[SCSI] sas: add support for enclosure and bad ID rphy attributes

[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 6381ba53853c25c32567be5c37934ad8582a6604..4196137e66dea5b9e191b86b6988766985a040ba 100644 (file)
--- a/drivers/eisa/eisa-bus.c
+++ b/drivers/eisa/eisa-bus.c
@@ -149,7 +149,7 @@ void eisa_driver_unregister (struct eisa_driver *edrv)
        driver_unregister (&edrv->driver);
 }
 
-static ssize_t eisa_show_sig (struct device *dev, char *buf)
+static ssize_t eisa_show_sig (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct eisa_device *edev = to_eisa_device (dev);
         return sprintf (buf,"%s\n", edev->id.sig);
@@ -157,7 +157,7 @@ static ssize_t eisa_show_sig (struct device *dev, char *buf)
 
 static DEVICE_ATTR(signature, S_IRUGO, eisa_show_sig, NULL);
 
-static ssize_t eisa_show_state (struct device *dev, char *buf)
+static ssize_t eisa_show_state (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct eisa_device *edev = to_eisa_device (dev);
         return sprintf (buf,"%d\n", edev->state & EISA_CONFIG_ENABLED);
@@ -281,13 +281,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 +315,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 \