of_mdio: Remove flags argument from of_phy_connect
Subsystems (12)
PATCH 1/1 of_mdio: Remove flags argument from of_phy_connect
of_phy_connect() only required a flags argument in order to pass it down to to phy_connect(). Since that argument was removed, it is of no use in this function either (confirmed by checking all callers in kernel tree as well).
--- drivers/net/ethernet/freescale/fec_mpc52xx.c | 2 +- drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- drivers/net/ethernet/freescale/gianfar.c | 2 +- drivers/net/ethernet/freescale/ucc_geth.c | 2 +- drivers/net/ethernet/marvell/mvneta.c | 2 +- drivers/net/ethernet/octeon/octeon_mgmt.c | 2 +- drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +- drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- drivers/of/of_mdio.c | 2 +- drivers/staging/octeon/ethernet-mdio.c | 2 +- include/linux/of_mdio.h | 4 ++-- 13 files changed, 14 insertions(+), 14 deletions(-)
drivers/net/ethernet/freescale/fec_mpc52xx.c +1 -1
@@ -217,7 +217,7 @@ static int mpc52xx_fec_open(struct net_device *dev)if (priv->phy_node) { priv->phydev =of_phy_connect (priv->ndev, priv->phy_node, - mpc52xx_fec_adjust_link,0 ,0 ); + mpc52xx_fec_adjust_link,0 );if (!priv->phydev) {dev_err (&dev->dev,"of_phy_connect failed\n" );return -ENODEV ;
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +1 -1
@@ -799,7 +799,7 @@ static int fs_init_phy(struct net_device *dev) iface = fep->fpi->use_rmii ?PHY_INTERFACE_MODE_RMII :PHY_INTERFACE_MODE_MII ; - phydev =of_phy_connect (dev, fep->fpi->phy_node, &fs_adjust_link,0 , + phydev =of_phy_connect (dev, fep->fpi->phy_node, &fs_adjust_link, iface);if (!phydev) { phydev = of_phy_connect_fixed_link(dev, &fs_adjust_link,
drivers/net/ethernet/freescale/gianfar.c +1 -1
@@ -1467,7 +1467,7 @@ static int init_phy(struct net_device *dev) interface =gfar_get_interface (dev); - priv->phydev =of_phy_connect (dev, priv->phy_node, &adjust_link,0 , + priv->phydev =of_phy_connect (dev, priv->phy_node, &adjust_link, interface);if (!priv->phydev) priv->phydev = of_phy_connect_fixed_link(dev, &adjust_link,
drivers/net/ethernet/freescale/ucc_geth.c +1 -1
@@ -1745,7 +1745,7 @@ static int init_phy(struct net_device *dev) priv->oldspeed =0 ; priv->oldduplex =-1 ; - phydev =of_phy_connect (dev, ug_info->phy_node, &adjust_link,0 , + phydev =of_phy_connect (dev, ug_info->phy_node, &adjust_link, priv->phy_interface);if (!phydev) phydev = of_phy_connect_fixed_link(dev, &adjust_link,
drivers/net/ethernet/marvell/mvneta.c +1 -1
@@ -2344,7 +2344,7 @@ static int mvneta_mdio_probe(struct mvneta_port *pp) {struct phy_device *phy_dev; - phy_dev =of_phy_connect (pp->dev, pp->phy_node, mvneta_adjust_link,0 , + phy_dev =of_phy_connect (pp->dev, pp->phy_node, mvneta_adjust_link, pp->phy_interface);if (!phy_dev) {netdev_err (pp->dev,"could not find the PHY\n" );
drivers/net/ethernet/octeon/octeon_mgmt.c +1 -1
@@ -970,7 +970,7 @@ static int octeon_mgmt_init_phy(struct net_device *netdev) } p->phydev =of_phy_connect (netdev, p->phy_np, - octeon_mgmt_adjust_link,0 , + octeon_mgmt_adjust_link,PHY_INTERFACE_MODE_MII );if (!p->phydev)
drivers/net/ethernet/pasemi/pasemi_mac.c +1 -1
@@ -1100,7 +1100,7 @@ static int pasemi_mac_phy_init(struct net_device *dev) mac->speed =0 ; mac->duplex =-1 ; - phydev =of_phy_connect (dev, phy_dn, &pasemi_adjust_link,0 , + phydev =of_phy_connect (dev, phy_dn, &pasemi_adjust_link,PHY_INTERFACE_MODE_SGMII );if (!phydev) {
drivers/net/ethernet/xilinx/ll_temac_main.c +1 -1
@@ -857,7 +857,7 @@ static int temac_open(struct net_device *ndev)if (lp->phy_node) { lp->phy_dev =of_phy_connect (lp->ndev, lp->phy_node, - temac_adjust_link,0 ,0 ); + temac_adjust_link,0 );if (!lp->phy_dev) {dev_err (lp->dev,"of_phy_connect() failed\n" );return -ENODEV ;
drivers/net/ethernet/xilinx/xilinx_axienet_main.c +1 -1
@@ -935,7 +935,7 @@ static int axienet_open(struct net_device *ndev)if (lp->phy_node) { lp->phy_dev =of_phy_connect (lp->ndev, lp->phy_node, - axienet_adjust_link,0 , + axienet_adjust_link,PHY_INTERFACE_MODE_GMII );if (!lp->phy_dev) {dev_err (lp->dev,"of_phy_connect() failed\n" );
drivers/net/ethernet/xilinx/xilinx_emaclite.c +1 -1
@@ -931,7 +931,7 @@ static int xemaclite_open(struct net_device *dev)u32 bmcr; lp->phy_dev =of_phy_connect (lp->ndev, lp->phy_node, - xemaclite_adjust_link,0 , + xemaclite_adjust_link,PHY_INTERFACE_MODE_MII );if (!lp->phy_dev) {dev_err (&lp->ndev->dev,"of_phy_connect() failed\n" );
drivers/of/of_mdio.c +1 -1
@@ -149,7 +149,7 @@ EXPORT_SYMBOL(of_phy_find_device);*/ struct phy_device *of_phy_connect (struct net_device *dev,struct device_node *phy_np, -void (*hndlr)(struct net_device *),u32 flags, +void (*hndlr)(struct net_device *),phy_interface_t iface) {struct phy_device *phy =of_phy_find_device (phy_np);
drivers/staging/octeon/ethernet-mdio.c +1 -1
@@ -171,7 +171,7 @@ int cvm_oct_phy_setup_device(struct net_device *dev)if (!phy_node)return 0 ; - priv->phydev =of_phy_connect (dev, phy_node, cvm_oct_adjust_link,0 , + priv->phydev =of_phy_connect (dev, phy_node, cvm_oct_adjust_link,PHY_INTERFACE_MODE_GMII );if (priv->phydev ==NULL )
include/linux/of_mdio.h +2 -2
@@ -18,7 +18,7 @@ extern struct phy_device *of_phy_find_device(struct device_node *phy_np);extern struct phy_device *of_phy_connect (struct net_device *dev,struct device_node *phy_np,void (*hndlr)(struct net_device *), -u32 flags,phy_interface_t iface); +phy_interface_t iface);extern struct phy_device *of_phy_connect_fixed_link (struct net_device *dev,void (*hndlr)(struct net_device *),phy_interface_t iface);
@@ -39,7 +39,7 @@ static inline struct phy_device *of_phy_find_device(struct device_node *phy_np)static inline struct phy_device *of_phy_connect (struct net_device *dev,struct device_node *phy_np,void (*hndlr)(struct net_device *), -u32 flags,phy_interface_t iface) +phy_interface_t iface) {return NULL ; }
Signature · 1 line
1.8.1.2
Quoted 3 lines · Ben Collins
of_phy_connect()only required a flags argument in order to pass it down to tophy_connect(). Since that argument was removed, it is of no use in this function either (confirmed by checking all callers in kernel tree as well).
Looks good to me:
(you should have CC'd [email protected] as it is probably going to get merged via the net tree)
Quoted 200 lines
Signed-off-by Ben Collins <[email protected]>Cc Grant Likely <[email protected]>Cc Rob Herring <[email protected]>--- drivers/net/ethernet/freescale/fec_mpc52xx.c | 2 +- drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- drivers/net/ethernet/freescale/gianfar.c | 2 +- drivers/net/ethernet/freescale/ucc_geth.c | 2 +- drivers/net/ethernet/marvell/mvneta.c | 2 +- drivers/net/ethernet/octeon/octeon_mgmt.c | 2 +- drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +- drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- drivers/of/of_mdio.c | 2 +- drivers/staging/octeon/ethernet-mdio.c | 2 +- include/linux/of_mdio.h | 4 ++-- 13 files changed, 14 insertions(+), 14 deletions(-)drivers/net/ethernet/freescale/fec_mpc52xx.c +1
-1@@ -217,7 +217,7 @@ static int mpc52xx_fec_open(struct net_device *dev)if (priv->phy_node) { priv->phydev =of_phy_connect (priv->ndev, priv->phy_node, - mpc52xx_fec_adjust_link,0 ,0 ); + mpc52xx_fec_adjust_link,0 );if (!priv->phydev) {dev_err (&dev->dev,"of_phy_connect failed\n" );return -ENODEV ;drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +1
-1@@ -799,7 +799,7 @@ static int fs_init_phy(struct net_device *dev) iface = fep->fpi->use_rmii ?PHY_INTERFACE_MODE_RMII :PHY_INTERFACE_MODE_MII ; - phydev =of_phy_connect (dev, fep->fpi->phy_node, &fs_adjust_link,0 , + phydev =of_phy_connect (dev, fep->fpi->phy_node, &fs_adjust_link, iface);if (!phydev) { phydev = of_phy_connect_fixed_link(dev, &fs_adjust_link,drivers/net/ethernet/freescale/gianfar.c +1
-1@@ -1467,7 +1467,7 @@ static int init_phy(struct net_device *dev) interface =gfar_get_interface (dev); - priv->phydev =of_phy_connect (dev, priv->phy_node, &adjust_link,0 , + priv->phydev =of_phy_connect (dev, priv->phy_node, &adjust_link, interface);if (!priv->phydev) priv->phydev = of_phy_connect_fixed_link(dev, &adjust_link,drivers/net/ethernet/freescale/ucc_geth.c +1
-1@@ -1745,7 +1745,7 @@ static int init_phy(struct net_device *dev) priv->oldspeed =0 ; priv->oldduplex =-1 ; - phydev =of_phy_connect (dev, ug_info->phy_node, &adjust_link,0 , + phydev =of_phy_connect (dev, ug_info->phy_node, &adjust_link, priv->phy_interface);if (!phydev) phydev = of_phy_connect_fixed_link(dev, &adjust_link,drivers/net/ethernet/marvell/mvneta.c +1
-1@@ -2344,7 +2344,7 @@ static int mvneta_mdio_probe(struct mvneta_port *pp) {struct phy_device *phy_dev; - phy_dev =of_phy_connect (pp->dev, pp->phy_node, mvneta_adjust_link,0 , + phy_dev =of_phy_connect (pp->dev, pp->phy_node, mvneta_adjust_link, pp->phy_interface);if (!phy_dev) {netdev_err (pp->dev,"could not find the PHY\n" );drivers/net/ethernet/octeon/octeon_mgmt.c +1
-1@@ -970,7 +970,7 @@ static int octeon_mgmt_init_phy(struct net_device *netdev) } p->phydev =of_phy_connect (netdev, p->phy_np, - octeon_mgmt_adjust_link,0 , + octeon_mgmt_adjust_link,PHY_INTERFACE_MODE_MII );if (!p->phydev)drivers/net/ethernet/pasemi/pasemi_mac.c +1
-1@@ -1100,7 +1100,7 @@ static int pasemi_mac_phy_init(struct net_device *dev) mac->speed =0 ; mac->duplex =-1 ; - phydev =of_phy_connect (dev, phy_dn, &pasemi_adjust_link,0 , + phydev =of_phy_connect (dev, phy_dn, &pasemi_adjust_link,PHY_INTERFACE_MODE_SGMII );if (!phydev) {drivers/net/ethernet/xilinx/ll_temac_main.c +1
-1@@ -857,7 +857,7 @@ static int temac_open(struct net_device *ndev)if (lp->phy_node) { lp->phy_dev =of_phy_connect (lp->ndev, lp->phy_node, - temac_adjust_link,0 ,0 ); + temac_adjust_link,0 );if (!lp->phy_dev) {dev_err (lp->dev,"of_phy_connect() failed\n" );return -ENODEV ;drivers/net/ethernet/xilinx/xilinx_axienet_main.c +1
-1@@ -935,7 +935,7 @@ static int axienet_open(struct net_device *ndev)if (lp->phy_node) { lp->phy_dev =of_phy_connect (lp->ndev, lp->phy_node, - axienet_adjust_link,0 , + axienet_adjust_link,PHY_INTERFACE_MODE_GMII );if (!lp->phy_dev) {dev_err (lp->dev,"of_phy_connect() failed\n" );drivers/net/ethernet/xilinx/xilinx_emaclite.c +1
-1@@ -931,7 +931,7 @@ static int xemaclite_open(struct net_device *dev)u32 bmcr; lp->phy_dev =of_phy_connect (lp->ndev, lp->phy_node, - xemaclite_adjust_link,0 , + xemaclite_adjust_link,PHY_INTERFACE_MODE_MII );if (!lp->phy_dev) {dev_err (&lp->ndev->dev,"of_phy_connect() failed\n" );drivers/of/of_mdio.c +1
-1@@ -149,7 +149,7 @@ EXPORT_SYMBOL(of_phy_find_device);*/ struct phy_device *of_phy_connect (struct net_device *dev,struct device_node *phy_np, -void (*hndlr)(struct net_device *),u32 flags, +void (*hndlr)(struct net_device *),phy_interface_t iface) {struct phy_device *phy =of_phy_find_device (phy_np);drivers/staging/octeon/ethernet-mdio.c +1
-1@@ -171,7 +171,7 @@ int cvm_oct_phy_setup_device(struct net_device *dev)if (!phy_node)return 0 ; - priv->phydev =of_phy_connect (dev, phy_node, cvm_oct_adjust_link,0 , + priv->phydev =of_phy_connect (dev, phy_node, cvm_oct_adjust_link,PHY_INTERFACE_MODE_GMII );if (priv->phydev ==NULL )include/linux/of_mdio.h +2
-2@@ -18,7 +18,7 @@ extern struct phy_device *of_phy_find_device(struct device_node *phy_np);extern struct phy_device *of_phy_connect (struct net_device *dev,struct device_node *phy_np,void (*hndlr)(struct net_device *), -u32 flags,phy_interface_t iface); +phy_interface_t iface);extern struct phy_device *of_phy_connect_fixed_link (struct net_device *dev,void (*hndlr)(struct net_device *),phy_interface_t iface);@@ -39,7 +39,7 @@ static inline struct phy_device *of_phy_find_device(struct device_node *phy_np)static inline struct phy_device *of_phy_connect (struct net_device *dev,struct device_node *phy_np,void (*hndlr)(struct net_device *), -u32 flags,phy_interface_t iface) +phy_interface_t iface) {return NULL ; }
Quoted 8 lines · Ben Collins
of_phy_connect()only required a flags argument in order to pass it down to tophy_connect(). Since that argument was removed, it is of no use in this function either (confirmed by checking all callers in kernel tree as well).Signed-off-by Ben Collins <[email protected]>Cc Grant Likely <[email protected]>Cc Rob Herring <[email protected]>
This would be best merged through David Millers networking tree.
g.
Quoted 196 lines
drivers/net/ethernet/freescale/fec_mpc52xx.c | 2 +- drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- drivers/net/ethernet/freescale/gianfar.c | 2 +- drivers/net/ethernet/freescale/ucc_geth.c | 2 +- drivers/net/ethernet/marvell/mvneta.c | 2 +- drivers/net/ethernet/octeon/octeon_mgmt.c | 2 +- drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +- drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- drivers/of/of_mdio.c | 2 +- drivers/staging/octeon/ethernet-mdio.c | 2 +- include/linux/of_mdio.h | 4 ++-- 13 files changed, 14 insertions(+), 14 deletions(-)drivers/net/ethernet/freescale/fec_mpc52xx.c +1
-1@@ -217,7 +217,7 @@ static int mpc52xx_fec_open(struct net_device *dev)if (priv->phy_node) { priv->phydev =of_phy_connect (priv->ndev, priv->phy_node, - mpc52xx_fec_adjust_link,0 ,0 ); + mpc52xx_fec_adjust_link,0 );if (!priv->phydev) {dev_err (&dev->dev,"of_phy_connect failed\n" );return -ENODEV ;drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +1
-1@@ -799,7 +799,7 @@ static int fs_init_phy(struct net_device *dev) iface = fep->fpi->use_rmii ?PHY_INTERFACE_MODE_RMII :PHY_INTERFACE_MODE_MII ; - phydev =of_phy_connect (dev, fep->fpi->phy_node, &fs_adjust_link,0 , + phydev =of_phy_connect (dev, fep->fpi->phy_node, &fs_adjust_link, iface);if (!phydev) { phydev = of_phy_connect_fixed_link(dev, &fs_adjust_link,drivers/net/ethernet/freescale/gianfar.c +1
-1@@ -1467,7 +1467,7 @@ static int init_phy(struct net_device *dev) interface =gfar_get_interface (dev); - priv->phydev =of_phy_connect (dev, priv->phy_node, &adjust_link,0 , + priv->phydev =of_phy_connect (dev, priv->phy_node, &adjust_link, interface);if (!priv->phydev) priv->phydev = of_phy_connect_fixed_link(dev, &adjust_link,drivers/net/ethernet/freescale/ucc_geth.c +1
-1@@ -1745,7 +1745,7 @@ static int init_phy(struct net_device *dev) priv->oldspeed =0 ; priv->oldduplex =-1 ; - phydev =of_phy_connect (dev, ug_info->phy_node, &adjust_link,0 , + phydev =of_phy_connect (dev, ug_info->phy_node, &adjust_link, priv->phy_interface);if (!phydev) phydev = of_phy_connect_fixed_link(dev, &adjust_link,drivers/net/ethernet/marvell/mvneta.c +1
-1@@ -2344,7 +2344,7 @@ static int mvneta_mdio_probe(struct mvneta_port *pp) {struct phy_device *phy_dev; - phy_dev =of_phy_connect (pp->dev, pp->phy_node, mvneta_adjust_link,0 , + phy_dev =of_phy_connect (pp->dev, pp->phy_node, mvneta_adjust_link, pp->phy_interface);if (!phy_dev) {netdev_err (pp->dev,"could not find the PHY\n" );drivers/net/ethernet/octeon/octeon_mgmt.c +1
-1@@ -970,7 +970,7 @@ static int octeon_mgmt_init_phy(struct net_device *netdev) } p->phydev =of_phy_connect (netdev, p->phy_np, - octeon_mgmt_adjust_link,0 , + octeon_mgmt_adjust_link,PHY_INTERFACE_MODE_MII );if (!p->phydev)drivers/net/ethernet/pasemi/pasemi_mac.c +1
-1@@ -1100,7 +1100,7 @@ static int pasemi_mac_phy_init(struct net_device *dev) mac->speed =0 ; mac->duplex =-1 ; - phydev =of_phy_connect (dev, phy_dn, &pasemi_adjust_link,0 , + phydev =of_phy_connect (dev, phy_dn, &pasemi_adjust_link,PHY_INTERFACE_MODE_SGMII );if (!phydev) {drivers/net/ethernet/xilinx/ll_temac_main.c +1
-1@@ -857,7 +857,7 @@ static int temac_open(struct net_device *ndev)if (lp->phy_node) { lp->phy_dev =of_phy_connect (lp->ndev, lp->phy_node, - temac_adjust_link,0 ,0 ); + temac_adjust_link,0 );if (!lp->phy_dev) {dev_err (lp->dev,"of_phy_connect() failed\n" );return -ENODEV ;drivers/net/ethernet/xilinx/xilinx_axienet_main.c +1
-1@@ -935,7 +935,7 @@ static int axienet_open(struct net_device *ndev)if (lp->phy_node) { lp->phy_dev =of_phy_connect (lp->ndev, lp->phy_node, - axienet_adjust_link,0 , + axienet_adjust_link,PHY_INTERFACE_MODE_GMII );if (!lp->phy_dev) {dev_err (lp->dev,"of_phy_connect() failed\n" );drivers/net/ethernet/xilinx/xilinx_emaclite.c +1
-1@@ -931,7 +931,7 @@ static int xemaclite_open(struct net_device *dev)u32 bmcr; lp->phy_dev =of_phy_connect (lp->ndev, lp->phy_node, - xemaclite_adjust_link,0 , + xemaclite_adjust_link,PHY_INTERFACE_MODE_MII );if (!lp->phy_dev) {dev_err (&lp->ndev->dev,"of_phy_connect() failed\n" );drivers/of/of_mdio.c +1
-1@@ -149,7 +149,7 @@ EXPORT_SYMBOL(of_phy_find_device);*/ struct phy_device *of_phy_connect (struct net_device *dev,struct device_node *phy_np, -void (*hndlr)(struct net_device *),u32 flags, +void (*hndlr)(struct net_device *),phy_interface_t iface) {struct phy_device *phy =of_phy_find_device (phy_np);drivers/staging/octeon/ethernet-mdio.c +1
-1@@ -171,7 +171,7 @@ int cvm_oct_phy_setup_device(struct net_device *dev)if (!phy_node)return 0 ; - priv->phydev =of_phy_connect (dev, phy_node, cvm_oct_adjust_link,0 , + priv->phydev =of_phy_connect (dev, phy_node, cvm_oct_adjust_link,PHY_INTERFACE_MODE_GMII );if (priv->phydev ==NULL )include/linux/of_mdio.h +2
-2@@ -18,7 +18,7 @@ extern struct phy_device *of_phy_find_device(struct device_node *phy_np);extern struct phy_device *of_phy_connect (struct net_device *dev,struct device_node *phy_np,void (*hndlr)(struct net_device *), -u32 flags,phy_interface_t iface); +phy_interface_t iface);extern struct phy_device *of_phy_connect_fixed_link (struct net_device *dev,void (*hndlr)(struct net_device *),phy_interface_t iface);@@ -39,7 +39,7 @@ static inline struct phy_device *of_phy_find_device(struct device_node *phy_np)static inline struct phy_device *of_phy_connect (struct net_device *dev,struct device_node *phy_np,void (*hndlr)(struct net_device *), -u32 flags,phy_interface_t iface) +phy_interface_t iface) {return NULL ; }Signature · 1 line
1.8.1.2
Signature · 2 lines
Grant Likely, B.Sc, P.Eng. Secret Lab Technologies, Ltd.