Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a2a5245 authored by Guenter Roeck's avatar Guenter Roeck Committed by Mark Brown
Browse files

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: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 63002e84

drivers/spi/spi-s3c64xx.c

+4 −4
Original line number Diff line number Diff line
@@ -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);