Skip to content

Commit d4c720a

Browse files
author
Georgi Djakov
committed
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.de Signed-off-by: Georgi Djakov <djakov@kernel.org>
2 parents 9330bf7 + c8fd5a3 commit d4c720a

19 files changed

Lines changed: 19 additions & 21 deletions

‎drivers/interconnect/qcom/icc-rpmh.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,14 +253,12 @@ int qcom_icc_rpmh_probe(struct platform_device *pdev)
253253
}
254254
EXPORT_SYMBOL_GPL(qcom_icc_rpmh_probe);
255255

256-
int qcom_icc_rpmh_remove(struct platform_device *pdev)
256+
void qcom_icc_rpmh_remove(struct platform_device *pdev)
257257
{
258258
struct qcom_icc_provider *qp = platform_get_drvdata(pdev);
259259

260260
icc_provider_deregister(&qp->provider);
261261
icc_nodes_remove(&qp->provider);
262-
263-
return 0;
264262
}
265263
EXPORT_SYMBOL_GPL(qcom_icc_rpmh_remove);
266264

‎drivers/interconnect/qcom/icc-rpmh.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,6 @@ int qcom_icc_set(struct icc_node *src, struct icc_node *dst);
126126
int qcom_icc_bcm_init(struct qcom_icc_bcm *bcm, struct device *dev);
127127
void qcom_icc_pre_aggregate(struct icc_node *node);
128128
int qcom_icc_rpmh_probe(struct platform_device *pdev);
129-
int qcom_icc_rpmh_remove(struct platform_device *pdev);
129+
void qcom_icc_rpmh_remove(struct platform_device *pdev);
130130

131131
#endif

‎drivers/interconnect/qcom/qdu1000.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
10461046

10471047
static struct platform_driver qnoc_driver = {
10481048
.probe = qnoc_probe,
1049-
.remove = qcom_icc_rpmh_remove,
1049+
.remove_new = qcom_icc_rpmh_remove,
10501050
.driver = {
10511051
.name = "qnoc-qdu1000",
10521052
.of_match_table = qnoc_of_match,

‎drivers/interconnect/qcom/sa8775p.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2519,7 +2519,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
25192519

25202520
static struct platform_driver qnoc_driver = {
25212521
.probe = qcom_icc_rpmh_probe,
2522-
.remove = qcom_icc_rpmh_remove,
2522+
.remove_new = qcom_icc_rpmh_remove,
25232523
.driver = {
25242524
.name = "qnoc-sa8775p",
25252525
.of_match_table = qnoc_of_match,

‎drivers/interconnect/qcom/sc7180.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1807,7 +1807,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
18071807

18081808
static struct platform_driver qnoc_driver = {
18091809
.probe = qcom_icc_rpmh_probe,
1810-
.remove = qcom_icc_rpmh_remove,
1810+
.remove_new = qcom_icc_rpmh_remove,
18111811
.driver = {
18121812
.name = "qnoc-sc7180",
18131813
.of_match_table = qnoc_of_match,

‎drivers/interconnect/qcom/sc7280.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1835,7 +1835,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
18351835

18361836
static struct platform_driver qnoc_driver = {
18371837
.probe = qcom_icc_rpmh_probe,
1838-
.remove = qcom_icc_rpmh_remove,
1838+
.remove_new = qcom_icc_rpmh_remove,
18391839
.driver = {
18401840
.name = "qnoc-sc7280",
18411841
.of_match_table = qnoc_of_match,

‎drivers/interconnect/qcom/sc8180x.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1888,7 +1888,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
18881888

18891889
static struct platform_driver qnoc_driver = {
18901890
.probe = qcom_icc_rpmh_probe,
1891-
.remove = qcom_icc_rpmh_remove,
1891+
.remove_new = qcom_icc_rpmh_remove,
18921892
.driver = {
18931893
.name = "qnoc-sc8180x",
18941894
.of_match_table = qnoc_of_match,

‎drivers/interconnect/qcom/sc8280xp.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2391,7 +2391,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
23912391

23922392
static struct platform_driver qnoc_driver = {
23932393
.probe = qcom_icc_rpmh_probe,
2394-
.remove = qcom_icc_rpmh_remove,
2394+
.remove_new = qcom_icc_rpmh_remove,
23952395
.driver = {
23962396
.name = "qnoc-sc8280xp",
23972397
.of_match_table = qnoc_of_match,

‎drivers/interconnect/qcom/sdm670.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1533,7 +1533,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
15331533

15341534
static struct platform_driver qnoc_driver = {
15351535
.probe = qcom_icc_rpmh_probe,
1536-
.remove = qcom_icc_rpmh_remove,
1536+
.remove_new = qcom_icc_rpmh_remove,
15371537
.driver = {
15381538
.name = "qnoc-sdm670",
15391539
.of_match_table = qnoc_of_match,

‎drivers/interconnect/qcom/sdm845.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1802,7 +1802,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
18021802

18031803
static struct platform_driver qnoc_driver = {
18041804
.probe = qcom_icc_rpmh_probe,
1805-
.remove = qcom_icc_rpmh_remove,
1805+
.remove_new = qcom_icc_rpmh_remove,
18061806
.driver = {
18071807
.name = "qnoc-sdm845",
18081808
.of_match_table = qnoc_of_match,

0 commit comments

Comments
 (0)