Home » Mailing list archives » linux-netdev » 2009 » March » 19

[PATCH 8/9] net/pasemi_mac: Rework pasemi_mac driver to use of_mdio infrastructure

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Grant Likely
Subject: [PATCH 8/9] net/pasemi_mac: Rework pasemi_mac driver to use of_mdio infrastructure
Date: Wednesday, March 18, 2009 - 10:00 pm

From: Grant Likely <grant.likely@secretlab.ca>

This patch simplifies the driver by making use of more common code.
    
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---

 drivers/net/pasemi_mac.c |   19 +++----------------
 drivers/net/pasemi_mac.h |    1 -
 2 files changed, 3 insertions(+), 17 deletions(-)


diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index d0349e7..8c92d1f 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -1086,34 +1086,21 @@ static int pasemi_mac_phy_init(struct net_device *dev)
 	struct pasemi_mac *mac = netdev_priv(dev);
 	struct device_node *dn, *phy_dn;
 	struct phy_device *phydev;
-	unsigned int phy_id;
 	const phandle *ph;
 	const unsigned int *prop;
 	struct resource r;
 	int ret;
 
 	dn = pci_device_to_OF_node(mac->pdev);
-	ph = of_get_property(dn, "phy-handle", NULL);
-	if (!ph)
-		return -ENODEV;
-	phy_dn = of_find_node_by_phandle(*ph);
-
-	prop = of_get_property(phy_dn, "reg", NULL);
-	ret = of_address_to_resource(phy_dn->parent, 0, &r);
-	if (ret)
-		goto err;
-
-	phy_id = *prop;
-	snprintf(mac->phy_id, sizeof(mac->phy_id), "%x:%02x",
-		 (int)r.start, phy_id);
-
+	phy_dn = of_parse_phandle(dn, "phy-handle", 0);
 	of_node_put(phy_dn);
 
 	mac->link = 0;
 	mac->speed = 0;
 	mac->duplex = -1;
 
-	phydev = phy_connect(dev, mac->phy_id, &pasemi_adjust_link, 0, PHY_INTERFACE_MODE_SGMII);
+	phydev = of_phy_connect(dev, phy_dn, &pasemi_adjust_link, 0,
+				PHY_INTERFACE_MODE_SGMII);
 
 	if (IS_ERR(phydev)) {
 		printk(KERN_ERR "%s: Could not attach to phy\n", dev->name);
diff --git a/drivers/net/pasemi_mac.h b/drivers/net/pasemi_mac.h
index 1a115ec..e2f4efa 100644
--- a/drivers/net/pasemi_mac.h
+++ b/drivers/net/pasemi_mac.h
@@ -100,7 +100,6 @@ struct pasemi_mac {
 	int	duplex;
 
 	unsigned int	msg_enable;
-	char	phy_id[BUS_ID_SIZE];
 };
 
 /* Software status descriptor (ring_info) */

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 1/9] of: add of_parse_phandle() helper for parsing ..., Grant Likely, (Wed Mar 18, 10:00 pm)
[PATCH 2/9] phylib: rework to prepare for OF registration ..., Grant Likely, (Wed Mar 18, 10:00 pm)
[PATCH 3/9] phylib: add *_direct() variants of phy_connect ..., Grant Likely, (Wed Mar 18, 10:00 pm)
[PATCH 4/9] openfirmware: Add OF phylib support code, Grant Likely, (Wed Mar 18, 10:00 pm)
[PATCH 5/9] net: make mpc5200 fec driver use of_mdio infra ..., Grant Likely, (Wed Mar 18, 10:00 pm)
[PATCH 6/9] net/gianfar: Rework gianfar driver to use OF P ..., Grant Likely, (Wed Mar 18, 10:00 pm)
[PATCH 7/9] net/ucc_geth: Rework ucc_geth driver to use OF ..., Grant Likely, (Wed Mar 18, 10:00 pm)
[PATCH 8/9] net/pasemi_mac: Rework pasemi_mac driver to us ..., Grant Likely, (Wed Mar 18, 10:00 pm)
[PATCH 9/9] net/fs_enet: Rework fs_enet driver to use of_m ..., Grant Likely, (Wed Mar 18, 10:01 pm)
Re: [PATCH 1/9] of: add of_parse_phandle() helper for pars ..., Grant Likely, (Wed Mar 18, 10:05 pm)
Re: [PATCH 2/9] phylib: rework to prepare for OF registrat ..., Grant Likely, (Wed Mar 18, 10:05 pm)
Re: [PATCH 3/9] phylib: add *_direct() variants of phy_con ..., Grant Likely, (Wed Mar 18, 10:05 pm)
Re: [PATCH 4/9] openfirmware: Add OF phylib support code, Grant Likely, (Wed Mar 18, 10:06 pm)
Re: [PATCH 5/9] net: make mpc5200 fec driver use of_mdio ..., Grant Likely, (Wed Mar 18, 10:06 pm)
Re: [PATCH 6/9] net/gianfar: Rework gianfar driver to use ..., Grant Likely, (Wed Mar 18, 10:07 pm)
Re: [PATCH 7/9] net/ucc_geth: Rework ucc_geth driver to us ..., Grant Likely, (Wed Mar 18, 10:07 pm)
Re: [PATCH 8/9] net/pasemi_mac: Rework pasemi_mac driver t ..., Grant Likely, (Wed Mar 18, 10:07 pm)
Re: [PATCH 9/9] net/fs_enet: Rework fs_enet driver to use ..., Grant Likely, (Wed Mar 18, 10:07 pm)
Re: [PATCH 1/9] of: add of_parse_phandle() helper for pars ..., Michael Ellerman, (Wed Mar 18, 10:07 pm)
Re: [PATCH 9/9] net/fs_enet: Rework fs_enet driver to use ..., David Miller, (Wed Mar 18, 10:42 pm)
Re: [PATCH 9/9] net/fs_enet: Rework fs_enet driver to use ..., Grant Likely, (Wed Mar 18, 11:11 pm)