Merge branch 'virtex-for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-virtex into...

[linux-2.6-omap-h63xx.git] / drivers / pci / hotplug / rpaphp_slot.c

diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c
index 3009193f005827965b79f099b730d040e70af5b4..8ad3debb3794a742db476d28f41ee5aef906a204 100644 (file)
--- a/drivers/pci/hotplug/rpaphp_slot.c
+++ b/drivers/pci/hotplug/rpaphp_slot.c
@@ -33,30 +33,37 @@
 #include <asm/rtas.h>
 #include "rpaphp.h"
 
-static ssize_t location_read_file (struct hotplug_slot *php_slot, char *buf)
+static ssize_t address_read_file (struct hotplug_slot *php_slot, char *buf)
 {
-       char *value;
-       int retval = -ENOENT;
+       int retval;
        struct slot *slot = (struct slot *)php_slot->private;
+       struct pci_bus *bus;
 
        if (!slot)
-               return retval;
+               return -ENOENT;
+
+       bus = slot->bus;
+       if (!bus)
+               return -ENOENT;
+
+       if (bus->self)
+               retval = sprintf(buf, pci_name(bus->self));
+       else
+               retval = sprintf(buf, "%04x:%02x:00.0",
+                       pci_domain_nr(bus), bus->number);
 
-       value = slot->location;
-       retval = sprintf (buf, "%s\n", value);
        return retval;
 }
 
-static struct hotplug_slot_attribute php_attr_location = {
-       .attr = {.name = "phy_location", .mode = S_IFREG | S_IRUGO},
-       .show = location_read_file,
+static struct hotplug_slot_attribute php_attr_address = {
+       .attr = {.name = "address", .mode = S_IFREG | S_IRUGO},
+       .show = address_read_file,
 };
 
 /* free up the memory used by a slot */
 static void rpaphp_release_slot(struct hotplug_slot *hotplug_slot)
 {
        struct slot *slot = (struct slot *) hotplug_slot->private;
-
        dealloc_slot_struct(slot);
 }
 
@@ -66,11 +73,10 @@ void dealloc_slot_struct(struct slot *slot)
        kfree(slot->hotplug_slot->name);
        kfree(slot->hotplug_slot);
        kfree(slot);
-       return;
 }
 
-struct slot *alloc_slot_struct(struct device_node *dn, int drc_index, char *drc_name,
-                 int power_domain)
+struct slot *alloc_slot_struct(struct device_node *dn,
+                       int drc_index, char *drc_name, int power_domain)
 {
        struct slot *slot;
        
@@ -84,16 +90,13 @@ struct slot *alloc_slot_struct(struct device_node *dn, int drc_index, char *drc_
                                           GFP_KERNEL);
        if (!slot->hotplug_slot->info)
                goto error_hpslot;
-       slot->hotplug_slot->name = kmalloc(BUS_ID_SIZE + 1, GFP_KERNEL);
+       slot->hotplug_slot->name = kmalloc(strlen(drc_name) + 1, GFP_KERNEL);
        if (!slot->hotplug_slot->name)
                goto error_info;        
-       slot->location = kmalloc(strlen(drc_name) + 1, GFP_KERNEL);
-       if (!slot->location)
-               goto error_name;
        slot->name = slot->hotplug_slot->name;
+       strcpy(slot->name, drc_name);
        slot->dn = dn;
        slot->index = drc_index;
-       strcpy(slot->location, drc_name);
        slot->power_domain = power_domain;
        slot->hotplug_slot->private = slot;
        slot->hotplug_slot->ops = &rpaphp_hotplug_slot_ops;
@@ -101,8 +104,6 @@ struct slot *alloc_slot_struct(struct device_node *dn, int drc_index, char *drc_
        
        return (slot);
 
-error_name:
-       kfree(slot->hotplug_slot->name);
 error_info:
        kfree(slot->hotplug_slot->info);
 error_hpslot:
@@ -115,7 +116,7 @@ error_nomem:
 
 static int is_registered(struct slot *slot)
 {
-       struct slot             *tmp_slot;
+       struct slot *tmp_slot;
 
        list_for_each_entry(tmp_slot, &rpaphp_slot_head, rpaphp_slot_list) {
                if (!strcmp(tmp_slot->name, slot->name))
@@ -134,14 +135,12 @@ int rpaphp_deregister_slot(struct slot *slot)
 
        list_del(&slot->rpaphp_slot_list);
        
-       /* remove "phy_location" file */
-       sysfs_remove_file(&php_slot->kobj, &php_attr_location.attr);
+       /* remove "address" file */
+       sysfs_remove_file(&php_slot->kobj, &php_attr_address.attr);
 
        retval = pci_hp_deregister(php_slot);
        if (retval)
                err("Problem unregistering a slot %s\n", slot->name);
-       else
-               num_slots--;
 
        dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
        return retval;
@@ -160,18 +159,17 @@ int rpaphp_register_slot(struct slot *slot)
        /* should not try to register the same slot twice */
        if (is_registered(slot)) {
                err("rpaphp_register_slot: slot[%s] is already registered\n", slot->name);
-               retval = -EAGAIN;
-               goto register_fail;
+               return -EAGAIN;
        }       
 
        retval = pci_hp_register(php_slot);
        if (retval) {
                err("pci_hp_register failed with error %d\n", retval);
-               goto register_fail;
+               return retval;
        }
 
-       /* create "phy_location" file */
-       retval = sysfs_create_file(&php_slot->kobj, &php_attr_location.attr);
+       /* create "address" file */
+       retval = sysfs_create_file(&php_slot->kobj, &php_attr_address.attr);
        if (retval) {
                err("sysfs_create_file failed with error %d\n", retval);
                goto sysfs_fail;
@@ -179,45 +177,11 @@ int rpaphp_register_slot(struct slot *slot)
 
        /* add slot to our internal list */
        list_add(&slot->rpaphp_slot_list, &rpaphp_slot_head);
-       info("Slot [%s](PCI location=%s) registered\n", slot->name,
-                       slot->location);
-       num_slots++;
+       info("Slot [%s] registered\n", slot->name);
        return 0;
 
 sysfs_fail:
        pci_hp_deregister(php_slot);
-register_fail:
-       rpaphp_release_slot(php_slot);
        return retval;
 }
 
-int rpaphp_get_power_status(struct slot *slot, u8 * value)
-{
-       int rc = 0, level;
-       
-       rc = rtas_get_power_level(slot->power_domain, &level);
-       if (rc < 0) {
-               err("failed to get power-level for slot(%s), rc=0x%x\n",
-                       slot->location, rc);
-               return rc;
-       }
-
-       dbg("%s the power level of slot %s(pwd-domain:0x%x) is %d\n",
-               __FUNCTION__, slot->name, slot->power_domain, level);
-       *value = level;
-
-       return rc;
-}
-
-int rpaphp_set_attention_status(struct slot *slot, u8 status)
-{
-       int rc;
-
-       /* status: LED_OFF or LED_ON */
-       rc = rtas_set_indicator(DR_INDICATOR, slot->index, status);
-       if (rc < 0)
-               err("slot(name=%s location=%s index=0x%x) set attention-status(%d) failed! rc=0x%x\n",
-                   slot->name, slot->location, slot->index, status, rc);
-
-       return rc;
-}