leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spi: omap2-mcspi: Convert to use devm_kcalloc

Browse Source 
This saves a few unwind code and return proper error if devm_kcalloc fails.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Axel Lin
2014-03-29 21:37:44 +08:00
committed by Mark Brown
parent 455c6fdbd2
commit a6f936db64
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/spi/spi-omap2-mcspi.c
View File

@@ -1356,12 +1356,13 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
INIT_LIST_HEAD(&mcspi->ctx.cs); INIT_LIST_HEAD(&mcspi->ctx.cs);
mcspi->dma_channels = kcalloc(master->num_chipselect, mcspi->dma_channels = devm_kcalloc(&pdev->dev, master->num_chipselect,
sizeof(struct omap2_mcspi_dma), sizeof(struct omap2_mcspi_dma),
GFP_KERNEL); GFP_KERNEL);
if (mcspi->dma_channels == NULL) {
if (mcspi->dma_channels == NULL) status = -ENOMEM;
goto free_master; goto free_master;
}
for (i = 0; i < master->num_chipselect; i++) { for (i = 0; i < master->num_chipselect; i++) {
char *dma_rx_ch_name = mcspi->dma_channels[i].dma_rx_ch_name; char *dma_rx_ch_name = mcspi->dma_channels[i].dma_rx_ch_name;
@@ -1403,7 +1404,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
} }
if (status < 0) if (status < 0)
goto dma_chnl_free; goto free_master;
pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_use_autosuspend(&pdev->dev);
pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT); pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT);
@@ -1421,8 +1422,6 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
disable_pm: disable_pm:
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
dma_chnl_free:
kfree(mcspi->dma_channels);
free_master: free_master:
spi_master_put(master); spi_master_put(master);
return status; return status;
@@ -1430,19 +1429,12 @@ free_master:
static int omap2_mcspi_remove(struct platform_device *pdev) static int omap2_mcspi_remove(struct platform_device *pdev)
{ {
struct spi_master *master; struct spi_master *master = platform_get_drvdata(pdev);
struct omap2_mcspi *mcspi; struct omap2_mcspi *mcspi = spi_master_get_devdata(master);
struct omap2_mcspi_dma *dma_channels;
master = platform_get_drvdata(pdev);
mcspi = spi_master_get_devdata(master);
dma_channels = mcspi->dma_channels;
pm_runtime_put_sync(mcspi->dev); pm_runtime_put_sync(mcspi->dev);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
kfree(dma_channels);
return 0; return 0;
} }