linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 4/9] staging: panel: Use a macro for checking module params state
Date: Tue, 18 Nov 2014 21:56:09 +0100	[thread overview]
Message-ID: <1416344174-9155-5-git-send-email-marius.gorski@gmail.com> (raw)
In-Reply-To: <1416344174-9155-1-git-send-email-marius.gorski@gmail.com>

Avoid values comparison and use a macro instead that checks
whether module param has been set by the user to some value
at loading time.

Signed-off-by: Mariusz Gorski <marius.gorski@gmail.com>
---
 drivers/staging/panel/panel.c | 88 ++++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 43 deletions(-)

diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index 1b4a211..97fc4ca 100644
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
@@ -135,6 +135,8 @@
 
 #define NOT_SET			-1
 
+#define IS_NOT_SET(x)	(x == NOT_SET)
+
 /* macros to simplify use of the parallel port */
 #define r_ctr(x)        (parport_read_control((x)->port))
 #define r_dtr(x)        (parport_read_data((x)->port))
@@ -1411,29 +1413,29 @@ static void lcd_init(void)
 	switch (lcd_type) {
 	case LCD_TYPE_OLD:
 		/* parallel mode, 8 bits */
-		if (lcd_proto < 0)
+		if (IS_NOT_SET(lcd_proto))
 			lcd_proto = LCD_PROTO_PARALLEL;
-		if (lcd_charset < 0)
+		if (IS_NOT_SET(lcd_charset))
 			lcd_charset = LCD_CHARSET_NORMAL;
 		if (lcd_e_pin == PIN_NOT_SET)
 			lcd_e_pin = PIN_STROBE;
 		if (lcd_rs_pin == PIN_NOT_SET)
 			lcd_rs_pin = PIN_AUTOLF;
 
-		if (lcd_width < 0)
+		if (IS_NOT_SET(lcd_width))
 			lcd_width = 40;
-		if (lcd_bwidth < 0)
+		if (IS_NOT_SET(lcd_bwidth))
 			lcd_bwidth = 40;
-		if (lcd_hwidth < 0)
+		if (IS_NOT_SET(lcd_hwidth))
 			lcd_hwidth = 64;
-		if (lcd_height < 0)
+		if (IS_NOT_SET(lcd_height))
 			lcd_height = 2;
 		break;
 	case LCD_TYPE_KS0074:
 		/* serial mode, ks0074 */
-		if (lcd_proto < 0)
+		if (IS_NOT_SET(lcd_proto))
 			lcd_proto = LCD_PROTO_SERIAL;
-		if (lcd_charset < 0)
+		if (IS_NOT_SET(lcd_charset))
 			lcd_charset = LCD_CHARSET_KS0074;
 		if (lcd_bl_pin == PIN_NOT_SET)
 			lcd_bl_pin = PIN_AUTOLF;
@@ -1442,20 +1444,20 @@ static void lcd_init(void)
 		if (lcd_da_pin == PIN_NOT_SET)
 			lcd_da_pin = PIN_D0;
 
-		if (lcd_width < 0)
+		if (IS_NOT_SET(lcd_width))
 			lcd_width = 16;
-		if (lcd_bwidth < 0)
+		if (IS_NOT_SET(lcd_bwidth))
 			lcd_bwidth = 40;
-		if (lcd_hwidth < 0)
+		if (IS_NOT_SET(lcd_hwidth))
 			lcd_hwidth = 16;
-		if (lcd_height < 0)
+		if (IS_NOT_SET(lcd_height))
 			lcd_height = 2;
 		break;
 	case LCD_TYPE_NEXCOM:
 		/* parallel mode, 8 bits, generic */
-		if (lcd_proto < 0)
+		if (IS_NOT_SET(lcd_proto))
 			lcd_proto = LCD_PROTO_PARALLEL;
-		if (lcd_charset < 0)
+		if (IS_NOT_SET(lcd_charset))
 			lcd_charset = LCD_CHARSET_NORMAL;
 		if (lcd_e_pin == PIN_NOT_SET)
 			lcd_e_pin = PIN_AUTOLF;
@@ -1464,42 +1466,42 @@ static void lcd_init(void)
 		if (lcd_rw_pin == PIN_NOT_SET)
 			lcd_rw_pin = PIN_INITP;
 
-		if (lcd_width < 0)
+		if (IS_NOT_SET(lcd_width))
 			lcd_width = 16;
-		if (lcd_bwidth < 0)
+		if (IS_NOT_SET(lcd_bwidth))
 			lcd_bwidth = 40;
-		if (lcd_hwidth < 0)
+		if (IS_NOT_SET(lcd_hwidth))
 			lcd_hwidth = 64;
-		if (lcd_height < 0)
+		if (IS_NOT_SET(lcd_height))
 			lcd_height = 2;
 		break;
 	case LCD_TYPE_CUSTOM:
 		/* customer-defined */
-		if (lcd_proto < 0)
+		if (IS_NOT_SET(lcd_proto))
 			lcd_proto = DEFAULT_LCD_PROTO;
-		if (lcd_charset < 0)
+		if (IS_NOT_SET(lcd_charset))
 			lcd_charset = DEFAULT_LCD_CHARSET;
 		/* default geometry will be set later */
 		break;
 	case LCD_TYPE_HANTRONIX:
 		/* parallel mode, 8 bits, hantronix-like */
 	default:
-		if (lcd_proto < 0)
+		if (IS_NOT_SET(lcd_proto))
 			lcd_proto = LCD_PROTO_PARALLEL;
-		if (lcd_charset < 0)
+		if (IS_NOT_SET(lcd_charset))
 			lcd_charset = LCD_CHARSET_NORMAL;
 		if (lcd_e_pin == PIN_NOT_SET)
 			lcd_e_pin = PIN_STROBE;
 		if (lcd_rs_pin == PIN_NOT_SET)
 			lcd_rs_pin = PIN_SELECP;
 
-		if (lcd_width < 0)
+		if (IS_NOT_SET(lcd_width))
 			lcd_width = 16;
-		if (lcd_bwidth < 0)
+		if (IS_NOT_SET(lcd_bwidth))
 			lcd_bwidth = 40;
-		if (lcd_hwidth < 0)
+		if (IS_NOT_SET(lcd_hwidth))
 			lcd_hwidth = 64;
-		if (lcd_height < 0)
+		if (IS_NOT_SET(lcd_height))
 			lcd_height = 2;
 		break;
 	}
@@ -1557,7 +1559,7 @@ static void lcd_init(void)
 	if (lcd_da_pin == PIN_NOT_SET)
 		lcd_da_pin = PIN_NONE;
 
-	if (lcd_charset < 0)
+	if (IS_NOT_SET(lcd_charset))
 		lcd_charset = DEFAULT_LCD_CHARSET;
 
 	if (lcd_charset == LCD_CHARSET_KS0074)
@@ -2227,58 +2229,58 @@ static struct parport_driver panel_driver = {
 static int __init panel_init_module(void)
 {
 	/* for backwards compatibility */
-	if (keypad_type < 0)
+	if (IS_NOT_SET(keypad_type))
 		keypad_type = keypad_enabled;
 
-	if (lcd_type < 0)
+	if (IS_NOT_SET(lcd_type))
 		lcd_type = lcd_enabled;
 
 	/* take care of an eventual profile */
 	switch (profile) {
 	case PANEL_PROFILE_CUSTOM:
 		/* custom profile */
-		if (keypad_type < 0)
+		if (IS_NOT_SET(keypad_type))
 			keypad_type = DEFAULT_KEYPAD_TYPE;
-		if (lcd_type < 0)
+		if (IS_NOT_SET(lcd_type))
 			lcd_type = DEFAULT_LCD_TYPE;
 		break;
 	case PANEL_PROFILE_OLD:
 		/* 8 bits, 2*16, old keypad */
-		if (keypad_type < 0)
+		if (IS_NOT_SET(keypad_type))
 			keypad_type = KEYPAD_TYPE_OLD;
-		if (lcd_type < 0)
+		if (IS_NOT_SET(lcd_type))
 			lcd_type = LCD_TYPE_OLD;
-		if (lcd_width < 0)
+		if (IS_NOT_SET(lcd_width))
 			lcd_width = 16;
-		if (lcd_hwidth < 0)
+		if (IS_NOT_SET(lcd_hwidth))
 			lcd_hwidth = 16;
 		break;
 	case PANEL_PROFILE_NEW:
 		/* serial, 2*16, new keypad */
-		if (keypad_type < 0)
+		if (IS_NOT_SET(keypad_type))
 			keypad_type = KEYPAD_TYPE_NEW;
-		if (lcd_type < 0)
+		if (IS_NOT_SET(lcd_type))
 			lcd_type = LCD_TYPE_KS0074;
 		break;
 	case PANEL_PROFILE_HANTRONIX:
 		/* 8 bits, 2*16 hantronix-like, no keypad */
-		if (keypad_type < 0)
+		if (IS_NOT_SET(keypad_type))
 			keypad_type = KEYPAD_TYPE_NONE;
-		if (lcd_type < 0)
+		if (IS_NOT_SET(lcd_type))
 			lcd_type = LCD_TYPE_HANTRONIX;
 		break;
 	case PANEL_PROFILE_NEXCOM:
 		/* generic 8 bits, 2*16, nexcom keypad, eg. Nexcom. */
-		if (keypad_type < 0)
+		if (IS_NOT_SET(keypad_type))
 			keypad_type = KEYPAD_TYPE_NEXCOM;
-		if (lcd_type < 0)
+		if (IS_NOT_SET(lcd_type))
 			lcd_type = LCD_TYPE_NEXCOM;
 		break;
 	case PANEL_PROFILE_LARGE:
 		/* 8 bits, 2*40, old keypad */
-		if (keypad_type < 0)
+		if (IS_NOT_SET(keypad_type))
 			keypad_type = KEYPAD_TYPE_OLD;
-		if (lcd_type < 0)
+		if (IS_NOT_SET(lcd_type))
 			lcd_type = LCD_TYPE_OLD;
 		break;
 	}
-- 
2.1.3


  parent reply	other threads:[~2014-11-18 21:01 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 ` Mariusz Gorski [this message]
2014-11-18 21:18   ` [PATCH 4/9] staging: panel: Use a macro for checking module params state 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 ` [PATCH 8/9] staging: panel: Remove more magic number comparison Mariusz Gorski
2014-11-18 21:25   ` 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-5-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;
as well as URLs for NNTP newsgroup(s).