Commit 85eb5344 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Greg Kroah-Hartman

staging: spmi: hisi-spmi-controller: fix it to probe successfully

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: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/122bd1c02f325094f4830ac79a86430fbe01e3d5.1597647359.git.mchehab+huawei@kernel.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2ea3f6a0
...@@ -324,11 +324,14 @@ static int spmi_controller_probe(struct platform_device *pdev) ...@@ -324,11 +324,14 @@ static int spmi_controller_probe(struct platform_device *pdev)
ctrl->write_cmd = spmi_write_cmd; ctrl->write_cmd = spmi_write_cmd;
ret = spmi_controller_add(ctrl); ret = spmi_controller_add(ctrl);
if (ret) { if (ret)
dev_err(&pdev->dev, "spmi_add_controller failed!\n");
goto err_add_controller; goto err_add_controller;
}
dev_info(&pdev->dev, "spmi_add_controller initialized\n");
return 0;
err_add_controller: err_add_controller:
dev_err(&pdev->dev, "spmi_add_controller failed!\n");
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
return ret; return ret;
} }
...@@ -347,13 +350,13 @@ static const struct of_device_id spmi_controller_match_table[] = { ...@@ -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 = { static struct platform_driver spmi_controller_driver = {
.probe = spmi_controller_probe, .probe = spmi_controller_probe,
.remove = spmi_del_controller, .remove = spmi_del_controller,
.driver = { .driver = {
.name = SPMI_CONTROLLER_NAME, .name = SPMI_CONTROLLER_NAME,
.owner = THIS_MODULE,
.of_match_table = spmi_controller_match_table, .of_match_table = spmi_controller_match_table,
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment