diff mbox series

[U-Boot,2/5] net: fec_mxc: simplify fec_get_miibus

Message ID 20180310011957.21801-2-peng.fan@nxp.com
State Superseded
Delegated to: Joe Hershberger
Headers show
Series [U-Boot,1/5] net: fec_mxc: Fix DM driver issue in recv | expand

Commit Message

Peng Fan March 10, 2018, 1:19 a.m. UTC 
No need to provide two prototype for this function.
Use ulong for the first parameter, then this function
could be shared for DM/non DM case.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 drivers/net/fec_mxc.c | 13 ++-----------
 include/netdev.h      |  6 +-----
 2 files changed, 3 insertions(+), 16 deletions(-)

Comments

Joe Hershberger March 19, 2018, 9:18 p.m. UTC | #1 
On Fri, Mar 9, 2018 at 7:19 PM, Peng Fan <peng.fan@nxp.com> wrote:
> No need to provide two prototype for this function.
> Use ulong for the first parameter, then this function
> could be shared for DM/non DM case.
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Lothar Waßmann March 20, 2018, 8:49 a.m. UTC | #2 
Hi,

On Sat, 10 Mar 2018 09:19:54 +0800 Peng Fan wrote:
> No need to provide two prototype for this function.
> Use ulong for the first parameter, then this function
> could be shared for DM/non DM case.
> 
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
>  drivers/net/fec_mxc.c | 13 ++-----------
>  include/netdev.h      |  6 +-----
>  2 files changed, 3 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
> index 7c396d8d95..2bd4ba4ef1 100644
> --- a/drivers/net/fec_mxc.c
> +++ b/drivers/net/fec_mxc.c
> @@ -1021,18 +1021,9 @@ static void fec_free_descs(struct fec_priv *fec)
>  	free(fec->tbd_base);
>  }
>  
> -#ifdef CONFIG_DM_ETH
> -struct mii_dev *fec_get_miibus(struct udevice *dev, int dev_id)
> -#else
> -struct mii_dev *fec_get_miibus(uint32_t base_addr, int dev_id)
> -#endif
> +struct mii_dev *fec_get_miibus(ulong base_addr, int dev_id)
>  {
> -#ifdef CONFIG_DM_ETH
> -	struct fec_priv *priv = dev_get_priv(dev);
> -	struct ethernet_regs *eth = priv->eth;
> -#else
>  	struct ethernet_regs *eth = (struct ethernet_regs *)(ulong)base_addr;
>
The (ulong) is redundant here.



Lothar Waßmann
Peng Fan March 20, 2018, 9:29 a.m. UTC | #3 
> -----Original Message-----

> From: Lothar Waßmann [mailto:LW@KARO-electronics.de]

> Sent: 2018年3月20日 16:50

> To: Peng Fan <peng.fan@nxp.com>

> Cc: joe.hershberger@ni.com; u-boot@lists.denx.de

> Subject: Re: [U-Boot] [PATCH 2/5] net: fec_mxc: simplify fec_get_miibus

> 

> Hi,

> 

> On Sat, 10 Mar 2018 09:19:54 +0800 Peng Fan wrote:

> > No need to provide two prototype for this function.

> > Use ulong for the first parameter, then this function could be shared

> > for DM/non DM case.

> >

> > Signed-off-by: Peng Fan <peng.fan@nxp.com>

> > ---

> >  drivers/net/fec_mxc.c | 13 ++-----------

> >  include/netdev.h      |  6 +-----

> >  2 files changed, 3 insertions(+), 16 deletions(-)

> >

> > diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index

> > 7c396d8d95..2bd4ba4ef1 100644

> > --- a/drivers/net/fec_mxc.c

> > +++ b/drivers/net/fec_mxc.c

> > @@ -1021,18 +1021,9 @@ static void fec_free_descs(struct fec_priv *fec)

> >  	free(fec->tbd_base);

> >  }

> >

> > -#ifdef CONFIG_DM_ETH

> > -struct mii_dev *fec_get_miibus(struct udevice *dev, int dev_id)

> > -#else -struct mii_dev *fec_get_miibus(uint32_t base_addr, int dev_id)

> > -#endif

> > +struct mii_dev *fec_get_miibus(ulong base_addr, int dev_id)

> >  {

> > -#ifdef CONFIG_DM_ETH

> > -	struct fec_priv *priv = dev_get_priv(dev);

> > -	struct ethernet_regs *eth = priv->eth;

> > -#else

> >  	struct ethernet_regs *eth = (struct ethernet_regs

> > *)(ulong)base_addr;

> >

> The (ulong) is redundant here.

Thanks. 
Joe, would you mind help fix when you commit the patch,
or you need me send out v2?

Thanks,
Peng.
> 

> 

> 

> Lothar Waßmann
Joe Hershberger March 21, 2018, 7:13 p.m. UTC | #4 
On Tue, Mar 20, 2018 at 4:29 AM, Peng Fan <peng.fan@nxp.com> wrote:
>
>
>> -----Original Message-----
>> From: Lothar Waßmann [mailto:LW@KARO-electronics.de]
>> Sent: 2018年3月20日 16:50
>> To: Peng Fan <peng.fan@nxp.com>
>> Cc: joe.hershberger@ni.com; u-boot@lists.denx.de
>> Subject: Re: [U-Boot] [PATCH 2/5] net: fec_mxc: simplify fec_get_miibus
>>
>> Hi,
>>
>> On Sat, 10 Mar 2018 09:19:54 +0800 Peng Fan wrote:
>> > No need to provide two prototype for this function.
>> > Use ulong for the first parameter, then this function could be shared
>> > for DM/non DM case.
>> >
>> > Signed-off-by: Peng Fan <peng.fan@nxp.com>
>> > ---
>> >  drivers/net/fec_mxc.c | 13 ++-----------
>> >  include/netdev.h      |  6 +-----
>> >  2 files changed, 3 insertions(+), 16 deletions(-)
>> >
>> > diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index
>> > 7c396d8d95..2bd4ba4ef1 100644
>> > --- a/drivers/net/fec_mxc.c
>> > +++ b/drivers/net/fec_mxc.c
>> > @@ -1021,18 +1021,9 @@ static void fec_free_descs(struct fec_priv *fec)
>> >     free(fec->tbd_base);
>> >  }
>> >
>> > -#ifdef CONFIG_DM_ETH
>> > -struct mii_dev *fec_get_miibus(struct udevice *dev, int dev_id)
>> > -#else -struct mii_dev *fec_get_miibus(uint32_t base_addr, int dev_id)
>> > -#endif
>> > +struct mii_dev *fec_get_miibus(ulong base_addr, int dev_id)
>> >  {
>> > -#ifdef CONFIG_DM_ETH
>> > -   struct fec_priv *priv = dev_get_priv(dev);
>> > -   struct ethernet_regs *eth = priv->eth;
>> > -#else
>> >     struct ethernet_regs *eth = (struct ethernet_regs
>> > *)(ulong)base_addr;
>> >
>> The (ulong) is redundant here.
> Thanks.
> Joe, would you mind help fix when you commit the patch,
> or you need me send out v2?

I can fix it up.

-Joe
Joe Hershberger March 21, 2018, 7:20 p.m. UTC | #5 
On Wed, Mar 21, 2018 at 2:13 PM, Joe Hershberger <joe.hershberger@ni.com> wrote:
> On Tue, Mar 20, 2018 at 4:29 AM, Peng Fan <peng.fan@nxp.com> wrote:
>>
>>
>>> -----Original Message-----
>>> From: Lothar Waßmann [mailto:LW@KARO-electronics.de]
>>> Sent: 2018年3月20日 16:50
>>> To: Peng Fan <peng.fan@nxp.com>
>>> Cc: joe.hershberger@ni.com; u-boot@lists.denx.de
>>> Subject: Re: [U-Boot] [PATCH 2/5] net: fec_mxc: simplify fec_get_miibus
>>>
>>> Hi,
>>>
>>> On Sat, 10 Mar 2018 09:19:54 +0800 Peng Fan wrote:
>>> > No need to provide two prototype for this function.
>>> > Use ulong for the first parameter, then this function could be shared
>>> > for DM/non DM case.
>>> >
>>> > Signed-off-by: Peng Fan <peng.fan@nxp.com>
>>> > ---
>>> >  drivers/net/fec_mxc.c | 13 ++-----------
>>> >  include/netdev.h      |  6 +-----
>>> >  2 files changed, 3 insertions(+), 16 deletions(-)
>>> >
>>> > diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index
>>> > 7c396d8d95..2bd4ba4ef1 100644
>>> > --- a/drivers/net/fec_mxc.c
>>> > +++ b/drivers/net/fec_mxc.c
>>> > @@ -1021,18 +1021,9 @@ static void fec_free_descs(struct fec_priv *fec)
>>> >     free(fec->tbd_base);
>>> >  }
>>> >
>>> > -#ifdef CONFIG_DM_ETH
>>> > -struct mii_dev *fec_get_miibus(struct udevice *dev, int dev_id)
>>> > -#else -struct mii_dev *fec_get_miibus(uint32_t base_addr, int dev_id)
>>> > -#endif
>>> > +struct mii_dev *fec_get_miibus(ulong base_addr, int dev_id)
>>> >  {
>>> > -#ifdef CONFIG_DM_ETH
>>> > -   struct fec_priv *priv = dev_get_priv(dev);
>>> > -   struct ethernet_regs *eth = priv->eth;
>>> > -#else
>>> >     struct ethernet_regs *eth = (struct ethernet_regs
>>> > *)(ulong)base_addr;
>>> >
>>> The (ulong) is redundant here.
>> Thanks.
>> Joe, would you mind help fix when you commit the patch,
>> or you need me send out v2?
>
> I can fix it up.

Looks like you already did.

-Joe
diff mbox series

Patch

diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 7c396d8d95..2bd4ba4ef1 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -1021,18 +1021,9 @@  static void fec_free_descs(struct fec_priv *fec)
 	free(fec->tbd_base);
 }
 
-#ifdef CONFIG_DM_ETH
-struct mii_dev *fec_get_miibus(struct udevice *dev, int dev_id)
-#else
-struct mii_dev *fec_get_miibus(uint32_t base_addr, int dev_id)
-#endif
+struct mii_dev *fec_get_miibus(ulong base_addr, int dev_id)
 {
-#ifdef CONFIG_DM_ETH
-	struct fec_priv *priv = dev_get_priv(dev);
-	struct ethernet_regs *eth = priv->eth;
-#else
 	struct ethernet_regs *eth = (struct ethernet_regs *)(ulong)base_addr;
-#endif
 	struct mii_dev *bus;
 	int ret;
 
@@ -1284,7 +1275,7 @@  static int fecmxc_probe(struct udevice *dev)
 	fec_reg_setup(priv);
 	priv->dev_id = (dev_id == -1) ? 0 : dev_id;
 
-	bus = fec_get_miibus(dev, dev_id);
+	bus = fec_get_miibus((ulong)priv->eth, dev_id);
 	if (!bus) {
 		ret = -ENOMEM;
 		goto err_mii;
diff --git a/include/netdev.h b/include/netdev.h
index 3958a4cd32..c96f851be0 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -119,11 +119,7 @@  static inline int pci_eth_init(bd_t *bis)
 	return num;
 }
 
-#ifdef CONFIG_DM_ETH
-struct mii_dev *fec_get_miibus(struct udevice *dev, int dev_id);
-#else
-struct mii_dev *fec_get_miibus(uint32_t base_addr, int dev_id);
-#endif
+struct mii_dev *fec_get_miibus(ulong base_addr, int dev_id);
 
 #ifdef CONFIG_PHYLIB
 struct phy_device;