public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH]ipmi:ipmi_si_intf.c Fix warning: variable 'addr_space' set but not used
@ 2010-07-08 19:09 Justin P. Mattock
  2010-07-08 20:05 ` Corey Minyard
  0 siblings, 1 reply; 6+ messages in thread
From: Justin P. Mattock @ 2010-07-08 19:09 UTC (permalink / raw)
  To: minyard
  Cc: akpm, openipmi-developer, linux-kernel, sftp.mtuci,
	Justin P. Mattock

The below patch fixes a warning message generated by GCC, and also
updates a web address pointing to a pdf containging information.
CC [M]  drivers/char/ipmi/ipmi_si_intf.o
drivers/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

Signed-off-by: Sergey V. <sftp.mtuci@gmail.com>
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>

---
 drivers/char/ipmi/ipmi_si_intf.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 094bdc3..7e40d02 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -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,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");
-- 
1.7.1.rc1.21.gf3bd6


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH]ipmi:ipmi_si_intf.c Fix warning: variable 'addr_space' set but not used
@ 2010-07-06  4:31 Justin P. Mattock
  2010-07-06 13:57 ` Corey Minyard
  0 siblings, 1 reply; 6+ messages in thread
From: Justin P. Mattock @ 2010-07-06  4:31 UTC (permalink / raw)
  To: minyard; +Cc: akpm, openipmi-developer, linux-kernel, Justin P. Mattock

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.o
drivers/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).

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>

---
 drivers/char/ipmi/ipmi_si_intf.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 094bdc3..969e69a 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -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) {
-- 
1.7.1.rc1.21.gf3bd6


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2010-07-08 21:24 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-08 19:09 [PATCH]ipmi:ipmi_si_intf.c Fix warning: variable 'addr_space' set but not used Justin P. Mattock
2010-07-08 20:05 ` Corey Minyard
2010-07-08 21:24   ` Justin P. Mattock
  -- strict thread matches above, loose matches on Subject: below --
2010-07-06  4:31 Justin P. Mattock
2010-07-06 13:57 ` Corey Minyard
2010-07-06 14:30   ` Justin P. Mattock

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox