diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-06-27 16:28:15 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 18:03:08 -0700 |
commit | e94e15f70559962f60915a09d44658b73a453fe2 (patch) | |
tree | 0ce8fb08e276cfc93a65b82ded38c4c1a1c9169b /drivers/pcmcia/ds.c | |
parent | daa9517d9eccc3598b2b0cdfa0b016ae4a4fcdce (diff) | |
download | linux-e94e15f70559962f60915a09d44658b73a453fe2.tar.bz2 |
[PATCH] pcmcia: cleanups
From: Adrian Bunk <bunk@stusta.de>
This patch contains the following cleanups:
- make needlessly global code static
- remove the following unneeded EXPORT_SYMBOL's:
- ds.c: pcmcia_report_error
- ds.c: pcmcia_bus_type
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/pcmcia/ds.c')
-rw-r--r-- | drivers/pcmcia/ds.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index 5c88ff8e7d7e..0de0f2300457 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c @@ -60,7 +60,7 @@ MODULE_DESCRIPTION("PCMCIA Driver Services"); MODULE_LICENSE("GPL"); #ifdef DEBUG -int ds_pc_debug; +static int ds_pc_debug; module_param_named(pc_debug, ds_pc_debug, int, 0644); @@ -108,6 +108,8 @@ struct pcmcia_bus_socket { }; static spinlock_t pcmcia_dev_list_lock; +static struct bus_type pcmcia_bus_type; + #define DS_SOCKET_PRESENT 0x01 #define DS_SOCKET_BUSY 0x02 #define DS_SOCKET_REMOVAL_PENDING 0x10 @@ -218,7 +220,7 @@ static const lookup_t service_table[] = { }; -int pcmcia_report_error(client_handle_t handle, error_info_t *err) +static int pcmcia_report_error(client_handle_t handle, error_info_t *err) { int i; char *serv; @@ -248,7 +250,6 @@ int pcmcia_report_error(client_handle_t handle, error_info_t *err) return CS_SUCCESS; } /* report_error */ -EXPORT_SYMBOL(pcmcia_report_error); /* end of code which was in cs.c before */ @@ -1901,13 +1902,12 @@ static struct class_interface pcmcia_bus_interface = { }; -struct bus_type pcmcia_bus_type = { +static struct bus_type pcmcia_bus_type = { .name = "pcmcia", .hotplug = pcmcia_bus_hotplug, .match = pcmcia_bus_match, .dev_attrs = pcmcia_dev_attrs, }; -EXPORT_SYMBOL(pcmcia_bus_type); static int __init init_pcmcia_bus(void) |