From 36c4b0d1d1417f3081488a5311bacdd7f3e7d63e Mon Sep 17 00:00:00 2001
From: David Brownell <dbrownell@users.sourceforge.net>
Date: Wed, 6 Dec 2006 17:13:59 -0800
Subject: [PATCH 4/9] ARM: OMAP: gpio init section cleanups

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 <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 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(-)

Index: linux-2.6/arch/arm/mach-omap1/board-fsample.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-omap1/board-fsample.c	2007-05-03 11:57:37.000000000 -0700
+++ linux-2.6/arch/arm/mach-omap1/board-fsample.c	2007-05-06 11:08:56.000000000 -0700
@@ -246,7 +246,7 @@ static void __init fsample_init_smc91x(v
 	mdelay(50);
 }
 
-void omap_fsample_init_irq(void)
+static void __init omap_fsample_init_irq(void)
 {
 	omap1_init_common_hw();
 	omap_init_irq();
Index: linux-2.6/arch/arm/mach-omap1/board-h3.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-omap1/board-h3.c	2007-05-03 11:57:37.000000000 -0700
+++ linux-2.6/arch/arm/mach-omap1/board-h3.c	2007-05-06 11:08:56.000000000 -0700
@@ -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();
Index: linux-2.6/arch/arm/mach-omap1/board-innovator.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-omap1/board-innovator.c	2007-05-03 11:57:37.000000000 -0700
+++ linux-2.6/arch/arm/mach-omap1/board-innovator.c	2007-05-06 11:08:56.000000000 -0700
@@ -308,7 +308,7 @@ static void __init innovator_init_smc91x
 	}
 }
 
-void innovator_init_irq(void)
+static void __init innovator_init_irq(void)
 {
 	omap1_init_common_hw();
 	omap_init_irq();
Index: linux-2.6/arch/arm/mach-omap1/board-perseus2.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-omap1/board-perseus2.c	2007-05-03 11:57:37.000000000 -0700
+++ linux-2.6/arch/arm/mach-omap1/board-perseus2.c	2007-05-06 11:08:56.000000000 -0700
@@ -246,7 +246,7 @@ static void __init perseus2_init_smc91x(
 	mdelay(50);
 }
 
-void omap_perseus2_init_irq(void)
+static void __init omap_perseus2_init_irq(void)
 {
 	omap1_init_common_hw();
 	omap_init_irq();
Index: linux-2.6/arch/arm/plat-omap/gpio.c
===================================================================
--- linux-2.6.orig/arch/arm/plat-omap/gpio.c	2007-05-06 11:03:38.000000000 -0700
+++ linux-2.6/arch/arm/plat-omap/gpio.c	2007-05-06 11:08:56.000000000 -0700
@@ -13,7 +13,6 @@
 
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/sysdev.h>
 #include <linux/err.h>
@@ -1545,7 +1544,7 @@ void omap2_gpio_resume_after_retention(v
  * 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();