aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/char/pcmcia/synclink_cs.c7
-rw-r--r--drivers/isdn/hisax/avma1_cs.c3
-rw-r--r--drivers/isdn/hisax/elsa_cs.c10
-rw-r--r--drivers/isdn/hisax/sedlbauer_cs.c12
-rw-r--r--drivers/isdn/hisax/teles_cs.c10
-rw-r--r--drivers/net/wireless/airo_cs.c11
-rw-r--r--drivers/net/wireless/hostap/hostap_cs.c15
-rw-r--r--drivers/pcmcia/ds.c7
-rw-r--r--drivers/scsi/pcmcia/nsp_cs.c15
-rw-r--r--drivers/staging/comedi/drivers/cb_das16_cs.c9
-rw-r--r--drivers/staging/comedi/drivers/das08_cs.c9
-rw-r--r--drivers/staging/comedi/drivers/ni_daq_700.c9
-rw-r--r--drivers/staging/comedi/drivers/ni_daq_dio24.c9
-rw-r--r--drivers/staging/comedi/drivers/ni_labpc_cs.c9
-rw-r--r--drivers/staging/comedi/drivers/quatech_daqp_cs.c9
-rw-r--r--drivers/usb/host/sl811_cs.c8
16 files changed, 8 insertions, 144 deletions
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index a343b8f817e4..7c71913714ca 100644
--- 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)
592 592
593 info->io_base = link->resource[0]->start; 593 info->io_base = link->resource[0]->start;
594 info->irq_level = link->irq; 594 info->irq_level = link->irq;
595
596 dev_info(&link->dev, "index 0x%02x:",
597 link->config_index);
598 printk(", irq %d", link->irq);
599 if (link->resource[0])
600 printk(", io %pR", link->resource[0]);
601 printk("\n");
602 return 0; 595 return 0;
603 596
604failed: 597failed:
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index cb09f0cacd12..47590e0a63dc 100644
--- 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)
162 return -ENODEV; 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 icard.para[0] = link->irq; 165 icard.para[0] = link->irq;
169 icard.para[1] = link->resource[0]->start; 166 icard.para[1] = link->resource[0]->start;
170 icard.protocol = isdnprot; 167 icard.protocol = isdnprot;
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
index f203a52aab2a..b37b9f0f7fdc 100644
--- 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)
196 if (i != 0) 196 if (i != 0)
197 goto failed; 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 icard.para[0] = link->irq; 199 icard.para[0] = link->irq;
210 icard.para[1] = link->resource[0]->start; 200 icard.para[1] = link->resource[0]->start;
211 icard.protocol = protocol; 201 icard.protocol = protocol;
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c
index a88c88f6cdeb..ff17dba175c4 100644
--- 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)
205 if (ret) 205 if (ret)
206 goto failed; 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 icard.para[0] = link->irq; 208 icard.para[0] = link->irq;
221 icard.para[1] = link->resource[0]->start; 209 icard.para[1] = link->resource[0]->start;
222 icard.protocol = protocol; 210 icard.protocol = protocol;
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
index 05a5631963bb..13ba9abfc9b5 100644
--- 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)
183 if (i != 0) 183 if (i != 0)
184 goto cs_failed; 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 icard.para[0] = link->irq; 186 icard.para[0] = link->irq;
197 icard.para[1] = link->resource[0]->start; 187 icard.para[1] = link->resource[0]->start;
198 icard.protocol = protocol; 188 icard.protocol = protocol;
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index 77682f27772b..4067bf1cdeb4 100644
--- 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)
193 if (!((local_info_t *)link->priv)->eth_dev) 193 if (!((local_info_t *)link->priv)->eth_dev)
194 goto failed; 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 return 0; 196 return 0;
208 197
209 failed: 198 failed:
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index e57b20134d39..d6ff0c7b7d94 100644
--- 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)
544 544
545 spin_unlock_irqrestore(&local->irq_init_lock, flags); 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 local->shutdown = 0; 547 local->shutdown = 0;
561 548
562 sandisk_enable_wireless(dev); 549 sandisk_enable_wireless(dev);
@@ -568,7 +555,7 @@ static int prism2_config(struct pcmcia_device *link)
568 return ret; 555 return ret;
569 556
570 failed_unlock: 557 failed_unlock:
571 spin_unlock_irqrestore(&local->irq_init_lock, flags); 558 spin_unlock_irqrestore(&local->irq_init_lock, flags);
572 failed: 559 failed:
573 kfree(hw_priv); 560 kfree(hw_priv);
574 prism2_release((u_long)link); 561 prism2_release((u_long)link);
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index dd43bd33a9e3..912c74082891 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -277,6 +277,8 @@ static int pcmcia_device_probe(struct device *dev)
277 if (!ret) { 277 if (!ret) {
278 p_dev->config_base = cis_config.base; 278 p_dev->config_base = cis_config.base;
279 p_dev->config_regs = cis_config.rmask[0]; 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 } else { 282 } else {
281 dev_printk(KERN_INFO, dev, 283 dev_printk(KERN_INFO, dev,
282 "pcmcia: could not parse base and rmask0 of CIS\n"); 284 "pcmcia: could not parse base and rmask0 of CIS\n");
@@ -290,6 +292,11 @@ static int pcmcia_device_probe(struct device *dev)
290 p_drv->drv.name, ret); 292 p_drv->drv.name, ret);
291 goto put_module; 293 goto put_module;
292 } 294 }
295 dev_dbg(dev, "%s bound: Vpp %d.%d, idx %x, IRQ %d", p_drv->drv.name,
296 p_dev->vpp/10, p_dev->vpp%10, p_dev->config_index, p_dev->irq);
297 dev_dbg(dev, "resources: ioport %pR %pR iomem %pR %pR %pR",
298 p_dev->resource[0], p_dev->resource[1], p_dev->resource[2],
299 p_dev->resource[3], p_dev->resource[4]);
293 300
294 mutex_lock(&s->ops_mutex); 301 mutex_lock(&s->ops_mutex);
295 if ((s->pcmcia_pfc) && 302 if ((s->pcmcia_pfc) &&
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 3b90ad9d1956..2b4a1a82d529 100644
--- 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)
1687 1687
1688 info->host = host; 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 return 0; 1690 return 0;
1706 1691
1707 cs_failed: 1692 cs_failed:
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index c43c68922c74..0c4b27c13eb7 100644
--- 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)
745 if (ret) 745 if (ret)
746 goto failed; 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 return; 748 return;
758 749
759failed: 750failed:
diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c
index d3959093381b..6d893253de45 100644
--- 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)
235 if (ret) 235 if (ret)
236 goto failed; 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 return; 238 return;
248 239
249failed: 240failed:
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index 7129b0ca4c8b..52441255e2bd 100644
--- 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)
568 if (ret != 0) 568 if (ret != 0)
569 goto failed; 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 return; 571 return;
581 572
582failed: 573failed:
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c
index 4defdda2bfaf..54dda4a45039 100644
--- 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)
319 if (ret) 319 if (ret)
320 goto failed; 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 return; 322 return;
332 323
333failed: 324failed:
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index 5123b3131c51..22119f2a292e 100644
--- 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)
297 if (ret) 297 if (ret)
298 goto failed; 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 return; 300 return;
310 301
311failed: 302failed:
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index afd283d0e711..de37ff70a9e7 100644
--- 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)
1103 if (ret) 1103 if (ret)
1104 goto failed; 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 return; 1106 return;
1116 1107
1117failed: 1108failed:
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c
index 81d7eeacdf6a..9ce95cdfc9ef 100644
--- 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)
164 if (ret) 164 if (ret)
165 goto failed; 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 if (sl811_hc_init(parent, link->resource[0]->start, link->irq) 167 if (sl811_hc_init(parent, link->resource[0]->start, link->irq)
176 < 0) { 168 < 0) {
177failed: 169failed:
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-27 02:01:46 -0500