Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 827b4649 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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: default avatarRafael J. Wysocki <rjw@sisk.pl>
Cc: stable@kernel.org
parent 17d857be

drivers/pcmcia/at91_cf.c

+1 −1
Original line number Diff line number Diff line
@@ -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_data	*board = cf->board;



	pcmcia_socket_dev_suspend(&pdev->dev, mesg);

	pcmcia_socket_dev_suspend(&pdev->dev);

	if (device_may_wakeup(&pdev->dev)) {

		enable_irq_wake(board->det_pin);

		if (board->irq_pin)

drivers/pcmcia/au1000_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ static int au1x00_drv_pcmcia_probe(struct platform_device *dev) 
static int au1x00_drv_pcmcia_suspend(struct platform_device *dev,

				     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)

drivers/pcmcia/bfin_cf_pcmcia.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

	return pcmcia_socket_dev_suspend(&pdev->dev, mesg);

	return pcmcia_socket_dev_suspend(&pdev->dev);

}



static int bfin_cf_resume(struct platform_device *pdev)

drivers/pcmcia/cs.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ EXPORT_SYMBOL(pcmcia_socket_list_rwsem); 
static int socket_resume(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;

drivers/pcmcia/i82092.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ MODULE_DEVICE_TABLE(pci, i82092aa_pci_ids); 
#ifdef CONFIG_PM

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)