Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dmaengine: dw: Unify ret-val local variables naming

Currently there are two names utilized in the driver to keep the functions
call status: ret and err. For the sake of unification convert to using the
first version only.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
Acked-by: Andy Shevchenko <andy@kernel.org>
Link: https://lore.kernel.org/r/20240802075100.6475-7-fancer.lancer@gmail.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Serge Semin and committed by
Vinod Koul
2ebc36b9 d8fa0802

+20 -20
+10 -10
drivers/dma/dw/core.c
··· 1155 1155 bool autocfg = false; 1156 1156 unsigned int dw_params; 1157 1157 unsigned int i; 1158 - int err; 1158 + int ret; 1159 1159 1160 1160 dw->pdata = devm_kzalloc(chip->dev, sizeof(*dw->pdata), GFP_KERNEL); 1161 1161 if (!dw->pdata) ··· 1171 1171 1172 1172 autocfg = dw_params >> DW_PARAMS_EN & 1; 1173 1173 if (!autocfg) { 1174 - err = -EINVAL; 1174 + ret = -EINVAL; 1175 1175 goto err_pdata; 1176 1176 } 1177 1177 ··· 1191 1191 pdata->chan_allocation_order = CHAN_ALLOCATION_ASCENDING; 1192 1192 pdata->chan_priority = CHAN_PRIORITY_ASCENDING; 1193 1193 } else if (chip->pdata->nr_channels > DW_DMA_MAX_NR_CHANNELS) { 1194 - err = -EINVAL; 1194 + ret = -EINVAL; 1195 1195 goto err_pdata; 1196 1196 } else { 1197 1197 memcpy(dw->pdata, chip->pdata, sizeof(*dw->pdata)); ··· 1203 1203 dw->chan = devm_kcalloc(chip->dev, pdata->nr_channels, sizeof(*dw->chan), 1204 1204 GFP_KERNEL); 1205 1205 if (!dw->chan) { 1206 - err = -ENOMEM; 1206 + ret = -ENOMEM; 1207 1207 goto err_pdata; 1208 1208 } 1209 1209 ··· 1221 1221 sizeof(struct dw_desc), 4, 0); 1222 1222 if (!dw->desc_pool) { 1223 1223 dev_err(chip->dev, "No memory for descriptors dma pool\n"); 1224 - err = -ENOMEM; 1224 + ret = -ENOMEM; 1225 1225 goto err_pdata; 1226 1226 } 1227 1227 1228 1228 tasklet_setup(&dw->tasklet, dw_dma_tasklet); 1229 1229 1230 - err = request_irq(chip->irq, dw_dma_interrupt, IRQF_SHARED, 1230 + ret = request_irq(chip->irq, dw_dma_interrupt, IRQF_SHARED, 1231 1231 dw->name, dw); 1232 - if (err) 1232 + if (ret) 1233 1233 goto err_pdata; 1234 1234 1235 1235 INIT_LIST_HEAD(&dw->dma.channels); ··· 1341 1341 */ 1342 1342 dma_set_max_seg_size(dw->dma.dev, dw->chan[0].block_size); 1343 1343 1344 - err = dma_async_device_register(&dw->dma); 1345 - if (err) 1344 + ret = dma_async_device_register(&dw->dma); 1345 + if (ret) 1346 1346 goto err_dma_register; 1347 1347 1348 1348 dev_info(chip->dev, "DesignWare DMA Controller, %d channels\n", ··· 1356 1356 free_irq(chip->irq, dw); 1357 1357 err_pdata: 1358 1358 pm_runtime_put_sync_suspend(chip->dev); 1359 - return err; 1359 + return ret; 1360 1360 } 1361 1361 1362 1362 int do_dma_remove(struct dw_dma_chip *chip)
+10 -10
drivers/dma/dw/platform.c
··· 29 29 struct dw_dma_chip_pdata *data; 30 30 struct dw_dma_chip *chip; 31 31 struct device *dev = &pdev->dev; 32 - int err; 32 + int ret; 33 33 34 34 match = device_get_match_data(dev); 35 35 if (!match) ··· 51 51 if (IS_ERR(chip->regs)) 52 52 return PTR_ERR(chip->regs); 53 53 54 - err = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); 55 - if (err) 56 - return err; 54 + ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); 55 + if (ret) 56 + return ret; 57 57 58 58 if (!data->pdata) 59 59 data->pdata = dev_get_platdata(dev); ··· 69 69 chip->clk = devm_clk_get_optional(chip->dev, "hclk"); 70 70 if (IS_ERR(chip->clk)) 71 71 return PTR_ERR(chip->clk); 72 - err = clk_prepare_enable(chip->clk); 73 - if (err) 74 - return err; 72 + ret = clk_prepare_enable(chip->clk); 73 + if (ret) 74 + return ret; 75 75 76 76 pm_runtime_enable(&pdev->dev); 77 77 78 - err = data->probe(chip); 79 - if (err) 78 + ret = data->probe(chip); 79 + if (ret) 80 80 goto err_dw_dma_probe; 81 81 82 82 platform_set_drvdata(pdev, data); ··· 90 90 err_dw_dma_probe: 91 91 pm_runtime_disable(&pdev->dev); 92 92 clk_disable_unprepare(chip->clk); 93 - return err; 93 + return ret; 94 94 } 95 95 96 96 static void dw_remove(struct platform_device *pdev)