drivers/pcmcia/: possible cleanups
PATCH 1/1 drivers/pcmcia/: possible cleanups
This patch contains the following possible 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 <[email protected]>
---
drivers/pcmcia/ds.c | 10 +++++----- drivers/pcmcia/rsrc_nonstatic.c | 4 ++-- include/pcmcia/cs.h | 1 - include/pcmcia/ds.h | 2 -- 4 files changed, 7 insertions(+), 10 deletions(-)
include/pcmcia/cs.h renamed from include/pcmcia/cs.h.old +0 -1
@@ -417,7 +417,6 @@int pcmcia_resume_card (struct pcmcia_socket *skt);int pcmcia_eject_card (struct pcmcia_socket *skt);int pcmcia_insert_card (struct pcmcia_socket *skt); -int pcmcia_report_error (client_handle_t handle,error_info_t *err);struct pcmcia_socket *pcmcia_get_socket (struct pcmcia_socket *skt);void pcmcia_put_socket (struct pcmcia_socket *skt);
include/pcmcia/ds.h renamed from include/pcmcia/ds.h.old +0 -2
@@ -129,8 +129,6 @@struct pcmcia_socket ; -extern struct bus_type pcmcia_bus_type; -struct pcmcia_driver {dev_link_t *(*attach)(void );void (*detach)(dev_link_t *);
drivers/pcmcia/ds.c renamed from drivers/pcmcia/ds.c.old +5 -5
@@ -58,7 +58,7 @@MODULE_LICENSE ("GPL" );#ifdef DEBUG -int ds_pc_debug; +static int ds_pc_debug;module_param_named (pc_debug, ds_pc_debug, int,0644 );
@@ -214,7 +214,7 @@ }; -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;
@@ -244,7 +244,6 @@return CS_SUCCESS ; }/* report_error */ -EXPORT_SYMBOL (pcmcia_report_error);/* end of code which was in cs.c before */
@@ -262,6 +261,8 @@static struct pcmcia_driver *get_pcmcia_driver (dev_info_t *dev_info);static struct pcmcia_bus_socket *get_socket_info_by_nr (unsigned int nr); +static struct bus_type pcmcia_bus_type; +static void pcmcia_release_bus_socket (struct kref *refcount) { struct pcmcia_bus_socket *s = container_of(refcount, struct pcmcia_bus_socket, refcount);
@@ -1610,12 +1611,11 @@ }; -struct bus_type pcmcia_bus_type = { +static struct bus_type pcmcia_bus_type = { .name ="pcmcia" , .match = pcmcia_bus_match, .dev_attrs = pcmcia_dev_attrs, }; -EXPORT_SYMBOL (pcmcia_bus_type);static int __init init_pcmcia_bus (void )
drivers/pcmcia/rsrc_nonstatic.c renamed from drivers/pcmcia/rsrc_nonstatic.c.old +2 -2
@@ -606,7 +606,7 @@======================================================================*/ -struct resource *nonstatic_find_io_region (unsigned long base,int num, +static struct resource *nonstatic_find_io_region (unsigned long base,int num,unsigned long align,struct pcmcia_socket *s) {struct resource *res =make_resource (0 , num,IORESOURCE_IO , s->dev.class_id);
@@ -640,7 +640,7 @@return res; } -struct resource *nonstatic_find_mem_region (u_long base,u_long num,u_long align, +static struct resource *nonstatic_find_mem_region (u_long base,u_long num,u_long align,int low,struct pcmcia_socket *s) {struct resource *res =make_resource (0 , num,IORESOURCE_MEM , s->dev.class_id);