From: Marek Vasut <marex@denx.de>
To: Gerhard Sittig <gsi@denx.de>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
linux-input@vger.kernel.org, devicetree-discuss@lists.ozlabs.org,
linux-arm-kernel@lists.infradead.org,
Chao Xie <xiechao.mail@gmail.com>, Arnd Bergmann <arnd@arndb.de>,
Sekhar Nori <nsekhar@ti.com>, Tony Lindgren <tony@atomide.com>,
Eric Miao <eric.y.miao@gmail.com>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Ralf Baechle <ralf@linux-mips.org>,
Anatolij Gustschin <agust@denx.de>, Detlev Zundel <dzu@denx.de>
Subject: Re: [PATCH v1 02/12] input: matrix-keymap: func call coding style nit
Date: Sat, 22 Jun 2013 04:18:59 +0200 [thread overview]
Message-ID: <201306220418.59722.marex@denx.de> (raw)
In-Reply-To: <1371838198-7327-3-git-send-email-gsi@denx.de>
Dear Gerhard Sittig,
> make the matrix_keypad_map_key() routine return an error code
> instead of boolean, as its name suggests an action and not a query
>
> Signed-off-by: Gerhard Sittig <gsi@denx.de>
> ---
> drivers/input/matrix-keymap.c | 19 ++++++++++---------
> 1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/input/matrix-keymap.c b/drivers/input/matrix-keymap.c
> index 08b61f5..b7091f2 100644
> --- a/drivers/input/matrix-keymap.c
> +++ b/drivers/input/matrix-keymap.c
> @@ -27,9 +27,10 @@
> #include <linux/module.h>
> #include <linux/input/matrix_keypad.h>
>
> -static bool matrix_keypad_map_key(struct input_dev *input_dev,
> - unsigned int rows, unsigned int cols,
> - unsigned int row_shift, unsigned int key)
> +/* translates packed row/col/code specs to the corresponding keycode[]
> item */ +static int matrix_keypad_map_key(struct input_dev *input_dev,
> + unsigned int rows, unsigned int cols,
> + unsigned int row_shift, unsigned int key)
> {
> unsigned short *keymap = input_dev->keycode;
> unsigned int row = KEY_ROW(key);
> @@ -40,13 +41,13 @@ static bool matrix_keypad_map_key(struct input_dev
> *input_dev, dev_err(input_dev->dev.parent,
> "%s: invalid keymap entry 0x%x (row: %d, col: %d, rows:
%d, cols:
> %d)\n", __func__, key, row, col, rows, cols);
> - return false;
> + return -ERANGE;
> }
>
> keymap[MATRIX_SCAN_CODE(row, col, row_shift)] = code;
> __set_bit(code, input_dev->keybit);
>
> - return true;
> + return 0;
> }
>
> #ifdef CONFIG_OF
> @@ -109,8 +110,8 @@ static int matrix_keypad_parse_of_keymap(const char
> *propname, for (i = 0; i < size; i++) {
> unsigned int key = be32_to_cpup(prop + i);
>
> - if (!matrix_keypad_map_key(input_dev, rows, cols,
> - row_shift, key))
ret = matrix_keypad_map_key(input_dev, rows, cols, row_shift, key);
if (ret)
return ret;
Now that you return correct error codes from above, you should propagate them
through.
Best regards,
Marek Vasut
WARNING: multiple messages have this Message-ID (diff)
From: marex@denx.de (Marek Vasut)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v1 02/12] input: matrix-keymap: func call coding style nit
Date: Sat, 22 Jun 2013 04:18:59 +0200 [thread overview]
Message-ID: <201306220418.59722.marex@denx.de> (raw)
In-Reply-To: <1371838198-7327-3-git-send-email-gsi@denx.de>
Dear Gerhard Sittig,
> make the matrix_keypad_map_key() routine return an error code
> instead of boolean, as its name suggests an action and not a query
>
> Signed-off-by: Gerhard Sittig <gsi@denx.de>
> ---
> drivers/input/matrix-keymap.c | 19 ++++++++++---------
> 1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/input/matrix-keymap.c b/drivers/input/matrix-keymap.c
> index 08b61f5..b7091f2 100644
> --- a/drivers/input/matrix-keymap.c
> +++ b/drivers/input/matrix-keymap.c
> @@ -27,9 +27,10 @@
> #include <linux/module.h>
> #include <linux/input/matrix_keypad.h>
>
> -static bool matrix_keypad_map_key(struct input_dev *input_dev,
> - unsigned int rows, unsigned int cols,
> - unsigned int row_shift, unsigned int key)
> +/* translates packed row/col/code specs to the corresponding keycode[]
> item */ +static int matrix_keypad_map_key(struct input_dev *input_dev,
> + unsigned int rows, unsigned int cols,
> + unsigned int row_shift, unsigned int key)
> {
> unsigned short *keymap = input_dev->keycode;
> unsigned int row = KEY_ROW(key);
> @@ -40,13 +41,13 @@ static bool matrix_keypad_map_key(struct input_dev
> *input_dev, dev_err(input_dev->dev.parent,
> "%s: invalid keymap entry 0x%x (row: %d, col: %d, rows:
%d, cols:
> %d)\n", __func__, key, row, col, rows, cols);
> - return false;
> + return -ERANGE;
> }
>
> keymap[MATRIX_SCAN_CODE(row, col, row_shift)] = code;
> __set_bit(code, input_dev->keybit);
>
> - return true;
> + return 0;
> }
>
> #ifdef CONFIG_OF
> @@ -109,8 +110,8 @@ static int matrix_keypad_parse_of_keymap(const char
> *propname, for (i = 0; i < size; i++) {
> unsigned int key = be32_to_cpup(prop + i);
>
> - if (!matrix_keypad_map_key(input_dev, rows, cols,
> - row_shift, key))
ret = matrix_keypad_map_key(input_dev, rows, cols, row_shift, key);
if (ret)
return ret;
Now that you return correct error codes from above, you should propagate them
through.
Best regards,
Marek Vasut
next prev parent reply other threads:[~2013-06-22 2:19 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-21 18:09 [PATCH v1 00/12] input: keypad-matrix: doc update, hw separation, polling, binary columns Gerhard Sittig
2013-06-21 18:09 ` Gerhard Sittig
2013-06-21 18:09 ` [PATCH v1 01/12] input: matrix-keypad: update devicetree binding doc Gerhard Sittig
2013-06-21 18:09 ` Gerhard Sittig
2013-06-21 21:31 ` Stephen Warren
2013-06-21 21:31 ` Stephen Warren
2013-06-22 9:23 ` Gerhard Sittig
2013-06-22 9:23 ` Gerhard Sittig
2013-06-24 22:00 ` Stephen Warren
2013-06-24 22:00 ` Stephen Warren
2013-06-28 8:24 ` Gerhard Sittig
2013-06-28 8:24 ` Gerhard Sittig
2013-06-28 14:50 ` Stephen Warren
2013-06-28 14:50 ` Stephen Warren
2013-06-30 11:04 ` Gerhard Sittig
2013-06-30 11:04 ` Gerhard Sittig
2013-06-21 18:09 ` [PATCH v1 02/12] input: matrix-keymap: func call coding style nit Gerhard Sittig
2013-06-21 18:09 ` Gerhard Sittig
2013-06-22 2:18 ` Marek Vasut [this message]
2013-06-22 2:18 ` Marek Vasut
2013-06-22 8:22 ` Gerhard Sittig
2013-06-22 8:22 ` Gerhard Sittig
2013-06-22 13:23 ` Marek Vasut
2013-06-22 13:23 ` Marek Vasut
2013-06-21 18:09 ` [PATCH v1 03/12] input: matrix-keypad: rename variables and funcs Gerhard Sittig
2013-06-21 18:09 ` Gerhard Sittig
2013-06-21 18:09 ` [PATCH v1 04/12] input: matrix-keypad: push/pull, separate polarity Gerhard Sittig
2013-06-21 18:09 ` Gerhard Sittig
2013-06-21 21:34 ` Stephen Warren
2013-06-21 21:34 ` Stephen Warren
2013-06-22 9:36 ` Gerhard Sittig
2013-06-22 9:36 ` Gerhard Sittig
2013-06-24 23:14 ` Stephen Warren
2013-06-24 23:14 ` Stephen Warren
2013-06-28 8:33 ` Gerhard Sittig
2013-06-28 8:33 ` Gerhard Sittig
2013-06-28 15:01 ` Stephen Warren
2013-06-28 15:01 ` Stephen Warren
2013-06-30 11:43 ` Gerhard Sittig
2013-06-30 11:43 ` Gerhard Sittig
2013-06-21 18:09 ` [PATCH v1 05/12] input: matrix-keypad: update comments, diagnostics Gerhard Sittig
2013-06-21 18:09 ` Gerhard Sittig
2013-06-22 2:23 ` Marek Vasut
2013-06-22 2:23 ` Marek Vasut
2013-06-21 18:09 ` [PATCH v1 06/12] input: keypad-matrix: refactor matrix scan logic Gerhard Sittig
2013-06-21 18:09 ` Gerhard Sittig
2013-06-21 18:09 ` [PATCH v1 07/12] input: keypad-matrix: introduce polling support Gerhard Sittig
2013-06-21 18:09 ` Gerhard Sittig
2013-06-21 21:38 ` Stephen Warren
2013-06-21 21:38 ` Stephen Warren
2013-06-22 9:50 ` Gerhard Sittig
2013-06-22 9:50 ` Gerhard Sittig
2013-06-24 23:18 ` Stephen Warren
2013-06-24 23:18 ` Stephen Warren
2013-06-21 18:09 ` [PATCH v1 08/12] input: keypad-matrix: tell GPIO pins from matrix lines Gerhard Sittig
2013-06-21 18:09 ` Gerhard Sittig
2013-06-21 21:41 ` Stephen Warren
2013-06-21 21:41 ` Stephen Warren
2013-06-22 10:00 ` Gerhard Sittig
2013-06-22 10:00 ` Gerhard Sittig
2013-06-24 23:26 ` Stephen Warren
2013-06-24 23:26 ` Stephen Warren
2013-06-28 7:52 ` Gerhard Sittig
2013-06-28 7:52 ` Gerhard Sittig
2013-06-28 14:35 ` Stephen Warren
2013-06-28 14:35 ` Stephen Warren
2013-06-28 18:25 ` Dmitry Torokhov
2013-06-28 18:25 ` Dmitry Torokhov
2013-06-30 12:03 ` Gerhard Sittig
2013-06-30 12:03 ` Gerhard Sittig
2013-06-21 18:09 ` [PATCH v1 09/12] input: matrix-keypad: add binary column encoding Gerhard Sittig
2013-06-21 18:09 ` Gerhard Sittig
2013-06-21 21:58 ` Stephen Warren
2013-06-21 21:58 ` Stephen Warren
2013-06-21 18:09 ` [PATCH v1 10/12] input: keypad_matrix: use usleep_range() for scan delay Gerhard Sittig
2013-06-21 18:09 ` Gerhard Sittig
2013-06-21 22:00 ` Stephen Warren
2013-06-21 22:00 ` Stephen Warren
2013-06-22 10:17 ` Gerhard Sittig
2013-06-22 10:17 ` Gerhard Sittig
2013-06-24 23:27 ` Stephen Warren
2013-06-24 23:27 ` Stephen Warren
2013-06-21 18:09 ` [PATCH v1 11/12] input: keypad-matrix: AC14xx device tree update Gerhard Sittig
2013-06-21 18:09 ` Gerhard Sittig
2013-06-21 18:09 ` [PATCH v1 12/12] input: matrix-keypad: add diagnostics in probe() Gerhard Sittig
2013-06-21 18:09 ` Gerhard Sittig
2013-06-22 2:28 ` Marek Vasut
2013-06-22 2:28 ` Marek Vasut
2013-06-22 8:30 ` Gerhard Sittig
2013-06-22 8:30 ` Gerhard Sittig
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=201306220418.59722.marex@denx.de \
--to=marex@denx.de \
--cc=agust@denx.de \
--cc=arnd@arndb.de \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=dmitry.torokhov@gmail.com \
--cc=dzu@denx.de \
--cc=eric.y.miao@gmail.com \
--cc=gsi@denx.de \
--cc=haojian.zhuang@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-input@vger.kernel.org \
--cc=nsekhar@ti.com \
--cc=ralf@linux-mips.org \
--cc=tony@atomide.com \
--cc=xiechao.mail@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.