lkml.org 
[lkml]   [2022]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 394/475] scsi: aha152x: Fix aha152x_setup() __setup handler return value
    Date
    From: Randy Dunlap <rdunlap@infradead.org>

    [ Upstream commit cc8294ec4738d25e2bb2d71f7d82a9bf7f4a157b ]

    __setup() handlers should return 1 if the command line option is handled
    and 0 if not (or maybe never return 0; doing so just pollutes init's
    environment with strings that are not init arguments/parameters).

    Return 1 from aha152x_setup() to indicate that the boot option has been
    handled.

    Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru
    Link: https://lore.kernel.org/r/20220223000623.5920-1-rdunlap@infradead.org
    Cc: "Juergen E. Fischer" <fischer@norbit.de>
    Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
    Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
    Reported-by: Igor Zhbanov <i.zhbanov@omprussia.ru>
    Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/aha152x.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
    index eb466c2e1839..fdd9f1a5100c 100644
    --- a/drivers/scsi/aha152x.c
    +++ b/drivers/scsi/aha152x.c
    @@ -3368,13 +3368,11 @@ static int __init aha152x_setup(char *str)
    setup[setup_count].synchronous = ints[0] >= 6 ? ints[6] : 1;
    setup[setup_count].delay = ints[0] >= 7 ? ints[7] : DELAY_DEFAULT;
    setup[setup_count].ext_trans = ints[0] >= 8 ? ints[8] : 0;
    - if (ints[0] > 8) { /*}*/
    + if (ints[0] > 8)
    printk(KERN_NOTICE "aha152x: usage: aha152x=<IOBASE>[,<IRQ>[,<SCSI ID>"
    "[,<RECONNECT>[,<PARITY>[,<SYNCHRONOUS>[,<DELAY>[,<EXT_TRANS>]]]]]]]\n");
    - } else {
    + else
    setup_count++;
    - return 0;
    - }

    return 1;
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-04-14 17:20    [W:4.021 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site