소스 검색

[ARM] omap: fix a load of "warning: symbol 'xxx' was not declared. Should it be static?"

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King 16 년 전
부모
커밋
7c8ad9828e

+ 1 - 1
drivers/input/keyboard/omap-keypad.c

@@ -62,7 +62,7 @@ struct omap_kp {
 	unsigned int debounce;
 	unsigned int debounce;
 };
 };
 
 
-DECLARE_TASKLET_DISABLED(kp_tasklet, omap_kp_tasklet, 0);
+static DECLARE_TASKLET_DISABLED(kp_tasklet, omap_kp_tasklet, 0);
 
 
 static int *keymap;
 static int *keymap;
 static unsigned int *row_gpios;
 static unsigned int *row_gpios;

+ 2 - 2
drivers/mmc/host/omap.c

@@ -172,7 +172,7 @@ struct mmc_omap_host {
 	struct omap_mmc_platform_data *pdata;
 	struct omap_mmc_platform_data *pdata;
 };
 };
 
 
-void mmc_omap_fclk_offdelay(struct mmc_omap_slot *slot)
+static void mmc_omap_fclk_offdelay(struct mmc_omap_slot *slot)
 {
 {
 	unsigned long tick_ns;
 	unsigned long tick_ns;
 
 
@@ -182,7 +182,7 @@ void mmc_omap_fclk_offdelay(struct mmc_omap_slot *slot)
 	}
 	}
 }
 }
 
 
-void mmc_omap_fclk_enable(struct mmc_omap_host *host, unsigned int enable)
+static void mmc_omap_fclk_enable(struct mmc_omap_host *host, unsigned int enable)
 {
 {
 	unsigned long flags;
 	unsigned long flags;
 
 

+ 2 - 0
drivers/video/omap/dispc.h

@@ -40,4 +40,6 @@ extern void omap_dispc_enable_digit_out(int enable);
 extern int  omap_dispc_request_irq(void (*callback)(void *data), void *data);
 extern int  omap_dispc_request_irq(void (*callback)(void *data), void *data);
 extern void omap_dispc_free_irq(void);
 extern void omap_dispc_free_irq(void);
 
 
+extern const struct lcd_ctrl omap2_int_ctrl;
+
 #endif
 #endif

+ 2 - 2
drivers/video/omap/lcd_h4.c

@@ -47,7 +47,7 @@ static unsigned long h4_panel_get_caps(struct lcd_panel *panel)
 	return 0;
 	return 0;
 }
 }
 
 
-struct lcd_panel h4_panel = {
+static struct lcd_panel h4_panel = {
 	.name		= "h4",
 	.name		= "h4",
 	.config		= OMAP_LCDC_PANEL_TFT,
 	.config		= OMAP_LCDC_PANEL_TFT,
 
 
@@ -91,7 +91,7 @@ static int h4_panel_resume(struct platform_device *pdev)
 	return 0;
 	return 0;
 }
 }
 
 
-struct platform_driver h4_panel_driver = {
+static struct platform_driver h4_panel_driver = {
 	.probe		= h4_panel_probe,
 	.probe		= h4_panel_probe,
 	.remove		= h4_panel_remove,
 	.remove		= h4_panel_remove,
 	.suspend	= h4_panel_suspend,
 	.suspend	= h4_panel_suspend,

+ 2 - 0
drivers/video/omap/lcdc.c

@@ -34,6 +34,8 @@
 
 
 #include <asm/mach-types.h>
 #include <asm/mach-types.h>
 
 
+#include "lcdc.h"
+
 #define MODULE_NAME			"lcdc"
 #define MODULE_NAME			"lcdc"
 
 
 #define OMAP_LCDC_BASE			0xfffec000
 #define OMAP_LCDC_BASE			0xfffec000

+ 2 - 0
drivers/video/omap/lcdc.h

@@ -4,4 +4,6 @@
 int omap_lcdc_set_dma_callback(void (*callback)(void *data), void *data);
 int omap_lcdc_set_dma_callback(void (*callback)(void *data), void *data);
 void omap_lcdc_free_dma_callback(void);
 void omap_lcdc_free_dma_callback(void);
 
 
+extern const struct lcd_ctrl omap1_int_ctrl;
+
 #endif
 #endif

+ 5 - 4
drivers/video/omap/omapfb_main.c

@@ -31,11 +31,14 @@
 #include <mach/dma.h>
 #include <mach/dma.h>
 #include <mach/omapfb.h>
 #include <mach/omapfb.h>
 
 
+#include "lcdc.h"
+#include "dispc.h"
+
 #define MODULE_NAME	"omapfb"
 #define MODULE_NAME	"omapfb"
 
 
 static unsigned int	def_accel;
 static unsigned int	def_accel;
 static unsigned long	def_vram[OMAPFB_PLANE_NUM];
 static unsigned long	def_vram[OMAPFB_PLANE_NUM];
-static int		def_vram_cnt;
+static unsigned int	def_vram_cnt;
 static unsigned long	def_vxres;
 static unsigned long	def_vxres;
 static unsigned long	def_vyres;
 static unsigned long	def_vyres;
 static unsigned int	def_rotate;
 static unsigned int	def_rotate;
@@ -84,12 +87,10 @@ static struct caps_table_struct color_caps[] = {
  * LCD panel
  * LCD panel
  * ---------------------------------------------------------------------------
  * ---------------------------------------------------------------------------
  */
  */
-extern struct lcd_ctrl omap1_int_ctrl;
-extern struct lcd_ctrl omap2_int_ctrl;
 extern struct lcd_ctrl hwa742_ctrl;
 extern struct lcd_ctrl hwa742_ctrl;
 extern struct lcd_ctrl blizzard_ctrl;
 extern struct lcd_ctrl blizzard_ctrl;
 
 
-static struct lcd_ctrl *ctrls[] = {
+static const struct lcd_ctrl *ctrls[] = {
 #ifdef CONFIG_ARCH_OMAP1
 #ifdef CONFIG_ARCH_OMAP1
 	&omap1_int_ctrl,
 	&omap1_int_ctrl,
 #else
 #else