aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2012-08-16 23:14:25 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-27 13:19:19 -0400
commit9a2a52452575a4edf5b91e341d7d87fe2be3474c (patch)
tree97faa79e905d12149316f9958e675c61e6ec3324
parent63002e84a80c02b0be0f73932b955755903baabf (diff)
spi/s3c64xx: Drop extra calls to spi_master_get in suspend/remove functions
Suspend and resume functions call spi_master_get() without matching spi_master_put(). The extra references are unnecessary and cause subsequent module unload attempts to fail. Drop the calls. Signed-off-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--drivers/spi/spi-s3c64xx.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index cfa2c35dfeed..0087139090e4 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -1409,7 +1409,7 @@ static int s3c64xx_spi_remove(struct platform_device *pdev)
1409#ifdef CONFIG_PM 1409#ifdef CONFIG_PM
1410static int s3c64xx_spi_suspend(struct device *dev) 1410static int s3c64xx_spi_suspend(struct device *dev)
1411{ 1411{
1412 struct spi_master *master = spi_master_get(dev_get_drvdata(dev)); 1412 struct spi_master *master = dev_get_drvdata(dev);
1413 struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); 1413 struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
1414 1414
1415 spi_master_suspend(master); 1415 spi_master_suspend(master);
@@ -1428,7 +1428,7 @@ static int s3c64xx_spi_suspend(struct device *dev)
1428 1428
1429static int s3c64xx_spi_resume(struct device *dev) 1429static int s3c64xx_spi_resume(struct device *dev)
1430{ 1430{
1431 struct spi_master *master = spi_master_get(dev_get_drvdata(dev)); 1431 struct spi_master *master = dev_get_drvdata(dev);
1432 struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); 1432 struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
1433 struct s3c64xx_spi_info *sci = sdd->cntrlr_info; 1433 struct s3c64xx_spi_info *sci = sdd->cntrlr_info;
1434 1434
@@ -1452,7 +1452,7 @@ static int s3c64xx_spi_resume(struct device *dev)
1452#ifdef CONFIG_PM_RUNTIME 1452#ifdef CONFIG_PM_RUNTIME
1453static int s3c64xx_spi_runtime_suspend(struct device *dev) 1453static int s3c64xx_spi_runtime_suspend(struct device *dev)
1454{ 1454{
1455 struct spi_master *master = spi_master_get(dev_get_drvdata(dev)); 1455 struct spi_master *master = dev_get_drvdata(dev);
1456 struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); 1456 struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
1457 1457
1458 clk_disable(sdd->clk); 1458 clk_disable(sdd->clk);
@@ -1463,7 +1463,7 @@ static int s3c64xx_spi_runtime_suspend(struct device *dev)
1463 1463
1464static int s3c64xx_spi_runtime_resume(struct device *dev) 1464static int s3c64xx_spi_runtime_resume(struct device *dev)
1465{ 1465{
1466 struct spi_master *master = spi_master_get(dev_get_drvdata(dev)); 1466 struct spi_master *master = dev_get_drvdata(dev);
1467 struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); 1467 struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
1468 1468
1469 clk_enable(sdd->src_clk); 1469 clk_enable(sdd->src_clk);