Skip to content

Commit

Permalink
[media] rc-core: int to bool conversion for winbond-cir
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Härdeman authored and Mauro Carvalho Chehab committed May 20, 2011
1 parent 0f2ce16 commit 67cdd42
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/media/rc/winbond-cir.c
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ wbcir_shutdown(struct pnp_dev *device)
{
struct device *dev = &device->dev;
struct wbcir_data *data = pnp_get_drvdata(device);
int do_wake = 1;
bool do_wake = true;
u8 match[11];
u8 mask[11];
u8 rc6_csl = 0;
Expand All @@ -392,14 +392,14 @@ wbcir_shutdown(struct pnp_dev *device)
memset(mask, 0, sizeof(mask));

if (wake_sc == INVALID_SCANCODE || !device_may_wakeup(dev)) {
do_wake = 0;
do_wake = false;
goto finish;
}

switch (protocol) {
case IR_PROTOCOL_RC5:
if (wake_sc > 0xFFF) {
do_wake = 0;
do_wake = false;
dev_err(dev, "RC5 - Invalid wake scancode\n");
break;
}
Expand All @@ -418,7 +418,7 @@ wbcir_shutdown(struct pnp_dev *device)

case IR_PROTOCOL_NEC:
if (wake_sc > 0xFFFFFF) {
do_wake = 0;
do_wake = false;
dev_err(dev, "NEC - Invalid wake scancode\n");
break;
}
Expand All @@ -440,7 +440,7 @@ wbcir_shutdown(struct pnp_dev *device)

if (wake_rc6mode == 0) {
if (wake_sc > 0xFFFF) {
do_wake = 0;
do_wake = false;
dev_err(dev, "RC6 - Invalid wake scancode\n");
break;
}
Expand Down Expand Up @@ -496,7 +496,7 @@ wbcir_shutdown(struct pnp_dev *device)
} else if (wake_sc <= 0x007FFFFF) {
rc6_csl = 60;
} else {
do_wake = 0;
do_wake = false;
dev_err(dev, "RC6 - Invalid wake scancode\n");
break;
}
Expand All @@ -508,14 +508,14 @@ wbcir_shutdown(struct pnp_dev *device)
mask[i++] = 0x0F;

} else {
do_wake = 0;
do_wake = false;
dev_err(dev, "RC6 - Invalid wake mode\n");
}

break;

default:
do_wake = 0;
do_wake = false;
break;
}

Expand Down

0 comments on commit 67cdd42

Please sign in to comment.