pciehp: Fix wrong slot capability check

Current pciehp saves only 8bits of Slot Capability registers in
ctrl->ctrlcap. But it refers more than 8bit for checking EMI capability.
It is clearly a bug and EMI would never work. To fix this problem,
this patch saves full Slot Capability contens in ctrl->slot_cap. It also
reduce the redundant reads of Slot Capability register. And this pach
also cleans up the macros to check the slot capabilitys (e.g. MRL_SENS(),
and so on).

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by:  Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index cf36f2355173..43d8ddb2d679 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -258,7 +258,7 @@ static int init_slots(struct controller *ctrl)
                         goto error_info;
                 }
                 /* create additional sysfs entries */
-                if (EMI(ctrl->ctrlcap)) {
+                if (EMI(ctrl)) {
                         retval = sysfs_create_file(&hotplug_slot->kobj,
                                 &hotplug_slot_attr_lock.attr);
                         if (retval) {
@@ -291,7 +291,7 @@ static void cleanup_slots(struct controller *ctrl)
         list_for_each_safe(tmp, next, &ctrl->slot_list) {
                 slot = list_entry(tmp, struct slot, slot_list);
                 list_del(&slot->slot_list);
-                if (EMI(ctrl->ctrlcap))
+                if (EMI(ctrl))
                         sysfs_remove_file(&slot->hotplug_slot->kobj,
                                 &hotplug_slot_attr_lock.attr);
                 cancel_delayed_work(&slot->work);
@@ -312,7 +312,7 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)
 
         hotplug_slot->info->attention_status = status;
 
-        if (ATTN_LED(slot->ctrl->ctrlcap))
+        if (ATTN_LED(slot->ctrl))
                 slot->hpc_ops->set_attention_status(slot, status);
 
         return 0;
@@ -479,7 +479,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
                 if (rc) /* -ENODEV: shouldn't happen, but deal with it */
                         value = 0;
         }
-        if ((POWER_CTRL(ctrl->ctrlcap)) && !value) {
+        if ((POWER_CTRL(ctrl)) && !value) {
                 rc = t_slot->hpc_ops->power_off_slot(t_slot); /* Power off slot if not occupied*/
                 if (rc)
                         goto err_out_free_ctrl_slot;