lkml.org 
[lkml]   [2024]   [Apr]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 17/34] greybus: arche-ctrl: move device table to its right location
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    The arche-ctrl has two platform drivers and three of_device_id tables,
    but one table is only used for the the module loader, while the other
    two seem to be associated with their drivers.

    This leads to a W=1 warning when the driver is built-in:

    drivers/staging/greybus/arche-platform.c:623:34: error: 'arche_combined_id' defined but not used [-Werror=unused-const-variable=]
    623 | static const struct of_device_id arche_combined_id[] = {

    Drop the extra table and register both tables that are actually
    used as the ones for the module loader instead.

    Fixes: 7b62b61c752a ("greybus: arche-ctrl: Don't expose driver internals to arche-platform driver")
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    ---
    drivers/staging/greybus/arche-apb-ctrl.c | 1 +
    drivers/staging/greybus/arche-platform.c | 9 +--------
    2 files changed, 2 insertions(+), 8 deletions(-)

    diff --git a/drivers/staging/greybus/arche-apb-ctrl.c b/drivers/staging/greybus/arche-apb-ctrl.c
    index 8541995008da..aa6f266b62a1 100644
    --- a/drivers/staging/greybus/arche-apb-ctrl.c
    +++ b/drivers/staging/greybus/arche-apb-ctrl.c
    @@ -466,6 +466,7 @@ static const struct of_device_id arche_apb_ctrl_of_match[] = {
    { .compatible = "usbffff,2", },
    { },
    };
    +MODULE_DEVICE_TABLE(of, arche_apb_ctrl_of_match);

    static struct platform_driver arche_apb_ctrl_device_driver = {
    .probe = arche_apb_ctrl_probe,
    diff --git a/drivers/staging/greybus/arche-platform.c b/drivers/staging/greybus/arche-platform.c
    index 891b75327d7f..b33977ccd527 100644
    --- a/drivers/staging/greybus/arche-platform.c
    +++ b/drivers/staging/greybus/arche-platform.c
    @@ -619,14 +619,7 @@ static const struct of_device_id arche_platform_of_match[] = {
    { .compatible = "google,arche-platform", },
    { },
    };
    -
    -static const struct of_device_id arche_combined_id[] = {
    - /* Use PID/VID of SVC device */
    - { .compatible = "google,arche-platform", },
    - { .compatible = "usbffff,2", },
    - { },
    -};
    -MODULE_DEVICE_TABLE(of, arche_combined_id);
    +MODULE_DEVICE_TABLE(of, arche_platform_of_match);

    static struct platform_driver arche_platform_device_driver = {
    .probe = arche_platform_probe,
    --
    2.39.2

    \
     
     \ /
      Last update: 2024-05-27 16:20    [W:4.061 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site