diff options
author | Evgeniy Polyakov <johnpol@2ka.mipt.ru> | 2006-04-04 20:35:22 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-22 11:22:50 -0700 |
commit | 2c5bfdac33607a618d8cf1532ef235ca9eccd49e (patch) | |
tree | 77786a135938d368db3d386ab864fc9d8d50c153 /drivers/w1/w1.c | |
parent | 339f07236b481371ffb4993cf309dd1f1b3382ab (diff) | |
download | op-kernel-dev-2c5bfdac33607a618d8cf1532ef235ca9eccd49e.zip op-kernel-dev-2c5bfdac33607a618d8cf1532ef235ca9eccd49e.tar.gz |
[PATCH] W1: cleanups
Nice cleanup spotted by Adrian Bunk, which was lost due to moving to the
completely new functionality.
Shame-shame-shame on me.
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 420be14..b41366a 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c @@ -214,11 +214,12 @@ struct device w1_master_device = { .release = &w1_master_release }; -struct device_driver w1_slave_driver = { +static struct device_driver w1_slave_driver = { .name = "w1_slave_driver", .bus = &w1_bus_type, }; +#if 0 struct device w1_slave_device = { .parent = NULL, .bus = &w1_bus_type, @@ -226,6 +227,7 @@ struct device w1_slave_device = { .driver = &w1_slave_driver, .release = &w1_slave_release }; +#endif /* 0 */ static ssize_t w1_master_attribute_show_name(struct device *dev, struct device_attribute *attr, char *buf) { @@ -383,7 +385,7 @@ int w1_create_master_attributes(struct w1_master *master) return sysfs_create_group(&master->dev.kobj, &w1_master_defattr_group); } -void w1_destroy_master_attributes(struct w1_master *master) +static void w1_destroy_master_attributes(struct w1_master *master) { sysfs_remove_group(&master->dev.kobj, &w1_master_defattr_group); } |