diff options
| author | Qipan Li <Qipan.Li@csr.com> | 2015-05-07 07:13:10 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-05-07 10:46:11 +0100 |
| commit | a34bcbedf8c9f6e960a09ed677d320392b1fe8d0 (patch) | |
| tree | 85a13cdb2b390eafa75cbb6c3b0d97d81a16cd06 /drivers/spi/spi-sirf.c | |
| parent | 96bf40194fdda941ce579be199a9427feee5dffa (diff) | |
| download | linux-stable-a34bcbedf8c9f6e960a09ed677d320392b1fe8d0.tar.gz linux-stable-a34bcbedf8c9f6e960a09ed677d320392b1fe8d0.tar.bz2 linux-stable-a34bcbedf8c9f6e960a09ed677d320392b1fe8d0.zip | |
spi: sirf: replace kmalloc by devm_kzalloc
Signed-off-by: Qipan Li <Qipan.Li@csr.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-sirf.c')
| -rw-r--r-- | drivers/spi/spi-sirf.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c index a69ccb75f7d7..ae4bd1154141 100644 --- a/drivers/spi/spi-sirf.c +++ b/drivers/spi/spi-sirf.c @@ -758,7 +758,7 @@ static int spi_sirfsoc_probe(struct platform_device *pdev) /* We are not using dummy delay between command and data */ writel(0, sspi->base + SIRFSOC_SPI_DUMMY_DELAY_CTL); - sspi->dummypage = kmalloc(2 * PAGE_SIZE, GFP_KERNEL); + sspi->dummypage = devm_kzalloc(&pdev->dev, 2 * PAGE_SIZE, GFP_KERNEL); if (!sspi->dummypage) { ret = -ENOMEM; goto free_clk; @@ -766,12 +766,10 @@ static int spi_sirfsoc_probe(struct platform_device *pdev) ret = spi_bitbang_start(&sspi->bitbang); if (ret) - goto free_dummypage; + goto free_clk; dev_info(&pdev->dev, "registerred, bus number = %d\n", master->bus_num); return 0; -free_dummypage: - kfree(sspi->dummypage); free_clk: clk_disable_unprepare(sspi->clk); clk_put(sspi->clk); @@ -794,7 +792,6 @@ static int spi_sirfsoc_remove(struct platform_device *pdev) sspi = spi_master_get_devdata(master); spi_bitbang_stop(&sspi->bitbang); - kfree(sspi->dummypage); clk_disable_unprepare(sspi->clk); clk_put(sspi->clk); dma_release_channel(sspi->rx_chan); |