You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
From 3e53007a55e70d5036a527900befecf9a6316d05 Mon Sep 17 00:00:00 2001
|
|
From: Chunfeng Yun <chunfeng.yun@mediatek.com>
|
|
Date: Thu, 28 Dec 2017 16:40:36 +0530
|
|
Subject: [PATCH 179/224] phy: phy-mtk-tphy: 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>
|
|
---
|
|
drivers/phy/mediatek/phy-mtk-tphy.c | 11 +++++------
|
|
1 file changed, 5 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/phy/mediatek/phy-mtk-tphy.c
|
|
+++ b/drivers/phy/mediatek/phy-mtk-tphy.c
|
|
@@ -20,6 +20,7 @@
|
|
#include <linux/iopoll.h>
|
|
#include <linux/module.h>
|
|
#include <linux/of_address.h>
|
|
+#include <linux/of_device.h>
|
|
#include <linux/phy/phy.h>
|
|
#include <linux/platform_device.h>
|
|
|
|
@@ -995,7 +996,6 @@ MODULE_DEVICE_TABLE(of, mtk_tphy_id_tabl
|
|
|
|
static int mtk_tphy_probe(struct platform_device *pdev)
|
|
{
|
|
- const struct of_device_id *match;
|
|
struct device *dev = &pdev->dev;
|
|
struct device_node *np = dev->of_node;
|
|
struct device_node *child_np;
|
|
@@ -1005,15 +1005,14 @@ static int mtk_tphy_probe(struct platfor
|
|
struct resource res;
|
|
int port, retval;
|
|
|
|
- match = of_match_node(mtk_tphy_id_table, pdev->dev.of_node);
|
|
- if (!match)
|
|
- return -EINVAL;
|
|
-
|
|
tphy = devm_kzalloc(dev, sizeof(*tphy), GFP_KERNEL);
|
|
if (!tphy)
|
|
return -ENOMEM;
|
|
|
|
- tphy->pdata = match->data;
|
|
+ tphy->pdata = of_device_get_match_data(dev);
|
|
+ if (!tphy->pdata)
|
|
+ return -EINVAL;
|
|
+
|
|
tphy->nphys = of_get_child_count(np);
|
|
tphy->phys = devm_kcalloc(dev, tphy->nphys,
|
|
sizeof(*tphy->phys), GFP_KERNEL);
|