Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa

3 files changed, 131 insertions, 19 deletions

diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index bd7c966ea2d7..0ecbe4edbec1 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -69,6 +69,7 @@ static int card_probe(struct pnp_card * card, struct pnp_card_driver * drv)
                         return 0;
                 clink->card = card;
                 clink->driver = drv;
+                clink->pm_state = PMSG_ON;
                 if (drv->probe) {
                         if (drv->probe(clink, id)>=0)
                                 return 1;
@@ -333,6 +334,28 @@ void pnp_release_card_device(struct pnp_dev * dev)
         up_write(&dev->dev.bus->subsys.rwsem);
 }
 
+/*
+ * suspend/resume callbacks
+ */
+static int card_suspend(struct pnp_dev *dev, pm_message_t state)
+{
+        struct pnp_card_link *link = dev->card_link;
+        if (link->pm_state.event == state.event)
+                return 0;
+        link->pm_state = state;
+        return link->driver->suspend(link, state);
+}
+
+static int card_resume(struct pnp_dev *dev)
+{
+        struct pnp_card_link *link = dev->card_link;
+        if (link->pm_state.event == PM_EVENT_ON)
+                return 0;
+        link->pm_state = PMSG_ON;
+        link->driver->resume(link);
+        return 0;
+}
+
 /**
  * pnp_register_card_driver - registers a PnP card driver with the PnP Layer
  * @drv: pointer to the driver to register
@@ -348,6 +371,8 @@ int pnp_register_card_driver(struct pnp_card_driver * drv)
         drv->link.flags = drv->flags;
         drv->link.probe = NULL;
         drv->link.remove = &card_remove_first;
+        drv->link.suspend = drv->suspend ? card_suspend : NULL;
+        drv->link.resume = drv->resume ? card_resume : NULL;
 
         spin_lock(&pnp_lock);
         list_add_tail(&drv->global_list, &pnp_card_drivers);
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index d3ccce706ab4..15fb758a9e52 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -146,10 +146,57 @@ static int pnp_bus_match(struct device *dev, struct device_driver *drv)
         return 1;
 }
 
+static int pnp_bus_suspend(struct device *dev, pm_message_t state)
+{
+        struct pnp_dev * pnp_dev = to_pnp_dev(dev);
+        struct pnp_driver * pnp_drv = pnp_dev->driver;
+        int error;
+
+        if (!pnp_drv)
+                return 0;
+
+        if (pnp_drv->suspend) {
+                error = pnp_drv->suspend(pnp_dev, state);
+                if (error)
+                        return error;
+        }
+
+        if (!(pnp_drv->flags & PNP_DRIVER_RES_DO_NOT_CHANGE) &&
+            pnp_can_disable(pnp_dev)) {
+                error = pnp_stop_dev(pnp_dev);
+                if (error)
+                        return error;
+        }
+
+        return 0;
+}
+
+static int pnp_bus_resume(struct device *dev)
+{
+        struct pnp_dev * pnp_dev = to_pnp_dev(dev);
+        struct pnp_driver * pnp_drv = pnp_dev->driver;
+        int error;
+
+        if (!pnp_drv)
+                return 0;
+
+        if (!(pnp_drv->flags & PNP_DRIVER_RES_DO_NOT_CHANGE)) {
+                error = pnp_start_dev(pnp_dev);
+                if (error)
+                        return error;
+        }
+
+        if (pnp_drv->resume)
+                return pnp_drv->resume(pnp_dev);
+
+        return 0;
+}
 
 struct bus_type pnp_bus_type = {
         .name   = "pnp",
         .match  = pnp_bus_match,
+        .suspend = pnp_bus_suspend,
+        .resume = pnp_bus_resume,
 };
 
 
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 261668618b2d..c4256aa32bcb 100644
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -470,6 +470,53 @@ int pnp_auto_config_dev(struct pnp_dev *dev)
 }
 
 /**
+ * pnp_start_dev - low-level start of the PnP device
+ * @dev: pointer to the desired device
+ *
+ * assumes that resources have alread been allocated
+ */
+
+int pnp_start_dev(struct pnp_dev *dev)
+{
+        if (!pnp_can_write(dev)) {
+                pnp_info("Device %s does not supported activation.", dev->dev.bus_id);
+                return -EINVAL;
+        }
+
+        if (dev->protocol->set(dev, &dev->res)<0) {
+                pnp_err("Failed to activate device %s.", dev->dev.bus_id);
+                return -EIO;
+        }
+
+        pnp_info("Device %s activated.", dev->dev.bus_id);
+
+        return 0;
+}
+
+/**
+ * pnp_stop_dev - low-level disable of the PnP device
+ * @dev: pointer to the desired device
+ *
+ * does not free resources
+ */
+
+int pnp_stop_dev(struct pnp_dev *dev)
+{
+        if (!pnp_can_disable(dev)) {
+                pnp_info("Device %s does not supported disabling.", dev->dev.bus_id);
+                return -EINVAL;
+        }
+        if (dev->protocol->disable(dev)<0) {
+                pnp_err("Failed to disable device %s.", dev->dev.bus_id);
+                return -EIO;
+        }
+
+        pnp_info("Device %s disabled.", dev->dev.bus_id);
+
+        return 0;
+}
+
+/**
  * pnp_activate_dev - activates a PnP device for use
  * @dev: pointer to the desired device
  *
@@ -477,6 +524,8 @@ int pnp_auto_config_dev(struct pnp_dev *dev)
  */
 int pnp_activate_dev(struct pnp_dev *dev)
 {
+        int error;
+
         if (!dev)
                 return -EINVAL;
         if (dev->active) {
@@ -487,18 +536,11 @@ int pnp_activate_dev(struct pnp_dev *dev)
         if (pnp_auto_config_dev(dev))
                 return -EBUSY;
 
-        if (!pnp_can_write(dev)) {
-                pnp_info("Device %s does not supported activation.", dev->dev.bus_id);
-                return -EINVAL;
-        }
-
-        if (dev->protocol->set(dev, &dev->res)<0) {
-                pnp_err("Failed to activate device %s.", dev->dev.bus_id);
-                return -EIO;
-        }
+        error = pnp_start_dev(dev);
+        if (error)
+                return error;
 
         dev->active = 1;
-        pnp_info("Device %s activated.", dev->dev.bus_id);
 
         return 1;
 }
@@ -511,23 +553,19 @@ int pnp_activate_dev(struct pnp_dev *dev)
  */
 int pnp_disable_dev(struct pnp_dev *dev)
 {
+        int error;
+
         if (!dev)
                 return -EINVAL;
         if (!dev->active) {
                 return 0; /* the device is already disabled */
         }
 
-        if (!pnp_can_disable(dev)) {
-                pnp_info("Device %s does not supported disabling.", dev->dev.bus_id);
-                return -EINVAL;
-        }
-        if (dev->protocol->disable(dev)<0) {
-                pnp_err("Failed to disable device %s.", dev->dev.bus_id);
-                return -EIO;
-        }
+        error = pnp_stop_dev(dev);
+        if (error)
+                return error;
 
         dev->active = 0;
-        pnp_info("Device %s disabled.", dev->dev.bus_id);
 
         /* release the resources so that other devices can use them */
         down(&pnp_res_mutex);
@@ -558,6 +596,8 @@ EXPORT_SYMBOL(pnp_manual_config_dev);
 #if 0
 EXPORT_SYMBOL(pnp_auto_config_dev);
 #endif
+EXPORT_SYMBOL(pnp_start_dev);
+EXPORT_SYMBOL(pnp_stop_dev);
 EXPORT_SYMBOL(pnp_activate_dev);
 EXPORT_SYMBOL(pnp_disable_dev);
 EXPORT_SYMBOL(pnp_resource_change);