From: Mike Frysinger <vapier@gentoo.org>
To: linux-usb@vger.kernel.org, Felipe Balbi <felipe.balbi@nokia.com>
Cc: linux-kernel@vger.kernel.org,
uclinux-dist-devel@blackfin.uclinux.org,
Bryan Wu <cooloney@kernel.org>
Subject: [PATCH 02/11] USB: musb: kill compile warning for Blackfin systems
Date: Wed, 16 Sep 2009 19:38:36 -0400 [thread overview]
Message-ID: <1253144325-1203-2-git-send-email-vapier@gentoo.org> (raw)
In-Reply-To: <1253144325-1203-1-git-send-email-vapier@gentoo.org>
From: Bryan Wu <cooloney@kernel.org>
The Blackfin version of musb_read_target_reg_base() returns a u16 when the
common code expects a (void __iomem *), so update the Blackfin function to
return the right value. This fixes the compile warning:
drivers/usb/musb/musb_core.c: In function 'musb_core_init':
drivers/usb/musb/musb_core.c:1448: warning: assignment makes pointer from
integer without a cast
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
drivers/usb/musb/musb_regs.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h
index fbfd3fd..0154e38 100644
--- a/drivers/usb/musb/musb_regs.h
+++ b/drivers/usb/musb/musb_regs.h
@@ -474,9 +474,9 @@ static inline u16 musb_read_hwvers(void __iomem *mbase)
return 0;
}
-static inline u16 musb_read_target_reg_base(u8 i, void __iomem *mbase)
+static inline void __iomem *musb_read_target_reg_base(u8 i, void __iomem *mbase)
{
- return 0;
+ return NULL;
}
static inline void musb_write_rxfunaddr(void __iomem *ep_target_regs,
--
1.6.5.rc1
next prev parent reply other threads:[~2009-09-16 23:40 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-16 23:38 [PATCH 01/11] USB: musb: tweak musb_read_fifo() to avoid unused warnings Mike Frysinger
2009-09-16 23:38 ` Mike Frysinger [this message]
2009-09-16 23:38 ` [PATCH 03/11] USB: musb: kill some useless comments in Blackfin driver Mike Frysinger
2009-09-16 23:38 ` [PATCH 04/11] USB: musb: update Blackfin processor dependency Mike Frysinger
2009-09-16 23:38 ` [PATCH 05/11] USB: musb: add notes for Blackfin anomalies Mike Frysinger
2009-09-17 12:33 ` Sergei Shtylyov
2009-09-17 16:25 ` [PATCH 05/12 v2] " Mike Frysinger
2009-09-16 23:38 ` [PATCH 06/11] USB: musb: add work around for Blackfin anomaly 05000456 Mike Frysinger
2009-09-16 23:38 ` [PATCH 07/11] USB: musb: fix musb_platform_set_mode() definition Mike Frysinger
2009-09-16 23:38 ` [PATCH 08/11] USB: musb: clear the Blackfin interrupt pending bits early in the ISR Mike Frysinger
2009-09-16 23:38 ` [PATCH 09/11] USB: musb: error out when anomaly 05000380 is applicable Mike Frysinger
2009-09-16 23:38 ` [PATCH 10/11] USB: musb: Blackfin code needs NOP_USB_XCEIV too Mike Frysinger
2009-09-16 23:38 ` [PATCH 11/11] USB: musb: fix printf warning in debug code Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1253144325-1203-2-git-send-email-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=cooloney@kernel.org \
--cc=felipe.balbi@nokia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=uclinux-dist-devel@blackfin.uclinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®