[PATCH v1 4/5] ipmi: refer to table as "SPMI", not "ACPI"

Bjorn Helgaas
2009-11-18T00:05:24Z

This discovery method uses the SPMI table, not the ACPI namespace. In
the future, we will look in the namespace, so let's refer to the table
as "SPMI" and save "ACPI" for the namespace.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
---
drivers/char/ipmi/ipmi_si_intf.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index aaf6ead..b58e587 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -1919,7 +1919,7 @@ struct SPMITable {
s8 spmi_id[1]; /* A '\0' terminated array starts here. */
};

-static __devinit int try_init_acpi(struct SPMITable *spmi)
+static __devinit int try_init_spmi(struct SPMITable *spmi)
{
struct smi_info *info;
u8 addr_space;
@@ -1940,7 +1940,7 @@ static __devinit int try_init_acpi(struct SPMITable *spmi)
return -ENOMEM;
}

- info->addr_source = "ACPI";
+ info->addr_source = "SPMI";

/* Figure out the interface type. */
switch (spmi->InterfaceType) {
@@ -2002,7 +2002,7 @@ static __devinit int try_init_acpi(struct SPMITable *spmi)
return 0;
}

-static __devinit void acpi_find_bmc(void)
+static __devinit void spmi_find_bmc(void)
{
acpi_status status;
struct SPMITable *spmi;
@@ -2020,7 +2020,7 @@ static __devinit void acpi_find_bmc(void)
if (status != AE_OK)
return;

- try_init_acpi(spmi);
+ try_init_spmi(spmi);
}
}
#endif
@@ -3104,7 +3104,7 @@ static __devinit int init_ipmi_si(void)
#endif

#ifdef CONFIG_ACPI
- acpi_find_bmc();
+ spmi_find_bmc();
#endif

#ifdef CONFIG_PCI