lkml.org 
[lkml]   [2021]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 209/530] staging: comedi: tests: ni_routes_test: Fix compilation error
    Date
    From: Ian Abbott <abbotti@mev.co.uk>

    [ Upstream commit 6db58ed2b2d9bb1792eace4f9aa70e8bdd730ffc ]

    The `ni_routes_test` module is not currently selectable using the
    Kconfig files, but can be built by specifying `CONFIG_COMEDI_TESTS=m` on
    the "make" command line. It currently fails to compile due to an extra
    parameter added to the `ni_assign_device_routes` function by
    commit e3b7ce73c578 ("staging: comedi: ni_routes: Allow alternate board
    name for routes"). Fix it by supplying the value `NULL` for the added
    `alt_board_name` parameter (which specifies that there is no alternate
    board name).

    Fixes: e3b7ce73c578 ("staging: comedi: ni_routes: Allow alternate board name for routes")
    Cc: Spencer E. Olson <olsonse@umich.edu>
    Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
    Link: https://lore.kernel.org/r/20210407140142.447250-2-abbotti@mev.co.uk
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/comedi/drivers/tests/ni_routes_test.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/staging/comedi/drivers/tests/ni_routes_test.c b/drivers/staging/comedi/drivers/tests/ni_routes_test.c
    index eaefaf596a37..02606e39625a 100644
    --- a/drivers/staging/comedi/drivers/tests/ni_routes_test.c
    +++ b/drivers/staging/comedi/drivers/tests/ni_routes_test.c
    @@ -217,7 +217,8 @@ void test_ni_assign_device_routes(void)
    const u8 *table, *oldtable;

    init_pci_6070e();
    - ni_assign_device_routes(ni_eseries, pci_6070e, &private.routing_tables);
    + ni_assign_device_routes(ni_eseries, pci_6070e, NULL,
    + &private.routing_tables);
    devroutes = private.routing_tables.valid_routes;
    table = private.routing_tables.route_values;

    @@ -253,7 +254,8 @@ void test_ni_assign_device_routes(void)
    olddevroutes = devroutes;
    oldtable = table;
    init_pci_6220();
    - ni_assign_device_routes(ni_mseries, pci_6220, &private.routing_tables);
    + ni_assign_device_routes(ni_mseries, pci_6220, NULL,
    + &private.routing_tables);
    devroutes = private.routing_tables.valid_routes;
    table = private.routing_tables.route_values;

    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-12 18:02    [W:4.042 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site