ipmi:ipmi_si_intf.c Fix warning: variable 'addr_space' set but not used
PATCH v2 1/1 ipmi:ipmi_si_intf.c Fix warning: variable 'addr_space' set but not used
This is version two of fixing a warning message generated by GCC
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 updates a broken web address.
--- drivers/char/ipmi/ipmi_si_intf.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-)
drivers/char/ipmi/ipmi_si_intf.c +2 -7
@@ -1965,8 +1965,8 @@ 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/download/files +* /unprot/hpspmi.pdf */ struct SPMITable {s8 Signature[4 ];
@@ -2013,7 +2013,6 @@ struct SPMITable {static __devinit int try_init_spmi (struct SPMITable *spmi) {struct smi_info *info; -u8 addr_space;if (spmi->IPMIlegacy !=1 ) { printk(KERN_INFO PFX "Bad SPMI legacy %d\n", spmi->IPMIlegacy);
@@ -2021,10 +2020,6 @@ 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 ; -else - addr_space =IPMI_IO_ADDR_SPACE ; - info =kzalloc (sizeof (*info),GFP_KERNEL );if (!info) { printk(KERN_ERR PFX "Could not allocate SI data (3)\n");
Signature · 1 line
1.7.1.rc1.21.gf3bd6
Quoted 4 lines · On Tuesday 06 of July 2010 21:15:44 Justin P. Mattock wrote:
This is version two of fixing a warning message generated by GCC
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
Quoted 6 lines
And also updates a broken web address.
Signed-off-by Justin P. Mattock <[email protected]>---
Hello Justin.
[...]
Review static __devinit int try_init_spmi(struct SPMITable
Quoted 1 line
(quoted diff) +0
-0@@ -2021,10 +2020,6 @@ static __devinit int try_init_spmi(struct SPMITable
*spmi)
drivers/char/ipmi/ipmi_si_intf.c static __devinit int try_init_spmi(struct SPMITable *spmi) · line 2025
Quoted 10 lines
drivers/char/ipmi/ipmi_si_intf.c +0
-4}if (spmi->addr.space_id ==ACPI_ADR_SPACE_SYSTEM_MEMORY ) - addr_space =IPMI_MEM_ADDR_SPACE ; -else - addr_space =IPMI_IO_ADDR_SPACE ; - info =kzalloc (sizeof (*info),GFP_KERNEL );if (!info) { printk(KERN_ERR PFX "Could not allocate SI data (3)\n");
This looks like after applying this patch 'info = ...' will be part of if statement (without indent before 'info = ...')
if (spmi->addr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) info = kzalloc(sizeof(*info), GFP_KERNEL);
It's correct?
Thanks
Quoted 9 lines
Signature · 7 lines
1.7.1.rc1.21.gf3bd6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Quoted 20 lines
Hello Justin.
[...]
Review static __devinit int try_init_spmi(struct SPMITable
Quoted 1 line
(quoted diff) +0
-0@@ -2021,10 +2020,6 @@ static __devinit int try_init_spmi(struct SPMITable*spmi)
Review static __devinit int try_init_spmi(struct SPMITable · line 2025
Quoted 10 lines
(quoted diff) +0
-4} if (spmi->addr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) - addr_space = IPMI_MEM_ADDR_SPACE; - else - addr_space = IPMI_IO_ADDR_SPACE; - info = kzalloc(sizeof(*info), GFP_KERNEL); if (!info) { printk(KERN_ERR PFX "Could not allocate SI data (3)\n");This looks like after applying this patch 'info = ...' will be part of if statement (without indent before 'info = ...')
Quoted 7 lines
if (spmi->addr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) info = kzalloc(sizeof(*info), GFP_KERNEL);It's correct?
Thanks
the original patch I dont think this is correct. a bit confusing with the if(!info) at the bottom of this. here's an updated version if it looks to be correct I'll resend if not I'll redu:
--- drivers/char/ipmi/ipmi_si_intf.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-)
drivers/char/ipmi/ipmi_si_intf.c +0 -7
@@ -2013,19 +2013,12 @@ struct SPMITable {static __devinit int try_init_spmi (struct SPMITable *spmi) {struct smi_info *info; -u8 addr_space;if (spmi->IPMIlegacy !=1 ) { printk(KERN_INFO PFX "Bad SPMI legacy %d\n", spmi->IPMIlegacy);return -ENODEV ; } -if (spmi->addr.space_id ==ACPI_ADR_SPACE_SYSTEM_MEMORY ) - addr_space =IPMI_MEM_ADDR_SPACE ; -else - addr_space =IPMI_IO_ADDR_SPACE ; - - info =kzalloc (sizeof (*info),GFP_KERNEL );if (!info) { printk(KERN_ERR PFX "Could not allocate SI data (3)\n");return -ENOMEM ;
-- 1.7.1.rc1.21.gf3bd6
Thanks for the info on this..
Justin P. Mattock
Quoted 65 lines · On Tuesday 06 of July 2010 22:30:00 Justin P. Mattock wrote:
Quoted 20 lines
Hello Justin.
[...]
Review static __devinit int try_init_spmi(struct SPMITable
Quoted 1 line
(quoted diff) +0
-0@@ -2021,10 +2020,6 @@ static __devinit int try_init_spmi(struct SPMITable*spmi)
Review static __devinit int try_init_spmi(struct SPMITable · line 2025
Quoted 10 lines
(quoted diff) +0
-4} if (spmi->addr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) - addr_space = IPMI_MEM_ADDR_SPACE; - else - addr_space = IPMI_IO_ADDR_SPACE; - info = kzalloc(sizeof(*info), GFP_KERNEL); if (!info) { printk(KERN_ERR PFX "Could not allocate SI data (3)\n");This looks like after applying this patch 'info = ...' will be part of if statement (without indent before 'info = ...')
Quoted 7 lines
if (spmi->addr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) info = kzalloc(sizeof(*info), GFP_KERNEL);It's correct?
Thanks
the original patch I dont think this is correct. a bit confusing with the if(!info) at the bottom of this.
here's an updated version if it looks to be correct I'll resend if not I'll redu:--- drivers/char/ipmi/ipmi_si_intf.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-)drivers/char/ipmi/ipmi_si_intf.c +0
-8@@ -2013,19 +2013,12 @@ struct SPMITable {static __devinit int try_init_spmi (struct SPMITable *spmi) {struct smi_info *info; -u8 addr_space;if (spmi->IPMIlegacy !=1 ) { printk(KERN_INFO PFX "Bad SPMI legacy %d\n", spmi->IPMIlegacy);return -ENODEV ; } -if (spmi->addr.space_id ==ACPI_ADR_SPACE_SYSTEM_MEMORY ) - addr_space =IPMI_MEM_ADDR_SPACE ; -else - addr_space =IPMI_IO_ADDR_SPACE ; - - info =kzalloc (sizeof (*info),GFP_KERNEL );if (!info) { printk(KERN_ERR PFX "Could not allocate SI data (3)\n");return -ENOMEM ; -- 1.7.1.rc1.21.gf3bd6
Quoted 4 lines
Thanks for the info on this..
Justin P. Mattock
Sorry, but I think that new patch is not correct.
Why do you delete this row "info = kzalloc(sizeof(*info), GFP_KERNEL)"? There is the only one unused variable addr_space, so I think it should be removed, that's all.
The following code is correct and not need to be changed:
info = kzalloc(sizeof(*info), GFP_KERNEL);
if (!info) {
printk(KERN_ERR PFX "Could not allocate SI data (3)\n");Please see below my patch.
Thanks.
---
Fix compile warningdrivers/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
--- drivers/char/ipmi/ipmi_si_intf.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)
(quoted diff) +0 -0
b/drivers/char/ipmi/ipmi_si_intf.c
index 094bdc3..1f5f025 100644
drivers/char/ipmi/ipmi_si_intf.c +0 -6
@@ -2013,18 +2013,12 @@ struct SPMITable {static __devinit int try_init_spmi (struct SPMITable *spmi) {struct smi_info *info; -u8 addr_space;if (spmi->IPMIlegacy !=1 ) { printk(KERN_INFO PFX "Bad SPMI legacy %d\n", spmi->IPMIlegacy);return -ENODEV ; } -if (spmi->addr.space_id ==ACPI_ADR_SPACE_SYSTEM_MEMORY ) - addr_space =IPMI_MEM_ADDR_SPACE ; -else - addr_space =IPMI_IO_ADDR_SPACE ; - info =kzalloc (sizeof (*info),GFP_KERNEL );if (!info) { printk(KERN_ERR PFX "Could not allocate SI data (3)\n");
Signature · 1 line
1.7.1
Quoted 111 lines · Sergey V.
Quoted 65 lines · On Tuesday 06 of July 2010 22:30:00 Justin P. Mattock wrote:
Quoted 20 lines
Hello Justin.
[...]
Review static __devinit int try_init_spmi(struct SPMITable
Quoted 1 line
(quoted diff) +0
-0@@ -2021,10 +2020,6 @@ static __devinit int try_init_spmi(struct SPMITable*spmi)
drivers/char/ipmi/ipmi_si_intf.c struct SPMITable { · line 2024
Quoted 10 lines
drivers/char/ipmi/ipmi_si_intf.c +0
-4}if (spmi->addr.space_id ==ACPI_ADR_SPACE_SYSTEM_MEMORY ) - addr_space =IPMI_MEM_ADDR_SPACE ; -else - addr_space =IPMI_IO_ADDR_SPACE ; - info =kzalloc (sizeof (*info),GFP_KERNEL );if (!info) { printk(KERN_ERR PFX "Could not allocate SI data (3)\n");This looks like after applying this patch 'info = ...' will be part of if statement (without indent before 'info = ...')
Quoted 7 lines
if (spmi->addr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) info = kzalloc(sizeof(*info), GFP_KERNEL);It's correct?
Thanks
the original patch I dont think this is correct. a bit confusing with the if(!info) at the bottom of this.
here's an updated version if it looks to be correct I'll resend if not I'll redu:--- drivers/char/ipmi/ipmi_si_intf.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-)drivers/char/ipmi/ipmi_si_intf.c +0
-8@@ -2013,19 +2013,12 @@ struct SPMITable {static __devinit int try_init_spmi (struct SPMITable *spmi) {struct smi_info *info; -u8 addr_space;if (spmi->IPMIlegacy !=1 ) { printk(KERN_INFO PFX "Bad SPMI legacy %d\n", spmi->IPMIlegacy);return -ENODEV ; } -if (spmi->addr.space_id ==ACPI_ADR_SPACE_SYSTEM_MEMORY ) - addr_space =IPMI_MEM_ADDR_SPACE ; -else - addr_space =IPMI_IO_ADDR_SPACE ; - - info =kzalloc (sizeof (*info),GFP_KERNEL );if (!info) { printk(KERN_ERR PFX "Could not allocate SI data (3)\n");return -ENOMEM ; -- 1.7.1.rc1.21.gf3bd6Quoted 4 lines
Thanks for the info on this..
Justin P. Mattock
Sorry, but I think that new patch is not correct.
Why do you delete this row "info =
kzalloc(sizeof(*info), GFP_KERNEL)"? There is the only one unused variableaddr_space, so I think it should be removed, that's all.The following code is correct and not need to be changed:
info = kzalloc(sizeof(*info), GFP_KERNEL); if (!info) { printk(KERN_ERR PFX "Could not allocate SI data (3)\n");Please see below my patch.
Thanks.---
Fix compile warningdrivers/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 usedSigned-off-by Sergey V.<[email protected]>--- drivers/char/ipmi/ipmi_si_intf.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)drivers/char/ipmi/ipmi_si_intf.c +0
-1@@ -2013,18 +2013,12 @@ struct SPMITable {static __devinit int try_init_spmi (struct SPMITable *spmi) {struct smi_info *info; -u8 addr_space;if (spmi->IPMIlegacy !=1 ) { printk(KERN_INFO PFX "Bad SPMI legacy %d\n", spmi->IPMIlegacy);return -ENODEV ;
drivers/char/ipmi/ipmi_si_intf.c struct SPMITable { · line 2024
Quoted 10 lines
drivers/char/ipmi/ipmi_si_intf.c +0
-5} -if (spmi->addr.space_id ==ACPI_ADR_SPACE_SYSTEM_MEMORY ) - addr_space =IPMI_MEM_ADDR_SPACE ; -else - addr_space =IPMI_IO_ADDR_SPACE ; - info =kzalloc (sizeof (*info),GFP_KERNEL );if (!info) { printk(KERN_ERR PFX "Could not allocate SI data (3)\n");
well if everybody agrees with your change then all good...
Justin P. Mattock
what ever came about with this?
Justin P. Mattock
Quoted 3 lines · Justin P. Mattock
what ever came about with this?
Justin P. Mattock
Well, Sergey sent a patch, but I don't think it was quite in a form that can be taken. Do you want to resend per the standard rules?
-corey
Quoted 9 lines · Corey Minyard
Quoted 3 lines · Justin P. Mattock
what ever came about with this?
Justin P. Mattock
Well, Sergey sent a patch, but I don't think it was quite in a form that can be taken. Do you want to resend per the standard rules?
-corey
yeah let me resend it..
Justin P. Mattock