diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-07-24 07:14:44 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-08-03 03:02:44 -0400 |
commit | 2ce4905e4da9f512b38f56a53ece9da2072dd164 (patch) | |
tree | 64ca3ecc0dea9b4fbdca2c9b1353ee282e9afc82 /include/pcmcia/ds.h | |
parent | 3dace8cf15ae1dd7c9384758b3a29556b441a90a (diff) |
pcmcia: use struct resource for PCMCIA devices
Introduce a new field into struct pcmcia_device named "resource" and of
type struct resource *, which contains the IO port ranges allocated for
this device. Memory window ranges and registration with the resource
trees will follow at a later date.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'include/pcmcia/ds.h')
-rw-r--r-- | include/pcmcia/ds.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index d494ce417b4f..3dafd7db34df 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h | |||
@@ -80,13 +80,13 @@ struct pcmcia_device { | |||
80 | struct list_head socket_device_list; | 80 | struct list_head socket_device_list; |
81 | 81 | ||
82 | /* deprecated, will be cleaned up soon */ | 82 | /* deprecated, will be cleaned up soon */ |
83 | u_int open; | ||
84 | io_req_t io; | 83 | io_req_t io; |
85 | config_req_t conf; | 84 | config_req_t conf; |
86 | window_handle_t win; | 85 | window_handle_t win; |
87 | 86 | ||
88 | /* device setup */ | 87 | /* device setup */ |
89 | unsigned int irq; | 88 | unsigned int irq; |
89 | struct resource *resource[MAX_IO_WIN]; | ||
90 | 90 | ||
91 | /* Is the device suspended? */ | 91 | /* Is the device suspended? */ |
92 | u16 suspended:1; | 92 | u16 suspended:1; |
@@ -120,6 +120,7 @@ struct pcmcia_device { | |||
120 | 120 | ||
121 | /* data private to drivers */ | 121 | /* data private to drivers */ |
122 | void *priv; | 122 | void *priv; |
123 | unsigned int open; | ||
123 | }; | 124 | }; |
124 | 125 | ||
125 | #define to_pcmcia_dev(n) container_of(n, struct pcmcia_device, dev) | 126 | #define to_pcmcia_dev(n) container_of(n, struct pcmcia_device, dev) |