Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a7149f9a26eb44a5658d56335c23104ba529e9f6

Authored by Dominik Brodowski
1 parent 9cb495bb41
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_dbg and dev_print in pd6729.c 

As suggested by Wolfram Sang <w.sang@pengutronix.de>, use dev_dbg(),
and dev_{err,warn,info}() in pd6729.c, and add some "\n" suggested by
Komuro <komurojun-mbn@nifty.com>. In the ISR, use pr_devel() and
dev_vdbg() as they are only compiled if DEBUG (or, for dev_vdbg(),
VERBOSE_DEBUG) are set explicitly.

CC: Komuro <komurojun-mbn@nifty.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

Showing 2 changed files with 37 additions and 40 deletions Side-by-side Diff

drivers/pcmcia/pd6729.c
Diff comments   View file @ a7149f9
... ... @@ -213,7 +213,8 @@
213 213  
214 214 if (csc & I365_CSC_DETECT) {
215 215 events |= SS_DETECT;
216   - dprintk("Card detected in socket %i!\n", i);
  216 + dev_vdbg(&socket[i].socket.dev,
  217 + "Card detected in socket %i!\n", i);
217 218 }
218 219  
219 220 if (indirect_read(&socket[i], I365_INTCTL)
220 221  
... ... @@ -331,11 +332,11 @@
331 332 reg = I365_PWR_NORESET; /* default: disable resetdrv on resume */
332 333  
333 334 if (state->flags & SS_PWR_AUTO) {
334   - dprintk("Auto power\n");
  335 + dev_dbg(&sock->dev, "Auto power\n");
335 336 reg |= I365_PWR_AUTO; /* automatic power mngmnt */
336 337 }
337 338 if (state->flags & SS_OUTPUT_ENA) {
338   - dprintk("Power Enabled\n");
  339 + dev_dbg(&sock->dev, "Power Enabled\n");
339 340 reg |= I365_PWR_OUT; /* enable power */
340 341 }
341 342  
342 343  
343 344  
344 345  
345 346  
346 347  
347 348  
... ... @@ -343,40 +344,44 @@
343 344 case 0:
344 345 break;
345 346 case 33:
346   - dprintk("setting voltage to Vcc to 3.3V on socket %i\n",
  347 + dev_dbg(&sock->dev,
  348 + "setting voltage to Vcc to 3.3V on socket %i\n",
347 349 socket->number);
348 350 reg |= I365_VCC_5V;
349 351 indirect_setbit(socket, PD67_MISC_CTL_1, PD67_MC1_VCC_3V);
350 352 break;
351 353 case 50:
352   - dprintk("setting voltage to Vcc to 5V on socket %i\n",
  354 + dev_dbg(&sock->dev,
  355 + "setting voltage to Vcc to 5V on socket %i\n",
353 356 socket->number);
354 357 reg |= I365_VCC_5V;
355 358 indirect_resetbit(socket, PD67_MISC_CTL_1, PD67_MC1_VCC_3V);
356 359 break;
357 360 default:
358   - dprintk("pd6729: pd6729_set_socket called with "
359   - "invalid VCC power value: %i\n",
360   - state->Vcc);
  361 + dev_dbg(&sock->dev,
  362 + "pd6729_set_socket called with invalid VCC power "
  363 + "value: %i\n", state->Vcc);
361 364 return -EINVAL;
362 365 }
363 366  
364 367 switch (state->Vpp) {
365 368 case 0:
366   - dprintk("not setting Vpp on socket %i\n", socket->number);
  369 + dev_dbg(&sock->dev, "not setting Vpp on socket %i\n",
  370 + socket->number);
367 371 break;
368 372 case 33:
369 373 case 50:
370   - dprintk("setting Vpp to Vcc for socket %i\n", socket->number);
  374 + dev_dbg(&sock->dev, "setting Vpp to Vcc for socket %i\n",
  375 + socket->number);
371 376 reg |= I365_VPP1_5V;
372 377 break;
373 378 case 120:
374   - dprintk("setting Vpp to 12.0\n");
  379 + dev_dbg(&sock->dev, "setting Vpp to 12.0\n");
375 380 reg |= I365_VPP1_12V;
376 381 break;
377 382 default:
378   - dprintk("pd6729: pd6729_set_socket called with invalid VPP power value: %i\n",
379   - state->Vpp);
  383 + dev_dbg(&sock->dev, "pd6729: pd6729_set_socket called with "
  384 + "invalid VPP power value: %i\n", state->Vpp);
380 385 return -EINVAL;
381 386 }
382 387  
... ... @@ -438,7 +443,7 @@
438 443  
439 444 /* Check error conditions */
440 445 if (map > 1) {
441   - dprintk("pd6729_set_io_map with invalid map");
  446 + dev_dbg(&sock->dev, "pd6729_set_io_map with invalid map\n");
442 447 return -EINVAL;
443 448 }
444 449  
... ... @@ -446,7 +451,7 @@
446 451 if (indirect_read(socket, I365_ADDRWIN) & I365_ENA_IO(map))
447 452 indirect_resetbit(socket, I365_ADDRWIN, I365_ENA_IO(map));
448 453  
449   - /* dprintk("set_io_map: Setting range to %x - %x\n",
  454 + /* dev_dbg(&sock->dev, "set_io_map: Setting range to %x - %x\n",
450 455 io->start, io->stop);*/
451 456  
452 457 /* write the new values */
453 458  
... ... @@ -478,12 +483,12 @@
478 483  
479 484 map = mem->map;
480 485 if (map > 4) {
481   - printk("pd6729_set_mem_map: invalid map");
  486 + dev_warn(&sock->dev, "invalid map requested\n");
482 487 return -EINVAL;
483 488 }
484 489  
485 490 if ((mem->res->start > mem->res->end) || (mem->speed > 1000)) {
486   - printk("pd6729_set_mem_map: invalid address / speed");
  491 + dev_warn(&sock->dev, "invalid invalid address / speed\n");
487 492 return -EINVAL;
488 493 }
489 494  
490 495  
... ... @@ -529,12 +534,12 @@
529 534 if (mem->flags & MAP_WRPROT)
530 535 i |= I365_MEM_WRPROT;
531 536 if (mem->flags & MAP_ATTRIB) {
532   - /* dprintk("requesting attribute memory for socket %i\n",
533   - socket->number);*/
  537 + /* dev_dbg(&sock->dev, "requesting attribute memory for "
  538 + "socket %i\n", socket->number);*/
534 539 i |= I365_MEM_REG;
535 540 } else {
536   - /* dprintk("requesting normal memory for socket %i\n",
537   - socket->number);*/
  541 + /* dev_dbg(&sock->dev, "requesting normal memory for "
  542 + "socket %i\n", socket->number);*/
538 543 }
539 544 indirect_write16(socket, base + I365_W_OFF, i);
540 545  
... ... @@ -577,7 +582,7 @@
577 582  
578 583 static irqreturn_t pd6729_test(int irq, void *dev)
579 584 {
580   - dprintk("-> hit on irq %d\n", irq);
  585 + pr_devel("-> hit on irq %d\n", irq);
581 586 return IRQ_HANDLED;
582 587 }
583 588  
584 589  
... ... @@ -642,13 +647,13 @@
642 647 goto err_out_free_mem;
643 648  
644 649 if (!pci_resource_start(dev, 0)) {
645   - printk(KERN_INFO "pd6729: refusing to load the driver "
646   - "as the io_base is 0.\n");
  650 + dev_warn(&dev->dev, "refusing to load the driver as the "
  651 + "io_base is NULL.\n");
647 652 goto err_out_free_mem;
648 653 }
649 654  
650   - printk(KERN_INFO "pd6729: Cirrus PD6729 PCI to PCMCIA Bridge "
651   - "at 0x%llx on irq %d\n",
  655 + dev_info(&dev->dev, "Cirrus PD6729 PCI to PCMCIA Bridge at 0x%llx "
  656 + "on irq %d\n",
652 657 (unsigned long long)pci_resource_start(dev, 0), dev->irq);
653 658 /*
654 659 * Since we have no memory BARs some firmware may not
655 660  
... ... @@ -656,14 +661,14 @@
656 661 */
657 662 pci_read_config_byte(dev, PCI_COMMAND, &configbyte);
658 663 if (!(configbyte & PCI_COMMAND_MEMORY)) {
659   - printk(KERN_DEBUG "pd6729: Enabling PCI_COMMAND_MEMORY.\n");
  664 + dev_dbg(&dev->dev, "pd6729: Enabling PCI_COMMAND_MEMORY.\n");
660 665 configbyte |= PCI_COMMAND_MEMORY;
661 666 pci_write_config_byte(dev, PCI_COMMAND, configbyte);
662 667 }
663 668  
664 669 ret = pci_request_regions(dev, "pd6729");
665 670 if (ret) {
666   - printk(KERN_INFO "pd6729: pci request region failed.\n");
  671 + dev_warn(&dev->dev, "pci request region failed.\n");
667 672 goto err_out_disable;
668 673 }
669 674  
... ... @@ -672,7 +677,7 @@
672 677  
673 678 mask = pd6729_isa_scan();
674 679 if (irq_mode == 0 && mask == 0) {
675   - printk(KERN_INFO "pd6729: no ISA interrupt is available.\n");
  680 + dev_warn(&dev->dev, "no ISA interrupt is available.\n");
676 681 goto err_out_free_res;
677 682 }
678 683  
... ... @@ -697,8 +702,8 @@
697 702 /* Register the interrupt handler */
698 703 if ((ret = request_irq(dev->irq, pd6729_interrupt, IRQF_SHARED,
699 704 "pd6729", socket))) {
700   - printk(KERN_ERR "pd6729: Failed to register irq %d, "
701   - "aborting\n", dev->irq);
  705 + dev_err(&dev->dev, "Failed to register irq %d\n",
  706 + dev->irq);
702 707 goto err_out_free_res;
703 708 }
704 709 } else {
... ... @@ -713,8 +718,7 @@
713 718 for (i = 0; i < MAX_SOCKETS; i++) {
714 719 ret = pcmcia_register_socket(&socket[i].socket);
715 720 if (ret) {
716   - printk(KERN_INFO "pd6729: pcmcia_register_socket "
717   - "failed.\n");
  721 + dev_warn(&dev->dev, "pcmcia_register_socket failed.\n");
718 722 for (j = 0; j < i ; j++)
719 723 pcmcia_unregister_socket(&socket[j].socket);
720 724 goto err_out_free_res2;
drivers/pcmcia/pd6729.h
Diff comments   View file @ a7149f9
1 1 #ifndef _INCLUDE_GUARD_PD6729_H_
2 2 #define _INCLUDE_GUARD_PD6729_H_
3 3  
4   -/* Debuging defines */
5   -#ifdef NOTRACE
6   -#define dprintk(fmt, args...) printk(fmt , ## args)
7   -#else
8   -#define dprintk(fmt, args...) do {} while (0)
9   -#endif
10   -
11 4 /* Flags for I365_GENCTL */
12 5 #define I365_DF_VS1 0x40 /* DF-step Voltage Sense */
13 6 #define I365_DF_VS2 0x80