lkml.org 
[lkml]   [2020]   [Aug]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/33] spmi: hisi-spmi-controller: fix it to probe successfully
    Date
    Add a MODULE_DEVICE_TABLE() to the driver.

    Also, the current logic calls platform_set_drvdata(pdev, NULL)
    if the driver succeeds loading.

    While here, remove the .owner, as it is not needed upstream
    anymore.

    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    ---
    drivers/spmi/hisi-spmi-controller.c | 11 +++++++----
    1 file changed, 7 insertions(+), 4 deletions(-)

    diff --git a/drivers/spmi/hisi-spmi-controller.c b/drivers/spmi/hisi-spmi-controller.c
    index 3af0bd1b379f..bc6847f9a5e7 100644
    --- a/drivers/spmi/hisi-spmi-controller.c
    +++ b/drivers/spmi/hisi-spmi-controller.c
    @@ -324,11 +324,14 @@ static int spmi_controller_probe(struct platform_device *pdev)
    ctrl->write_cmd = spmi_write_cmd;

    ret = spmi_controller_add(ctrl);
    - if (ret) {
    - dev_err(&pdev->dev, "spmi_add_controller failed!\n");
    + if (ret)
    goto err_add_controller;
    - }
    +
    + dev_info(&pdev->dev, "spmi_add_controller initialized\n");
    + return 0;
    +
    err_add_controller:
    + dev_err(&pdev->dev, "spmi_add_controller failed!\n");
    platform_set_drvdata(pdev, NULL);
    return ret;
    }
    @@ -347,13 +350,13 @@ static const struct of_device_id spmi_controller_match_table[] = {
    },
    {}
    };
    +MODULE_DEVICE_TABLE(of, spmi_controller_match_table);

    static struct platform_driver spmi_controller_driver = {
    .probe = spmi_controller_probe,
    .remove = spmi_del_controller,
    .driver = {
    .name = SPMI_CONTROLLER_NAME,
    - .owner = THIS_MODULE,
    .of_match_table = spmi_controller_match_table,
    },
    };
    --
    2.26.2
    \
     
     \ /
      Last update: 2020-08-11 17:44    [W:4.629 / U:0.444 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site