Commit 919b742f authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Vinod Koul

dmaengine: st_fdma: fix uninitialized variable access

The newly added st_fdma driver introduces a build warning for
allmodconfig when we add '-Wmaybe-uninitialized':

drivers/dma/st_fdma.c: In function 'st_fdma_probe':
drivers/dma/st_fdma.c:777:5: error: 'ret' may be used uninitialized in this function [-Werror=maybe-uninitialized]

The warning is correct, though this can't happen in practice
as the check is redundant (we don't get to this function if
the pointer is NULL). Even if the function were called with a
NULL of_node, the check is not needed because of_property_read_u32
can deal with a NULL argument by returning an error.

Removing the unnecessary code simplifies the function and avoids
the condition that we get the warning for.

Fixes: 6b4cd727 ("dmaengine: st_fdma: Add STMicroelectronics FDMA engine driver support")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarPeter Griffin <peter.griffin@linaro.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent ecaf33bc
...@@ -720,21 +720,11 @@ static int st_fdma_parse_dt(struct platform_device *pdev, ...@@ -720,21 +720,11 @@ static int st_fdma_parse_dt(struct platform_device *pdev,
const struct st_fdma_driverdata *drvdata, const struct st_fdma_driverdata *drvdata,
struct st_fdma_dev *fdev) struct st_fdma_dev *fdev)
{ {
struct device_node *np = pdev->dev.of_node;
int ret;
if (!np)
goto err;
ret = of_property_read_u32(np, "dma-channels", &fdev->nr_channels);
if (ret)
goto err;
snprintf(fdev->fw_name, FW_NAME_SIZE, "fdma_%s_%d.elf", snprintf(fdev->fw_name, FW_NAME_SIZE, "fdma_%s_%d.elf",
drvdata->name, drvdata->id); drvdata->name, drvdata->id);
err: return of_property_read_u32(pdev->dev.of_node, "dma-channels",
return ret; &fdev->nr_channels);
} }
#define FDMA_DMA_BUSWIDTHS (BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | \ #define FDMA_DMA_BUSWIDTHS (BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | \
BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | \ BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment