On Thu, Feb 10, 2011 at 05:18:54PM -0800, Greg KH wrote:
> On Fri, Feb 11, 2011 at 12:26:47AM +0100, Johan Hovold wrote:
> > On Thu, Feb 10, 2011 at 12:15:59PM -0800, Greg Kroah-Hartman wrote:
> > > From: Felipe Balbi <balbi@xxxxxx>
> > >
> > > We know that blackfin doesn't support double
> > > buffering feature as of today. So we add a
> > > flag set by musb_platform_init() to forcefully
> > > disable that feature.
> > >
> > > Such flag is created and marked as deprecated
> > > to force us to find a solution for the missing
> > > double buffering support on blackfin.
> >
> > This patch breaks builds with CONFIG_USB_GADGET_MUSB_HDRC unset:
> >
> >
> > CC drivers/usb/musb/musb_host.o
> > drivers/usb/musb/musb_host.c: In function âmusb_rx_reinitâ:
> > drivers/usb/musb/musb_host.c:612: error: âstruct musbâ has no member named âdouble_buffer_not_okâ
> > drivers/usb/musb/musb_host.c: In function âmusb_ep_programâ:
> > drivers/usb/musb/musb_host.c:787: error: âstruct musbâ has no member named âdouble_buffer_not_okâ
> >
> >
> > as the double_buffer_not_ok flag is compiled out of struct musb in this
> > case. Moving the declaration out of the ifdef fixes my build.
>
> Ick. Felipe, care to send a patch fixing this?
Sure, it's attached. My bad. Should've tested the several combinations
of Kconfig.
--
balbi
>From 0b97a7b32ffa4a6465cad0dbf51b85e54e09fe4f Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@xxxxxx>
Date: Fri, 11 Feb 2011 10:00:02 +0200
Subject: [PATCH] usb: musb: fix build breakage
Organization: Texas Instruments\n
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
---
drivers/usb/musb/musb_core.h | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index d74a811..e6400be 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -488,6 +488,15 @@ struct musb {
unsigned set_address:1;
unsigned test_mode:1;
unsigned softconnect:1;
+
+ u8 address;
+ u8 test_mode_nr;
+ u16 ackpend; /* ep0 */
+ enum musb_g_ep0_state ep0_state;
+ struct usb_gadget g; /* the gadget */
+ struct usb_gadget_driver *gadget_driver; /* its driver */
+#endif
+
/*
* FIXME: Remove this flag.
*
@@ -501,14 +510,6 @@ struct musb {
*/
unsigned double_buffer_not_ok:1 __deprecated;
- u8 address;
- u8 test_mode_nr;
- u16 ackpend; /* ep0 */
- enum musb_g_ep0_state ep0_state;
- struct usb_gadget g; /* the gadget */
- struct usb_gadget_driver *gadget_driver; /* its driver */
-#endif
-
struct musb_hdrc_config *config;
#ifdef MUSB_CONFIG_PROC_FS
--
1.7.4.rc2
