diff options
author | Heba Aamer <heba93aamer@gmail.com> | 2015-01-26 08:21:09 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-03 15:18:16 -0500 |
commit | f3a9d7ef7990ccb543b3441d9964b9ebc9bae046 (patch) | |
tree | 6967feaf75922e4501284247da9617206d166afd /drivers/staging | |
parent | 2948c01c2b686f03aa50a3a87323604f7ad39578 (diff) |
[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/staging')
-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 eb4ccb8d2a93..19628d0104ab 100644 --- a/drivers/staging/media/lirc/lirc_serial.c +++ b/drivers/staging/media/lirc/lirc_serial.c | |||
@@ -107,7 +107,7 @@ static int io; | |||
107 | static int irq; | 107 | static int irq; |
108 | static bool iommap; | 108 | static bool iommap; |
109 | static int ioshift; | 109 | static int ioshift; |
110 | static bool softcarrier = 1; | 110 | static bool softcarrier = true; |
111 | static bool share_irq; | 111 | static bool share_irq; |
112 | static bool debug; | 112 | static bool debug; |
113 | static int sense = -1; /* -1 = auto, 0 = active high, 1 = active low */ | 113 | static int sense = -1; /* -1 = auto, 0 = active high, 1 = active low */ |
@@ -266,7 +266,7 @@ static unsigned long space_width; | |||
266 | /* fetch serial input packet (1 byte) from register offset */ | 266 | /* fetch serial input packet (1 byte) from register offset */ |
267 | static u8 sinp(int offset) | 267 | static u8 sinp(int offset) |
268 | { | 268 | { |
269 | if (iommap != 0) | 269 | if (iommap) |
270 | /* the register is memory-mapped */ | 270 | /* the register is memory-mapped */ |
271 | offset <<= ioshift; | 271 | offset <<= ioshift; |
272 | 272 | ||
@@ -276,7 +276,7 @@ static u8 sinp(int offset) | |||
276 | /* write serial output packet (1 byte) of value to register offset */ | 276 | /* write serial output packet (1 byte) of value to register offset */ |
277 | static void soutp(int offset, u8 value) | 277 | static void soutp(int offset, u8 value) |
278 | { | 278 | { |
279 | if (iommap != 0) | 279 | if (iommap) |
280 | /* the register is memory-mapped */ | 280 | /* the register is memory-mapped */ |
281 | offset <<= ioshift; | 281 | offset <<= ioshift; |
282 | 282 | ||
@@ -799,10 +799,10 @@ static int lirc_serial_probe(struct platform_device *dev) | |||
799 | * For memory mapped I/O you *might* need to use ioremap() first, | 799 | * For memory mapped I/O you *might* need to use ioremap() first, |
800 | * for the NSLU2 it's done in boot code. | 800 | * for the NSLU2 it's done in boot code. |
801 | */ | 801 | */ |
802 | if (((iommap != 0) | 802 | if (((iommap) |
803 | && (devm_request_mem_region(&dev->dev, iommap, 8 << ioshift, | 803 | && (devm_request_mem_region(&dev->dev, iommap, 8 << ioshift, |
804 | LIRC_DRIVER_NAME) == NULL)) | 804 | LIRC_DRIVER_NAME) == NULL)) |
805 | || ((iommap == 0) | 805 | || ((!iommap) |
806 | && (devm_request_region(&dev->dev, io, 8, | 806 | && (devm_request_region(&dev->dev, io, 8, |
807 | LIRC_DRIVER_NAME) == NULL))) { | 807 | LIRC_DRIVER_NAME) == NULL))) { |
808 | dev_err(&dev->dev, "port %04x already in use\n", io); | 808 | dev_err(&dev->dev, "port %04x already in use\n", io); |