adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()

Browse source 
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
This commit is contained in:
Rafael J. Wysocki 2009-09-29 00:10:41 +02:00
parent 17d857be64
commit 827b4649d4
18 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/pcmcia/at91_cf.c
View file

@ -363,7 +363,7 @@ static int at91_cf_suspend(struct platform_device *pdev, pm_message_t mesg)
struct at91_cf_socket *cf = platform_get_drvdata(pdev); struct at91_cf_socket *cf = platform_get_drvdata(pdev);
struct at91_cf_data *board = cf->board; struct at91_cf_data *board = cf->board;
pcmcia_socket_dev_suspend(&pdev->dev, mesg); pcmcia_socket_dev_suspend(&pdev->dev);
if (device_may_wakeup(&pdev->dev)) { if (device_may_wakeup(&pdev->dev)) {
enable_irq_wake(board->det_pin); enable_irq_wake(board->det_pin);
if (board->irq_pin) if (board->irq_pin)

2
drivers/pcmcia/au1000_generic.c
View file

@ -515,7 +515,7 @@ static int au1x00_drv_pcmcia_probe(struct platform_device *dev)
static int au1x00_drv_pcmcia_suspend(struct platform_device *dev, static int au1x00_drv_pcmcia_suspend(struct platform_device *dev,
pm_message_t state) pm_message_t state)
{ {
return pcmcia_socket_dev_suspend(&dev->dev, state); return pcmcia_socket_dev_suspend(&dev->dev);
} }
static int au1x00_drv_pcmcia_resume(struct platform_device *dev) static int au1x00_drv_pcmcia_resume(struct platform_device *dev)

2
drivers/pcmcia/bfin_cf_pcmcia.c
View file

@ -302,7 +302,7 @@ static int __devexit bfin_cf_remove(struct platform_device *pdev)
static int bfin_cf_suspend(struct platform_device *pdev, pm_message_t mesg) static int bfin_cf_suspend(struct platform_device *pdev, pm_message_t mesg)
{ {
return pcmcia_socket_dev_suspend(&pdev->dev, mesg); return pcmcia_socket_dev_suspend(&pdev->dev);
} }
static int bfin_cf_resume(struct platform_device *pdev) static int bfin_cf_resume(struct platform_device *pdev)

2
drivers/pcmcia/cs.c
View file

@ -101,7 +101,7 @@ EXPORT_SYMBOL(pcmcia_socket_list_rwsem);
static int socket_resume(struct pcmcia_socket *skt); static int socket_resume(struct pcmcia_socket *skt);
static int socket_suspend(struct pcmcia_socket *skt); static int socket_suspend(struct pcmcia_socket *skt);
int pcmcia_socket_dev_suspend(struct device *dev, pm_message_t state) int pcmcia_socket_dev_suspend(struct device *dev)
{ {
struct pcmcia_socket *socket; struct pcmcia_socket *socket;

2
drivers/pcmcia/i82092.c
View file

@ -42,7 +42,7 @@ MODULE_DEVICE_TABLE(pci, i82092aa_pci_ids);
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int i82092aa_socket_suspend (struct pci_dev *dev, pm_message_t state) static int i82092aa_socket_suspend (struct pci_dev *dev, pm_message_t state)
{ {
return pcmcia_socket_dev_suspend(&dev->dev, state); return pcmcia_socket_dev_suspend(&dev->dev);
} }
static int i82092aa_socket_resume (struct pci_dev *dev) static int i82092aa_socket_resume (struct pci_dev *dev)

2
drivers/pcmcia/i82365.c
View file

@ -1241,7 +1241,7 @@ static int pcic_init(struct pcmcia_socket *s)
static int i82365_drv_pcmcia_suspend(struct platform_device *dev, static int i82365_drv_pcmcia_suspend(struct platform_device *dev,
pm_message_t state) pm_message_t state)
{ {
return pcmcia_socket_dev_suspend(&dev->dev, state); return pcmcia_socket_dev_suspend(&dev->dev);
} }
static int i82365_drv_pcmcia_resume(struct platform_device *dev) static int i82365_drv_pcmcia_resume(struct platform_device *dev)

2
drivers/pcmcia/m32r_cfc.c
View file

@ -699,7 +699,7 @@ static struct pccard_operations pcc_operations = {
static int cfc_drv_pcmcia_suspend(struct platform_device *dev, static int cfc_drv_pcmcia_suspend(struct platform_device *dev,
pm_message_t state) pm_message_t state)
{ {
return pcmcia_socket_dev_suspend(&dev->dev, state); return pcmcia_socket_dev_suspend(&dev->dev);
} }
static int cfc_drv_pcmcia_resume(struct platform_device *dev) static int cfc_drv_pcmcia_resume(struct platform_device *dev)

2
drivers/pcmcia/m32r_pcc.c
View file

@ -675,7 +675,7 @@ static struct pccard_operations pcc_operations = {
static int pcc_drv_pcmcia_suspend(struct platform_device *dev, static int pcc_drv_pcmcia_suspend(struct platform_device *dev,
pm_message_t state) pm_message_t state)
{ {
return pcmcia_socket_dev_suspend(&dev->dev, state); return pcmcia_socket_dev_suspend(&dev->dev);
} }
static int pcc_drv_pcmcia_resume(struct platform_device *dev) static int pcc_drv_pcmcia_resume(struct platform_device *dev)

2
drivers/pcmcia/m8xx_pcmcia.c
View file

@ -1296,7 +1296,7 @@ static int m8xx_remove(struct of_device *ofdev)
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int m8xx_suspend(struct platform_device *pdev, pm_message_t state) static int m8xx_suspend(struct platform_device *pdev, pm_message_t state)
{ {
return pcmcia_socket_dev_suspend(&pdev->dev, state); return pcmcia_socket_dev_suspend(&pdev->dev);
} }
static int m8xx_resume(struct platform_device *pdev) static int m8xx_resume(struct platform_device *pdev)

2
drivers/pcmcia/omap_cf.c
View file

@ -334,7 +334,7 @@ static int __exit omap_cf_remove(struct platform_device *pdev)
static int omap_cf_suspend(struct platform_device *pdev, pm_message_t mesg) static int omap_cf_suspend(struct platform_device *pdev, pm_message_t mesg)
{ {
return pcmcia_socket_dev_suspend(&pdev->dev, mesg); return pcmcia_socket_dev_suspend(&pdev->dev);
} }
static int omap_cf_resume(struct platform_device *pdev) static int omap_cf_resume(struct platform_device *pdev)

2
drivers/pcmcia/pd6729.c
View file

@ -758,7 +758,7 @@ static void __devexit pd6729_pci_remove(struct pci_dev *dev)
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int pd6729_socket_suspend(struct pci_dev *dev, pm_message_t state) static int pd6729_socket_suspend(struct pci_dev *dev, pm_message_t state)
{ {
return pcmcia_socket_dev_suspend(&dev->dev, state); return pcmcia_socket_dev_suspend(&dev->dev);
} }
static int pd6729_socket_resume(struct pci_dev *dev) static int pd6729_socket_resume(struct pci_dev *dev)

2
drivers/pcmcia/pxa2xx_base.c
View file

@ -302,7 +302,7 @@ static int pxa2xx_drv_pcmcia_remove(struct platform_device *dev)
static int pxa2xx_drv_pcmcia_suspend(struct device *dev) static int pxa2xx_drv_pcmcia_suspend(struct device *dev)
{ {
return pcmcia_socket_dev_suspend(dev, PMSG_SUSPEND); return pcmcia_socket_dev_suspend(dev);
} }
static int pxa2xx_drv_pcmcia_resume(struct device *dev) static int pxa2xx_drv_pcmcia_resume(struct device *dev)

2
drivers/pcmcia/sa1100_generic.c
View file

@ -89,7 +89,7 @@ static int sa11x0_drv_pcmcia_remove(struct platform_device *dev)
static int sa11x0_drv_pcmcia_suspend(struct platform_device *dev, static int sa11x0_drv_pcmcia_suspend(struct platform_device *dev,
pm_message_t state) pm_message_t state)
{ {
return pcmcia_socket_dev_suspend(&dev->dev, state); return pcmcia_socket_dev_suspend(&dev->dev);
} }
static int sa11x0_drv_pcmcia_resume(struct platform_device *dev) static int sa11x0_drv_pcmcia_resume(struct platform_device *dev)

2
drivers/pcmcia/sa1111_generic.c
View file

@ -159,7 +159,7 @@ static int __devexit pcmcia_remove(struct sa1111_dev *dev)
static int pcmcia_suspend(struct sa1111_dev *dev, pm_message_t state) static int pcmcia_suspend(struct sa1111_dev *dev, pm_message_t state)
{ {
return pcmcia_socket_dev_suspend(&dev->dev, state); return pcmcia_socket_dev_suspend(&dev->dev);
} }
static int pcmcia_resume(struct sa1111_dev *dev) static int pcmcia_resume(struct sa1111_dev *dev)

2
drivers/pcmcia/tcic.c
View file

@ -366,7 +366,7 @@ static int __init get_tcic_id(void)
static int tcic_drv_pcmcia_suspend(struct platform_device *dev, static int tcic_drv_pcmcia_suspend(struct platform_device *dev,
pm_message_t state) pm_message_t state)
{ {
return pcmcia_socket_dev_suspend(&dev->dev, state); return pcmcia_socket_dev_suspend(&dev->dev);
} }
static int tcic_drv_pcmcia_resume(struct platform_device *dev) static int tcic_drv_pcmcia_resume(struct platform_device *dev)

2
drivers/pcmcia/vrc4171_card.c
View file

@ -707,7 +707,7 @@ __setup("vrc4171_card=", vrc4171_card_setup);
static int vrc4171_card_suspend(struct platform_device *dev, static int vrc4171_card_suspend(struct platform_device *dev,
pm_message_t state) pm_message_t state)
{ {
return pcmcia_socket_dev_suspend(&dev->dev, state); return pcmcia_socket_dev_suspend(&dev->dev);
} }
static int vrc4171_card_resume(struct platform_device *dev) static int vrc4171_card_resume(struct platform_device *dev)

2
drivers/pcmcia/yenta_socket.c
View file

@ -1230,7 +1230,7 @@ static int yenta_dev_suspend (struct pci_dev *dev, pm_message_t state)
struct yenta_socket *socket = pci_get_drvdata(dev); struct yenta_socket *socket = pci_get_drvdata(dev);
int ret; int ret;
ret = pcmcia_socket_dev_suspend(&dev->dev, state); ret = pcmcia_socket_dev_suspend(&dev->dev);
if (socket) { if (socket) {
if (socket->type && socket->type->save_state) if (socket->type && socket->type->save_state)

2
include/pcmcia/ss.h
View file

@ -279,7 +279,7 @@ extern struct pccard_resource_ops pccard_iodyn_ops;
extern struct pccard_resource_ops pccard_nonstatic_ops; extern struct pccard_resource_ops pccard_nonstatic_ops;
/* socket drivers are expected to use these callbacks in their .drv struct */ /* socket drivers are expected to use these callbacks in their .drv struct */
extern int pcmcia_socket_dev_suspend(struct device *dev, pm_message_t state); extern int pcmcia_socket_dev_suspend(struct device *dev);
extern int pcmcia_socket_dev_resume(struct device *dev); extern int pcmcia_socket_dev_resume(struct device *dev);
/* socket drivers use this callback in their IRQ handler */ /* socket drivers use this callback in their IRQ handler */