mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
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>
This commit is contained in:
parent
96bf40194f
commit
a34bcbedf8
1 changed files with 2 additions and 5 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue