1 files changed, 147 insertions, 114 deletions

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 7bd7c45b53ef..9397ab49b72e 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -43,6 +43,7 @@
 #include <linux/moduleparam.h>
 #include <asm/system.h>
 #include <linux/sched.h>
+#include <linux/seq_file.h>
 #include <linux/timer.h>
 #include <linux/errno.h>
 #include <linux/spinlock.h>
@@ -57,6 +58,7 @@
 #include <asm/irq.h>
 #include <linux/interrupt.h>
 #include <linux/rcupdate.h>
+#include <linux/ipmi.h>
 #include <linux/ipmi_smi.h>
 #include <asm/io.h>
 #include "ipmi_si_sm.h"
@@ -65,11 +67,10 @@
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/pnp.h>
-
-#ifdef CONFIG_PPC_OF
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
-#endif
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 
 #define PFX "ipmi_si: "
 
@@ -107,23 +108,13 @@ enum si_type {
 };
 static char *si_to_str[] = { "kcs", "smic", "bt" };
 
-enum ipmi_addr_src {
-        SI_INVALID = 0, SI_HOTMOD, SI_HARDCODED, SI_SPMI, SI_ACPI, SI_SMBIOS,
-        SI_PCI, SI_DEVICETREE, SI_DEFAULT
-};
 static char *ipmi_addr_src_to_str[] = { NULL, "hotmod", "hardcoded", "SPMI",
                                         "ACPI", "SMBIOS", "PCI",
                                         "device-tree", "default" };
 
 #define DEVICE_NAME "ipmi_si"
 
-static struct platform_driver ipmi_driver = {
-        .driver = {
-                .name = DEVICE_NAME,
-                .bus = &platform_bus_type
-        }
-};
-
+static struct platform_driver ipmi_driver;
 
 /*
  * Indexes into stats[] in smi_info below.
@@ -291,6 +282,7 @@ struct smi_info {
         struct task_struct *thread;
 
         struct list_head link;
+        union ipmi_smi_info_union addr_info;
 };
 
 #define smi_inc_stat(smi, stat) \
@@ -308,9 +300,6 @@ static int pci_registered;
 #ifdef CONFIG_ACPI
 static int pnp_registered;
 #endif
-#ifdef CONFIG_PPC_OF
-static int of_registered;
-#endif
 
 static unsigned int kipmid_max_busy_us[SI_MAX_PARMS];
 static int num_max_busy_us;
@@ -320,6 +309,7 @@ static int unload_when_empty = 1;
 static int add_smi(struct smi_info *smi);
 static int try_smi_init(struct smi_info *smi);
 static void cleanup_one_si(struct smi_info *to_clean);
+static void cleanup_ipmi_si(void);
 
 static ATOMIC_NOTIFIER_HEAD(xaction_notifier_list);
 static int register_xaction_notifier(struct notifier_block *nb)
@@ -350,7 +340,7 @@ static void return_hosed_msg(struct smi_info *smi_info, int cCode)
                 cCode = IPMI_ERR_UNSPECIFIED;
         /* else use it as is */
 
-        /* Make it a reponse */
+        /* Make it a response */
         msg->rsp[0] = msg->data[0] | 4;
         msg->rsp[1] = msg->data[1];
         msg->rsp[2] = cCode;
@@ -899,6 +889,14 @@ static void sender(void                *send_info,
         printk("**Enqueue: %d.%9.9d\n", t.tv_sec, t.tv_usec);
 #endif
 
+        /*
+         * last_timeout_jiffies is updated here to avoid
+         * smi_timeout() handler passing very large time_diff
+         * value to smi_event_handler() that causes
+         * the send command to abort.
+         */
+        smi_info->last_timeout_jiffies = jiffies;
+
         mod_timer(&smi_info->si_timer, jiffies + SI_TIMEOUT_JIFFIES);
 
         if (smi_info->thread)
@@ -1186,6 +1184,18 @@ static int smi_start_processing(void       *send_info,
         return 0;
 }
 
+static int get_smi_info(void *send_info, struct ipmi_smi_info *data)
+{
+        struct smi_info *smi = send_info;
+
+        data->addr_src = smi->addr_source;
+        data->dev = smi->dev;
+        data->addr_info = smi->addr_info;
+        get_device(smi->dev);
+
+        return 0;
+}
+
 static void set_maintenance_mode(void *send_info, int enable)
 {
         struct smi_info   *smi_info = send_info;
@@ -1197,6 +1207,7 @@ static void set_maintenance_mode(void *send_info, int enable)
 static struct ipmi_smi_handlers handlers = {
         .owner                  = THIS_MODULE,
         .start_processing       = smi_start_processing,
+        .get_smi_info           = get_smi_info,
         .sender                 = sender,
         .request_events         = request_events,
         .set_maintenance_mode   = set_maintenance_mode,
@@ -1665,6 +1676,17 @@ static int check_hotmod_int_op(const char *curr, const char *option,
         return 0;
 }
 
+static struct smi_info *smi_info_alloc(void)
+{
+        struct smi_info *info = kzalloc(sizeof(*info), GFP_KERNEL);
+
+        if (info) {
+                spin_lock_init(&info->si_lock);
+                spin_lock_init(&info->msg_lock);
+        }
+        return info;
+}
+
 static int hotmod_handler(const char *val, struct kernel_param *kp)
 {
         char *str = kstrdup(val, GFP_KERNEL);
@@ -1779,7 +1801,7 @@ static int hotmod_handler(const char *val, struct kernel_param *kp)
                 }
 
                 if (op == HM_ADD) {
-                        info = kzalloc(sizeof(*info), GFP_KERNEL);
+                        info = smi_info_alloc();
                         if (!info) {
                                 rv = -ENOMEM;
                                 goto out;
@@ -1835,8 +1857,9 @@ static int hotmod_handler(const char *val, struct kernel_param *kp)
         return rv;
 }
 
-static __devinit void hardcode_find_bmc(void)
+static int __devinit hardcode_find_bmc(void)
 {
+        int ret = -ENODEV;
         int             i;
         struct smi_info *info;
 
@@ -1844,9 +1867,9 @@ static __devinit void hardcode_find_bmc(void)
                 if (!ports[i] && !addrs[i])
                         continue;
 
-                info = kzalloc(sizeof(*info), GFP_KERNEL);
+                info = smi_info_alloc();
                 if (!info)
-                        return;
+                        return -ENOMEM;
 
                 info->addr_source = SI_HARDCODED;
                 printk(KERN_INFO PFX "probing via hardcoded address\n");
@@ -1899,10 +1922,12 @@ static __devinit void hardcode_find_bmc(void)
                 if (!add_smi(info)) {
                         if (try_smi_init(info))
                                 cleanup_one_si(info);
+                        ret = 0;
                 } else {
                         kfree(info);
                 }
         }
+        return ret;
 }
 
 #ifdef CONFIG_ACPI
@@ -1917,7 +1942,8 @@ static __devinit void hardcode_find_bmc(void)
 static int acpi_failure;
 
 /* For GPE-type interrupts. */
-static u32 ipmi_acpi_gpe(void *context)
+static u32 ipmi_acpi_gpe(acpi_handle gpe_device,
+        u32 gpe_number, void *context)
 {
         struct smi_info *smi_info = context;
         unsigned long   flags;
@@ -1974,8 +2000,7 @@ static int acpi_gpe_irq_setup(struct smi_info *info)
 
 /*
  * Defined at
- * http://h21007.www2.hp.com/portal/download/files
- * /unprot/hpspmi.pdf
+ * http://h21007.www2.hp.com/portal/download/files/unprot/hpspmi.pdf
  */
 struct SPMITable {
         s8      Signature[4];
@@ -2019,7 +2044,7 @@ struct SPMITable {
         s8      spmi_id[1]; /* A '\0' terminated array starts here. */
 };
 
-static __devinit int try_init_spmi(struct SPMITable *spmi)
+static int __devinit try_init_spmi(struct SPMITable *spmi)
 {
         struct smi_info  *info;
 
@@ -2028,7 +2053,7 @@ static __devinit int try_init_spmi(struct SPMITable *spmi)
                 return -ENODEV;
         }
 
-        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        info = smi_info_alloc();
         if (!info) {
                 printk(KERN_ERR PFX "Could not allocate SI data (3)\n");
                 return -ENOMEM;
@@ -2102,7 +2127,7 @@ static __devinit int try_init_spmi(struct SPMITable *spmi)
         return 0;
 }
 
-static __devinit void spmi_find_bmc(void)
+static void __devinit spmi_find_bmc(void)
 {
         acpi_status      status;
         struct SPMITable *spmi;
@@ -2138,7 +2163,7 @@ static int __devinit ipmi_pnp_probe(struct pnp_dev *dev,
         if (!acpi_dev)
                 return -ENODEV;
 
-        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        info = smi_info_alloc();
         if (!info)
                 return -ENOMEM;
 
@@ -2146,6 +2171,7 @@ static int __devinit ipmi_pnp_probe(struct pnp_dev *dev,
         printk(KERN_INFO PFX "probing via ACPI\n");
 
         handle = acpi_dev->handle;
+        info->addr_info.acpi_info.acpi_handle = handle;
 
         /* _IFT tells us the interface type: KCS, BT, etc */
         status = acpi_evaluate_integer(handle, "_IFT", NULL, &tmp);
@@ -2315,11 +2341,11 @@ static int __devinit decode_dmi(const struct dmi_header *dm,
         return 0;
 }
 
-static __devinit void try_init_dmi(struct dmi_ipmi_data *ipmi_data)
+static void __devinit try_init_dmi(struct dmi_ipmi_data *ipmi_data)
 {
         struct smi_info *info;
 
-        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        info = smi_info_alloc();
         if (!info) {
                 printk(KERN_ERR PFX "Could not allocate SI data\n");
                 return;
@@ -2426,7 +2452,7 @@ static int __devinit ipmi_pci_probe(struct pci_dev *pdev,
         int class_type = pdev->class & PCI_ERMC_CLASSCODE_TYPE_MASK;
         struct smi_info *info;
 
-        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        info = smi_info_alloc();
         if (!info)
                 return -ENOMEM;
 
@@ -2529,20 +2555,24 @@ static struct pci_driver ipmi_pci_driver = {
 };
 #endif /* CONFIG_PCI */
 
-
-#ifdef CONFIG_PPC_OF
-static int __devinit ipmi_of_probe(struct platform_device *dev,
-                         const struct of_device_id *match)
+static struct of_device_id ipmi_match[];
+static int __devinit ipmi_probe(struct platform_device *dev)
 {
+#ifdef CONFIG_OF
+        const struct of_device_id *match;
         struct smi_info *info;
         struct resource resource;
-        const int *regsize, *regspacing, *regshift;
+        const __be32 *regsize, *regspacing, *regshift;
         struct device_node *np = dev->dev.of_node;
         int ret;
         int proplen;
 
         dev_info(&dev->dev, "probing via device tree\n");
 
+        match = of_match_device(ipmi_match, &dev->dev);
+        if (!match)
+                return -EINVAL;
+
         ret = of_address_to_resource(np, 0, &resource);
         if (ret) {
                 dev_warn(&dev->dev, PFX "invalid address from OF\n");
@@ -2567,7 +2597,7 @@ static int __devinit ipmi_of_probe(struct platform_device *dev,
                 return -EINVAL;
         }
 
-        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        info = smi_info_alloc();
 
         if (!info) {
                 dev_err(&dev->dev,
@@ -2589,9 +2619,9 @@ static int __devinit ipmi_of_probe(struct platform_device *dev,
 
         info->io.addr_data      = resource.start;
 
-        info->io.regsize        = regsize ? *regsize : DEFAULT_REGSIZE;
-        info->io.regspacing     = regspacing ? *regspacing : DEFAULT_REGSPACING;
-        info->io.regshift       = regshift ? *regshift : 0;
+        info->io.regsize        = regsize ? be32_to_cpup(regsize) : DEFAULT_REGSIZE;
+        info->io.regspacing     = regspacing ? be32_to_cpup(regspacing) : DEFAULT_REGSPACING;
+        info->io.regshift       = regshift ? be32_to_cpup(regshift) : 0;
 
         info->irq               = irq_of_parse_and_map(dev->dev.of_node, 0);
         info->dev               = &dev->dev;
@@ -2606,13 +2636,15 @@ static int __devinit ipmi_of_probe(struct platform_device *dev,
                 kfree(info);
                 return -EBUSY;
         }
-
+#endif
         return 0;
 }
 
-static int __devexit ipmi_of_remove(struct platform_device *dev)
+static int __devexit ipmi_remove(struct platform_device *dev)
 {
+#ifdef CONFIG_OF
         cleanup_one_si(dev_get_drvdata(&dev->dev));
+#endif
         return 0;
 }
 
@@ -2627,16 +2659,15 @@ static struct of_device_id ipmi_match[] =
         {},
 };
 
-static struct of_platform_driver ipmi_of_platform_driver = {
+static struct platform_driver ipmi_driver = {
         .driver = {
-                .name = "ipmi",
+                .name = DEVICE_NAME,
                 .owner = THIS_MODULE,
                 .of_match_table = ipmi_match,
         },
-        .probe          = ipmi_of_probe,
-        .remove         = __devexit_p(ipmi_of_remove),
+        .probe          = ipmi_probe,
+        .remove         = __devexit_p(ipmi_remove),
 };
-#endif /* CONFIG_PPC_OF */
 
 static int wait_for_msg_done(struct smi_info *smi_info)
 {
@@ -2775,54 +2806,73 @@ static int try_enable_event_buffer(struct smi_info *smi_info)
         return rv;
 }
 
-static int type_file_read_proc(char *page, char **start, off_t off,
-                               int count, int *eof, void *data)
+static int smi_type_proc_show(struct seq_file *m, void *v)
 {
-        struct smi_info *smi = data;
+        struct smi_info *smi = m->private;
+
+        return seq_printf(m, "%s\n", si_to_str[smi->si_type]);
+}
 
-        return sprintf(page, "%s\n", si_to_str[smi->si_type]);
+static int smi_type_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, smi_type_proc_show, PDE(inode)->data);
 }
 
-static int stat_file_read_proc(char *page, char **start, off_t off,
-                               int count, int *eof, void *data)
+static const struct file_operations smi_type_proc_ops = {
+        .open           = smi_type_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static int smi_si_stats_proc_show(struct seq_file *m, void *v)
 {
-        char            *out = (char *) page;
-        struct smi_info *smi = data;
+        struct smi_info *smi = m->private;
 
-        out += sprintf(out, "interrupts_enabled:    %d\n",
+        seq_printf(m, "interrupts_enabled:    %d\n",
                        smi->irq && !smi->interrupt_disabled);
-        out += sprintf(out, "short_timeouts:        %u\n",
+        seq_printf(m, "short_timeouts:        %u\n",
                        smi_get_stat(smi, short_timeouts));
-        out += sprintf(out, "long_timeouts:         %u\n",
+        seq_printf(m, "long_timeouts:         %u\n",
                        smi_get_stat(smi, long_timeouts));
-        out += sprintf(out, "idles:                 %u\n",
+        seq_printf(m, "idles:                 %u\n",
                        smi_get_stat(smi, idles));
-        out += sprintf(out, "interrupts:            %u\n",
+        seq_printf(m, "interrupts:            %u\n",
                        smi_get_stat(smi, interrupts));
-        out += sprintf(out, "attentions:            %u\n",
+        seq_printf(m, "attentions:            %u\n",
                        smi_get_stat(smi, attentions));
-        out += sprintf(out, "flag_fetches:          %u\n",
+        seq_printf(m, "flag_fetches:          %u\n",
                        smi_get_stat(smi, flag_fetches));
-        out += sprintf(out, "hosed_count:           %u\n",
+        seq_printf(m, "hosed_count:           %u\n",
                        smi_get_stat(smi, hosed_count));
-        out += sprintf(out, "complete_transactions: %u\n",
+        seq_printf(m, "complete_transactions: %u\n",
                        smi_get_stat(smi, complete_transactions));
-        out += sprintf(out, "events:                %u\n",
+        seq_printf(m, "events:                %u\n",
                        smi_get_stat(smi, events));
-        out += sprintf(out, "watchdog_pretimeouts:  %u\n",
+        seq_printf(m, "watchdog_pretimeouts:  %u\n",
                        smi_get_stat(smi, watchdog_pretimeouts));
-        out += sprintf(out, "incoming_messages:     %u\n",
+        seq_printf(m, "incoming_messages:     %u\n",
                        smi_get_stat(smi, incoming_messages));
+        return 0;
+}
 
-        return out - page;
+static int smi_si_stats_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, smi_si_stats_proc_show, PDE(inode)->data);
 }
 
-static int param_read_proc(char *page, char **start, off_t off,
-                           int count, int *eof, void *data)
+static const struct file_operations smi_si_stats_proc_ops = {
+        .open           = smi_si_stats_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static int smi_params_proc_show(struct seq_file *m, void *v)
 {
-        struct smi_info *smi = data;
+        struct smi_info *smi = m->private;
 
-        return sprintf(page,
+        return seq_printf(m,
                        "%s,%s,0x%lx,rsp=%d,rsi=%d,rsh=%d,irq=%d,ipmb=%d\n",
                        si_to_str[smi->si_type],
                        addr_space_to_str[smi->io.addr_type],
@@ -2834,6 +2884,18 @@ static int param_read_proc(char *page, char **start, off_t off,
                        smi->slave_addr);
 }
 
+static int smi_params_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, smi_params_proc_show, PDE(inode)->data);
+}
+
+static const struct file_operations smi_params_proc_ops = {
+        .open           = smi_params_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 /*
  * oem_data_avail_to_receive_msg_avail
  * @info - smi_info structure with msg_flags set
@@ -2900,7 +2962,7 @@ static void return_hosed_msg_badsize(struct smi_info *smi_info)
 {
         struct ipmi_smi_msg *msg = smi_info->curr_msg;
 
-        /* Make it a reponse */
+        /* Make it a response */
         msg->rsp[0] = msg->data[0] | 4;
         msg->rsp[1] = msg->data[1];
         msg->rsp[2] = CANNOT_RETURN_REQUESTED_LENGTH;
@@ -3002,7 +3064,7 @@ static __devinitdata struct ipmi_default_vals
         { .port = 0 }
 };
 
-static __devinit void default_find_bmc(void)
+static void __devinit default_find_bmc(void)
 {
         struct smi_info *info;
         int             i;
@@ -3014,7 +3076,7 @@ static __devinit void default_find_bmc(void)
                 if (check_legacy_ioport(ipmi_defaults[i].port))
                         continue;
 #endif
-                info = kzalloc(sizeof(*info), GFP_KERNEL);
+                info = smi_info_alloc();
                 if (!info)
                         return;
 
@@ -3139,9 +3201,6 @@ static int try_smi_init(struct smi_info *new_smi)
                 goto out_err;
         }
 
-        spin_lock_init(&(new_smi->si_lock));
-        spin_lock_init(&(new_smi->msg_lock));
-
         /* Do low-level detection first. */
         if (new_smi->handlers->detect(new_smi->si_sm)) {
                 if (new_smi->addr_source)
@@ -3230,7 +3289,7 @@ static int try_smi_init(struct smi_info *new_smi)
         }
 
         rv = ipmi_smi_add_proc_entry(new_smi->intf, "type",
-                                     type_file_read_proc,
+                                     &smi_type_proc_ops,
                                      new_smi);
         if (rv) {
                 dev_err(new_smi->dev, "Unable to create proc entry: %d\n", rv);
@@ -3238,7 +3297,7 @@ static int try_smi_init(struct smi_info *new_smi)
         }
 
         rv = ipmi_smi_add_proc_entry(new_smi->intf, "si_stats",
-                                     stat_file_read_proc,
+                                     &smi_si_stats_proc_ops,
                                      new_smi);
         if (rv) {
                 dev_err(new_smi->dev, "Unable to create proc entry: %d\n", rv);
@@ -3246,7 +3305,7 @@ static int try_smi_init(struct smi_info *new_smi)
         }
 
         rv = ipmi_smi_add_proc_entry(new_smi->intf, "params",
-                                     param_read_proc,
+                                     &smi_params_proc_ops,
                                      new_smi);
         if (rv) {
                 dev_err(new_smi->dev, "Unable to create proc entry: %d\n", rv);
@@ -3305,7 +3364,7 @@ static int try_smi_init(struct smi_info *new_smi)
         return rv;
 }
 
-static __devinit int init_ipmi_si(void)
+static int __devinit init_ipmi_si(void)
 {
         int  i;
         char *str;
@@ -3317,8 +3376,7 @@ static __devinit int init_ipmi_si(void)
                 return 0;
         initialized = 1;
 
-        /* Register the device drivers. */
-        rv = driver_register(&ipmi_driver.driver);
+        rv = platform_driver_register(&ipmi_driver);
         if (rv) {
                 printk(KERN_ERR PFX "Unable to register driver: %d\n", rv);
                 return rv;
@@ -3342,15 +3400,9 @@ static __devinit int init_ipmi_si(void)
 
         printk(KERN_INFO "IPMI System Interface driver.\n");
 
-        hardcode_find_bmc();
-
         /* If the user gave us a device, they presumably want us to use it */
-        mutex_lock(&smi_infos_lock);
-        if (!list_empty(&smi_infos)) {
-                mutex_unlock(&smi_infos_lock);
+        if (!hardcode_find_bmc())
                 return 0;
-        }
-        mutex_unlock(&smi_infos_lock);
 
 #ifdef CONFIG_PCI
         rv = pci_register_driver(&ipmi_pci_driver);
@@ -3373,11 +3425,6 @@ static __devinit int init_ipmi_si(void)
         spmi_find_bmc();
 #endif
 
-#ifdef CONFIG_PPC_OF
-        of_register_platform_driver(&ipmi_of_platform_driver);
-        of_registered = 1;
-#endif
-
         /* We prefer devices with interrupts, but in the case of a machine
            with multiple BMCs we assume that there will be several instances
            of a given type so if we succeed in registering a type then also
@@ -3428,16 +3475,7 @@ static __devinit int init_ipmi_si(void)
         mutex_lock(&smi_infos_lock);
         if (unload_when_empty && list_empty(&smi_infos)) {
                 mutex_unlock(&smi_infos_lock);
-#ifdef CONFIG_PCI
-                if (pci_registered)
-                        pci_unregister_driver(&ipmi_pci_driver);
-#endif
-
-#ifdef CONFIG_PPC_OF
-                if (of_registered)
-                        of_unregister_platform_driver(&ipmi_of_platform_driver);
-#endif
-                driver_unregister(&ipmi_driver.driver);
+                cleanup_ipmi_si();
                 printk(KERN_WARNING PFX
                        "Unable to find any System Interface(s)\n");
                 return -ENODEV;
@@ -3518,7 +3556,7 @@ static void cleanup_one_si(struct smi_info *to_clean)
         kfree(to_clean);
 }
 
-static __exit void cleanup_ipmi_si(void)
+static void cleanup_ipmi_si(void)
 {
         struct smi_info *e, *tmp_e;
 
@@ -3534,17 +3572,12 @@ static __exit void cleanup_ipmi_si(void)
                 pnp_unregister_driver(&ipmi_pnp_driver);
 #endif
 
-#ifdef CONFIG_PPC_OF
-        if (of_registered)
-                of_unregister_platform_driver(&ipmi_of_platform_driver);
-#endif
+        platform_driver_unregister(&ipmi_driver);
 
         mutex_lock(&smi_infos_lock);
         list_for_each_entry_safe(e, tmp_e, &smi_infos, link)
                 cleanup_one_si(e);
         mutex_unlock(&smi_infos_lock);
-
-        driver_unregister(&ipmi_driver.driver);
 }
 module_exit(cleanup_ipmi_si);