Commit b60a5ede authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: merge ds_internal.h into cs_internal.h 



Merge ds_internal.c into cs_internal.h.

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent dc953e55

drivers/pcmcia/cs_internal.h

+40 −0
Original line number Diff line number Diff line
@@ -177,4 +177,44 @@ struct resource *pcmcia_find_mem_region(u_long base, 
					int low,

					struct pcmcia_socket *s);



/*

 * Stuff internal to module "pcmcia".

 */

/* ds.c */

extern struct bus_type pcmcia_bus_type;



/* pcmcia_resource.c */

extern int pcmcia_release_configuration(struct pcmcia_device *p_dev);



#ifdef CONFIG_PCMCIA_IOCTL

/* ds.c */

extern spinlock_t pcmcia_dev_list_lock;



extern struct pcmcia_device *pcmcia_get_dev(struct pcmcia_device *p_dev);

extern void pcmcia_put_dev(struct pcmcia_device *p_dev);



struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s,

					unsigned int function);



/* pcmcia_ioctl.c */

extern void __init pcmcia_setup_ioctl(void);

extern void __exit pcmcia_cleanup_ioctl(void);

extern void handle_event(struct pcmcia_socket *s, event_t event);

extern int handle_request(struct pcmcia_socket *s, event_t event);



#else /* CONFIG_PCMCIA_IOCTL */



static inline void __init pcmcia_setup_ioctl(void) { return; }

static inline void __exit pcmcia_cleanup_ioctl(void) { return; }

static inline void handle_event(struct pcmcia_socket *s, event_t event)

{

	return;

}

static inline int handle_request(struct pcmcia_socket *s, event_t event)

{

	return 0;

}



#endif /* CONFIG_PCMCIA_IOCTL */



#endif /* _LINUX_CS_INTERNAL_H */

drivers/pcmcia/ds.c

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <pcmcia/ss.h>



#include "cs_internal.h"

#include "ds_internal.h"



/*====================================================================*/

drivers/pcmcia/ds_internal.h

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/* ds_internal.h - internal header for 16-bit PCMCIA devices management */



extern spinlock_t pcmcia_dev_list_lock;

extern struct bus_type pcmcia_bus_type;



extern struct pcmcia_device * pcmcia_get_dev(struct pcmcia_device *p_dev);

extern void pcmcia_put_dev(struct pcmcia_device *p_dev);



struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int function);



extern int pcmcia_release_configuration(struct pcmcia_device *p_dev);



#ifdef CONFIG_PCMCIA_IOCTL

extern void __init pcmcia_setup_ioctl(void);

extern void __exit pcmcia_cleanup_ioctl(void);

extern void handle_event(struct pcmcia_socket *s, event_t event);

extern int handle_request(struct pcmcia_socket *s, event_t event);

#else

static inline void __init pcmcia_setup_ioctl(void) { return; }

static inline void __exit pcmcia_cleanup_ioctl(void) { return; }

static inline void handle_event(struct pcmcia_socket *s, event_t event)

{

	return;

}

static inline int handle_request(struct pcmcia_socket *s, event_t event)

{

	return 0;

}

#endif

drivers/pcmcia/pcmcia_ioctl.c

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include <pcmcia/ss.h>



#include "cs_internal.h"

#include "ds_internal.h"



static int major_dev = -1;

drivers/pcmcia/pcmcia_resource.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <pcmcia/ds.h>



#include "cs_internal.h"

#include "ds_internal.h"





/* Access speed for IO windows */