Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso

1 files changed, 21 insertions, 21 deletions

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 7bd7c45b53ef..22abd188fe12 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -320,6 +320,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)
@@ -1665,6 +1666,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 +1791,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;
@@ -1844,7 +1856,7 @@ 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;
 
@@ -2028,7 +2040,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;
@@ -2138,7 +2150,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;
 
@@ -2319,7 +2331,7 @@ static __devinit void 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 +2438,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;
 
@@ -2567,7 +2579,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,
@@ -3014,7 +3026,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 +3151,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)
@@ -3428,16 +3437,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;