diff options
author | Dirk Hohndel <hohndel@infradead.org> | 2009-10-21 04:05:46 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 15:23:03 -0500 |
commit | ca5edf2f4ad1d40b8aaa5fe60630c21525b5c948 (patch) | |
tree | a1af64c537a24ef0127b8bf8d6592e7196307f13 /drivers/staging/comedi | |
parent | a622afcb7e4c7d24bb29b07e82fd8b7fcd81c0c0 (diff) |
Staging: comedi: icp_multi: fix style issue printk
add KERN_ facility to printk (mostly KERN_DEBUG, some KERN_WARNING)
Signed-off-by: Dirk Hohndel <hohndel@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r-- | drivers/staging/comedi/drivers/icp_multi.c | 93 |
1 files changed, 55 insertions, 38 deletions
diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c index 27a9ae9c7f2..d6ca6ccb85b 100644 --- a/drivers/staging/comedi/drivers/icp_multi.c +++ b/drivers/staging/comedi/drivers/icp_multi.c | |||
@@ -256,7 +256,7 @@ static int icp_multi_insn_read_ai(struct comedi_device *dev, | |||
256 | int n, timeout; | 256 | int n, timeout; |
257 | 257 | ||
258 | #ifdef ICP_MULTI_EXTDEBUG | 258 | #ifdef ICP_MULTI_EXTDEBUG |
259 | printk("icp multi EDBG: BGN: icp_multi_insn_read_ai(...)\n"); | 259 | printk(KERN_DEBUG "icp multi EDBG: BGN: icp_multi_insn_read_ai(...)\n"); |
260 | #endif | 260 | #endif |
261 | /* Disable A/D conversion ready interrupt */ | 261 | /* Disable A/D conversion ready interrupt */ |
262 | devpriv->IntEnable &= ~ADC_READY; | 262 | devpriv->IntEnable &= ~ADC_READY; |
@@ -270,7 +270,7 @@ static int icp_multi_insn_read_ai(struct comedi_device *dev, | |||
270 | setup_channel_list(dev, s, &insn->chanspec, 1); | 270 | setup_channel_list(dev, s, &insn->chanspec, 1); |
271 | 271 | ||
272 | #ifdef ICP_MULTI_EXTDEBUG | 272 | #ifdef ICP_MULTI_EXTDEBUG |
273 | printk("icp_multi A ST=%4x IO=%p\n", | 273 | printk(KERN_DEBUG "icp_multi A ST=%4x IO=%p\n", |
274 | readw(devpriv->io_addr + ICP_MULTI_ADC_CSR), | 274 | readw(devpriv->io_addr + ICP_MULTI_ADC_CSR), |
275 | devpriv->io_addr + ICP_MULTI_ADC_CSR); | 275 | devpriv->io_addr + ICP_MULTI_ADC_CSR); |
276 | #endif | 276 | #endif |
@@ -283,14 +283,14 @@ static int icp_multi_insn_read_ai(struct comedi_device *dev, | |||
283 | devpriv->AdcCmdStatus &= ~ADC_ST; | 283 | devpriv->AdcCmdStatus &= ~ADC_ST; |
284 | 284 | ||
285 | #ifdef ICP_MULTI_EXTDEBUG | 285 | #ifdef ICP_MULTI_EXTDEBUG |
286 | printk("icp multi B n=%d ST=%4x\n", n, | 286 | printk(KERN_DEBUG "icp multi B n=%d ST=%4x\n", n, |
287 | readw(devpriv->io_addr + ICP_MULTI_ADC_CSR)); | 287 | readw(devpriv->io_addr + ICP_MULTI_ADC_CSR)); |
288 | #endif | 288 | #endif |
289 | 289 | ||
290 | udelay(1); | 290 | udelay(1); |
291 | 291 | ||
292 | #ifdef ICP_MULTI_EXTDEBUG | 292 | #ifdef ICP_MULTI_EXTDEBUG |
293 | printk("icp multi C n=%d ST=%4x\n", n, | 293 | printk(KERN_DEBUG "icp multi C n=%d ST=%4x\n", n, |
294 | readw(devpriv->io_addr + ICP_MULTI_ADC_CSR)); | 294 | readw(devpriv->io_addr + ICP_MULTI_ADC_CSR)); |
295 | #endif | 295 | #endif |
296 | 296 | ||
@@ -303,7 +303,8 @@ static int icp_multi_insn_read_ai(struct comedi_device *dev, | |||
303 | 303 | ||
304 | #ifdef ICP_MULTI_EXTDEBUG | 304 | #ifdef ICP_MULTI_EXTDEBUG |
305 | if (!(timeout % 10)) | 305 | if (!(timeout % 10)) |
306 | printk("icp multi D n=%d tm=%d ST=%4x\n", n, | 306 | printk(KERN_DEBUG |
307 | "icp multi D n=%d tm=%d ST=%4x\n", n, | ||
307 | timeout, | 308 | timeout, |
308 | readw(devpriv->io_addr + | 309 | readw(devpriv->io_addr + |
309 | ICP_MULTI_ADC_CSR)); | 310 | ICP_MULTI_ADC_CSR)); |
@@ -328,9 +329,9 @@ static int icp_multi_insn_read_ai(struct comedi_device *dev, | |||
328 | data[n] = 0; | 329 | data[n] = 0; |
329 | 330 | ||
330 | #ifdef ICP_MULTI_EXTDEBUG | 331 | #ifdef ICP_MULTI_EXTDEBUG |
331 | printk | 332 | printk(KERN_DEBUG |
332 | ("icp multi EDBG: END: icp_multi_insn_read_ai(...) n=%d\n", | 333 | "icp multi EDBG: END: icp_multi_insn_read_ai(...) n=%d\n", |
333 | n); | 334 | n); |
334 | #endif | 335 | #endif |
335 | return -ETIME; | 336 | return -ETIME; |
336 | 337 | ||
@@ -348,7 +349,8 @@ conv_finish: | |||
348 | writew(devpriv->IntStatus, devpriv->io_addr + ICP_MULTI_INT_STAT); | 349 | writew(devpriv->IntStatus, devpriv->io_addr + ICP_MULTI_INT_STAT); |
349 | 350 | ||
350 | #ifdef ICP_MULTI_EXTDEBUG | 351 | #ifdef ICP_MULTI_EXTDEBUG |
351 | printk("icp multi EDBG: END: icp_multi_insn_read_ai(...) n=%d\n", n); | 352 | printk(KERN_DEBUG |
353 | "icp multi EDBG: END: icp_multi_insn_read_ai(...) n=%d\n", n); | ||
352 | #endif | 354 | #endif |
353 | return n; | 355 | return n; |
354 | } | 356 | } |
@@ -378,7 +380,8 @@ static int icp_multi_insn_write_ao(struct comedi_device *dev, | |||
378 | int n, chan, range, timeout; | 380 | int n, chan, range, timeout; |
379 | 381 | ||
380 | #ifdef ICP_MULTI_EXTDEBUG | 382 | #ifdef ICP_MULTI_EXTDEBUG |
381 | printk("icp multi EDBG: BGN: icp_multi_insn_write_ao(...)\n"); | 383 | printk(KERN_DEBUG |
384 | "icp multi EDBG: BGN: icp_multi_insn_write_ao(...)\n"); | ||
382 | #endif | 385 | #endif |
383 | /* Disable D/A conversion ready interrupt */ | 386 | /* Disable D/A conversion ready interrupt */ |
384 | devpriv->IntEnable &= ~DAC_READY; | 387 | devpriv->IntEnable &= ~DAC_READY; |
@@ -414,7 +417,8 @@ static int icp_multi_insn_write_ao(struct comedi_device *dev, | |||
414 | 417 | ||
415 | #ifdef ICP_MULTI_EXTDEBUG | 418 | #ifdef ICP_MULTI_EXTDEBUG |
416 | if (!(timeout % 10)) | 419 | if (!(timeout % 10)) |
417 | printk("icp multi A n=%d tm=%d ST=%4x\n", n, | 420 | printk(KERN_DEBUG |
421 | "icp multi A n=%d tm=%d ST=%4x\n", n, | ||
418 | timeout, | 422 | timeout, |
419 | readw(devpriv->io_addr + | 423 | readw(devpriv->io_addr + |
420 | ICP_MULTI_DAC_CSR)); | 424 | ICP_MULTI_DAC_CSR)); |
@@ -439,8 +443,8 @@ static int icp_multi_insn_write_ao(struct comedi_device *dev, | |||
439 | devpriv->ao_data[chan] = 0; | 443 | devpriv->ao_data[chan] = 0; |
440 | 444 | ||
441 | #ifdef ICP_MULTI_EXTDEBUG | 445 | #ifdef ICP_MULTI_EXTDEBUG |
442 | printk | 446 | printk(KERN_DEBUG |
443 | ("icp multi EDBG: END: icp_multi_insn_write_ao(...) n=%d\n", | 447 | "icp multi EDBG: END: icp_multi_insn_write_ao(...) n=%d\n", |
444 | n); | 448 | n); |
445 | #endif | 449 | #endif |
446 | return -ETIME; | 450 | return -ETIME; |
@@ -460,7 +464,8 @@ dac_ready: | |||
460 | } | 464 | } |
461 | 465 | ||
462 | #ifdef ICP_MULTI_EXTDEBUG | 466 | #ifdef ICP_MULTI_EXTDEBUG |
463 | printk("icp multi EDBG: END: icp_multi_insn_write_ao(...) n=%d\n", n); | 467 | printk(KERN_DEBUG |
468 | "icp multi EDBG: END: icp_multi_insn_write_ao(...) n=%d\n", n); | ||
464 | #endif | 469 | #endif |
465 | return n; | 470 | return n; |
466 | } | 471 | } |
@@ -549,14 +554,14 @@ static int icp_multi_insn_bits_do(struct comedi_device *dev, | |||
549 | struct comedi_insn *insn, unsigned int *data) | 554 | struct comedi_insn *insn, unsigned int *data) |
550 | { | 555 | { |
551 | #ifdef ICP_MULTI_EXTDEBUG | 556 | #ifdef ICP_MULTI_EXTDEBUG |
552 | printk("icp multi EDBG: BGN: icp_multi_insn_bits_do(...)\n"); | 557 | printk(KERN_DEBUG "icp multi EDBG: BGN: icp_multi_insn_bits_do(...)\n"); |
553 | #endif | 558 | #endif |
554 | 559 | ||
555 | if (data[0]) { | 560 | if (data[0]) { |
556 | s->state &= ~data[0]; | 561 | s->state &= ~data[0]; |
557 | s->state |= (data[0] & data[1]); | 562 | s->state |= (data[0] & data[1]); |
558 | 563 | ||
559 | printk("Digital outputs = %4x \n", s->state); | 564 | printk(KERN_DEBUG "Digital outputs = %4x \n", s->state); |
560 | 565 | ||
561 | writew(s->state, devpriv->io_addr + ICP_MULTI_DO); | 566 | writew(s->state, devpriv->io_addr + ICP_MULTI_DO); |
562 | } | 567 | } |
@@ -564,7 +569,7 @@ static int icp_multi_insn_bits_do(struct comedi_device *dev, | |||
564 | data[1] = readw(devpriv->io_addr + ICP_MULTI_DI); | 569 | data[1] = readw(devpriv->io_addr + ICP_MULTI_DI); |
565 | 570 | ||
566 | #ifdef ICP_MULTI_EXTDEBUG | 571 | #ifdef ICP_MULTI_EXTDEBUG |
567 | printk("icp multi EDBG: END: icp_multi_insn_bits_do(...)\n"); | 572 | printk(KERN_DEBUG "icp multi EDBG: END: icp_multi_insn_bits_do(...)\n"); |
568 | #endif | 573 | #endif |
569 | return 2; | 574 | return 2; |
570 | } | 575 | } |
@@ -641,7 +646,8 @@ static irqreturn_t interrupt_service_icp_multi(int irq, void *d) | |||
641 | int int_no; | 646 | int int_no; |
642 | 647 | ||
643 | #ifdef ICP_MULTI_EXTDEBUG | 648 | #ifdef ICP_MULTI_EXTDEBUG |
644 | printk("icp multi EDBG: BGN: interrupt_service_icp_multi(%d,...)\n", | 649 | printk(KERN_DEBUG |
650 | "icp multi EDBG: BGN: interrupt_service_icp_multi(%d,...)\n", | ||
645 | irq); | 651 | irq); |
646 | #endif | 652 | #endif |
647 | 653 | ||
@@ -652,7 +658,8 @@ static irqreturn_t interrupt_service_icp_multi(int irq, void *d) | |||
652 | return IRQ_NONE; | 658 | return IRQ_NONE; |
653 | 659 | ||
654 | #ifdef ICP_MULTI_EXTDEBUG | 660 | #ifdef ICP_MULTI_EXTDEBUG |
655 | printk("icp multi EDBG: interrupt_service_icp_multi() ST: %4x\n", | 661 | printk(KERN_DEBUG |
662 | "icp multi EDBG: interrupt_service_icp_multi() ST: %4x\n", | ||
656 | readw(devpriv->io_addr + ICP_MULTI_INT_STAT)); | 663 | readw(devpriv->io_addr + ICP_MULTI_INT_STAT)); |
657 | #endif | 664 | #endif |
658 | 665 | ||
@@ -680,7 +687,8 @@ static irqreturn_t interrupt_service_icp_multi(int irq, void *d) | |||
680 | } | 687 | } |
681 | 688 | ||
682 | #ifdef ICP_MULTI_EXTDEBUG | 689 | #ifdef ICP_MULTI_EXTDEBUG |
683 | printk("icp multi EDBG: END: interrupt_service_icp_multi(...)\n"); | 690 | printk(KERN_DEBUG |
691 | "icp multi EDBG: END: interrupt_service_icp_multi(...)\n"); | ||
684 | #endif | 692 | #endif |
685 | return IRQ_HANDLED; | 693 | return IRQ_HANDLED; |
686 | } | 694 | } |
@@ -713,7 +721,8 @@ static int check_channel_list(struct comedi_device *dev, | |||
713 | unsigned int i; | 721 | unsigned int i; |
714 | 722 | ||
715 | #ifdef ICP_MULTI_EXTDEBUG | 723 | #ifdef ICP_MULTI_EXTDEBUG |
716 | printk("icp multi EDBG: check_channel_list(...,%d)\n", n_chan); | 724 | printk(KERN_DEBUG |
725 | "icp multi EDBG: check_channel_list(...,%d)\n", n_chan); | ||
717 | #endif | 726 | #endif |
718 | /* Check that we at least have one channel to check */ | 727 | /* Check that we at least have one channel to check */ |
719 | if (n_chan < 1) { | 728 | if (n_chan < 1) { |
@@ -726,7 +735,7 @@ static int check_channel_list(struct comedi_device *dev, | |||
726 | if (CR_AREF(chanlist[i]) == AREF_DIFF) { | 735 | if (CR_AREF(chanlist[i]) == AREF_DIFF) { |
727 | if (CR_CHAN(chanlist[i]) > this_board->n_aichand) { | 736 | if (CR_CHAN(chanlist[i]) > this_board->n_aichand) { |
728 | comedi_error(dev, | 737 | comedi_error(dev, |
729 | "Incorrect differential ai channel number"); | 738 | "Incorrect differential ai ch-nr"); |
730 | return 0; | 739 | return 0; |
731 | } | 740 | } |
732 | } else { | 741 | } else { |
@@ -769,7 +778,8 @@ static void setup_channel_list(struct comedi_device *dev, | |||
769 | unsigned int diff; | 778 | unsigned int diff; |
770 | 779 | ||
771 | #ifdef ICP_MULTI_EXTDEBUG | 780 | #ifdef ICP_MULTI_EXTDEBUG |
772 | printk("icp multi EDBG: setup_channel_list(...,%d)\n", n_chan); | 781 | printk(KERN_DEBUG |
782 | "icp multi EDBG: setup_channel_list(...,%d)\n", n_chan); | ||
773 | #endif | 783 | #endif |
774 | devpriv->act_chanlist_len = n_chan; | 784 | devpriv->act_chanlist_len = n_chan; |
775 | devpriv->act_chanlist_pos = 0; | 785 | devpriv->act_chanlist_pos = 0; |
@@ -810,7 +820,8 @@ static void setup_channel_list(struct comedi_device *dev, | |||
810 | devpriv->io_addr + ICP_MULTI_ADC_CSR); | 820 | devpriv->io_addr + ICP_MULTI_ADC_CSR); |
811 | 821 | ||
812 | #ifdef ICP_MULTI_EXTDEBUG | 822 | #ifdef ICP_MULTI_EXTDEBUG |
813 | printk("GS: %2d. [%4x]=%4x %4x\n", i, chanprog, range, | 823 | printk(KERN_DEBUG |
824 | "GS: %2d. [%4x]=%4x %4x\n", i, chanprog, range, | ||
814 | devpriv->act_chanlist[i]); | 825 | devpriv->act_chanlist[i]); |
815 | #endif | 826 | #endif |
816 | } | 827 | } |
@@ -837,7 +848,8 @@ static int icp_multi_reset(struct comedi_device *dev) | |||
837 | unsigned int i; | 848 | unsigned int i; |
838 | 849 | ||
839 | #ifdef ICP_MULTI_EXTDEBUG | 850 | #ifdef ICP_MULTI_EXTDEBUG |
840 | printk("icp_multi EDBG: BGN: icp_multi_reset(...)\n"); | 851 | printk(KERN_DEBUG |
852 | "icp_multi EDBG: BGN: icp_multi_reset(...)\n"); | ||
841 | #endif | 853 | #endif |
842 | /* Clear INT enables and requests */ | 854 | /* Clear INT enables and requests */ |
843 | writew(0, devpriv->io_addr + ICP_MULTI_INT_EN); | 855 | writew(0, devpriv->io_addr + ICP_MULTI_INT_EN); |
@@ -868,7 +880,8 @@ static int icp_multi_reset(struct comedi_device *dev) | |||
868 | writew(0, devpriv->io_addr + ICP_MULTI_DO); | 880 | writew(0, devpriv->io_addr + ICP_MULTI_DO); |
869 | 881 | ||
870 | #ifdef ICP_MULTI_EXTDEBUG | 882 | #ifdef ICP_MULTI_EXTDEBUG |
871 | printk("icp multi EDBG: END: icp_multi_reset(...)\n"); | 883 | printk(KERN_DEBUG |
884 | "icp multi EDBG: END: icp_multi_reset(...)\n"); | ||
872 | #endif | 885 | #endif |
873 | return 0; | 886 | return 0; |
874 | } | 887 | } |
@@ -900,7 +913,8 @@ static int icp_multi_attach(struct comedi_device *dev, | |||
900 | resource_size_t io_addr[5], iobase; | 913 | resource_size_t io_addr[5], iobase; |
901 | unsigned char pci_bus, pci_slot, pci_func; | 914 | unsigned char pci_bus, pci_slot, pci_func; |
902 | 915 | ||
903 | printk("icp_multi EDBG: BGN: icp_multi_attach(...)\n"); | 916 | printk(KERN_WARNING |
917 | "icp_multi EDBG: BGN: icp_multi_attach(...)\n"); | ||
904 | 918 | ||
905 | /* Alocate private data storage space */ | 919 | /* Alocate private data storage space */ |
906 | ret = alloc_private(dev, sizeof(struct icp_multi_private)); | 920 | ret = alloc_private(dev, sizeof(struct icp_multi_private)); |
@@ -918,7 +932,8 @@ static int icp_multi_attach(struct comedi_device *dev, | |||
918 | ); | 932 | ); |
919 | } | 933 | } |
920 | 934 | ||
921 | printk("Anne's comedi%d: icp_multi: board=%s", dev->minor, | 935 | printk(KERN_WARNING |
936 | "Anne's comedi%d: icp_multi: board=%s", dev->minor, | ||
922 | this_board->name); | 937 | this_board->name); |
923 | 938 | ||
924 | card = select_and_alloc_pci_card(PCI_VENDOR_ID_ICP, | 939 | card = select_and_alloc_pci_card(PCI_VENDOR_ID_ICP, |
@@ -932,24 +947,26 @@ static int icp_multi_attach(struct comedi_device *dev, | |||
932 | 947 | ||
933 | if ((pci_card_data(card, &pci_bus, &pci_slot, &pci_func, &io_addr[0], | 948 | if ((pci_card_data(card, &pci_bus, &pci_slot, &pci_func, &io_addr[0], |
934 | &irq)) < 0) { | 949 | &irq)) < 0) { |
935 | printk(" - Can't get configuration data!\n"); | 950 | printk(KERN_WARNING " - Can't get configuration data!\n"); |
936 | return -EIO; | 951 | return -EIO; |
937 | } | 952 | } |
938 | 953 | ||
939 | iobase = io_addr[2]; | 954 | iobase = io_addr[2]; |
940 | devpriv->phys_iobase = iobase; | 955 | devpriv->phys_iobase = iobase; |
941 | 956 | ||
942 | printk(", b:s:f=%d:%d:%d, io=0x%8llx \n", pci_bus, pci_slot, pci_func, | 957 | printk(KERN_WARNING |
958 | ", b:s:f=%d:%d:%d, io=0x%8llx \n", pci_bus, pci_slot, pci_func, | ||
943 | (unsigned long long)iobase); | 959 | (unsigned long long)iobase); |
944 | 960 | ||
945 | devpriv->io_addr = ioremap(iobase, ICP_MULTI_SIZE); | 961 | devpriv->io_addr = ioremap(iobase, ICP_MULTI_SIZE); |
946 | 962 | ||
947 | if (devpriv->io_addr == NULL) { | 963 | if (devpriv->io_addr == NULL) { |
948 | printk("ioremap failed.\n"); | 964 | printk(KERN_WARNING "ioremap failed.\n"); |
949 | return -ENOMEM; | 965 | return -ENOMEM; |
950 | } | 966 | } |
951 | #ifdef ICP_MULTI_EXTDEBUG | 967 | #ifdef ICP_MULTI_EXTDEBUG |
952 | printk("0x%08llx mapped to %p, ", (unsigned long long)iobase, | 968 | printk(KERN_DEBUG |
969 | "0x%08llx mapped to %p, ", (unsigned long long)iobase, | ||
953 | devpriv->io_addr); | 970 | devpriv->io_addr); |
954 | #endif | 971 | #endif |
955 | 972 | ||
@@ -977,20 +994,20 @@ static int icp_multi_attach(struct comedi_device *dev, | |||
977 | if (irq) { | 994 | if (irq) { |
978 | if (request_irq(irq, interrupt_service_icp_multi, | 995 | if (request_irq(irq, interrupt_service_icp_multi, |
979 | IRQF_SHARED, "Inova Icp Multi", dev)) { | 996 | IRQF_SHARED, "Inova Icp Multi", dev)) { |
980 | printk | 997 | printk(KERN_WARNING |
981 | (", unable to allocate IRQ %u, DISABLING IT", | 998 | "unable to allocate IRQ %u, DISABLING IT", |
982 | irq); | 999 | irq); |
983 | irq = 0; /* Can't use IRQ */ | 1000 | irq = 0; /* Can't use IRQ */ |
984 | } else | 1001 | } else |
985 | printk(", irq=%u", irq); | 1002 | printk(KERN_WARNING ", irq=%u", irq); |
986 | } else | 1003 | } else |
987 | printk(", IRQ disabled"); | 1004 | printk(KERN_WARNING ", IRQ disabled"); |
988 | } else | 1005 | } else |
989 | irq = 0; | 1006 | irq = 0; |
990 | 1007 | ||
991 | dev->irq = irq; | 1008 | dev->irq = irq; |
992 | 1009 | ||
993 | printk(".\n"); | 1010 | printk(KERN_WARNING ".\n"); |
994 | 1011 | ||
995 | subdev = 0; | 1012 | subdev = 0; |
996 | 1013 | ||
@@ -1065,7 +1082,7 @@ static int icp_multi_attach(struct comedi_device *dev, | |||
1065 | devpriv->valid = 1; | 1082 | devpriv->valid = 1; |
1066 | 1083 | ||
1067 | #ifdef ICP_MULTI_EXTDEBUG | 1084 | #ifdef ICP_MULTI_EXTDEBUG |
1068 | printk("icp multi EDBG: END: icp_multi_attach(...)\n"); | 1085 | printk(KERN_DEBUG "icp multi EDBG: END: icp_multi_attach(...)\n"); |
1069 | #endif | 1086 | #endif |
1070 | 1087 | ||
1071 | return 0; | 1088 | return 0; |