aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorThomas Abraham <thomas.abraham@linaro.org>2012-07-12 18:15:14 -0400
committerKukjin Kim <kgene.kim@samsung.com>2012-07-13 02:23:46 -0400
commit868dee91a5f96dfbc97b2cd582614cdc339ec305 (patch)
treea60604b361a0a1d2839c906c79001600a0c14c1f /drivers/spi
parenta5238e360b715e9a1bb39d7d3537f78cc9e9e286 (diff)
ARM: SAMSUNG: Remove pdev pointer parameter from spi gpio setup functions
The platform data pointer that is passed to the spi gpio setup functions is not used. Hence, this parameter is removed from all the spi gpio setup functions. Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> Acked-by: Jaswinder Singh <jaswinder.singh@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-s3c64xx.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 8698618e56f..0a9e43e635a 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -1071,7 +1071,7 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)
1071 goto err1; 1071 goto err1;
1072 } 1072 }
1073 1073
1074 if (sci->cfg_gpio == NULL || sci->cfg_gpio(pdev)) { 1074 if (sci->cfg_gpio == NULL || sci->cfg_gpio()) {
1075 dev_err(&pdev->dev, "Unable to config gpio\n"); 1075 dev_err(&pdev->dev, "Unable to config gpio\n");
1076 ret = -EBUSY; 1076 ret = -EBUSY;
1077 goto err2; 1077 goto err2;
@@ -1214,12 +1214,11 @@ static int s3c64xx_spi_suspend(struct device *dev)
1214 1214
1215static int s3c64xx_spi_resume(struct device *dev) 1215static int s3c64xx_spi_resume(struct device *dev)
1216{ 1216{
1217 struct platform_device *pdev = to_platform_device(dev);
1218 struct spi_master *master = spi_master_get(dev_get_drvdata(dev)); 1217 struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
1219 struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); 1218 struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
1220 struct s3c64xx_spi_info *sci = sdd->cntrlr_info; 1219 struct s3c64xx_spi_info *sci = sdd->cntrlr_info;
1221 1220
1222 sci->cfg_gpio(pdev); 1221 sci->cfg_gpio();
1223 1222
1224 /* Enable the clock */ 1223 /* Enable the clock */
1225 clk_enable(sdd->src_clk); 1224 clk_enable(sdd->src_clk);