diff options
| author | Adrian Bunk <bunk@stusta.de> | 2005-12-13 23:04:33 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-03-24 02:28:12 +0100 |
| commit | a9fb1c7b950bed4afe208c9d67e20f086bb6abbb (patch) | |
| tree | 496c2b8b292411a6163dc451b8dab82665a8ab99 /drivers/w1/w1.c | |
| parent | [PATCH] W1: Add the DS2482 I2C-to-w1 bridge driver. (diff) | |
| download | linux-a9fb1c7b950bed4afe208c9d67e20f086bb6abbb.tar.xz linux-a9fb1c7b950bed4afe208c9d67e20f086bb6abbb.zip | |
[PATCH] w1: misc cleanups
This patch contains the following cleanups:
- make needlessly global code static
- declarations for global code belong into header files
- w1.c: #if 0 the unused struct w1_slave_device
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
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 f0b47fe4ed25..5def7fb903ac 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c @@ -164,11 +164,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, @@ -176,6 +177,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) { @@ -355,7 +357,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); } |