spi/s3c64xx: Drop extra calls to spi_master_get in suspend/remove functions

PATCH New Guenter Roeck 3 participants 5 messages Aug 17, 2012 – Aug 27, 2012

Subsystems (3)

SPI Arm Samsung Exynos Samsung SPI drivers

lore

Share & tools

lore

Guenter Roeck

author

2012-08-17 03:14 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 drivers/spi/spi-s3c64xx.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

drivers/spi/spi-s3c64xx.c +4 -4

index 646a765..d7a87df 100644
@@ -1409,7 +1409,7 @@ static int s3c64xx_spi_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int s3c64xx_spi_suspend(struct device *dev)
 {
-	struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+	struct spi_master *master = dev_get_drvdata(dev);
 	struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
 
 	spi_master_suspend(master);

@@ -1428,7 +1428,7 @@ static int s3c64xx_spi_suspend(struct device *dev)
 
 static int s3c64xx_spi_resume(struct device *dev)
 {
-	struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+	struct spi_master *master = dev_get_drvdata(dev);
 	struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
 	struct s3c64xx_spi_info *sci = sdd->cntrlr_info;

@@ -1452,7 +1452,7 @@ static int s3c64xx_spi_resume(struct device *dev)
 #ifdef CONFIG_PM_RUNTIME
 static int s3c64xx_spi_runtime_suspend(struct device *dev)
 {
-	struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+	struct spi_master *master = dev_get_drvdata(dev);
 	struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
 
 	clk_disable(sdd->clk);

@@ -1463,7 +1463,7 @@ static int s3c64xx_spi_runtime_suspend(struct device *dev)
 
 static int s3c64xx_spi_runtime_resume(struct device *dev)
 {
-	struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+	struct spi_master *master = dev_get_drvdata(dev);
 	struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
 
 	clk_enable(sdd->src_clk);

Signature · 1 line

1.7.9.7

Guenter Roeck

author

2012-08-17 03:28 UTC #1 lore raw

PATCH 1/1 spi/s3c64xx: Drop extra calls to spi_master_get in suspend/remove functions

Sigh.

s/remove/resume/ in headline.

Guenter

Quoted 53 lines · Guenter Roeck

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 <[email protected]>

---
 drivers/spi/spi-s3c64xx.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

drivers/spi/spi-s3c64xx.c +4 -4

index 646a765..d7a87df 100644
@@ -1409,7 +1409,7 @@ static int s3c64xx_spi_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int s3c64xx_spi_suspend(struct device *dev)
 {
-	struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+	struct spi_master *master = dev_get_drvdata(dev);
 	struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
 
 	spi_master_suspend(master);

@@ -1428,7 +1428,7 @@ static int s3c64xx_spi_suspend(struct device *dev)
 
 static int s3c64xx_spi_resume(struct device *dev)
 {
-	struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+	struct spi_master *master = dev_get_drvdata(dev);
 	struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
 	struct s3c64xx_spi_info *sci = sdd->cntrlr_info;

@@ -1452,7 +1452,7 @@ static int s3c64xx_spi_resume(struct device *dev)
 #ifdef CONFIG_PM_RUNTIME
 static int s3c64xx_spi_runtime_suspend(struct device *dev)
 {
-	struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+	struct spi_master *master = dev_get_drvdata(dev);
 	struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
 
 	clk_disable(sdd->clk);

@@ -1463,7 +1463,7 @@ static int s3c64xx_spi_runtime_suspend(struct device *dev)
 
 static int s3c64xx_spi_runtime_resume(struct device *dev)
 {
-	struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+	struct spi_master *master = dev_get_drvdata(dev);
 	struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
 
 	clk_enable(sdd->src_clk);

Signature · 1 line

1.7.9.7

Kukjin Kim

2012-08-23 05:40 UTC #2 lore raw

PATCH 1/1 spi/s3c64xx: Drop extra calls to spi_master_get in suspend/remove functions

In reply to Guenter Roeck

Quoted 7 lines · Guenter Roeck

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 <[email protected]>

Acked-by Kukjin Kim <[email protected]>

(Cc'ed Mark Brown who is handling spi now)

Guenter, maybe you need to re-send this patch to Mark so that he can apply ;-)

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

Quoted 52 lines

---
 drivers/spi/spi-s3c64xx.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

drivers/spi/spi-s3c64xx.c +1 -1

index 646a765..d7a87df 100644
@@ -1409,7 +1409,7 @@ static int s3c64xx_spi_remove(struct platform_device
 *pdev)
 #ifdef CONFIG_PM
 static int s3c64xx_spi_suspend(struct device *dev)
 {
-	struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+	struct spi_master *master = dev_get_drvdata(dev);
 	struct s3c64xx_spi_driver_data *sdd =
 spi_master_get_devdata(master);

drivers/spi/spi-s3c64xx.c +2 -2

 	spi_master_suspend(master);

@@ -1428,7 +1428,7 @@ static int s3c64xx_spi_suspend(struct device *dev)
 
 static int s3c64xx_spi_resume(struct device *dev)
 {
-	struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+	struct spi_master *master = dev_get_drvdata(dev);
 	struct s3c64xx_spi_driver_data *sdd =
 spi_master_get_devdata(master);
 	struct s3c64xx_spi_info *sci = sdd->cntrlr_info;

@@ -1452,7 +1452,7 @@ static int s3c64xx_spi_resume(struct device *dev)
 #ifdef CONFIG_PM_RUNTIME
 static int s3c64xx_spi_runtime_suspend(struct device *dev)
 {
-	struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+	struct spi_master *master = dev_get_drvdata(dev);
 	struct s3c64xx_spi_driver_data *sdd =
 spi_master_get_devdata(master);

drivers/spi/spi-s3c64xx.c +1 -1

 	clk_disable(sdd->clk);

@@ -1463,7 +1463,7 @@ static int s3c64xx_spi_runtime_suspend(struct device
 *dev)
 
 static int s3c64xx_spi_runtime_resume(struct device *dev)
 {
-	struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+	struct spi_master *master = dev_get_drvdata(dev);
 	struct s3c64xx_spi_driver_data *sdd =
 spi_master_get_devdata(master);

clk_enable(sdd->src_clk);
--
1.7.9.7

Guenter Roeck

author

2012-08-23 13:39 UTC #3 lore raw

PATCH 1/1 spi/s3c64xx: Drop extra calls to spi_master_get in suspend/remove functions

Quoted 7 lines · Kukjin Kim

Quoted 6 lines · Guenter Roeck
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.

Quoted 9 lines

Quoted 1 line
Signed-off-by Guenter Roeck <[email protected]>
Acked-by Kukjin Kim <[email protected]>
(Cc'ed Mark Brown who is handling spi now)
Guenter, maybe you need to re-send this patch to Mark so that he can apply ;-)

Guess you are right - and I did copy Mark on my later patches. Mark, I just bounced the patch to you, so you should have it now.

Thanks,
Guenter

Quoted 62 lines

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

Quoted 52 lines

---
 drivers/spi/spi-s3c64xx.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

drivers/spi/spi-s3c64xx.c +1 -1

index 646a765..d7a87df 100644
@@ -1409,7 +1409,7 @@ static int s3c64xx_spi_remove(struct platform_device
 *pdev)
 #ifdef CONFIG_PM
 static int s3c64xx_spi_suspend(struct device *dev)
 {
-	struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+	struct spi_master *master = dev_get_drvdata(dev);
 	struct s3c64xx_spi_driver_data *sdd =
 spi_master_get_devdata(master);

drivers/spi/spi-s3c64xx.c +2 -2

 	spi_master_suspend(master);

@@ -1428,7 +1428,7 @@ static int s3c64xx_spi_suspend(struct device *dev)
 
 static int s3c64xx_spi_resume(struct device *dev)
 {
-	struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+	struct spi_master *master = dev_get_drvdata(dev);
 	struct s3c64xx_spi_driver_data *sdd =
 spi_master_get_devdata(master);
 	struct s3c64xx_spi_info *sci = sdd->cntrlr_info;

@@ -1452,7 +1452,7 @@ static int s3c64xx_spi_resume(struct device *dev)
 #ifdef CONFIG_PM_RUNTIME
 static int s3c64xx_spi_runtime_suspend(struct device *dev)
 {
-	struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+	struct spi_master *master = dev_get_drvdata(dev);
 	struct s3c64xx_spi_driver_data *sdd =
 spi_master_get_devdata(master);

drivers/spi/spi-s3c64xx.c +1 -1

 	clk_disable(sdd->clk);

@@ -1463,7 +1463,7 @@ static int s3c64xx_spi_runtime_suspend(struct device
 *dev)
 
 static int s3c64xx_spi_runtime_resume(struct device *dev)
 {
-	struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+	struct spi_master *master = dev_get_drvdata(dev);
 	struct s3c64xx_spi_driver_data *sdd =
 spi_master_get_devdata(master);

clk_enable(sdd->src_clk);
--
1.7.9.7

Mark Brown

Applied

2012-08-27 17:19 UTC #4 lore raw

PATCH 1/1 spi/s3c64xx: Drop extra calls to spi_master_get in suspend/remove functions

In reply to Guenter Roeck

Quoted 3 lines · Guenter Roeck

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.

Applied, thanks.