evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

spi: sirf: remove the allocation of dummypage

Browse source 
this job has been done by spi core.

Signed-off-by: Qipan Li <Qipan.Li@csr.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Qipan Li 2015-05-26 05:21:01 +00:00 • committed by Mark Brown
parent e3fb57c832
commit 3aa7b1d66f
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/spi/spi-sirf.c
View file

@ -303,7 +303,6 @@ struct sirfsoc_spi {
struct dma_chan *tx_chan; struct dma_chan *tx_chan;
dma_addr_t src_start; dma_addr_t src_start;
dma_addr_t dst_start; dma_addr_t dst_start;
void *dummypage;
int word_width; /* in bytes */ int word_width; /* in bytes */
/* /*
@ -719,8 +718,8 @@ static int spi_sirfsoc_transfer(struct spi_device *spi, struct spi_transfer *t)
struct sirfsoc_spi *sspi; struct sirfsoc_spi *sspi;
sspi = spi_master_get_devdata(spi->master); sspi = spi_master_get_devdata(spi->master);
sspi->tx = t->tx_buf ? t->tx_buf : sspi->dummypage; sspi->tx = t->tx_buf;
sspi->rx = t->rx_buf ? t->rx_buf : sspi->dummypage; sspi->rx = t->rx_buf;
sspi->left_tx_word = sspi->left_rx_word = t->len / sspi->word_width; sspi->left_tx_word = sspi->left_rx_word = t->len / sspi->word_width;
reinit_completion(&sspi->rx_done); reinit_completion(&sspi->rx_done);
reinit_completion(&sspi->tx_done); reinit_completion(&sspi->tx_done);
@ -1114,6 +1113,7 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
master->bits_per_word_mask = SPI_BPW_MASK(8) | SPI_BPW_MASK(12) | master->bits_per_word_mask = SPI_BPW_MASK(8) | SPI_BPW_MASK(12) |
SPI_BPW_MASK(16) | SPI_BPW_MASK(32); SPI_BPW_MASK(16) | SPI_BPW_MASK(32);
master->max_speed_hz = SIRFSOC_SPI_DEFAULT_FRQ; master->max_speed_hz = SIRFSOC_SPI_DEFAULT_FRQ;
master->flags = SPI_MASTER_MUST_RX | SPI_MASTER_MUST_TX;
sspi->bitbang.master->dev.of_node = pdev->dev.of_node; sspi->bitbang.master->dev.of_node = pdev->dev.of_node;
/* request DMA channels */ /* request DMA channels */
@ -1141,12 +1141,6 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
init_completion(&sspi->rx_done); init_completion(&sspi->rx_done);
init_completion(&sspi->tx_done); init_completion(&sspi->tx_done);
sspi->dummypage = devm_kzalloc(&pdev->dev, 2 * PAGE_SIZE, GFP_KERNEL);
if (!sspi->dummypage) {
ret = -ENOMEM;
goto free_clk;
}
ret = spi_bitbang_start(&sspi->bitbang); ret = spi_bitbang_start(&sspi->bitbang);
if (ret) if (ret)
goto free_clk; goto free_clk;