diff options
author | David Härdeman <david@hardeman.nu> | 2011-04-28 11:13:17 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-20 08:29:50 -0400 |
commit | 67cdd42e0630eff3673808aa57007501353c73b6 (patch) | |
tree | 7640fbc8699888107d45c63288afb1f5aaf7d58a /drivers/media/rc | |
parent | 0f2ce168c850b4ea4b0d71f59c5603bdee85b6b5 (diff) |
[media] rc-core: int to bool conversion for winbond-cir
Using bool instead of an int helps readability a bit.
Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/rc')
-rw-r--r-- | drivers/media/rc/winbond-cir.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c index 186de5522001..c7686ca81a6b 100644 --- a/drivers/media/rc/winbond-cir.c +++ b/drivers/media/rc/winbond-cir.c | |||
@@ -382,7 +382,7 @@ wbcir_shutdown(struct pnp_dev *device) | |||
382 | { | 382 | { |
383 | struct device *dev = &device->dev; | 383 | struct device *dev = &device->dev; |
384 | struct wbcir_data *data = pnp_get_drvdata(device); | 384 | struct wbcir_data *data = pnp_get_drvdata(device); |
385 | int do_wake = 1; | 385 | bool do_wake = true; |
386 | u8 match[11]; | 386 | u8 match[11]; |
387 | u8 mask[11]; | 387 | u8 mask[11]; |
388 | u8 rc6_csl = 0; | 388 | u8 rc6_csl = 0; |
@@ -392,14 +392,14 @@ wbcir_shutdown(struct pnp_dev *device) | |||
392 | memset(mask, 0, sizeof(mask)); | 392 | memset(mask, 0, sizeof(mask)); |
393 | 393 | ||
394 | if (wake_sc == INVALID_SCANCODE || !device_may_wakeup(dev)) { | 394 | if (wake_sc == INVALID_SCANCODE || !device_may_wakeup(dev)) { |
395 | do_wake = 0; | 395 | do_wake = false; |
396 | goto finish; | 396 | goto finish; |
397 | } | 397 | } |
398 | 398 | ||
399 | switch (protocol) { | 399 | switch (protocol) { |
400 | case IR_PROTOCOL_RC5: | 400 | case IR_PROTOCOL_RC5: |
401 | if (wake_sc > 0xFFF) { | 401 | if (wake_sc > 0xFFF) { |
402 | do_wake = 0; | 402 | do_wake = false; |
403 | dev_err(dev, "RC5 - Invalid wake scancode\n"); | 403 | dev_err(dev, "RC5 - Invalid wake scancode\n"); |
404 | break; | 404 | break; |
405 | } | 405 | } |
@@ -418,7 +418,7 @@ wbcir_shutdown(struct pnp_dev *device) | |||
418 | 418 | ||
419 | case IR_PROTOCOL_NEC: | 419 | case IR_PROTOCOL_NEC: |
420 | if (wake_sc > 0xFFFFFF) { | 420 | if (wake_sc > 0xFFFFFF) { |
421 | do_wake = 0; | 421 | do_wake = false; |
422 | dev_err(dev, "NEC - Invalid wake scancode\n"); | 422 | dev_err(dev, "NEC - Invalid wake scancode\n"); |
423 | break; | 423 | break; |
424 | } | 424 | } |
@@ -440,7 +440,7 @@ wbcir_shutdown(struct pnp_dev *device) | |||
440 | 440 | ||
441 | if (wake_rc6mode == 0) { | 441 | if (wake_rc6mode == 0) { |
442 | if (wake_sc > 0xFFFF) { | 442 | if (wake_sc > 0xFFFF) { |
443 | do_wake = 0; | 443 | do_wake = false; |
444 | dev_err(dev, "RC6 - Invalid wake scancode\n"); | 444 | dev_err(dev, "RC6 - Invalid wake scancode\n"); |
445 | break; | 445 | break; |
446 | } | 446 | } |
@@ -496,7 +496,7 @@ wbcir_shutdown(struct pnp_dev *device) | |||
496 | } else if (wake_sc <= 0x007FFFFF) { | 496 | } else if (wake_sc <= 0x007FFFFF) { |
497 | rc6_csl = 60; | 497 | rc6_csl = 60; |
498 | } else { | 498 | } else { |
499 | do_wake = 0; | 499 | do_wake = false; |
500 | dev_err(dev, "RC6 - Invalid wake scancode\n"); | 500 | dev_err(dev, "RC6 - Invalid wake scancode\n"); |
501 | break; | 501 | break; |
502 | } | 502 | } |
@@ -508,14 +508,14 @@ wbcir_shutdown(struct pnp_dev *device) | |||
508 | mask[i++] = 0x0F; | 508 | mask[i++] = 0x0F; |
509 | 509 | ||
510 | } else { | 510 | } else { |
511 | do_wake = 0; | 511 | do_wake = false; |
512 | dev_err(dev, "RC6 - Invalid wake mode\n"); | 512 | dev_err(dev, "RC6 - Invalid wake mode\n"); |
513 | } | 513 | } |
514 | 514 | ||
515 | break; | 515 | break; |
516 | 516 | ||
517 | default: | 517 | default: |
518 | do_wake = 0; | 518 | do_wake = false; |
519 | break; | 519 | break; |
520 | } | 520 | } |
521 | 521 | ||