Skip to content

Commit

Permalink
ipmi: refer to table as "SPMI", not "ACPI"
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Bjorn Helgaas authored and Len Brown committed Dec 15, 2009
1 parent ad49768 commit 18a3e0b
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/char/ipmi/ipmi_si_intf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down Expand Up @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 18a3e0b

Please sign in to comment.