* [PATCH] Staging: Comedi adv_pci1710 : Corrected over 80 column warnings
@ 2012-04-28 15:50 Tomas Melin
2012-05-03 15:27 ` [PATCH] Staging: Comedi adv_pci1710 : Corrected DPRINTK formatting Tomas Melin
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Tomas Melin @ 2012-04-28 15:50 UTC (permalink / raw)
To: kernel-janitors
Various comments and code lines longer than 80 chars fixed in file adv_pci1710.c.
Signed-off-by: Tomas Melin <tomas.melin@iki.fi>
---
drivers/staging/comedi/drivers/adv_pci1710.c | 33 ++++++++++++++-----------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index 8318c82..b5ef21d 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -676,7 +676,9 @@ static void interrupt_pci1710_every_sample(void *d)
s->async->buf_int_count, s->async->buf_int_ptr,
s->async->buf_user_count, s->async->buf_user_ptr);
DPRINTK("adv_pci1710 EDBG: EOS2\n");
- if ((!devpriv->neverending_ai) && (devpriv->ai_act_scan >= devpriv->ai_scans)) { /* all data sampled */
+ if ((!devpriv->neverending_ai) &&
+ (devpriv->ai_act_scan >= devpriv->ai_scans)) {
+ /* all data sampled */
pci171x_ai_cancel(dev, s);
s->async->events |= COMEDI_CB_EOA;
comedi_event(dev, s);
@@ -804,8 +806,8 @@ static irqreturn_t interrupt_service_pci1710(int irq, void *d)
irq);
if (!dev->attached) /* is device attached? */
return IRQ_NONE; /* no, exit */
-
- if (!(inw(dev->iobase + PCI171x_STATUS) & Status_IRQ)) /* is this interrupt from our board? */
+ /* is this interrupt from our board? */
+ if (!(inw(dev->iobase + PCI171x_STATUS) & Status_IRQ))
return IRQ_NONE; /* no, exit */
DPRINTK("adv_pci1710 EDBG: interrupt_service_pci1710() ST: %4x\n",
@@ -814,7 +816,7 @@ static irqreturn_t interrupt_service_pci1710(int irq, void *d)
if (devpriv->ai_et) { /* Switch from initial TRIG_EXT to TRIG_xxx. */
devpriv->ai_et = 0;
devpriv->CntrlReg &= Control_CNT0;
- devpriv->CntrlReg |= Control_SW; /* set software trigger */
+ devpriv->CntrlReg |= Control_SW; /* set software trigger */
outw(devpriv->CntrlReg, dev->iobase + PCI171x_CONTROL);
devpriv->CntrlReg = devpriv->ai_et_CntrlReg;
outb(0, dev->iobase + PCI171x_CLRFIFO);
@@ -865,7 +867,8 @@ static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device *dev,
devpriv->neverending_ai = 0;
devpriv->CntrlReg &= Control_CNT0;
- if ((devpriv->ai_flags & TRIG_WAKE_EOS)) { /* don't we want wake up every scan? devpriv->ai_eos=1; */
+ /* don't we want wake up every scan? devpriv->ai_eos=1; */
+ if ((devpriv->ai_flags & TRIG_WAKE_EOS)) {
devpriv->ai_eos = 1;
} else {
devpriv->CntrlReg |= Control_ONEFH;
@@ -982,13 +985,13 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
#ifdef PCI171X_EXTDEBUG
pci171x_cmdtest_out(1, cmd);
#endif
- DPRINTK
- ("adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=1\n",
- err);
+ DPRINTK(
+ "adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=1\n",
+ err);
return 1;
}
- /* step 2: make sure trigger sources are unique and mutually compatible */
+ /* step2: make sure trigger srcs are unique and mutually compatible */
if (cmd->start_src != TRIG_NOW && cmd->start_src != TRIG_EXT) {
cmd->start_src = TRIG_NOW;
@@ -1015,9 +1018,9 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
#ifdef PCI171X_EXTDEBUG
pci171x_cmdtest_out(2, cmd);
#endif
- DPRINTK
- ("adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=2\n",
- err);
+ DPRINTK(
+ "adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=2\n",
+ err);
return 2;
}
@@ -1065,9 +1068,9 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
#ifdef PCI171X_EXTDEBUG
pci171x_cmdtest_out(3, cmd);
#endif
- DPRINTK
- ("adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=3\n",
- err);
+ DPRINTK(
+ "adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=3\n",
+ err);
return 3;
}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] Staging: Comedi adv_pci1710 : Corrected DPRINTK formatting
2012-04-28 15:50 [PATCH] Staging: Comedi adv_pci1710 : Corrected over 80 column warnings Tomas Melin
@ 2012-05-03 15:27 ` Tomas Melin
2012-05-04 13:34 ` Dan Carpenter
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Tomas Melin @ 2012-05-03 15:27 UTC (permalink / raw)
To: kernel-janitors
Corrected formatting for several DPRINT messages.
Signed-off-by: Tomas Melin <tomas.melin@iki.fi>
---
drivers/staging/comedi/drivers/adv_pci1710.c | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index 8318c82..1256321 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -982,9 +982,8 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
#ifdef PCI171X_EXTDEBUG
pci171x_cmdtest_out(1, cmd);
#endif
- DPRINTK
- ("adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=1\n",
- err);
+ DPRINTK("adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=1\n",
+ err);
return 1;
}
@@ -1015,9 +1014,8 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
#ifdef PCI171X_EXTDEBUG
pci171x_cmdtest_out(2, cmd);
#endif
- DPRINTK
- ("adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=2\n",
- err);
+ DPRINTK("adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=2\n",
+ err);
return 2;
}
@@ -1065,9 +1063,8 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
#ifdef PCI171X_EXTDEBUG
pci171x_cmdtest_out(3, cmd);
#endif
- DPRINTK
- ("adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=3\n",
- err);
+ DPRINTK("adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=3\n",
+ err);
return 3;
}
@@ -1085,9 +1082,8 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
}
if (err) {
- DPRINTK
- ("adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=4\n",
- err);
+ DPRINTK("adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=4\n",
+ err);
return 4;
}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] Staging: Comedi adv_pci1710 : Corrected DPRINTK formatting
2012-04-28 15:50 [PATCH] Staging: Comedi adv_pci1710 : Corrected over 80 column warnings Tomas Melin
2012-05-03 15:27 ` [PATCH] Staging: Comedi adv_pci1710 : Corrected DPRINTK formatting Tomas Melin
@ 2012-05-04 13:34 ` Dan Carpenter
2012-05-04 16:25 ` Tomas Melin
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2012-05-04 13:34 UTC (permalink / raw)
To: kernel-janitors
On Thu, May 03, 2012 at 06:27:36PM +0300, Tomas Melin wrote:
> Corrected formatting for several DPRINT messages.
>
This patch is fine, but eventually these will have to changed to:
dev_dbg(dev->class_dev,
"adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=1\n",
err);
Or even better they can just be removed after the driver is stable.
It's not worth shifting things around too much if we're just going
to redo it later.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] Staging: Comedi adv_pci1710 : Corrected DPRINTK formatting
2012-04-28 15:50 [PATCH] Staging: Comedi adv_pci1710 : Corrected over 80 column warnings Tomas Melin
2012-05-03 15:27 ` [PATCH] Staging: Comedi adv_pci1710 : Corrected DPRINTK formatting Tomas Melin
2012-05-04 13:34 ` Dan Carpenter
@ 2012-05-04 16:25 ` Tomas Melin
2012-05-04 17:08 ` Dan Carpenter
2012-05-09 20:24 ` Greg KH
4 siblings, 0 replies; 6+ messages in thread
From: Tomas Melin @ 2012-05-04 16:25 UTC (permalink / raw)
To: kernel-janitors
On Fri, May 4, 2012 at 4:34 PM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> On Thu, May 03, 2012 at 06:27:36PM +0300, Tomas Melin wrote:
>> Corrected formatting for several DPRINT messages.
>>
>
> This patch is fine, but eventually these will have to changed to:
>
> dev_dbg(dev->class_dev,
> "adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=1\n",
> err);
>
Ok, I see. So dev_dbg() should always be preffered for debug printing?
Also while we are at it, how strict is the rule that printk:s should
include KERN_ facility level statements? are missing facility levels
worth patching?
regards,
Tomas
> Or even better they can just be removed after the driver is stable.
> It's not worth shifting things around too much if we're just going
> to redo it later.
>
> regards,
> dan carpenter
>
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Staging: Comedi adv_pci1710 : Corrected DPRINTK formatting
2012-04-28 15:50 [PATCH] Staging: Comedi adv_pci1710 : Corrected over 80 column warnings Tomas Melin
` (2 preceding siblings ...)
2012-05-04 16:25 ` Tomas Melin
@ 2012-05-04 17:08 ` Dan Carpenter
2012-05-09 20:24 ` Greg KH
4 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2012-05-04 17:08 UTC (permalink / raw)
To: kernel-janitors
On Fri, May 04, 2012 at 07:25:00PM +0300, Tomas Melin wrote:
> On Fri, May 4, 2012 at 4:34 PM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> > On Thu, May 03, 2012 at 06:27:36PM +0300, Tomas Melin wrote:
> >> Corrected formatting for several DPRINT messages.
> >>
> >
> > This patch is fine, but eventually these will have to changed to:
> >
> > dev_dbg(dev->class_dev,
> > "adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=1\n",
> > err);
> >
>
> Ok, I see. So dev_dbg() should always be preffered for debug printing?
>
Yep. I think dev_info() and friends are prefered now. Btw, are you
subscribed to the driver-devel mailing list? Hm... This email
should have been CC'd to that list, but it's not.
There was a discussion earlier about whether dev->class_dev was the
right device pointer to use. I think we decided it was. But it
would be good if someone were testing this. I assume you don't
have the hardware.
> Also while we are at it, how strict is the rule that printk:s should
> include KERN_ facility level statements? are missing facility levels
> worth patching?
>
I think instead of adding KERN_ levels we're trying to move to
dev_warn() etc.
regards,
dan carpenter
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] Staging: Comedi adv_pci1710 : Corrected DPRINTK formatting
2012-04-28 15:50 [PATCH] Staging: Comedi adv_pci1710 : Corrected over 80 column warnings Tomas Melin
` (3 preceding siblings ...)
2012-05-04 17:08 ` Dan Carpenter
@ 2012-05-09 20:24 ` Greg KH
4 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2012-05-09 20:24 UTC (permalink / raw)
To: kernel-janitors
On Thu, May 03, 2012 at 06:27:36PM +0300, Tomas Melin wrote:
> Corrected formatting for several DPRINT messages.
>
> Signed-off-by: Tomas Melin <tomas.melin@iki.fi>
> ---
> drivers/staging/comedi/drivers/adv_pci1710.c | 20 ++++++++------------
> 1 files changed, 8 insertions(+), 12 deletions(-)
For some reason this patch doesn't apply at all, care to redo it against
the linux-next tree and resend?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-05-09 20:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-28 15:50 [PATCH] Staging: Comedi adv_pci1710 : Corrected over 80 column warnings Tomas Melin
2012-05-03 15:27 ` [PATCH] Staging: Comedi adv_pci1710 : Corrected DPRINTK formatting Tomas Melin
2012-05-04 13:34 ` Dan Carpenter
2012-05-04 16:25 ` Tomas Melin
2012-05-04 17:08 ` Dan Carpenter
2012-05-09 20:24 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox