ipmi:ipmi_si_intf.c Fix warning: variable 'addr_space' set but not used
PATCH 1/1 ipmi:ipmi_si_intf.c Fix warning: variable 'addr_space' set but not used
Remove addr_space in exchange for two symbols that represent mm = IPMI_MEM_ADDR_SPACE;
io = IPMI_IO_ADDR_SPACE;
then add a dev_warn printing information so that GCC doesn't give a warning when building the kernel.
the original warning from GCC is this:
CC [M] drivers/char/ipmi/ipmi_si_intf.odrivers/char/ipmi/ipmi_si_intf.c: In function 'try_init_spmi':drivers/char/ipmi/ipmi_si_intf.c:2016:8: warning: variable 'addr_space' set but not used
And also the web address pointing to a *.pdf is no where to be found(or atleast I couldn't find it), so just use the web site itself(if somebody has the *.pdf
let me know I can change this).
--- drivers/char/ipmi/ipmi_si_intf.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-)
drivers/char/ipmi/ipmi_si_intf.c +9 -5
@@ -1965,8 +1965,7 @@ static int acpi_gpe_irq_setup(struct smi_info *info)/* * Defined at -* http://h21007.www2.hp.com/dspp/files/unprotected/devresource/ -* Docs/TechPapers/IA64/hpspmi.pdf +* http://h21007.www2.hp.com/portal/site/dspp */ struct SPMITable {s8 Signature[4 ];
@@ -2013,7 +2012,7 @@ struct SPMITable {static __devinit int try_init_spmi (struct SPMITable *spmi) {struct smi_info *info; -u8 addr_space; +u8 mem, io;if (spmi->IPMIlegacy !=1 ) { printk(KERN_INFO PFX "Bad SPMI legacy %d\n", spmi->IPMIlegacy);
@@ -2021,9 +2020,14 @@ static __devinit int try_init_spmi(struct SPMITable *spmi) }if (spmi->addr.space_id ==ACPI_ADR_SPACE_SYSTEM_MEMORY ) - addr_space =IPMI_MEM_ADDR_SPACE ; + mem =IPMI_MEM_ADDR_SPACE ;else - addr_space =IPMI_IO_ADDR_SPACE ; + io =IPMI_IO_ADDR_SPACE ; + +if (mem || io) { +dev_warn (info->dev,"spmi address space %d\n" , mem ?: io); +return 0 ; + } info =kzalloc (sizeof (*info),GFP_KERNEL );if (!info) {
Signature · 1 line
1.7.1.rc1.21.gf3bd6
Well, this patch is incorrect because IPMI_IO_ADDR_SPACE is zero. I'm not sure what your change is trying to accomplish, anyway. This is actually dead code from a previous change, I believe, and just needs to be removed. I did find that document at http://h21007.www2.hp.com/portal/download/files/unprot/hpspmi.pdf, not sure if there's a more reliable place to find it.
-corey
Quoted 62 lines · Justin P. Mattock
Remove
addr_spacein exchange for two symbols that represent mm =IPMI_MEM_ADDR_SPACE;
io =IPMI_IO_ADDR_SPACE;
then add adev_warnprinting information so that GCC doesn't give a warning when building the kernel.
the original warning from GCC is this:CC [M]
drivers/char/ipmi/ipmi_si_intf.odrivers/char/ipmi/ipmi_si_intf.c: In function 'try_init_spmi':drivers/char/ipmi/ipmi_si_intf.c:2016:8: warning: variable 'addr_space' set but not usedAnd also the web address pointing to a *.pdf is no where to be found(or atleast I couldn't find it), so just use the web site itself(if somebody has the *.pdf
let me know I can change this).Signed-off-by Justin P. Mattock<[email protected]>--- drivers/char/ipmi/ipmi_si_intf.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-)drivers/char/ipmi/ipmi_si_intf.c +9
-5@@ -1965,8 +1965,7 @@ static int acpi_gpe_irq_setup(struct smi_info *info)/* * Defined at -* http://h21007.www2.hp.com/dspp/files/unprotected/devresource/ -* Docs/TechPapers/IA64/hpspmi.pdf +* http://h21007.www2.hp.com/portal/site/dspp */ struct SPMITable {s8 Signature[4 ];@@ -2013,7 +2012,7 @@ struct SPMITable {static __devinit int try_init_spmi (struct SPMITable *spmi) {struct smi_info *info; -u8 addr_space; +u8 mem, io;if (spmi->IPMIlegacy !=1 ) { printk(KERN_INFO PFX "Bad SPMI legacy %d\n", spmi->IPMIlegacy);@@ -2021,9 +2020,14 @@ static __devinit int try_init_spmi(struct SPMITable *spmi) }if (spmi->addr.space_id ==ACPI_ADR_SPACE_SYSTEM_MEMORY ) - addr_space =IPMI_MEM_ADDR_SPACE ; + mem =IPMI_MEM_ADDR_SPACE ;else - addr_space =IPMI_IO_ADDR_SPACE ; + io =IPMI_IO_ADDR_SPACE ; + +if (mem || io) { +dev_warn (info->dev,"spmi address space %d\n" , mem ?: io); +return 0 ; + } info =kzalloc (sizeof (*info),GFP_KERNEL );if (!info) {
Quoted 9 lines · Corey Minyard
Well, this patch is incorrect because
IPMI_IO_ADDR_SPACEis zero. I'm not sure what your change is trying to accomplish, anyway. This is actually dead code from a previous change, I believe, and just needs to be removed. I did find that document at
http://h21007.www2.hp.com/portal/download/files/unprot/hpspmi.pdf, not sure if there's a more reliable place to find it.-corey
cool thanks.. so it's dead code..I'll resend then with it removed.
as for the web address I don't know how you found that.. i.e. I spent at least 45mins looking on that site for that *.pdf(searching gives nothing etc..)
Quoted 65 lines · Justin P. Mattock
Quoted 64 lines
Remove
addr_spacein exchange for two symbols that represent mm =IPMI_MEM_ADDR_SPACE;
io =IPMI_IO_ADDR_SPACE;
then add adev_warnprinting information so that GCC doesn't give a warning when building the kernel.
the original warning from GCC is this:CC [M]
drivers/char/ipmi/ipmi_si_intf.odrivers/char/ipmi/ipmi_si_intf.c: In function 'try_init_spmi':drivers/char/ipmi/ipmi_si_intf.c:2016:8: warning: variable 'addr_space' set but not usedAnd also the web address pointing to a *.pdf is no where to be found(or atleast I couldn't
find it), so just use the web siteitself(if somebody has the *.pdf let me know I can change this).Signed-off-by Justin P. Mattock<[email protected]>---
drivers/char/ipmi/ipmi_si_intf.c| 14 +++++++++-----1 files changed, 9 insertions(+), 5 deletions(-)drivers/char/ipmi/ipmi_si_intf.c +1
-2@@ -1965,8 +1965,7 @@ static int acpi_gpe_irq_setup(struct smi_info *info)/* * Defined at -* http://h21007.www2.hp.com/dspp/files/unprotected/devresource/ -* Docs/TechPapers/IA64/hpspmi.pdf +* http://h21007.www2.hp.com/portal/site/dspp */ struct SPMITable {s8 Signature[4];
drivers/char/ipmi/ipmi_si_intf.c +2
-2@@ -2013,7 +2012,7 @@ struct SPMITable {static __devinit int try_init_spmi (struct SPMITable *spmi) {struct smi_info *info; -u8 addr_space; +u8 mem, io;if (spmi->IPMIlegacy !=1 ) { printk(KERN_INFO PFX "Bad SPMI legacy %d\n", spmi->IPMIlegacy);@@ -2021,9 +2020,14 @@ static __devinit int try_init_spmi(struct SPMITable *spmi) }if (spmi->addr.space_id ==ACPI_ADR_SPACE_SYSTEM_MEMORY ) - addr_space =IPMI_MEM_ADDR_SPACE ; + mem =IPMI_MEM_ADDR_SPACE ;else
-addr_space=IPMI_IO_ADDR_SPACE;
+ io =IPMI_IO_ADDR_SPACE;
+
+ if (mem || io) {
+dev_warn(info->dev, "spmi address space %d\n", mem ?: io);
+ return 0;
+ }
Quoted 4 lines
Quoted 2 lines
info =
kzalloc(sizeof(*info), GFP_KERNEL);
if (!info) {
Justin P. Mattock