target/linux/mediatek/patches-4.14/0179-phy-phy-mtk-tphy-use-of_device_get_match_data.patch

   1 From 3e53007a55e70d5036a527900befecf9a6316d05 Mon Sep 17 00:00:00 2001
   2 From: Chunfeng Yun <chunfeng.yun@mediatek.com>
   3 Date: Thu, 28 Dec 2017 16:40:36 +0530
   4 Subject: [PATCH 179/224] phy: phy-mtk-tphy: use of_device_get_match_data()
   5
   6 reduce the boilerplate code to get the specific data
   7
   8 Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
   9 Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
  10 ---
  11  drivers/phy/mediatek/phy-mtk-tphy.c | 11 +++++------
  12  1 file changed, 5 insertions(+), 6 deletions(-)
  13
  14 diff --git a/drivers/phy/mediatek/phy-mtk-tphy.c b/drivers/phy/mediatek/phy-mtk-tphy.c
  15 index 11cab1d84a02..1e96d0740ef5 100644
  16 --- a/drivers/phy/mediatek/phy-mtk-tphy.c
  17 +++ b/drivers/phy/mediatek/phy-mtk-tphy.c
  18 @@ -20,6 +20,7 @@
  19  #include <linux/iopoll.h>
  20  #include <linux/module.h>
  21  #include <linux/of_address.h>
  22 +#include <linux/of_device.h>
  23  #include <linux/phy/phy.h>
  24  #include <linux/platform_device.h>
  25
  26 @@ -995,7 +996,6 @@ MODULE_DEVICE_TABLE(of, mtk_tphy_id_table);
  27
  28  static int mtk_tphy_probe(struct platform_device *pdev)
  29  {
  30 -       const struct of_device_id *match;
  31         struct device *dev = &pdev->dev;
  32         struct device_node *np = dev->of_node;
  33         struct device_node *child_np;
  34 @@ -1005,15 +1005,14 @@ static int mtk_tphy_probe(struct platform_device *pdev)
  35         struct resource res;
  36         int port, retval;
  37
  38 -       match = of_match_node(mtk_tphy_id_table, pdev->dev.of_node);
  39 -       if (!match)
  40 -               return -EINVAL;
  41 -
  42         tphy = devm_kzalloc(dev, sizeof(*tphy), GFP_KERNEL);
  43         if (!tphy)
  44                 return -ENOMEM;
  45
  46 -       tphy->pdata = match->data;
  47 +       tphy->pdata = of_device_get_match_data(dev);
  48 +       if (!tphy->pdata)
  49 +               return -EINVAL;
  50 +
  51         tphy->nphys = of_get_child_count(np);
  52         tphy->phys = devm_kcalloc(dev, tphy->nphys,
  53                                        sizeof(*tphy->phys), GFP_KERNEL);
  54 --
  55 2.11.0
  56