diff options
author | Guenter Roeck <linux@roeck-us.net> | 2012-08-16 23:26:00 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-17 17:46:41 -0400 |
commit | af36107968f1b5faab0e4a0cc44fa4498c63f017 (patch) | |
tree | 1be6443cd2b32be4847257515be595afe8acbb7f /drivers/spi/spi-coldfire-qspi.c | |
parent | a0c3652caa357b8f4e76efe401646ef298483cd9 (diff) |
spi/coldfire-qspi: Drop extra calls to spi_master_get in suspend/resume 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, so drop the calls.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/spi/spi-coldfire-qspi.c')
-rw-r--r-- | drivers/spi/spi-coldfire-qspi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-coldfire-qspi.c b/drivers/spi/spi-coldfire-qspi.c index 1a30b47465c..764bfee7592 100644 --- a/drivers/spi/spi-coldfire-qspi.c +++ b/drivers/spi/spi-coldfire-qspi.c | |||
@@ -540,7 +540,7 @@ static int __devexit mcfqspi_remove(struct platform_device *pdev) | |||
540 | #ifdef CONFIG_PM_SLEEP | 540 | #ifdef CONFIG_PM_SLEEP |
541 | static int mcfqspi_suspend(struct device *dev) | 541 | static int mcfqspi_suspend(struct device *dev) |
542 | { | 542 | { |
543 | struct spi_master *master = spi_master_get(dev_get_drvdata(dev)); | 543 | struct spi_master *master = dev_get_drvdata(dev); |
544 | struct mcfqspi *mcfqspi = spi_master_get_devdata(master); | 544 | struct mcfqspi *mcfqspi = spi_master_get_devdata(master); |
545 | 545 | ||
546 | spi_master_suspend(master); | 546 | spi_master_suspend(master); |
@@ -552,7 +552,7 @@ static int mcfqspi_suspend(struct device *dev) | |||
552 | 552 | ||
553 | static int mcfqspi_resume(struct device *dev) | 553 | static int mcfqspi_resume(struct device *dev) |
554 | { | 554 | { |
555 | struct spi_master *master = spi_master_get(dev_get_drvdata(dev)); | 555 | struct spi_master *master = dev_get_drvdata(dev); |
556 | struct mcfqspi *mcfqspi = spi_master_get_devdata(master); | 556 | struct mcfqspi *mcfqspi = spi_master_get_devdata(master); |
557 | 557 | ||
558 | spi_master_resume(master); | 558 | spi_master_resume(master); |