[SCSI] qla2xxx: Don't wait for loop transition to complete if LOOP_DEAD state is...

[linux-2.6-omap-h63xx.git] / drivers / eisa / eisa-bus.c

diff --git a/drivers/eisa/eisa-bus.c b/drivers/eisa/eisa-bus.c
index 1937743c8e2971bb15b9f1d703aca168be4240e2..6078e2f588172e73aad9ad45ec2a3cfb9eb7e97d 100644 (file)
--- a/drivers/eisa/eisa-bus.c
+++ b/drivers/eisa/eisa-bus.c
@@ -135,13 +135,8 @@ struct bus_type eisa_bus_type = {
 
 int eisa_driver_register (struct eisa_driver *edrv)
 {
-       int r;
-       
        edrv->driver.bus = &eisa_bus_type;
-       if ((r = driver_register (&edrv->driver)) < 0)
-               return r;
-
-       return 0;
+       return driver_register (&edrv->driver);
 }
 
 void eisa_driver_unregister (struct eisa_driver *edrv)
@@ -281,13 +276,11 @@ static int __init eisa_probe (struct eisa_root_device *root)
        /* First try to get hold of slot 0. If there is no device
         * here, simply fail, unless root->force_probe is set. */
        
-       if (!(edev = kmalloc (sizeof (*edev), GFP_KERNEL))) {
+       if (!(edev = kzalloc (sizeof (*edev), GFP_KERNEL))) {
                printk (KERN_ERR "EISA: Couldn't allocate mainboard slot\n");
                return -ENOMEM;
        }
                
-       memset (edev, 0, sizeof (*edev));
-
        if (eisa_request_resources (root, edev, 0)) {
                printk (KERN_WARNING \
                        "EISA: Cannot allocate resource for mainboard\n");
@@ -317,13 +310,11 @@ static int __init eisa_probe (struct eisa_root_device *root)
  force_probe:
        
         for (c = 0, i = 1; i <= root->slots; i++) {
-               if (!(edev = kmalloc (sizeof (*edev), GFP_KERNEL))) {
+               if (!(edev = kzalloc (sizeof (*edev), GFP_KERNEL))) {
                        printk (KERN_ERR "EISA: Out of memory for slot %d\n",
                                i);
                        continue;
                }
-               
-               memset (edev, 0, sizeof (*edev));
 
                if (eisa_request_resources (root, edev, i)) {
                        printk (KERN_WARNING \