lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Dominik Brodowski
2010-08-01 11:21:14 +02:00
parent 00990e7ce0
commit 1cc745d1cd
16 changed files with 8 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/char/pcmcia/synclink_cs.c
View File

@@ -592,13 +592,6 @@ static int mgslpc_config(struct pcmcia_device *link)
info->io_base = link->resource[0]->start; info->io_base = link->resource[0]->start;
info->irq_level = link->irq; 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; return 0;
failed: failed:

3
drivers/isdn/hisax/avma1_cs.c
View File

@@ -162,9 +162,6 @@ static int __devinit avma1cs_config(struct pcmcia_device *link)
return -ENODEV; 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[0] = link->irq;
icard.para[1] = link->resource[0]->start; icard.para[1] = link->resource[0]->start;
icard.protocol = isdnprot; icard.protocol = isdnprot;

10
drivers/isdn/hisax/elsa_cs.c
View File

@@ -196,16 +196,6 @@ static int __devinit elsa_cs_config(struct pcmcia_device *link)
if (i != 0) if (i != 0)
goto failed; 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[0] = link->irq;
icard.para[1] = link->resource[0]->start; icard.para[1] = link->resource[0]->start;
icard.protocol = protocol; icard.protocol = protocol;

12
drivers/isdn/hisax/sedlbauer_cs.c
View File

@@ -205,18 +205,6 @@ static int __devinit sedlbauer_config(struct pcmcia_device *link)
if (ret) if (ret)
goto failed; 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[0] = link->irq;
icard.para[1] = link->resource[0]->start; icard.para[1] = link->resource[0]->start;
icard.protocol = protocol; icard.protocol = protocol;

10
drivers/isdn/hisax/teles_cs.c
View File

@@ -183,16 +183,6 @@ static int __devinit teles_cs_config(struct pcmcia_device *link)
if (i != 0) if (i != 0)
goto cs_failed; 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[0] = link->irq;
icard.para[1] = link->resource[0]->start; icard.para[1] = link->resource[0]->start;
icard.protocol = protocol; icard.protocol = protocol;

11
drivers/net/wireless/airo_cs.c
View File

@@ -193,17 +193,6 @@ static int airo_config(struct pcmcia_device *link)
if (!((local_info_t *)link->priv)->eth_dev) if (!((local_info_t *)link->priv)->eth_dev)
goto failed; 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; return 0;
failed: failed:

15
drivers/net/wireless/hostap/hostap_cs.c
View File

@@ -544,19 +544,6 @@ static int prism2_config(struct pcmcia_device *link)
spin_unlock_irqrestore(&local->irq_init_lock, flags); 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; local->shutdown = 0;
sandisk_enable_wireless(dev); sandisk_enable_wireless(dev);
@@ -568,7 +555,7 @@ static int prism2_config(struct pcmcia_device *link)
return ret; return ret;
failed_unlock: failed_unlock:
spin_unlock_irqrestore(&local->irq_init_lock, flags); spin_unlock_irqrestore(&local->irq_init_lock, flags);
failed: failed:
kfree(hw_priv); kfree(hw_priv);
prism2_release((u_long)link); prism2_release((u_long)link);

7
drivers/pcmcia/ds.c
View File

@@ -277,6 +277,8 @@ static int pcmcia_device_probe(struct device *dev)
if (!ret) { if (!ret) {
p_dev->config_base = cis_config.base; p_dev->config_base = cis_config.base;
p_dev->config_regs = cis_config.rmask[0]; p_dev->config_regs = cis_config.rmask[0];
dev_dbg(dev, "base %x, regs %x", p_dev->config_base,
p_dev->config_regs);
} else { } else {
dev_printk(KERN_INFO, dev, dev_printk(KERN_INFO, dev,
"pcmcia: could not parse base and rmask0 of CIS\n"); "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); p_drv->drv.name, ret);
goto put_module; 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); mutex_lock(&s->ops_mutex);
if ((s->pcmcia_pfc) && if ((s->pcmcia_pfc) &&

15
drivers/scsi/pcmcia/nsp_cs.c
View File

@@ -1687,21 +1687,6 @@ static int nsp_cs_config(struct pcmcia_device *link)
info->host = host; 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; return 0;
cs_failed: cs_failed:

9
drivers/staging/comedi/drivers/cb_das16_cs.c
View File

@@ -745,15 +745,6 @@ static void das16cs_pcmcia_config(struct pcmcia_device *link)
if (ret) if (ret)
goto failed; 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; return;
failed: failed:

9
drivers/staging/comedi/drivers/das08_cs.c
View File

@@ -235,15 +235,6 @@ static void das08_pcmcia_config(struct pcmcia_device *link)
if (ret) if (ret)
goto failed; 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; return;
failed: failed:

9
drivers/staging/comedi/drivers/ni_daq_700.c
View File

@@ -568,15 +568,6 @@ static void dio700_config(struct pcmcia_device *link)
if (ret != 0) if (ret != 0)
goto failed; 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; return;
failed: failed:

9
drivers/staging/comedi/drivers/ni_daq_dio24.c
View File

@@ -319,15 +319,6 @@ static void dio24_config(struct pcmcia_device *link)
if (ret) if (ret)
goto failed; 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; return;
failed: failed:

9
drivers/staging/comedi/drivers/ni_labpc_cs.c
View File

@@ -297,15 +297,6 @@ static void labpc_config(struct pcmcia_device *link)
if (ret) if (ret)
goto failed; 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; return;
failed: failed:

9
drivers/staging/comedi/drivers/quatech_daqp_cs.c
View File

@@ -1103,15 +1103,6 @@ static void daqp_cs_config(struct pcmcia_device *link)
if (ret) if (ret)
goto failed; 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; return;
failed: failed:

8
drivers/usb/host/sl811_cs.c
View File

@@ -164,14 +164,6 @@ static int sl811_cs_config(struct pcmcia_device *link)
if (ret) if (ret)
goto failed; 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) if (sl811_hc_init(parent, link->resource[0]->start, link->irq)
< 0) { < 0) {
failed: failed: