Signed-off-by: Andrew Morton --- drivers/base/class.c | 2 +- drivers/base/core.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff -puN Documentation/feature-removal-schedule.txt~gregkh-driver-deprecate-physdev-keys Documentation/feature-removal-schedule.txt diff -puN drivers/base/class.c~gregkh-driver-deprecate-physdev-keys drivers/base/class.c --- a/drivers/base/class.c~gregkh-driver-deprecate-physdev-keys +++ a/drivers/base/class.c @@ -361,7 +361,7 @@ static int class_uevent(struct kset *kse pr_debug("%s - name = %s\n", __FUNCTION__, class_dev->class_id); if (class_dev->dev) { - /* add physical device, backing this device */ + /* add device, backing this class device (deprecated) */ struct device *dev = class_dev->dev; char *path = kobject_get_path(&dev->kobj, GFP_KERNEL); diff -puN drivers/base/core.c~gregkh-driver-deprecate-physdev-keys drivers/base/core.c --- a/drivers/base/core.c~gregkh-driver-deprecate-physdev-keys +++ a/drivers/base/core.c @@ -149,17 +149,21 @@ static int dev_uevent(struct kset *kset, "MINOR=%u", MINOR(dev->devt)); } - /* add bus name of physical device */ + /* add bus name (same as SUBSYSTEM, deprecated) */ if (dev->bus) add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length, "PHYSDEVBUS=%s", dev->bus->name); - /* add driver name of physical device */ - if (dev->driver) + /* add driver name (PHYSDEV* values are deprecated)*/ + if (dev->driver) { + add_uevent_var(envp, num_envp, &i, + buffer, buffer_size, &length, + "DRIVER=%s", dev->driver->name); add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length, "PHYSDEVDRIVER=%s", dev->driver->name); + } /* terminate, set to next free slot, shrink available space */ envp[i] = NULL; _