diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-08-08 06:27:40 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-09-29 11:20:25 -0400 |
commit | 06b3a1d12f41b592972643f8b84015d6c03dc576 (patch) | |
tree | 9c2e9450a74f3cea78d8819bfcd305f3f6c40b0d /drivers/net/wireless/orinoco | |
parent | 2e9b981a7c63ee8278df6823f8389d69dad1a499 (diff) |
pcmcia: avoid messages on module (un)loading
printk() statements on module load or unload are frowned upon. Also,
add a few __init or __exit declarations.
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/net/wireless/orinoco')
-rw-r--r-- | drivers/net/wireless/orinoco/orinoco_cs.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/orinoco/spectrum_cs.c | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c index 28212661f34a..2b1f554af0b2 100644 --- a/drivers/net/wireless/orinoco/orinoco_cs.c +++ b/drivers/net/wireless/orinoco/orinoco_cs.c | |||
@@ -281,12 +281,6 @@ static int orinoco_cs_resume(struct pcmcia_device *link) | |||
281 | /* Module initialization */ | 281 | /* Module initialization */ |
282 | /********************************************************************/ | 282 | /********************************************************************/ |
283 | 283 | ||
284 | /* Can't be declared "const" or the whole __initdata section will | ||
285 | * become const */ | ||
286 | static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION | ||
287 | " (David Gibson <hermes@gibson.dropbear.id.au>, " | ||
288 | "Pavel Roskin <proski@gnu.org>, et al)"; | ||
289 | |||
290 | static struct pcmcia_device_id orinoco_cs_ids[] = { | 284 | static struct pcmcia_device_id orinoco_cs_ids[] = { |
291 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), /* 3Com AirConnect PCI 777A */ | 285 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), /* 3Com AirConnect PCI 777A */ |
292 | PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), /* Lucent Orinoco and old Intersil */ | 286 | PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), /* Lucent Orinoco and old Intersil */ |
@@ -389,8 +383,6 @@ static struct pcmcia_driver orinoco_driver = { | |||
389 | static int __init | 383 | static int __init |
390 | init_orinoco_cs(void) | 384 | init_orinoco_cs(void) |
391 | { | 385 | { |
392 | printk(KERN_DEBUG "%s\n", version); | ||
393 | |||
394 | return pcmcia_register_driver(&orinoco_driver); | 386 | return pcmcia_register_driver(&orinoco_driver); |
395 | } | 387 | } |
396 | 388 | ||
diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/orinoco/spectrum_cs.c index 5906e9af9064..1314cf204f12 100644 --- a/drivers/net/wireless/orinoco/spectrum_cs.c +++ b/drivers/net/wireless/orinoco/spectrum_cs.c | |||
@@ -345,12 +345,6 @@ spectrum_cs_resume(struct pcmcia_device *link) | |||
345 | /* Module initialization */ | 345 | /* Module initialization */ |
346 | /********************************************************************/ | 346 | /********************************************************************/ |
347 | 347 | ||
348 | /* Can't be declared "const" or the whole __initdata section will | ||
349 | * become const */ | ||
350 | static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION | ||
351 | " (Pavel Roskin <proski@gnu.org>," | ||
352 | " David Gibson <hermes@gibson.dropbear.id.au>, et al)"; | ||
353 | |||
354 | static struct pcmcia_device_id spectrum_cs_ids[] = { | 348 | static struct pcmcia_device_id spectrum_cs_ids[] = { |
355 | PCMCIA_DEVICE_MANF_CARD(0x026c, 0x0001), /* Symbol Spectrum24 LA4137 */ | 349 | PCMCIA_DEVICE_MANF_CARD(0x026c, 0x0001), /* Symbol Spectrum24 LA4137 */ |
356 | PCMCIA_DEVICE_MANF_CARD(0x0104, 0x0001), /* Socket Communications CF */ | 350 | PCMCIA_DEVICE_MANF_CARD(0x0104, 0x0001), /* Socket Communications CF */ |
@@ -372,8 +366,6 @@ static struct pcmcia_driver orinoco_driver = { | |||
372 | static int __init | 366 | static int __init |
373 | init_spectrum_cs(void) | 367 | init_spectrum_cs(void) |
374 | { | 368 | { |
375 | printk(KERN_DEBUG "%s\n", version); | ||
376 | |||
377 | return pcmcia_register_driver(&orinoco_driver); | 369 | return pcmcia_register_driver(&orinoco_driver); |
378 | } | 370 | } |
379 | 371 | ||