Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+8 -144
-3
drivers/isdn/hisax/avma1_cs.c
··· 162 162 return -ENODEV; 163 163 } 164 164 165 - printk(KERN_NOTICE "avma1_cs: checking at i/o %#x, irq %d\n", 166 - (unsigned int) link->resource[0]->start, link->irq); 167 - 168 165 icard.para[0] = link->irq; 169 166 icard.para[1] = link->resource[0]->start; 170 167 icard.protocol = isdnprot;
-10
drivers/isdn/hisax/elsa_cs.c
··· 196 196 if (i != 0) 197 197 goto failed; 198 198 199 - /* Finally, report what we've done */ 200 - dev_info(&link->dev, "index 0x%02x: ", 201 - link->config_index); 202 - printk(", irq %d", link->irq); 203 - if (link->resource[0]) 204 - printk(" & %pR", link->resource[0]); 205 - if (link->resource[1]) 206 - printk(" & %pR", link->resource[1]); 207 - printk("\n"); 208 - 209 199 icard.para[0] = link->irq; 210 200 icard.para[1] = link->resource[0]->start; 211 201 icard.protocol = protocol;
-12
drivers/isdn/hisax/sedlbauer_cs.c
··· 205 205 if (ret) 206 206 goto failed; 207 207 208 - /* Finally, report what we've done */ 209 - dev_info(&link->dev, "index 0x%02x:", 210 - link->config_index); 211 - if (link->vpp) 212 - printk(", Vpp %d.%d", link->vpp/10, link->vpp%10); 213 - printk(", irq %d", link->irq); 214 - if (link->resource[0]) 215 - printk(" & %pR", link->resource[0]); 216 - if (link->resource[1]) 217 - printk(" & %pR", link->resource[1]); 218 - printk("\n"); 219 - 220 208 icard.para[0] = link->irq; 221 209 icard.para[1] = link->resource[0]->start; 222 210 icard.protocol = protocol;
-10
drivers/isdn/hisax/teles_cs.c
··· 183 183 if (i != 0) 184 184 goto cs_failed; 185 185 186 - /* Finally, report what we've done */ 187 - dev_info(&link->dev, "index 0x%02x:", 188 - link->config_index); 189 - printk(", irq %d", link->irq); 190 - if (link->resource[0]) 191 - printk(" & %pR", link->resource[0]); 192 - if (link->resource[1]) 193 - printk(" & %pR", link->resource[1]); 194 - printk("\n"); 195 - 196 186 icard.para[0] = link->irq; 197 187 icard.para[1] = link->resource[0]->start; 198 188 icard.protocol = protocol;
-11
drivers/net/wireless/airo_cs.c
··· 193 193 if (!((local_info_t *)link->priv)->eth_dev) 194 194 goto failed; 195 195 196 - /* Finally, report what we've done */ 197 - dev_info(&link->dev, "index 0x%02x: ", 198 - link->config_index); 199 - if (link->vpp) 200 - printk(", Vpp %d.%d", link->vpp/10, link->vpp%10); 201 - printk(", irq %d", link->irq); 202 - if (link->resource[0]) 203 - printk(" & %pR", link->resource[0]); 204 - if (link->resource[1]) 205 - printk(" & %pR", link->resource[1]); 206 - printk("\n"); 207 196 return 0; 208 197 209 198 failed:
+1 -14
drivers/net/wireless/hostap/hostap_cs.c
··· 544 544 545 545 spin_unlock_irqrestore(&local->irq_init_lock, flags); 546 546 547 - /* Finally, report what we've done */ 548 - printk(KERN_INFO "%s: index 0x%02x: ", 549 - dev_info, link->config_index); 550 - if (link->vpp) 551 - printk(", Vpp %d.%d", link->vpp / 10, 552 - link->vpp % 10); 553 - printk(", irq %d", link->irq); 554 - if (link->resource[0]) 555 - printk(" & %pR", link->resource[0]); 556 - if (link->resource[1]) 557 - printk(" & %pR", link->resource[1]); 558 - printk("\n"); 559 - 560 547 local->shutdown = 0; 561 548 562 549 sandisk_enable_wireless(dev); ··· 555 568 return ret; 556 569 557 570 failed_unlock: 558 - spin_unlock_irqrestore(&local->irq_init_lock, flags); 571 + spin_unlock_irqrestore(&local->irq_init_lock, flags); 559 572 failed: 560 573 kfree(hw_priv); 561 574 prism2_release((u_long)link);
+7
drivers/pcmcia/ds.c
··· 277 277 if (!ret) { 278 278 p_dev->config_base = cis_config.base; 279 279 p_dev->config_regs = cis_config.rmask[0]; 280 + dev_dbg(dev, "base %x, regs %x", p_dev->config_base, 281 + p_dev->config_regs); 280 282 } else { 281 283 dev_printk(KERN_INFO, dev, 282 284 "pcmcia: could not parse base and rmask0 of CIS\n"); ··· 292 290 p_drv->drv.name, ret); 293 291 goto put_module; 294 292 } 293 + dev_dbg(dev, "%s bound: Vpp %d.%d, idx %x, IRQ %d", p_drv->drv.name, 294 + p_dev->vpp/10, p_dev->vpp%10, p_dev->config_index, p_dev->irq); 295 + dev_dbg(dev, "resources: ioport %pR %pR iomem %pR %pR %pR", 296 + p_dev->resource[0], p_dev->resource[1], p_dev->resource[2], 297 + p_dev->resource[3], p_dev->resource[4]); 295 298 296 299 mutex_lock(&s->ops_mutex); 297 300 if ((s->pcmcia_pfc) &&
-15
drivers/scsi/pcmcia/nsp_cs.c
··· 1687 1687 1688 1688 info->host = host; 1689 1689 1690 - /* Finally, report what we've done */ 1691 - printk(KERN_INFO "nsp_cs: index 0x%02x: ", 1692 - link->config_index); 1693 - if (link->vpp) { 1694 - printk(", Vpp %d.%d", link->vpp/10, link->vpp%10); 1695 - } 1696 - printk(", irq %d", link->irq); 1697 - if (link->resource[0]) 1698 - printk(", io %pR", link->resource[0]); 1699 - if (link->resource[1]) 1700 - printk(" & %pR", link->resource[1]); 1701 - if (link->resource[2]) 1702 - printk(", mem %pR", link->resource[2]); 1703 - printk("\n"); 1704 - 1705 1690 return 0; 1706 1691 1707 1692 cs_failed:
-9
drivers/staging/comedi/drivers/cb_das16_cs.c
··· 745 745 if (ret) 746 746 goto failed; 747 747 748 - /* Finally, report what we've done */ 749 - dev_info(&link->dev, "index 0x%02x", link->config_index); 750 - printk(", irq %u", link->irq); 751 - if (link->resource[0]) 752 - printk(", io %pR", link->resource[0]); 753 - if (link->resource[1]) 754 - printk(", io %pR", link->resource[1]); 755 - printk("\n"); 756 - 757 748 return; 758 749 759 750 failed:
-9
drivers/staging/comedi/drivers/das08_cs.c
··· 235 235 if (ret) 236 236 goto failed; 237 237 238 - /* Finally, report what we've done */ 239 - dev_info(&link->dev, "index 0x%02x", link->config_index); 240 - printk(", irq %u", link->irq); 241 - if (link->resource[0]) 242 - printk(", io %pR", link->resource[0]); 243 - if (link->resource[1]) 244 - printk(" & %pR", link->resource[1]); 245 - printk("\n"); 246 - 247 238 return; 248 239 249 240 failed:
-9
drivers/staging/comedi/drivers/ni_daq_700.c
··· 568 568 if (ret != 0) 569 569 goto failed; 570 570 571 - /* Finally, report what we've done */ 572 - dev_info(&link->dev, "index 0x%02x", link->config_index); 573 - printk(", irq %d", link->irq); 574 - if (link->resource[0]) 575 - printk(", io %pR", link->resource[0]); 576 - if (link->resource[1]) 577 - printk(" & %pR", link->resource[1]); 578 - printk("\n"); 579 - 580 571 return; 581 572 582 573 failed:
-9
drivers/staging/comedi/drivers/ni_daq_dio24.c
··· 319 319 if (ret) 320 320 goto failed; 321 321 322 - /* Finally, report what we've done */ 323 - dev_info(&link->dev, "index 0x%02x", link->config_index); 324 - printk(", irq %d", link->irq); 325 - if (link->resource[0]) 326 - printk(" & %pR", link->resource[0]); 327 - if (link->resource[1]) 328 - printk(" & %pR", link->resource[1]); 329 - printk("\n"); 330 - 331 322 return; 332 323 333 324 failed:
-9
drivers/staging/comedi/drivers/ni_labpc_cs.c
··· 297 297 if (ret) 298 298 goto failed; 299 299 300 - /* Finally, report what we've done */ 301 - dev_info(&link->dev, "index 0x%02x", link->config_index); 302 - printk(", irq %d", link->irq); 303 - if (link->resource[0]) 304 - printk(" & %pR", link->resource[0]); 305 - if (link->resource[1]) 306 - printk(" & %pR", link->resource[1]); 307 - printk("\n"); 308 - 309 300 return; 310 301 311 302 failed:
-9
drivers/staging/comedi/drivers/quatech_daqp_cs.c
··· 1103 1103 if (ret) 1104 1104 goto failed; 1105 1105 1106 - /* Finally, report what we've done */ 1107 - dev_info(&link->dev, "index 0x%02x", link->config_index); 1108 - printk(", irq %u", link->irq); 1109 - if (link->resource[0]) 1110 - printk(" & %pR", link->resource[0]); 1111 - if (link->resource[1]) 1112 - printk(" & %pR", link->resource[1]); 1113 - printk("\n"); 1114 - 1115 1106 return; 1116 1107 1117 1108 failed:
-8
drivers/usb/host/sl811_cs.c
··· 164 164 if (ret) 165 165 goto failed; 166 166 167 - dev_info(&link->dev, "index 0x%02x: ", 168 - link->config_index); 169 - if (link->vpp) 170 - printk(", Vpp %d.%d", link->vpp/10, link->vpp%10); 171 - printk(", irq %d", link->irq); 172 - printk(", io %pR", link->resource[0]); 173 - printk("\n"); 174 - 175 167 if (sl811_hc_init(parent, link->resource[0]->start, link->irq) 176 168 < 0) { 177 169 failed: