| Message ID | 20130210032234.GE4801@atomide.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Tony Lindgren <tony@atomide.com> [130209 19:29]: > > From: Tony Lindgren <tony@atomide.com> > Date: Sat, 9 Feb 2013 19:20:57 -0800 > Subject: [PATCH] ARCH: OMAP2+: Make sure files with omap initcalls include soc.h Oops, will fix up the subject to say ARM: OMAP2+ instead of ARCH.. > Looks like there are few more places that I missed that can cause > compiler warnings. After grepping for omap initcall, all files > needing soc.h should now have it. > > Reported-by: Russell King <rmk+kernel@arm.linux.org.uk> > Signed-off-by: Tony Lindgren <tony@atomide.com> > > --- a/arch/arm/mach-omap2/omap-iommu.c > +++ b/arch/arm/mach-omap2/omap-iommu.c > @@ -16,6 +16,7 @@ > #include <linux/slab.h> > > #include <linux/platform_data/iommu-omap.h> > +#include "soc.h" > #include "omap_hwmod.h" > #include "omap_device.h" > > --- a/arch/arm/mach-omap2/smartreflex-class3.c > +++ b/arch/arm/mach-omap2/smartreflex-class3.c > @@ -12,6 +12,7 @@ > */ > > #include <linux/power/smartreflex.h> > +#include "soc.h" > #include "voltage.h" > > static int sr_class3_enable(struct omap_sr *sr) > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Sat, Feb 9, 2013 at 7:22 PM, Tony Lindgren <tony@atomide.com> wrote: > * Olof Johansson <olof@lixom.net> [130209 19:08]: >> On Sat, Feb 9, 2013 at 7:00 PM, Tony Lindgren <tony@atomide.com> wrote: >> > * Russell King - ARM Linux <linux@arm.linux.org.uk> [130209 03:53]: >> >> On Tue, Feb 05, 2013 at 02:22:18PM +0000, Russell King - ARM Linux wrote: >> >> > arch/arm/mach-omap2/hwspinlock.c:60:1: warning: data definition has no type or storage class >> >> > arch/arm/mach-omap2/hwspinlock.c:60:1: warning: type defaults to 'int' in declaration of 'omap_postcore_initcall' >> >> > arch/arm/mach-omap2/hwspinlock.c:60:1: warning: parameter names (without types) in function declaration >> >> > arch/arm/mach-omap2/hwspinlock.c:31:122: warning: 'hwspinlocks_init' defined but not used >> >> >> >> I'm still seeing the above in the build of Friday's merge. I'm also >> >> seeing additional warnings in the randconfig similar to the above for >> >> arch/arm/mach-omap2/omap-iommu.c. >> > >> > Thanks for letting me know about the omap-iommu.c one. Looks like >> > there's also one patch for drm.c. >> > >> > Olof, if you did not yet apply the hwspinlock.c warning fix, I'll >> > just do a branch with all three of them for you. >> >> I haven't (must have missed it), so please just send a branch. > > OK will do. Probably you started fixing up the bad Reported-by > line in my patch and then got disrupted :) > > Found one more after some grepping, after the following patch they > should be all fixed up. Pull request coming shortly. Oh wait -- I got confused there for a bit (this came in right as I had to step out for a while). I definitely picked up the hwspinlock patch, and it's there in my local for-next. Looks like I missed pushing it out though. That explains why Russell didn't see the fix. :( So, the hwspinlock patch is already applied. The soc.h one is not, and I'm not sure what the third one is? -Olof
* Olof Johansson <olof@lixom.net> [130209 20:25]: > On Sat, Feb 9, 2013 at 7:22 PM, Tony Lindgren <tony@atomide.com> wrote: > > * Olof Johansson <olof@lixom.net> [130209 19:08]: > >> On Sat, Feb 9, 2013 at 7:00 PM, Tony Lindgren <tony@atomide.com> wrote: > >> > * Russell King - ARM Linux <linux@arm.linux.org.uk> [130209 03:53]: > >> >> On Tue, Feb 05, 2013 at 02:22:18PM +0000, Russell King - ARM Linux wrote: > >> >> > arch/arm/mach-omap2/hwspinlock.c:60:1: warning: data definition has no type or storage class > >> >> > arch/arm/mach-omap2/hwspinlock.c:60:1: warning: type defaults to 'int' in declaration of 'omap_postcore_initcall' > >> >> > arch/arm/mach-omap2/hwspinlock.c:60:1: warning: parameter names (without types) in function declaration > >> >> > arch/arm/mach-omap2/hwspinlock.c:31:122: warning: 'hwspinlocks_init' defined but not used > >> >> > >> >> I'm still seeing the above in the build of Friday's merge. I'm also > >> >> seeing additional warnings in the randconfig similar to the above for > >> >> arch/arm/mach-omap2/omap-iommu.c. > >> > > >> > Thanks for letting me know about the omap-iommu.c one. Looks like > >> > there's also one patch for drm.c. > >> > > >> > Olof, if you did not yet apply the hwspinlock.c warning fix, I'll > >> > just do a branch with all three of them for you. > >> > >> I haven't (must have missed it), so please just send a branch. > > > > OK will do. Probably you started fixing up the bad Reported-by > > line in my patch and then got disrupted :) > > > > Found one more after some grepping, after the following patch they > > should be all fixed up. Pull request coming shortly. > > Oh wait -- I got confused there for a bit (this came in right as I had > to step out for a while). > > I definitely picked up the hwspinlock patch, and it's there in my > local for-next. Looks like I missed pushing it out though. That > explains why Russell didn't see the fix. :( > > > So, the hwspinlock patch is already applied. The soc.h one is not, and > I'm not sure what the third one is? Maybe check that you have these in your multiplatform branch: 09cee18dbced86b27c6c7d4501126cf2a287d089 ARM: OMAP2+: Make sure files with omap initcalls include soc.h b9a30021abeaf9687640c13ef8006346736dc29f ARM: OMAP2+: Include soc.h to drm.c to fix compiling f3533403b5a8ac970f6159664d145cb88b1aa6bf ARM: OMAP2+: Fix warning for hwspinlock omap_postcore_initcall You can cherry pick the missing ones from my omap-for-v3.9/multiplatform-fixes branch. Regards, Tony
On Mon, Feb 11, 2013 at 11:05 AM, Tony Lindgren <tony@atomide.com> wrote: > * Olof Johansson <olof@lixom.net> [130209 20:25]: >> On Sat, Feb 9, 2013 at 7:22 PM, Tony Lindgren <tony@atomide.com> wrote: >> > * Olof Johansson <olof@lixom.net> [130209 19:08]: >> >> On Sat, Feb 9, 2013 at 7:00 PM, Tony Lindgren <tony@atomide.com> wrote: >> >> > * Russell King - ARM Linux <linux@arm.linux.org.uk> [130209 03:53]: >> >> >> On Tue, Feb 05, 2013 at 02:22:18PM +0000, Russell King - ARM Linux wrote: >> >> >> > arch/arm/mach-omap2/hwspinlock.c:60:1: warning: data definition has no type or storage class >> >> >> > arch/arm/mach-omap2/hwspinlock.c:60:1: warning: type defaults to 'int' in declaration of 'omap_postcore_initcall' >> >> >> > arch/arm/mach-omap2/hwspinlock.c:60:1: warning: parameter names (without types) in function declaration >> >> >> > arch/arm/mach-omap2/hwspinlock.c:31:122: warning: 'hwspinlocks_init' defined but not used >> >> >> >> >> >> I'm still seeing the above in the build of Friday's merge. I'm also >> >> >> seeing additional warnings in the randconfig similar to the above for >> >> >> arch/arm/mach-omap2/omap-iommu.c. >> >> > >> >> > Thanks for letting me know about the omap-iommu.c one. Looks like >> >> > there's also one patch for drm.c. >> >> > >> >> > Olof, if you did not yet apply the hwspinlock.c warning fix, I'll >> >> > just do a branch with all three of them for you. >> >> >> >> I haven't (must have missed it), so please just send a branch. >> > >> > OK will do. Probably you started fixing up the bad Reported-by >> > line in my patch and then got disrupted :) >> > >> > Found one more after some grepping, after the following patch they >> > should be all fixed up. Pull request coming shortly. >> >> Oh wait -- I got confused there for a bit (this came in right as I had >> to step out for a while). >> >> I definitely picked up the hwspinlock patch, and it's there in my >> local for-next. Looks like I missed pushing it out though. That >> explains why Russell didn't see the fix. :( >> >> >> So, the hwspinlock patch is already applied. The soc.h one is not, and >> I'm not sure what the third one is? > > Maybe check that you have these in your multiplatform branch: > > 09cee18dbced86b27c6c7d4501126cf2a287d089 ARM: OMAP2+: Make sure files with omap initcalls include soc.h > b9a30021abeaf9687640c13ef8006346736dc29f ARM: OMAP2+: Include soc.h to drm.c to fix compiling > f3533403b5a8ac970f6159664d145cb88b1aa6bf ARM: OMAP2+: Fix warning for hwspinlock omap_postcore_initcall > > You can cherry pick the missing ones from my omap-for-v3.9/multiplatform-fixes > branch. Yeah, that email was from before I had cherry-picked in from your last pull request. Sorry for the confusion. :) -Olof
--- a/arch/arm/mach-omap2/omap-iommu.c +++ b/arch/arm/mach-omap2/omap-iommu.c @@ -16,6 +16,7 @@ #include <linux/slab.h> #include <linux/platform_data/iommu-omap.h> +#include "soc.h" #include "omap_hwmod.h" #include "omap_device.h" --- a/arch/arm/mach-omap2/smartreflex-class3.c +++ b/arch/arm/mach-omap2/smartreflex-class3.c @@ -12,6 +12,7 @@ */ #include <linux/power/smartreflex.h> +#include "soc.h" #include "voltage.h" static int sr_class3_enable(struct omap_sr *sr)