Commit d4c720a1 authored by Georgi Djakov's avatar Georgi Djakov
Browse files

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: default avatarGeorgi Djakov <djakov@kernel.org>
parents 9330bf74 c8fd5a37

drivers/interconnect/qcom/icc-rpmh.c

+1 −3
Original line number Diff line number Diff line
@@ -253,14 +253,12 @@ int qcom_icc_rpmh_probe(struct platform_device *pdev) 
}

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);



	icc_provider_deregister(&qp->provider);

	icc_nodes_remove(&qp->provider);



	return 0;

}

EXPORT_SYMBOL_GPL(qcom_icc_rpmh_remove);

drivers/interconnect/qcom/icc-rpmh.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

void qcom_icc_pre_aggregate(struct icc_node *node);

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

drivers/interconnect/qcom/qdu1000.c

+1 −1
Original line number Diff line number Diff line
@@ -1046,7 +1046,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match); 


static struct platform_driver qnoc_driver = {

	.probe = qnoc_probe,

	.remove = qcom_icc_rpmh_remove,

	.remove_new = qcom_icc_rpmh_remove,

	.driver = {

		.name = "qnoc-qdu1000",

		.of_match_table = qnoc_of_match,

drivers/interconnect/qcom/sa8775p.c

+1 −1
Original line number Diff line number Diff line
@@ -2519,7 +2519,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match); 


static struct platform_driver qnoc_driver = {

	.probe = qcom_icc_rpmh_probe,

	.remove = qcom_icc_rpmh_remove,

	.remove_new = qcom_icc_rpmh_remove,

	.driver = {

		.name = "qnoc-sa8775p",

		.of_match_table = qnoc_of_match,

drivers/interconnect/qcom/sc7180.c

+1 −1
Original line number Diff line number Diff line
@@ -1807,7 +1807,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match); 


static struct platform_driver qnoc_driver = {

	.probe = qcom_icc_rpmh_probe,

	.remove = qcom_icc_rpmh_remove,

	.remove_new = qcom_icc_rpmh_remove,

	.driver = {

		.name = "qnoc-sc7180",

		.of_match_table = qnoc_of_match,