summaryrefslogtreecommitdiffstats
path: root/drivers/w1/w1_int.c
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2005-12-13 14:04:33 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-03-23 17:28:12 -0800
commita9fb1c7b950bed4afe208c9d67e20f086bb6abbb (patch)
tree496c2b8b292411a6163dc451b8dab82665a8ab99 /drivers/w1/w1_int.c
parentbaf12ae29ab4cc6381e21b2e1a3af75a6a8f7566 (diff)
downloadlinux-stable-a9fb1c7b950bed4afe208c9d67e20f086bb6abbb.tar.gz
linux-stable-a9fb1c7b950bed4afe208c9d67e20f086bb6abbb.tar.bz2
linux-stable-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_int.c')
-rw-r--r--drivers/w1/w1_int.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index c3f67eafc7ec..4724693ad51d 100644
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -26,19 +26,10 @@
#include "w1.h"
#include "w1_log.h"
#include "w1_netlink.h"
+#include "w1_int.h"
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,
struct device_driver *driver,
struct device *device)
@@ -103,7 +94,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
return dev;
}
-void w1_free_dev(struct w1_master *dev)
+static void w1_free_dev(struct w1_master *dev)
{
device_unregister(&dev->dev);
}