From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yw0-f174.google.com (mail-yw0-f174.google.com [209.85.211.174]) by ozlabs.org (Postfix) with ESMTP id DBD9CB7B92 for ; Thu, 8 Oct 2009 03:11:35 +1100 (EST) Received: by ywh4 with SMTP id 4so298808ywh.10 for ; Wed, 07 Oct 2009 09:11:34 -0700 (PDT) MIME-Version: 1.0 Sender: glikely@secretlab.ca In-Reply-To: <200910071715.57249.jezz@sysmic.org> References: <200910071715.57249.jezz@sysmic.org> From: Grant Likely Date: Wed, 7 Oct 2009 10:11:14 -0600 Message-ID: Subject: Re: Nested function in drivers/of/of_mdio.c To: =?ISO-8859-1?Q?J=E9r=F4me_Pouiller?= Content-Type: text/plain; charset=ISO-8859-1 Cc: netdev , linuxppc , Andy Fleming , "David S. Miller" List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Wed, Oct 7, 2009 at 9:15 AM, J=E9r=F4me Pouiller wrote= : > Dear, > > I have a problem with commit 8bc487d150b939e69830c39322df4ee486efe381 > in file drivers/of/of_mdio.c in function of_phy_find_device. > > As you see, this function define match() as a nested function. My > compiler (powerpc-e500-linux-gnu-gcc-3.4.1) raise an error during link > due to this nested definition: > =A0drivers/built-in.o(.text+0x5e2a4): In function `of_phy_find_device': /= home/jezz/linux-next/drivers/of/of_mdio.c:107: > undefined reference to `__trampoline_setup' > > I am sure I could solve problem by rebuilding my toolchain. > Nevertheless, I think nested function definition is not perfectly > supported by all compilers. Also, I suggest to place function match() > outside of scope of of_phy_find_device as in following patch. I'm okay with that, but if you're moving code out of the file scope, then please rename the function to of_phy_match() to avoid global namespace conflicts. g. > > diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c > index bacaa53..c7b2e26 100644 > --- a/drivers/of/of_mdio.c > +++ b/drivers/of/of_mdio.c > @@ -97,6 +97,10 @@ int of_mdiobus_register(struct mii_bus *mdio, struct d= evice_node *np) > =A0} > =A0EXPORT_SYMBOL(of_mdiobus_register); > > +static int match(struct device *dev, void *phy_np) > +{ > + =A0 =A0 =A0 return dev_archdata_get_node(&dev->archdata) =3D=3D phy_np; > +} > =A0/** > =A0* of_phy_find_device - Give a PHY node, find the phy_device > =A0* @phy_np: Pointer to the phy's device tree node > @@ -106,11 +110,6 @@ EXPORT_SYMBOL(of_mdiobus_register); > =A0struct phy_device *of_phy_find_device(struct device_node *phy_np) > =A0{ > =A0 =A0 =A0 =A0struct device *d; > - =A0 =A0 =A0 int match(struct device *dev, void *phy_np) > - =A0 =A0 =A0 { > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 return dev_archdata_get_node(&dev->archdata= ) =3D=3D phy_np; > - =A0 =A0 =A0 } > - > =A0 =A0 =A0 =A0if (!phy_np) > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return NULL; > > > What do you think about it? > > Best regards, > > -- > J=E9r=F4me Pouiller (jezz AT sysmic DOT org) > --=20 Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd.