On Tue, Aug 24, 2021 at 3:01 PM Vladimir Oltean <vladimir.olt...@nxp.com> wrote: > > DM DSA uses "err" for error code values, so use this consistently. > > Signed-off-by: Vladimir Oltean <vladimir.olt...@nxp.com> > Reviewed-by: Ramon Fried <rfried....@gmail.com> > Tested-by: Michael Walle <mich...@walle.cc> > --- > net/dsa-uclass.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/net/dsa-uclass.c b/net/dsa-uclass.c > index 694664d81bbb..f279ca7d2d6c 100644 > --- a/net/dsa-uclass.c > +++ b/net/dsa-uclass.c > @@ -248,7 +248,7 @@ static int dsa_port_probe(struct udevice *pdev) > struct dsa_port_pdata *port_pdata; > struct dsa_priv *dsa_priv; > struct udevice *master; > - int ret; > + int err; > > port_pdata = dev_get_parent_plat(pdev); > dsa_priv = dev_get_uclass_priv(dev); > @@ -268,9 +268,9 @@ static int dsa_port_probe(struct udevice *pdev) > * TODO: we assume the master device is always there and doesn't get > * removed during runtime. > */ > - ret = device_probe(master); > - if (ret) > - return ret; > + err = device_probe(master); > + if (err) > + return err; > > /* > * Inherit port's hwaddr from the DSA master, unless the port already > -- > 2.25.1 > Applied to u-boot-net/network-master Thanks, Ramon.