pcmcia: remove the "Finally, report what we've done" message

Remove this unnecessary message -- this info is either available
in sysfs or by enabling dynamic debug from the PCMCIA core.

CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-scsi@vger.kernel.org
CC: linux-usb@vger.kernel.org
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index a343b8f817e499a05651eba8bdb1488c64478dda..7c71913714ca782316daaa504aad2ec437fb75ed 100644 (file)
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -592,13 +592,6 @@ static int mgslpc_config(struct pcmcia_device *link)
 
     info->io_base = link->resource[0]->start;
     info->irq_level = link->irq;
-
-    dev_info(&link->dev, "index 0x%02x:",
-           link->config_index);
-    printk(", irq %d", link->irq);
-    if (link->resource[0])
-           printk(", io %pR", link->resource[0]);
-    printk("\n");
     return 0;
 
 failed:

diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index cb09f0cacd12cc286a398db82728c58375927701..47590e0a63dcba72c26c2b1e3ac49729b11031ee 100644 (file)
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -162,9 +162,6 @@ static int __devinit avma1cs_config(struct pcmcia_device *link)
        return -ENODEV;
     }
 
-    printk(KERN_NOTICE "avma1_cs: checking at i/o %#x, irq %d\n",
-               (unsigned int) link->resource[0]->start, link->irq);
-
     icard.para[0] = link->irq;
     icard.para[1] = link->resource[0]->start;
     icard.protocol = isdnprot;

diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
index f203a52aab2a32f9d6cd76da34ab8013f8ff5cd1..b37b9f0f7fdc450c991deda17d9f153666ecb7e4 100644 (file)
--- a/drivers/isdn/hisax/elsa_cs.c
+++ b/drivers/isdn/hisax/elsa_cs.c
@@ -196,16 +196,6 @@ static int __devinit elsa_cs_config(struct pcmcia_device *link)
     if (i != 0)
        goto failed;
 
-    /* Finally, report what we've done */
-    dev_info(&link->dev, "index 0x%02x: ",
-           link->config_index);
-    printk(", irq %d", link->irq);
-    if (link->resource[0])
-       printk(" & %pR", link->resource[0]);
-    if (link->resource[1])
-       printk(" & %pR", link->resource[1]);
-    printk("\n");
-
     icard.para[0] = link->irq;
     icard.para[1] = link->resource[0]->start;
     icard.protocol = protocol;

diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c
index a88c88f6cdebe8263ed84fd3a742f0e13cd75c73..ff17dba175c4375ecf5361046e69bfa3e9b449a2 100644 (file)
--- a/drivers/isdn/hisax/sedlbauer_cs.c
+++ b/drivers/isdn/hisax/sedlbauer_cs.c
@@ -205,18 +205,6 @@ static int __devinit sedlbauer_config(struct pcmcia_device *link)
     if (ret)
            goto failed;
 
-    /* Finally, report what we've done */
-    dev_info(&link->dev, "index 0x%02x:",
-          link->config_index);
-    if (link->vpp)
-       printk(", Vpp %d.%d", link->vpp/10, link->vpp%10);
-    printk(", irq %d", link->irq);
-    if (link->resource[0])
-       printk(" & %pR", link->resource[0]);
-    if (link->resource[1])
-       printk(" & %pR", link->resource[1]);
-    printk("\n");
-
     icard.para[0] = link->irq;
     icard.para[1] = link->resource[0]->start;
     icard.protocol = protocol;

diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
index 05a5631963bb22da97f5ce603ada2e7ffd5c57f2..13ba9abfc9b5c1732df5eb2db3123deacb70cae9 100644 (file)
--- a/drivers/isdn/hisax/teles_cs.c
+++ b/drivers/isdn/hisax/teles_cs.c
@@ -183,16 +183,6 @@ static int __devinit teles_cs_config(struct pcmcia_device *link)
     if (i != 0)
       goto cs_failed;
 
-    /* Finally, report what we've done */
-    dev_info(&link->dev, "index 0x%02x:",
-           link->config_index);
-    printk(", irq %d", link->irq);
-    if (link->resource[0])
-       printk(" & %pR", link->resource[0]);
-    if (link->resource[1])
-       printk(" & %pR", link->resource[1]);
-    printk("\n");
-
     icard.para[0] = link->irq;
     icard.para[1] = link->resource[0]->start;
     icard.protocol = protocol;

diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index 77682f27772b9887c2be29c661114e6501c3ea0a..4067bf1cdeb4d098980dc28dc7529385a5edea86 100644 (file)
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -193,17 +193,6 @@ static int airo_config(struct pcmcia_device *link)
        if (!((local_info_t *)link->priv)->eth_dev)
                goto failed;
 
-       /* Finally, report what we've done */
-       dev_info(&link->dev, "index 0x%02x: ",
-              link->config_index);
-       if (link->vpp)
-               printk(", Vpp %d.%d", link->vpp/10, link->vpp%10);
-       printk(", irq %d", link->irq);
-       if (link->resource[0])
-               printk(" & %pR", link->resource[0]);
-       if (link->resource[1])
-               printk(" & %pR", link->resource[1]);
-       printk("\n");
        return 0;
 
  failed:

diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index e57b20134d39fe54de6f1eaaeab096442ae04ef0..d6ff0c7b7d948227c8ebe620088b2804f0c9f1ef 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -544,19 +544,6 @@ static int prism2_config(struct pcmcia_device *link)
 
        spin_unlock_irqrestore(&local->irq_init_lock, flags);
 
-       /* Finally, report what we've done */
-       printk(KERN_INFO "%s: index 0x%02x: ",
-              dev_info, link->config_index);
-       if (link->vpp)
-               printk(", Vpp %d.%d", link->vpp / 10,
-                      link->vpp % 10);
-       printk(", irq %d", link->irq);
-       if (link->resource[0])
-               printk(" & %pR", link->resource[0]);
-       if (link->resource[1])
-               printk(" & %pR", link->resource[1]);
-       printk("\n");
-
        local->shutdown = 0;
 
        sandisk_enable_wireless(dev);
@@ -568,7 +555,7 @@ static int prism2_config(struct pcmcia_device *link)
        return ret;
 
  failed_unlock:
-        spin_unlock_irqrestore(&local->irq_init_lock, flags);
+       spin_unlock_irqrestore(&local->irq_init_lock, flags);
  failed:
        kfree(hw_priv);
        prism2_release((u_long)link);

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index dd43bd33a9e34e9df09101e925b09cb5671a7f15..912c7408289162d654d5a2232e973be9d74c65e2 100644 (file)
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -277,6 +277,8 @@ static int pcmcia_device_probe(struct device *dev)
        if (!ret) {
                p_dev->config_base = cis_config.base;
                p_dev->config_regs = cis_config.rmask[0];
+               dev_dbg(dev, "base %x, regs %x", p_dev->config_base,
+                       p_dev->config_regs);
        } else {
                dev_printk(KERN_INFO, dev,
                           "pcmcia: could not parse base and rmask0 of CIS\n");
@@ -290,6 +292,11 @@ static int pcmcia_device_probe(struct device *dev)
                           p_drv->drv.name, ret);
                goto put_module;
        }
+       dev_dbg(dev, "%s bound: Vpp %d.%d, idx %x, IRQ %d", p_drv->drv.name,
+               p_dev->vpp/10, p_dev->vpp%10, p_dev->config_index, p_dev->irq);
+       dev_dbg(dev, "resources: ioport %pR %pR iomem %pR %pR %pR",
+               p_dev->resource[0], p_dev->resource[1], p_dev->resource[2],
+               p_dev->resource[3], p_dev->resource[4]);
 
        mutex_lock(&s->ops_mutex);
        if ((s->pcmcia_pfc) &&

diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 3b90ad9d1956dab7ee23aff985109a70bf9973fc..2b4a1a82d5296260d8f8f05d915c0b83e8689913 100644 (file)
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1687,21 +1687,6 @@ static int nsp_cs_config(struct pcmcia_device *link)
 
        info->host = host;
 
-       /* Finally, report what we've done */
-       printk(KERN_INFO "nsp_cs: index 0x%02x: ",
-              link->config_index);
-       if (link->vpp) {
-               printk(", Vpp %d.%d", link->vpp/10, link->vpp%10);
-       }
-       printk(", irq %d", link->irq);
-       if (link->resource[0])
-               printk(", io %pR", link->resource[0]);
-       if (link->resource[1])
-               printk(" & %pR", link->resource[1]);
-       if (link->resource[2])
-               printk(", mem %pR", link->resource[2]);
-       printk("\n");
-
        return 0;
 
  cs_failed:

diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index c43c68922c741249143e8c15124d0154a5ea4f7c..0c4b27c13eb7d38afed4f2f10a3ac84e05643bde 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -745,15 +745,6 @@ static void das16cs_pcmcia_config(struct pcmcia_device *link)
        if (ret)
                goto failed;
 
-       /* Finally, report what we've done */
-       dev_info(&link->dev, "index 0x%02x", link->config_index);
-       printk(", irq %u", link->irq);
-       if (link->resource[0])
-               printk(", io %pR", link->resource[0]);
-       if (link->resource[1])
-               printk(", io %pR", link->resource[1]);
-       printk("\n");
-
        return;
 
 failed:

diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c
index d3959093381ba7a24b47d3214370fc78b3be25a6..6d893253de453c28d7d49a2648af8e60eadd30eb 100644 (file)
--- a/drivers/staging/comedi/drivers/das08_cs.c
+++ b/drivers/staging/comedi/drivers/das08_cs.c
@@ -235,15 +235,6 @@ static void das08_pcmcia_config(struct pcmcia_device *link)
        if (ret)
                goto failed;
 
-       /* Finally, report what we've done */
-       dev_info(&link->dev, "index 0x%02x", link->config_index);
-       printk(", irq %u", link->irq);
-       if (link->resource[0])
-               printk(", io %pR", link->resource[0]);
-       if (link->resource[1])
-               printk(" & %pR", link->resource[1]);
-       printk("\n");
-
        return;
 
 failed:

diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index 7129b0ca4c8bfe5b5858059abda6b8338da9bc6c..52441255e2bd3d25ba53cb17a48718a9482c1951 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -568,15 +568,6 @@ static void dio700_config(struct pcmcia_device *link)
        if (ret != 0)
                goto failed;
 
-       /* Finally, report what we've done */
-       dev_info(&link->dev, "index 0x%02x", link->config_index);
-       printk(", irq %d", link->irq);
-       if (link->resource[0])
-               printk(", io %pR", link->resource[0]);
-       if (link->resource[1])
-               printk(" & %pR", link->resource[1]);
-       printk("\n");
-
        return;
 
 failed:

diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c
index 4defdda2bfaf8ff3359da2fe2122011a5347f168..54dda4a4503958277acc57f23d170744cada1b90 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_daq_dio24.c
+++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c
@@ -319,15 +319,6 @@ static void dio24_config(struct pcmcia_device *link)
        if (ret)
                goto failed;
 
-       /* Finally, report what we've done */
-       dev_info(&link->dev, "index 0x%02x", link->config_index);
-       printk(", irq %d", link->irq);
-       if (link->resource[0])
-               printk(" & %pR", link->resource[0]);
-       if (link->resource[1])
-               printk(" & %pR", link->resource[1]);
-       printk("\n");
-
        return;
 
 failed:

diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index 5123b3131c51c9283134da19678f04b5b9c1a654..22119f2a292e7df89b3d462098538796969e4c69 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -297,15 +297,6 @@ static void labpc_config(struct pcmcia_device *link)
        if (ret)
                goto failed;
 
-       /* Finally, report what we've done */
-       dev_info(&link->dev, "index 0x%02x", link->config_index);
-       printk(", irq %d", link->irq);
-       if (link->resource[0])
-               printk(" & %pR", link->resource[0]);
-       if (link->resource[1])
-               printk(" & %pR", link->resource[1]);
-       printk("\n");
-
        return;
 
 failed:

diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index afd283d0e7113bf05be06942816157f5426d0399..de37ff70a9e7587a3bbb39fba1d208a33819b962 100644 (file)
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -1103,15 +1103,6 @@ static void daqp_cs_config(struct pcmcia_device *link)
        if (ret)
                goto failed;
 
-       /* Finally, report what we've done */
-       dev_info(&link->dev, "index 0x%02x", link->config_index);
-       printk(", irq %u", link->irq);
-       if (link->resource[0])
-               printk(" & %pR", link->resource[0]);
-       if (link->resource[1])
-               printk(" & %pR", link->resource[1]);
-       printk("\n");
-
        return;
 
 failed:

diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c
index 81d7eeacdf6a6f5dcee650171f3e6b8b07cf9103..9ce95cdfc9ef8ddfc0dee820bb18798e4a401cf6 100644 (file)
--- a/drivers/usb/host/sl811_cs.c
+++ b/drivers/usb/host/sl811_cs.c
@@ -164,14 +164,6 @@ static int sl811_cs_config(struct pcmcia_device *link)
        if (ret)
                goto failed;
 
-       dev_info(&link->dev, "index 0x%02x: ",
-               link->config_index);
-       if (link->vpp)
-               printk(", Vpp %d.%d", link->vpp/10, link->vpp%10);
-       printk(", irq %d", link->irq);
-       printk(", io %pR", link->resource[0]);
-       printk("\n");
-
        if (sl811_hc_init(parent, link->resource[0]->start, link->irq)
                        < 0) {
 failed: