leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] pcmcia: cleanups

Browse Source 
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>
This commit is contained in:
Dominik Brodowski 2005-06-27 16:28:15 -07:00 committed by Linus Torvalds
parent daa9517d9e
commit e94e15f705
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/pcmcia/ds.c
View File

@ -60,7 +60,7 @@ MODULE_DESCRIPTION("PCMCIA Driver Services");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#ifdef DEBUG #ifdef DEBUG
int ds_pc_debug; static int ds_pc_debug;
module_param_named(pc_debug, ds_pc_debug, int, 0644); 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 spinlock_t pcmcia_dev_list_lock;
static struct bus_type pcmcia_bus_type;
#define DS_SOCKET_PRESENT 0x01 #define DS_SOCKET_PRESENT 0x01
#define DS_SOCKET_BUSY 0x02 #define DS_SOCKET_BUSY 0x02
#define DS_SOCKET_REMOVAL_PENDING 0x10 #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; int i;
char *serv; char *serv;
@ -248,7 +250,6 @@ int pcmcia_report_error(client_handle_t handle, error_info_t *err)
return CS_SUCCESS; return CS_SUCCESS;
} /* report_error */ } /* report_error */
EXPORT_SYMBOL(pcmcia_report_error);
/* end of code which was in cs.c before */ /* 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", .name = "pcmcia",
.hotplug = pcmcia_bus_hotplug, .hotplug = pcmcia_bus_hotplug,
.match = pcmcia_bus_match, .match = pcmcia_bus_match,
.dev_attrs = pcmcia_dev_attrs, .dev_attrs = pcmcia_dev_attrs,
}; };
EXPORT_SYMBOL(pcmcia_bus_type);
static int __init init_pcmcia_bus(void) static int __init init_pcmcia_bus(void)

6
drivers/pcmcia/rsrc_nonstatic.c
View File

@ -601,7 +601,7 @@ static int nonstatic_adjust_io_region(struct resource *res, unsigned long r_star
======================================================================*/ ======================================================================*/
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) unsigned long align, struct pcmcia_socket *s)
{ {
struct resource *res = make_resource(0, num, IORESOURCE_IO, s->dev.class_id); struct resource *res = make_resource(0, num, IORESOURCE_IO, s->dev.class_id);
@ -635,8 +635,8 @@ struct resource *nonstatic_find_io_region(unsigned long base, int num,
return res; 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,
int low, struct pcmcia_socket *s) u_long align, int low, struct pcmcia_socket *s)
{ {
struct resource *res = make_resource(0, num, IORESOURCE_MEM, s->dev.class_id); struct resource *res = make_resource(0, num, IORESOURCE_MEM, s->dev.class_id);
struct socket_data *s_data = s->resource_data; struct socket_data *s_data = s->resource_data;

1
include/pcmcia/cs.h
View File

@ -417,7 +417,6 @@ int pcmcia_suspend_card(struct pcmcia_socket *skt);
int pcmcia_resume_card(struct pcmcia_socket *skt); int pcmcia_resume_card(struct pcmcia_socket *skt);
int pcmcia_eject_card(struct pcmcia_socket *skt); int pcmcia_eject_card(struct pcmcia_socket *skt);
int pcmcia_insert_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); struct pcmcia_socket * pcmcia_get_socket(struct pcmcia_socket *skt);
void pcmcia_put_socket(struct pcmcia_socket *skt); void pcmcia_put_socket(struct pcmcia_socket *skt);

2
include/pcmcia/ds.h
View File

@ -131,8 +131,6 @@ typedef struct dev_link_t {
struct pcmcia_socket; struct pcmcia_socket;
extern struct bus_type pcmcia_bus_type;
struct pcmcia_driver { struct pcmcia_driver {
dev_link_t *(*attach)(void); dev_link_t *(*attach)(void);
void (*detach)(dev_link_t *); void (*detach)(dev_link_t *);