Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit dbe4ea5fde198a3808e46b665d889818c1e600f5

Authored by Dominik Brodowski
1 parent ac449d6e2c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

pcmcia: use dev_printk in module rsrc_nonstatic 

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

Showing 1 changed file with 18 additions and 15 deletions Side-by-side Diff

drivers/pcmcia/rsrc_nonstatic.c
Diff comments   View file @ dbe4ea5
... ... @@ -194,13 +194,14 @@
194 194 int any;
195 195 u_char *b, hole, most;
196 196  
197   - printk(KERN_INFO "cs: IO port probe %#x-%#x:",
198   - base, base+num-1);
  197 + dev_printk(KERN_INFO, &s->dev, "cs: IO port probe %#x-%#x:",
  198 + base, base+num-1);
199 199  
200 200 /* First, what does a floating port look like? */
201 201 b = kzalloc(256, GFP_KERNEL);
202 202 if (!b) {
203   - printk(KERN_ERR "do_io_probe: unable to kmalloc 256 bytes");
  203 + dev_printk(KERN_ERR, &s->dev,
  204 + "do_io_probe: unable to kmalloc 256 bytes");
204 205 return;
205 206 }
206 207 for (i = base, most = 0; i < base+num; i += 8) {
... ... @@ -366,8 +367,8 @@
366 367 struct socket_data *s_data = s->resource_data;
367 368 u_long i, j, bad, fail, step;
368 369  
369   - printk(KERN_INFO "cs: memory probe 0x%06lx-0x%06lx:",
370   - base, base+num-1);
  370 + dev_printk(KERN_INFO, &s->dev, "cs: memory probe 0x%06lx-0x%06lx:",
  371 + base, base+num-1);
371 372 bad = fail = 0;
372 373 step = (num < 0x20000) ? 0x2000 : ((num>>4) & ~0x1fff);
373 374 /* don't allow too large steps */
... ... @@ -431,8 +432,8 @@
431 432 if (probe_mask & MEM_PROBE_HIGH) {
432 433 if (inv_probe(s_data->mem_db.next, s) > 0)
433 434 return 0;
434   - printk(KERN_NOTICE "cs: warning: no high memory space "
435   - "available!\n");
  435 + dev_printk(KERN_NOTICE, &s->dev,
  436 + "cs: warning: no high memory space available!\n");
436 437 return -ENODEV;
437 438 }
438 439  
... ... @@ -794,10 +795,11 @@
794 795 if (res->flags & IORESOURCE_IO) {
795 796 if (res == &ioport_resource)
796 797 continue;
797   - printk(KERN_INFO "pcmcia: parent PCI bridge I/O "
798   - "window: 0x%llx - 0x%llx\n",
799   - (unsigned long long)res->start,
800   - (unsigned long long)res->end);
  798 + dev_printk(KERN_INFO, &s->cb_dev->dev,
  799 + "pcmcia: parent PCI bridge I/O "
  800 + "window: 0x%llx - 0x%llx\n",
  801 + (unsigned long long)res->start,
  802 + (unsigned long long)res->end);
801 803 if (!adjust_io(s, ADD_MANAGED_RESOURCE, res->start, res->end))
802 804 done |= IORESOURCE_IO;
803 805  
... ... @@ -806,10 +808,11 @@
806 808 if (res->flags & IORESOURCE_MEM) {
807 809 if (res == &iomem_resource)
808 810 continue;
809   - printk(KERN_INFO "pcmcia: parent PCI bridge Memory "
810   - "window: 0x%llx - 0x%llx\n",
811   - (unsigned long long)res->start,
812   - (unsigned long long)res->end);
  811 + dev_printk(KERN_INFO, &s->cb_dev->dev,
  812 + "pcmcia: parent PCI bridge Memory "
  813 + "window: 0x%llx - 0x%llx\n",
  814 + (unsigned long long)res->start,
  815 + (unsigned long long)res->end);
813 816 if (!adjust_memory(s, ADD_MANAGED_RESOURCE, res->start, res->end))
814 817 done |= IORESOURCE_MEM;
815 818 }