Hi,
On Tue, May 17, 2011 at 04:45:45PM -0400, Mike Frysinger wrote:
> this patch breaks blackfin musb:
> commit 5c8a86e10a7c164f44537fabdc169fd8b4e7a440
> usb: musb: drop unneeded musb_debug trickery
>
> CC drivers/usb/musb/blackfin.o
> drivers/usb/musb/blackfin.c: In function âmusb_write_fifoâ:
> drivers/usb/musb/blackfin.c:46: error: âmusbâ undeclared (first use in
> this function)
> drivers/usb/musb/blackfin.c:46: error: (Each undeclared identifier is
> reported only once
> drivers/usb/musb/blackfin.c:46: error: for each function it appears in.)
> drivers/usb/musb/blackfin.c: In function âmusb_read_fifoâ:
> drivers/usb/musb/blackfin.c:157: error: âmusbâ undeclared (first use
> in this function)
> make[3]: *** [drivers/usb/musb/blackfin.o] Error 1
>
> looking at the code, it seems that drivers/usb/musb/tusb6010.c will
> break too. i'm guessing both need what musb_core.c has:
> struct musb *musb = hw_ep->musb;
my bad, that patch was made by a simple regex and it seems I didn't
compile enough. But I remember fixing tusb6010, maybe I forgot to git
add.
Anyway, patch attached and pull request below:
The following changes since commit 43b416e5f6a3ce269571cfe25c8f1e8e9316c5b0:
MAINTAINERS: tree moved to kernel.org (2011-05-13 15:21:47 +0300)
are available in the git repository at:
master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb.git for-next
Felipe Balbi (1):
usb: musb: fix compile error
drivers/usb/musb/blackfin.c | 2 ++
drivers/usb/musb/tusb6010.c | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
Greg can you either apply the patch or pull my for-next branch again ?
Thanks a lot.
Thanks for the report Mike.
--
balbi
From 60cccb7797f8c62cacca37965ac0e449aeaaee52 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@xxxxxx>
Date: Wed, 18 May 2011 00:25:03 +0300
Subject: [PATCH] usb: musb: fix compile error
Organization: Texas Instruments\n
commit 35a83365da6aa10095c6138cc428c15853409c32
(usb: musb: drop unneeded musb_debug trickery)
introduced a compile error for blackfin and
tusb6010 glue layers. Fix it.
Reported-by: Mike Frysinger <vapier.adi@xxxxxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
---
drivers/usb/musb/blackfin.c | 2 ++
drivers/usb/musb/tusb6010.c | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index 95d75c0..ae8c396 100644
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
@@ -35,6 +35,7 @@ struct bfin_glue {
*/
void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *src)
{
+ struct musb *musb = hw_ep->musb;
void __iomem *fifo = hw_ep->fifo;
void __iomem *epio = hw_ep->regs;
u8 epnum = hw_ep->epnum;
@@ -98,6 +99,7 @@ void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *src)
*/
void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *dst)
{
+ struct musb *musb = hw_ep->musb;
void __iomem *fifo = hw_ep->fifo;
u8 epnum = hw_ep->epnum;
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index 2f683a6..b410357 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -172,6 +172,7 @@ static inline void tusb_fifo_read_unaligned(void __iomem *fifo,
void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *buf)
{
+ struct musb *musb = hw_ep->musb;
void __iomem *ep_conf = hw_ep->conf;
void __iomem *fifo = hw_ep->fifo;
u8 epnum = hw_ep->epnum;
@@ -221,6 +222,7 @@ void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *buf)
void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *buf)
{
+ struct musb *musb = hw_ep->musb;
void __iomem *ep_conf = hw_ep->conf;
void __iomem *fifo = hw_ep->fifo;
u8 epnum = hw_ep->epnum;
--
1.7.5.1.300.gc565c
Attachment:
signature.asc
Description: Digital signature
