diff options
author | John Sheehan <john.d.sheehan@gmail.com> | 2010-05-28 11:33:25 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-17 16:36:34 -0400 |
commit | daca497d8035cdb649b37ef1c962f1f0de8f16d9 (patch) | |
tree | 2e9c7bf9577de8bcdc9e78d61c7feea92c5aecdc | |
parent | 6fd071cccf4127f1e81767a819720d8915b2a800 (diff) |
Staging: comedi: fix code warnings in s626.c
A patch for s626.c to fix some of the warnings
reported by the checkpatch.pl tool, namely,
printk() should include KERN_ facility level
unnecessary whitespace before a quoted newline
Signed-off-by: John Sheehan <john.d.sheehan@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/comedi/drivers/s626.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index a3cc93362ec..febb62e86ec 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c | |||
@@ -543,13 +543,13 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
543 | devpriv->pdev = pdev; | 543 | devpriv->pdev = pdev; |
544 | 544 | ||
545 | if (pdev == NULL) { | 545 | if (pdev == NULL) { |
546 | printk("s626_attach: Board not present!!!\n"); | 546 | printk(KERN_ERR "s626_attach: Board not present!!!\n"); |
547 | return -ENODEV; | 547 | return -ENODEV; |
548 | } | 548 | } |
549 | 549 | ||
550 | result = comedi_pci_enable(pdev, "s626"); | 550 | result = comedi_pci_enable(pdev, "s626"); |
551 | if (result < 0) { | 551 | if (result < 0) { |
552 | printk("s626_attach: comedi_pci_enable fails\n"); | 552 | printk(KERN_ERR "s626_attach: comedi_pci_enable fails\n"); |
553 | return -ENODEV; | 553 | return -ENODEV; |
554 | } | 554 | } |
555 | devpriv->got_regions = 1; | 555 | devpriv->got_regions = 1; |
@@ -558,7 +558,7 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
558 | 558 | ||
559 | devpriv->base_addr = ioremap(resourceStart, SIZEOF_ADDRESS_SPACE); | 559 | devpriv->base_addr = ioremap(resourceStart, SIZEOF_ADDRESS_SPACE); |
560 | if (devpriv->base_addr == NULL) { | 560 | if (devpriv->base_addr == NULL) { |
561 | printk("s626_attach: IOREMAP failed\n"); | 561 | printk(KERN_ERR "s626_attach: IOREMAP failed\n"); |
562 | return -ENODEV; | 562 | return -ENODEV; |
563 | } | 563 | } |
564 | 564 | ||
@@ -579,7 +579,7 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
579 | pci_alloc_consistent(devpriv->pdev, DMABUF_SIZE, &appdma); | 579 | pci_alloc_consistent(devpriv->pdev, DMABUF_SIZE, &appdma); |
580 | 580 | ||
581 | if (devpriv->ANABuf.LogicalBase == NULL) { | 581 | if (devpriv->ANABuf.LogicalBase == NULL) { |
582 | printk("s626_attach: DMA Memory mapping error\n"); | 582 | printk(KERN_ERR "s626_attach: DMA Memory mapping error\n"); |
583 | return -ENOMEM; | 583 | return -ENOMEM; |
584 | } | 584 | } |
585 | 585 | ||
@@ -596,7 +596,7 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
596 | pci_alloc_consistent(devpriv->pdev, DMABUF_SIZE, &appdma); | 596 | pci_alloc_consistent(devpriv->pdev, DMABUF_SIZE, &appdma); |
597 | 597 | ||
598 | if (devpriv->RPSBuf.LogicalBase == NULL) { | 598 | if (devpriv->RPSBuf.LogicalBase == NULL) { |
599 | printk("s626_attach: DMA Memory mapping error\n"); | 599 | printk(KERN_ERR "s626_attach: DMA Memory mapping error\n"); |
600 | return -ENOMEM; | 600 | return -ENOMEM; |
601 | } | 601 | } |
602 | 602 | ||
@@ -622,18 +622,18 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
622 | 622 | ||
623 | /* set up interrupt handler */ | 623 | /* set up interrupt handler */ |
624 | if (dev->irq == 0) { | 624 | if (dev->irq == 0) { |
625 | printk(" unknown irq (bad)\n"); | 625 | printk(KERN_ERR " unknown irq (bad)\n"); |
626 | } else { | 626 | } else { |
627 | ret = request_irq(dev->irq, s626_irq_handler, IRQF_SHARED, | 627 | ret = request_irq(dev->irq, s626_irq_handler, IRQF_SHARED, |
628 | "s626", dev); | 628 | "s626", dev); |
629 | 629 | ||
630 | if (ret < 0) { | 630 | if (ret < 0) { |
631 | printk(" irq not available\n"); | 631 | printk(KERN_ERR " irq not available\n"); |
632 | dev->irq = 0; | 632 | dev->irq = 0; |
633 | } | 633 | } |
634 | } | 634 | } |
635 | 635 | ||
636 | DEBUG("s626_attach: -- it opts %d,%d -- \n", | 636 | DEBUG("s626_attach: -- it opts %d,%d --\n", |
637 | it->options[0], it->options[1]); | 637 | it->options[0], it->options[1]); |
638 | 638 | ||
639 | s = dev->subdevices + 0; | 639 | s = dev->subdevices + 0; |
@@ -1513,7 +1513,7 @@ void ResetADC(struct comedi_device *dev, uint8_t * ppl) | |||
1513 | break; /* Exit poll list processing loop. */ | 1513 | break; /* Exit poll list processing loop. */ |
1514 | } | 1514 | } |
1515 | } | 1515 | } |
1516 | DEBUG("ResetADC: ADC items %d \n", devpriv->AdcItems); | 1516 | DEBUG("ResetADC: ADC items %d\n", devpriv->AdcItems); |
1517 | 1517 | ||
1518 | /* VERSION 2.01 CHANGE: DELAY CHANGED FROM 250NS to 2US. Allow the | 1518 | /* VERSION 2.01 CHANGE: DELAY CHANGED FROM 250NS to 2US. Allow the |
1519 | * ADC to stabilize for 2 microseconds before starting the final | 1519 | * ADC to stabilize for 2 microseconds before starting the final |
@@ -1574,7 +1574,7 @@ static int s626_ai_insn_config(struct comedi_device *dev, | |||
1574 | /* register uint8_t i; */ | 1574 | /* register uint8_t i; */ |
1575 | /* register int32_t *readaddr; */ | 1575 | /* register int32_t *readaddr; */ |
1576 | 1576 | ||
1577 | /* DEBUG("as626_ai_rinsn: ai_rinsn enter \n"); */ | 1577 | /* DEBUG("as626_ai_rinsn: ai_rinsn enter\n"); */ |
1578 | 1578 | ||
1579 | /* Trigger ADC scan loop start by setting RPS Signal 0. */ | 1579 | /* Trigger ADC scan loop start by setting RPS Signal 0. */ |
1580 | /* MC_ENABLE( P_MC2, MC2_ADC_RPS ); */ | 1580 | /* MC_ENABLE( P_MC2, MC2_ADC_RPS ); */ |
@@ -1591,11 +1591,11 @@ static int s626_ai_insn_config(struct comedi_device *dev, | |||
1591 | /* Convert ADC data to 16-bit integer values and copy to application buffer. */ | 1591 | /* Convert ADC data to 16-bit integer values and copy to application buffer. */ |
1592 | /* for ( i = 0; i < devpriv->AdcItems; i++ ) { */ | 1592 | /* for ( i = 0; i < devpriv->AdcItems; i++ ) { */ |
1593 | /* *data = s626_ai_reg_to_uint( *readaddr++ ); */ | 1593 | /* *data = s626_ai_reg_to_uint( *readaddr++ ); */ |
1594 | /* DEBUG("s626_ai_rinsn: data %d \n",*data); */ | 1594 | /* DEBUG("s626_ai_rinsn: data %d\n",*data); */ |
1595 | /* data++; */ | 1595 | /* data++; */ |
1596 | /* } */ | 1596 | /* } */ |
1597 | 1597 | ||
1598 | /* DEBUG("s626_ai_rinsn: ai_rinsn escape \n"); */ | 1598 | /* DEBUG("s626_ai_rinsn: ai_rinsn escape\n"); */ |
1599 | /* return i; */ | 1599 | /* return i; */ |
1600 | /* } */ | 1600 | /* } */ |
1601 | 1601 | ||
@@ -1743,7 +1743,7 @@ static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) | |||
1743 | DEBUG("s626_ai_cmd: entering command function\n"); | 1743 | DEBUG("s626_ai_cmd: entering command function\n"); |
1744 | 1744 | ||
1745 | if (devpriv->ai_cmd_running) { | 1745 | if (devpriv->ai_cmd_running) { |
1746 | printk("s626_ai_cmd: Another ai_cmd is running %d\n", | 1746 | printk(KERN_ERR "s626_ai_cmd: Another ai_cmd is running %d\n", |
1747 | dev->minor); | 1747 | dev->minor); |
1748 | return -EBUSY; | 1748 | return -EBUSY; |
1749 | } | 1749 | } |
@@ -2147,7 +2147,7 @@ static void s626_dio_init(struct comedi_device *dev) | |||
2147 | DEBIwrite(dev, diopriv->WRDOut, 0); /* Program all outputs */ | 2147 | DEBIwrite(dev, diopriv->WRDOut, 0); /* Program all outputs */ |
2148 | /* to inactive state. */ | 2148 | /* to inactive state. */ |
2149 | } | 2149 | } |
2150 | DEBUG("s626_dio_init: DIO initialized \n"); | 2150 | DEBUG("s626_dio_init: DIO initialized\n"); |
2151 | } | 2151 | } |
2152 | 2152 | ||
2153 | /* DIO devices are slightly special. Although it is possible to | 2153 | /* DIO devices are slightly special. Although it is possible to |
@@ -2346,7 +2346,7 @@ static int s626_enc_insn_read(struct comedi_device *dev, | |||
2346 | int n; | 2346 | int n; |
2347 | struct enc_private *k = &encpriv[CR_CHAN(insn->chanspec)]; | 2347 | struct enc_private *k = &encpriv[CR_CHAN(insn->chanspec)]; |
2348 | 2348 | ||
2349 | DEBUG("s626_enc_insn_read: encoder read channel %d \n", | 2349 | DEBUG("s626_enc_insn_read: encoder read channel %d\n", |
2350 | CR_CHAN(insn->chanspec)); | 2350 | CR_CHAN(insn->chanspec)); |
2351 | 2351 | ||
2352 | for (n = 0; n < insn->n; n++) | 2352 | for (n = 0; n < insn->n; n++) |
@@ -2364,7 +2364,7 @@ static int s626_enc_insn_write(struct comedi_device *dev, | |||
2364 | 2364 | ||
2365 | struct enc_private *k = &encpriv[CR_CHAN(insn->chanspec)]; | 2365 | struct enc_private *k = &encpriv[CR_CHAN(insn->chanspec)]; |
2366 | 2366 | ||
2367 | DEBUG("s626_enc_insn_write: encoder write channel %d \n", | 2367 | DEBUG("s626_enc_insn_write: encoder write channel %d\n", |
2368 | CR_CHAN(insn->chanspec)); | 2368 | CR_CHAN(insn->chanspec)); |
2369 | 2369 | ||
2370 | /* Set the preload register */ | 2370 | /* Set the preload register */ |
@@ -3099,12 +3099,12 @@ static uint16_t GetEnable_B(struct comedi_device *dev, struct enc_private *k) | |||
3099 | static void SetLatchSource(struct comedi_device *dev, struct enc_private *k, | 3099 | static void SetLatchSource(struct comedi_device *dev, struct enc_private *k, |
3100 | uint16_t value) | 3100 | uint16_t value) |
3101 | { | 3101 | { |
3102 | DEBUG("SetLatchSource: SetLatchSource enter 3550 \n"); | 3102 | DEBUG("SetLatchSource: SetLatchSource enter 3550\n"); |
3103 | DEBIreplace(dev, k->MyCRB, | 3103 | DEBIreplace(dev, k->MyCRB, |
3104 | (uint16_t) (~(CRBMSK_INTCTRL | CRBMSK_LATCHSRC)), | 3104 | (uint16_t) (~(CRBMSK_INTCTRL | CRBMSK_LATCHSRC)), |
3105 | (uint16_t) (value << CRBBIT_LATCHSRC)); | 3105 | (uint16_t) (value << CRBBIT_LATCHSRC)); |
3106 | 3106 | ||
3107 | DEBUG("SetLatchSource: SetLatchSource exit \n"); | 3107 | DEBUG("SetLatchSource: SetLatchSource exit\n"); |
3108 | } | 3108 | } |
3109 | 3109 | ||
3110 | /* | 3110 | /* |
@@ -3317,6 +3317,6 @@ static void CountersInit(struct comedi_device *dev) | |||
3317 | k->ResetCapFlags(dev, k); | 3317 | k->ResetCapFlags(dev, k); |
3318 | k->SetEnable(dev, k, CLKENAB_ALWAYS); | 3318 | k->SetEnable(dev, k, CLKENAB_ALWAYS); |
3319 | } | 3319 | } |
3320 | DEBUG("CountersInit: counters initialized \n"); | 3320 | DEBUG("CountersInit: counters initialized\n"); |
3321 | 3321 | ||
3322 | } | 3322 | } |