pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socket
As we don't need the "Config" counter any more, we can simplify struct pcmcia_socket. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
@@ -141,10 +141,6 @@ struct pcmcia_socket {
|
||||
u_short lock_count;
|
||||
pccard_mem_map cis_mem;
|
||||
void __iomem *cis_virt;
|
||||
struct {
|
||||
u_int AssignedIRQ;
|
||||
u_int Config;
|
||||
} irq;
|
||||
io_window_t io[MAX_IO_WIN];
|
||||
pccard_mem_map win[MAX_WIN];
|
||||
struct list_head cis_cache;
|
||||
@@ -235,6 +231,9 @@ struct pcmcia_socket {
|
||||
/* non-zero if PCMCIA card is present */
|
||||
atomic_t present;
|
||||
|
||||
/* IRQ to be used by PCMCIA devices. May not be IRQ 0. */
|
||||
unsigned int pcmcia_irq;
|
||||
|
||||
#ifdef CONFIG_PCMCIA_IOCTL
|
||||
struct user_info_t *user;
|
||||
wait_queue_head_t queue;
|
||||
|
Reference in New Issue
Block a user