phy: qcom-qmp-usb: move device-id table

Move the device-id table below probe() and next to the driver structure
to keep the driver callback functions grouped together.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20221028160435.26948-4-johan+linaro@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
index 52b4bee867db346f0fc8ac670cd98a66db235e01..ead136c7bd01e989529e8f91b5f76bd260725e49 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
@@ -2501,69 +2501,6 @@ int qmp_usb_create(struct device *dev, struct device_node *np, int id,
        return 0;
 }
 
-static const struct of_device_id qmp_usb_of_match_table[] = {
-       {
-               .compatible = "qcom,ipq6018-qmp-usb3-phy",
-               .data = &ipq8074_usb3phy_cfg,
-       }, {
-               .compatible = "qcom,ipq8074-qmp-usb3-phy",
-               .data = &ipq8074_usb3phy_cfg,
-       }, {
-               .compatible = "qcom,msm8996-qmp-usb3-phy",
-               .data = &msm8996_usb3phy_cfg,
-       }, {
-               .compatible = "qcom,msm8998-qmp-usb3-phy",
-               .data = &msm8998_usb3phy_cfg,
-       }, {
-               .compatible = "qcom,qcm2290-qmp-usb3-phy",
-               .data = &qcm2290_usb3phy_cfg,
-       }, {
-               .compatible = "qcom,sc7180-qmp-usb3-phy",
-               .data = &sc7180_usb3phy_cfg,
-       }, {
-               .compatible = "qcom,sc8180x-qmp-usb3-phy",
-               .data = &sm8150_usb3phy_cfg,
-       }, {
-               .compatible = "qcom,sc8280xp-qmp-usb3-uni-phy",
-               .data = &sc8280xp_usb3_uniphy_cfg,
-       }, {
-               .compatible = "qcom,sdm845-qmp-usb3-phy",
-               .data = &qmp_v3_usb3phy_cfg,
-       }, {
-               .compatible = "qcom,sdm845-qmp-usb3-uni-phy",
-               .data = &qmp_v3_usb3_uniphy_cfg,
-       }, {
-               .compatible = "qcom,sdx55-qmp-usb3-uni-phy",
-               .data = &sdx55_usb3_uniphy_cfg,
-       }, {
-               .compatible = "qcom,sdx65-qmp-usb3-uni-phy",
-               .data = &sdx65_usb3_uniphy_cfg,
-       }, {
-               .compatible = "qcom,sm8150-qmp-usb3-phy",
-               .data = &sm8150_usb3phy_cfg,
-       }, {
-               .compatible = "qcom,sm8150-qmp-usb3-uni-phy",
-               .data = &sm8150_usb3_uniphy_cfg,
-       }, {
-               .compatible = "qcom,sm8250-qmp-usb3-phy",
-               .data = &sm8250_usb3phy_cfg,
-       }, {
-               .compatible = "qcom,sm8250-qmp-usb3-uni-phy",
-               .data = &sm8250_usb3_uniphy_cfg,
-       }, {
-               .compatible = "qcom,sm8350-qmp-usb3-phy",
-               .data = &sm8350_usb3phy_cfg,
-       }, {
-               .compatible = "qcom,sm8350-qmp-usb3-uni-phy",
-               .data = &sm8350_usb3_uniphy_cfg,
-       }, {
-               .compatible = "qcom,sm8450-qmp-usb3-phy",
-               .data = &sm8350_usb3phy_cfg,
-       },
-       { },
-};
-MODULE_DEVICE_TABLE(of, qmp_usb_of_match_table);
-
 static const struct dev_pm_ops qmp_usb_pm_ops = {
        SET_RUNTIME_PM_OPS(qmp_usb_runtime_suspend,
                           qmp_usb_runtime_resume, NULL)
@@ -2665,6 +2602,69 @@ err_node_put:
        return ret;
 }
 
+static const struct of_device_id qmp_usb_of_match_table[] = {
+       {
+               .compatible = "qcom,ipq6018-qmp-usb3-phy",
+               .data = &ipq8074_usb3phy_cfg,
+       }, {
+               .compatible = "qcom,ipq8074-qmp-usb3-phy",
+               .data = &ipq8074_usb3phy_cfg,
+       }, {
+               .compatible = "qcom,msm8996-qmp-usb3-phy",
+               .data = &msm8996_usb3phy_cfg,
+       }, {
+               .compatible = "qcom,msm8998-qmp-usb3-phy",
+               .data = &msm8998_usb3phy_cfg,
+       }, {
+               .compatible = "qcom,qcm2290-qmp-usb3-phy",
+               .data = &qcm2290_usb3phy_cfg,
+       }, {
+               .compatible = "qcom,sc7180-qmp-usb3-phy",
+               .data = &sc7180_usb3phy_cfg,
+       }, {
+               .compatible = "qcom,sc8180x-qmp-usb3-phy",
+               .data = &sm8150_usb3phy_cfg,
+       }, {
+               .compatible = "qcom,sc8280xp-qmp-usb3-uni-phy",
+               .data = &sc8280xp_usb3_uniphy_cfg,
+       }, {
+               .compatible = "qcom,sdm845-qmp-usb3-phy",
+               .data = &qmp_v3_usb3phy_cfg,
+       }, {
+               .compatible = "qcom,sdm845-qmp-usb3-uni-phy",
+               .data = &qmp_v3_usb3_uniphy_cfg,
+       }, {
+               .compatible = "qcom,sdx55-qmp-usb3-uni-phy",
+               .data = &sdx55_usb3_uniphy_cfg,
+       }, {
+               .compatible = "qcom,sdx65-qmp-usb3-uni-phy",
+               .data = &sdx65_usb3_uniphy_cfg,
+       }, {
+               .compatible = "qcom,sm8150-qmp-usb3-phy",
+               .data = &sm8150_usb3phy_cfg,
+       }, {
+               .compatible = "qcom,sm8150-qmp-usb3-uni-phy",
+               .data = &sm8150_usb3_uniphy_cfg,
+       }, {
+               .compatible = "qcom,sm8250-qmp-usb3-phy",
+               .data = &sm8250_usb3phy_cfg,
+       }, {
+               .compatible = "qcom,sm8250-qmp-usb3-uni-phy",
+               .data = &sm8250_usb3_uniphy_cfg,
+       }, {
+               .compatible = "qcom,sm8350-qmp-usb3-phy",
+               .data = &sm8350_usb3phy_cfg,
+       }, {
+               .compatible = "qcom,sm8350-qmp-usb3-uni-phy",
+               .data = &sm8350_usb3_uniphy_cfg,
+       }, {
+               .compatible = "qcom,sm8450-qmp-usb3-phy",
+               .data = &sm8350_usb3phy_cfg,
+       },
+       { },
+};
+MODULE_DEVICE_TABLE(of, qmp_usb_of_match_table);
+
 static struct platform_driver qmp_usb_driver = {
        .probe          = qmp_usb_probe,
        .driver = {