aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2006-09-14 05:23:28 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-12-01 17:51:59 -0500
commita87cb2ac4a78c590583b52a3ed196adc6c25b6c9 (patch)
treef854514881e530a6e15ae1ff9e0efdc194dbed4e
parent99ef3ef8d5f2f5b5312627127ad63df27c0d0d05 (diff)
CONFIG_SYSFS_DEPRECATED - PHYSDEV* uevent variables
Disable the PHYSDEV* uevent variables if CONFIG_SYSFS_DEPRECATED is enabled. Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/base/core.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index b565b7e9d40b..f544adc5a5e2 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -154,20 +154,24 @@ static int dev_uevent(struct kset *kset, struct kobject *kobj, char **envp,
154 "MINOR=%u", MINOR(dev->devt)); 154 "MINOR=%u", MINOR(dev->devt));
155 } 155 }
156 156
157#ifdef CONFIG_SYSFS_DEPRECATED
157 /* add bus name (same as SUBSYSTEM, deprecated) */ 158 /* add bus name (same as SUBSYSTEM, deprecated) */
158 if (dev->bus) 159 if (dev->bus)
159 add_uevent_var(envp, num_envp, &i, 160 add_uevent_var(envp, num_envp, &i,
160 buffer, buffer_size, &length, 161 buffer, buffer_size, &length,
161 "PHYSDEVBUS=%s", dev->bus->name); 162 "PHYSDEVBUS=%s", dev->bus->name);
163#endif
162 164
163 /* add driver name (PHYSDEV* values are deprecated)*/ 165 /* add driver name (PHYSDEV* values are deprecated)*/
164 if (dev->driver) { 166 if (dev->driver) {
165 add_uevent_var(envp, num_envp, &i, 167 add_uevent_var(envp, num_envp, &i,
166 buffer, buffer_size, &length, 168 buffer, buffer_size, &length,
167 "DRIVER=%s", dev->driver->name); 169 "DRIVER=%s", dev->driver->name);
170#ifdef CONFIG_SYSFS_DEPRECATED
168 add_uevent_var(envp, num_envp, &i, 171 add_uevent_var(envp, num_envp, &i,
169 buffer, buffer_size, &length, 172 buffer, buffer_size, &length,
170 "PHYSDEVDRIVER=%s", dev->driver->name); 173 "PHYSDEVDRIVER=%s", dev->driver->name);
174#endif
171 } 175 }
172 176
173 /* terminate, set to next free slot, shrink available space */ 177 /* terminate, set to next free slot, shrink available space */