Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18a3e0bf authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

ipmi: refer to table as "SPMI", not "ACPI" 



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: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent ad497680

drivers/char/ipmi/ipmi_si_intf.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -1919,7 +1919,7 @@ struct SPMITable { 
	s8      spmi_id[1]; /* A '\0' terminated array starts here. */

	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;

	struct smi_info  *info;

	u8 		 addr_space;

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

		return -ENOMEM;

	}

	}





	info->addr_source = "ACPI";

	info->addr_source = "SPMI";





	/* Figure out the interface type. */

	/* Figure out the interface type. */

	switch (spmi->InterfaceType) {

	switch (spmi->InterfaceType) {
@@ -2002,7 +2002,7 @@ static __devinit int try_init_acpi(struct SPMITable *spmi) 
	return 0;

	return 0;

}

}





static __devinit void acpi_find_bmc(void)

static __devinit void spmi_find_bmc(void)

{

{

	acpi_status      status;

	acpi_status      status;

	struct SPMITable *spmi;

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

		if (status != AE_OK)

			return;

			return;





		try_init_acpi(spmi);

		try_init_spmi(spmi);

	}

	}

}

}

#endif

#endif
@@ -3104,7 +3104,7 @@ static __devinit int init_ipmi_si(void) 
#endif

#endif





#ifdef CONFIG_ACPI

#ifdef CONFIG_ACPI

	acpi_find_bmc();

	spmi_find_bmc();

#endif

#endif





#ifdef CONFIG_PCI

#ifdef CONFIG_PCI