Skip to content

Commit

Permalink
[ARM] 3066/1: Fix PXA irda driver suspend/resume functions
Browse files Browse the repository at this point in the history
Patch from Richard Purdie

Update the PXA irda driver to match the recent platform device
suspend/resume level changes.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Richard Purdie authored and Russell King committed Oct 30, 2005
1 parent 9f75e1e commit 91e1a51
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions drivers/net/irda/pxaficp_ir.c
Original file line number Diff line number Diff line change
Expand Up @@ -704,15 +704,12 @@ static int pxa_irda_stop(struct net_device *dev)
return 0;
}

static int pxa_irda_suspend(struct device *_dev, pm_message_t state, u32 level)
static int pxa_irda_suspend(struct device *_dev, pm_message_t state)
{
struct net_device *dev = dev_get_drvdata(_dev);
struct pxa_irda *si;

if (!dev || level != SUSPEND_DISABLE)
return 0;

if (netif_running(dev)) {
if (dev && netif_running(dev)) {
si = netdev_priv(dev);
netif_device_detach(dev);
pxa_irda_shutdown(si);
Expand All @@ -721,15 +718,12 @@ static int pxa_irda_suspend(struct device *_dev, pm_message_t state, u32 level)
return 0;
}

static int pxa_irda_resume(struct device *_dev, u32 level)
static int pxa_irda_resume(struct device *_dev)
{
struct net_device *dev = dev_get_drvdata(_dev);
struct pxa_irda *si;

if (!dev || level != RESUME_ENABLE)
return 0;

if (netif_running(dev)) {
if (dev && netif_running(dev)) {
si = netdev_priv(dev);
pxa_irda_startup(si);
netif_device_attach(dev);
Expand Down

0 comments on commit 91e1a51

Please sign in to comment.