aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@linux.intel.com>2015-08-05 03:04:05 -0400
committerMark Brown <broonie@kernel.org>2015-08-05 05:27:27 -0400
commit757fe8d514a9bab55156dfb2c4a03e56ba96a028 (patch)
tree1e68d2f7b08b1f169f678553dffb17db3c263a82 /drivers/spi
parent94e5c23d3c52f58f4051810a15aeacc085127ad1 (diff)
spi: spi-pxa2xx: Remove unused legacy null dma buffer and allocation for it
Remove null_dma_buf variable and extra allocation for it. It is not needed since commit 6356437e65c2 ("spi: spi-pxa2xx: remove legacy PXA DMA bits"). Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-pxa2xx.c4
-rw-r--r--drivers/spi/spi-pxa2xx.h3
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 246ffabc72c9..fdd791977041 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1414,8 +1414,7 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
1414 return -ENODEV; 1414 return -ENODEV;
1415 } 1415 }
1416 1416
1417 /* Allocate master with space for drv_data and null dma buffer */ 1417 master = spi_alloc_master(dev, sizeof(struct driver_data));
1418 master = spi_alloc_master(dev, sizeof(struct driver_data) + 16);
1419 if (!master) { 1418 if (!master) {
1420 dev_err(&pdev->dev, "cannot alloc spi_master\n"); 1419 dev_err(&pdev->dev, "cannot alloc spi_master\n");
1421 pxa_ssp_free(ssp); 1420 pxa_ssp_free(ssp);
@@ -1442,7 +1441,6 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
1442 master->auto_runtime_pm = true; 1441 master->auto_runtime_pm = true;
1443 1442
1444 drv_data->ssp_type = ssp->type; 1443 drv_data->ssp_type = ssp->type;
1445 drv_data->null_dma_buf = (u32 *)PTR_ALIGN(&drv_data[1], DMA_ALIGNMENT);
1446 1444
1447 drv_data->ioaddr = ssp->mmio_base; 1445 drv_data->ioaddr = ssp->mmio_base;
1448 drv_data->ssdr_physical = ssp->phys_base + SSDR; 1446 drv_data->ssdr_physical = ssp->phys_base + SSDR;
diff --git a/drivers/spi/spi-pxa2xx.h b/drivers/spi/spi-pxa2xx.h
index 3b69c46bfbc9..0a9b6390a817 100644
--- a/drivers/spi/spi-pxa2xx.h
+++ b/drivers/spi/spi-pxa2xx.h
@@ -36,9 +36,6 @@ struct driver_data {
36 /* PXA hookup */ 36 /* PXA hookup */
37 struct pxa2xx_spi_master *master_info; 37 struct pxa2xx_spi_master *master_info;
38 38
39 /* PXA private DMA setup stuff */
40 u32 *null_dma_buf;
41
42 /* SSP register addresses */ 39 /* SSP register addresses */
43 void __iomem *ioaddr; 40 void __iomem *ioaddr;
44 u32 ssdr_physical; 41 u32 ssdr_physical;