* Re: staging: comedi: drivers: use comedi_dio_update_state() for complex cases
[not found] <20131107062754.93B2D660F4A@gitolite.kernel.org>
@ 2013-11-08 20:06 ` Dave Jones
2013-11-26 18:07 ` Hartley Sweeten
0 siblings, 1 reply; 6+ messages in thread
From: Dave Jones @ 2013-11-08 20:06 UTC (permalink / raw)
To: Linux Kernel Mailing List; +Cc: hsweeten
On Thu, Nov 07, 2013 at 06:27:54AM +0000, Linux Kernel wrote:
> Gitweb: http://git.kernel.org/linus/;a=commit;h=b3ff824a81e8978deb56f6d163479c1a0a606037
> Commit: b3ff824a81e8978deb56f6d163479c1a0a606037
> Parent: 97f4289ad08cffe55de06d4ac4f89ac540450aee
> Author: H Hartley Sweeten <hsweeten@visionengravers.com>
> AuthorDate: Fri Aug 30 11:06:17 2013 -0700
> Committer: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> CommitDate: Tue Sep 17 07:47:40 2013 -0700
>
> staging: comedi: drivers: use comedi_dio_update_state() for complex cases
>
> Use comedi_dio_update_state() to handle the boilerplate code to update
> the subdevice s->state for more complex cases where the hardware is only
> updated based on the 'mask' of the channels that are modified.
>
> Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
> Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This bit looks suspect :-
> if (mask) {
> - s->state &= ~mask;
> - s->state |= (bits & mask);
> -
> if (mask & 0x00ff)
> outb(s->state & 0xff, dev->iobase + reg);
> - if ((mask & 0xff00) && (s->n_chan > 8))
> + if ((mask & 0xff00) & (s->n_chan > 8))
> outb((s->state >> 8) & 0xff, dev->iobase + reg + 1);
> - if ((mask & 0xff0000) && (s->n_chan > 16))
> + if ((mask & 0xff0000) & (s->n_chan > 16))
> outb((s->state >> 16) & 0xff, dev->iobase + reg + 2);
> - if ((mask & 0xff000000) && (s->n_chan > 24))
> + if ((mask & 0xff000000) & (s->n_chan > 24))
> outb((s->state >> 24) & 0xff, dev->iobase + reg + 3);
> }
should those be shifts ? Like so ?
diff --git a/drivers/staging/comedi/drivers/pcl730.c b/drivers/staging/comedi/drivers/pcl730.c
index d041b714db29..29a54e5d73d6 100644
--- a/drivers/staging/comedi/drivers/pcl730.c
+++ b/drivers/staging/comedi/drivers/pcl730.c
@@ -173,11 +173,11 @@ static int pcl730_do_insn_bits(struct comedi_device *dev,
if (mask) {
if (mask & 0x00ff)
outb(s->state & 0xff, dev->iobase + reg);
- if ((mask & 0xff00) & (s->n_chan > 8))
+ if ((mask & 0xff00) & (s->n_chan >> 8))
outb((s->state >> 8) & 0xff, dev->iobase + reg + 1);
- if ((mask & 0xff0000) & (s->n_chan > 16))
+ if ((mask & 0xff0000) & (s->n_chan >> 16))
outb((s->state >> 16) & 0xff, dev->iobase + reg + 2);
- if ((mask & 0xff000000) & (s->n_chan > 24))
+ if ((mask & 0xff000000) & (s->n_chan >> 24))
outb((s->state >> 24) & 0xff, dev->iobase + reg + 3);
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: staging: comedi: drivers: use comedi_dio_update_state() for complex cases
2013-11-08 20:06 ` staging: comedi: drivers: use comedi_dio_update_state() for complex cases Dave Jones
@ 2013-11-26 18:07 ` Hartley Sweeten
2013-11-27 2:57 ` staging: comedi: Fix boolean/logical and mix-up Dave Jones
0 siblings, 1 reply; 6+ messages in thread
From: Hartley Sweeten @ 2013-11-26 18:07 UTC (permalink / raw)
To: Dave Jones, Linux Kernel Mailing List
On Friday, November 08, 2013 1:07 PM, Dave Jones wrote:
> On Thu, Nov 07, 2013 at 06:27:54AM +0000, Linux Kernel wrote:
>> Gitweb: http://git.kernel.org/linus/;a=commit;h=b3ff824a81e8978deb56f6d163479c1a0a606037
>> Commit: b3ff824a81e8978deb56f6d163479c1a0a606037
>> Parent: 97f4289ad08cffe55de06d4ac4f89ac540450aee
>> Author: H Hartley Sweeten <hsweeten@visionengravers.com>
>> AuthorDate: Fri Aug 30 11:06:17 2013 -0700
>> Committer: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>> CommitDate: Tue Sep 17 07:47:40 2013 -0700
>>
>> staging: comedi: drivers: use comedi_dio_update_state() for complex cases
>>
>> Use comedi_dio_update_state() to handle the boilerplate code to update
>> the subdevice s->state for more complex cases where the hardware is only
>> updated based on the 'mask' of the channels that are modified.
>>
>> Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
>> Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
>> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> This bit looks suspect :-
>
>> if (mask) {
>> - s->state &= ~mask;
>> - s->state |= (bits & mask);
>> -
>> if (mask & 0x00ff)
>> outb(s->state & 0xff, dev->iobase + reg);
>> - if ((mask & 0xff00) && (s->n_chan > 8))
>> + if ((mask & 0xff00) & (s->n_chan > 8))
>> outb((s->state >> 8) & 0xff, dev->iobase + reg + 1);
>> - if ((mask & 0xff0000) && (s->n_chan > 16))
>> + if ((mask & 0xff0000) & (s->n_chan > 16))
>> outb((s->state >> 16) & 0xff, dev->iobase + reg + 2);
>> - if ((mask & 0xff000000) && (s->n_chan > 24))
>> + if ((mask & 0xff000000) & (s->n_chan > 24))
>> outb((s->state >> 24) & 0xff, dev->iobase + reg + 3);
>> }
>
>
> should those be shifts ? Like so ?
>
>
> diff --git a/drivers/staging/comedi/drivers/pcl730.c b/drivers/staging/comedi/drivers/pcl730.c
> index d041b714db29..29a54e5d73d6 100644
> --- a/drivers/staging/comedi/drivers/pcl730.c
> +++ b/drivers/staging/comedi/drivers/pcl730.c
> @@ -173,11 +173,11 @@ static int pcl730_do_insn_bits(struct comedi_device *dev,
> if (mask) {
> if (mask & 0x00ff)
> outb(s->state & 0xff, dev->iobase + reg);
> - if ((mask & 0xff00) & (s->n_chan > 8))
> + if ((mask & 0xff00) & (s->n_chan >> 8))
> outb((s->state >> 8) & 0xff, dev->iobase + reg + 1);
> - if ((mask & 0xff0000) & (s->n_chan > 16))
> + if ((mask & 0xff0000) & (s->n_chan >> 16))
> outb((s->state >> 16) & 0xff, dev->iobase + reg + 2);
> - if ((mask & 0xff000000) & (s->n_chan > 24))
> + if ((mask & 0xff000000) & (s->n_chan >> 24))
> outb((s->state >> 24) & 0xff, dev->iobase + reg + 3);
> }
No, they should not be bit-shifts.
But, there is a bug here. The if tests should be like this:
if ((mask & 0xff00) && (s->n_chan > 8))
Sorry about that.
Do you want to post a patch? If I don't see one in the next couple days I'll fix it.
Regards,
Hartley
^ permalink raw reply [flat|nested] 6+ messages in thread
* staging: comedi: Fix boolean/logical and mix-up.
2013-11-26 18:07 ` Hartley Sweeten
@ 2013-11-27 2:57 ` Dave Jones
2013-11-27 16:38 ` Hartley Sweeten
0 siblings, 1 reply; 6+ messages in thread
From: Dave Jones @ 2013-11-27 2:57 UTC (permalink / raw)
To: Hartley Sweeten; +Cc: Linux Kernel Mailing List
Introduced in commit b3ff824a81e8.
Signed-off-by: Dave Jones <davej@fedoraproject.org>
diff --git a/drivers/staging/comedi/drivers/pcl730.c b/drivers/staging/comedi/drivers/pcl730.c
index d041b714db29..2baaf1db6fbf 100644
--- a/drivers/staging/comedi/drivers/pcl730.c
+++ b/drivers/staging/comedi/drivers/pcl730.c
@@ -173,11 +173,11 @@ static int pcl730_do_insn_bits(struct comedi_device *dev,
if (mask) {
if (mask & 0x00ff)
outb(s->state & 0xff, dev->iobase + reg);
- if ((mask & 0xff00) & (s->n_chan > 8))
+ if ((mask & 0xff00) && (s->n_chan > 8))
outb((s->state >> 8) & 0xff, dev->iobase + reg + 1);
- if ((mask & 0xff0000) & (s->n_chan > 16))
+ if ((mask & 0xff0000) && (s->n_chan > 16))
outb((s->state >> 16) & 0xff, dev->iobase + reg + 2);
- if ((mask & 0xff000000) & (s->n_chan > 24))
+ if ((mask & 0xff000000) && (s->n_chan > 24))
outb((s->state >> 24) & 0xff, dev->iobase + reg + 3);
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: staging: comedi: Fix boolean/logical and mix-up.
2013-11-27 2:57 ` staging: comedi: Fix boolean/logical and mix-up Dave Jones
@ 2013-11-27 16:38 ` Hartley Sweeten
2013-11-27 16:59 ` Hartley Sweeten
0 siblings, 1 reply; 6+ messages in thread
From: Hartley Sweeten @ 2013-11-27 16:38 UTC (permalink / raw)
To: Dave Jones; +Cc: Linux Kernel Mailing List, Greg KH, devel@driverdev.osuosl.org
On Tuesday, November 26, 2013 7:57 PM, Dave Jones wrote:
> Introduced in commit b3ff824a81e8.
>
> Signed-off-by: Dave Jones <davej@fedoraproject.org>
>
> diff --git a/drivers/staging/comedi/drivers/pcl730.c b/drivers/staging/comedi/drivers/pcl730.c
> index d041b714db29..2baaf1db6fbf 100644
> --- a/drivers/staging/comedi/drivers/pcl730.c
> +++ b/drivers/staging/comedi/drivers/pcl730.c
> @@ -173,11 +173,11 @@ static int pcl730_do_insn_bits(struct comedi_device *dev,
> if (mask) {
> if (mask & 0x00ff)
> outb(s->state & 0xff, dev->iobase + reg);
> - if ((mask & 0xff00) & (s->n_chan > 8))
> + if ((mask & 0xff00) && (s->n_chan > 8))
> outb((s->state >> 8) & 0xff, dev->iobase + reg + 1);
> - if ((mask & 0xff0000) & (s->n_chan > 16))
> + if ((mask & 0xff0000) && (s->n_chan > 16))
> outb((s->state >> 16) & 0xff, dev->iobase + reg + 2);
> - if ((mask & 0xff000000) & (s->n_chan > 24))
> + if ((mask & 0xff000000) && (s->n_chan > 24))
> outb((s->state >> 24) & 0xff, dev->iobase + reg + 3);
> }
My bad...
Added Greg KH and the staging devel list to the CCs.
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: staging: comedi: Fix boolean/logical and mix-up.
2013-11-27 16:38 ` Hartley Sweeten
@ 2013-11-27 16:59 ` Hartley Sweeten
2013-11-27 17:11 ` Dave Jones
0 siblings, 1 reply; 6+ messages in thread
From: Hartley Sweeten @ 2013-11-27 16:59 UTC (permalink / raw)
To: Hartley Sweeten, Dave Jones, dan.carpenter@oracle.com
Cc: devel@driverdev.osuosl.org, Greg KH, Linux Kernel Mailing List
On Wednesday, November 27, 2013 9:39 AM, Hartley Sweeten wrote:
> On Tuesday, November 26, 2013 7:57 PM, Dave Jones wrote:
>> Introduced in commit b3ff824a81e8.
>>
>> Signed-off-by: Dave Jones <davej@fedoraproject.org>
>>
>> diff --git a/drivers/staging/comedi/drivers/pcl730.c b/drivers/staging/comedi/drivers/pcl730.c
>> index d041b714db29..2baaf1db6fbf 100644
>> --- a/drivers/staging/comedi/drivers/pcl730.c
>> +++ b/drivers/staging/comedi/drivers/pcl730.c
>> @@ -173,11 +173,11 @@ static int pcl730_do_insn_bits(struct comedi_device *dev,
>> if (mask) {
>> if (mask & 0x00ff)
>> outb(s->state & 0xff, dev->iobase + reg);
>> - if ((mask & 0xff00) & (s->n_chan > 8))
>> + if ((mask & 0xff00) && (s->n_chan > 8))
>> outb((s->state >> 8) & 0xff, dev->iobase + reg + 1);
>> - if ((mask & 0xff0000) & (s->n_chan > 16))
>> + if ((mask & 0xff0000) && (s->n_chan > 16))
>> outb((s->state >> 16) & 0xff, dev->iobase + reg + 2);
>> - if ((mask & 0xff000000) & (s->n_chan > 24))
>> + if ((mask & 0xff000000) && (s->n_chan > 24))
>> outb((s->state >> 24) & 0xff, dev->iobase + reg + 3);
>> }
>
> My bad...
>
> Added Greg KH and the staging devel list to the CCs.
>
> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Dave,
I just noticed that Dan Carpenter already submitted a patch that fixed this.
It was merged as commit 9382c06e2d192adec090fb09ff0b699e951f88e1.
Hartley
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: staging: comedi: Fix boolean/logical and mix-up.
2013-11-27 16:59 ` Hartley Sweeten
@ 2013-11-27 17:11 ` Dave Jones
0 siblings, 0 replies; 6+ messages in thread
From: Dave Jones @ 2013-11-27 17:11 UTC (permalink / raw)
To: Hartley Sweeten
Cc: dan.carpenter@oracle.com, devel@driverdev.osuosl.org, Greg KH,
Linux Kernel Mailing List
On Wed, Nov 27, 2013 at 04:59:17PM +0000, Hartley Sweeten wrote:
> > Added Greg KH and the staging devel list to the CCs.
>
> I just noticed that Dan Carpenter already submitted a patch that fixed this.
> It was merged as commit 9382c06e2d192adec090fb09ff0b699e951f88e1.
Ah, I didn't look at -next.
thanks,
Dave
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-11-27 17:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20131107062754.93B2D660F4A@gitolite.kernel.org>
2013-11-08 20:06 ` staging: comedi: drivers: use comedi_dio_update_state() for complex cases Dave Jones
2013-11-26 18:07 ` Hartley Sweeten
2013-11-27 2:57 ` staging: comedi: Fix boolean/logical and mix-up Dave Jones
2013-11-27 16:38 ` Hartley Sweeten
2013-11-27 16:59 ` Hartley Sweeten
2013-11-27 17:11 ` Dave Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).