| Message ID | 1336751221-19127-1-git-send-email-bjorn@mork.no |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 05/11/2012 08:47 AM, Bjørn Mork wrote: > CONFIG_OF_MDIO is tristate and will be m if PHYLIB is m. Use > IS_ENABLED macro to prevent build error: > > ERROR: "of_mdio_find_bus" [drivers/net/phy/mdio-mux.ko] undefined! > > Reported-by: Randy Dunlap<rdunlap@xenotime.net> > Cc: David Daney<david.daney@cavium.com> > Signed-off-by: Bjørn Mork<bjorn@mork.no> I was able to reproduce the failure, and this patch both fixes it and seems correct, so... Acked-by: David Daney<david.daney@cavium.com> Sorry about this failure. > --- > I wonder if this could be as banal as this? Not even build tested... > > Should be wrapped into commit 25106022 if it works, to ensure > bisectability. > > > > Bjørn > > drivers/net/phy/mdio_bus.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c > index 83d5c9f..683ef1c 100644 > --- a/drivers/net/phy/mdio_bus.c > +++ b/drivers/net/phy/mdio_bus.c > @@ -88,7 +88,7 @@ static struct class mdio_bus_class = { > .dev_release = mdiobus_release, > }; > > -#ifdef CONFIG_OF_MDIO > +#if IS_ENABLED(CONFIG_OF_MDIO) > /* Helper function for of_mdio_find_bus */ > static int of_mdio_bus_match(struct device *dev, void *mdio_bus_np) > { -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Bjørn Mork <bjorn@mork.no> Date: Fri, 11 May 2012 17:47:01 +0200 > Should be wrapped into commit 25106022 if it works, to ensure > bisectability. Wrapped into? Commits made to my net-next tree are permanent and irreversible, so we cannot go back and change a commit. I never rebase my tree, too many people use it directly and pull it into their tree, so I'd break their world if I ever did that. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: David Daney <ddaney.cavm@gmail.com> Date: Fri, 11 May 2012 10:58:06 -0700 > On 05/11/2012 08:47 AM, Bjørn Mork wrote: >> CONFIG_OF_MDIO is tristate and will be m if PHYLIB is m. Use >> IS_ENABLED macro to prevent build error: >> >> ERROR: "of_mdio_find_bus" [drivers/net/phy/mdio-mux.ko] undefined! >> >> Reported-by: Randy Dunlap<rdunlap@xenotime.net> >> Cc: David Daney<david.daney@cavium.com> >> Signed-off-by: Bjørn Mork<bjorn@mork.no> > > I was able to reproduce the failure, and this patch both fixes it and > seems correct, so... > > Acked-by: David Daney<david.daney@cavium.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 05/11/2012 08:47 AM, Bjørn Mork wrote: > CONFIG_OF_MDIO is tristate and will be m if PHYLIB is m. Use > IS_ENABLED macro to prevent build error: > > ERROR: "of_mdio_find_bus" [drivers/net/phy/mdio-mux.ko] undefined! > > Reported-by: Randy Dunlap <rdunlap@xenotime.net> > Cc: David Daney <david.daney@cavium.com> > Signed-off-by: Bjørn Mork <bjorn@mork.no> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Thanks. > --- > I wonder if this could be as banal as this? Not even build tested... > > Should be wrapped into commit 25106022 if it works, to ensure > bisectability. > > > > Bjørn > > drivers/net/phy/mdio_bus.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c > index 83d5c9f..683ef1c 100644 > --- a/drivers/net/phy/mdio_bus.c > +++ b/drivers/net/phy/mdio_bus.c > @@ -88,7 +88,7 @@ static struct class mdio_bus_class = { > .dev_release = mdiobus_release, > }; > > -#ifdef CONFIG_OF_MDIO > +#if IS_ENABLED(CONFIG_OF_MDIO) > /* Helper function for of_mdio_find_bus */ > static int of_mdio_bus_match(struct device *dev, void *mdio_bus_np) > {
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 83d5c9f..683ef1c 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -88,7 +88,7 @@ static struct class mdio_bus_class = { .dev_release = mdiobus_release, }; -#ifdef CONFIG_OF_MDIO +#if IS_ENABLED(CONFIG_OF_MDIO) /* Helper function for of_mdio_find_bus */ static int of_mdio_bus_match(struct device *dev, void *mdio_bus_np) {
CONFIG_OF_MDIO is tristate and will be m if PHYLIB is m. Use IS_ENABLED macro to prevent build error: ERROR: "of_mdio_find_bus" [drivers/net/phy/mdio-mux.ko] undefined! Reported-by: Randy Dunlap <rdunlap@xenotime.net> Cc: David Daney <david.daney@cavium.com> Signed-off-by: Bjørn Mork <bjorn@mork.no> --- I wonder if this could be as banal as this? Not even build tested... Should be wrapped into commit 25106022 if it works, to ensure bisectability. Bjørn drivers/net/phy/mdio_bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)