diff options
Diffstat (limited to 'drivers/base/class.c')
-rw-r--r-- | drivers/base/class.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/base/class.c b/drivers/base/class.c index 5b9cf06eab8f..a863bb091e11 100644 --- a/drivers/base/class.c +++ b/drivers/base/class.c | |||
@@ -65,13 +65,13 @@ static struct sysfs_ops class_sysfs_ops = { | |||
65 | .store = class_attr_store, | 65 | .store = class_attr_store, |
66 | }; | 66 | }; |
67 | 67 | ||
68 | static struct kobj_type ktype_class = { | 68 | static struct kobj_type class_ktype = { |
69 | .sysfs_ops = &class_sysfs_ops, | 69 | .sysfs_ops = &class_sysfs_ops, |
70 | .release = class_release, | 70 | .release = class_release, |
71 | }; | 71 | }; |
72 | 72 | ||
73 | /* Hotplug events for classes go to the class_obj subsys */ | 73 | /* Hotplug events for classes go to the class_obj subsys */ |
74 | static decl_subsys(class, &ktype_class, NULL); | 74 | static decl_subsys(class, &class_ktype, NULL); |
75 | 75 | ||
76 | 76 | ||
77 | int class_create_file(struct class * cls, const struct class_attribute * attr) | 77 | int class_create_file(struct class * cls, const struct class_attribute * attr) |
@@ -323,7 +323,7 @@ static void class_dev_release(struct kobject * kobj) | |||
323 | } | 323 | } |
324 | } | 324 | } |
325 | 325 | ||
326 | static struct kobj_type ktype_class_device = { | 326 | static struct kobj_type class_device_ktype = { |
327 | .sysfs_ops = &class_dev_sysfs_ops, | 327 | .sysfs_ops = &class_dev_sysfs_ops, |
328 | .release = class_dev_release, | 328 | .release = class_dev_release, |
329 | }; | 329 | }; |
@@ -332,7 +332,7 @@ static int class_uevent_filter(struct kset *kset, struct kobject *kobj) | |||
332 | { | 332 | { |
333 | struct kobj_type *ktype = get_ktype(kobj); | 333 | struct kobj_type *ktype = get_ktype(kobj); |
334 | 334 | ||
335 | if (ktype == &ktype_class_device) { | 335 | if (ktype == &class_device_ktype) { |
336 | struct class_device *class_dev = to_class_dev(kobj); | 336 | struct class_device *class_dev = to_class_dev(kobj); |
337 | if (class_dev->class) | 337 | if (class_dev->class) |
338 | return 1; | 338 | return 1; |
@@ -452,7 +452,7 @@ static struct kset_uevent_ops class_uevent_ops = { | |||
452 | .uevent = class_uevent, | 452 | .uevent = class_uevent, |
453 | }; | 453 | }; |
454 | 454 | ||
455 | static decl_subsys(class_obj, &ktype_class_device, &class_uevent_ops); | 455 | static decl_subsys(class_obj, &class_device_ktype, &class_uevent_ops); |
456 | 456 | ||
457 | 457 | ||
458 | static int class_device_add_attrs(struct class_device * cd) | 458 | static int class_device_add_attrs(struct class_device * cd) |