diff options
| author | Heba Aamer <heba93aamer@gmail.com> | 2015-01-26 13:21:09 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-03 20:18:16 (GMT) |
| commit | f3a9d7ef7990ccb543b3441d9964b9ebc9bae046 (patch) | |
| tree | 6967feaf75922e4501284247da9617206d166afd /drivers | |
| parent | 2948c01c2b686f03aa50a3a87323604f7ad39578 (diff) | |
| download | linux-f3a9d7ef7990ccb543b3441d9964b9ebc9bae046.tar.xz | |
[media] staging: lirc_serial: adjust boolean assignments
Adjusts boolean assignments from 0/1 to false/true.
And accordingly, it also adjusts the if conditions.
Signed-off-by: Heba Aamer <heba93aamer@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/media/lirc/lirc_serial.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c index eb4ccb8..19628d0 100644 --- a/drivers/staging/media/lirc/lirc_serial.c +++ b/drivers/staging/media/lirc/lirc_serial.c @@ -107,7 +107,7 @@ static int io; static int irq; static bool iommap; static int ioshift; -static bool softcarrier = 1; +static bool softcarrier = true; static bool share_irq; static bool debug; static int sense = -1; /* -1 = auto, 0 = active high, 1 = active low */ @@ -266,7 +266,7 @@ static unsigned long space_width; /* fetch serial input packet (1 byte) from register offset */ static u8 sinp(int offset) { - if (iommap != 0) + if (iommap) /* the register is memory-mapped */ offset <<= ioshift; @@ -276,7 +276,7 @@ static u8 sinp(int offset) /* write serial output packet (1 byte) of value to register offset */ static void soutp(int offset, u8 value) { - if (iommap != 0) + if (iommap) /* the register is memory-mapped */ offset <<= ioshift; @@ -799,10 +799,10 @@ static int lirc_serial_probe(struct platform_device *dev) * For memory mapped I/O you *might* need to use ioremap() first, * for the NSLU2 it's done in boot code. */ - if (((iommap != 0) + if (((iommap) && (devm_request_mem_region(&dev->dev, iommap, 8 << ioshift, LIRC_DRIVER_NAME) == NULL)) - || ((iommap == 0) + || ((!iommap) && (devm_request_region(&dev->dev, io, 8, LIRC_DRIVER_NAME) == NULL))) { dev_err(&dev->dev, "port %04x already in use\n", io); |