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 f0b47fe4ed25..5def7fb903ac 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c | |||
@@ -164,11 +164,12 @@ struct device w1_master_device = { | |||
164 | .release = &w1_master_release | 164 | .release = &w1_master_release |
165 | }; | 165 | }; |
166 | 166 | ||
167 | struct device_driver w1_slave_driver = { | 167 | static struct device_driver w1_slave_driver = { |
168 | .name = "w1_slave_driver", | 168 | .name = "w1_slave_driver", |
169 | .bus = &w1_bus_type, | 169 | .bus = &w1_bus_type, |
170 | }; | 170 | }; |
171 | 171 | ||
172 | #if 0 | ||
172 | struct device w1_slave_device = { | 173 | struct device w1_slave_device = { |
173 | .parent = NULL, | 174 | .parent = NULL, |
174 | .bus = &w1_bus_type, | 175 | .bus = &w1_bus_type, |
@@ -176,6 +177,7 @@ struct device w1_slave_device = { | |||
176 | .driver = &w1_slave_driver, | 177 | .driver = &w1_slave_driver, |
177 | .release = &w1_slave_release | 178 | .release = &w1_slave_release |
178 | }; | 179 | }; |
180 | #endif /* 0 */ | ||
179 | 181 | ||
180 | static ssize_t w1_master_attribute_show_name(struct device *dev, struct device_attribute *attr, char *buf) | 182 | static ssize_t w1_master_attribute_show_name(struct device *dev, struct device_attribute *attr, char *buf) |
181 | { | 183 | { |
@@ -355,7 +357,7 @@ int w1_create_master_attributes(struct w1_master *master) | |||
355 | return sysfs_create_group(&master->dev.kobj, &w1_master_defattr_group); | 357 | return sysfs_create_group(&master->dev.kobj, &w1_master_defattr_group); |
356 | } | 358 | } |
357 | 359 | ||
358 | void w1_destroy_master_attributes(struct w1_master *master) | 360 | static void w1_destroy_master_attributes(struct w1_master *master) |
359 | { | 361 | { |
360 | sysfs_remove_group(&master->dev.kobj, &w1_master_defattr_group); | 362 | sysfs_remove_group(&master->dev.kobj, &w1_master_defattr_group); |
361 | } | 363 | } |