1 files changed, 18 insertions, 6 deletions

diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c
index 12b92a0ff688..5bb63430262e 100644
--- a/drivers/pci/hotplug/pnv_php.c
+++ b/drivers/pci/hotplug/pnv_php.c
@@ -328,6 +328,11 @@ out:
         return ret;
 }
 
+static inline struct pnv_php_slot *to_pnv_php_slot(struct hotplug_slot *slot)
+{
+        return container_of(slot, struct pnv_php_slot, slot);
+}
+
 int pnv_php_set_slot_power_state(struct hotplug_slot *slot,
                                  uint8_t state)
 {
@@ -378,7 +383,6 @@ static int pnv_php_get_power_state(struct hotplug_slot *slot, u8 *state)
                          ret);
         } else {
                 *state = power_state;
-                slot->info->power_status = power_state;
         }
 
         return 0;
@@ -397,7 +401,6 @@ static int pnv_php_get_adapter_state(struct hotplug_slot *slot, u8 *state)
         ret = pnv_pci_get_presence_state(php_slot->id, &presence);
         if (ret >= 0) {
                 *state = presence;
-                slot->info->adapter_status = presence;
                 ret = 0;
         } else {
                 pci_warn(php_slot->pdev, "Error %d getting presence\n", ret);
@@ -406,10 +409,20 @@ static int pnv_php_get_adapter_state(struct hotplug_slot *slot, u8 *state)
         return ret;
 }
 
+static int pnv_php_get_attention_state(struct hotplug_slot *slot, u8 *state)
+{
+        struct pnv_php_slot *php_slot = to_pnv_php_slot(slot);
+
+        *state = php_slot->attention_state;
+        return 0;
+}
+
 static int pnv_php_set_attention_state(struct hotplug_slot *slot, u8 state)
 {
+        struct pnv_php_slot *php_slot = to_pnv_php_slot(slot);
+
         /* FIXME: Make it real once firmware supports it */
-        slot->info->attention_status = state;
+        php_slot->attention_state = state;
 
         return 0;
 }
@@ -501,8 +514,7 @@ scan:
 
 static int pnv_php_enable_slot(struct hotplug_slot *slot)
 {
-        struct pnv_php_slot *php_slot = container_of(slot,
-                                                     struct pnv_php_slot, slot);
+        struct pnv_php_slot *php_slot = to_pnv_php_slot(slot);
 
         return pnv_php_enable(php_slot, true);
 }
@@ -533,6 +545,7 @@ static int pnv_php_disable_slot(struct hotplug_slot *slot)
 static const struct hotplug_slot_ops php_slot_ops = {
         .get_power_status       = pnv_php_get_power_state,
         .get_adapter_status     = pnv_php_get_adapter_state,
+        .get_attention_status   = pnv_php_get_attention_state,
         .set_attention_status   = pnv_php_set_attention_state,
         .enable_slot            = pnv_php_enable_slot,
         .disable_slot           = pnv_php_disable_slot,
@@ -594,7 +607,6 @@ static struct pnv_php_slot *pnv_php_alloc_slot(struct device_node *dn)
         php_slot->id                    = id;
         php_slot->power_state_check     = false;
         php_slot->slot.ops              = &php_slot_ops;
-        php_slot->slot.info             = &php_slot->slot_info;
         php_slot->slot.private          = php_slot;
 
         INIT_LIST_HEAD(&php_slot->children);