aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pcmcia/ds.c10
-rw-r--r--drivers/pcmcia/rsrc_nonstatic.c6
-rw-r--r--include/pcmcia/cs.h1
-rw-r--r--include/pcmcia/ds.h2
4 files changed, 8 insertions, 11 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");
60MODULE_LICENSE("GPL"); 60MODULE_LICENSE("GPL");
61 61
62#ifdef DEBUG 62#ifdef DEBUG
63int ds_pc_debug; 63static int ds_pc_debug;
64 64
65module_param_named(pc_debug, ds_pc_debug, int, 0644); 65module_param_named(pc_debug, ds_pc_debug, int, 0644);
66 66
@@ -108,6 +108,8 @@ struct pcmcia_bus_socket {
108}; 108};
109static spinlock_t pcmcia_dev_list_lock; 109static spinlock_t pcmcia_dev_list_lock;
110 110
111static struct bus_type pcmcia_bus_type;
112
111#define DS_SOCKET_PRESENT 0x01 113#define DS_SOCKET_PRESENT 0x01
112#define DS_SOCKET_BUSY 0x02 114#define DS_SOCKET_BUSY 0x02
113#define DS_SOCKET_REMOVAL_PENDING 0x10 115#define DS_SOCKET_REMOVAL_PENDING 0x10
@@ -218,7 +220,7 @@ static const lookup_t service_table[] = {
218}; 220};
219 221
220 222
221int pcmcia_report_error(client_handle_t handle, error_info_t *err) 223static int pcmcia_report_error(client_handle_t handle, error_info_t *err)
222{ 224{
223 int i; 225 int i;
224 char *serv; 226 char *serv;
@@ -248,7 +250,6 @@ int pcmcia_report_error(client_handle_t handle, error_info_t *err)
248 250
249 return CS_SUCCESS; 251 return CS_SUCCESS;
250} /* report_error */ 252} /* report_error */
251EXPORT_SYMBOL(pcmcia_report_error);
252 253
253/* end of code which was in cs.c before */ 254/* end of code which was in cs.c before */
254 255
@@ -1901,13 +1902,12 @@ static struct class_interface pcmcia_bus_interface = {
1901}; 1902};
1902 1903
1903 1904
1904struct bus_type pcmcia_bus_type = { 1905static struct bus_type pcmcia_bus_type = {
1905 .name = "pcmcia", 1906 .name = "pcmcia",
1906 .hotplug = pcmcia_bus_hotplug, 1907 .hotplug = pcmcia_bus_hotplug,
1907 .match = pcmcia_bus_match, 1908 .match = pcmcia_bus_match,
1908 .dev_attrs = pcmcia_dev_attrs, 1909 .dev_attrs = pcmcia_dev_attrs,
1909}; 1910};
1910EXPORT_SYMBOL(pcmcia_bus_type);
1911 1911
1912 1912
1913static int __init init_pcmcia_bus(void) 1913static int __init init_pcmcia_bus(void)
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
index 5876bab7c14c..9a0b835d612b 100644
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -601,7 +601,7 @@ static int nonstatic_adjust_io_region(struct resource *res, unsigned long r_star
601 601
602======================================================================*/ 602======================================================================*/
603 603
604struct resource *nonstatic_find_io_region(unsigned long base, int num, 604static struct resource *nonstatic_find_io_region(unsigned long base, int num,
605 unsigned long align, struct pcmcia_socket *s) 605 unsigned long align, struct pcmcia_socket *s)
606{ 606{
607 struct resource *res = make_resource(0, num, IORESOURCE_IO, s->dev.class_id); 607 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,
635 return res; 635 return res;
636} 636}
637 637
638struct resource * nonstatic_find_mem_region(u_long base, u_long num, u_long align, 638static struct resource * nonstatic_find_mem_region(u_long base, u_long num,
639 int low, struct pcmcia_socket *s) 639 u_long align, int low, struct pcmcia_socket *s)
640{ 640{
641 struct resource *res = make_resource(0, num, IORESOURCE_MEM, s->dev.class_id); 641 struct resource *res = make_resource(0, num, IORESOURCE_MEM, s->dev.class_id);
642 struct socket_data *s_data = s->resource_data; 642 struct socket_data *s_data = s->resource_data;
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index 8d8643adc786..60a3decea820 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -417,7 +417,6 @@ int pcmcia_suspend_card(struct pcmcia_socket *skt);
417int pcmcia_resume_card(struct pcmcia_socket *skt); 417int pcmcia_resume_card(struct pcmcia_socket *skt);
418int pcmcia_eject_card(struct pcmcia_socket *skt); 418int pcmcia_eject_card(struct pcmcia_socket *skt);
419int pcmcia_insert_card(struct pcmcia_socket *skt); 419int pcmcia_insert_card(struct pcmcia_socket *skt);
420int pcmcia_report_error(client_handle_t handle, error_info_t *err);
421 420
422struct pcmcia_socket * pcmcia_get_socket(struct pcmcia_socket *skt); 421struct pcmcia_socket * pcmcia_get_socket(struct pcmcia_socket *skt);
423void pcmcia_put_socket(struct pcmcia_socket *skt); 422void pcmcia_put_socket(struct pcmcia_socket *skt);
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index c267edde9d0c..2b52553f2d94 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -131,8 +131,6 @@ typedef struct dev_link_t {
131 131
132struct pcmcia_socket; 132struct pcmcia_socket;
133 133
134extern struct bus_type pcmcia_bus_type;
135
136struct pcmcia_driver { 134struct pcmcia_driver {
137 dev_link_t *(*attach)(void); 135 dev_link_t *(*attach)(void);
138 void (*detach)(dev_link_t *); 136 void (*detach)(dev_link_t *);