Merge tag 'sound-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / fsl / fsl_easrc.c

diff --git a/sound/soc/fsl/fsl_easrc.c b/sound/soc/fsl/fsl_easrc.c
index 636a702f37a62ec0ad11bbf00ca13738eaebd944..b1765c7d3bcd2ccfc70330685f6df5408e71b5ae 100644 (file)
--- a/sound/soc/fsl/fsl_easrc.c
+++ b/sound/soc/fsl/fsl_easrc.c
@@ -380,7 +380,7 @@ static int fsl_easrc_resampler_config(struct fsl_asrc *easrc)
 }
 
 /**
 }
 
 /**

- *  Scale filter coefficients (64 bits float)
+ *  fsl_easrc_normalize_filter - Scale filter coefficients (64 bits float)

  *  For input float32 normalized range (1.0,-1.0) -> output int[16,24,32]:
  *      scale it by multiplying filter coefficients by 2^31
  *  For input int[16, 24, 32] -> output float32
  *  For input float32 normalized range (1.0,-1.0) -> output int[16,24,32]:
  *      scale it by multiplying filter coefficients by 2^31
  *  For input int[16, 24, 32] -> output float32


@@ -748,7 +748,7 @@ static int fsl_easrc_config_one_slot(struct fsl_asrc_pair *ctx,
 {
        struct fsl_asrc *easrc = ctx->asrc;
        struct fsl_easrc_ctx_priv *ctx_priv = ctx->private;
 {
        struct fsl_asrc *easrc = ctx->asrc;
        struct fsl_easrc_ctx_priv *ctx_priv = ctx->private;

-       int st1_chanxexp, st1_mem_alloc = 0, st2_mem_alloc = 0;
+       int st1_chanxexp, st1_mem_alloc = 0, st2_mem_alloc;

        unsigned int reg0, reg1, reg2, reg3;
        unsigned int addr;
 
        unsigned int reg0, reg1, reg2, reg3;
        unsigned int addr;
 


@@ -1328,7 +1328,7 @@ static int fsl_easrc_stop_context(struct fsl_asrc_pair *ctx)
 {
        struct fsl_asrc *easrc = ctx->asrc;
        int val, i;
 {
        struct fsl_asrc *easrc = ctx->asrc;
        int val, i;

-       int size = 0;
+       int size;

        int retry = 200;
 
        regmap_read(easrc->regmap, REG_EASRC_CC(ctx->index), &val);
        int retry = 200;
 
        regmap_read(easrc->regmap, REG_EASRC_CC(ctx->index), &val);


@@ -1889,15 +1889,12 @@ static int fsl_easrc_probe(struct platform_device *pdev)
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        regs = devm_ioremap_resource(dev, res);
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        regs = devm_ioremap_resource(dev, res);

-       if (IS_ERR(regs)) {
-               dev_err(&pdev->dev, "failed ioremap\n");
+       if (IS_ERR(regs))

                return PTR_ERR(regs);
                return PTR_ERR(regs);

-       }

 
        easrc->paddr = res->start;
 
 
        easrc->paddr = res->start;
 

-       easrc->regmap = devm_regmap_init_mmio_clk(dev, "mem", regs,
-                                                 &fsl_easrc_regmap_config);
+       easrc->regmap = devm_regmap_init_mmio(dev, regs, &fsl_easrc_regmap_config);

        if (IS_ERR(easrc->regmap)) {
                dev_err(dev, "failed to init regmap");
                return PTR_ERR(easrc->regmap);
        if (IS_ERR(easrc->regmap)) {
                dev_err(dev, "failed to init regmap");
                return PTR_ERR(easrc->regmap);