Revert driver core: fix passing platform_data

This reverts commit ce21c7bcd796fc4f45d48781b7e85f493cc55ee5:
	We will remove platform_data field from struct device until
	all platform devices pass its specific data from platfom_device
	and all platform drivers use platform specific data passed by
	platform_device->platform_data. This kind of conversion will
	need a long time, for thousands of files is affected.

	To make the conversion easily, we allow platform specific data
	passed by struct device or struct platform_device and platform
	driver may use it from struct device or struct platform_device.

As we really don't want to do this at all.

Cc: David Brownell <david-b@pacbell.net>
Cc: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index ec5400c3202152c652e2332857f4a8c3c416809a..d1d0ee4319263a19b9832b136cebbbf531f92cda 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -247,20 +247,7 @@ 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;
-       }
+       pdev->platform_data = pdev->dev.platform_data;
 
        for (i = 0; i < pdev->num_resources; i++) {
                struct resource *p, *r = &pdev->resource[i];