[ALSA] [PATCH] alsa: Improved PnP suspend support

Also use the PnP functions to start/stop the devices during the suspend so
that drivers will not have to duplicate this code.

Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Jaroslav Kysela <perex@suse.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index ea2cb9a8b21d7f40c5dbdeb5d77f19ae52ef1178..15fb758a9e526e0428fe88fe1ceb8e03d067906f 100644 (file)
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -150,19 +150,46 @@ 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;
+       }
 
-       if (pnp_drv && pnp_drv->suspend)
-               return pnp_drv->suspend(pnp_dev, state);
        return 0;
 }
 
-static void pnp_bus_resume(struct device *dev)
+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 && pnp_drv->resume)
-               pnp_drv->resume(pnp_dev);
+       if (pnp_drv->resume)
+               return pnp_drv->resume(pnp_dev);
+
+       return 0;
 }
 
 struct bus_type pnp_bus_type = {

diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 261668618b2d481d8bd5074e8297e0f9374f145b..c4256aa32bcb0cc296624301cc8087aabfdac350 100644 (file)
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -469,6 +469,53 @@ int pnp_auto_config_dev(struct pnp_dev *dev)
        return -EBUSY;
 }
 
+/**
+ * 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);

diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index 472319fcf631ba9f0b9b38ff3b6e3885b5b362e4..93b0959eb40f466ba0e1834da22c558b090a937e 100644 (file)
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -385,6 +385,8 @@ void pnp_init_resource_table(struct pnp_resource_table *table);
 int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table *res, int mode);
 int pnp_auto_config_dev(struct pnp_dev *dev);
 int pnp_validate_config(struct pnp_dev *dev);
+int pnp_start_dev(struct pnp_dev *dev);
+int pnp_stop_dev(struct pnp_dev *dev);
 int pnp_activate_dev(struct pnp_dev *dev);
 int pnp_disable_dev(struct pnp_dev *dev);
 void pnp_resource_change(struct resource *resource, unsigned long start, unsigned long size);
@@ -428,6 +430,8 @@ static inline void pnp_init_resource_table(struct pnp_resource_table *table) { }
 static inline int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table *res, int mode) { return -ENODEV; }
 static inline int pnp_auto_config_dev(struct pnp_dev *dev) { return -ENODEV; }
 static inline int pnp_validate_config(struct pnp_dev *dev) { return -ENODEV; }
+static inline int pnp_start_dev(struct pnp_dev *dev) { return -ENODEV; }
+static inline int pnp_stop_dev(struct pnp_dev *dev) { return -ENODEV; }
 static inline int pnp_activate_dev(struct pnp_dev *dev) { return -ENODEV; }
 static inline int pnp_disable_dev(struct pnp_dev *dev) { return -ENODEV; }
 static inline void pnp_resource_change(struct resource *resource, unsigned long start, unsigned long size) { }