tunnels: fix netns vs proto registration ordering
[safe/jmp/linux-2.6] / drivers / pnp / driver.c
index d3ccce7..cd11b11 100644 (file)
@@ -2,10 +2,8 @@
  * driver.c - device id matching, driver model, etc.
  *
  * Copyright 2002 Adam Belay <ambx1@neo.rr.com>
- *
  */
 
-#include <linux/config.h>
 #include <linux/string.h>
 #include <linux/list.h>
 #include <linux/module.h>
 static int compare_func(const char *ida, const char *idb)
 {
        int i;
+
        /* we only need to compare the last 4 chars */
-       for (i=3; i<7; i++)
-       {
+       for (i = 3; i < 7; i++) {
                if (ida[i] != 'X' &&
-                   idb[i] != 'X' &&
-                   toupper(ida[i]) != toupper(idb[i]))
+                   idb[i] != 'X' && toupper(ida[i]) != toupper(idb[i]))
                        return 0;
        }
        return 1;
@@ -32,20 +29,22 @@ int compare_pnp_id(struct pnp_id *pos, const char *id)
 {
        if (!pos || !id || (strlen(id) != 7))
                return 0;
-       if (memcmp(id,"ANYDEVS",7)==0)
+       if (memcmp(id, "ANYDEVS", 7) == 0)
                return 1;
-       while (pos){
-               if (memcmp(pos->id,id,3)==0)
-                       if (compare_func(pos->id,id)==1)
+       while (pos) {
+               if (memcmp(pos->id, id, 3) == 0)
+                       if (compare_func(pos->id, id) == 1)
                                return 1;
                pos = pos->next;
        }
        return 0;
 }
 
-static const struct pnp_device_id * match_device(struct pnp_driver *drv, struct pnp_dev *dev)
+static const struct pnp_device_id *match_device(struct pnp_driver *drv,
+                                               struct pnp_dev *dev)
 {
        const struct pnp_device_id *drv_id = drv->id_table;
+
        if (!drv_id)
                return NULL;
 
@@ -60,7 +59,7 @@ static const struct pnp_device_id * match_device(struct pnp_driver *drv, struct
 int pnp_device_attach(struct pnp_dev *pnp_dev)
 {
        spin_lock(&pnp_lock);
-       if(pnp_dev->status != PNP_READY){
+       if (pnp_dev->status != PNP_READY) {
                spin_unlock(&pnp_lock);
                return -EBUSY;
        }
@@ -87,8 +86,6 @@ static int pnp_device_probe(struct device *dev)
        pnp_dev = to_pnp_dev(dev);
        pnp_drv = to_pnp_driver(dev->driver);
 
-       pnp_dbg("match found with the PnP device '%s' and the driver '%s'", dev->bus_id,pnp_drv->name);
-
        error = pnp_device_attach(pnp_dev);
        if (error < 0)
                return error;
@@ -100,7 +97,7 @@ static int pnp_device_probe(struct device *dev)
                                return error;
                }
        } else if ((pnp_drv->flags & PNP_DRIVER_RES_DISABLE)
-                   == PNP_DRIVER_RES_DISABLE) {
+                  == PNP_DRIVER_RES_DISABLE) {
                error = pnp_disable_dev(pnp_dev);
                if (error < 0)
                        return error;
@@ -111,11 +108,12 @@ static int pnp_device_probe(struct device *dev)
                if (dev_id != NULL)
                        error = pnp_drv->probe(pnp_dev, dev_id);
        }
-       if (error >= 0){
+       if (error >= 0) {
                pnp_dev->driver = pnp_drv;
                error = 0;
        } else
                goto fail;
+
        return error;
 
 fail:
@@ -125,8 +123,8 @@ fail:
 
 static int pnp_device_remove(struct device *dev)
 {
-       struct pnp_dev * pnp_dev = to_pnp_dev(dev);
-       struct pnp_driver * drv = pnp_dev->driver;
+       struct pnp_dev *pnp_dev = to_pnp_dev(dev);
+       struct pnp_driver *drv = pnp_dev->driver;
 
        if (drv) {
                if (drv->remove)
@@ -137,85 +135,137 @@ 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);
-       struct pnp_driver * pnp_drv = to_pnp_driver(drv);
+       struct pnp_dev *pnp_dev = to_pnp_dev(dev);
+       struct pnp_driver *pnp_drv = to_pnp_driver(drv);
+
        if (match_device(pnp_drv, pnp_dev) == NULL)
                return 0;
        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;
 
-struct bus_type pnp_bus_type = {
-       .name   = "pnp",
-       .match  = pnp_bus_match,
-};
+       if (!pnp_drv)
+               return 0;
 
+       if (pnp_drv->suspend) {
+               error = pnp_drv->suspend(pnp_dev, state);
+               if (error)
+                       return error;
+       }
 
-static int count_devices(struct device * dev, void * c)
-{
-       int * count = c;
-       (*count)++;
+       if (pnp_can_disable(pnp_dev)) {
+               error = pnp_stop_dev(pnp_dev);
+               if (error)
+                       return error;
+       }
+
+       if (pnp_dev->protocol->suspend)
+               pnp_dev->protocol->suspend(pnp_dev, state);
        return 0;
 }
 
-int pnp_register_driver(struct pnp_driver *drv)
+static int pnp_bus_resume(struct device *dev)
 {
-       int count;
+       struct pnp_dev *pnp_dev = to_pnp_dev(dev);
+       struct pnp_driver *pnp_drv = pnp_dev->driver;
+       int error;
 
-       pnp_dbg("the driver '%s' has been registered", drv->name);
+       if (!pnp_drv)
+               return 0;
 
-       drv->driver.name = drv->name;
-       drv->driver.bus = &pnp_bus_type;
-       drv->driver.probe = pnp_device_probe;
-       drv->driver.remove = pnp_device_remove;
+       if (pnp_dev->protocol->resume)
+               pnp_dev->protocol->resume(pnp_dev);
 
-       count = driver_register(&drv->driver);
+       if (pnp_can_write(pnp_dev)) {
+               error = pnp_start_dev(pnp_dev);
+               if (error)
+                       return error;
+       }
 
-       /* get the number of initial matches */
-       if (count >= 0){
-               count = 0;
-               driver_for_each_device(&drv->driver, NULL, &count, count_devices);
+       if (pnp_drv->resume) {
+               error = pnp_drv->resume(pnp_dev);
+               if (error)
+                       return error;
        }
-       return count;
+
+       return 0;
+}
+
+struct bus_type pnp_bus_type = {
+       .name    = "pnp",
+       .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,
+};
+
+int pnp_register_driver(struct pnp_driver *drv)
+{
+       drv->driver.name = drv->name;
+       drv->driver.bus = &pnp_bus_type;
+
+       return driver_register(&drv->driver);
 }
 
 void pnp_unregister_driver(struct pnp_driver *drv)
 {
        driver_unregister(&drv->driver);
-       pnp_dbg("the driver '%s' has been unregistered", drv->name);
 }
 
 /**
  * pnp_add_id - adds an EISA id to the specified device
- * @id: pointer to a pnp_id structure
  * @dev: pointer to the desired device
- *
+ * @id: pointer to an EISA id string
  */
-
-int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev)
+struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id)
 {
-       struct pnp_id *ptr;
-       if (!id)
-               return -EINVAL;
-       if (!dev)
-               return -EINVAL;
-       id->next = NULL;
+       struct pnp_id *dev_id, *ptr;
+
+       dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
+       if (!dev_id)
+               return NULL;
+
+       dev_id->id[0] = id[0];
+       dev_id->id[1] = id[1];
+       dev_id->id[2] = id[2];
+       dev_id->id[3] = tolower(id[3]);
+       dev_id->id[4] = tolower(id[4]);
+       dev_id->id[5] = tolower(id[5]);
+       dev_id->id[6] = tolower(id[6]);
+       dev_id->id[7] = '\0';
+
+       dev_id->next = NULL;
        ptr = dev->id;
        while (ptr && ptr->next)
                ptr = ptr->next;
        if (ptr)
-               ptr->next = id;
+               ptr->next = dev_id;
        else
-               dev->id = id;
-       return 0;
+               dev->id = dev_id;
+
+       return dev_id;
 }
 
 EXPORT_SYMBOL(pnp_register_driver);
 EXPORT_SYMBOL(pnp_unregister_driver);
-#if 0
-EXPORT_SYMBOL(pnp_add_id);
-#endif
 EXPORT_SYMBOL(pnp_device_attach);
 EXPORT_SYMBOL(pnp_device_detach);