From 7e50387bceda4d5542e4ba87097f69071b425fe5 Mon Sep 17 00:00:00 2001 From: Corey Minyard Date: Thu, 9 Oct 2014 07:20:32 -0500 Subject: ipmi: Move the address source to string to ipmi-generic code It was in the system interface driver, but is generic functionality. Signed-off-by: Corey Minyard --- include/linux/ipmi.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h index 76d2acbfa7c6..47b8f8ddb2b1 100644 --- a/include/linux/ipmi.h +++ b/include/linux/ipmi.h @@ -278,6 +278,7 @@ enum ipmi_addr_src { SI_INVALID = 0, SI_HOTMOD, SI_HARDCODED, SI_SPMI, SI_ACPI, SI_SMBIOS, SI_PCI, SI_DEVICETREE, SI_DEFAULT }; +const char *ipmi_addr_src_to_str(enum ipmi_addr_src src); union ipmi_smi_info_union { /* -- cgit v1.2.3 From 5a0e10ec4a82ec9e1ab9b85a0f2c2893f7ffda25 Mon Sep 17 00:00:00 2001 From: Corey Minyard Date: Fri, 10 Oct 2014 22:11:05 -0500 Subject: ipmi: Remove useless sysfs_name parameters It was always "bmc", so just hardcode it. It makes no sense to pass that in. Signed-off-by: Corey Minyard --- include/linux/ipmi_smi.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h index bd349240d50e..6131845016d9 100644 --- a/include/linux/ipmi_smi.h +++ b/include/linux/ipmi_smi.h @@ -212,7 +212,6 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers, void *send_info, struct ipmi_device_id *device_id, struct device *dev, - const char *sysfs_name, unsigned char slave_addr); /* -- cgit v1.2.3 From a11213fc36d29d42ab00d400796e98fc770c93b9 Mon Sep 17 00:00:00 2001 From: Corey Minyard Date: Fri, 10 Oct 2014 17:47:04 -0500 Subject: ipmi: Use the proper type for acpi_handle Minor cleanup, don't use a void pointer, use the right type. Signed-off-by: Corey Minyard --- include/linux/ipmi.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h index 47b8f8ddb2b1..838dbfa3c331 100644 --- a/include/linux/ipmi.h +++ b/include/linux/ipmi.h @@ -37,6 +37,7 @@ #include #include +#include /* For acpi_handle */ struct module; struct device; @@ -281,13 +282,15 @@ enum ipmi_addr_src { const char *ipmi_addr_src_to_str(enum ipmi_addr_src src); union ipmi_smi_info_union { +#ifdef CONFIG_ACPI /* * the acpi_info element is defined for the SI_ACPI * address type */ struct { - void *acpi_handle; + acpi_handle acpi_handle; } acpi_info; +#endif }; struct ipmi_smi_info { -- cgit v1.2.3 From 99ab32f3b5d705be562b8c4d9dca7c1ae3dc2cdf Mon Sep 17 00:00:00 2001 From: Corey Minyard Date: Fri, 7 Nov 2014 07:57:31 -0600 Subject: ipmi: Remove the now unused priority from SMI sender Since the queue was moved into the message handler, the priority field is now irrelevant. Signed-off-by: Corey Minyard --- include/linux/ipmi_smi.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h index 6131845016d9..0b1e569f5ff5 100644 --- a/include/linux/ipmi_smi.h +++ b/include/linux/ipmi_smi.h @@ -98,12 +98,11 @@ struct ipmi_smi_handlers { operation is not allowed to fail. If an error occurs, it should report back the error in a received message. It may do this in the current call context, since no write locks - are held when this is run. If the priority is > 0, the - message will go into a high-priority queue and be sent - first. Otherwise, it goes into a normal-priority queue. */ + are held when this is run. Message are delivered one at + a time by the message handler, a new message will not be + delivered until the previous message is returned. */ void (*sender)(void *send_info, - struct ipmi_smi_msg *msg, - int priority); + struct ipmi_smi_msg *msg); /* Called by the upper layer to request that we try to get events from the BMC we are attached to. */ -- cgit v1.2.3