PCI: rpaphp: remove rpaphp_set_attention_status()
The rpaphp_set_attention_status() routine seems to be a wrapper around a single rtas call. Abolish it. 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:
parent
307ff12e35
commit
c02929c278
|
@ -102,6 +102,5 @@ 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 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_register_slot(struct slot *slot);
|
||||||
extern int rpaphp_deregister_slot(struct slot *slot);
|
extern int rpaphp_deregister_slot(struct slot *slot);
|
||||||
extern int rpaphp_set_attention_status(struct slot *slot, u8 status);
|
|
||||||
|
|
||||||
#endif /* _PPC64PHP_H */
|
#endif /* _PPC64PHP_H */
|
||||||
|
|
|
@ -63,27 +63,26 @@ module_param(debug, bool, 0644);
|
||||||
*/
|
*/
|
||||||
static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 value)
|
static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 value)
|
||||||
{
|
{
|
||||||
int retval = 0;
|
int rc;
|
||||||
struct slot *slot = (struct slot *)hotplug_slot->private;
|
struct slot *slot = (struct slot *)hotplug_slot->private;
|
||||||
|
|
||||||
down(&rpaphp_sem);
|
down(&rpaphp_sem);
|
||||||
switch (value) {
|
switch (value) {
|
||||||
case 0:
|
case 0:
|
||||||
retval = rpaphp_set_attention_status(slot, LED_OFF);
|
|
||||||
hotplug_slot->info->attention_status = 0;
|
|
||||||
break;
|
|
||||||
case 1:
|
case 1:
|
||||||
default:
|
|
||||||
retval = rpaphp_set_attention_status(slot, LED_ON);
|
|
||||||
hotplug_slot->info->attention_status = 1;
|
|
||||||
break;
|
|
||||||
case 2:
|
case 2:
|
||||||
retval = rpaphp_set_attention_status(slot, LED_ID);
|
break;
|
||||||
hotplug_slot->info->attention_status = 2;
|
default:
|
||||||
|
value = 1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
up(&rpaphp_sem);
|
up(&rpaphp_sem);
|
||||||
return retval;
|
|
||||||
|
rc = rtas_set_indicator(DR_INDICATOR, slot->index, value);
|
||||||
|
if (!rc)
|
||||||
|
hotplug_slot->info->attention_status = value;
|
||||||
|
|
||||||
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -184,15 +184,3 @@ sysfs_fail:
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
int rpaphp_set_attention_status(struct slot *slot, u8 status)
|
|
||||||
{
|
|
||||||
int rc;
|
|
||||||
|
|
||||||
/* status: LED_OFF or LED_ON */
|
|
||||||
rc = rtas_set_indicator(DR_INDICATOR, slot->index, status);
|
|
||||||
if (rc < 0)
|
|
||||||
err("slot(name=%s location=%s index=0x%x) set attention-status(%d) failed! rc=0x%x\n",
|
|
||||||
slot->name, slot->location, slot->index, status, rc);
|
|
||||||
|
|
||||||
return rc;
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue