hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This reverts commit edb16da34b 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>
This commit is contained in:
Greg Kroah-Hartman 2019-04-29 19:49:21 +02:00
parent bc0c60457c
commit 391c0325cc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/base/platform.c
View File

@ -890,7 +890,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a,
if (len != -ENODEV) if (len != -ENODEV)
return len; 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; 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; return rc;
add_uevent_var(env, "MODALIAS=%s%s", PLATFORM_MODULE_PREFIX, add_uevent_var(env, "MODALIAS=%s%s", PLATFORM_MODULE_PREFIX,
dev_name(&pdev->dev)); pdev->name);
return 0; return 0;
} }
@ -975,7 +975,7 @@ static const struct platform_device_id *platform_match_id(
struct platform_device *pdev) struct platform_device *pdev)
{ {
while (id->name[0]) { while (id->name[0]) {
if (strcmp(dev_name(&pdev->dev), id->name) == 0) { if (strcmp(pdev->name, id->name) == 0) {
pdev->id_entry = id; pdev->id_entry = id;
return 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; return platform_match_id(pdrv->id_table, pdev) != NULL;
/* fall-back to driver name match */ /* 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 #ifdef CONFIG_PM_SLEEP