| Message ID | 1358757475-21035-2-git-send-email-s.hauer@pengutronix.de |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Hi Sascha, On Mon, Jan 21, 2013 at 09:37:54AM +0100, Sascha Hauer wrote: > For devicetree parsing only the fec_get_phy_mode_dt() is > available. Rename it to fec_probe_dt() to be able to add more devicetree > parsing to it. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > --- [...] > -static int fec_get_phy_mode_dt(struct platform_device *pdev) > +static int fec_probe_dt(struct fec_enet_private *fep) > { > - struct device_node *np = pdev->dev.of_node; > + struct device_node *np = fep->pdev->dev.of_node; > > - if (np) > - return of_get_phy_mode(np); > + if (!np) > + return -ENODEV; > + > + fep->phy_interface = of_get_phy_mode(np); > > return -ENODEV; Maybe return fep->phy_interface? baruch
On Mon, Jan 21, 2013 at 07:48:26PM +0200, Baruch Siach wrote: > Hi Sascha, > > On Mon, Jan 21, 2013 at 09:37:54AM +0100, Sascha Hauer wrote: > > For devicetree parsing only the fec_get_phy_mode_dt() is > > available. Rename it to fec_probe_dt() to be able to add more devicetree > > parsing to it. > > > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > > --- > > [...] > > > -static int fec_get_phy_mode_dt(struct platform_device *pdev) > > +static int fec_probe_dt(struct fec_enet_private *fep) > > { > > - struct device_node *np = pdev->dev.of_node; > > + struct device_node *np = fep->pdev->dev.of_node; > > > > - if (np) > > - return of_get_phy_mode(np); > > + if (!np) > > + return -ENODEV; > > + > > + fep->phy_interface = of_get_phy_mode(np); > > > > return -ENODEV; > > Maybe return fep->phy_interface? No, but indeed this should return successfully. I will rework this after it's clear how we want to proceed with this. Sascha
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c index 0704bca..2f86557 100644 --- a/drivers/net/ethernet/freescale/fec.c +++ b/drivers/net/ethernet/freescale/fec.c @@ -1484,12 +1484,14 @@ static int fec_enet_init(struct net_device *ndev) } #ifdef CONFIG_OF -static int fec_get_phy_mode_dt(struct platform_device *pdev) +static int fec_probe_dt(struct fec_enet_private *fep) { - struct device_node *np = pdev->dev.of_node; + struct device_node *np = fep->pdev->dev.of_node; - if (np) - return of_get_phy_mode(np); + if (!np) + return -ENODEV; + + fep->phy_interface = of_get_phy_mode(np); return -ENODEV; } @@ -1519,7 +1521,7 @@ static void fec_reset_phy(struct platform_device *pdev) gpio_set_value(phy_reset, 1); } #else /* CONFIG_OF */ -static inline int fec_get_phy_mode_dt(struct platform_device *pdev) +static inline int fec_probe_dt(struct fec_enet_private *fep) { return -ENODEV; } @@ -1581,15 +1583,13 @@ fec_probe(struct platform_device *pdev) platform_set_drvdata(pdev, ndev); - ret = fec_get_phy_mode_dt(pdev); + ret = fec_probe_dt(fep); if (ret < 0) { pdata = pdev->dev.platform_data; if (pdata) fep->phy_interface = pdata->phy; else fep->phy_interface = PHY_INTERFACE_MODE_MII; - } else { - fep->phy_interface = ret; } for (i = 0; i < FEC_IRQ_NUM; i++) {
For devicetree parsing only the fec_get_phy_mode_dt() is available. Rename it to fec_probe_dt() to be able to add more devicetree parsing to it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- drivers/net/ethernet/freescale/fec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)