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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Guenter Roeck and committed by

Mark Brown 13 years ago 9a2a5245 63002e84

+4 -4

1 changed file

expand all

drivers

spi

spi-s3c64xx.c

+4 -4

drivers/spi/spi-s3c64xx.c

··· 1409 1409 #ifdef CONFIG_PM 1410 1410 static 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 1413 struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); 1414 1414 1415 1415 spi_master_suspend(master); ··· 1428 1428 1429 1429 static 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 1432 struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); 1433 1433 struct s3c64xx_spi_info *sci = sdd->cntrlr_info; 1434 1434 ··· 1452 1452 #ifdef CONFIG_PM_RUNTIME 1453 1453 static 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 1456 struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); 1457 1457 1458 1458 clk_disable(sdd->clk); ··· 1463 1463 1464 1464 static 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 1467 struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); 1468 1468 1469 1469 clk_enable(sdd->src_clk);