diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-11 12:47:49 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-12 17:51:12 -0400 |
| commit | 8f4afc410b8d2be49f34835b6bbe788f50471b02 (patch) | |
| tree | 376f7cea8e5f6caac9184b8d5913ba63b7940623 /drivers/base | |
| parent | adc56808f32e15fa0c0fcd5ecb4b30989076ef2b (diff) | |
Driver core: rename ktype_device
This makes it a bit more sane when trying to figure out how to clean up
the ktype mess.
Based on a larger patch from Kay Sievers
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 65de221e3bfa..c1343414d285 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
| @@ -108,7 +108,7 @@ static void device_release(struct kobject * kobj) | |||
| 108 | } | 108 | } |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | static struct kobj_type ktype_device = { | 111 | static struct kobj_type device_ktype = { |
| 112 | .release = device_release, | 112 | .release = device_release, |
| 113 | .sysfs_ops = &dev_sysfs_ops, | 113 | .sysfs_ops = &dev_sysfs_ops, |
| 114 | }; | 114 | }; |
| @@ -118,7 +118,7 @@ static int dev_uevent_filter(struct kset *kset, struct kobject *kobj) | |||
| 118 | { | 118 | { |
| 119 | struct kobj_type *ktype = get_ktype(kobj); | 119 | struct kobj_type *ktype = get_ktype(kobj); |
| 120 | 120 | ||
| 121 | if (ktype == &ktype_device) { | 121 | if (ktype == &device_ktype) { |
| 122 | struct device *dev = to_dev(kobj); | 122 | struct device *dev = to_dev(kobj); |
| 123 | if (dev->uevent_suppress) | 123 | if (dev->uevent_suppress) |
| 124 | return 0; | 124 | return 0; |
| @@ -405,7 +405,7 @@ static struct device_attribute devt_attr = | |||
| 405 | * devices_subsys - structure to be registered with kobject core. | 405 | * devices_subsys - structure to be registered with kobject core. |
| 406 | */ | 406 | */ |
| 407 | 407 | ||
| 408 | decl_subsys(devices, &ktype_device, &device_uevent_ops); | 408 | decl_subsys(devices, &device_ktype, &device_uevent_ops); |
| 409 | 409 | ||
| 410 | 410 | ||
| 411 | /** | 411 | /** |
