aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@marvell.com>2010-05-05 10:11:15 -0400
committerEric Miao <eric.y.miao@gmail.com>2010-05-11 11:25:06 -0400
commitbaffe1699c68da5040de6b274054adc995795782 (patch)
treecdb8a8b80ffb7d8d14b80305c38af650a9842abf /drivers
parent2503991a56483dc8477a3c6ca86da253eb5f8af9 (diff)
[ARM] pxa: add namespace on ssp
In order to prevent code ambiguous, add namespace on functions in ssp driver. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/pxa2xx_spi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index 50d6b780bc67..e76b1afafe07 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -1465,7 +1465,7 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)
1465 1465
1466 platform_info = dev->platform_data; 1466 platform_info = dev->platform_data;
1467 1467
1468 ssp = ssp_request(pdev->id, pdev->name); 1468 ssp = pxa_ssp_request(pdev->id, pdev->name);
1469 if (ssp == NULL) { 1469 if (ssp == NULL) {
1470 dev_err(&pdev->dev, "failed to request SSP%d\n", pdev->id); 1470 dev_err(&pdev->dev, "failed to request SSP%d\n", pdev->id);
1471 return -ENODEV; 1471 return -ENODEV;
@@ -1475,7 +1475,7 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)
1475 master = spi_alloc_master(dev, sizeof(struct driver_data) + 16); 1475 master = spi_alloc_master(dev, sizeof(struct driver_data) + 16);
1476 if (!master) { 1476 if (!master) {
1477 dev_err(&pdev->dev, "cannot alloc spi_master\n"); 1477 dev_err(&pdev->dev, "cannot alloc spi_master\n");
1478 ssp_free(ssp); 1478 pxa_ssp_free(ssp);
1479 return -ENOMEM; 1479 return -ENOMEM;
1480 } 1480 }
1481 drv_data = spi_master_get_devdata(master); 1481 drv_data = spi_master_get_devdata(master);
@@ -1604,7 +1604,7 @@ out_error_irq_alloc:
1604 1604
1605out_error_master_alloc: 1605out_error_master_alloc:
1606 spi_master_put(master); 1606 spi_master_put(master);
1607 ssp_free(ssp); 1607 pxa_ssp_free(ssp);
1608 return status; 1608 return status;
1609} 1609}
1610 1610
@@ -1648,7 +1648,7 @@ static int pxa2xx_spi_remove(struct platform_device *pdev)
1648 free_irq(ssp->irq, drv_data); 1648 free_irq(ssp->irq, drv_data);
1649 1649
1650 /* Release SSP */ 1650 /* Release SSP */
1651 ssp_free(ssp); 1651 pxa_ssp_free(ssp);
1652 1652
1653 /* Disconnect from the SPI framework */ 1653 /* Disconnect from the SPI framework */
1654 spi_unregister_master(drv_data->master); 1654 spi_unregister_master(drv_data->master);