Merge tag 'perf-tools-for-v6.8-1-2024-01-09' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-microblaze.git] / drivers / mailbox / qcom-apcs-ipc-mailbox.c

diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
index 002a135..7d91e7c 100644 (file)
--- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c
+++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
@@ -129,14 +129,12 @@ static int qcom_apcs_ipc_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int qcom_apcs_ipc_remove(struct platform_device *pdev)
+static void qcom_apcs_ipc_remove(struct platform_device *pdev)
 {
        struct qcom_apcs_ipc *apcs = platform_get_drvdata(pdev);
        struct platform_device *clk = apcs->clk;
 
        platform_device_unregister(clk);
-
-       return 0;
 }
 
 /* .data is the offset of the ipc register within the global block */
@@ -145,19 +143,19 @@ static const struct of_device_id qcom_apcs_ipc_of_match[] = {
        { .compatible = "qcom,msm8916-apcs-kpss-global", .data = &msm8916_apcs_data },
        { .compatible = "qcom,msm8939-apcs-kpss-global", .data = &msm8916_apcs_data },
        { .compatible = "qcom,msm8953-apcs-kpss-global", .data = &msm8994_apcs_data },
-       { .compatible = "qcom,msm8976-apcs-kpss-global", .data = &msm8994_apcs_data },
        { .compatible = "qcom,msm8994-apcs-kpss-global", .data = &msm8994_apcs_data },
        { .compatible = "qcom,msm8996-apcs-hmss-global", .data = &msm8996_apcs_data },
-       { .compatible = "qcom,msm8998-apcs-hmss-global", .data = &msm8994_apcs_data },
        { .compatible = "qcom,qcm2290-apcs-hmss-global", .data = &msm8994_apcs_data },
+       { .compatible = "qcom,sdm845-apss-shared", .data = &apps_shared_apcs_data },
+       { .compatible = "qcom,sdx55-apcs-gcc", .data = &sdx55_apcs_data },
+       /* Do not add any more entries using existing driver data */
+       { .compatible = "qcom,msm8976-apcs-kpss-global", .data = &msm8994_apcs_data },
+       { .compatible = "qcom,msm8998-apcs-hmss-global", .data = &msm8994_apcs_data },
        { .compatible = "qcom,qcs404-apcs-apps-global", .data = &msm8916_apcs_data },
        { .compatible = "qcom,sdm660-apcs-hmss-global", .data = &msm8994_apcs_data },
-       { .compatible = "qcom,sdm845-apss-shared", .data = &apps_shared_apcs_data },
        { .compatible = "qcom,sm4250-apcs-hmss-global", .data = &msm8994_apcs_data },
        { .compatible = "qcom,sm6125-apcs-hmss-global", .data = &msm8994_apcs_data },
        { .compatible = "qcom,sm6115-apcs-hmss-global", .data = &msm8994_apcs_data },
-       { .compatible = "qcom,sdx55-apcs-gcc", .data = &sdx55_apcs_data },
-       /* Do not add any more entries using existing driver data */
        { .compatible = "qcom,ipq5332-apcs-apps-global", .data = &ipq6018_apcs_data },
        { .compatible = "qcom,ipq8074-apcs-apps-global", .data = &ipq6018_apcs_data },
        { .compatible = "qcom,sc7180-apss-shared", .data = &apps_shared_apcs_data },
@@ -169,7 +167,7 @@ MODULE_DEVICE_TABLE(of, qcom_apcs_ipc_of_match);
 
 static struct platform_driver qcom_apcs_ipc_driver = {
        .probe = qcom_apcs_ipc_probe,
-       .remove = qcom_apcs_ipc_remove,
+       .remove_new = qcom_apcs_ipc_remove,
        .driver = {
                .name = "qcom_apcs_ipc",
                .of_match_table = qcom_apcs_ipc_of_match,