Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (61 commits)
  Dynamic debug: fix pr_fmt() build error
  Dynamic debug: allow simple quoting of words
  dynamic debug: update docs
  dynamic debug: combine dprintk and dynamic printk
  sysfs: fix some bin_vm_ops errors
  kobject: don't block for each kobject_uevent
  sysfs: only allow one scheduled removal callback per kobj
  Driver core: Fix device_move() vs. dpm list ordering, v2
  Driver core: some cleanup on drivers/base/sys.c
  Driver core: implement uevent suppress in kobject
  vcs: hook sysfs devices into object lifetime instead of "binding"
  driver core: fix passing platform_data
  driver core: move platform_data into platform_device
  sysfs: don't block indefinitely for unmapped files.
  driver core: move knode_bus into private structure
  driver core: move knode_driver into private structure
  driver core: move klist_children into private structure
  driver core: create a private portion of struct device
  driver core: remove polling for driver_probe_done(v5)
  sysfs: reference sysfs_dirent from sysfs inodes
  ...

Fixed conflicts in drivers/sh/maple/maple.c manually

1 files changed, 47 insertions, 13 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 349a1013603f..d2198f64ad4e 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -217,6 +217,7 @@ int platform_device_add_data(struct platform_device *pdev, const void *data,
         if (d) {
                 memcpy(d, data, size);
                 pdev->dev.platform_data = d;
+                pdev->platform_data = d;
         }
         return d ? 0 : -ENOMEM;
 }
@@ -246,6 +247,21 @@ int platform_device_add(struct platform_device *pdev)
         else
                 dev_set_name(&pdev->dev, pdev->name);
 
+        /* We will remove platform_data field from struct device
+        * if all platform devices pass its platform specific data
+        * from platform_device. The conversion is going to be a
+        * long time, so we allow the two cases coexist to make
+        * this kind of fix more easily*/
+        if (pdev->platform_data && pdev->dev.platform_data) {
+                printk(KERN_ERR
+                               "%s: use which platform_data?\n",
+                               dev_name(&pdev->dev));
+        } else if (pdev->platform_data) {
+                pdev->dev.platform_data = pdev->platform_data;
+        } else if (pdev->dev.platform_data) {
+                pdev->platform_data = pdev->dev.platform_data;
+        }
+
         for (i = 0; i < pdev->num_resources; i++) {
                 struct resource *p, *r = &pdev->resource[i];
 
@@ -584,10 +600,25 @@ static int platform_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
         struct platform_device  *pdev = to_platform_device(dev);
 
-        add_uevent_var(env, "MODALIAS=platform:%s", pdev->name);
+        add_uevent_var(env, "MODALIAS=%s%s", PLATFORM_MODULE_PREFIX,
+                (pdev->id_entry) ? pdev->id_entry->name : pdev->name);
         return 0;
 }
 
+static const struct platform_device_id *platform_match_id(
+                        struct platform_device_id *id,
+                        struct platform_device *pdev)
+{
+        while (id->name[0]) {
+                if (strcmp(pdev->name, id->name) == 0) {
+                        pdev->id_entry = id;
+                        return id;
+                }
+                id++;
+        }
+        return NULL;
+}
+
 /**
  * platform_match - bind platform device to platform driver.
  * @dev: device.
@@ -603,9 +634,14 @@ static int platform_uevent(struct device *dev, struct kobj_uevent_env *env)
  */
 static int platform_match(struct device *dev, struct device_driver *drv)
 {
-        struct platform_device *pdev;
+        struct platform_device *pdev = to_platform_device(dev);
+        struct platform_driver *pdrv = to_platform_driver(drv);
 
-        pdev = container_of(dev, struct platform_device, dev);
+        /* match against the id table first */
+        if (pdrv->id_table)
+                return platform_match_id(pdrv->id_table, pdev) != NULL;
+
+        /* fall-back to driver name match */
         return (strcmp(pdev->name, drv->name) == 0);
 }
 
@@ -623,26 +659,24 @@ static int platform_legacy_suspend(struct device *dev, pm_message_t mesg)
 
 static int platform_legacy_suspend_late(struct device *dev, pm_message_t mesg)
 {
-        struct platform_driver *drv = to_platform_driver(dev->driver);
-        struct platform_device *pdev;
+        struct platform_driver *pdrv = to_platform_driver(dev->driver);
+        struct platform_device *pdev = to_platform_device(dev);
         int ret = 0;
 
-        pdev = container_of(dev, struct platform_device, dev);
-        if (dev->driver && drv->suspend_late)
-                ret = drv->suspend_late(pdev, mesg);
+        if (dev->driver && pdrv->suspend_late)
+                ret = pdrv->suspend_late(pdev, mesg);
 
         return ret;
 }
 
 static int platform_legacy_resume_early(struct device *dev)
 {
-        struct platform_driver *drv = to_platform_driver(dev->driver);
-        struct platform_device *pdev;
+        struct platform_driver *pdrv = to_platform_driver(dev->driver);
+        struct platform_device *pdev = to_platform_device(dev);
         int ret = 0;
 
-        pdev = container_of(dev, struct platform_device, dev);
-        if (dev->driver && drv->resume_early)
-                ret = drv->resume_early(pdev);
+        if (dev->driver && pdrv->resume_early)
+                ret = pdrv->resume_early(pdev);
 
         return ret;
 }