On Tue, Nov 10, 2015 at 10:33:07AM -0800, Joe Perches wrote:
> Expand parse_err macro with hidden flow in-place.
> Remove the now unused parse_err macro.
Quick one... thanks, I guess.
> Miscellanea:
>
> o Use invalid not illegal for error messages
>
> Noticed-by: Brian Norris <computersforpe...@gmail.com>
> Signed-off-by: Joe Perches <j...@perches.com>
> ---
> > Did you notice that
> > there's a "return" statement embedded in the parse_err() macro? So there
> > was no bug in the first place.
I forgot to add to that last sentence "except for a readability bug."
Thanks for following up.
> drivers/mtd/devices/phram.c | 29 ++++++++++++++++-------------
> 1 file changed, 16 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
> index 8b66e52..d93b85e 100644
> --- a/drivers/mtd/devices/phram.c
> +++ b/drivers/mtd/devices/phram.c
> @@ -199,11 +199,6 @@ static inline void kill_final_newline(char *str)
> }
>
>
> -#define parse_err(fmt, args...) do { \
> - pr_err(fmt , ## args); \
> - return 1; \
> -} while (0)
> -
> #ifndef MODULE
> static int phram_init_called;
> /*
> @@ -226,8 +221,10 @@ static int phram_setup(const char *val)
> uint64_t len;
> int i, ret;
>
> - if (strnlen(val, sizeof(buf)) >= sizeof(buf))
> - parse_err("parameter too long\n");
> + if (strnlen(val, sizeof(buf)) >= sizeof(buf)) {
> + pr_err("parameter too long\n");
> + return 1;
> + }
>
> strcpy(str, val);
> kill_final_newline(str);
> @@ -235,11 +232,15 @@ static int phram_setup(const char *val)
> for (i = 0; i < 3; i++)
> token[i] = strsep(&str, ",");
>
> - if (str)
> - parse_err("too many arguments\n");
> + if (str) {
> + pr_err("too many arguments\n");
> + return 1;
> + }
>
> - if (!token[2])
> - parse_err("not enough arguments\n");
> + if (!token[2]) {
> + pr_err("not enough arguments\n");
> + return 1;
> + }
>
> ret = parse_name(&name, token[0]);
> if (ret)
> @@ -248,13 +249,15 @@ static int phram_setup(const char *val)
> ret = parse_num64(&start, token[1]);
> if (ret) {
> kfree(name);
> - parse_err("illegal start address\n");
> + pr_err("invalid start address\n");
> + return 1;
> }
>
> ret = parse_num64(&len, token[2]);
> if (ret) {
> kfree(name);
> - parse_err("illegal device length\n");
> + pr_err("invalid device length\n");
> + return 1;
> }
>
> ret = register_device(name, start, len);
>
Looks better to me, though I think -EINVAL makes more sense than 1. That
could be a subsequent patch, I suppose.
I'll wait to see if the original reporter has anything to say.
Regards,
Brian
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
