From: Mariusz Gorski <marius.gorski@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Willy Tarreau <w@1wt.eu>
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 8/9] staging: panel: Remove more magic number comparison
Date: Tue, 18 Nov 2014 21:56:13 +0100 [thread overview]
Message-ID: <1416344174-9155-9-git-send-email-marius.gorski@gmail.com> (raw)
In-Reply-To: <1416344174-9155-1-git-send-email-marius.gorski@gmail.com>
Use a macro instead of magic number comparison for checking
whether a module param value has been set.
Signed-off-by: Mariusz Gorski <marius.gorski@gmail.com>
---
drivers/staging/panel/panel.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index ee48bca..268ad2e 100644
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
@@ -136,6 +136,7 @@
#define NOT_SET -1
#define IS_NOT_SET(x) (x == NOT_SET)
+#define IS_SET(x) (x > NOT_SET)
/* macros to simplify use of the parallel port */
#define r_ctr(x) (parport_read_control((x)->port))
@@ -1496,17 +1497,17 @@ static void lcd_init(void)
}
/* Overwrite with module params set on loading */
- if (lcd_height > -1)
+ if (IS_SET(lcd_height))
lcd.height = lcd_height;
- if (lcd_width > -1)
+ if (IS_SET(lcd_width))
lcd.width = lcd_width;
- if (lcd_bwidth > -1)
+ if (IS_SET(lcd_bwidth))
lcd.bwidth = lcd_bwidth;
- if (lcd_hwidth > -1)
+ if (IS_SET(lcd_hwidth))
lcd.hwidth = lcd_hwidth;
- if (lcd_charset > -1)
+ if (IS_SET(lcd_charset))
lcd.charset = lcd_charset;
- if (lcd_proto > -1)
+ if (IS_SET(lcd_proto))
lcd.proto = lcd_proto;
if (lcd_e_pin != PIN_NOT_SET)
lcd.pins.e = lcd_e_pin;
@@ -2306,16 +2307,16 @@ static int __init panel_init_module(void)
* Overwrite selection with module param values (both keypad and lcd),
* where the deprecated params have lower prio.
*/
- if (keypad_enabled > -1)
+ if (IS_SET(keypad_enabled))
selected_keypad_type = keypad_enabled;
- if (keypad_type > -1)
+ if (IS_SET(keypad_type))
selected_keypad_type = keypad_type;
keypad.enabled = (selected_keypad_type > 0);
- if (lcd_enabled > -1)
+ if (IS_SET(lcd_enabled))
selected_lcd_type = lcd_enabled;
- if (lcd_type > -1)
+ if (IS_SET(lcd_type))
selected_lcd_type = lcd_type;
lcd.enabled = (selected_lcd_type > 0);
--
2.1.3
next prev parent reply other threads:[~2014-11-18 21:00 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-18 20:56 [PATCH 0/9] staging: panel: Refactor panel initialization Mariusz Gorski
2014-11-18 20:56 ` [PATCH 1/9] staging: panel: Set default parport module param value Mariusz Gorski
2014-11-18 21:14 ` Willy Tarreau
2014-11-18 20:56 ` [PATCH 2/9] staging: panel: Call init function directly Mariusz Gorski
2014-11-18 21:15 ` Willy Tarreau
2014-11-18 20:56 ` [PATCH 3/9] staging: panel: Remove magic numbers Mariusz Gorski
2014-11-18 21:14 ` Willy Tarreau
2014-11-18 20:56 ` [PATCH 4/9] staging: panel: Use a macro for checking module params state Mariusz Gorski
2014-11-18 21:18 ` Willy Tarreau
2014-11-18 21:50 ` Mariusz Gorski
2014-11-18 20:56 ` [PATCH 5/9] staging: panel: Start making module params read-only Mariusz Gorski
2014-11-18 21:19 ` Willy Tarreau
2014-11-18 20:56 ` [PATCH 6/9] staging: panel: Make two more " Mariusz Gorski
2014-11-18 21:20 ` Willy Tarreau
2014-11-18 21:50 ` Mariusz Gorski
2014-11-18 22:58 ` Willy Tarreau
2014-11-18 20:56 ` [PATCH 7/9] staging: panel: Refactor LCD init code Mariusz Gorski
2014-11-18 21:23 ` Willy Tarreau
2014-11-18 21:51 ` Mariusz Gorski
2014-11-18 22:59 ` Willy Tarreau
2014-11-18 20:56 ` Mariusz Gorski [this message]
2014-11-18 21:25 ` [PATCH 8/9] staging: panel: Remove more magic number comparison Willy Tarreau
2014-11-18 21:50 ` Mariusz Gorski
2014-11-18 20:56 ` [PATCH 9/9] staging: panel: Move LCD-related state into struct lcd Mariusz Gorski
2014-11-18 21:26 ` Willy Tarreau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1416344174-9155-9-git-send-email-marius.gorski@gmail.com \
--to=marius.gorski@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=w@1wt.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome