* [PATCH] ARM: OMAP1: usb: fix sparse warnings
@ 2012-10-26 20:52 Paul Walmsley
2012-10-26 21:20 ` Tony Lindgren
0 siblings, 1 reply; 8+ messages in thread
From: Paul Walmsley @ 2012-10-26 20:52 UTC (permalink / raw)
To: linux-arm-kernel
Resolve the following sparse warnings:
arch/arm/mach-omap1/usb.c:304:12: warning: symbol 'omap1_usb0_init' was not declared. Should it be static?
arch/arm/mach-omap1/usb.c:412:12: warning: symbol 'omap1_usb1_init' was not declared. Should it be static?
arch/arm/mach-omap1/usb.c:478:12: warning: symbol 'omap1_usb2_init' was not declared. Should it be static?
by declaring those functions as static. Also remove the unneeded
prototypes and related code from the plat/usb.h header file.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Felipe Balbi <balbi@ti.com>
---
Tony, care to take this one?
arch/arm/mach-omap1/usb.c | 6 +++---
arch/arm/plat-omap/include/plat/usb.h | 20 --------------------
2 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c
index 84267ed..104fed3 100644
--- a/arch/arm/mach-omap1/usb.c
+++ b/arch/arm/mach-omap1/usb.c
@@ -301,7 +301,7 @@ static inline void otg_device_init(struct omap_usb_config *pdata)
#endif
-u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
+static u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
{
u32 syscon1 = 0;
@@ -409,7 +409,7 @@ u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
return syscon1 << 16;
}
-u32 __init omap1_usb1_init(unsigned nwires)
+static u32 __init omap1_usb1_init(unsigned nwires)
{
u32 syscon1 = 0;
@@ -475,7 +475,7 @@ bad:
return syscon1 << 20;
}
-u32 __init omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
+static u32 __init omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
{
u32 syscon1 = 0;
diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
index 87ee140..669baa1 100644
--- a/arch/arm/plat-omap/include/plat/usb.h
+++ b/arch/arm/plat-omap/include/plat/usb.h
@@ -156,24 +156,4 @@ extern void ti81xx_musb_phy_power(u8 on);
#define USBPHY_OTGSESSEND_EN (1 << 20)
#define USBPHY_DATA_POLARITY (1 << 23)
-#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_USB)
-u32 omap1_usb0_init(unsigned nwires, unsigned is_device);
-u32 omap1_usb1_init(unsigned nwires);
-u32 omap1_usb2_init(unsigned nwires, unsigned alt_pingroup);
-#else
-static inline u32 omap1_usb0_init(unsigned nwires, unsigned is_device)
-{
- return 0;
-}
-static inline u32 omap1_usb1_init(unsigned nwires)
-{
- return 0;
-
-}
-static inline u32 omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
-{
- return 0;
-}
-#endif
-
#endif /* __ASM_ARCH_OMAP_USB_H */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH] ARM: OMAP1: usb: fix sparse warnings
2012-10-26 20:52 [PATCH] ARM: OMAP1: usb: fix sparse warnings Paul Walmsley
@ 2012-10-26 21:20 ` Tony Lindgren
2012-10-26 21:25 ` Paul Walmsley
2012-10-26 21:28 ` [PATCH v2] " Paul Walmsley
0 siblings, 2 replies; 8+ messages in thread
From: Tony Lindgren @ 2012-10-26 21:20 UTC (permalink / raw)
To: linux-arm-kernel
* Paul Walmsley <paul@pwsan.com> [121026 13:54]:
>
> Resolve the following sparse warnings:
>
> arch/arm/mach-omap1/usb.c:304:12: warning: symbol 'omap1_usb0_init' was not declared. Should it be static?
> arch/arm/mach-omap1/usb.c:412:12: warning: symbol 'omap1_usb1_init' was not declared. Should it be static?
> arch/arm/mach-omap1/usb.c:478:12: warning: symbol 'omap1_usb2_init' was not declared. Should it be static?
>
> by declaring those functions as static. Also remove the unneeded
> prototypes and related code from the plat/usb.h header file.
>
> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Felipe Balbi <balbi@ti.com>
> ---
>
> Tony, care to take this one?
Let's apply just the usb.c changes on omap-for-v3.8/cleanup-headers
as plat/usb.h is now gone?
Regards,
Tony
> arch/arm/mach-omap1/usb.c | 6 +++---
> arch/arm/plat-omap/include/plat/usb.h | 20 --------------------
> 2 files changed, 3 insertions(+), 23 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c
> index 84267ed..104fed3 100644
> --- a/arch/arm/mach-omap1/usb.c
> +++ b/arch/arm/mach-omap1/usb.c
> @@ -301,7 +301,7 @@ static inline void otg_device_init(struct omap_usb_config *pdata)
>
> #endif
>
> -u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
> +static u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
> {
> u32 syscon1 = 0;
>
> @@ -409,7 +409,7 @@ u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
> return syscon1 << 16;
> }
>
> -u32 __init omap1_usb1_init(unsigned nwires)
> +static u32 __init omap1_usb1_init(unsigned nwires)
> {
> u32 syscon1 = 0;
>
> @@ -475,7 +475,7 @@ bad:
> return syscon1 << 20;
> }
>
> -u32 __init omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
> +static u32 __init omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
> {
> u32 syscon1 = 0;
>
> diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
> index 87ee140..669baa1 100644
> --- a/arch/arm/plat-omap/include/plat/usb.h
> +++ b/arch/arm/plat-omap/include/plat/usb.h
> @@ -156,24 +156,4 @@ extern void ti81xx_musb_phy_power(u8 on);
> #define USBPHY_OTGSESSEND_EN (1 << 20)
> #define USBPHY_DATA_POLARITY (1 << 23)
>
> -#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_USB)
> -u32 omap1_usb0_init(unsigned nwires, unsigned is_device);
> -u32 omap1_usb1_init(unsigned nwires);
> -u32 omap1_usb2_init(unsigned nwires, unsigned alt_pingroup);
> -#else
> -static inline u32 omap1_usb0_init(unsigned nwires, unsigned is_device)
> -{
> - return 0;
> -}
> -static inline u32 omap1_usb1_init(unsigned nwires)
> -{
> - return 0;
> -
> -}
> -static inline u32 omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
> -{
> - return 0;
> -}
> -#endif
> -
> #endif /* __ASM_ARCH_OMAP_USB_H */
> --
> 1.7.10.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH] ARM: OMAP1: usb: fix sparse warnings
2012-10-26 21:20 ` Tony Lindgren
@ 2012-10-26 21:25 ` Paul Walmsley
2012-10-26 21:28 ` Tony Lindgren
2012-10-26 21:28 ` [PATCH v2] " Paul Walmsley
1 sibling, 1 reply; 8+ messages in thread
From: Paul Walmsley @ 2012-10-26 21:25 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, 26 Oct 2012, Tony Lindgren wrote:
> * Paul Walmsley <paul@pwsan.com> [121026 13:54]:
> >
> > Resolve the following sparse warnings:
> >
> > arch/arm/mach-omap1/usb.c:304:12: warning: symbol 'omap1_usb0_init' was not declared. Should it be static?
> > arch/arm/mach-omap1/usb.c:412:12: warning: symbol 'omap1_usb1_init' was not declared. Should it be static?
> > arch/arm/mach-omap1/usb.c:478:12: warning: symbol 'omap1_usb2_init' was not declared. Should it be static?
> >
> > by declaring those functions as static. Also remove the unneeded
> > prototypes and related code from the plat/usb.h header file.
> >
> > Signed-off-by: Paul Walmsley <paul@pwsan.com>
> > Cc: Tony Lindgren <tony@atomide.com>
> > Cc: Felipe Balbi <balbi@ti.com>
> > ---
> >
> > Tony, care to take this one?
>
> Let's apply just the usb.c changes on omap-for-v3.8/cleanup-headers
> as plat/usb.h is now gone?
OK no problem, thought you might want it for the -rc series...
- Paul
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] ARM: OMAP1: usb: fix sparse warnings
2012-10-26 21:25 ` Paul Walmsley
@ 2012-10-26 21:28 ` Tony Lindgren
2012-10-26 21:29 ` Paul Walmsley
0 siblings, 1 reply; 8+ messages in thread
From: Tony Lindgren @ 2012-10-26 21:28 UTC (permalink / raw)
To: linux-arm-kernel
* Paul Walmsley <paul@pwsan.com> [121026 14:27]:
> On Fri, 26 Oct 2012, Tony Lindgren wrote:
>
> > * Paul Walmsley <paul@pwsan.com> [121026 13:54]:
> > >
> > > Resolve the following sparse warnings:
> > >
> > > arch/arm/mach-omap1/usb.c:304:12: warning: symbol 'omap1_usb0_init' was not declared. Should it be static?
> > > arch/arm/mach-omap1/usb.c:412:12: warning: symbol 'omap1_usb1_init' was not declared. Should it be static?
> > > arch/arm/mach-omap1/usb.c:478:12: warning: symbol 'omap1_usb2_init' was not declared. Should it be static?
> > >
> > > by declaring those functions as static. Also remove the unneeded
> > > prototypes and related code from the plat/usb.h header file.
> > >
> > > Signed-off-by: Paul Walmsley <paul@pwsan.com>
> > > Cc: Tony Lindgren <tony@atomide.com>
> > > Cc: Felipe Balbi <balbi@ti.com>
> > > ---
> > >
> > > Tony, care to take this one?
> >
> > Let's apply just the usb.c changes on omap-for-v3.8/cleanup-headers
> > as plat/usb.h is now gone?
>
> OK no problem, thought you might want it for the -rc series...
Looks like it's not urgent for the -rc series, so let's not
introduce more self-inflicted merge conflicts. If that's OK
with you, I can apply it to omap-for-v3.8/cleanup-headers
without the header changes.
Regards,
Tony
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] ARM: OMAP1: usb: fix sparse warnings
2012-10-26 21:28 ` Tony Lindgren
@ 2012-10-26 21:29 ` Paul Walmsley
0 siblings, 0 replies; 8+ messages in thread
From: Paul Walmsley @ 2012-10-26 21:29 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, 26 Oct 2012, Tony Lindgren wrote:
> Looks like it's not urgent for the -rc series, so let's not
> introduce more self-inflicted merge conflicts. If that's OK
> with you, I can apply it to omap-for-v3.8/cleanup-headers
> without the header changes.
Yep that's fine, better to avoid creating unnecessary merge conflicts for
sure. Just sent the version against omap-for-v3.8/cleanup-headers...
- Paul
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2] ARM: OMAP1: usb: fix sparse warnings
2012-10-26 21:20 ` Tony Lindgren
2012-10-26 21:25 ` Paul Walmsley
@ 2012-10-26 21:28 ` Paul Walmsley
2012-10-26 21:33 ` Tony Lindgren
2012-10-29 16:21 ` Felipe Balbi
1 sibling, 2 replies; 8+ messages in thread
From: Paul Walmsley @ 2012-10-26 21:28 UTC (permalink / raw)
To: linux-arm-kernel
Resolve the following sparse warnings:
arch/arm/mach-omap1/usb.c:304:12: warning: symbol 'omap1_usb0_init' was not declared. Should it be static?
arch/arm/mach-omap1/usb.c:412:12: warning: symbol 'omap1_usb1_init' was not declared. Should it be static?
arch/arm/mach-omap1/usb.c:478:12: warning: symbol 'omap1_usb2_init' was not declared. Should it be static?
by declaring those functions as static.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Felipe Balbi <balbi@ti.com>
---
Applies on linux-omap/omap-for-v3.8/cleanup-headers.
arch/arm/mach-omap1/usb.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c
index 84267ed..104fed3 100644
--- a/arch/arm/mach-omap1/usb.c
+++ b/arch/arm/mach-omap1/usb.c
@@ -301,7 +301,7 @@ static inline void otg_device_init(struct omap_usb_config *pdata)
#endif
-u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
+static u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
{
u32 syscon1 = 0;
@@ -409,7 +409,7 @@ u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
return syscon1 << 16;
}
-u32 __init omap1_usb1_init(unsigned nwires)
+static u32 __init omap1_usb1_init(unsigned nwires)
{
u32 syscon1 = 0;
@@ -475,7 +475,7 @@ bad:
return syscon1 << 20;
}
-u32 __init omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
+static u32 __init omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
{
u32 syscon1 = 0;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2] ARM: OMAP1: usb: fix sparse warnings
2012-10-26 21:28 ` [PATCH v2] " Paul Walmsley
@ 2012-10-26 21:33 ` Tony Lindgren
2012-10-29 16:21 ` Felipe Balbi
1 sibling, 0 replies; 8+ messages in thread
From: Tony Lindgren @ 2012-10-26 21:33 UTC (permalink / raw)
To: linux-arm-kernel
* Paul Walmsley <paul@pwsan.com> [121026 14:30]:
>
> Resolve the following sparse warnings:
>
> arch/arm/mach-omap1/usb.c:304:12: warning: symbol 'omap1_usb0_init' was not declared. Should it be static?
> arch/arm/mach-omap1/usb.c:412:12: warning: symbol 'omap1_usb1_init' was not declared. Should it be static?
> arch/arm/mach-omap1/usb.c:478:12: warning: symbol 'omap1_usb2_init' was not declared. Should it be static?
>
> by declaring those functions as static.
>
> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Felipe Balbi <balbi@ti.com>
> ---
>
> Applies on linux-omap/omap-for-v3.8/cleanup-headers.
Thanks applied.
Regards,
Tony
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2] ARM: OMAP1: usb: fix sparse warnings
2012-10-26 21:28 ` [PATCH v2] " Paul Walmsley
2012-10-26 21:33 ` Tony Lindgren
@ 2012-10-29 16:21 ` Felipe Balbi
1 sibling, 0 replies; 8+ messages in thread
From: Felipe Balbi @ 2012-10-29 16:21 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 26, 2012 at 09:28:58PM +0000, Paul Walmsley wrote:
>
> Resolve the following sparse warnings:
>
> arch/arm/mach-omap1/usb.c:304:12: warning: symbol 'omap1_usb0_init' was not declared. Should it be static?
> arch/arm/mach-omap1/usb.c:412:12: warning: symbol 'omap1_usb1_init' was not declared. Should it be static?
> arch/arm/mach-omap1/usb.c:478:12: warning: symbol 'omap1_usb2_init' was not declared. Should it be static?
>
> by declaring those functions as static.
>
> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Felipe Balbi <balbi@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
> ---
>
> Applies on linux-omap/omap-for-v3.8/cleanup-headers.
>
> arch/arm/mach-omap1/usb.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c
> index 84267ed..104fed3 100644
> --- a/arch/arm/mach-omap1/usb.c
> +++ b/arch/arm/mach-omap1/usb.c
> @@ -301,7 +301,7 @@ static inline void otg_device_init(struct omap_usb_config *pdata)
>
> #endif
>
> -u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
> +static u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
> {
> u32 syscon1 = 0;
>
> @@ -409,7 +409,7 @@ u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
> return syscon1 << 16;
> }
>
> -u32 __init omap1_usb1_init(unsigned nwires)
> +static u32 __init omap1_usb1_init(unsigned nwires)
> {
> u32 syscon1 = 0;
>
> @@ -475,7 +475,7 @@ bad:
> return syscon1 << 20;
> }
>
> -u32 __init omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
> +static u32 __init omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
> {
> u32 syscon1 = 0;
>
> --
> 1.7.10.4
>
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121029/cecc3b45/attachment.sig>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-10-29 16:21 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-26 20:52 [PATCH] ARM: OMAP1: usb: fix sparse warnings Paul Walmsley
2012-10-26 21:20 ` Tony Lindgren
2012-10-26 21:25 ` Paul Walmsley
2012-10-26 21:28 ` Tony Lindgren
2012-10-26 21:29 ` Paul Walmsley
2012-10-26 21:28 ` [PATCH v2] " Paul Walmsley
2012-10-26 21:33 ` Tony Lindgren
2012-10-29 16:21 ` Felipe Balbi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).