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, 8 insertions, 8 deletions

diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 9dd132925ffa..8264a7680435 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -93,7 +93,7 @@ struct controller {
         u8 slot_device_offset;
         u32 first_slot;         /* First physical slot number */  /* PCIE only has 1 slot */
         u8 slot_bus;            /* Bus where the slots handled by this controller sit */
-        u8 ctrlcap;
+        u32 slot_cap;
         u8 cap_base;
         struct timer_list poll_timer;
         volatile int cmd_busy;
@@ -136,13 +136,13 @@ struct controller {
 #define HP_SUPR_RM_SUP  0x00000020
 #define EMI_PRSN        0x00020000
 
-#define ATTN_BUTTN(cap)         (cap & ATTN_BUTTN_PRSN)
-#define POWER_CTRL(cap)         (cap & PWR_CTRL_PRSN)
-#define MRL_SENS(cap)           (cap & MRL_SENS_PRSN)
-#define ATTN_LED(cap)           (cap & ATTN_LED_PRSN)
-#define PWR_LED(cap)            (cap & PWR_LED_PRSN) 
-#define HP_SUPR_RM(cap)         (cap & HP_SUPR_RM_SUP)
-#define EMI(cap)                (cap & EMI_PRSN)
+#define ATTN_BUTTN(ctrl)        ((ctrl)->slot_cap & ATTN_BUTTN_PRSN)
+#define POWER_CTRL(ctrl)        ((ctrl)->slot_cap & PWR_CTRL_PRSN)
+#define MRL_SENS(ctrl)          ((ctrl)->slot_cap & MRL_SENS_PRSN)
+#define ATTN_LED(ctrl)          ((ctrl)->slot_cap & ATTN_LED_PRSN)
+#define PWR_LED(ctrl)           ((ctrl)->slot_cap & PWR_LED_PRSN)
+#define HP_SUPR_RM(ctrl)        ((ctrl)->slot_cap & HP_SUPR_RM_SUP)
+#define EMI(ctrl)               ((ctrl)->slot_cap & EMI_PRSN)
 
 extern int pciehp_sysfs_enable_slot(struct slot *slot);
 extern int pciehp_sysfs_disable_slot(struct slot *slot);