PNP: change pnp_add_id() to allocate its own pnp_id structures

This moves some of the pnp_id knowledge out of the backends and into
the PNP core.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-By: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 21 insertions, 7 deletions

diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index e85cbf116db1..d3f869ee1d92 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -226,22 +226,36 @@ void pnp_unregister_driver(struct pnp_driver *drv)
 
 /**
  * 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;
+        struct pnp_id *dev_id, *ptr;
 
-        id->next = NULL;
+        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);