OMAP: TWL: sparse fixes

PATCH New Nishanth Menon 3 participants 10 messages Jan 3, 2011 – Jan 5, 2011

Subsystems (3)

Arm (32-bit) Arm sub-architectures OMAP2+ support

lore

Share & tools

lore

Nishanth Menon

author

2011-01-03 18:58 UTC #1 lore raw

PATCH 1/2 OMAP2+: TWL: make conversion routines static

The uv_to_vsel, vsel_to_uv functions don't need to be exposed to the world as they are used as function pointers. make them static.

Fixes sparse warnings:
arch/arm/mach-omap2/omap_twl.c:63:15: warning: symbol 'twl4030_vsel_to_uv' was not declared. Should it be static? arch/arm/mach-omap2/omap_twl.c:68:4: warning: symbol 'twl4030_uv_to_vsel' was not declared. Should it be static? arch/arm/mach-omap2/omap_twl.c:73:15: warning: symbol 'twl6030_vsel_to_uv' was not declared. Should it be static? arch/arm/mach-omap2/omap_twl.c:105:4: warning: symbol 'twl6030_uv_to_vsel' was not declared. Should it be static?

Signed-off-by Nishanth Menon <[email protected]>

---
 arch/arm/mach-omap2/omap_twl.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

arch/arm/mach-omap2/omap_twl.c +4 -4

index 15f8c6c..65ab4e3 100644
@@ -60,17 +60,17 @@ static u8 smps_offset;
 
 #define REG_SMPS_OFFSET         0xE0
 
-unsigned long twl4030_vsel_to_uv(const u8 vsel)
+static unsigned long twl4030_vsel_to_uv(const u8 vsel)
 {
 	return (((vsel * 125) + 6000)) * 100;
 }
 
-u8 twl4030_uv_to_vsel(unsigned long uv)
+static u8 twl4030_uv_to_vsel(unsigned long uv)
 {
 	return DIV_ROUND_UP(uv - 600000, 12500);
 }
 
-unsigned long twl6030_vsel_to_uv(const u8 vsel)
+static unsigned long twl6030_vsel_to_uv(const u8 vsel)
 {
 	/*
 	 * In TWL6030 depending on the value of SMPS_OFFSET

@@ -102,7 +102,7 @@ unsigned long twl6030_vsel_to_uv(const u8 vsel)
 		return ((((vsel - 1) * 125) + 6000)) * 100;
 }
 
-u8 twl6030_uv_to_vsel(unsigned long uv)
+static u8 twl6030_uv_to_vsel(unsigned long uv)
 {
 	/*
 	 * In TWL6030 depending on the value of SMPS_OFFSET

Signature · 1 line

1.6.3.3

Nishanth Menon

author

2011-01-03 18:58 UTC #2 lore raw

PATCH 2/2 OMAP2+: TWL: include pm header for init protos

In reply to Nishanth Menon

twl_init functions are declared in pm.h and used in pm.c
pm.h header defining the protos need to be included to
ensure that omap_twl.c has consistent function definition.
This fixes sparse warning:
arch/arm/mach-omap2/omap_twl.c:237:12: warning: symbol 'omap4_twl_init' was not declared. Should it be static? arch/arm/mach-omap2/omap_twl.c:256:12: warning: symbol 'omap3_twl_init' was not declared. Should it be static?

Signed-off-by Nishanth Menon <[email protected]>

---
 arch/arm/mach-omap2/omap_twl.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

arch/arm/mach-omap2/omap_twl.c +2 -0

index 65ab4e3..00e1d2b 100644
@@ -20,6 +20,8 @@
 
 #include <plat/voltage.h>
 
+#include "pm.h"
+
 #define OMAP3_SRI2C_SLAVE_ADDR		0x12
 #define OMAP3_VDD_MPU_SR_CONTROL_REG	0x00
 #define OMAP3_VDD_CORE_SR_CONTROL_REG	0x01

Signature · 1 line

1.6.3.3

Russell King - ARM Linux

2011-01-03 22:36 UTC #3 lore raw

cover OMAP: TWL: sparse fixes

In reply to Nishanth Menon

Quoted 7 lines · Nishanth Menon

Source:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
branch: omap-for-linus
Doing a rm arch/arm/mach-omap2/*.o;make C=1 arch/arm/mach-omap2/ resulted in the following sparse warnings:
http://pastebin.mozilla.org/907954

FYI, you may like to try:

make C=2 arch/arm/mach-omap2/

instead of the two-step process:

| Do a kernel make with "make C=1" to run sparse on all the C files that get
| recompiled, or use "make C=2" to run sparse on the files whether they need to
| be recompiled or not.  The latter is a fast way to check the whole tree if you
| have already built it.

Nishanth Menon

author

2011-01-03 22:39 UTC #4 lore raw

cover OMAP: TWL: sparse fixes

Russell King - ARM Linux had written, on 01/03/2011 04:36 PM, the following:

Quoted 11 lines · Nishanth Menon

Quoted 7 lines
Source:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
branch: omap-for-linus
Doing a rm arch/arm/mach-omap2/*.o;make C=1 arch/arm/mach-omap2/ resulted in the following sparse warnings:
http://pastebin.mozilla.org/907954
FYI, you may like to try:

Quoted 7 lines

make C=2 arch/arm/mach-omap2/

instead of the two-step process:

| Do a kernel make with "make C=1" to run sparse on all the C files that get
| recompiled, or use "make C=2" to run sparse on the files whether they need to
| be recompiled or not.  The latter is a fast way to check the whole tree if you
| have already built it.

Gee thanks. /me should update my old bash aliases :D

Signature · 2 lines

Regards,
Nishanth Menon

Nishanth Menon

author

2011-01-04 20:37 UTC #5 lore raw

cover OMAP: TWL: sparse fixes

Nishanth Menon had written, on 01/03/2011 04:39 PM, the following:

Quoted 23 lines

Russell King - ARM Linux had written, on 01/03/2011 04:36 PM, the following:
Quoted 13 lines · Nishanth Menon
Quoted 7 lines
Source:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
branch: omap-for-linus
Doing a rm arch/arm/mach-omap2/*.o;make C=1 arch/arm/mach-omap2/ resulted in the following sparse warnings:
http://pastebin.mozilla.org/907954
FYI, you may like to try:
make C=2 arch/arm/mach-omap2/
Quoted 8 lines
instead of the two-step process:
| Do a kernel make with "make C=1" to run sparse on all the C files that get
| recompiled, or use "make C=2" to run sparse on the files whether they need to
| be recompiled or not. The latter is a fast way to check the whole tree if you
| have already built it.

Quoted 1 line

Gee thanks. /me should update my old bash aliases :D

hmm.. minor nit (with codesourcery 2010.09-50 - 4.5.1):
rm arch/arm/mach-omap2/*.o;make C=1 arch/arm/mach-omap2/ 2>Kerr;make C=2 arch/arm/mach-omap2/ 2>Kerr1;diff Kerr Kerr1
[..]
1,4d0
< arch/arm/mach-omap2/mux.c: In function 'omap_mux_get_by_name':
< arch/arm/mach-omap2/mux.c:163:17: warning: 'found_mode' may be used uninitialized in this function
< arch/arm/mach-omap2/clkt_clksel.c: In function 'omap2_clksel_set_parent':
< arch/arm/mach-omap2/clkt_clksel.c:100:35: warning: 'max_clkr' may be used uninitialized in this function

Kinda interesting to note that C=2 does'nt list all potential gcc warnings :( if one wanted a collated list of all warnings, rm .../*.o helps I guess.

Signature · 2 lines

Regards,
Nishanth Menon

Russell King - ARM Linux

2011-01-05 00:25 UTC #6 lore raw

cover OMAP: TWL: sparse fixes

Quoted 12 lines · Nishanth Menon

hmm.. minor nit (with codesourcery 2010.09-50 - 4.5.1):
rm arch/arm/mach-omap2/*.o;make C=1 arch/arm/mach-omap2/ 2>Kerr;make C=2 arch/arm/mach-omap2/ 2>Kerr1;diff Kerr Kerr1
[..]
1,4d0
< arch/arm/mach-omap2/mux.c: In function 'omap_mux_get_by_name':
< arch/arm/mach-omap2/mux.c:163:17: warning: 'found_mode' may be used uninitialized in this function
< arch/arm/mach-omap2/clkt_clksel.c: In function 'omap2_clksel_set_parent':
< arch/arm/mach-omap2/clkt_clksel.c:100:35: warning: 'max_clkr' may be used uninitialized in this function

Quoted 3 lines

Kinda interesting to note that C=2 does'nt list all potential gcc warnings :( if one wanted a collated list of all warnings, rm .../*.o helps I guess.

C=2 only runs sparse - so if you're committing patches to fix sparse warnings, that's what you should be interested in.

I'd suggest that fixing sparse warnings and GCC warnings in a single patch is probably not the best thing to do - GCC warnings are less subjective than sparse warnings.

Nishanth Menon

author

2011-01-05 13:32 UTC #7 lore raw

cover OMAP: TWL: sparse fixes

Russell King - ARM Linux wrote, on 01/04/2011 06:25 PM:

Quoted 17 lines · Nishanth Menon

Quoted 12 lines
hmm.. minor nit (with codesourcery 2010.09-50 - 4.5.1):
rm arch/arm/mach-omap2/*.o;make C=1 arch/arm/mach-omap2/ 2>Kerr;make C=2 arch/arm/mach-omap2/ 2>Kerr1;diff Kerr Kerr1
[..]
1,4d0
< arch/arm/mach-omap2/mux.c: In function 'omap_mux_get_by_name':
< arch/arm/mach-omap2/mux.c:163:17: warning: 'found_mode' may be used uninitialized in this function
< arch/arm/mach-omap2/clkt_clksel.c: In function 'omap2_clksel_set_parent':
< arch/arm/mach-omap2/clkt_clksel.c:100:35: warning: 'max_clkr' may be used uninitialized in this function
Quoted 3 lines
Kinda interesting to note that C=2 does'nt list all potential gcc warnings :( if one wanted a collated list of all warnings, rm .../*.o helps I guess.

Quoted 6 lines

C=2 only runs sparse - so if you're committing patches to fix sparse warnings, that's what you should be interested in.
I'd suggest that fixing sparse warnings and GCC warnings in a single patch is probably not the best thing to do - GCC warnings are less subjective than sparse warnings.

I agree.

Signature · 2 lines

Regards,
Nishanth Menon

Kevin Hilman

2011-01-04 18:00 UTC #8 lore raw

cover OMAP: TWL: sparse fixes

In reply to Nishanth Menon

Quoted 8 lines · Nishanth Menon

Source:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
branch: omap-for-linus
Doing a rm arch/arm/mach-omap2/*.o;make C=1 arch/arm/mach-omap2/ resulted in the following sparse warnings:
http://pastebin.mozilla.org/907954

Quoted 7 lines

This series fixes the twl warnings
Nishanth Menon (2):
OMAP2+: TWL: make conversion routines static
OMAP2+: TWL: include pm header for init protos
 arch/arm/mach-omap2/omap_twl.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

Acked-by Kevin Hilman <[email protected]>

Tony, these should probably queue for .38 if it's not too late.

Kevin

Kevin Hilman

2011-01-04 22:44 UTC #9 lore raw

cover OMAP: TWL: sparse fixes

Quoted 15 lines · Kevin Hilman

Quoted 13 lines · Nishanth Menon
Source:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
branch: omap-for-linus
Doing a rm arch/arm/mach-omap2/*.o;make C=1 arch/arm/mach-omap2/ resulted in the following sparse warnings:
http://pastebin.mozilla.org/907954
This series fixes the twl warnings
Nishanth Menon (2):
OMAP2+: TWL: make conversion routines static
OMAP2+: TWL: include pm header for init protos

Quoted 6 lines

Quoted 2 lines
 arch/arm/mach-omap2/omap_twl.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
Acked-by Kevin Hilman <[email protected]>
Tony, these should probably queue for .38 if it's not too late.

On second thought, it's too late for the main 2.6.38 merge window for these. I'll queue these in my pm-fixes branch for the 2.6.38-rc cycle.

Kevin