diff options
Diffstat (limited to 'drivers/net/wireless/orinoco/spectrum_cs.c')
-rw-r--r-- | drivers/net/wireless/orinoco/spectrum_cs.c | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/orinoco/spectrum_cs.c index 1314cf204f1..fb859a5ad2e 100644 --- a/drivers/net/wireless/orinoco/spectrum_cs.c +++ b/drivers/net/wireless/orinoco/spectrum_cs.c | |||
@@ -153,14 +153,6 @@ spectrum_cs_stop_firmware(struct orinoco_private *priv, int idle) | |||
153 | /* PCMCIA stuff */ | 153 | /* PCMCIA stuff */ |
154 | /********************************************************************/ | 154 | /********************************************************************/ |
155 | 155 | ||
156 | /* | ||
157 | * This creates an "instance" of the driver, allocating local data | ||
158 | * structures for one device. The device is registered with Card | ||
159 | * Services. | ||
160 | * | ||
161 | * The dev_link structure is initialized, but we don't actually | ||
162 | * configure the card at this point -- we wait until we receive a card | ||
163 | * insertion event. */ | ||
164 | static int | 156 | static int |
165 | spectrum_cs_probe(struct pcmcia_device *link) | 157 | spectrum_cs_probe(struct pcmcia_device *link) |
166 | { | 158 | { |
@@ -181,12 +173,6 @@ spectrum_cs_probe(struct pcmcia_device *link) | |||
181 | return spectrum_cs_config(link); | 173 | return spectrum_cs_config(link); |
182 | } /* spectrum_cs_attach */ | 174 | } /* spectrum_cs_attach */ |
183 | 175 | ||
184 | /* | ||
185 | * This deletes a driver "instance". The device is de-registered with | ||
186 | * Card Services. If it has been released, all local data structures | ||
187 | * are freed. Otherwise, the structures will be freed when the device | ||
188 | * is released. | ||
189 | */ | ||
190 | static void spectrum_cs_detach(struct pcmcia_device *link) | 176 | static void spectrum_cs_detach(struct pcmcia_device *link) |
191 | { | 177 | { |
192 | struct orinoco_private *priv = link->priv; | 178 | struct orinoco_private *priv = link->priv; |
@@ -198,12 +184,6 @@ static void spectrum_cs_detach(struct pcmcia_device *link) | |||
198 | free_orinocodev(priv); | 184 | free_orinocodev(priv); |
199 | } /* spectrum_cs_detach */ | 185 | } /* spectrum_cs_detach */ |
200 | 186 | ||
201 | /* | ||
202 | * spectrum_cs_config() is scheduled to run after a CARD_INSERTION | ||
203 | * event is received, to configure the PCMCIA socket, and to make the | ||
204 | * device available to the system. | ||
205 | */ | ||
206 | |||
207 | static int spectrum_cs_config_check(struct pcmcia_device *p_dev, | 187 | static int spectrum_cs_config_check(struct pcmcia_device *p_dev, |
208 | void *priv_data) | 188 | void *priv_data) |
209 | { | 189 | { |
@@ -221,20 +201,6 @@ spectrum_cs_config(struct pcmcia_device *link) | |||
221 | int ret; | 201 | int ret; |
222 | void __iomem *mem; | 202 | void __iomem *mem; |
223 | 203 | ||
224 | /* | ||
225 | * In this loop, we scan the CIS for configuration table | ||
226 | * entries, each of which describes a valid card | ||
227 | * configuration, including voltage, IO window, memory window, | ||
228 | * and interrupt settings. | ||
229 | * | ||
230 | * We make no assumptions about the card to be configured: we | ||
231 | * use just the information available in the CIS. In an ideal | ||
232 | * world, this would work for any PCMCIA card, but it requires | ||
233 | * a complete and accurate CIS. In practice, a driver usually | ||
234 | * "knows" most of these things without consulting the CIS, | ||
235 | * and most client drivers will only use the CIS to fill in | ||
236 | * implementation-defined details. | ||
237 | */ | ||
238 | link->config_flags |= CONF_AUTO_SET_VPP | CONF_AUTO_CHECK_VCC | | 204 | link->config_flags |= CONF_AUTO_SET_VPP | CONF_AUTO_CHECK_VCC | |
239 | CONF_AUTO_SET_IO | CONF_ENABLE_IRQ; | 205 | CONF_AUTO_SET_IO | CONF_ENABLE_IRQ; |
240 | if (ignore_cis_vcc) | 206 | if (ignore_cis_vcc) |
@@ -263,11 +229,6 @@ spectrum_cs_config(struct pcmcia_device *link) | |||
263 | hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING); | 229 | hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING); |
264 | hw->eeprom_pda = true; | 230 | hw->eeprom_pda = true; |
265 | 231 | ||
266 | /* | ||
267 | * This actually configures the PCMCIA socket -- setting up | ||
268 | * the I/O windows and the interrupt mapping, and putting the | ||
269 | * card and host interface into "Memory and IO" mode. | ||
270 | */ | ||
271 | ret = pcmcia_enable_device(link); | 232 | ret = pcmcia_enable_device(link); |
272 | if (ret) | 233 | if (ret) |
273 | goto failed; | 234 | goto failed; |
@@ -296,11 +257,6 @@ spectrum_cs_config(struct pcmcia_device *link) | |||
296 | return -ENODEV; | 257 | return -ENODEV; |
297 | } /* spectrum_cs_config */ | 258 | } /* spectrum_cs_config */ |
298 | 259 | ||
299 | /* | ||
300 | * After a card is removed, spectrum_cs_release() will unregister the | ||
301 | * device, and release the PCMCIA configuration. If the device is | ||
302 | * still open, this will be postponed until it is closed. | ||
303 | */ | ||
304 | static void | 260 | static void |
305 | spectrum_cs_release(struct pcmcia_device *link) | 261 | spectrum_cs_release(struct pcmcia_device *link) |
306 | { | 262 | { |