summaryrefslogtreecommitdiff
path: root/drivers/pci/hotplug
diff options
context:
space:
mode:
authorLinas Vepstas <linas@austin.ibm.com>2007-04-14 02:34:13 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-05-03 06:02:39 +0400
commit427310ff02e80cc80826407c0121cec3694c9e7d (patch)
tree7c7577d89e56f12225a52609ba92e24216244a01 /drivers/pci/hotplug
parent517d5a0417e19101eaa769039d1921d626ee546c (diff)
downloadlinux-427310ff02e80cc80826407c0121cec3694c9e7d.tar.xz
PCI: rpaphp: Remve another call that is a wrapper
Remove another stovepipe: a call which wraps another call, and just adds printks. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Cc: John Rose <johnrose@austin.ibm.com> Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/hotplug')
-rw-r--r--drivers/pci/hotplug/rpaphp.h1
-rw-r--r--drivers/pci/hotplug/rpaphp_core.c6
-rw-r--r--drivers/pci/hotplug/rpaphp_pci.c7
-rw-r--r--drivers/pci/hotplug/rpaphp_slot.c18
4 files changed, 10 insertions, 22 deletions
diff --git a/drivers/pci/hotplug/rpaphp.h b/drivers/pci/hotplug/rpaphp.h
index 2ccbe8d4229d..fdd99b2ebe5f 100644
--- a/drivers/pci/hotplug/rpaphp.h
+++ b/drivers/pci/hotplug/rpaphp.h
@@ -103,7 +103,6 @@ extern void dealloc_slot_struct(struct slot *slot);
extern struct slot *alloc_slot_struct(struct device_node *dn, int drc_index, char *drc_name, int power_domain);
extern int rpaphp_register_slot(struct slot *slot);
extern int rpaphp_deregister_slot(struct slot *slot);
-extern int rpaphp_get_power_status(struct slot *slot, u8 * value);
extern int rpaphp_set_attention_status(struct slot *slot, u8 status);
#endif /* _PPC64PHP_H */
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index ca95e1515d6f..2d919fb1931c 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -100,11 +100,13 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 value)
*/
static int get_power_status(struct hotplug_slot *hotplug_slot, u8 * value)
{
- int retval;
+ int retval, level;
struct slot *slot = (struct slot *)hotplug_slot->private;
down(&rpaphp_sem);
- retval = rpaphp_get_power_status(slot, value);
+ retval = rtas_get_power_level (slot->power_domain, &level);
+ if (!retval)
+ *value = level;
up(&rpaphp_sem);
return retval;
}
diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c
index 881e8073c807..ba8c83770abe 100644
--- a/drivers/pci/hotplug/rpaphp_pci.c
+++ b/drivers/pci/hotplug/rpaphp_pci.c
@@ -183,9 +183,14 @@ exit_rc:
int rpaphp_register_pci_slot(struct slot *slot)
{
+ int rc, level;
struct hotplug_slot_info *info = slot->hotplug_slot->info;
- rpaphp_get_power_status(slot, &info->power_status);
+ rc = rtas_get_power_level(slot->power_domain, &level);
+ if (rc)
+ return rc;
+ info->power_status = level;
+
rpaphp_get_pci_adapter_status(slot, 1, &info->adapter_status);
if (info->adapter_status == NOT_VALID) {
diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c
index 9b9400727985..30c9dc98e4ec 100644
--- a/drivers/pci/hotplug/rpaphp_slot.c
+++ b/drivers/pci/hotplug/rpaphp_slot.c
@@ -184,24 +184,6 @@ sysfs_fail:
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;