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

+18 -18
+1 -1
drivers/pcmcia/at91_cf.c
··· 363 363 struct at91_cf_socket *cf = platform_get_drvdata(pdev); 364 364 struct at91_cf_data *board = cf->board; 365 365 366 - pcmcia_socket_dev_suspend(&pdev->dev, mesg); 366 + pcmcia_socket_dev_suspend(&pdev->dev); 367 367 if (device_may_wakeup(&pdev->dev)) { 368 368 enable_irq_wake(board->det_pin); 369 369 if (board->irq_pin)
+1 -1
drivers/pcmcia/au1000_generic.c
··· 515 515 static int au1x00_drv_pcmcia_suspend(struct platform_device *dev, 516 516 pm_message_t state) 517 517 { 518 - return pcmcia_socket_dev_suspend(&dev->dev, state); 518 + return pcmcia_socket_dev_suspend(&dev->dev); 519 519 } 520 520 521 521 static int au1x00_drv_pcmcia_resume(struct platform_device *dev)
+1 -1
drivers/pcmcia/bfin_cf_pcmcia.c
··· 302 302 303 303 static int bfin_cf_suspend(struct platform_device *pdev, pm_message_t mesg) 304 304 { 305 - return pcmcia_socket_dev_suspend(&pdev->dev, mesg); 305 + return pcmcia_socket_dev_suspend(&pdev->dev); 306 306 } 307 307 308 308 static int bfin_cf_resume(struct platform_device *pdev)
+1 -1
drivers/pcmcia/cs.c
··· 101 101 static int socket_resume(struct pcmcia_socket *skt); 102 102 static int socket_suspend(struct pcmcia_socket *skt); 103 103 104 - int pcmcia_socket_dev_suspend(struct device *dev, pm_message_t state) 104 + int pcmcia_socket_dev_suspend(struct device *dev) 105 105 { 106 106 struct pcmcia_socket *socket; 107 107
+1 -1
drivers/pcmcia/i82092.c
··· 42 42 #ifdef CONFIG_PM 43 43 static int i82092aa_socket_suspend (struct pci_dev *dev, pm_message_t state) 44 44 { 45 - return pcmcia_socket_dev_suspend(&dev->dev, state); 45 + return pcmcia_socket_dev_suspend(&dev->dev); 46 46 } 47 47 48 48 static int i82092aa_socket_resume (struct pci_dev *dev)
+1 -1
drivers/pcmcia/i82365.c
··· 1241 1241 static int i82365_drv_pcmcia_suspend(struct platform_device *dev, 1242 1242 pm_message_t state) 1243 1243 { 1244 - return pcmcia_socket_dev_suspend(&dev->dev, state); 1244 + return pcmcia_socket_dev_suspend(&dev->dev); 1245 1245 } 1246 1246 1247 1247 static int i82365_drv_pcmcia_resume(struct platform_device *dev)
+1 -1
drivers/pcmcia/m32r_cfc.c
··· 699 699 static int cfc_drv_pcmcia_suspend(struct platform_device *dev, 700 700 pm_message_t state) 701 701 { 702 - return pcmcia_socket_dev_suspend(&dev->dev, state); 702 + return pcmcia_socket_dev_suspend(&dev->dev); 703 703 } 704 704 705 705 static int cfc_drv_pcmcia_resume(struct platform_device *dev)
+1 -1
drivers/pcmcia/m32r_pcc.c
··· 675 675 static int pcc_drv_pcmcia_suspend(struct platform_device *dev, 676 676 pm_message_t state) 677 677 { 678 - return pcmcia_socket_dev_suspend(&dev->dev, state); 678 + return pcmcia_socket_dev_suspend(&dev->dev); 679 679 } 680 680 681 681 static int pcc_drv_pcmcia_resume(struct platform_device *dev)
+1 -1
drivers/pcmcia/m8xx_pcmcia.c
··· 1296 1296 #ifdef CONFIG_PM 1297 1297 static 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 1302 1302 static int m8xx_resume(struct platform_device *pdev)
+1 -1
drivers/pcmcia/omap_cf.c
··· 334 334 335 335 static int omap_cf_suspend(struct platform_device *pdev, pm_message_t mesg) 336 336 { 337 - return pcmcia_socket_dev_suspend(&pdev->dev, mesg); 337 + return pcmcia_socket_dev_suspend(&pdev->dev); 338 338 } 339 339 340 340 static int omap_cf_resume(struct platform_device *pdev)
+1 -1
drivers/pcmcia/pd6729.c
··· 758 758 #ifdef CONFIG_PM 759 759 static int pd6729_socket_suspend(struct pci_dev *dev, pm_message_t state) 760 760 { 761 - return pcmcia_socket_dev_suspend(&dev->dev, state); 761 + return pcmcia_socket_dev_suspend(&dev->dev); 762 762 } 763 763 764 764 static int pd6729_socket_resume(struct pci_dev *dev)
+1 -1
drivers/pcmcia/pxa2xx_base.c
··· 302 302 303 303 static int pxa2xx_drv_pcmcia_suspend(struct device *dev) 304 304 { 305 - return pcmcia_socket_dev_suspend(dev, PMSG_SUSPEND); 305 + return pcmcia_socket_dev_suspend(dev); 306 306 } 307 307 308 308 static int pxa2xx_drv_pcmcia_resume(struct device *dev)
+1 -1
drivers/pcmcia/sa1100_generic.c
··· 89 89 static int sa11x0_drv_pcmcia_suspend(struct platform_device *dev, 90 90 pm_message_t state) 91 91 { 92 - return pcmcia_socket_dev_suspend(&dev->dev, state); 92 + return pcmcia_socket_dev_suspend(&dev->dev); 93 93 } 94 94 95 95 static int sa11x0_drv_pcmcia_resume(struct platform_device *dev)
+1 -1
drivers/pcmcia/sa1111_generic.c
··· 159 159 160 160 static int pcmcia_suspend(struct sa1111_dev *dev, pm_message_t state) 161 161 { 162 - return pcmcia_socket_dev_suspend(&dev->dev, state); 162 + return pcmcia_socket_dev_suspend(&dev->dev); 163 163 } 164 164 165 165 static int pcmcia_resume(struct sa1111_dev *dev)
+1 -1
drivers/pcmcia/tcic.c
··· 366 366 static int tcic_drv_pcmcia_suspend(struct platform_device *dev, 367 367 pm_message_t state) 368 368 { 369 - return pcmcia_socket_dev_suspend(&dev->dev, state); 369 + return pcmcia_socket_dev_suspend(&dev->dev); 370 370 } 371 371 372 372 static int tcic_drv_pcmcia_resume(struct platform_device *dev)
+1 -1
drivers/pcmcia/vrc4171_card.c
··· 707 707 static int vrc4171_card_suspend(struct platform_device *dev, 708 708 pm_message_t state) 709 709 { 710 - return pcmcia_socket_dev_suspend(&dev->dev, state); 710 + return pcmcia_socket_dev_suspend(&dev->dev); 711 711 } 712 712 713 713 static int vrc4171_card_resume(struct platform_device *dev)
+1 -1
drivers/pcmcia/yenta_socket.c
··· 1230 1230 struct yenta_socket *socket = pci_get_drvdata(dev); 1231 1231 int ret; 1232 1232 1233 - ret = pcmcia_socket_dev_suspend(&dev->dev, state); 1233 + ret = pcmcia_socket_dev_suspend(&dev->dev); 1234 1234 1235 1235 if (socket) { 1236 1236 if (socket->type && socket->type->save_state)
+1 -1
include/pcmcia/ss.h
··· 279 279 extern struct pccard_resource_ops pccard_nonstatic_ops; 280 280 281 281 /* socket drivers are expected to use these callbacks in their .drv struct */ 282 - extern int pcmcia_socket_dev_suspend(struct device *dev, pm_message_t state); 282 + extern int pcmcia_socket_dev_suspend(struct device *dev); 283 283 extern int pcmcia_socket_dev_resume(struct device *dev); 284 284 285 285 /* socket drivers use this callback in their IRQ handler */