OMAP2/TWL: Fix Sparse warnings
Subsystems (9)
v2 cover OMAP2/TWL: Fix Sparse warnings
This v2 version of sparse fixes series has review comments incorporated which are archived at:
http://www.spinics.net/lists/linux-omap/msg35427.html
Out of total 11 patches in v1 series, three patches are dropped from this version since two patches are accepted and already applied in other mailing lists. The remaining one patch requires clarification on API usage in audio driver.
With 2.6.36-rc5, some more sparse warnings are introduced. For fixing these new warnings, two new patches added into this series.
As per tony's suggestion,
http://www.spinics.net/lists/linux-omap/msg36474.html
I have cc'ed respective maintainers and mailing lists for the patches and also I will setup git branch for these patches for pull request if there are no further review comments.
Testing:
========
Patch series tested and verified with omap3_defconfig build and boot tested on omap zoom3.
G, Manjunath Kondaiah (10):
OMAP: mach-omap2: Fix miscellaneous sparse warnings
OMAP: mach-omap2: Fix incorrect assignment warnings
OMAP: mach-omap2: Fix static declaration warnings
OMAP: mach-omap2: Fix static function warnings
OMAP: plat-omap: Fix static function warnings
OMAP: NAND: Fix static declaration warning
TWL CORE: Fix sparse warning
TWL IRQ: Fix fucntion declaration warnings OMAP2/3: Convert write/read functions to raw read/write
OMAP3: Keypad: Fix incorrect type initializer
arch/arm/mach-omap2/board-3430sdp.c | 2 +- arch/arm/mach-omap2/board-am3517evm.c | 5 +-- arch/arm/mach-omap2/board-cm-t35.c | 2 +- arch/arm/mach-omap2/board-devkit8000.c | 2 +- arch/arm/mach-omap2/board-igep0020.c | 4 +- arch/arm/mach-omap2/board-ldp.c | 2 +- arch/arm/mach-omap2/board-n8x0.c | 16 +------------ arch/arm/mach-omap2/board-omap3evm.c | 8 +++--- arch/arm/mach-omap2/board-omap3stalker.c | 4 +- arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 4 ++- arch/arm/mach-omap2/board-rx51-sdram.c | 2 +- arch/arm/mach-omap2/board-rx51-video.c | 2 + arch/arm/mach-omap2/board-zoom-debugboard.c | 2 + arch/arm/mach-omap2/board-zoom-peripherals.c | 4 ++- arch/arm/mach-omap2/control.c | 5 ++- arch/arm/mach-omap2/gpmc-onenand.c | 8 +++--- arch/arm/mach-omap2/include/mach/board-flash.h | 2 + arch/arm/mach-omap2/include/mach/board-rx51.h | 11 +++++++++ arch/arm/mach-omap2/irq.c | 1 - arch/arm/mach-omap2/mux2420.c | 2 +- arch/arm/mach-omap2/mux2430.c | 2 +- arch/arm/mach-omap2/mux34xx.c | 12 +++++----- arch/arm/mach-omap2/pm-debug.c | 2 +- arch/arm/mach-omap2/pm34xx.c | 2 +- arch/arm/mach-omap2/powerdomain.c | 28 ------------------------ arch/arm/mach-omap2/prcm.c | 2 +- arch/arm/mach-omap2/timer-gp.c | 1 + arch/arm/plat-omap/cpu-omap.c | 4 +- arch/arm/plat-omap/dmtimer.c | 6 ++-- arch/arm/plat-omap/fb.c | 1 + arch/arm/plat-omap/include/plat/dmtimer.h | 4 ++- arch/arm/plat-omap/include/plat/sdrc.h | 1 + arch/arm/plat-omap/mcbsp.c | 10 ++++---- arch/arm/plat-omap/sram.c | 13 ++++++----- drivers/mfd/twl-core.c | 2 +- drivers/mtd/nand/omap2.c | 6 ++-- drivers/mtd/onenand/omap2.c | 2 +- include/linux/i2c/twl.h | 5 ++++ include/linux/omapfb.h | 5 ++++ 40 files changed, 96 insertions(+), 102 deletions(-) create mode 100644 arch/arm/mach-omap2/include/mach/board-rx51.h
PATCH v2 1/10 OMAP: mach-omap2: Fix incorrect assignment warnings
This patch fixes below sparse warnings for incorrect assignments.
arch/arm/mach-omap2/control.c:195:16: warning: incorrect type in assignment (different address spaces)arch/arm/mach-omap2/control.c:195:16: expected unsigned int [usertype] *v_addrarch/arm/mach-omap2/control.c:195:16: got void [noderef] <asn:2>*<noident>arch/arm/mach-omap2/control.c:199:25: warning: incorrect type in argument 1 (different address spaces)arch/arm/mach-omap2/control.c:199:25: expected void const volatile [noderef] <asn:2>*<noident>arch/arm/mach-omap2/control.c:199:25: got unsigned int [usertype] *arch/arm/mach-omap2/control.c:320:28: warning: incorrect type in assignment (different address spaces)arch/arm/mach-omap2/control.c:320:28: expected void *[noderef] <asn:2>scratchpad_addressarch/arm/mach-omap2/control.c:320:28: got void [noderef] <asn:2>*<noident>arch/arm/mach-omap2/control.c:321:9: warning: incorrect type in argument 1 (different address spaces)arch/arm/mach-omap2/control.c:321:9: expected void volatile [noderef] <asn:2>*<noident>arch/arm/mach-omap2/control.c:321:9: got void *[noderef] <asn:2>scratchpad_addressarch/arm/mach-omap2/control.c:324:9: warning: incorrect type in argument 1 (different address spaces)arch/arm/mach-omap2/control.c:324:9: expected void volatile [noderef] <asn:2>*<noident>arch/arm/mach-omap2/control.c:324:9: got void *arch/arm/mach-omap2/control.c:327:9: warning: incorrect type in argument 1 (different address spaces)arch/arm/mach-omap2/control.c:327:9: expected void volatile [noderef] <asn:2>*<noident>arch/arm/mach-omap2/control.c:327:9: got void *arch/arm/mach-omap2/control.c:334:9: warning: incorrect type in argument 1 (different address spaces)arch/arm/mach-omap2/control.c:334:9: expected void volatile [noderef] <asn:2>*<noident>arch/arm/mach-omap2/control.c:334:9: got void *arch/arm/mach-omap2/control.c:321:9: warning: dereference of noderef expression arch/arm/mach-omap2/control.c:324:9: warning: dereference of noderef expression arch/arm/mach-omap2/control.c:327:9: warning: dereference of noderef expression arch/arm/mach-omap2/control.c:334:9: warning: dereference of noderef expression
arch/arm/mach-omap2/pm34xx.c:323:28: warning: incorrect type in assignment (different address spaces)arch/arm/mach-omap2/pm34xx.c:323:28: expected unsigned int [usertype] *scratchpad_addressarch/arm/mach-omap2/pm34xx.c:323:28: got void [noderef] <asn:2>*<noident>arch/arm/mach-omap2/pm34xx.c:326:26: warning: incorrect type in argument 1 (different address spaces)arch/arm/mach-omap2/pm34xx.c:326:26: expected void const volatile [noderef] <asn:2>*<noident>arch/arm/mach-omap2/pm34xx.c:326:26: got unsigned int [usertype] *arch/arm/mach-omap2/pm34xx.c:329:26: warning: incorrect type in argument 1 (different address spaces)arch/arm/mach-omap2/pm34xx.c:329:26: expected void const volatile [noderef] <asn:2>*<noident>arch/arm/mach-omap2/pm34xx.c:329:26: got unsigned int [usertype] *arch/arm/mach-omap2/pm34xx.c:334:29: warning: incorrect type in argument 1 (different address spaces)arch/arm/mach-omap2/pm34xx.c:334:29: expected void const volatile [noderef] <asn:2>*<noident>arch/arm/mach-omap2/pm34xx.c:334:29: got unsigned int [usertype] *
--- arch/arm/mach-omap2/control.c | 4 ++-- arch/arm/mach-omap2/pm34xx.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/control.c +2 -2
@@ -190,7 +190,7 @@ void omap_ctrl_writel(u32 val, u16 offset)void omap3_clear_scratchpad_contents (void ) {u32 max_offset =OMAP343X_SCRATCHPAD_ROM_OFFSET ; -u32 *v_addr; +void __iomem *v_addr;u32 offset =0 ; v_addr =OMAP2_L4_IO_ADDRESS (OMAP343X_SCRATCHPAD_ROM ); if (prm_read_mod_reg(OMAP3430_GR_MOD, OMAP3_PRM_RSTST_OFFSET) &
@@ -206,7 +206,7 @@ void omap3_clear_scratchpad_contents(void)/* Populate the scratchpad structure with restore structure */ void omap3_save_scratchpad_contents (void ) { -void *__iomem scratchpad_address; +void __iomem *scratchpad_address;u32 arm_context_addr;struct omap3_scratchpad scratchpad_contents;struct omap3_scratchpad_prcm_block prcm_block_contents;
arch/arm/mach-omap2/pm34xx.c +1 -1
@@ -316,7 +316,7 @@ static void restore_control_register(u32 val)/* Function to restore the table entry that was modified for enabling MMU */ static void restore_table_entry (void ) { -u32 *scratchpad_address; +void __iomem *scratchpad_address;u32 previous_value, control_reg_value;u32 *address;
Signature · 1 line
1.7.0.4
PATCH v2 1/10 OMAP: mach-omap2: Fix incorrect assignment warnings
Quoted 1 line · Manjunath Kondaiah
This patch fixes below sparse warnings for incorrect assignments.
As pointed out by Jean, this patch fixed some sparse warnings, but also broke some things, specifically off mode.
In the future, *please* be sure to test the code paths that are being changed. This patch changed some code that is only exercised during off-mode, but was clearly not tested with off mode enabled.
As background for why this broke functionality, keep this in mind:
void *a = NULL; u32 *b = NULL;
a + 1 = 1
b + 1 = 4
IOW, you cannot simply replace a 'u32 *' by a 'void *' without checking and fixing any pointer arithmetic.
[...]
arch/arm/mach-omap2/control.c void omap_ctrl_writel(u32 val, u16 offset) · line 196
Quoted 13 lines
arch/arm/mach-omap2/control.c +1
-1@@ -190,7 +190,7 @@ void omap_ctrl_writel(u32 val, u16 offset)void omap3_clear_scratchpad_contents (void ) {u32 max_offset =OMAP343X_SCRATCHPAD_ROM_OFFSET ; -u32 *v_addr; +void __iomem *v_addr;u32 offset =0 ; v_addr =OMAP2_L4_IO_ADDRESS (OMAP343X_SCRATCHPAD_ROM ); if (prm_read_mod_reg(OMAP3430_GR_MOD, OMAP3_PRM_RSTST_OFFSET) &
Interestingly, this one not only fixed the sparse warning but also fixed a bug. :) Before this change, only every 4th entry of the scratchpad was zeroed.
arch/arm/mach-omap2/control.c void omap3_clear_scratchpad_contents(void) · line 212
Quoted 9 lines
arch/arm/mach-omap2/control.c +1
-1@@ -206,7 +206,7 @@ void omap3_clear_scratchpad_contents(void)/* Populate the scratchpad structure with restore structure */ void omap3_save_scratchpad_contents (void ) { -void *__iomem scratchpad_address; +void __iomem *scratchpad_address;u32 arm_context_addr;struct omap3_scratchpad scratchpad_contents;struct omap3_scratchpad_prcm_block prcm_block_contents;
This one is fine.
arch/arm/mach-omap2/pm34xx.c static void restore_control_register(u32 val) · line 321
Quoted 12 lines
arch/arm/mach-omap2/pm34xx.c +1
-1@@ -316,7 +316,7 @@ static void restore_control_register(u32 val)/* Function to restore the table entry that was modified for enabling MMU */ static void restore_table_entry (void ) { -u32 *scratchpad_address; +void __iomem *scratchpad_address;u32 previous_value, control_reg_value;u32 *address;
This one changes the result of any 'scratchpad_address + foo'.
So, if this is changed from u32 to void, all the offsets used when adding to the base need to be changed as well.
Kevin
PATCH v2 1/10 OMAP: mach-omap2: Fix incorrect assignment warnings
Quoted 25 lines
-----Original Message-----
From: Kevin Hilman [mailto:khilman at deeprootsystems.com]
Sent: Saturday, October 09, 2010 1:43 AM
To: G, Manjunath Kondaiah
Cc: linux-omap at vger.kernel.org;
linux-arm-kernel at lists.infradead.org; Tony Lindgren; Menon, Nishanth
Subject: Re: [PATCH v2 01/10] OMAP: mach-omap2: Fix incorrect assignment warningsQuoted 1 line · Manjunath Kondaiah
This patch fixes below sparse warnings for incorrect assignments.
As pointed out by Jean, this patch fixed some sparse warnings, but also broke some things, specifically off mode.
In the future, *please* be sure to test the code paths that are being changed. This patch changed some code that is only exercised during off-mode, but was clearly not tested with off mode enabled.
As background for why this broke functionality, keep this in mind:
Quoted 8 lines
void *a = NULL; u32 *b = NULL;a + 1 = 1
b + 1 = 4IOW, you cannot simply replace a 'u32 *' by a 'void *' without checking and fixing any pointer arithmetic.
I apologize for breaking off mode support. Since sparse fixes is big patch series, I was able to test only boot and same was mentioned along with the test report in the series. Also, multiple versions of patches posted for review, I was expecting comments on this type of regressions.
I will take care of testing code coverage paths for future patches.
Thanks to Jean and Kevin for identifying and fixing this regression.
-Manjunath
PATCH v2 2/10 OMAP: mach-omap2: Fix static declaration warnings
In reply to G, Manjunath KondaiahThis patch fixes sparse warnings due to non declaration of static structures and variables.
Sparse warning logs fixed:arch/arm/mach-omap2/control.c:88:6: warning: symbol 'omap3_secure_ram_storage' was not declared. Should it be static? narch/arm/mach-omap2/timer-gp.c:50:22: warning: symbol 'gptimer_wakeup' was not declared. Should it be static? arch/arm/mach-omap2/timer-gp.c:240:18: warning: symbol 'omap_timer' was not declared. Should it be static? arch/arm/mach-omap2/prcm.c:121:24: warning: symbol 'prcm_context' was not declared. Should it be static? arch/arm/mach-omap2/mux2420.c:510:29: warning: symbol 'omap2420_pop_ball' was not declared. Should it be static? arch/arm/mach-omap2/mux2430.c:589:29: warning: symbol 'omap2430_pop_ball' was not declared. Should it be static? arch/arm/mach-omap2/mux34xx.c:934:28: warning: symbol 'omap3_cus_subset' was not declared. Should it be static? arch/arm/mach-omap2/mux34xx.c:1080:29: warning: symbol 'omap3_cus_ball' was not declared. Should it be static? arch/arm/mach-omap2/mux34xx.c:1272:28: warning: symbol 'omap3_cbb_subset' was not declared. Should it be static? arch/arm/mach-omap2/mux34xx.c:1393:29: warning: symbol 'omap3_cbb_ball' was not declared. Should it be static? arch/arm/mach-omap2/mux34xx.c:1603:28: warning: symbol 'omap36xx_cbp_subset' was not declared. Should it be static? arch/arm/mach-omap2/mux34xx.c:1821:29: warning: symbol 'omap36xx_cbp_ball' was not declared. Should it be static? arch/arm/mach-omap2/pm-debug.c:165:15: warning: symbol 'pm_dbg_dir' was not declared. Should it be static? arch/arm/mach-omap2/board-omap3evm.c:587:30: warning: symbol 'ads7846_config' was not declared. Should it be static? arch/arm/mach-omap2/board-omap3evm.c:606:23: warning: symbol 'omap3evm_spi_board_info' was not declared. Should it be static? arch/arm/mach-omap2/board-rx51-sdram.c:46:25: warning: symbol 'rx51_sdrc_params' was not declared. Should it be static? arch/arm/mach-omap2/board-rx51-sdram.c:211:25: warning: symbol 'rx51_get_sdram_timings' was not declared. Should it be static? arch/arm/mach-omap2/board-omap3touchbook.c:64:15: warning: symbol 'touchbook_revision' was not declared. Should it be static? arch/arm/mach-omap2/board-am3517evm.c:350:24: warning: symbol 'am3517_evm_dss_device' was not declared. Should it be static? arch/arm/mach-omap2/board-omap3stalker.c:567:23: warning: symbol 'omap3stalker_spi_board_info' was not declared. Should it be static?
--- arch/arm/mach-omap2/board-am3517evm.c | 2 +- arch/arm/mach-omap2/board-omap3evm.c | 4 ++-- arch/arm/mach-omap2/board-omap3stalker.c | 2 +- arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- arch/arm/mach-omap2/board-rx51-sdram.c | 2 +- arch/arm/mach-omap2/control.c | 1 + arch/arm/mach-omap2/mux2420.c | 2 +- arch/arm/mach-omap2/mux2430.c | 2 +- arch/arm/mach-omap2/mux34xx.c | 12 ++++++------ arch/arm/mach-omap2/pm-debug.c | 2 +- arch/arm/mach-omap2/prcm.c | 2 +- arch/arm/plat-omap/include/plat/dmtimer.h | 2 ++ arch/arm/plat-omap/include/plat/sdrc.h | 1 + 13 files changed, 20 insertions(+), 16 deletions(-)
arch/arm/mach-omap2/board-am3517evm.c +1 -1
@@ -347,7 +347,7 @@ static struct omap_dss_board_info am3517_evm_dss_data = { .default_device = &am3517_evm_lcd_device, }; -struct platform_device am3517_evm_dss_device = { +static struct platform_device am3517_evm_dss_device = { .name ="omapdss" , .id =-1 , .dev = {
arch/arm/mach-omap2/board-omap3evm.c +2 -2
@@ -584,7 +584,7 @@ static int ads7846_get_pendown_state(void)return !gpio_get_value (OMAP3_EVM_TS_GPIO ); } -struct ads7846_platform_data ads7846_config = { +static struct ads7846_platform_data ads7846_config = { .x_max =0x0fff , .y_max =0x0fff , .x_plate_ohms =180 ,
@@ -603,7 +603,7 @@ static struct omap2_mcspi_device_config ads7846_mcspi_config = { .single_channel = 1, /* 0: slave, 1: master */ }; -struct spi_board_info omap3evm_spi_board_info[] = { +static struct spi_board_info omap3evm_spi_board_info[] = { [0 ] = { .modalias ="ads7846" , .bus_num =1 ,
arch/arm/mach-omap2/board-omap3stalker.c +1 -1
@@ -564,7 +564,7 @@ static struct omap2_mcspi_device_config ads7846_mcspi_config = { .single_channel = 1, /* 0: slave, 1: master */ }; -struct spi_board_info omap3stalker_spi_board_info[] = { +static struct spi_board_info omap3stalker_spi_board_info[] = { [0 ] = { .modalias ="ads7846" , .bus_num =1 ,
arch/arm/mach-omap2/board-omap3touchbook.c +1 -1
@@ -61,7 +61,7 @@#define TB_BL_PWM_TIMER 9#define TB_KILL_POWER_GPIO 168 -unsigned long touchbook_revision; +static unsigned long touchbook_revision;static struct mtd_partition omap3touchbook_nand_partitions[] = {/* All the partition sizes are listed in terms of NAND block size */
arch/arm/mach-omap2/board-rx51-sdram.c +1 -1
@@ -43,7 +43,7 @@ struct sdram_timings {u32 tWTR; }; -struct omap_sdrc_params rx51_sdrc_params[4 ]; +static struct omap_sdrc_params rx51_sdrc_params[4 ];static const struct sdram_timings rx51_timings[] = { {
arch/arm/mach-omap2/control.c +1 -0
@@ -23,6 +23,7 @@#include "cm.h" #include "prm.h" #include "sdrc.h" +#include "pm.h" static void __iomem *omap2_ctrl_base;
arch/arm/mach-omap2/mux2420.c +1 -1
@@ -507,7 +507,7 @@ static struct omap_mux __initdata omap2420_muxmodes[] = {* Balls for 447-pin POP package */ #ifdef CONFIG_DEBUG_FS -struct omap_ball __initdata omap2420_pop_ball[] = { +static struct omap_ball __initdata omap2420_pop_ball[] = {_OMAP2420_BALLENTRY (CAM_D0 ,"y4" ,NULL ),_OMAP2420_BALLENTRY (CAM_D1 ,"y3" ,NULL ), _OMAP2420_BALLENTRY(CAM_D2, "u7", NULL),
arch/arm/mach-omap2/mux2430.c +1 -1
@@ -586,7 +586,7 @@ static struct omap_mux __initdata omap2430_muxmodes[] = {* 447-pin s-PBGA Package, 0.00mm Ball Pitch (Bottom) */ #ifdef CONFIG_DEBUG_FS -struct omap_ball __initdata omap2430_pop_ball[] = { +static struct omap_ball __initdata omap2430_pop_ball[] = {_OMAP2430_BALLENTRY (CAM_D0 ,"t8" ,NULL ),_OMAP2430_BALLENTRY (CAM_D1 ,"t4" ,NULL ), _OMAP2430_BALLENTRY(CAM_D10, "r4", NULL),
arch/arm/mach-omap2/mux34xx.c +6 -6
@@ -931,7 +931,7 @@ struct omap_ball __initdata omap3_cbc_ball[] = {* Signals different on CUS package compared to superset */ #if defined(CONFIG_OMAP_MUX ) && defined(CONFIG_OMAP_PACKAGE_CUS ) -struct omap_mux __initdata omap3_cus_subset[] = { +static struct omap_mux __initdata omap3_cus_subset[] = {_OMAP3_MUXENTRY (CAM_D10 ,109 ,"cam_d10" ,NULL ,NULL ,NULL , "gpio_109", NULL, NULL, "safe_mode"),
@@ -1077,7 +1077,7 @@ struct omap_mux __initdata omap3_cus_subset[] = {*/ #if defined(CONFIG_OMAP_MUX ) && defined(CONFIG_DEBUG_FS ) \ && defined(CONFIG_OMAP_PACKAGE_CUS ) -struct omap_ball __initdata omap3_cus_ball[] = { +static struct omap_ball __initdata omap3_cus_ball[] = {_OMAP3_BALLENTRY (CAM_D0 ,"ab18" ,NULL ),_OMAP3_BALLENTRY (CAM_D1 ,"ac18" ,NULL ), _OMAP3_BALLENTRY(CAM_D10, "f21", NULL),
@@ -1269,7 +1269,7 @@ struct omap_ball __initdata omap3_cus_ball[] = {* Signals different on CBB package comapared to superset */ #if defined(CONFIG_OMAP_MUX ) && defined(CONFIG_OMAP_PACKAGE_CBB ) -struct omap_mux __initdata omap3_cbb_subset[] = { +static struct omap_mux __initdata omap3_cbb_subset[] = {_OMAP3_MUXENTRY (CAM_D10 ,109 ,"cam_d10" ,NULL ,NULL ,NULL , "gpio_109", NULL, NULL, "safe_mode"),
@@ -1390,7 +1390,7 @@ struct omap_mux __initdata omap3_cbb_subset[] = {*/ #if defined(CONFIG_OMAP_MUX ) && defined(CONFIG_DEBUG_FS ) \ && defined(CONFIG_OMAP_PACKAGE_CBB ) -struct omap_ball __initdata omap3_cbb_ball[] = { +static struct omap_ball __initdata omap3_cbb_ball[] = {_OMAP3_BALLENTRY (CAM_D0 ,"ag17" ,NULL ),_OMAP3_BALLENTRY (CAM_D1 ,"ah17" ,NULL ), _OMAP3_BALLENTRY(CAM_D10, "b25", NULL),
@@ -1600,7 +1600,7 @@ struct omap_ball __initdata omap3_cbb_ball[] = {* Signals different on 36XX CBP package comapared to 34XX CBC package */ #if defined(CONFIG_OMAP_MUX ) && defined(CONFIG_OMAP_PACKAGE_CBP ) -struct omap_mux __initdata omap36xx_cbp_subset[] = { +static struct omap_mux __initdata omap36xx_cbp_subset[] = {_OMAP3_MUXENTRY (CAM_D0 ,99 ,"cam_d0" ,NULL ,"csi2_dx2" ,NULL , "gpio_99", NULL, NULL, "safe_mode"),
@@ -1818,7 +1818,7 @@ struct omap_mux __initdata omap36xx_cbp_subset[] = {*/ #if defined(CONFIG_OMAP_MUX ) && defined(CONFIG_DEBUG_FS ) \ && defined (CONFIG_OMAP_PACKAGE_CBP ) -struct omap_ball __initdata omap36xx_cbp_ball[] = { +static struct omap_ball __initdata omap36xx_cbp_ball[] = {_OMAP3_BALLENTRY (CAM_D0 ,"ag17" ,NULL ),_OMAP3_BALLENTRY (CAM_D1 ,"ah17" ,NULL ), _OMAP3_BALLENTRY(CAM_D10, "b25", NULL),
arch/arm/mach-omap2/pm-debug.c +1 -1
@@ -162,7 +162,7 @@ void omap2_pm_dump(int mode, int resume, unsigned int us)static void pm_dbg_regset_store (u32 *ptr); -struct dentry *pm_dbg_dir; +static struct dentry *pm_dbg_dir;static int pm_dbg_init_done;
arch/arm/mach-omap2/prcm.c +1 -1
@@ -118,7 +118,7 @@ struct omap3_prcm_regs {u32 wkup_pm_wken; }; -struct omap3_prcm_regs prcm_context; +static struct omap3_prcm_regs prcm_context;u32 omap_prcm_get_reset_sources (void ) {
arch/arm/plat-omap/include/plat/dmtimer.h +2 -0
@@ -45,6 +45,8 @@#define OMAP_TIMER_TRIGGER_OVERFLOW_AND_COMPARE 0x02struct omap_dm_timer ; +extern struct omap_dm_timer *gptimer_wakeup; +extern struct sys_timer omap_timer;struct clk ;int omap_dm_timer_init (void );
arch/arm/plat-omap/include/plat/sdrc.h +1 -0
@@ -147,6 +147,7 @@ struct memory_timings { };extern void omap2xxx_sdrc_init_params (u32 force_lock_to_unlock_mode); +struct omap_sdrc_params *rx51_get_sdram_timings (void );u32 omap2xxx_sdrc_dll_is_unlocked (void );u32 omap2xxx_sdrc_reprogram (u32 level,u32 force);
Signature · 1 line
1.7.0.4
PATCH v2 3/10 OMAP: mach-omap2: Fix static function warnings
In reply to G, Manjunath KondaiahThis patch fixes sparse warnings due non declarations of static functions.
arch/arm/mach-omap2/timer-gp.c:115:12: warning: symbol 'omap2_gp_clockevent_set_gptimer' was not declared. Should it be static? arch/arm/mach-omap2/powerdomain.c:993:5: warning: symbol 'pwrdm_set_lowpwrstchange' was not declared. Should it be static? arch/arm/mach-omap2/board-flash.c:141:8: warning: symbol 'board_nand_init' was not declared. Should it be static? arch/arm/mach-omap2/board-n8x0.c:416:6: warning: symbol 'n8x0_mmc_slot1_cover_handler' was not declared. Should it be static? arch/arm/mach-omap2/board-n8x0.c:544:13: warning: symbol 'n8x0_mmc_init' was not declared. Should it be static? arch/arm/mach-omap2/board-rx51-peripherals.c:902:13: warning: symbol 'rx51_peripherals_init' was not declared. Should it be static? arch/arm/mach-omap2/board-rx51-video.c:107:13: warning: symbol 'rx51_video_mem_init' was not declared. Should it be static? arch/arm/mach-omap2/board-zoom-debugboard.c:155:12: warning: symbol 'zoom_debugboard_init' was not declared. Should it be static? arch/arm/mach-omap2/board-zoom-peripherals.c:280:13: warning: symbol 'zoom_peripherals_init' was not declared. Should it be static? arch/arm/mach-omap2/board-igep0020.c:110:13: warning: symbol 'igep2_flash_init' was not declared. Should it be static? arch/arm/mach-omap2/board-am3517evm.c:109:6: warning: symbol 'am3517_evm_ethernet_init' was not declared. Should it be static?
--- arch/arm/mach-omap2/board-am3517evm.c | 2 +- arch/arm/mach-omap2/board-igep0020.c | 4 +- arch/arm/mach-omap2/board-n8x0.c | 16 +------------ arch/arm/mach-omap2/board-rx51-peripherals.c | 2 + arch/arm/mach-omap2/board-rx51-video.c | 2 + arch/arm/mach-omap2/board-zoom-debugboard.c | 2 + arch/arm/mach-omap2/board-zoom-peripherals.c | 2 + arch/arm/mach-omap2/include/mach/board-flash.h | 2 + arch/arm/mach-omap2/include/mach/board-rx51.h | 11 +++++++++ arch/arm/mach-omap2/powerdomain.c | 28 ------------------------ arch/arm/mach-omap2/timer-gp.c | 1 + arch/arm/plat-omap/include/plat/dmtimer.h | 2 +- 12 files changed, 27 insertions(+), 47 deletions(-) create mode 100644 arch/arm/mach-omap2/include/mach/board-rx51.h
arch/arm/mach-omap2/board-am3517evm.c +1 -1
@@ -106,7 +106,7 @@ static void am3517_disable_ethernet_int(void) regval =omap_ctrl_readl (AM35XX_CONTROL_LVL_INTR_CLEAR ); } -void am3517_evm_ethernet_init (struct emac_platform_data *pdata) +static void am3517_evm_ethernet_init (struct emac_platform_data *pdata) {unsigned int regval;
arch/arm/mach-omap2/board-igep0020.c +2 -2
@@ -107,7 +107,7 @@ static struct platform_device igep2_onenand_device = { }, }; -void __init igep2_flash_init (void ) +static void __init igep2_flash_init (void ) {u8 cs =0 ;u8 onenandcs =GPMC_CS_NUM +1 ;
@@ -141,7 +141,7 @@ void __init igep2_flash_init(void) }#else -void __init igep2_flash_init (void ) {} +static void __init igep2_flash_init (void ) {}#endif #if defined(CONFIG_SMSC911X ) || defined(CONFIG_SMSC911X_MODULE )
arch/arm/mach-omap2/board-n8x0.c +1 -15
@@ -383,15 +383,6 @@ static void n8x0_mmc_callback(void *data, u8 card_mask)omap_mmc_notify_cover_event (mmc_device, index, *openp); } -void n8x0_mmc_slot1_cover_handler (void *arg,int closed_state) -{ -if (mmc_device ==NULL ) -return ; - - slot1_cover_open = !closed_state; -omap_mmc_notify_cover_event (mmc_device,0 , closed_state); -} -static int n8x0_mmc_late_init (struct device *dev) {int r, bit, *openp;
@@ -511,7 +502,7 @@ static struct omap_mmc_platform_data mmc1_data = {static struct omap_mmc_platform_data *mmc_data[OMAP24XX_NR_MMC ]; -void __init n8x0_mmc_init (void ) +static void __init n8x0_mmc_init (void ) {int err;
@@ -560,11 +551,6 @@ void __init n8x0_mmc_init(void)void __init n8x0_mmc_init (void ) { } - -void n8x0_mmc_slot1_cover_handler (void *arg,int state) -{ -} -#endif /* CONFIG_MMC_OMAP */ #ifdef CONFIG_MENELAUS
arch/arm/mach-omap2/board-rx51-peripherals.c +2 -0
@@ -32,6 +32,8 @@#include <plat/onenand.h> #include <plat/gpmc-smc91x.h> +#include <mach/board-rx51.h> +#include <sound/tlv320aic3x.h> #include <sound/tpa6130a2-plat.h>
arch/arm/mach-omap2/board-rx51-video.c +2 -0
@@ -20,6 +20,8 @@#include <plat/vram.h> #include <plat/mcspi.h> +#include <mach/board-rx51.h> +#include "mux.h" #define RX51_LCD_RESET_GPIO 90
arch/arm/mach-omap2/board-zoom-debugboard.c +2 -0
@@ -16,6 +16,8 @@#include <plat/gpmc.h> +#include <mach/board-zoom.h> +#define ZOOM_SMSC911X_CS 7#define ZOOM_SMSC911X_GPIO 158#define ZOOM_QUADUART_CS 3
arch/arm/mach-omap2/board-zoom-peripherals.c +2 -0
@@ -24,6 +24,8 @@#include <plat/common.h> #include <plat/usb.h> +#include <mach/board-zoom.h> +#include "mux.h" #include "hsmmc.h"
arch/arm/mach-omap2/include/mach/board-flash.h +2 -0
@@ -26,3 +26,5 @@ struct flash_partitions {extern void board_flash_init (struct flash_partitions [],char chip_sel[][GPMC_CS_NUM ]); +extern void board_nand_init (struct mtd_partition *nand_parts, +u8 nr_parts,u8 cs);
arch/arm/mach-omap2/include/mach/board-rx51.h new file +11 -0
@@ -0,0 +1,11 @@ +/* +* Defines for rx51 boards +*/ + +#ifndef _OMAP_BOARD_RX51_H +#define _OMAP_BOARD_RX51_H + +extern void __init rx51_peripherals_init (void ); +extern void __init rx51_video_mem_init (void ); + +#endif
arch/arm/mach-omap2/powerdomain.c +0 -28
@@ -981,34 +981,6 @@ bool pwrdm_has_hdwr_sar(struct powerdomain *pwrdm) }/** -* pwrdm_set_lowpwrstchange - Request a low power state change -* @pwrdm: struct powerdomain * -* -* Allows a powerdomain to transtion to a lower power sleep state -* from an existing sleep state without waking up the powerdomain. -* Returns -EINVAL if the powerdomain pointer is null or if the -* powerdomain does not support LOWPOWERSTATECHANGE, or returns 0 -* upon success. -*/ -int pwrdm_set_lowpwrstchange (struct powerdomain *pwrdm) -{ -if (!pwrdm) -return -EINVAL ; - -if (!(pwrdm->flags &PWRDM_HAS_LOWPOWERSTATECHANGE )) -return -EINVAL ; - -pr_debug ("powerdomain: %s: setting LOWPOWERSTATECHANGE bit\n" , - pwrdm->name); - -prm_rmw_mod_reg_bits (OMAP4430_LOWPOWERSTATECHANGE_MASK , - (1 <<OMAP4430_LOWPOWERSTATECHANGE_SHIFT ), - pwrdm->prcm_offs, pwrstctrl_reg_offs); - -return 0 ; -} - -/** * pwrdm_wait_transition - wait for powerdomain power transition to finish * @pwrdm: struct powerdomain * to wait for *
arch/arm/mach-omap2/timer-gp.c +1 -0
@@ -123,6 +123,7 @@ int __init omap2_gp_clockevent_set_gptimer(u8 id)return 0 ; } +EXPORT_SYMBOL (omap2_gp_clockevent_set_gptimer);static void __init omap2_gp_clockevent_init (void ) {
arch/arm/plat-omap/include/plat/dmtimer.h +1 -1
@@ -81,6 +81,6 @@ unsigned int omap_dm_timer_read_counter(struct omap_dm_timer *timer);void omap_dm_timer_write_counter (struct omap_dm_timer *timer,unsigned int value);int omap_dm_timers_active (void ); - +int omap2_gp_clockevent_set_gptimer (u8 id);#endif /* __ASM_ARCH_DMTIMER_H */
Signature · 1 line
1.7.0.4
PATCH v2 3/10 OMAP: mach-omap2: Fix static function warnings
Hello Manjunath,
one comment:
Quoted 29 lines · Manjunath Kondaiah
arch/arm/mach-omap2/powerdomain.c | 28 ------------------------ 12 files changed, 27 insertions(+), 47 deletions(-) create mode 100644 arch/arm/mach-omap2/include/mach/board-rx51.harch/arm/mach-omap2/powerdomain.c +0
-17@@ -981,34 +981,6 @@ bool pwrdm_has_hdwr_sar(struct powerdomain *pwrdm) }/** -* pwrdm_set_lowpwrstchange - Request a low power state change -* @pwrdm: struct powerdomain * -* -* Allows a powerdomain to transtion to a lower power sleep state -* from an existing sleep state without waking up the powerdomain. -* Returns -EINVAL if the powerdomain pointer is null or if the -* powerdomain does not support LOWPOWERSTATECHANGE, or returns 0 -* upon success. -*/ -int pwrdm_set_lowpwrstchange (struct powerdomain *pwrdm) -{ -if (!pwrdm) -return -EINVAL ; - -if (!(pwrdm->flags &PWRDM_HAS_LOWPOWERSTATECHANGE )) -return -EINVAL ; -
arch/arm/mach-omap2/powerdomain.c bool pwrdm_has_hdwr_sar(struct powerdomain *pwrdm) · line 1010
Quoted 10 lines
arch/arm/mach-omap2/powerdomain.c +0
-10-pr_debug ("powerdomain: %s: setting LOWPOWERSTATECHANGE bit\n" , - pwrdm->name); - -prm_rmw_mod_reg_bits (OMAP4430_LOWPOWERSTATECHANGE_MASK , - (1 <<OMAP4430_LOWPOWERSTATECHANGE_SHIFT ), - pwrdm->prcm_offs, pwrstctrl_reg_offs); - -return 0 ; -} -
Please don't delete this function. It will be needed for OMAP4 power management. Instead, just add a prototype in plat-omap/include/plat/powerdomains.h.
- Paul
PATCH v2 3/10 OMAP: mach-omap2: Fix static function warnings
Hi Paul,
Quoted 51 lines
-----Original Message-----
From: Paul Walmsley [mailto:paul at pwsan.com]
Sent: Thursday, September 30, 2010 3:06 AM
To: G, Manjunath Kondaiah
Cc: linux-omap at vger.kernel.org;
linux-arm-kernel at lists.infradead.org; Tony Lindgren; Menon, Nishanth
Subject: Re: [PATCH v2 03/10] OMAP: mach-omap2: Fix static function warningsHello Manjunath,
one comment:
Quoted 1 line · Manjunath Kondaiah
arch/arm/mach-omap2/powerdomain.c | 28------------------------
Quoted 34 lines
12 files changed, 27 insertions(+), 47 deletions(-) create mode100644
arch/arm/mach-omap2/include/mach/board-rx51.harch/arm/mach-omap2/powerdomain.c +0
-22@@ -981,34 +981,6 @@ bool pwrdm_has_hdwr_sar(struct powerdomain *pwrdm) }/** -* pwrdm_set_lowpwrstchange - Request a low power state change -* @pwrdm: struct powerdomain * -* -* Allows a powerdomain to transtion to a lower power sleep state -* from an existing sleep state without waking up the powerdomain. -* Returns -EINVAL if the powerdomain pointer is null or if the -* powerdomain does not support LOWPOWERSTATECHANGE, or returns 0 -* upon success. -*/ -int pwrdm_set_lowpwrstchange(struct powerdomain *pwrdm) -{ -if (!pwrdm) -return -EINVAL ; - -if (!(pwrdm->flags &PWRDM_HAS_LOWPOWERSTATECHANGE )) -return -EINVAL ; - -pr_debug ("powerdomain: %s: setting LOWPOWERSTATECHANGE bit\n" , - pwrdm->name); - -prm_rmw_mod_reg_bits (OMAP4430_LOWPOWERSTATECHANGE_MASK , - (1 <<OMAP4430_LOWPOWERSTATECHANGE_SHIFT ), - pwrdm->prcm_offs, pwrstctrl_reg_offs);
Quoted 8 lines
arch/arm/mach-omap2/powerdomain.c bool pwrdm_has_hdwr_sar(struct powerdomain *pwrdm) · line 1010
Quoted 4 lines
arch/arm/mach-omap2/powerdomain.c +0
-4- -return 0 ; -} -Please don't delete this function. It will be needed for OMAP4 power management. Instead, just add a prototype in
plat-omap/include/plat/powerdomains.h.
Thanks. Taken care with new pull request sent to tony.
-Manjunath
PATCH v2 4/10 OMAP: mach-omap2: Fix miscellaneous sparse warnings
In reply to G, Manjunath KondaiahThis patch fixes miscellaneous sparse warnings in mach-omap2.
arch/arm/mach-omap2/board-am3517evm.c:141:17: warning: Initializer entry defined twicearch/arm/mach-omap2/board-am3517evm.c:142:18: also defined here
arch/arm/mach-omap2/irq.c:50:35: warning: Using plain integer as NULL pointer
--- arch/arm/mach-omap2/board-am3517evm.c | 1 - arch/arm/mach-omap2/irq.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/board-am3517evm.c +0 -1
@@ -139,7 +139,6 @@ static void am3517_evm_ethernet_init(struct emac_platform_data *pdata)static struct i2c_board_info __initdata am3517evm_i2c1_boardinfo[] = { {I2C_BOARD_INFO ("s35390a" ,0x30 ), - .type ="s35390a" , }, };
arch/arm/mach-omap2/irq.c +0 -1
@@ -47,7 +47,6 @@ static struct omap_irq_bank { } __attribute__ ((aligned(4))) irq_banks[] = { {/* MPU INTC */ - .base_reg =0 , .nr_irqs =96 , }, };
Signature · 1 line
1.7.0.4
PATCH v2 5/10 OMAP: plat-omap: Fix static function warnings
In reply to G, Manjunath KondaiahThis patch fixes sparse warnings due non declarations of static functions.
arch/arm/plat-omap/sram.c:130:13: warning: symbol 'omap_detect_sram' was not declared. Should it be static? arch/arm/plat-omap/sram.c:216:13: warning: symbol 'omap_map_sram' was not declared. Should it be static? arch/arm/plat-omap/sram.c:348:12: warning: symbol 'omap242x_sram_init' was not declared. Should it be static? arch/arm/plat-omap/sram.c:369:12: warning: symbol 'omap243x_sram_init' was not declared. Should it be static? arch/arm/plat-omap/sram.c:425:12: warning: symbol 'omap34xx_sram_init' was not declared. Should it be static? arch/arm/plat-omap/sram.c:441:12: warning: symbol 'omap44xx_sram_init' was not declared. Should it be static
arch/arm/plat-omap/mcbsp.c:36:6: warning: symbol 'omap_mcbsp_write' was not declared. Should it be static? arch/arm/plat-omap/mcbsp.c:50:5: warning: symbol 'omap_mcbsp_read' was not declared. Should it be static? arch/arm/plat-omap/mcbsp.c:65:6: warning: symbol 'omap_mcbsp_st_write' was not declared. Should it be static? arch/arm/plat-omap/mcbsp.c:70:5: warning: symbol 'omap_mcbsp_st_read' was not declared. Should it be static? arch/arm/plat-omap/mcbsp.c:1648:15: warning: symbol 'omap_st_add' was not declared. Should it be static?
arch/arm/plat-omap/fb.c:414:15: warning: symbol 'omapfb_reserve_sram' was not declared. Should it be static? arch/arm/plat-omap/cpu-omap.c:43:5: warning: symbol 'omap_verify_speed' was not declared. Should it be static? arch/arm/plat-omap/cpu-omap.c:61:14: warning: symbol 'omap_getspeed' was not declared. Should it be static?
--- arch/arm/plat-omap/cpu-omap.c | 4 ++-- arch/arm/plat-omap/fb.c | 1 + arch/arm/plat-omap/mcbsp.c | 10 +++++----- arch/arm/plat-omap/sram.c | 13 +++++++------ include/linux/omapfb.h | 5 +++++ 5 files changed, 20 insertions(+), 13 deletions(-)
arch/arm/plat-omap/cpu-omap.c +2 -2
@@ -40,7 +40,7 @@ static struct clk *mpu_clk;/* TODO: Add support for SDRAM timing changes */ -int omap_verify_speed (struct cpufreq_policy *policy) +static int omap_verify_speed (struct cpufreq_policy *policy) {if (freq_table)return cpufreq_frequency_table_verify (policy, freq_table);
@@ -58,7 +58,7 @@ int omap_verify_speed(struct cpufreq_policy *policy)return 0 ; } -unsigned int omap_getspeed (unsigned int cpu) +static unsigned int omap_getspeed (unsigned int cpu) {unsigned long rate;
arch/arm/plat-omap/fb.c +1 -0
@@ -421,3 +421,4 @@ unsigned long omapfb_reserve_sram(unsigned long sram_pstart, }#endif +EXPORT_SYMBOL (omapfb_reserve_sram);
arch/arm/plat-omap/mcbsp.c +5 -5
@@ -33,7 +33,7 @@struct omap_mcbsp **mcbsp_ptr;int omap_mcbsp_count, omap_mcbsp_cache_size; -void omap_mcbsp_write (struct omap_mcbsp *mcbsp,u16 reg,u32 val) +static void omap_mcbsp_write (struct omap_mcbsp *mcbsp,u16 reg,u32 val) {if (cpu_class_is_omap1 ()) { ((u16 *)mcbsp->reg_cache)[reg /sizeof (u16)] = (u16 )val;
@@ -47,7 +47,7 @@ void omap_mcbsp_write(struct omap_mcbsp *mcbsp, u16 reg, u32 val) } } -int omap_mcbsp_read (struct omap_mcbsp *mcbsp,u16 reg,bool from_cache) +static int omap_mcbsp_read (struct omap_mcbsp *mcbsp,u16 reg,bool from_cache) {if (cpu_class_is_omap1 ()) { return !from_cache ? __raw_readw(mcbsp->io_base + reg) :
@@ -62,12 +62,12 @@ int omap_mcbsp_read(struct omap_mcbsp *mcbsp, u16 reg, bool from_cache) }#ifdef CONFIG_ARCH_OMAP3 -void omap_mcbsp_st_write (struct omap_mcbsp *mcbsp,u16 reg,u32 val) +static void omap_mcbsp_st_write (struct omap_mcbsp *mcbsp,u16 reg,u32 val) {__raw_writel (val, mcbsp->st_data->io_base_st + reg); } -int omap_mcbsp_st_read (struct omap_mcbsp *mcbsp,u16 reg) +static int omap_mcbsp_st_read (struct omap_mcbsp *mcbsp,u16 reg) {return __raw_readl (mcbsp->st_data->io_base_st + reg); }
@@ -1645,7 +1645,7 @@ static const struct attribute_group sidetone_attr_group = { .attrs = (struct attribute **)sidetone_attrs, }; -int __devinit omap_st_add (struct omap_mcbsp *mcbsp) +static int __devinit omap_st_add (struct omap_mcbsp *mcbsp) {struct omap_mcbsp_platform_data *pdata = mcbsp->pdata;struct omap_mcbsp_st_data *st_data;
arch/arm/plat-omap/sram.c +7 -6
@@ -127,7 +127,7 @@ static int is_sram_locked(void)* to secure SRAM will hang the system. Also the SRAM is not * yet mapped at this point. */ -void __init omap_detect_sram (void ) +static void __init omap_detect_sram (void ) {unsigned long reserved;
@@ -213,7 +213,7 @@ static struct map_desc omap_sram_io_desc[] __initdata = {/* * Note that we cannot use ioremap for SRAM, as clock init needs SRAM early. */ -void __init omap_map_sram (void ) +static void __init omap_map_sram (void ) {unsigned long base;
@@ -345,7 +345,7 @@ u32 omap2_set_prcm(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass)#endif #ifdef CONFIG_ARCH_OMAP2420 -int __init omap242x_sram_init (void ) +static int __init omap242x_sram_init (void ) { _omap2_sram_ddr_init =omap_sram_push (omap242x_sram_ddr_init, omap242x_sram_ddr_init_sz);
@@ -366,7 +366,7 @@ static inline int omap242x_sram_init(void)#endif #ifdef CONFIG_ARCH_OMAP2430 -int __init omap243x_sram_init (void ) +static int __init omap243x_sram_init (void ) { _omap2_sram_ddr_init =omap_sram_push (omap243x_sram_ddr_init, omap243x_sram_ddr_init_sz);
@@ -422,7 +422,7 @@ void omap3_sram_restore_context(void) }#endif /* CONFIG_PM */ -int __init omap34xx_sram_init (void ) +static int __init omap34xx_sram_init (void ) { _omap3_sram_configure_core_dpll = omap_sram_push(omap3_sram_configure_core_dpll,
@@ -438,7 +438,7 @@ static inline int omap34xx_sram_init(void)#endif #ifdef CONFIG_ARCH_OMAP4 -int __init omap44xx_sram_init (void ) +static int __init omap44xx_sram_init (void ) {printk (KERN_ERR "FIXME: %s not implemented\n" , __func__);
@@ -469,3 +469,4 @@ int __init omap_sram_init(void)return 0 ; } +EXPORT_SYMBOL (omap_sram_init);
include/linux/omapfb.h +5 -0
@@ -257,6 +257,11 @@ struct omapfb_platform_data {extern void omapfb_set_platform_data (struct omapfb_platform_data *data);extern void omapfb_set_ctrl_platform_data (void *pdata);extern void omapfb_reserve_sdram_memblock (void ); +extern unsigned long omapfb_reserve_sram (unsigned long sram_pstart, +unsigned long sram_vstart, +unsigned long sram_size, +unsigned long pstart_avail, +unsigned long size_avail);#endif
Signature · 1 line
1.7.0.4
PATCH v2 6/10 OMAP: NAND: Fix static declaration warning
In reply to G, Manjunath KondaiahThis patch fixes sparse warning for static declaration of variable "use_dma"
drivers/mtd/nand/omap2.c:114:11: warning: symbol 'use_dma' was not declared. Should it be static?
--- drivers/mtd/nand/omap2.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/omap2.c +2 -2
@@ -111,11 +111,11 @@ static int use_dma = 1;module_param (use_dma, bool,0 );MODULE_PARM_DESC (use_dma,"enable/disable use of DMA" );#else -const int use_dma; +static const int use_dma;#endif #else const int use_prefetch; -const int use_dma; +static const int use_dma;#endif struct omap_nand_info {
Signature · 1 line
1.7.0.4
PATCH v2 7/10 TWL CORE: Fix sparse warning
In reply to G, Manjunath KondaiahFixes below sparse warning.
drivers/mfd/twl-core.c:258:20: warning: symbol 'twl_map' was not declared. Should it be static?
--- drivers/mfd/twl-core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mfd/twl-core.c +1 -1
@@ -255,7 +255,7 @@ struct twl_mapping {unsigned char sid;/* Slave ID */ unsigned char base;/* base address */ }; -struct twl_mapping *twl_map; +static struct twl_mapping *twl_map;static struct twl_mapping twl4030_map[TWL4030_MODULE_LAST +1 ] = {/*
Signature · 1 line
1.7.0.4
PATCH v2 7/10 TWL CORE: Fix sparse warning
Hi Manjunath,
Quoted 4 lines · Manjunath Kondaiah
Fixes below sparse warning.
drivers/mfd/twl-core.c:258:20: warning: symbol 'twl_map' was not declared. Should it be static?
Patch applied, thanks.
Cheers,
Samuel.
Quoted 25 lines
Signed-off-by G, Manjunath Kondaiah <[email protected]>Cc Samuel Ortiz <[email protected]>Cc Tony Lindgren <[email protected]>Cc Nishanth Menon <[email protected]>--- drivers/mfd/twl-core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/mfd/twl-core.c +1
-1@@ -255,7 +255,7 @@ struct twl_mapping {unsigned char sid;/* Slave ID */ unsigned char base;/* base address */ }; -struct twl_mapping *twl_map; +static struct twl_mapping *twl_map;static struct twl_mapping twl4030_map[TWL4030_MODULE_LAST +1 ] = {/* Signature · 1 line
1.7.0.4
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
PATCH v2 8/10 TWL IRQ: Fix fucntion declaration warnings
In reply to G, Manjunath KondaiahFixes following sparse warnings for twl4030 and twl6030 irq files.
drivers/mfd/twl4030-irq.c:783:5: warning: symbol 'twl4030_init_irq' was not declared. Should it be static? drivers/mfd/twl4030-irq.c:863:5: warning: symbol 'twl4030_exit_irq' was not declared. Should it be static? drivers/mfd/twl4030-irq.c:873:5: warning: symbol 'twl4030_init_chip_irq' was not declared. Should it be static?
drivers/mfd/twl6030-irq.c:226:5: warning: symbol 'twl6030_init_irq' was not declared. Should it be static? drivers/mfd/twl6030-irq.c:290:5: warning: symbol 'twl6030_exit_irq' was not declared. Should it be static?
--- include/linux/i2c/twl.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
include/linux/i2c/twl.h +5 -0
@@ -172,6 +172,11 @@ int twl_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes);int twl6030_interrupt_unmask (u8 bit_mask,u8 offset);int twl6030_interrupt_mask (u8 bit_mask,u8 offset); +int twl6030_init_irq (int irq_num,unsigned irq_base,unsigned irq_end); +int twl6030_exit_irq (void ); +int twl4030_init_irq (int irq_num,unsigned irq_base,unsigned irq_end); +int twl4030_exit_irq (void ); +int twl4030_init_chip_irq (const char *chip);/*----------------------------------------------------------------------*/
Signature · 1 line
1.7.0.4
PATCH v2 8/10 TWL IRQ: Fix fucntion declaration warnings
Hi Manjunath,
Quoted 23 lines · Manjunath Kondaiah
Fixes following sparse warnings for twl4030 and twl6030 irq files.
drivers/mfd/twl4030-irq.c:783:5: warning: symbol 'twl4030_init_irq' was not declared. Should it be static?drivers/mfd/twl4030-irq.c:863:5: warning: symbol 'twl4030_exit_irq' was not declared. Should it be static?drivers/mfd/twl4030-irq.c:873:5: warning: symbol 'twl4030_init_chip_irq' was not declared. Should it be static?
drivers/mfd/twl6030-irq.c:226:5: warning: symbol 'twl6030_init_irq' was not declared. Should it be static?drivers/mfd/twl6030-irq.c:290:5: warning: symbol 'twl6030_exit_irq' was not declared. Should it be static?Signed-off-by G, Manjunath Kondaiah <[email protected]>Cc Samuel Ortiz <[email protected]>Cc Tony Lindgren <[email protected]>Cc Nishanth Menon <[email protected]>--- include/linux/i2c/twl.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)include/linux/i2c/twl.h +0
-0
include/linux/i2c/twl.h int twl_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes); · line 179
Quoted 8 lines
include/linux/i2c/twl.h +5
-0@@ -172,6 +172,11 @@ int twl_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes);int twl6030_interrupt_unmask (u8 bit_mask,u8 offset);int twl6030_interrupt_mask (u8 bit_mask,u8 offset); +int twl6030_init_irq (int irq_num,unsigned irq_base,unsigned irq_end); +int twl6030_exit_irq (void ); +int twl4030_init_irq (int irq_num,unsigned irq_base,unsigned irq_end); +int twl4030_exit_irq (void ); +int twl4030_init_chip_irq (const char *chip);
No, we don't want to export those. Try defining them as extern from twl*-irq.c.
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
PATCH v2 8/10 TWL IRQ: Fix fucntion declaration warnings
Hi Samuel,
Quoted 43 lines
-----Original Message-----
From: Samuel Ortiz [mailto:sameo at linux.intel.com]
Sent: Monday, September 27, 2010 4:46 PM
To: G, Manjunath Kondaiah
Cc: linux-omap at vger.kernel.org;
linux-arm-kernel at lists.infradead.org; Tony Lindgren; Menon, Nishanth
Subject: Re: [PATCH v2 08/10] TWL IRQ: Fix fucntion declaration warningsHi Manjunath,
Quoted 3 lines · Manjunath Kondaiah
Fixes following sparse warnings for twl4030 and twl6030 irq files.
drivers/mfd/twl4030-irq.c:783:5: warning: symbol'
twl4030_init_irq' was not declared. Should it be static?Quoted 1 line
drivers/mfd/twl4030-irq.c:863:5: warning: symbol'
twl4030_exit_irq' was not declared. Should it be static?Quoted 1 line
drivers/mfd/twl4030-irq.c:873:5: warning: symbol'
twl4030_init_chip_irq' was not declared. Should it be static?Quoted 2 lines
drivers/mfd/twl6030-irq.c:226:5: warning: symbol'
twl6030_init_irq' was not declared. Should it be static?Quoted 1 line
drivers/mfd/twl6030-irq.c:290:5: warning: symbol'
twl6030_exit_irq' was not declared. Should it be static?Review
Quoted 11 lines
Signed-off-by G, Manjunath Kondaiah <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc Samuel Ortiz <[email protected]>Cc Tony Lindgren <[email protected]>Cc Nishanth Menon <[email protected]>--- include/linux/i2c/twl.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)(quoted diff) +0
-0
b/include/linux/i2c/twl.hindexQuoted 6 lines
6de90bf..c61e90a 100644
include/linux/i2c/twl.h +0
-0@@ -172,6 +172,11 @@ int twl_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes);
Quoted 9 lines
include/linux/i2c/twl.h int twl_i2c_read(u8 mod_no, u8 *value, u8 reg, · line 179
Quoted 6 lines
include/linux/i2c/twl.h +4
-0int twl6030_interrupt_unmask (u8 bit_mask,u8 offset);int twl6030_interrupt_mask (u8 bit_mask,u8 offset); +int twl6030_init_irq (int irq_num,unsigned irq_base,unsigned +irq_end);int twl6030_exit_irq (void );int twl4030_init_irq (int +irq_num,unsigned irq_base,unsigned irq_end);int +twl4030_exit_irq(void); int twl4030_init_chip_irq(constchar *chip);
No, we don't want to export those. Try defining them as extern from twl*-irq.c.
Having extern in .c file will generate checkpatch warning as:
WARNING: externs should be avoided in .c files
-Manjunath
PATCH v2 8/10 TWL IRQ: Fix fucntion declaration warnings
Quoted 71 lines
-----Original Message-----
From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-owner at vger.kernel.org] On Behalf Of G, Manjunath Kondaiah
Sent: Monday, September 27, 2010 6:40 PM
To: Samuel Ortiz
Cc: linux-omap at vger.kernel.org;
linux-arm-kernel at lists.infradead.org; Tony Lindgren; Menon, Nishanth
Subject: RE: [PATCH v2 08/10] TWL IRQ: Fix fucntion declaration warningsHi Samuel,
Quoted 12 lines
-----Original Message-----
From: Samuel Ortiz [mailto:sameo at linux.intel.com]
Sent: Monday, September 27, 2010 4:46 PM
To: G, Manjunath Kondaiah
Cc: linux-omap at vger.kernel.org;
linux-arm-kernel at lists.infradead.org; Tony Lindgren; Menon, Nishanth
Subject: Re: [PATCH v2 08/10] TWL IRQ: Fix fucntion declaration warningsHi Manjunath,
On Tue, Sep 21, 2010 at 03:31:18PM +0530, G, Manjunath
Quoted 23 lines · Kondaiah
Quoted 3 lines
Fixes following sparse warnings for twl4030 and twl6030 irq files.
drivers/mfd/twl4030-irq.c:783:5: warning: symbol'
twl4030_init_irq' was not declared. Should it be static?Quoted 1 line
drivers/mfd/twl4030-irq.c:863:5: warning: symbol'
twl4030_exit_irq' was not declared. Should it be static?Quoted 1 line
drivers/mfd/twl4030-irq.c:873:5: warning: symbol'
twl4030_init_chip_irq' was not declared. Should it be static?Quoted 2 lines
drivers/mfd/twl6030-irq.c:226:5: warning: symbol'
twl6030_init_irq' was not declared. Should it be static?Quoted 1 line
drivers/mfd/twl6030-irq.c:290:5: warning: symbol'
twl6030_exit_irq' was not declared. Should it be static?Quoted 10 lines
Signed-off-by G, Manjunath Kondaiah <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc Samuel Ortiz <[email protected]>Cc Tony Lindgren <[email protected]>Cc Nishanth Menon <[email protected]>--- include/linux/i2c/twl.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)Quoted 6 lines
Review
Quoted 1 line
(quoted diff) +0
-0
b/include/linux/i2c/twl.hindexinclude/linux/i2c/twl.h int twl_i2c_read(u8 mod_no, u8
Quoted 4 lines
6de90bf..c61e90a 100644
include/linux/i2c/twl.h +0
-0@@ -172,6 +172,11 @@ int twl_i2c_read(u8 mod_no, u8*value, u8 reg,
Quoted 11 lines
include/linux/i2c/twl.h int twl_i2c_read(u8 mod_no, u8 · line 179
Quoted 8 lines
include/linux/i2c/twl.h +4
-0unsigned num_bytes);int twl6030_interrupt_unmask (u8 bit_mask,u8 offset);int twl6030_interrupt_mask (u8 bit_mask,u8 offset); +int twl6030_init_irq (int irq_num,unsigned irq_base,unsigned +irq_end);int twl6030_exit_irq (void );int twl4030_init_irq (int +irq_num,unsigned irq_base,unsigned irq_end);int +twl4030_exit_irq(void); int twl4030_init_chip_irq(constchar *chip);
No, we don't want to export those. Try defining them as extern from twl*-irq.c.
Quoted 2 lines
Having extern in .c file will generate checkpatch warning as:
WARNING: externs should be avoided in .c files
As an alternate, how about having twl-core.h in drivers/mfd and defining them as extern so that these API's will be available only to files under drivers/mfd?
-Manjunath
PATCH v2 8/10 TWL IRQ: Fix fucntion declaration warnings
Hi Manjunath,
Quoted 9 lines · Manjunath Kondaiah
Quoted 5 lines
Quoted 2 lines
No, we don't want to export those. Try defining them as extern from twl*-irq.c.
Having extern in .c file will generate checkpatch warning as:
WARNING: externs should be avoided in .c filesAs an alternate, how about having
twl-core.hindrivers/mfdand defining them as extern so that these API's will be available only to files underdrivers/mfd?
That would be better, yes. Even though exporting those definititions through linux/i2c/twl.h is harmless.
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
PATCH v2 9/10 OMAP2/3: Convert write/read functions to raw read/write
In reply to G, Manjunath KondaiahFollowing sparse warnings exists due to use of writel/w and readl/w functions.
This patch fixes the sparse warnings by converting readl/w functions usage into __raw_readl/__raw_readw functions.
arch/arm/mach-omap2/board-omap3evm.c:77:12: warning: symbol '__v' shadows an earlier one arch/arm/mach-omap2/board-omap3evm.c:77:12: originally declared here
arch/arm/mach-omap2/gpmc-onenand.c:49:8: warning: symbol '__v' shadows an earlier one arch/arm/mach-omap2/gpmc-onenand.c:49:8: originally declared here arch/arm/mach-omap2/gpmc-onenand.c:89:8: warning: symbol '__v' shadows an earlier one arch/arm/mach-omap2/gpmc-onenand.c:89:8: originally declared here arch/arm/mach-omap2/gpmc-onenand.c:101:8: warning: symbol '__v' shadows an earlier one arch/arm/mach-omap2/gpmc-onenand.c:101:8: originally declared here arch/arm/mach-omap2/gpmc-onenand.c:151:9: warning: symbol '__v' shadows an earlier one arch/arm/mach-omap2/gpmc-onenand.c:151:9: originally declared here
arch/arm/plat-omap/dmtimer.c:295:10: warning: symbol '__v' shadows an earlier one arch/arm/plat-omap/dmtimer.c:295:10: originally declared here arch/arm/plat-omap/dmtimer.c:298:9: warning: symbol '__v' shadows an earlier one arch/arm/plat-omap/dmtimer.c:298:9: originally declared here arch/arm/plat-omap/dmtimer.c:311:10: warning: symbol '__v' shadows an earlier one arch/arm/plat-omap/dmtimer.c:311:10: originally declared here
drivers/mtd/nand/omap2.c:484:15: warning: symbol '__v' shadows an earlier one drivers/mtd/nand/omap2.c:484:15: originally declared here
drivers/mtd/onenand/omap2.c:86:9: warning: symbol '__v' shadows an earlier one drivers/mtd/onenand/omap2.c:86:9: originally declared here
--- arch/arm/mach-omap2/board-omap3evm.c | 2 +- arch/arm/mach-omap2/gpmc-onenand.c | 8 ++++---- arch/arm/plat-omap/dmtimer.c | 6 +++--- drivers/mtd/nand/omap2.c | 2 +- drivers/mtd/onenand/omap2.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/mach-omap2/board-omap3evm.c +1 -1
@@ -74,7 +74,7 @@ static void __init omap3_evm_get_revision(void) ioaddr =ioremap_nocache (OMAP3EVM_ETHR_START ,SZ_1K );if (!ioaddr)return ; - smsc_id =readl (ioaddr +OMAP3EVM_ETHR_ID_REV ) &0xFFFF0000 ; + smsc_id =__raw_readl (ioaddr +OMAP3EVM_ETHR_ID_REV ) &0xFFFF0000 ;iounmap (ioaddr);switch (smsc_id) {
arch/arm/mach-omap2/gpmc-onenand.c +4 -4
@@ -46,7 +46,7 @@ static int omap2_onenand_set_async_mode(int cs, void __iomem *onenand_base)const int t_wph =30 ;/* Ensure sync read and sync write are disabled */ - reg =readw (onenand_base +ONENAND_REG_SYS_CFG1 ); + reg =__raw_readw (onenand_base +ONENAND_REG_SYS_CFG1 ); reg &= ~ONENAND_SYS_CFG1_SYNC_READ & ~ONENAND_SYS_CFG1_SYNC_WRITE ;writew (reg, onenand_base +ONENAND_REG_SYS_CFG1 );
@@ -86,7 +86,7 @@ static int omap2_onenand_set_async_mode(int cs, void __iomem *onenand_base)return err;/* Ensure sync read and sync write are disabled */ - reg =readw (onenand_base +ONENAND_REG_SYS_CFG1 ); + reg =__raw_readw (onenand_base +ONENAND_REG_SYS_CFG1 ); reg &= ~ONENAND_SYS_CFG1_SYNC_READ & ~ONENAND_SYS_CFG1_SYNC_WRITE ;writew (reg, onenand_base +ONENAND_REG_SYS_CFG1 );
@@ -98,7 +98,7 @@ static void set_onenand_cfg(void __iomem *onenand_base, int latency, {u32 reg; - reg =readw (onenand_base +ONENAND_REG_SYS_CFG1 ); + reg =__raw_readw (onenand_base +ONENAND_REG_SYS_CFG1 ); reg &= ~((0x7 <<ONENAND_SYS_CFG1_BRL_SHIFT ) | (0x7 <<9 )); reg |= (latency <<ONENAND_SYS_CFG1_BRL_SHIFT ) |ONENAND_SYS_CFG1_BL_16 ;
@@ -148,7 +148,7 @@ static int omap2_onenand_set_sync_mode(struct omap_onenand_platform_data *cfg, err =omap2_onenand_set_async_mode (cs, onenand_base);if (err)return err; - reg =readw (onenand_base +ONENAND_REG_VERSION_ID ); + reg =__raw_readw (onenand_base +ONENAND_REG_VERSION_ID );switch ((reg >>4 ) &0xf ) {case 0 : freq =40 ;
arch/arm/plat-omap/dmtimer.c +3 -3
@@ -292,10 +292,10 @@ static spinlock_t dm_timer_lock;static inline u32 omap_dm_timer_read_reg (struct omap_dm_timer *timer,u32 reg) {if (timer->posted) -while (readl (timer->io_base + (OMAP_TIMER_WRITE_PEND_REG &0xff )) +while (__raw_readl (timer->io_base + (OMAP_TIMER_WRITE_PEND_REG &0xff )) & (reg >>WPSHIFT ))cpu_relax (); -return readl (timer->io_base + (reg &0xff )); +return __raw_readl (timer->io_base + (reg &0xff )); }/*
@@ -308,7 +308,7 @@ static void omap_dm_timer_write_reg(struct omap_dm_timer *timer, u32 reg, u32 value) {if (timer->posted) -while (readl (timer->io_base + (OMAP_TIMER_WRITE_PEND_REG &0xff )) +while (__raw_readl (timer->io_base + (OMAP_TIMER_WRITE_PEND_REG &0xff )) & (reg >>WPSHIFT ))cpu_relax ();writel (value, timer->io_base + (reg &0xff ));
drivers/mtd/nand/omap2.c +1 -1
@@ -481,7 +481,7 @@ static int omap_verify_buf(struct mtd_info *mtd, const u_char * buf, int len) len >>=1 ;while (len--) { -if (*p++ !=cpu_to_le16 (readw (info->nand.IO_ADDR_R))) +if (*p++ !=cpu_to_le16 (__raw_readw (info->nand.IO_ADDR_R)))return -EFAULT ; }
drivers/mtd/onenand/omap2.c +1 -1
@@ -83,7 +83,7 @@ static irqreturn_t omap2_onenand_interrupt(int irq, void *dev_id)static inline unsigned short read_reg (struct omap2_onenand *c,int reg) { -return readw (c->onenand.base + reg); +return __raw_readw (c->onenand.base + reg); } static inline void write_reg(struct omap2_onenand *c, unsigned short value,
Signature · 1 line
1.7.0.4
PATCH v2 9/10 OMAP2/3: Convert write/read functions to raw read/write
Quoted 10 lines
-----Original Message-----
From: linux-omap-owner at vger.kernel.org [mailto:linux-omap- owner at vger.kernel.org] On Behalf Of G, Manjunath Kondaiah
Sent: Tuesday, September 21, 2010 5:01 AM
To: linux-omap at vger.kernel.org
Cc: linux-arm-kernel at lists.infradead.org; linux-mtd at lists.infradead.org
Subject: [PATCH v2 09/10] OMAP2/3: Convert write/read functions to raw read/write
Quoted 6 lines
Following sparse warnings exists due to use of writel/w and readl/w functions.
This patch fixes the sparse warnings by converting readl/w functions usage into
__raw_readl/__raw_readw functions.
Apologies on bringing up an old topic here -> Is'nt it better to fix readl/w or writel/w than replacing it with __raw_readl/w etc?
Regards,
Nishanth Menon
[...]
PATCH v2 9/10 OMAP2/3: Convert write/read functions to raw read/write
Quoted 13 lines · Nishanth
Quoted 13 lines
-----Original Message-----
From: linux-omap-owner at vger.kernel.org [mailto:linux-omap- owner at vger.kernel.org] On Behalf Of G, Manjunath Kondaiah
Sent: Tuesday, September 21, 2010 5:01 AM
To: linux-omap at vger.kernel.org
Cc: linux-arm-kernel at lists.infradead.org; linux-mtd at lists.infradead.org
Subject: [PATCH v2 09/10] OMAP2/3: Convert write/read functions to raw read/writeFollowing sparse warnings exists due to use of writel/w and readl/w functions.
Quoted 6 lines
Quoted 3 lines
This patch fixes the sparse warnings by converting readl/w functions usage into
__raw_readl/__raw_readw functions.Apologies on bringing up an old topic here -> Is'nt it better to fix readl/w or writel/w than replacing it with __raw_readl/w etc?
No. If you're getting sparse warnings its because _you_ are using readl/writel wrongly.
They take a void __iomem pointer, not a u32, unsigned long, int, or even a void pointer.
PATCH v2 9/10 OMAP2/3: Convert write/read functions to raw read/write
Russell King - ARM Linux had written, on 10/07/2010 01:56 PM, the following:
Quoted 16 lines · Nishanth
Quoted 15 lines
Quoted 15 lines
-----Original Message-----
From: linux-omap-owner at vger.kernel.org [mailto:linux-omap- owner at vger.kernel.org] On Behalf Of G, Manjunath Kondaiah
Sent: Tuesday, September 21, 2010 5:01 AM
To: linux-omap at vger.kernel.org
Cc: linux-arm-kernel at lists.infradead.org; linux-mtd at lists.infradead.org
Subject: [PATCH v2 09/10] OMAP2/3: Convert write/read functions to raw read/writeFollowing sparse warnings exists due to use of writel/w and readl/w functions.
This patch fixes the sparse warnings by converting readl/w functions usage into
__raw_readl/__raw_readw functions.
Quoted 8 lines
Quoted 2 lines
Apologies on bringing up an old topic here -> Is'nt it better to fix readl/w or writel/w than replacing it with __raw_readl/w etc?
No. If you're getting sparse warnings its because _you_ are using readl/writel wrongly.
They take a void
__iomempointer, not a u32, unsigned long, int, or even a void pointer.
void __iomem *p;
...
readl(p);
unrolls to:
({ u32 __v = ({ u32 __v = (( __u32)(__le32)(( __le32) ((void)0, *(volatile unsigned int *)((p))))); __v; }); __asm__ __volatile__ ("mcr p15,
, %0, c7, c10, 5" : : "r" (0) : "memory"); __v; });
({ u32 __v = ({ u32 __v
seems to be the obvious cause of sparse warnings such as that attempted to be fixed in [1]
warning: symbol '__v' shadows an earlier one
my comment being that by moving {read,write}[wlb] to __raw versions dont solve the real issue of namespace here. fix should be in arch/arm/include/asm/io.h IMHO. so that there are no overlaps as this.
[1]http://marc.info/?l=linux-omap&m=128506333803725&w=2
Signature · 2 lines
Regards, Nishanth Menon
PATCH v2 9/10 OMAP2/3: Convert write/read functions to raw read/write
Quoted 3 lines · Nishanth Menon
my comment being that by moving {read,write}[wlb] to
__rawversions dont solve the real issue of namespace here. fix should be inarch/arm/include/asm/io.hIMHO. so that there are no overlaps as this.
Indeed. This patch is complete nonsense.
Signature · 2 lines
David Woodhouse Open Source Technology Centre David.Woodhouse at intel.com Intel Corporation
PATCH v2 9/10 OMAP2/3: Convert write/read functions to raw read/write
David,
Quoted 10 lines
-----Original Message-----
From: David Woodhouse [mailto:dwmw2 at infradead.org]
Sent: Monday, October 25, 2010 5:32 AM
To: Menon, Nishanth
Cc: Russell King - ARM Linux; G, Manjunath Kondaiah; linux-omap at vger.kernel.org; linux-mtd at lists.infradead.org; linux-arm-kernel at lists.infradead.org
Subject: Re: [PATCH v2 09/10] OMAP2/3: Convert write/read functions to raw read/write
Quoted 7 lines
Quoted 3 lines · Nishanth Menon
my comment being that by moving {read,write}[wlb] to
__rawversions dont solve the real issue of namespace here. fix should be inarch/arm/include/asm/io.hIMHO. so that there are nooverlaps as this.
Indeed. This patch is complete nonsense.
nonsense? There are two types of fixes proposed to fix these sparse warnings.
1. with this patch
2. fixing in io.h
https://patchwork.kernel.org/patch/250171/
1st option is already merged with 2.6.37 merge window.
If 2 get accepted, all __raw_read/write will get replaced with readl/writel.
Apart from those two, do you have any other alternate idea to fix these sparse warnings?
-Manjunath
PATCH v2 9/10 OMAP2/3: Convert write/read functions to raw read/write
Quoted 25 lines · Manjunath Kondaiah
David,
Quoted 10 lines
-----Original Message-----
From: David Woodhouse [mailto:dwmw2 at infradead.org]
Sent: Monday, October 25, 2010 5:32 AM
To: Menon, Nishanth
Cc: Russell King - ARM Linux; G, Manjunath Kondaiah; linux-omap at vger.kernel.org; linux-mtd at lists.infradead.org; linux-arm-kernel at lists.infradead.org
Subject: Re: [PATCH v2 09/10] OMAP2/3: Convert write/read functions to raw read/writeQuoted 7 lines
Quoted 3 lines · Nishanth Menon
my comment being that by moving {read,write}[wlb] to
__rawversions dont solve the real issue of namespace here. fix should be inarch/arm/include/asm/io.hIMHO. so that there are nooverlaps as this.
Indeed. This patch is complete nonsense.
nonsense? There are two types of fixes proposed to fix these sparse warnings.
1. with this patch
2. fixing inio.h
https://patchwork.kernel.org/patch/250171/
Quoted 5 lines
1st option is already merged with 2.6.37 merge window.
If 2 get accepted, all __raw_read/write will get replaced with readl/writel.
Apart from those two, do you have any other alternate idea to fix these sparse warnings?
The latter is obviously the better approach. The problem that sparse is complaining about is the fact that you have two nested C blocks, both of which contain a local variable called '__v'. By changing the variable names so that they're actually unique, we fix the real problem.
The answer is not that *all* drivers which call cpu_to_le16(readw()) must be changed, which is what you seem to have assumed. And you *certainly* can't change them to use __raw_readw(), which has *different* semantics (and endianness in some cases), without a clear comment in the changelog entry saying *why* that change was OK.
Signature · 1 line
dwmw2
PATCH v2 9/10 OMAP2/3: Convert write/read functions to raw read/write
In reply to David WoodhouseQuoted 6 lines · David Woodhouse
Quoted 3 lines · Nishanth Menon
my comment being that by moving {read,write}[wlb] to
__rawversions dont solve the real issue of namespace here. fix should be inarch/arm/include/asm/io.hIMHO. so that there are no overlaps as this.Indeed. This patch is complete nonsense.
Removing from my l2 tree.
Signature · 2 lines
Best Regards, Artem Bityutskiy (????? ????????)
PATCH v2 9/10 OMAP2/3: Convert write/read functions to raw read/write
In reply to G, Manjunath KondaiahQuoted 5 lines · Manjunath Kondaiah
Following sparse warnings exists due to use of writel/w and readl/w functions.
This patch fixes the sparse warnings by converting readl/w functions usage into __raw_readl/__raw_readw functions.
[...]
drivers/mtd/nand/omap2.c static int omap_verify_buf(struct mtd_info *mtd, const u_char * buf, int len) · line 484
Quoted 8 lines
drivers/mtd/nand/omap2.c +1
-1@@ -481,7 +481,7 @@ static int omap_verify_buf(struct mtd_info *mtd, const u_char * buf, int len) ? ? ? ?len >>= 1; ? ? ? ?while (len--) { - ? ? ? ? ? ? ? if (*p++ != cpu_to_le16(readw(info->nand.IO_ADDR_R))) + ? ? ? ? ? ? ? if (*p++ != cpu_to_le16(__raw_readw(info->nand.IO_ADDR_R)))
There was an old comment to remove use of 'cpu_to_le16' from driver, I just missed it. Can you rather use 'ioread16_rep' for reading data.
Signature · 2 lines
Regards, Vimal Singh
PATCH v2 10/10 OMAP3: Keypad: Fix incorrect type initializer
In reply to G, Manjunath KondaiahThe keypad matrix variable declaration is not matching with structure variable keymap declared in keypad_matrix.h.
Due to this, following sparse warnings are generated with omap3_defconfig.
arch/arm/mach-omap2/board-devkit8000.c:223:14: warning: incorrect type in initializer (different signedness)arch/arm/mach-omap2/board-devkit8000.c:223:14: expected unsigned int const [usertype] *keymaparch/arm/mach-omap2/board-devkit8000.c:223:14: got int static [toplevel] *<noident>
arch/arm/mach-omap2/board-ldp.c:107:14: warning: incorrect type in initializer (different signedness)arch/arm/mach-omap2/board-ldp.c:107:14: expected unsigned int const [usertype] *keymaparch/arm/mach-omap2/board-ldp.c:107:14: got int static [toplevel] *<noident>
arch/arm/mach-omap2/board-omap3evm.c:472:14: warning: incorrect type in initializer (different signedness)arch/arm/mach-omap2/board-omap3evm.c:472:14: expected unsigned int const [usertype] *keymaparch/arm/mach-omap2/board-omap3evm.c:472:14: got int static [toplevel] *<noident>
arch/arm/mach-omap2/board-3430sdp.c:114:14: warning: incorrect type in initializer (different signedness)arch/arm/mach-omap2/board-3430sdp.c:114:14: expected unsigned int const [usertype] *keymaparch/arm/mach-omap2/board-3430sdp.c:114:14: got int static [toplevel] *<noident>
arch/arm/mach-omap2/board-rx51-peripherals.c:248:14: warning: incorrect type in initializer (different signedness)arch/arm/mach-omap2/board-rx51-peripherals.c:248:14: expected unsigned int const [usertype] *keymaparch/arm/mach-omap2/board-rx51-peripherals.c:248:14: got int static [toplevel] *<noident>
arch/arm/mach-omap2/board-zoom-peripherals.c:88:14: warning: incorrect type in initializer (different signedness)arch/arm/mach-omap2/board-zoom-peripherals.c:88:14: expected unsigned int const [usertype] *keymaparch/arm/mach-omap2/board-zoom-peripherals.c:88:14: got int static [toplevel] *<noident>
arch/arm/mach-omap2/board-cm-t35.c:568:14: warning: incorrect type in initializer (different signedness)arch/arm/mach-omap2/board-cm-t35.c:568:14: expected unsigned int const [usertype] *keymaparch/arm/mach-omap2/board-cm-t35.c:568:14: got int static [toplevel] *<noident>
arch/arm/mach-omap2/board-omap3stalker.c:415:13: warning: incorrect type in initializer (different signedness)arch/arm/mach-omap2/board-omap3stalker.c:415:13: expected unsigned int const [usertype] *keymaparch/arm/mach-omap2/board-omap3stalker.c:415:13: got int static [toplevel] *<noident>
This patch modifies the variable keymap declaration as per declaration in matrix_keymap structure.
--- arch/arm/mach-omap2/board-3430sdp.c | 2 +- arch/arm/mach-omap2/board-cm-t35.c | 2 +- arch/arm/mach-omap2/board-devkit8000.c | 2 +- arch/arm/mach-omap2/board-ldp.c | 2 +- arch/arm/mach-omap2/board-omap3evm.c | 2 +- arch/arm/mach-omap2/board-omap3stalker.c | 2 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +- arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-)
arch/arm/mach-omap2/board-3430sdp.c +1 -1
@@ -76,7 +76,7 @@ static struct cpuidle_params omap3_cpuidle_params_table[] = { {1, 10000, 30000, 300000}, }; -static int board_keymap[] = { +static uint32_t board_keymap[] = {KEY (0 ,0 ,KEY_LEFT ),KEY (0 ,1 ,KEY_RIGHT ), KEY(0, 2, KEY_A),
arch/arm/mach-omap2/board-cm-t35.c +1 -1
@@ -558,7 +558,7 @@ static struct twl4030_usb_data cm_t35_usb_data = { .usb_mode = T2_USB_MODE_ULPI, }; -static int cm_t35_keymap[] = { +static uint32_t cm_t35_keymap[] = {KEY (0 ,0 ,KEY_A ),KEY (0 ,1 ,KEY_B ),KEY (0 ,2 ,KEY_LEFT ),KEY (1 ,0 ,KEY_UP ),KEY (1 ,1 ,KEY_ENTER ),KEY (1 ,2 ,KEY_DOWN ),KEY (2 ,0 ,KEY_RIGHT ),KEY (2 ,1 ,KEY_C ),KEY (2 ,2 ,KEY_D ),
arch/arm/mach-omap2/board-devkit8000.c +1 -1
@@ -198,7 +198,7 @@ static struct platform_device devkit8000_dss_device = {static struct regulator_consumer_supply devkit8000_vdda_dac_supply =REGULATOR_SUPPLY ("vdda_dac" ,"omapdss" ); -static int board_keymap[] = { +static uint32_t board_keymap[] = {KEY (0 ,0 ,KEY_1 ),KEY (1 ,0 ,KEY_2 ),KEY (2 ,0 ,KEY_3 ),
arch/arm/mach-omap2/board-ldp.c +1 -1
@@ -82,7 +82,7 @@ static struct platform_device ldp_smsc911x_device = { }, }; -static int board_keymap[] = { +static uint32_t board_keymap[] = {KEY (0 ,0 ,KEY_1 ),KEY (1 ,0 ,KEY_2 ),KEY (2 ,0 ,KEY_3 ),
arch/arm/mach-omap2/board-omap3evm.c +1 -1
@@ -446,7 +446,7 @@ static struct twl4030_usb_data omap3evm_usb_data = { .usb_mode = T2_USB_MODE_ULPI, }; -static int board_keymap[] = { +static uint32_t board_keymap[] = {KEY (0 ,0 ,KEY_LEFT ),KEY (0 ,1 ,KEY_DOWN ),KEY (0 ,2 ,KEY_ENTER ),
arch/arm/mach-omap2/board-omap3stalker.c +1 -1
@@ -389,7 +389,7 @@ static struct twl4030_usb_data omap3stalker_usb_data = { .usb_mode = T2_USB_MODE_ULPI, }; -static int board_keymap[] = { +static uint32_t board_keymap[] = {KEY (0 ,0 ,KEY_LEFT ),KEY (0 ,1 ,KEY_DOWN ),KEY (0 ,2 ,KEY_ENTER ),
arch/arm/mach-omap2/board-rx51-peripherals.c +1 -1
@@ -186,7 +186,7 @@ static void __init rx51_add_gpio_keys(void) }#endif /* CONFIG_KEYBOARD_GPIO || CONFIG_KEYBOARD_GPIO_MODULE */ -static int board_keymap[] = { +static uint32_t board_keymap[] = {/* * Note that KEY(x, 8, KEY_XXX) entries represent "entrire row * connected to the ground" matrix state.
arch/arm/mach-omap2/board-zoom-peripherals.c +1 -1
@@ -30,7 +30,7 @@#include "hsmmc.h" /* Zoom2 has Qwerty keyboard*/ -static int board_keymap[] = { +static uint32_t board_keymap[] = {KEY (0 ,0 ,KEY_E ),KEY (0 ,1 ,KEY_R ),KEY (0 ,2 ,KEY_T ),
Signature · 1 line
1.7.0.4