aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-08-15 02:38:38 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2010-09-29 11:20:25 -0400
commit2262054e74b4b26ed56a8535c1259f6c6c2862a4 (patch)
treefbcd0aa7879408b9676c2df6c7514e5d7428880a /drivers/net/pcmcia
parent06b3a1d12f41b592972643f8b84015d6c03dc576 (diff)
pcmcia: remove obsolete and wrong comments
What's worse than no comment? A wrong comment. Several PCMCIA device drivers contained the same comments, which were based on how the PCMCIA subsystem worked in the old days of 2.4., and which were originally part of a "dummy_cs" driver. These comments no longer matched at all what is happening now, and therefore should be removed. Tested-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/net/pcmcia')
-rw-r--r--drivers/net/pcmcia/3c574_cs.c23
-rw-r--r--drivers/net/pcmcia/3c589_cs.c35
-rw-r--r--drivers/net/pcmcia/axnet_cs.c33
-rw-r--r--drivers/net/pcmcia/com20020_cs.c33
-rw-r--r--drivers/net/pcmcia/ibmtr_cs.c33
-rw-r--r--drivers/net/pcmcia/nmclan_cs.c28
-rw-r--r--drivers/net/pcmcia/pcnet_cs.c42
-rw-r--r--drivers/net/pcmcia/smc91c92_cs.c33
-rw-r--r--drivers/net/pcmcia/xirc2ps_cs.c53
9 files changed, 2 insertions, 311 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index ba52b0b6d93b..ff824e11f0b6 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -287,16 +287,7 @@ static int tc574_probe(struct pcmcia_device *link)
287 dev->watchdog_timeo = TX_TIMEOUT; 287 dev->watchdog_timeo = TX_TIMEOUT;
288 288
289 return tc574_config(link); 289 return tc574_config(link);
290} /* tc574_attach */ 290}
291
292/*
293
294 This deletes a driver "instance". The device is de-registered
295 with Card Services. If it has been released, all local data
296 structures are freed. Otherwise, the structures will be freed
297 when the device is released.
298
299*/
300 291
301static void tc574_detach(struct pcmcia_device *link) 292static void tc574_detach(struct pcmcia_device *link)
302{ 293{
@@ -311,12 +302,6 @@ static void tc574_detach(struct pcmcia_device *link)
311 free_netdev(dev); 302 free_netdev(dev);
312} /* tc574_detach */ 303} /* tc574_detach */
313 304
314/*
315 tc574_config() is scheduled to run after a CARD_INSERTION event
316 is received, to configure the PCMCIA socket, and to make the
317 ethernet device available to the system.
318*/
319
320static const char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"}; 305static const char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"};
321 306
322static int tc574_config(struct pcmcia_device *link) 307static int tc574_config(struct pcmcia_device *link)
@@ -463,12 +448,6 @@ failed:
463 448
464} /* tc574_config */ 449} /* tc574_config */
465 450
466/*
467 After a card is removed, tc574_release() will unregister the net
468 device, and release the PCMCIA configuration. If the device is
469 still open, this will be postponed until it is closed.
470*/
471
472static void tc574_release(struct pcmcia_device *link) 451static void tc574_release(struct pcmcia_device *link)
473{ 452{
474 pcmcia_disable_device(link); 453 pcmcia_disable_device(link);
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 551759c25a74..a07e22295330 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -175,14 +175,6 @@ static const struct ethtool_ops netdev_ethtool_ops;
175 175
176static void tc589_detach(struct pcmcia_device *p_dev); 176static void tc589_detach(struct pcmcia_device *p_dev);
177 177
178/*======================================================================
179
180 tc589_attach() creates an "instance" of the driver, allocating
181 local data structures for one device. The device is registered
182 with Card Services.
183
184======================================================================*/
185
186static const struct net_device_ops el3_netdev_ops = { 178static const struct net_device_ops el3_netdev_ops = {
187 .ndo_open = el3_open, 179 .ndo_open = el3_open,
188 .ndo_stop = el3_close, 180 .ndo_stop = el3_close,
@@ -224,16 +216,7 @@ static int tc589_probe(struct pcmcia_device *link)
224 SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); 216 SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
225 217
226 return tc589_config(link); 218 return tc589_config(link);
227} /* tc589_attach */ 219}
228
229/*======================================================================
230
231 This deletes a driver "instance". The device is de-registered
232 with Card Services. If it has been released, all local data
233 structures are freed. Otherwise, the structures will be freed
234 when the device is released.
235
236======================================================================*/
237 220
238static void tc589_detach(struct pcmcia_device *link) 221static void tc589_detach(struct pcmcia_device *link)
239{ 222{
@@ -248,14 +231,6 @@ static void tc589_detach(struct pcmcia_device *link)
248 free_netdev(dev); 231 free_netdev(dev);
249} /* tc589_detach */ 232} /* tc589_detach */
250 233
251/*======================================================================
252
253 tc589_config() is scheduled to run after a CARD_INSERTION event
254 is received, to configure the PCMCIA socket, and to make the
255 ethernet device available to the system.
256
257======================================================================*/
258
259static int tc589_config(struct pcmcia_device *link) 234static int tc589_config(struct pcmcia_device *link)
260{ 235{
261 struct net_device *dev = link->priv; 236 struct net_device *dev = link->priv;
@@ -350,14 +325,6 @@ failed:
350 return -ENODEV; 325 return -ENODEV;
351} /* tc589_config */ 326} /* tc589_config */
352 327
353/*======================================================================
354
355 After a card is removed, tc589_release() will unregister the net
356 device, and release the PCMCIA configuration. If the device is
357 still open, this will be postponed until it is closed.
358
359======================================================================*/
360
361static void tc589_release(struct pcmcia_device *link) 328static void tc589_release(struct pcmcia_device *link)
362{ 329{
363 pcmcia_disable_device(link); 330 pcmcia_disable_device(link);
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index fb5a39ba4801..9e8b28b271ae 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -139,14 +139,6 @@ static const struct net_device_ops axnet_netdev_ops = {
139 .ndo_validate_addr = eth_validate_addr, 139 .ndo_validate_addr = eth_validate_addr,
140}; 140};
141 141
142/*======================================================================
143
144 axnet_attach() creates an "instance" of the driver, allocating
145 local data structures for one device. The device is registered
146 with Card Services.
147
148======================================================================*/
149
150static int axnet_probe(struct pcmcia_device *link) 142static int axnet_probe(struct pcmcia_device *link)
151{ 143{
152 axnet_dev_t *info; 144 axnet_dev_t *info;
@@ -175,15 +167,6 @@ static int axnet_probe(struct pcmcia_device *link)
175 return axnet_config(link); 167 return axnet_config(link);
176} /* axnet_attach */ 168} /* axnet_attach */
177 169
178/*======================================================================
179
180 This deletes a driver "instance". The device is de-registered
181 with Card Services. If it has been released, all local data
182 structures are freed. Otherwise, the structures will be freed
183 when the device is released.
184
185======================================================================*/
186
187static void axnet_detach(struct pcmcia_device *link) 170static void axnet_detach(struct pcmcia_device *link)
188{ 171{
189 struct net_device *dev = link->priv; 172 struct net_device *dev = link->priv;
@@ -246,14 +229,6 @@ static int get_prom(struct pcmcia_device *link)
246 return 1; 229 return 1;
247} /* get_prom */ 230} /* get_prom */
248 231
249/*======================================================================
250
251 axnet_config() is scheduled to run after a CARD_INSERTION event
252 is received, to configure the PCMCIA socket, and to make the
253 ethernet device available to the system.
254
255======================================================================*/
256
257static int try_io_port(struct pcmcia_device *link) 232static int try_io_port(struct pcmcia_device *link)
258{ 233{
259 int j, ret; 234 int j, ret;
@@ -392,14 +367,6 @@ failed:
392 return -ENODEV; 367 return -ENODEV;
393} /* axnet_config */ 368} /* axnet_config */
394 369
395/*======================================================================
396
397 After a card is removed, axnet_release() will unregister the net
398 device, and release the PCMCIA configuration. If the device is
399 still open, this will be postponed until it is closed.
400
401======================================================================*/
402
403static void axnet_release(struct pcmcia_device *link) 370static void axnet_release(struct pcmcia_device *link)
404{ 371{
405 pcmcia_disable_device(link); 372 pcmcia_disable_device(link);
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c
index a5d918ea5b13..b706a7249477 100644
--- a/drivers/net/pcmcia/com20020_cs.c
+++ b/drivers/net/pcmcia/com20020_cs.c
@@ -122,14 +122,6 @@ typedef struct com20020_dev_t {
122 struct net_device *dev; 122 struct net_device *dev;
123} com20020_dev_t; 123} com20020_dev_t;
124 124
125/*======================================================================
126
127 com20020_attach() creates an "instance" of the driver, allocating
128 local data structures for one device. The device is registered
129 with Card Services.
130
131======================================================================*/
132
133static int com20020_probe(struct pcmcia_device *p_dev) 125static int com20020_probe(struct pcmcia_device *p_dev)
134{ 126{
135 com20020_dev_t *info; 127 com20020_dev_t *info;
@@ -172,15 +164,6 @@ fail_alloc_info:
172 return -ENOMEM; 164 return -ENOMEM;
173} /* com20020_attach */ 165} /* com20020_attach */
174 166
175/*======================================================================
176
177 This deletes a driver "instance". The device is de-registered
178 with Card Services. If it has been released, all local data
179 structures are freed. Otherwise, the structures will be freed
180 when the device is released.
181
182======================================================================*/
183
184static void com20020_detach(struct pcmcia_device *link) 167static void com20020_detach(struct pcmcia_device *link)
185{ 168{
186 struct com20020_dev_t *info = link->priv; 169 struct com20020_dev_t *info = link->priv;
@@ -219,14 +202,6 @@ static void com20020_detach(struct pcmcia_device *link)
219 202
220} /* com20020_detach */ 203} /* com20020_detach */
221 204
222/*======================================================================
223
224 com20020_config() is scheduled to run after a CARD_INSERTION event
225 is received, to configure the PCMCIA socket, and to make the
226 device available to the system.
227
228======================================================================*/
229
230static int com20020_config(struct pcmcia_device *link) 205static int com20020_config(struct pcmcia_device *link)
231{ 206{
232 struct arcnet_local *lp; 207 struct arcnet_local *lp;
@@ -314,14 +289,6 @@ failed:
314 return -ENODEV; 289 return -ENODEV;
315} /* com20020_config */ 290} /* com20020_config */
316 291
317/*======================================================================
318
319 After a card is removed, com20020_release() will unregister the net
320 device, and release the PCMCIA configuration. If the device is
321 still open, this will be postponed until it is closed.
322
323======================================================================*/
324
325static void com20020_release(struct pcmcia_device *link) 292static void com20020_release(struct pcmcia_device *link)
326{ 293{
327 dev_dbg(&link->dev, "com20020_release\n"); 294 dev_dbg(&link->dev, "com20020_release\n");
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c
index d3c9f016f791..bf7dff96d881 100644
--- a/drivers/net/pcmcia/ibmtr_cs.c
+++ b/drivers/net/pcmcia/ibmtr_cs.c
@@ -121,14 +121,6 @@ static irqreturn_t ibmtr_interrupt(int irq, void *dev_id) {
121 return tok_interrupt(irq, dev); 121 return tok_interrupt(irq, dev);
122}; 122};
123 123
124/*======================================================================
125
126 ibmtr_attach() creates an "instance" of the driver, allocating
127 local data structures for one device. The device is registered
128 with Card Services.
129
130======================================================================*/
131
132static int __devinit ibmtr_attach(struct pcmcia_device *link) 124static int __devinit ibmtr_attach(struct pcmcia_device *link)
133{ 125{
134 ibmtr_dev_t *info; 126 ibmtr_dev_t *info;
@@ -161,15 +153,6 @@ static int __devinit ibmtr_attach(struct pcmcia_device *link)
161 return ibmtr_config(link); 153 return ibmtr_config(link);
162} /* ibmtr_attach */ 154} /* ibmtr_attach */
163 155
164/*======================================================================
165
166 This deletes a driver "instance". The device is de-registered
167 with Card Services. If it has been released, all local data
168 structures are freed. Otherwise, the structures will be freed
169 when the device is released.
170
171======================================================================*/
172
173static void ibmtr_detach(struct pcmcia_device *link) 156static void ibmtr_detach(struct pcmcia_device *link)
174{ 157{
175 struct ibmtr_dev_t *info = link->priv; 158 struct ibmtr_dev_t *info = link->priv;
@@ -194,14 +177,6 @@ static void ibmtr_detach(struct pcmcia_device *link)
194 kfree(info); 177 kfree(info);
195} /* ibmtr_detach */ 178} /* ibmtr_detach */
196 179
197/*======================================================================
198
199 ibmtr_config() is scheduled to run after a CARD_INSERTION event
200 is received, to configure the PCMCIA socket, and to make the
201 token-ring device available to the system.
202
203======================================================================*/
204
205static int __devinit ibmtr_config(struct pcmcia_device *link) 180static int __devinit ibmtr_config(struct pcmcia_device *link)
206{ 181{
207 ibmtr_dev_t *info = link->priv; 182 ibmtr_dev_t *info = link->priv;
@@ -297,14 +272,6 @@ failed:
297 return -ENODEV; 272 return -ENODEV;
298} /* ibmtr_config */ 273} /* ibmtr_config */
299 274
300/*======================================================================
301
302 After a card is removed, ibmtr_release() will unregister the net
303 device, and release the PCMCIA configuration. If the device is
304 still open, this will be postponed until it is closed.
305
306======================================================================*/
307
308static void ibmtr_release(struct pcmcia_device *link) 275static void ibmtr_release(struct pcmcia_device *link)
309{ 276{
310 ibmtr_dev_t *info = link->priv; 277 ibmtr_dev_t *info = link->priv;
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index 8e5730c42ce6..1eca4f5a6e78 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -434,13 +434,6 @@ static const struct net_device_ops mace_netdev_ops = {
434 .ndo_validate_addr = eth_validate_addr, 434 .ndo_validate_addr = eth_validate_addr,
435}; 435};
436 436
437/* ----------------------------------------------------------------------------
438nmclan_attach
439 Creates an "instance" of the driver, allocating local data
440 structures for one device. The device is registered with Card
441 Services.
442---------------------------------------------------------------------------- */
443
444static int nmclan_probe(struct pcmcia_device *link) 437static int nmclan_probe(struct pcmcia_device *link)
445{ 438{
446 mace_private *lp; 439 mace_private *lp;
@@ -472,14 +465,6 @@ static int nmclan_probe(struct pcmcia_device *link)
472 return nmclan_config(link); 465 return nmclan_config(link);
473} /* nmclan_attach */ 466} /* nmclan_attach */
474 467
475/* ----------------------------------------------------------------------------
476nmclan_detach
477 This deletes a driver "instance". The device is de-registered
478 with Card Services. If it has been released, all local data
479 structures are freed. Otherwise, the structures will be freed
480 when the device is released.
481---------------------------------------------------------------------------- */
482
483static void nmclan_detach(struct pcmcia_device *link) 468static void nmclan_detach(struct pcmcia_device *link)
484{ 469{
485 struct net_device *dev = link->priv; 470 struct net_device *dev = link->priv;
@@ -623,13 +608,6 @@ static int mace_init(mace_private *lp, unsigned int ioaddr, char *enet_addr)
623 return 0; 608 return 0;
624} /* mace_init */ 609} /* mace_init */
625 610
626/* ----------------------------------------------------------------------------
627nmclan_config
628 This routine is scheduled to run after a CARD_INSERTION event
629 is received, to configure the PCMCIA socket, and to make the
630 ethernet device available to the system.
631---------------------------------------------------------------------------- */
632
633static int nmclan_config(struct pcmcia_device *link) 611static int nmclan_config(struct pcmcia_device *link)
634{ 612{
635 struct net_device *dev = link->priv; 613 struct net_device *dev = link->priv;
@@ -710,12 +688,6 @@ failed:
710 return -ENODEV; 688 return -ENODEV;
711} /* nmclan_config */ 689} /* nmclan_config */
712 690
713/* ----------------------------------------------------------------------------
714nmclan_release
715 After a card is removed, nmclan_release() will unregister the
716 net device, and release the PCMCIA configuration. If the device
717 is still open, this will be postponed until it is closed.
718---------------------------------------------------------------------------- */
719static void nmclan_release(struct pcmcia_device *link) 691static void nmclan_release(struct pcmcia_device *link)
720{ 692{
721 dev_dbg(&link->dev, "nmclan_release\n"); 693 dev_dbg(&link->dev, "nmclan_release\n");
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 22987e6a685e..5d7d1d3088ae 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -237,14 +237,6 @@ static const struct net_device_ops pcnet_netdev_ops = {
237#endif 237#endif
238}; 238};
239 239
240/*======================================================================
241
242 pcnet_attach() creates an "instance" of the driver, allocating
243 local data structures for one device. The device is registered
244 with Card Services.
245
246======================================================================*/
247
248static int pcnet_probe(struct pcmcia_device *link) 240static int pcnet_probe(struct pcmcia_device *link)
249{ 241{
250 pcnet_dev_t *info; 242 pcnet_dev_t *info;
@@ -266,15 +258,6 @@ static int pcnet_probe(struct pcmcia_device *link)
266 return pcnet_config(link); 258 return pcnet_config(link);
267} /* pcnet_attach */ 259} /* pcnet_attach */
268 260
269/*======================================================================
270
271 This deletes a driver "instance". The device is de-registered
272 with Card Services. If it has been released, all local data
273 structures are freed. Otherwise, the structures will be freed
274 when the device is released.
275
276======================================================================*/
277
278static void pcnet_detach(struct pcmcia_device *link) 261static void pcnet_detach(struct pcmcia_device *link)
279{ 262{
280 struct net_device *dev = link->priv; 263 struct net_device *dev = link->priv;
@@ -461,14 +444,6 @@ static hw_info_t *get_hwired(struct pcmcia_device *link)
461 return &default_info; 444 return &default_info;
462} /* get_hwired */ 445} /* get_hwired */
463 446
464/*======================================================================
465
466 pcnet_config() is scheduled to run after a CARD_INSERTION event
467 is received, to configure the PCMCIA socket, and to make the
468 ethernet device available to the system.
469
470======================================================================*/
471
472static int try_io_port(struct pcmcia_device *link) 447static int try_io_port(struct pcmcia_device *link)
473{ 448{
474 int j, ret; 449 int j, ret;
@@ -665,14 +640,6 @@ failed:
665 return -ENODEV; 640 return -ENODEV;
666} /* pcnet_config */ 641} /* pcnet_config */
667 642
668/*======================================================================
669
670 After a card is removed, pcnet_release() will unregister the net
671 device, and release the PCMCIA configuration. If the device is
672 still open, this will be postponed until it is closed.
673
674======================================================================*/
675
676static void pcnet_release(struct pcmcia_device *link) 643static void pcnet_release(struct pcmcia_device *link)
677{ 644{
678 pcnet_dev_t *info = PRIV(link->priv); 645 pcnet_dev_t *info = PRIV(link->priv);
@@ -685,15 +652,6 @@ static void pcnet_release(struct pcmcia_device *link)
685 pcmcia_disable_device(link); 652 pcmcia_disable_device(link);
686} 653}
687 654
688/*======================================================================
689
690 The card status event handler. Mostly, this schedules other
691 stuff to run after an event is received. A CARD_REMOVAL event
692 also sets some flags to discourage the net drivers from trying
693 to talk to the card any more.
694
695======================================================================*/
696
697static int pcnet_suspend(struct pcmcia_device *link) 655static int pcnet_suspend(struct pcmcia_device *link)
698{ 656{
699 struct net_device *dev = link->priv; 657 struct net_device *dev = link->priv;
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index e4c4fb626572..0af2fc8ec164 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -299,14 +299,6 @@ static const struct net_device_ops smc_netdev_ops = {
299 .ndo_validate_addr = eth_validate_addr, 299 .ndo_validate_addr = eth_validate_addr,
300}; 300};
301 301
302/*======================================================================
303
304 smc91c92_attach() creates an "instance" of the driver, allocating
305 local data structures for one device. The device is registered
306 with Card Services.
307
308======================================================================*/
309
310static int smc91c92_probe(struct pcmcia_device *link) 302static int smc91c92_probe(struct pcmcia_device *link)
311{ 303{
312 struct smc_private *smc; 304 struct smc_private *smc;
@@ -338,15 +330,6 @@ static int smc91c92_probe(struct pcmcia_device *link)
338 return smc91c92_config(link); 330 return smc91c92_config(link);
339} /* smc91c92_attach */ 331} /* smc91c92_attach */
340 332
341/*======================================================================
342
343 This deletes a driver "instance". The device is de-registered
344 with Card Services. If it has been released, all local data
345 structures are freed. Otherwise, the structures will be freed
346 when the device is released.
347
348======================================================================*/
349
350static void smc91c92_detach(struct pcmcia_device *link) 333static void smc91c92_detach(struct pcmcia_device *link)
351{ 334{
352 struct net_device *dev = link->priv; 335 struct net_device *dev = link->priv;
@@ -819,14 +802,6 @@ static int check_sig(struct pcmcia_device *link)
819 return -ENODEV; 802 return -ENODEV;
820} 803}
821 804
822/*======================================================================
823
824 smc91c92_config() is scheduled to run after a CARD_INSERTION event
825 is received, to configure the PCMCIA socket, and to make the
826 ethernet device available to the system.
827
828======================================================================*/
829
830static int smc91c92_config(struct pcmcia_device *link) 805static int smc91c92_config(struct pcmcia_device *link)
831{ 806{
832 struct net_device *dev = link->priv; 807 struct net_device *dev = link->priv;
@@ -977,14 +952,6 @@ config_failed:
977 return -ENODEV; 952 return -ENODEV;
978} /* smc91c92_config */ 953} /* smc91c92_config */
979 954
980/*======================================================================
981
982 After a card is removed, smc91c92_release() will unregister the net
983 device, and release the PCMCIA configuration. If the device is
984 still open, this will be postponed until it is closed.
985
986======================================================================*/
987
988static void smc91c92_release(struct pcmcia_device *link) 955static void smc91c92_release(struct pcmcia_device *link)
989{ 956{
990 dev_dbg(&link->dev, "smc91c92_release\n"); 957 dev_dbg(&link->dev, "smc91c92_release\n");
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index 18cdc84a84bf..1fece617c069 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -266,33 +266,11 @@ static unsigned mii_rd(unsigned int ioaddr, u_char phyaddr, u_char phyreg);
266static void mii_wr(unsigned int ioaddr, u_char phyaddr, u_char phyreg, 266static void mii_wr(unsigned int ioaddr, u_char phyaddr, u_char phyreg,
267 unsigned data, int len); 267 unsigned data, int len);
268 268
269/*
270 * The event() function is this driver's Card Services event handler.
271 * It will be called by Card Services when an appropriate card status
272 * event is received. The config() and release() entry points are
273 * used to configure or release a socket, in response to card insertion
274 * and ejection events. They are invoked from the event handler.
275 */
276
277static int has_ce2_string(struct pcmcia_device * link); 269static int has_ce2_string(struct pcmcia_device * link);
278static int xirc2ps_config(struct pcmcia_device * link); 270static int xirc2ps_config(struct pcmcia_device * link);
279static void xirc2ps_release(struct pcmcia_device * link); 271static void xirc2ps_release(struct pcmcia_device * link);
280
281/****************
282 * The attach() and detach() entry points are used to create and destroy
283 * "instances" of the driver, where each instance represents everything
284 * needed to manage one actual PCMCIA card.
285 */
286
287static void xirc2ps_detach(struct pcmcia_device *p_dev); 272static void xirc2ps_detach(struct pcmcia_device *p_dev);
288 273
289/****************
290 * You'll also need to prototype all the functions that will actually
291 * be used to talk to your device. See 'pcmem_cs' for a good example
292 * of a fully self-sufficient driver; the other drivers rely more or
293 * less on other parts of the kernel.
294 */
295
296static irqreturn_t xirc2ps_interrupt(int irq, void *dev_id); 274static irqreturn_t xirc2ps_interrupt(int irq, void *dev_id);
297 275
298typedef struct local_info_t { 276typedef struct local_info_t {
@@ -500,16 +478,6 @@ static const struct net_device_ops netdev_ops = {
500 .ndo_validate_addr = eth_validate_addr, 478 .ndo_validate_addr = eth_validate_addr,
501}; 479};
502 480
503/****************
504 * xirc2ps_attach() creates an "instance" of the driver, allocating
505 * local data structures for one device. The device is registered
506 * with Card Services.
507 *
508 * The dev_link structure is initialized, but we don't actually
509 * configure the card at this point -- we wait until we receive a
510 * card insertion event.
511 */
512
513static int 481static int
514xirc2ps_probe(struct pcmcia_device *link) 482xirc2ps_probe(struct pcmcia_device *link)
515{ 483{
@@ -539,13 +507,6 @@ xirc2ps_probe(struct pcmcia_device *link)
539 return xirc2ps_config(link); 507 return xirc2ps_config(link);
540} /* xirc2ps_attach */ 508} /* xirc2ps_attach */
541 509
542/****************
543 * This deletes a driver "instance". The device is de-registered
544 * with Card Services. If it has been released, all local data
545 * structures are freed. Otherwise, the structures will be freed
546 * when the device is released.
547 */
548
549static void 510static void
550xirc2ps_detach(struct pcmcia_device *link) 511xirc2ps_detach(struct pcmcia_device *link)
551{ 512{
@@ -733,11 +694,6 @@ static int pcmcia_get_mac_ce(struct pcmcia_device *p_dev,
733}; 694};
734 695
735 696
736/****************
737 * xirc2ps_config() is scheduled to run after a CARD_INSERTION event
738 * is received, to configure the PCMCIA socket, and to make the
739 * ethernet device available to the system.
740 */
741static int 697static int
742xirc2ps_config(struct pcmcia_device * link) 698xirc2ps_config(struct pcmcia_device * link)
743{ 699{
@@ -861,10 +817,6 @@ xirc2ps_config(struct pcmcia_device * link)
861 if ((err=pcmcia_request_irq(link, xirc2ps_interrupt))) 817 if ((err=pcmcia_request_irq(link, xirc2ps_interrupt)))
862 goto config_error; 818 goto config_error;
863 819
864 /****************
865 * This actually configures the PCMCIA socket -- setting up
866 * the I/O windows and the interrupt mapping.
867 */
868 link->config_flags |= CONF_ENABLE_IRQ; 820 link->config_flags |= CONF_ENABLE_IRQ;
869 if (do_sound) 821 if (do_sound)
870 link->config_flags |= CONF_ENABLE_SPKR; 822 link->config_flags |= CONF_ENABLE_SPKR;
@@ -980,11 +932,6 @@ xirc2ps_config(struct pcmcia_device * link)
980 return -ENODEV; 932 return -ENODEV;
981} /* xirc2ps_config */ 933} /* xirc2ps_config */
982 934
983/****************
984 * After a card is removed, xirc2ps_release() will unregister the net
985 * device, and release the PCMCIA configuration. If the device is
986 * still open, this will be postponed until it is closed.
987 */
988static void 935static void
989xirc2ps_release(struct pcmcia_device *link) 936xirc2ps_release(struct pcmcia_device *link)
990{ 937{