Skip to content

L
linux
Commit d4c720a1 authored by Georgi Djakov's avatar Georgi Djakov
Browse files
Options

Merge branch 'icc-platform-remove' into icc-next 

Convert platform drivers to use the .remove_new callback.
* icc-platform-remove
  interconnect: qcom: Convert to platform remove callback returning void

Link: https://lore.kernel.org/r/20231015135955.1537751-2-u.kleine-koenig@pengutronix.deSigned-off-by: default avatarGeorgi Djakov <djakov@kernel.org>
parents 9330bf74 c8fd5a37
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 21 deletions
drivers/interconnect/qcom/icc-rpmh.c
View file @ d4c720a1
...@@ -253,14 +253,12 @@ int qcom_icc_rpmh_probe(struct platform_device *pdev) ...@@ -253,14 +253,12 @@ int qcom_icc_rpmh_probe(struct platform_device *pdev)
} }
EXPORT_SYMBOL_GPL(qcom_icc_rpmh_probe); EXPORT_SYMBOL_GPL(qcom_icc_rpmh_probe);
int qcom_icc_rpmh_remove(struct platform_device *pdev) void qcom_icc_rpmh_remove(struct platform_device *pdev)
{ {
struct qcom_icc_provider *qp = platform_get_drvdata(pdev); struct qcom_icc_provider *qp = platform_get_drvdata(pdev);
icc_provider_deregister(&qp->provider); icc_provider_deregister(&qp->provider);
icc_nodes_remove(&qp->provider); icc_nodes_remove(&qp->provider);
return 0;
} }
EXPORT_SYMBOL_GPL(qcom_icc_rpmh_remove); EXPORT_SYMBOL_GPL(qcom_icc_rpmh_remove);
......
drivers/interconnect/qcom/icc-rpmh.h
View file @ d4c720a1
...@@ -126,6 +126,6 @@ int qcom_icc_set(struct icc_node *src, struct icc_node *dst); ...@@ -126,6 +126,6 @@ int qcom_icc_set(struct icc_node *src, struct icc_node *dst);
int qcom_icc_bcm_init(struct qcom_icc_bcm *bcm, struct device *dev); int qcom_icc_bcm_init(struct qcom_icc_bcm *bcm, struct device *dev);
void qcom_icc_pre_aggregate(struct icc_node *node); void qcom_icc_pre_aggregate(struct icc_node *node);
int qcom_icc_rpmh_probe(struct platform_device *pdev); int qcom_icc_rpmh_probe(struct platform_device *pdev);
int qcom_icc_rpmh_remove(struct platform_device *pdev); void qcom_icc_rpmh_remove(struct platform_device *pdev);
#endif #endif
drivers/interconnect/qcom/qdu1000.c
View file @ d4c720a1
...@@ -1046,7 +1046,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match); ...@@ -1046,7 +1046,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
static struct platform_driver qnoc_driver = { static struct platform_driver qnoc_driver = {
.probe = qnoc_probe, .probe = qnoc_probe,
.remove = qcom_icc_rpmh_remove, .remove_new = qcom_icc_rpmh_remove,
.driver = { .driver = {
.name = "qnoc-qdu1000", .name = "qnoc-qdu1000",
.of_match_table = qnoc_of_match, .of_match_table = qnoc_of_match,
......
drivers/interconnect/qcom/sa8775p.c
View file @ d4c720a1
...@@ -2519,7 +2519,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match); ...@@ -2519,7 +2519,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
static struct platform_driver qnoc_driver = { static struct platform_driver qnoc_driver = {
.probe = qcom_icc_rpmh_probe, .probe = qcom_icc_rpmh_probe,
.remove = qcom_icc_rpmh_remove, .remove_new = qcom_icc_rpmh_remove,
.driver = { .driver = {
.name = "qnoc-sa8775p", .name = "qnoc-sa8775p",
.of_match_table = qnoc_of_match, .of_match_table = qnoc_of_match,
......
drivers/interconnect/qcom/sc7180.c
View file @ d4c720a1
...@@ -1807,7 +1807,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match); ...@@ -1807,7 +1807,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
static struct platform_driver qnoc_driver = { static struct platform_driver qnoc_driver = {
.probe = qcom_icc_rpmh_probe, .probe = qcom_icc_rpmh_probe,
.remove = qcom_icc_rpmh_remove, .remove_new = qcom_icc_rpmh_remove,
.driver = { .driver = {
.name = "qnoc-sc7180", .name = "qnoc-sc7180",
.of_match_table = qnoc_of_match, .of_match_table = qnoc_of_match,
......
drivers/interconnect/qcom/sc7280.c
View file @ d4c720a1
...@@ -1835,7 +1835,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match); ...@@ -1835,7 +1835,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
static struct platform_driver qnoc_driver = { static struct platform_driver qnoc_driver = {
.probe = qcom_icc_rpmh_probe, .probe = qcom_icc_rpmh_probe,
.remove = qcom_icc_rpmh_remove, .remove_new = qcom_icc_rpmh_remove,
.driver = { .driver = {
.name = "qnoc-sc7280", .name = "qnoc-sc7280",
.of_match_table = qnoc_of_match, .of_match_table = qnoc_of_match,
......
drivers/interconnect/qcom/sc8180x.c
View file @ d4c720a1
...@@ -1888,7 +1888,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match); ...@@ -1888,7 +1888,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
static struct platform_driver qnoc_driver = { static struct platform_driver qnoc_driver = {
.probe = qcom_icc_rpmh_probe, .probe = qcom_icc_rpmh_probe,
.remove = qcom_icc_rpmh_remove, .remove_new = qcom_icc_rpmh_remove,
.driver = { .driver = {
.name = "qnoc-sc8180x", .name = "qnoc-sc8180x",
.of_match_table = qnoc_of_match, .of_match_table = qnoc_of_match,
......
drivers/interconnect/qcom/sc8280xp.c
View file @ d4c720a1
...@@ -2391,7 +2391,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match); ...@@ -2391,7 +2391,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
static struct platform_driver qnoc_driver = { static struct platform_driver qnoc_driver = {
.probe = qcom_icc_rpmh_probe, .probe = qcom_icc_rpmh_probe,
.remove = qcom_icc_rpmh_remove, .remove_new = qcom_icc_rpmh_remove,
.driver = { .driver = {
.name = "qnoc-sc8280xp", .name = "qnoc-sc8280xp",
.of_match_table = qnoc_of_match, .of_match_table = qnoc_of_match,
......
drivers/interconnect/qcom/sdm670.c
View file @ d4c720a1
...@@ -1533,7 +1533,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match); ...@@ -1533,7 +1533,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
static struct platform_driver qnoc_driver = { static struct platform_driver qnoc_driver = {
.probe = qcom_icc_rpmh_probe, .probe = qcom_icc_rpmh_probe,
.remove = qcom_icc_rpmh_remove, .remove_new = qcom_icc_rpmh_remove,
.driver = { .driver = {
.name = "qnoc-sdm670", .name = "qnoc-sdm670",
.of_match_table = qnoc_of_match, .of_match_table = qnoc_of_match,
......
drivers/interconnect/qcom/sdm845.c
View file @ d4c720a1
...@@ -1802,7 +1802,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match); ...@@ -1802,7 +1802,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
static struct platform_driver qnoc_driver = { static struct platform_driver qnoc_driver = {
.probe = qcom_icc_rpmh_probe, .probe = qcom_icc_rpmh_probe,
.remove = qcom_icc_rpmh_remove, .remove_new = qcom_icc_rpmh_remove,
.driver = { .driver = {
.name = "qnoc-sdm845", .name = "qnoc-sdm845",
.of_match_table = qnoc_of_match, .of_match_table = qnoc_of_match,
......
drivers/interconnect/qcom/sdx55.c
View file @ d4c720a1
...@@ -913,7 +913,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match); ...@@ -913,7 +913,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
static struct platform_driver qnoc_driver = { static struct platform_driver qnoc_driver = {
.probe = qcom_icc_rpmh_probe, .probe = qcom_icc_rpmh_probe,
.remove = qcom_icc_rpmh_remove, .remove_new = qcom_icc_rpmh_remove,
.driver = { .driver = {
.name = "qnoc-sdx55", .name = "qnoc-sdx55",
.of_match_table = qnoc_of_match, .of_match_table = qnoc_of_match,
......
drivers/interconnect/qcom/sdx65.c
View file @ d4c720a1
...@@ -897,7 +897,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match); ...@@ -897,7 +897,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
static struct platform_driver qnoc_driver = { static struct platform_driver qnoc_driver = {
.probe = qcom_icc_rpmh_probe, .probe = qcom_icc_rpmh_probe,
.remove = qcom_icc_rpmh_remove, .remove_new = qcom_icc_rpmh_remove,
.driver = { .driver = {
.name = "qnoc-sdx65", .name = "qnoc-sdx65",
.of_match_table = qnoc_of_match, .of_match_table = qnoc_of_match,
......
drivers/interconnect/qcom/sdx75.c
View file @ d4c720a1
...@@ -1083,7 +1083,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match); ...@@ -1083,7 +1083,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
static struct platform_driver qnoc_driver = { static struct platform_driver qnoc_driver = {
.probe = qcom_icc_rpmh_probe, .probe = qcom_icc_rpmh_probe,
.remove = qcom_icc_rpmh_remove, .remove_new = qcom_icc_rpmh_remove,
.driver = { .driver = {
.name = "qnoc-sdx75", .name = "qnoc-sdx75",
.of_match_table = qnoc_of_match, .of_match_table = qnoc_of_match,
......
drivers/interconnect/qcom/sm6350.c
View file @ d4c720a1
...@@ -1702,7 +1702,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match); ...@@ -1702,7 +1702,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
static struct platform_driver qnoc_driver = { static struct platform_driver qnoc_driver = {
.probe = qcom_icc_rpmh_probe, .probe = qcom_icc_rpmh_probe,
.remove = qcom_icc_rpmh_remove, .remove_new = qcom_icc_rpmh_remove,
.driver = { .driver = {
.name = "qnoc-sm6350", .name = "qnoc-sm6350",
.of_match_table = qnoc_of_match, .of_match_table = qnoc_of_match,
......
drivers/interconnect/qcom/sm8150.c
View file @ d4c720a1
...@@ -1864,7 +1864,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match); ...@@ -1864,7 +1864,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
static struct platform_driver qnoc_driver = { static struct platform_driver qnoc_driver = {
.probe = qcom_icc_rpmh_probe, .probe = qcom_icc_rpmh_probe,
.remove = qcom_icc_rpmh_remove, .remove_new = qcom_icc_rpmh_remove,
.driver = { .driver = {
.name = "qnoc-sm8150", .name = "qnoc-sm8150",
.of_match_table = qnoc_of_match, .of_match_table = qnoc_of_match,
......
drivers/interconnect/qcom/sm8250.c
View file @ d4c720a1
...@@ -1991,7 +1991,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match); ...@@ -1991,7 +1991,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
static struct platform_driver qnoc_driver = { static struct platform_driver qnoc_driver = {
.probe = qcom_icc_rpmh_probe, .probe = qcom_icc_rpmh_probe,
.remove = qcom_icc_rpmh_remove, .remove_new = qcom_icc_rpmh_remove,
.driver = { .driver = {
.name = "qnoc-sm8250", .name = "qnoc-sm8250",
.of_match_table = qnoc_of_match, .of_match_table = qnoc_of_match,
......
drivers/interconnect/qcom/sm8350.c
View file @ d4c720a1
...@@ -1961,7 +1961,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match); ...@@ -1961,7 +1961,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
static struct platform_driver qnoc_driver = { static struct platform_driver qnoc_driver = {
.probe = qcom_icc_rpmh_probe, .probe = qcom_icc_rpmh_probe,
.remove = qcom_icc_rpmh_remove, .remove_new = qcom_icc_rpmh_remove,
.driver = { .driver = {
.name = "qnoc-sm8350", .name = "qnoc-sm8350",
.of_match_table = qnoc_of_match, .of_match_table = qnoc_of_match,
......
drivers/interconnect/qcom/sm8450.c
View file @ d4c720a1
...@@ -1884,7 +1884,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match); ...@@ -1884,7 +1884,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
static struct platform_driver qnoc_driver = { static struct platform_driver qnoc_driver = {
.probe = qcom_icc_rpmh_probe, .probe = qcom_icc_rpmh_probe,
.remove = qcom_icc_rpmh_remove, .remove_new = qcom_icc_rpmh_remove,
.driver = { .driver = {
.name = "qnoc-sm8450", .name = "qnoc-sm8450",
.of_match_table = qnoc_of_match, .of_match_table = qnoc_of_match,
......
drivers/interconnect/qcom/sm8550.c
View file @ d4c720a1
...@@ -2219,7 +2219,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match); ...@@ -2219,7 +2219,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
static struct platform_driver qnoc_driver = { static struct platform_driver qnoc_driver = {
.probe = qcom_icc_rpmh_probe, .probe = qcom_icc_rpmh_probe,
.remove = qcom_icc_rpmh_remove, .remove_new = qcom_icc_rpmh_remove,
.driver = { .driver = {
.name = "qnoc-sm8550", .name = "qnoc-sm8550",
.of_match_table = qnoc_of_match, .of_match_table = qnoc_of_match,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7