OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Linas Vepstas 2007-04-13 15:34:13 -07:00 committed by Greg Kroah-Hartman
parent 517d5a0417
commit 427310ff02
4 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/pci/hotplug/rpaphp.h
View File

@ -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 */

6
drivers/pci/hotplug/rpaphp_core.c
View File

@ -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;
}

7
drivers/pci/hotplug/rpaphp_pci.c
View File

@ -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) {

18
drivers/pci/hotplug/rpaphp_slot.c
View File

@ -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;