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>

4 files changed, 0 insertions, 20 deletions

diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index e932526d456..c7b482d15e2 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -54,8 +54,6 @@
                            __func__ , ## args);         \
         } while (0)
 
-static char *version = "cm4000_cs.c v2.4.0gm6 - All bugs added by Harald Welte";
-
 #define T_1SEC          (HZ)
 #define T_10MSEC        msecs_to_jiffies(10)
 #define T_20MSEC        msecs_to_jiffies(20)
@@ -1889,8 +1887,6 @@ static int __init cmm_init(void)
 {
         int rc;
 
-        printk(KERN_INFO "%s\n", version);
-
         cmm_class = class_create(THIS_MODULE, "cardman_4000");
         if (IS_ERR(cmm_class))
                 return PTR_ERR(cmm_class);
@@ -1915,7 +1911,6 @@ static int __init cmm_init(void)
 
 static void __exit cmm_exit(void)
 {
-        printk(KERN_INFO MODULE_NAME ": unloading\n");
         pcmcia_unregister_driver(&cm4000_driver);
         unregister_chrdev(major, DEVICE_NAME);
         class_destroy(cmm_class);
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index d7e2bec0248..bf2f046fc2c 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -48,9 +48,6 @@
                            __func__ , ## args);         \
         } while (0)
 
-static char *version =
-"OMNIKEY CardMan 4040 v1.1.0gm5 - All bugs added by Harald Welte";
-
 #define CCID_DRIVER_BULK_DEFAULT_TIMEOUT        (150*HZ)
 #define CCID_DRIVER_ASYNC_POWERUP_TIMEOUT       (35*HZ)
 #define CCID_DRIVER_MINIMUM_TIMEOUT             (3*HZ)
@@ -653,7 +650,6 @@ static int __init cm4040_init(void)
 {
         int rc;
 
-        printk(KERN_INFO "%s\n", version);
         cmx_class = class_create(THIS_MODULE, "cardman_4040");
         if (IS_ERR(cmx_class))
                 return PTR_ERR(cmx_class);
@@ -678,7 +674,6 @@ static int __init cm4040_init(void)
 
 static void __exit cm4040_exit(void)
 {
-        printk(KERN_INFO MODULE_NAME ": unloading\n");
         pcmcia_unregister_driver(&reader_driver);
         unregister_chrdev(major, DEVICE_NAME);
         class_destroy(cmx_class);
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c
index a1b80834669..94b8eb4d691 100644
--- a/drivers/char/pcmcia/ipwireless/main.c
+++ b/drivers/char/pcmcia/ipwireless/main.c
@@ -307,9 +307,6 @@ static int __init init_ipwireless(void)
 {
         int ret;
 
-        printk(KERN_INFO IPWIRELESS_PCCARD_NAME " "
-               IPWIRELESS_PCMCIA_VERSION " by " IPWIRELESS_PCMCIA_AUTHOR "\n");
-
         ret = ipwireless_tty_init();
         if (ret != 0)
                 return ret;
@@ -326,9 +323,6 @@ static int __init init_ipwireless(void)
  */
 static void __exit exit_ipwireless(void)
 {
-        printk(KERN_INFO IPWIRELESS_PCCARD_NAME " "
-                        IPWIRELESS_PCMCIA_VERSION " removed\n");
-
         pcmcia_unregister_driver(&me);
         ipwireless_tty_release();
 }
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 493dba51115..d97a53cccdc 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -2809,8 +2809,6 @@ static void synclink_cs_cleanup(void)
 {
         int rc;
 
-        printk("Unloading %s: version %s\n", driver_name, driver_version);
-
         while(mgslpc_device_list)
                 mgslpc_remove_device(mgslpc_device_list);
 
@@ -2833,8 +2831,6 @@ static int __init synclink_cs_init(void)
             BREAKPOINT();
     }
 
-    printk("%s %s\n", driver_name, driver_version);
-
     if ((rc = pcmcia_register_driver(&mgslpc_driver)) < 0)
             return rc;