Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] w1: misc cleanups

Browse source 
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>
This commit is contained in:
Adrian Bunk 2005-12-13 14:04:33 -08:00 committed by Greg Kroah-Hartman
parent baf12ae29a
commit a9fb1c7b95
5 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/w1/w1.c
View file

@ -164,11 +164,12 @@ struct device w1_master_device = {
.release = &w1_master_release .release = &w1_master_release
}; };
struct device_driver w1_slave_driver = { static struct device_driver w1_slave_driver = {
.name = "w1_slave_driver", .name = "w1_slave_driver",
.bus = &w1_bus_type, .bus = &w1_bus_type,
}; };
#if 0
struct device w1_slave_device = { struct device w1_slave_device = {
.parent = NULL, .parent = NULL,
.bus = &w1_bus_type, .bus = &w1_bus_type,
@ -176,6 +177,7 @@ struct device w1_slave_device = {
.driver = &w1_slave_driver, .driver = &w1_slave_driver,
.release = &w1_slave_release .release = &w1_slave_release
}; };
#endif /* 0 */
static ssize_t w1_master_attribute_show_name(struct device *dev, struct device_attribute *attr, char *buf) 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); 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); sysfs_remove_group(&master->dev.kobj, &w1_master_defattr_group);
} }

10
drivers/w1/w1.h
View file

@ -203,6 +203,16 @@ static inline struct w1_master* dev_to_w1_master(struct device *dev)
return container_of(dev, struct w1_master, dev); return container_of(dev, struct w1_master, dev);
} }
extern int w1_max_slave_count;
extern int w1_max_slave_ttl;
extern spinlock_t w1_mlock;
extern struct list_head w1_masters;
extern struct device_driver w1_master_driver;
extern struct device w1_master_device;
int w1_process(void *data);
void w1_reconnect_slaves(struct w1_family *f);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __W1_H */ #endif /* __W1_H */

2
drivers/w1/w1_family.c
View file

@ -25,10 +25,10 @@
#include <linux/delay.h> #include <linux/delay.h>
#include "w1_family.h" #include "w1_family.h"
#include "w1.h"
DEFINE_SPINLOCK(w1_flock); DEFINE_SPINLOCK(w1_flock);
static LIST_HEAD(w1_families); static LIST_HEAD(w1_families);
extern void w1_reconnect_slaves(struct w1_family *f);
int w1_register_family(struct w1_family *newf) int w1_register_family(struct w1_family *newf)
{ {

13
drivers/w1/w1_int.c
View file

@ -26,19 +26,10 @@
#include "w1.h" #include "w1.h"
#include "w1_log.h" #include "w1_log.h"
#include "w1_netlink.h" #include "w1_netlink.h"
#include "w1_int.h"
static u32 w1_ids = 1; static u32 w1_ids = 1;
extern struct device_driver w1_master_driver;
extern struct bus_type w1_bus_type;
extern struct device w1_master_device;
extern int w1_max_slave_count;
extern int w1_max_slave_ttl;
extern struct list_head w1_masters;
extern spinlock_t w1_mlock;
extern int w1_process(void *);
static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl, static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
struct device_driver *driver, struct device_driver *driver,
struct device *device) struct device *device)
@ -103,7 +94,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
return dev; return dev;
} }
void w1_free_dev(struct w1_master *dev) static void w1_free_dev(struct w1_master *dev)
{ {
device_unregister(&dev->dev); device_unregister(&dev->dev);
} }

2
drivers/w1/w1_io.c
View file

@ -28,7 +28,7 @@
#include "w1_log.h" #include "w1_log.h"
#include "w1_io.h" #include "w1_io.h"
int w1_delay_parm = 1; static int w1_delay_parm = 1;
module_param_named(delay_coef, w1_delay_parm, int, 0); module_param_named(delay_coef, w1_delay_parm, int, 0);
static u8 w1_crc8_table[] = { static u8 w1_crc8_table[] = {