Skip to content

Commit

Permalink
pnp: add a shutdown method to pnp drivers
Browse files Browse the repository at this point in the history
The shutdown method is used by the winbond cir driver to setup the
hardware for wake-from-S5.

Signed-off-by: Bjorn Helgaas <[email protected]>
Signed-off-by: David Härdeman <[email protected]>
Cc: Dmitry Torokhov <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Alphix authored and torvalds committed Sep 22, 2009
1 parent a976f15 commit abd6633
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
10 changes: 10 additions & 0 deletions drivers/pnp/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,15 @@ static int pnp_device_remove(struct device *dev)
return 0;
}

static void pnp_device_shutdown(struct device *dev)
{
struct pnp_dev *pnp_dev = to_pnp_dev(dev);
struct pnp_driver *drv = pnp_dev->driver;

if (drv && drv->shutdown)
drv->shutdown(pnp_dev);
}

static int pnp_bus_match(struct device *dev, struct device_driver *drv)
{
struct pnp_dev *pnp_dev = to_pnp_dev(dev);
Expand Down Expand Up @@ -203,6 +212,7 @@ struct bus_type pnp_bus_type = {
.match = pnp_bus_match,
.probe = pnp_device_probe,
.remove = pnp_device_remove,
.shutdown = pnp_device_shutdown,
.suspend = pnp_bus_suspend,
.resume = pnp_bus_resume,
.dev_attrs = pnp_interface_attrs,
Expand Down
1 change: 1 addition & 0 deletions include/linux/pnp.h
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@ struct pnp_driver {
unsigned int flags;
int (*probe) (struct pnp_dev *dev, const struct pnp_device_id *dev_id);
void (*remove) (struct pnp_dev *dev);
void (*shutdown) (struct pnp_dev *dev);
int (*suspend) (struct pnp_dev *dev, pm_message_t state);
int (*resume) (struct pnp_dev *dev);
struct device_driver driver;
Expand Down

0 comments on commit abd6633

Please sign in to comment.