Skip to content

Commit

Permalink
Staging: meilhaus: Correct use of ! and &
Browse files Browse the repository at this point in the history
ME_IO_SINGLE_TYPE_WRITE_NONBLOCKING and ME_IO_STREAM_CONFIG_WRAPAROUND both
hanve 0 as the rightmost bit, and thus eg
!flags & ME_IO_SINGLE_TYPE_WRITE_NONBLOCKING is always 0.
I assume that !(flags & ME_IO_SINGLE_TYPE_WRITE_NONBLOCKING) and
!(flags & ME_IO_STREAM_CONFIG_WRAPAROUND) were intended.

The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@@ expression E; constant C; @@
(
  !E & !C
|
- !E & C
+ !(E & C)
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Julia Lawall authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent c6f5af8 commit 530ddf8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion drivers/staging/meilhaus/me1600_ao.c
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,9 @@ static int me1600_ao_io_single_write(me_subdevice_t * subdevice,
queue_delayed_work(instance->me1600_workqueue,
&instance->ao_control_task, 1);

if ((!flags & ME_IO_SINGLE_TYPE_WRITE_NONBLOCKING) && ((instance->ao_regs_shadows)->trigger & instance->ao_idx)) { //Blocking mode. Wait for software trigger.
if ((!(flags & ME_IO_SINGLE_TYPE_WRITE_NONBLOCKING)) &&
((instance->ao_regs_shadows)->trigger & instance->ao_idx)) {
/* Blocking mode. Wait for software trigger. */
if (time_out) {
delay = (time_out * HZ) / 1000;
if (delay == 0)
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/meilhaus/me4600_ao.c
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,7 @@ static int me4600_ao_io_stream_config(me_subdevice_t * subdevice,
}

if (flags & ME_IO_STREAM_CONFIG_HARDWARE_ONLY) {
if (!flags & ME_IO_STREAM_CONFIG_WRAPAROUND) {
if (!(flags & ME_IO_STREAM_CONFIG_WRAPAROUND)) {
PERROR
("Hardware ME_IO_STREAM_CONFIG_HARDWARE_ONLY has to be with ME_IO_STREAM_CONFIG_WRAPAROUND.\n");
return ME_ERRNO_INVALID_FLAGS;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/meilhaus/me6000_ao.c
Original file line number Diff line number Diff line change
Expand Up @@ -1063,7 +1063,7 @@ static int me6000_ao_io_stream_config(me_subdevice_t * subdevice,
}

if (flags & ME_IO_STREAM_CONFIG_HARDWARE_ONLY) {
if (!flags & ME_IO_STREAM_CONFIG_WRAPAROUND) {
if (!(flags & ME_IO_STREAM_CONFIG_WRAPAROUND)) {
PERROR
("Hardware ME_IO_STREAM_CONFIG_HARDWARE_ONLY has to be with ME_IO_STREAM_CONFIG_WRAPAROUND.\n");
return ME_ERRNO_INVALID_FLAGS;
Expand Down

0 comments on commit 530ddf8

Please sign in to comment.