diff options
Diffstat (limited to 'drivers/w1/w1.c')
-rw-r--r-- | drivers/w1/w1.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index 420be14c2f8e..b41366a0784c 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c | |||
@@ -214,11 +214,12 @@ struct device w1_master_device = { | |||
214 | .release = &w1_master_release | 214 | .release = &w1_master_release |
215 | }; | 215 | }; |
216 | 216 | ||
217 | struct device_driver w1_slave_driver = { | 217 | static struct device_driver w1_slave_driver = { |
218 | .name = "w1_slave_driver", | 218 | .name = "w1_slave_driver", |
219 | .bus = &w1_bus_type, | 219 | .bus = &w1_bus_type, |
220 | }; | 220 | }; |
221 | 221 | ||
222 | #if 0 | ||
222 | struct device w1_slave_device = { | 223 | struct device w1_slave_device = { |
223 | .parent = NULL, | 224 | .parent = NULL, |
224 | .bus = &w1_bus_type, | 225 | .bus = &w1_bus_type, |
@@ -226,6 +227,7 @@ struct device w1_slave_device = { | |||
226 | .driver = &w1_slave_driver, | 227 | .driver = &w1_slave_driver, |
227 | .release = &w1_slave_release | 228 | .release = &w1_slave_release |
228 | }; | 229 | }; |
230 | #endif /* 0 */ | ||
229 | 231 | ||
230 | static ssize_t w1_master_attribute_show_name(struct device *dev, struct device_attribute *attr, char *buf) | 232 | static ssize_t w1_master_attribute_show_name(struct device *dev, struct device_attribute *attr, char *buf) |
231 | { | 233 | { |
@@ -383,7 +385,7 @@ int w1_create_master_attributes(struct w1_master *master) | |||
383 | return sysfs_create_group(&master->dev.kobj, &w1_master_defattr_group); | 385 | return sysfs_create_group(&master->dev.kobj, &w1_master_defattr_group); |
384 | } | 386 | } |
385 | 387 | ||
386 | void w1_destroy_master_attributes(struct w1_master *master) | 388 | static void w1_destroy_master_attributes(struct w1_master *master) |
387 | { | 389 | { |
388 | sysfs_remove_group(&master->dev.kobj, &w1_master_defattr_group); | 390 | sysfs_remove_group(&master->dev.kobj, &w1_master_defattr_group); |
389 | } | 391 | } |