On Thu, Apr 29, 2010 at 04:02:55PM -0700, Michal Nazarewicz wrote: > Greg KH <greg@xxxxxxxxx> writes: > > > On Fri, Apr 09, 2010 at 09:21:20PM +0200, Michal Nazarewicz wrote: > >> __init, __initdata and __exit tags have have been removed from > >> various files to make it possible for gadgets that do not use > >> the __init/__exit tags to use those. > >> > >> Files in question are related to: > >> * the core composite framework, > >> * the mass storage function (fixing a section mismatch) and > >> * ethernet driver (ACM, ECM, RNDIS). > >> > >> Signed-off-by: Michal Nazarewicz <m.nazarewicz@xxxxxxxxxxx> > >> Cc: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> > >> Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> > >> --- > >> drivers/usb/gadget/composite.c | 21 ++++++++++----------- > >> drivers/usb/gadget/config.c | 4 ++-- > >> drivers/usb/gadget/epautoconf.c | 12 ++++++------ > >> drivers/usb/gadget/f_acm.c | 32 ++++++++++++++++---------------- > >> drivers/usb/gadget/f_ecm.c | 33 +++++++++++++++++---------------- > >> drivers/usb/gadget/f_mass_storage.c | 2 +- > >> drivers/usb/gadget/f_rndis.c | 34 ++++++++++++++++++---------------- > >> drivers/usb/gadget/u_ether.c | 4 ++-- > >> 8 files changed, 72 insertions(+), 70 deletions(-) > >> > >> diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c > >> index 09289bb..ff155ca 100644 > >> --- a/drivers/usb/gadget/composite.c > >> +++ b/drivers/usb/gadget/composite.c > >> @@ -85,7 +85,7 @@ MODULE_PARM_DESC(iSerialNumber, "SerialNumber string"); > >> * This function returns the value of the function's bind(), which is > >> * zero for success else a negative errno value. > >> */ > >> -int __init usb_add_function(struct usb_configuration *config, > >> +int __cold usb_add_function(struct usb_configuration *config, > > > > What is the "__cold" for? > > __init, among other things implies __cold: > > include/linux/init.h:43: #define __init __section(.init.text) __cold notrace > > and so I left __cold leaving out __section. Hm, how about just dropping everything? I don't think we need the __cold here then, right? thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html