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

Move the device-id table after 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/20221114110621.4639-3-johan+linaro@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
index d6a031b..e7c8c44 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
@@ -2646,31 +2646,6 @@ static int qmp_combo_create(struct device *dev, struct device_node *np, int id,
        return 0;
 }
 
-static const struct of_device_id qmp_combo_of_match_table[] = {
-       {
-               .compatible = "qcom,sc7180-qmp-usb3-dp-phy",
-               .data = &sc7180_usb3dpphy_cfg,
-       },
-       {
-               .compatible = "qcom,sc8180x-qmp-usb3-dp-phy",
-               .data = &sc8180x_usb3dpphy_cfg,
-       },
-       {
-               .compatible = "qcom,sc8280xp-qmp-usb43dp-phy",
-               .data = &sc8280xp_usb43dpphy_combo_cfg,
-       },
-       {
-               .compatible = "qcom,sdm845-qmp-usb3-dp-phy",
-               .data = &sdm845_usb3dpphy_cfg,
-       },
-       {
-               .compatible = "qcom,sm8250-qmp-usb3-dp-phy",
-               .data = &sm8250_usb3dpphy_cfg,
-       },
-       { }
-};
-MODULE_DEVICE_TABLE(of, qmp_combo_of_match_table);
-
 static const struct dev_pm_ops qmp_combo_pm_ops = {
        SET_RUNTIME_PM_OPS(qmp_combo_runtime_suspend,
                           qmp_combo_runtime_resume, NULL)
@@ -2815,6 +2790,31 @@ err_node_put:
        return ret;
 }
 
+static const struct of_device_id qmp_combo_of_match_table[] = {
+       {
+               .compatible = "qcom,sc7180-qmp-usb3-dp-phy",
+               .data = &sc7180_usb3dpphy_cfg,
+       },
+       {
+               .compatible = "qcom,sc8180x-qmp-usb3-dp-phy",
+               .data = &sc8180x_usb3dpphy_cfg,
+       },
+       {
+               .compatible = "qcom,sc8280xp-qmp-usb43dp-phy",
+               .data = &sc8280xp_usb43dpphy_combo_cfg,
+       },
+       {
+               .compatible = "qcom,sdm845-qmp-usb3-dp-phy",
+               .data = &sdm845_usb3dpphy_cfg,
+       },
+       {
+               .compatible = "qcom,sm8250-qmp-usb3-dp-phy",
+               .data = &sm8250_usb3dpphy_cfg,
+       },
+       { }
+};
+MODULE_DEVICE_TABLE(of, qmp_combo_of_match_table);
+
 static struct platform_driver qmp_combo_driver = {
        .probe          = qmp_combo_probe,
        .driver = {