aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/cs_internal.h
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-07-11 03:51:14 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2010-07-30 15:07:26 -0400
commit5716d415f8c5a17d44f6e1d5a1e4998f7306a93b (patch)
tree81a946cccfd7ddb6f1b01839f68afa27fc42a180 /drivers/pcmcia/cs_internal.h
parentb37fa16e78d6f9790462b3181602a26b5af36260 (diff)
pcmcia: remove obsolete ioctl
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/cs_internal.h')
-rw-r--r--drivers/pcmcia/cs_internal.h40
1 files changed, 2 insertions, 38 deletions
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
index 4126a75445ea..a6cc63db8c8e 100644
--- a/drivers/pcmcia/cs_internal.h
+++ b/drivers/pcmcia/cs_internal.h
@@ -60,14 +60,6 @@ struct pccard_resource_ops {
60 struct resource* (*find_mem) (unsigned long base, unsigned long num, 60 struct resource* (*find_mem) (unsigned long base, unsigned long num,
61 unsigned long align, int low, 61 unsigned long align, int low,
62 struct pcmcia_socket *s); 62 struct pcmcia_socket *s);
63 int (*add_io) (struct pcmcia_socket *s,
64 unsigned int action,
65 unsigned long r_start,
66 unsigned long r_end);
67 int (*add_mem) (struct pcmcia_socket *s,
68 unsigned int action,
69 unsigned long r_start,
70 unsigned long r_end);
71 int (*init) (struct pcmcia_socket *s); 63 int (*init) (struct pcmcia_socket *s);
72 void (*exit) (struct pcmcia_socket *s); 64 void (*exit) (struct pcmcia_socket *s);
73}; 65};
@@ -146,6 +138,8 @@ void pcmcia_put_socket(struct pcmcia_socket *skt);
146/* ds.c */ 138/* ds.c */
147extern struct bus_type pcmcia_bus_type; 139extern struct bus_type pcmcia_bus_type;
148 140
141struct pcmcia_device;
142
149/* pcmcia_resource.c */ 143/* pcmcia_resource.c */
150extern int pcmcia_release_configuration(struct pcmcia_device *p_dev); 144extern int pcmcia_release_configuration(struct pcmcia_device *p_dev);
151extern int pcmcia_validate_mem(struct pcmcia_socket *s); 145extern int pcmcia_validate_mem(struct pcmcia_socket *s);
@@ -188,34 +182,4 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function,
188 182
189int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple); 183int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple);
190 184
191
192#ifdef CONFIG_PCMCIA_IOCTL
193/* ds.c */
194extern struct pcmcia_device *pcmcia_get_dev(struct pcmcia_device *p_dev);
195extern void pcmcia_put_dev(struct pcmcia_device *p_dev);
196
197struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s,
198 unsigned int function);
199
200/* pcmcia_ioctl.c */
201extern void __init pcmcia_setup_ioctl(void);
202extern void __exit pcmcia_cleanup_ioctl(void);
203extern void handle_event(struct pcmcia_socket *s, event_t event);
204extern int handle_request(struct pcmcia_socket *s, event_t event);
205
206#else /* CONFIG_PCMCIA_IOCTL */
207
208static inline void __init pcmcia_setup_ioctl(void) { return; }
209static inline void __exit pcmcia_cleanup_ioctl(void) { return; }
210static inline void handle_event(struct pcmcia_socket *s, event_t event)
211{
212 return;
213}
214static inline int handle_request(struct pcmcia_socket *s, event_t event)
215{
216 return 0;
217}
218
219#endif /* CONFIG_PCMCIA_IOCTL */
220
221#endif /* _LINUX_CS_INTERNAL_H */ 185#endif /* _LINUX_CS_INTERNAL_H */