| Message ID | 20220312063609.19362-1-rdunlap@infradead.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8b2360c7157b462c4870d447d1e65d30ef31f9aa |
| Headers | show |
| Series | ARM: JIVE: fix return value of __setup handler | expand |
On 12/03/2022 07:36, Randy Dunlap wrote: > __setup() handlers should return 1 to obsolete_checksetup() in > init/main.c to indicate that the boot option has been handled. > A return of 0 causes the boot option/value to be listed as an Unknown > kernel parameter and added to init's (limited) argument or environment > strings. Also, error return codes don't mean anything to > obsolete_checksetup() -- only non-zero (usually 1) or zero. > So return 1 from jive_mtdset(). > > Fixes: 9db829f485c5 ("[ARM] JIVE: Initial machine support for Logitech Jive") > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > Cc: Ben Dooks <ben-linux@fluff.org> > Cc: Krzysztof Kozlowski <krzk@kernel.org> > Cc: Alim Akhtar <alim.akhtar@samsung.com> > Cc: Russell King <linux@armlinux.org.uk> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-samsung-soc@vger.kernel.org > Cc: patches@armlinux.org.uk > --- > KernelVersion: v5.17-rc7 > > arch/arm/mach-s3c/mach-jive.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > It's too late for upcoming cycle, so I will pick it up after merge window. Best regards, Krzysztof
--- linux-next-20220310.orig/arch/arm/mach-s3c/mach-jive.c +++ linux-next-20220310/arch/arm/mach-s3c/mach-jive.c @@ -236,11 +236,11 @@ static int __init jive_mtdset(char *opti unsigned long set; if (options == NULL || options[0] == '\0') - return 0; + return 1; if (kstrtoul(options, 10, &set)) { printk(KERN_ERR "failed to parse mtdset=%s\n", options); - return 0; + return 1; } switch (set) { @@ -256,7 +256,7 @@ static int __init jive_mtdset(char *opti "using default.", set); } - return 0; + return 1; } /* parse the mtdset= option given to the kernel command line */
__setup() handlers should return 1 to obsolete_checksetup() in init/main.c to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) argument or environment strings. Also, error return codes don't mean anything to obsolete_checksetup() -- only non-zero (usually 1) or zero. So return 1 from jive_mtdset(). Fixes: 9db829f485c5 ("[ARM] JIVE: Initial machine support for Logitech Jive") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: Ben Dooks <ben-linux@fluff.org> Cc: Krzysztof Kozlowski <krzk@kernel.org> Cc: Alim Akhtar <alim.akhtar@samsung.com> Cc: Russell King <linux@armlinux.org.uk> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Cc: patches@armlinux.org.uk --- KernelVersion: v5.17-rc7 arch/arm/mach-s3c/mach-jive.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)