phy: samsung: use of_device_get_match_data()

reduce the boilerplate code to get the specific data

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

diff --git a/drivers/phy/samsung/phy-exynos-dp-video.c b/drivers/phy/samsung/phy-exynos-dp-video.c
index bb3279dbf88c52fe71cbf0cc68a1eebf7905ae31..2dd6dd1f37a82b652ce00414bf55c482b4052bac 100644 (file)
--- a/drivers/phy/samsung/phy-exynos-dp-video.c
+++ b/drivers/phy/samsung/phy-exynos-dp-video.c
@@ -16,6 +16,7 @@
 #include <linux/mfd/syscon.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
+#include <linux/of_device.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
@@ -78,7 +79,6 @@ static int exynos_dp_video_phy_probe(struct platform_device *pdev)
 {
        struct exynos_dp_video_phy *state;
        struct device *dev = &pdev->dev;
-       const struct of_device_id *match;
        struct phy_provider *phy_provider;
        struct phy *phy;
 
@@ -93,8 +93,7 @@ static int exynos_dp_video_phy_probe(struct platform_device *pdev)
                return PTR_ERR(state->regs);
        }
 
-       match = of_match_node(exynos_dp_video_phy_of_match, dev->of_node);
-       state->drvdata = match->data;
+       state->drvdata = of_device_get_match_data(dev);
 
        phy = devm_phy_create(dev, NULL, &exynos_dp_video_phy_ops);
        if (IS_ERR(phy)) {

diff --git a/drivers/phy/samsung/phy-exynos5-usbdrd.c b/drivers/phy/samsung/phy-exynos5-usbdrd.c
index 7c41daa2c625c9cab8fc3f53ef985c038b30983a..22c68f58b181611dd0f44b6033a804887969b0f7 100644 (file)
--- a/drivers/phy/samsung/phy-exynos5-usbdrd.c
+++ b/drivers/phy/samsung/phy-exynos5-usbdrd.c
@@ -18,6 +18,7 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
+#include <linux/of_device.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
@@ -662,7 +663,6 @@ static int exynos5_usbdrd_phy_probe(struct platform_device *pdev)
        struct exynos5_usbdrd_phy *phy_drd;
        struct phy_provider *phy_provider;
        struct resource *res;
-       const struct of_device_id *match;
        const struct exynos5_usbdrd_phy_drvdata *drv_data;
        struct regmap *reg_pmu;
        u32 pmu_offset;
@@ -681,9 +681,10 @@ static int exynos5_usbdrd_phy_probe(struct platform_device *pdev)
        if (IS_ERR(phy_drd->reg_phy))
                return PTR_ERR(phy_drd->reg_phy);
 
-       match = of_match_node(exynos5_usbdrd_phy_of_match, pdev->dev.of_node);
+       drv_data = of_device_get_match_data(dev);
+       if (!drv_data)
+               return -EINVAL;
 
-       drv_data = match->data;
        phy_drd->drv_data = drv_data;
 
        ret = exynos5_usbdrd_phy_clk_handle(phy_drd);

diff --git a/drivers/phy/samsung/phy-samsung-usb2.c b/drivers/phy/samsung/phy-samsung-usb2.c
index 1d22d93b552d759df577a26228f0e7c7464c83c9..ea818866985a5f3e485e457151fea3d16bb69dda 100644 (file)
--- a/drivers/phy/samsung/phy-samsung-usb2.c
+++ b/drivers/phy/samsung/phy-samsung-usb2.c
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
+#include <linux/of_device.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
@@ -142,7 +143,6 @@ MODULE_DEVICE_TABLE(of, samsung_usb2_phy_of_match);
 
 static int samsung_usb2_phy_probe(struct platform_device *pdev)
 {
-       const struct of_device_id *match;
        const struct samsung_usb2_phy_config *cfg;
        struct device *dev = &pdev->dev;
        struct phy_provider *phy_provider;
@@ -155,12 +155,9 @@ static int samsung_usb2_phy_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       match = of_match_node(samsung_usb2_phy_of_match, pdev->dev.of_node);
-       if (!match) {
-               dev_err(dev, "of_match_node() failed\n");
+       cfg = of_device_get_match_data(dev);
+       if (!cfg)
                return -EINVAL;
-       }
-       cfg = match->data;
 
        drv = devm_kzalloc(dev, sizeof(struct samsung_usb2_phy_driver) +
                cfg->num_phys * sizeof(struct samsung_usb2_phy_instance),