aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/m8xx_pcmcia.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2009-09-28 18:10:41 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2009-09-28 18:10:41 -0400
commit827b4649d4626bf97b203b4bcd69476bb9b4e760 (patch)
treef94042698d02499e95cfe59003fdafed725b3ed5 /drivers/pcmcia/m8xx_pcmcia.c
parent17d857be649a21ca90008c6dc425d849fa83db5c (diff)
PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()
pcmcia_socket_dev_suspend() doesn't use its second argument, so it may be dropped safely. This change is necessary for the subsequent yenta suspend/resume fix. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Cc: stable@kernel.org
Diffstat (limited to 'drivers/pcmcia/m8xx_pcmcia.c')
-rw-r--r--drivers/pcmcia/m8xx_pcmcia.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c
index d1ad0966392d..c69f2c4fe520 100644
--- a/drivers/pcmcia/m8xx_pcmcia.c
+++ b/drivers/pcmcia/m8xx_pcmcia.c
@@ -1296,7 +1296,7 @@ static int m8xx_remove(struct of_device *ofdev)
1296#ifdef CONFIG_PM 1296#ifdef CONFIG_PM
1297static int m8xx_suspend(struct platform_device *pdev, pm_message_t state) 1297static int m8xx_suspend(struct platform_device *pdev, pm_message_t state)
1298{ 1298{
1299 return pcmcia_socket_dev_suspend(&pdev->dev, state); 1299 return pcmcia_socket_dev_suspend(&pdev->dev);
1300} 1300}
1301 1301
1302static int m8xx_resume(struct platform_device *pdev) 1302static int m8xx_resume(struct platform_device *pdev)