Revert "driver core: platform: Fix the usage of platform device name(pdev->name)"

This reverts commit edb16da34b084c66763f29bee42b4e6bb33c3d66 as it
breaks existing systems as reported by Krzysztof.

Reported-by: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Venkata Narendra Kumar Gutta <vnkgutta@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index df76e40c1a835702f9b706afc86aad4a398c8b07..4d1729853d1aface77da09b151869f162dab562d 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -890,7 +890,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a,
        if (len != -ENODEV)
                return len;
 
-       len = snprintf(buf, PAGE_SIZE, "platform:%s\n", dev_name(&pdev->dev));
+       len = snprintf(buf, PAGE_SIZE, "platform:%s\n", pdev->name);
 
        return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
 }
@@ -966,7 +966,7 @@ static int platform_uevent(struct device *dev, struct kobj_uevent_env *env)
                return rc;
 
        add_uevent_var(env, "MODALIAS=%s%s", PLATFORM_MODULE_PREFIX,
-                       dev_name(&pdev->dev));
+                       pdev->name);
        return 0;
 }
 
@@ -975,7 +975,7 @@ static const struct platform_device_id *platform_match_id(
                        struct platform_device *pdev)
 {
        while (id->name[0]) {
-               if (strcmp(dev_name(&pdev->dev), id->name) == 0) {
+               if (strcmp(pdev->name, id->name) == 0) {
                        pdev->id_entry = id;
                        return id;
                }
@@ -1019,7 +1019,7 @@ static int platform_match(struct device *dev, struct device_driver *drv)
                return platform_match_id(pdrv->id_table, pdev) != NULL;
 
        /* fall-back to driver name match */
-       return (strcmp(dev_name(&pdev->dev), drv->name) == 0);
+       return (strcmp(pdev->name, drv->name) == 0);
 }
 
 #ifdef CONFIG_PM_SLEEP