- val = rv_readl(adata->acp3x_base + mmACP_BTTDM_ITER);
- rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_ITER);
- val = rv_readl(adata->acp3x_base + mmACP_BTTDM_IRER);
- rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_IRER);
- val = (FRM_LEN | (slots << 15) | (slot_len << 18));
nit-pick: you have extra parentheses that are not needed for (val | 0x02) and the outer ones on the previous line
+static int acp3x_i2s_trigger(struct snd_pcm_substream *substream,
int cmd, struct snd_soc_dai *dai)+{
- int ret = 0;
nit-pick: move last, xmas-style
- struct i2s_stream_instance *rtd = substream->runtime->private_data;
- u32 val, period_bytes;
+static int acp3x_dai_probe(struct platform_device *pdev) +{
- int status;
- struct resource *res;
- struct i2s_dev_data *adata;
- adata = devm_kzalloc(&pdev->dev, sizeof(struct i2s_dev_data),
GFP_KERNEL);- if (!adata)
return -ENOMEM;- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!res) {
dev_err(&pdev->dev, "IORESOURCE_MEM FAILED\n");goto err;- }
- adata->acp3x_base = devm_ioremap(&pdev->dev, res->start,
resource_size(res));- if (IS_ERR(adata->acp3x_base))
return PTR_ERR(adata->acp3x_base);- adata->i2s_irq = res->start;
- dev_set_drvdata(&pdev->dev, adata);
- status = devm_snd_soc_register_component(&pdev->dev,
&acp3x_dai_component,&acp3x_i2s_dai, 1);- if (status) {
dev_err(&pdev->dev, "Fail to register acp i2s dai\n");goto dev_err;- }
- pm_runtime_set_autosuspend_delay(&pdev->dev, 10000);
- pm_runtime_use_autosuspend(&pdev->dev);
- pm_runtime_enable(&pdev->dev);
- return 0;
+err:
- kfree(adata);
- return -ENOMEM;
+dev_err:
- kfree(adata->acp3x_base);
- kfree(adata);
- kfree(res);
- return -ENODEV;
this can be improved a bit by using ret = -ENOMEM/-ENODEV before the goto, and organizing the labels and the kfree calls in the reverse order of the initialization/allocation steps.
@@ -666,7 +461,24 @@ static int acp3x_audio_probe(struct platform_device *pdev) pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_enable(&pdev->dev); return 0;
+err:
- kfree(res);
- return -ENOMEM;
+base_err:
- kfree(res);
- kfree(adata);
- return -ENOMEM;
+io_irq:
- kfree(res);
- kfree(adata->acp3x_base);
- kfree(adata);
- return -ENOMEM;
- dev_err:
- kfree(res);
- kfree(adata->acp3x_base);
- kfree(adata); status = acp3x_deinit(adata->acp3x_base); if (status) dev_err(&pdev->dev, "ACP de-init failed\n");
same here, you should have all the kfrees in the reverse order of the kzalloc, and labels pointing straight at the sequence that needs to be executed. Duplicating the error flow makes it hard to maintain the code and check for memory leaks.