On Mon, Apr 09, 2007 at 05:01:06PM -0400, Tony Lindgren wrote:
> From: David Brownell <[email protected]>
>
> Minor GPIO cleanups: remove needless #include, and omap_gpio_init()
> should be __init, as well as all the board init code calling it.
>
> Signed-off-by: David Brownell <[email protected]>
> Signed-off-by: Tony Lindgren <[email protected]>
I've applied 8 patches from this series by cherry picking it from your
git tree, minus this patch which git wouldn't apply due to fuzz in
arch/arm/plat-omap/gpio.c.
> ---
> arch/arm/mach-omap1/board-fsample.c | 2 +-
> arch/arm/mach-omap1/board-h3.c | 2 +-
> arch/arm/mach-omap1/board-innovator.c | 2 +-
> arch/arm/mach-omap1/board-perseus2.c | 2 +-
> arch/arm/plat-omap/gpio.c | 3 +--
> 5 files changed, 5 insertions(+), 6 deletions(-)
>
> --- a/arch/arm/mach-omap1/board-fsample.c
> +++ b/arch/arm/mach-omap1/board-fsample.c
> @@ -246,7 +246,7 @@ static void __init fsample_init_smc91x(void)
> mdelay(50);
> }
>
> -void omap_fsample_init_irq(void)
> +static void __init omap_fsample_init_irq(void)
> {
> omap1_init_common_hw();
> omap_init_irq();
> --- a/arch/arm/mach-omap1/board-h3.c
> +++ b/arch/arm/mach-omap1/board-h3.c
> @@ -455,7 +455,7 @@ static void __init h3_init_smc91x(void)
> }
> }
>
> -void h3_init_irq(void)
> +static void __init h3_init_irq(void)
> {
> omap1_init_common_hw();
> omap_init_irq();
> --- a/arch/arm/mach-omap1/board-innovator.c
> +++ b/arch/arm/mach-omap1/board-innovator.c
> @@ -308,7 +308,7 @@ static void __init innovator_init_smc91x(void)
> }
> }
>
> -void innovator_init_irq(void)
> +static void __init innovator_init_irq(void)
> {
> omap1_init_common_hw();
> omap_init_irq();
> --- a/arch/arm/mach-omap1/board-perseus2.c
> +++ b/arch/arm/mach-omap1/board-perseus2.c
> @@ -246,7 +246,7 @@ static void __init perseus2_init_smc91x(void)
> mdelay(50);
> }
>
> -void omap_perseus2_init_irq(void)
> +static void __init omap_perseus2_init_irq(void)
> {
> omap1_init_common_hw();
> omap_init_irq();
> --- a/arch/arm/plat-omap/gpio.c
> +++ b/arch/arm/plat-omap/gpio.c
> @@ -13,7 +13,6 @@
>
> #include <linux/init.h>
> #include <linux/module.h>
> -#include <linux/sched.h>
> #include <linux/interrupt.h>
> #include <linux/ptrace.h>
> #include <linux/sysdev.h>
> @@ -1329,7 +1328,7 @@ void omap2_gpio_resume_after_retention(void)
> * This may get called early from board specific init
> * for boards that have interrupts routed via FPGA.
> */
> -int omap_gpio_init(void)
> +int __init omap_gpio_init(void)
> {
> if (!initialized)
> return _omap_gpio_init();
> --
> 1.4.4.2
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
On Sat, May 05, 2007 at 11:04:26AM +0100, Russell King wrote:
> On Mon, Apr 09, 2007 at 05:01:06PM -0400, Tony Lindgren wrote:
> > From: David Brownell <[email protected]>
> >
> > Minor GPIO cleanups: remove needless #include, and omap_gpio_init()
> > should be __init, as well as all the board init code calling it.
> >
> > Signed-off-by: David Brownell <[email protected]>
> > Signed-off-by: Tony Lindgren <[email protected]>
>
> I've applied 8 patches from this series by cherry picking it from your
> git tree, minus this patch which git wouldn't apply due to fuzz in
> arch/arm/plat-omap/gpio.c.
Incidentally, when doing a build after these patches, I'm seeing:
arch/arm/plat-omap/dma.c: In function `omap_get_dma_src_pos':
arch/arm/plat-omap/dma.c:750: warning: 'offset' might be used uninitialized in this function
arch/arm/plat-omap/dma.c: In function `omap_get_dma_dst_pos':
arch/arm/plat-omap/dma.c:772: warning: 'offset' might be used uninitialized in this function
These look like they're valid warnings to me.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
Subject: ARM: OMAP: Fix warning in dma.c
Fix warning: 'offset' might be uninitialized
Signed-off-by: Tony Lindgren <[email protected]>
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -747,7 +747,7 @@ int omap_set_dma_callback(int lch,
*/
dma_addr_t omap_get_dma_src_pos(int lch)
{
- dma_addr_t offset;
+ dma_addr_t offset = 0;
if (cpu_class_is_omap1())
offset = (dma_addr_t) (OMAP1_DMA_CSSA_L_REG(lch) |