* [PATCH] usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH
@ 2012-03-11 13:31 Lothar Waßmann
2012-03-11 13:51 ` Michal Nazarewicz
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Lothar Waßmann @ 2012-03-11 13:31 UTC (permalink / raw)
To: linux-usb
Cc: Felipe Balbi, Greg Kroah-Hartman, linux-kernel,
Lothar Waßmann
commit 28824b18ac4705e876a282a15ea0de8fc957551f:
|Author: Michal Nazarewicz <m.nazarewicz@samsung.com>
|Date: Wed May 5 12:53:13 2010 +0200
|
| USB: gadget: __init and __exit tags removed
|
| __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.
obviously missed (at least) this case leading to a section mismatch in
g_ffs.c when compiling with CONFIG_USB_FUNCTIONFS_ETH enabled.
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
---
drivers/usb/gadget/f_subset.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/usb/gadget/f_subset.c b/drivers/usb/gadget/f_subset.c
index c154064..3974bc9 100644
--- a/drivers/usb/gadget/f_subset.c
+++ b/drivers/usb/gadget/f_subset.c
@@ -404,7 +404,7 @@ geth_unbind(struct usb_configuration *c, struct usb_function *f)
* Caller must have called @gether_setup(). Caller is also responsible
* for calling @gether_cleanup() before module unload.
*/
-int __init geth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN])
+int geth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN])
{
struct f_gether *geth;
int status;
--
1.7.2.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH
2012-03-11 13:31 [PATCH] usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH Lothar Waßmann
@ 2012-03-11 13:51 ` Michal Nazarewicz
2012-03-11 14:08 ` Lothar Waßmann
2012-03-21 14:06 ` [PATCH v2] " Lothar Waßmann
2 siblings, 0 replies; 9+ messages in thread
From: Michal Nazarewicz @ 2012-03-11 13:51 UTC (permalink / raw)
To: linux-usb, Lothar Waßmann
Cc: Felipe Balbi, Greg Kroah-Hartman, linux-kernel
On Sun, 11 Mar 2012 14:31:10 +0100, Lothar Waßmann <LW@karo-electronics.de> wrote:
> commit 28824b18ac4705e876a282a15ea0de8fc957551f:
> |Author: Michal Nazarewicz <m.nazarewicz@samsung.com>
> |Date: Wed May 5 12:53:13 2010 +0200
> |
> | USB: gadget: __init and __exit tags removed
> |
> | __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.
> obviously missed (at least) this case leading to a section mismatch in
> g_ffs.c when compiling with CONFIG_USB_FUNCTIONFS_ETH enabled.
>
> Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
> ---
> drivers/usb/gadget/f_subset.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/usb/gadget/f_subset.c b/drivers/usb/gadget/f_subset.c
> index c154064..3974bc9 100644
> --- a/drivers/usb/gadget/f_subset.c
> +++ b/drivers/usb/gadget/f_subset.c
> @@ -404,7 +404,7 @@ geth_unbind(struct usb_configuration *c, struct usb_function *f)
> * Caller must have called @gether_setup(). Caller is also responsible
> * for calling @gether_cleanup() before module unload.
> */
> -int __init geth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN])
> +int geth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN])
> {
> struct f_gether *geth;
> int status;
--
Best regards, _ _
.o. | Liege of Serenely Enlightened Majesty of o' \,=./ `o
..o | Computer Science, Michał “mina86” Nazarewicz (o o)
ooo +----<email/xmpp: mpn@google.com>--------------ooO--(_)--Ooo--
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH
2012-03-11 13:31 [PATCH] usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH Lothar Waßmann
2012-03-11 13:51 ` Michal Nazarewicz
@ 2012-03-11 14:08 ` Lothar Waßmann
2012-03-12 5:21 ` Michal Nazarewicz
2012-03-21 10:04 ` Felipe Balbi
2012-03-21 14:06 ` [PATCH v2] " Lothar Waßmann
2 siblings, 2 replies; 9+ messages in thread
From: Lothar Waßmann @ 2012-03-11 14:08 UTC (permalink / raw)
To: linux-usb
Cc: Felipe Balbi, Greg Kroah-Hartman, linux-kernel,
Lothar Waßmann
Hi,
please ignore the previous message. I sent the patch out too early.
Here is a revised version.
commit 28824b18ac4705e876a282a15ea0de8fc957551f:
|Author: Michal Nazarewicz <m.nazarewicz@samsung.com>
|Date: Wed May 5 12:53:13 2010 +0200
|
| USB: gadget: __init and __exit tags removed
|
| __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.
obviously missed (at least) this case leading to a section mismatch in
g_ffs.c when compiling with CONFIG_USB_FUNCTIONFS_ETH enabled.
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
---
drivers/usb/gadget/f_subset.c | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/usb/gadget/f_subset.c b/drivers/usb/gadget/f_subset.c
index c154064..21ab474 100644
--- a/drivers/usb/gadget/f_subset.c
+++ b/drivers/usb/gadget/f_subset.c
@@ -74,7 +74,7 @@ static inline struct f_gether *func_to_geth(struct usb_function *f)
/* interface descriptor: */
-static struct usb_interface_descriptor subset_data_intf __initdata = {
+static struct usb_interface_descriptor subset_data_intf = {
.bLength = sizeof subset_data_intf,
.bDescriptorType = USB_DT_INTERFACE,
@@ -87,7 +87,7 @@ static struct usb_interface_descriptor subset_data_intf __initdata = {
/* .iInterface = DYNAMIC */
};
-static struct usb_cdc_header_desc mdlm_header_desc __initdata = {
+static struct usb_cdc_header_desc mdlm_header_desc = {
.bLength = sizeof mdlm_header_desc,
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_HEADER_TYPE,
@@ -95,7 +95,7 @@ static struct usb_cdc_header_desc mdlm_header_desc __initdata = {
.bcdCDC = cpu_to_le16(0x0110),
};
-static struct usb_cdc_mdlm_desc mdlm_desc __initdata = {
+static struct usb_cdc_mdlm_desc mdlm_desc = {
.bLength = sizeof mdlm_desc,
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_MDLM_TYPE,
@@ -111,7 +111,7 @@ static struct usb_cdc_mdlm_desc mdlm_desc __initdata = {
* can't really use its struct. All we do here is say that we're using
* the submode of "SAFE" which directly matches the CDC Subset.
*/
-static u8 mdlm_detail_desc[] __initdata = {
+static u8 mdlm_detail_desc[] = {
6,
USB_DT_CS_INTERFACE,
USB_CDC_MDLM_DETAIL_TYPE,
@@ -121,7 +121,7 @@ static u8 mdlm_detail_desc[] __initdata = {
0, /* network data capabilities ("raw" encapsulation) */
};
-static struct usb_cdc_ether_desc ether_desc __initdata = {
+static struct usb_cdc_ether_desc ether_desc = {
.bLength = sizeof ether_desc,
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_ETHERNET_TYPE,
@@ -136,7 +136,7 @@ static struct usb_cdc_ether_desc ether_desc __initdata = {
/* full speed support: */
-static struct usb_endpoint_descriptor fs_subset_in_desc __initdata = {
+static struct usb_endpoint_descriptor fs_subset_in_desc = {
.bLength = USB_DT_ENDPOINT_SIZE,
.bDescriptorType = USB_DT_ENDPOINT,
@@ -144,7 +144,7 @@ static struct usb_endpoint_descriptor fs_subset_in_desc __initdata = {
.bmAttributes = USB_ENDPOINT_XFER_BULK,
};
-static struct usb_endpoint_descriptor fs_subset_out_desc __initdata = {
+static struct usb_endpoint_descriptor fs_subset_out_desc = {
.bLength = USB_DT_ENDPOINT_SIZE,
.bDescriptorType = USB_DT_ENDPOINT,
@@ -152,7 +152,7 @@ static struct usb_endpoint_descriptor fs_subset_out_desc __initdata = {
.bmAttributes = USB_ENDPOINT_XFER_BULK,
};
-static struct usb_descriptor_header *fs_eth_function[] __initdata = {
+static struct usb_descriptor_header *fs_eth_function[] = {
(struct usb_descriptor_header *) &subset_data_intf,
(struct usb_descriptor_header *) &mdlm_header_desc,
(struct usb_descriptor_header *) &mdlm_desc,
@@ -165,7 +165,7 @@ static struct usb_descriptor_header *fs_eth_function[] __initdata = {
/* high speed support: */
-static struct usb_endpoint_descriptor hs_subset_in_desc __initdata = {
+static struct usb_endpoint_descriptor hs_subset_in_desc = {
.bLength = USB_DT_ENDPOINT_SIZE,
.bDescriptorType = USB_DT_ENDPOINT,
@@ -173,7 +173,7 @@ static struct usb_endpoint_descriptor hs_subset_in_desc __initdata = {
.wMaxPacketSize = cpu_to_le16(512),
};
-static struct usb_endpoint_descriptor hs_subset_out_desc __initdata = {
+static struct usb_endpoint_descriptor hs_subset_out_desc = {
.bLength = USB_DT_ENDPOINT_SIZE,
.bDescriptorType = USB_DT_ENDPOINT,
@@ -181,7 +181,7 @@ static struct usb_endpoint_descriptor hs_subset_out_desc __initdata = {
.wMaxPacketSize = cpu_to_le16(512),
};
-static struct usb_descriptor_header *hs_eth_function[] __initdata = {
+static struct usb_descriptor_header *hs_eth_function[] = {
(struct usb_descriptor_header *) &subset_data_intf,
(struct usb_descriptor_header *) &mdlm_header_desc,
(struct usb_descriptor_header *) &mdlm_desc,
@@ -194,7 +194,7 @@ static struct usb_descriptor_header *hs_eth_function[] __initdata = {
/* super speed support: */
-static struct usb_endpoint_descriptor ss_subset_in_desc __initdata = {
+static struct usb_endpoint_descriptor ss_subset_in_desc = {
.bLength = USB_DT_ENDPOINT_SIZE,
.bDescriptorType = USB_DT_ENDPOINT,
@@ -202,7 +202,7 @@ static struct usb_endpoint_descriptor ss_subset_in_desc __initdata = {
.wMaxPacketSize = cpu_to_le16(1024),
};
-static struct usb_endpoint_descriptor ss_subset_out_desc __initdata = {
+static struct usb_endpoint_descriptor ss_subset_out_desc = {
.bLength = USB_DT_ENDPOINT_SIZE,
.bDescriptorType = USB_DT_ENDPOINT,
@@ -210,7 +210,7 @@ static struct usb_endpoint_descriptor ss_subset_out_desc __initdata = {
.wMaxPacketSize = cpu_to_le16(1024),
};
-static struct usb_ss_ep_comp_descriptor ss_subset_bulk_comp_desc __initdata = {
+static struct usb_ss_ep_comp_descriptor ss_subset_bulk_comp_desc = {
.bLength = sizeof ss_subset_bulk_comp_desc,
.bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
@@ -219,7 +219,7 @@ static struct usb_ss_ep_comp_descriptor ss_subset_bulk_comp_desc __initdata = {
/* .bmAttributes = 0, */
};
-static struct usb_descriptor_header *ss_eth_function[] __initdata = {
+static struct usb_descriptor_header *ss_eth_function[] = {
(struct usb_descriptor_header *) &subset_data_intf,
(struct usb_descriptor_header *) &mdlm_header_desc,
(struct usb_descriptor_header *) &mdlm_desc,
@@ -290,7 +290,7 @@ static void geth_disable(struct usb_function *f)
/* serial function driver setup/binding */
-static int __init
+static int
geth_bind(struct usb_configuration *c, struct usb_function *f)
{
struct usb_composite_dev *cdev = c->cdev;
@@ -404,7 +404,7 @@ geth_unbind(struct usb_configuration *c, struct usb_function *f)
* Caller must have called @gether_setup(). Caller is also responsible
* for calling @gether_cleanup() before module unload.
*/
-int __init geth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN])
+int geth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN])
{
struct f_gether *geth;
int status;
--
1.7.2.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH
2012-03-11 14:08 ` Lothar Waßmann
@ 2012-03-12 5:21 ` Michal Nazarewicz
2012-03-21 10:04 ` Felipe Balbi
1 sibling, 0 replies; 9+ messages in thread
From: Michal Nazarewicz @ 2012-03-12 5:21 UTC (permalink / raw)
To: linux-usb, Lothar Waßmann
Cc: Felipe Balbi, Greg Kroah-Hartman, linux-kernel
On Sun, 11 Mar 2012 15:08:46 +0100, Lothar Waßmann <LW@karo-electronics.de> wrote:
> Hi,
>
> please ignore the previous message. I sent the patch out too early.
> Here is a revised version.
>
> commit 28824b18ac4705e876a282a15ea0de8fc957551f:
> |Author: Michal Nazarewicz <m.nazarewicz@samsung.com>
> |Date: Wed May 5 12:53:13 2010 +0200
> |
> | USB: gadget: __init and __exit tags removed
> |
> | __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.
> obviously missed (at least) this case leading to a section mismatch in
> g_ffs.c when compiling with CONFIG_USB_FUNCTIONFS_ETH enabled.
>
> Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
--
Best regards, _ _
.o. | Liege of Serenely Enlightened Majesty of o' \,=./ `o
..o | Computer Science, Michał “mina86” Nazarewicz (o o)
ooo +----<email/xmpp: mpn@google.com>--------------ooO--(_)--Ooo--
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH
2012-03-11 14:08 ` Lothar Waßmann
2012-03-12 5:21 ` Michal Nazarewicz
@ 2012-03-21 10:04 ` Felipe Balbi
2012-03-21 11:10 ` Lothar Waßmann
1 sibling, 1 reply; 9+ messages in thread
From: Felipe Balbi @ 2012-03-21 10:04 UTC (permalink / raw)
To: Lothar Waßmann
Cc: linux-usb, Felipe Balbi, Greg Kroah-Hartman, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 905 bytes --]
Hi,
On Sun, Mar 11, 2012 at 03:08:46PM +0100, Lothar Waßmann wrote:
> Hi,
>
> please ignore the previous message. I sent the patch out too early.
> Here is a revised version.
>
> commit 28824b18ac4705e876a282a15ea0de8fc957551f:
> |Author: Michal Nazarewicz <m.nazarewicz@samsung.com>
> |Date: Wed May 5 12:53:13 2010 +0200
> |
> | USB: gadget: __init and __exit tags removed
> |
> | __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.
> obviously missed (at least) this case leading to a section mismatch in
> g_ffs.c when compiling with CONFIG_USB_FUNCTIONFS_ETH enabled.
>
> Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
please send in proper patch format and while at that include any Acks
you already got.
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH
2012-03-21 10:04 ` Felipe Balbi
@ 2012-03-21 11:10 ` Lothar Waßmann
2012-03-21 11:42 ` Felipe Balbi
0 siblings, 1 reply; 9+ messages in thread
From: Lothar Waßmann @ 2012-03-21 11:10 UTC (permalink / raw)
To: balbi; +Cc: linux-usb, Greg Kroah-Hartman, linux-kernel
Hi,
Felipe Balbi writes:
> Hi,
>
> On Sun, Mar 11, 2012 at 03:08:46PM +0100, Lothar Waßmann wrote:
> > Hi,
> >
> > please ignore the previous message. I sent the patch out too early.
> > Here is a revised version.
> >
> > commit 28824b18ac4705e876a282a15ea0de8fc957551f:
> > |Author: Michal Nazarewicz <m.nazarewicz@samsung.com>
> > |Date: Wed May 5 12:53:13 2010 +0200
> > |
> > | USB: gadget: __init and __exit tags removed
> > |
> > | __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.
> > obviously missed (at least) this case leading to a section mismatch in
> > g_ffs.c when compiling with CONFIG_USB_FUNCTIONFS_ETH enabled.
> >
> > Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
>
> please send in proper patch format and while at that include any Acks
> you already got.
>
What's wrong with the format?
I used git-format-patch to create it, which should produce a properly
formatted patch AFAIK.
Lothar Waßmann
--
___________________________________________________________
Ka-Ro electronics GmbH | Pascalstraße 22 | D - 52076 Aachen
Phone: +49 2408 1402-0 | Fax: +49 2408 1402-10
Geschäftsführer: Matthias Kaussen
Handelsregistereintrag: Amtsgericht Aachen, HRB 4996
www.karo-electronics.de | info@karo-electronics.de
___________________________________________________________
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH
2012-03-21 11:10 ` Lothar Waßmann
@ 2012-03-21 11:42 ` Felipe Balbi
2012-03-21 12:35 ` Lothar Waßmann
0 siblings, 1 reply; 9+ messages in thread
From: Felipe Balbi @ 2012-03-21 11:42 UTC (permalink / raw)
To: Lothar Waßmann; +Cc: balbi, linux-usb, Greg Kroah-Hartman, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1418 bytes --]
On Wed, Mar 21, 2012 at 12:10:46PM +0100, Lothar Waßmann wrote:
> Hi,
>
> Felipe Balbi writes:
> > Hi,
> >
> > On Sun, Mar 11, 2012 at 03:08:46PM +0100, Lothar Waßmann wrote:
> > > Hi,
> > >
> > > please ignore the previous message. I sent the patch out too early.
> > > Here is a revised version.
> > >
> > > commit 28824b18ac4705e876a282a15ea0de8fc957551f:
> > > |Author: Michal Nazarewicz <m.nazarewicz@samsung.com>
> > > |Date: Wed May 5 12:53:13 2010 +0200
> > > |
> > > | USB: gadget: __init and __exit tags removed
> > > |
> > > | __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.
> > > obviously missed (at least) this case leading to a section mismatch in
> > > g_ffs.c when compiling with CONFIG_USB_FUNCTIONFS_ETH enabled.
> > >
> > > Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
> >
> > please send in proper patch format and while at that include any Acks
> > you already got.
> >
> What's wrong with the format?
> I used git-format-patch to create it, which should produce a properly
> formatted patch AFAIK.
if I try to apply your patch I will have the below on the commit log.
Hi,
please ignore the previous message. I sent the patch out too early.
Here is a revised version.
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH
2012-03-21 11:42 ` Felipe Balbi
@ 2012-03-21 12:35 ` Lothar Waßmann
0 siblings, 0 replies; 9+ messages in thread
From: Lothar Waßmann @ 2012-03-21 12:35 UTC (permalink / raw)
To: balbi; +Cc: linux-usb, Greg Kroah-Hartman, linux-kernel
Hi,
Felipe Balbi writes:
> On Wed, Mar 21, 2012 at 12:10:46PM +0100, Lothar Waßmann wrote:
> > Hi,
> >
> > Felipe Balbi writes:
> > > Hi,
> > >
> > > On Sun, Mar 11, 2012 at 03:08:46PM +0100, Lothar Waßmann wrote:
> > > > Hi,
> > > >
> > > > please ignore the previous message. I sent the patch out too early.
> > > > Here is a revised version.
> > > >
> > > > commit 28824b18ac4705e876a282a15ea0de8fc957551f:
> > > > |Author: Michal Nazarewicz <m.nazarewicz@samsung.com>
> > > > |Date: Wed May 5 12:53:13 2010 +0200
> > > > |
> > > > | USB: gadget: __init and __exit tags removed
> > > > |
> > > > | __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.
> > > > obviously missed (at least) this case leading to a section mismatch in
> > > > g_ffs.c when compiling with CONFIG_USB_FUNCTIONFS_ETH enabled.
> > > >
> > > > Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
> > >
> > > please send in proper patch format and while at that include any Acks
> > > you already got.
> > >
> > What's wrong with the format?
> > I used git-format-patch to create it, which should produce a properly
> > formatted patch AFAIK.
>
> if I try to apply your patch I will have the below on the commit log.
>
> Hi,
>
> please ignore the previous message. I sent the patch out too early.
> Here is a revised version.
>
Ah, OK ic.
Will resubmit the patch.
Lothar Waßmann
--
___________________________________________________________
Ka-Ro electronics GmbH | Pascalstraße 22 | D - 52076 Aachen
Phone: +49 2408 1402-0 | Fax: +49 2408 1402-10
Geschäftsführer: Matthias Kaussen
Handelsregistereintrag: Amtsgericht Aachen, HRB 4996
www.karo-electronics.de | info@karo-electronics.de
___________________________________________________________
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2] usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH
2012-03-11 13:31 [PATCH] usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH Lothar Waßmann
2012-03-11 13:51 ` Michal Nazarewicz
2012-03-11 14:08 ` Lothar Waßmann
@ 2012-03-21 14:06 ` Lothar Waßmann
2 siblings, 0 replies; 9+ messages in thread
From: Lothar Waßmann @ 2012-03-21 14:06 UTC (permalink / raw)
To: linux-usb
Cc: Lothar Waßmann, Felipe Balbi, Greg Kroah-Hartman,
linux-kernel
commit 28824b18ac4705e876a282a15ea0de8fc957551f:
|Author: Michal Nazarewicz <m.nazarewicz@samsung.com>
|Date: Wed May 5 12:53:13 2010 +0200
|
| USB: gadget: __init and __exit tags removed
|
| __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.
obviously missed (at least) this case leading to a section mismatch in
g_ffs.c when compiling with CONFIG_USB_FUNCTIONFS_ETH enabled.
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
---
drivers/usb/gadget/f_subset.c | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/usb/gadget/f_subset.c b/drivers/usb/gadget/f_subset.c
index c154064..21ab474 100644
--- a/drivers/usb/gadget/f_subset.c
+++ b/drivers/usb/gadget/f_subset.c
@@ -74,7 +74,7 @@ static inline struct f_gether *func_to_geth(struct usb_function *f)
/* interface descriptor: */
-static struct usb_interface_descriptor subset_data_intf __initdata = {
+static struct usb_interface_descriptor subset_data_intf = {
.bLength = sizeof subset_data_intf,
.bDescriptorType = USB_DT_INTERFACE,
@@ -87,7 +87,7 @@ static struct usb_interface_descriptor subset_data_intf __initdata = {
/* .iInterface = DYNAMIC */
};
-static struct usb_cdc_header_desc mdlm_header_desc __initdata = {
+static struct usb_cdc_header_desc mdlm_header_desc = {
.bLength = sizeof mdlm_header_desc,
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_HEADER_TYPE,
@@ -95,7 +95,7 @@ static struct usb_cdc_header_desc mdlm_header_desc __initdata = {
.bcdCDC = cpu_to_le16(0x0110),
};
-static struct usb_cdc_mdlm_desc mdlm_desc __initdata = {
+static struct usb_cdc_mdlm_desc mdlm_desc = {
.bLength = sizeof mdlm_desc,
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_MDLM_TYPE,
@@ -111,7 +111,7 @@ static struct usb_cdc_mdlm_desc mdlm_desc __initdata = {
* can't really use its struct. All we do here is say that we're using
* the submode of "SAFE" which directly matches the CDC Subset.
*/
-static u8 mdlm_detail_desc[] __initdata = {
+static u8 mdlm_detail_desc[] = {
6,
USB_DT_CS_INTERFACE,
USB_CDC_MDLM_DETAIL_TYPE,
@@ -121,7 +121,7 @@ static u8 mdlm_detail_desc[] __initdata = {
0, /* network data capabilities ("raw" encapsulation) */
};
-static struct usb_cdc_ether_desc ether_desc __initdata = {
+static struct usb_cdc_ether_desc ether_desc = {
.bLength = sizeof ether_desc,
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_ETHERNET_TYPE,
@@ -136,7 +136,7 @@ static struct usb_cdc_ether_desc ether_desc __initdata = {
/* full speed support: */
-static struct usb_endpoint_descriptor fs_subset_in_desc __initdata = {
+static struct usb_endpoint_descriptor fs_subset_in_desc = {
.bLength = USB_DT_ENDPOINT_SIZE,
.bDescriptorType = USB_DT_ENDPOINT,
@@ -144,7 +144,7 @@ static struct usb_endpoint_descriptor fs_subset_in_desc __initdata = {
.bmAttributes = USB_ENDPOINT_XFER_BULK,
};
-static struct usb_endpoint_descriptor fs_subset_out_desc __initdata = {
+static struct usb_endpoint_descriptor fs_subset_out_desc = {
.bLength = USB_DT_ENDPOINT_SIZE,
.bDescriptorType = USB_DT_ENDPOINT,
@@ -152,7 +152,7 @@ static struct usb_endpoint_descriptor fs_subset_out_desc __initdata = {
.bmAttributes = USB_ENDPOINT_XFER_BULK,
};
-static struct usb_descriptor_header *fs_eth_function[] __initdata = {
+static struct usb_descriptor_header *fs_eth_function[] = {
(struct usb_descriptor_header *) &subset_data_intf,
(struct usb_descriptor_header *) &mdlm_header_desc,
(struct usb_descriptor_header *) &mdlm_desc,
@@ -165,7 +165,7 @@ static struct usb_descriptor_header *fs_eth_function[] __initdata = {
/* high speed support: */
-static struct usb_endpoint_descriptor hs_subset_in_desc __initdata = {
+static struct usb_endpoint_descriptor hs_subset_in_desc = {
.bLength = USB_DT_ENDPOINT_SIZE,
.bDescriptorType = USB_DT_ENDPOINT,
@@ -173,7 +173,7 @@ static struct usb_endpoint_descriptor hs_subset_in_desc __initdata = {
.wMaxPacketSize = cpu_to_le16(512),
};
-static struct usb_endpoint_descriptor hs_subset_out_desc __initdata = {
+static struct usb_endpoint_descriptor hs_subset_out_desc = {
.bLength = USB_DT_ENDPOINT_SIZE,
.bDescriptorType = USB_DT_ENDPOINT,
@@ -181,7 +181,7 @@ static struct usb_endpoint_descriptor hs_subset_out_desc __initdata = {
.wMaxPacketSize = cpu_to_le16(512),
};
-static struct usb_descriptor_header *hs_eth_function[] __initdata = {
+static struct usb_descriptor_header *hs_eth_function[] = {
(struct usb_descriptor_header *) &subset_data_intf,
(struct usb_descriptor_header *) &mdlm_header_desc,
(struct usb_descriptor_header *) &mdlm_desc,
@@ -194,7 +194,7 @@ static struct usb_descriptor_header *hs_eth_function[] __initdata = {
/* super speed support: */
-static struct usb_endpoint_descriptor ss_subset_in_desc __initdata = {
+static struct usb_endpoint_descriptor ss_subset_in_desc = {
.bLength = USB_DT_ENDPOINT_SIZE,
.bDescriptorType = USB_DT_ENDPOINT,
@@ -202,7 +202,7 @@ static struct usb_endpoint_descriptor ss_subset_in_desc __initdata = {
.wMaxPacketSize = cpu_to_le16(1024),
};
-static struct usb_endpoint_descriptor ss_subset_out_desc __initdata = {
+static struct usb_endpoint_descriptor ss_subset_out_desc = {
.bLength = USB_DT_ENDPOINT_SIZE,
.bDescriptorType = USB_DT_ENDPOINT,
@@ -210,7 +210,7 @@ static struct usb_endpoint_descriptor ss_subset_out_desc __initdata = {
.wMaxPacketSize = cpu_to_le16(1024),
};
-static struct usb_ss_ep_comp_descriptor ss_subset_bulk_comp_desc __initdata = {
+static struct usb_ss_ep_comp_descriptor ss_subset_bulk_comp_desc = {
.bLength = sizeof ss_subset_bulk_comp_desc,
.bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
@@ -219,7 +219,7 @@ static struct usb_ss_ep_comp_descriptor ss_subset_bulk_comp_desc __initdata = {
/* .bmAttributes = 0, */
};
-static struct usb_descriptor_header *ss_eth_function[] __initdata = {
+static struct usb_descriptor_header *ss_eth_function[] = {
(struct usb_descriptor_header *) &subset_data_intf,
(struct usb_descriptor_header *) &mdlm_header_desc,
(struct usb_descriptor_header *) &mdlm_desc,
@@ -290,7 +290,7 @@ static void geth_disable(struct usb_function *f)
/* serial function driver setup/binding */
-static int __init
+static int
geth_bind(struct usb_configuration *c, struct usb_function *f)
{
struct usb_composite_dev *cdev = c->cdev;
@@ -404,7 +404,7 @@ geth_unbind(struct usb_configuration *c, struct usb_function *f)
* Caller must have called @gether_setup(). Caller is also responsible
* for calling @gether_cleanup() before module unload.
*/
-int __init geth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN])
+int geth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN])
{
struct f_gether *geth;
int status;
--
1.7.2.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-03-21 14:06 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-11 13:31 [PATCH] usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH Lothar Waßmann
2012-03-11 13:51 ` Michal Nazarewicz
2012-03-11 14:08 ` Lothar Waßmann
2012-03-12 5:21 ` Michal Nazarewicz
2012-03-21 10:04 ` Felipe Balbi
2012-03-21 11:10 ` Lothar Waßmann
2012-03-21 11:42 ` Felipe Balbi
2012-03-21 12:35 ` Lothar Waßmann
2012-03-21 14:06 ` [PATCH v2] " Lothar Waßmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox