tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

pcmcia: merge ds_internal.h into cs_internal.h

Merge ds_internal.c into cs_internal.h.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

Dominik Brodowski b60a5ede dc953e55

+40 -32
+40
drivers/pcmcia/cs_internal.h
··· 177 177 int low, 178 178 struct pcmcia_socket *s); 179 179 180 + /* 181 + * Stuff internal to module "pcmcia". 182 + */ 183 + /* ds.c */ 184 + extern struct bus_type pcmcia_bus_type; 185 + 186 + /* pcmcia_resource.c */ 187 + extern int pcmcia_release_configuration(struct pcmcia_device *p_dev); 188 + 189 + #ifdef CONFIG_PCMCIA_IOCTL 190 + /* ds.c */ 191 + extern spinlock_t pcmcia_dev_list_lock; 192 + 193 + extern struct pcmcia_device *pcmcia_get_dev(struct pcmcia_device *p_dev); 194 + extern void pcmcia_put_dev(struct pcmcia_device *p_dev); 195 + 196 + struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s, 197 + unsigned int function); 198 + 199 + /* pcmcia_ioctl.c */ 200 + extern void __init pcmcia_setup_ioctl(void); 201 + extern void __exit pcmcia_cleanup_ioctl(void); 202 + extern void handle_event(struct pcmcia_socket *s, event_t event); 203 + extern int handle_request(struct pcmcia_socket *s, event_t event); 204 + 205 + #else /* CONFIG_PCMCIA_IOCTL */ 206 + 207 + static inline void __init pcmcia_setup_ioctl(void) { return; } 208 + static inline void __exit pcmcia_cleanup_ioctl(void) { return; } 209 + static inline void handle_event(struct pcmcia_socket *s, event_t event) 210 + { 211 + return; 212 + } 213 + static inline int handle_request(struct pcmcia_socket *s, event_t event) 214 + { 215 + return 0; 216 + } 217 + 218 + #endif /* CONFIG_PCMCIA_IOCTL */ 219 + 180 220 #endif /* _LINUX_CS_INTERNAL_H */
-1
drivers/pcmcia/ds.c
··· 32 32 #include <pcmcia/ss.h> 33 33 34 34 #include "cs_internal.h" 35 - #include "ds_internal.h" 36 35 37 36 /*====================================================================*/ 38 37
-29
drivers/pcmcia/ds_internal.h
··· 1 - /* ds_internal.h - internal header for 16-bit PCMCIA devices management */ 2 - 3 - extern spinlock_t pcmcia_dev_list_lock; 4 - extern struct bus_type pcmcia_bus_type; 5 - 6 - extern struct pcmcia_device * pcmcia_get_dev(struct pcmcia_device *p_dev); 7 - extern void pcmcia_put_dev(struct pcmcia_device *p_dev); 8 - 9 - struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int function); 10 - 11 - extern int pcmcia_release_configuration(struct pcmcia_device *p_dev); 12 - 13 - #ifdef CONFIG_PCMCIA_IOCTL 14 - extern void __init pcmcia_setup_ioctl(void); 15 - extern void __exit pcmcia_cleanup_ioctl(void); 16 - extern void handle_event(struct pcmcia_socket *s, event_t event); 17 - extern int handle_request(struct pcmcia_socket *s, event_t event); 18 - #else 19 - static inline void __init pcmcia_setup_ioctl(void) { return; } 20 - static inline void __exit pcmcia_cleanup_ioctl(void) { return; } 21 - static inline void handle_event(struct pcmcia_socket *s, event_t event) 22 - { 23 - return; 24 - } 25 - static inline int handle_request(struct pcmcia_socket *s, event_t event) 26 - { 27 - return 0; 28 - } 29 - #endif
-1
drivers/pcmcia/pcmcia_ioctl.c
··· 38 38 #include <pcmcia/ss.h> 39 39 40 40 #include "cs_internal.h" 41 - #include "ds_internal.h" 42 41 43 42 static int major_dev = -1; 44 43
-1
drivers/pcmcia/pcmcia_resource.c
··· 29 29 #include <pcmcia/ds.h> 30 30 31 31 #include "cs_internal.h" 32 - #include "ds_internal.h" 33 32 34 33 35 34 /* Access speed for IO windows */