Message ID | 20200618220444.5064-1-rentao.bupt@gmail.com |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
Series | [net-next] of: mdio: preserve phy dev_flags in of_phy_connect() | expand |
On 6/18/2020 3:04 PM, rentao.bupt@gmail.com wrote: > From: Tao Ren <rentao.bupt@gmail.com> > > Replace assignment "=" with OR "|=" for "phy->dev_flags" so "dev_flags" > configured in phy probe() function can be preserved. > > The idea is similar to commit e7312efbd5de ("net: phy: modify assignment > to OR for dev_flags in phy_attach_direct"). > > Signed-off-by: Tao Ren <rentao.bupt@gmail.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
On Thu, Jun 18, 2020 at 03:04:44PM -0700, rentao.bupt@gmail.com wrote: > From: Tao Ren <rentao.bupt@gmail.com> > > Replace assignment "=" with OR "|=" for "phy->dev_flags" so "dev_flags" > configured in phy probe() function can be preserved. > > The idea is similar to commit e7312efbd5de ("net: phy: modify assignment > to OR for dev_flags in phy_attach_direct"). > > Signed-off-by: Tao Ren <rentao.bupt@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
From: rentao.bupt@gmail.com Date: Thu, 18 Jun 2020 15:04:44 -0700 > From: Tao Ren <rentao.bupt@gmail.com> > > Replace assignment "=" with OR "|=" for "phy->dev_flags" so "dev_flags" > configured in phy probe() function can be preserved. > > The idea is similar to commit e7312efbd5de ("net: phy: modify assignment > to OR for dev_flags in phy_attach_direct"). > > Signed-off-by: Tao Ren <rentao.bupt@gmail.com> Applied.
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index a04afe79529c..f5c46c72f4d3 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c @@ -380,7 +380,7 @@ struct phy_device *of_phy_connect(struct net_device *dev, if (!phy) return NULL; - phy->dev_flags = flags; + phy->dev_flags |= flags; ret = phy_connect_direct(dev, phy, hndlr, iface);