Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c02929c2 authored by Linas Vepstas's avatar Linas Vepstas Committed by Greg Kroah-Hartman
Browse files

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: default avatarLinas Vepstas <linas@austin.ibm.com>
Cc: John Rose <johnrose@austin.ibm.com>
Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 307ff12e

drivers/pci/hotplug/rpaphp.h

+0 −1
Original line number Diff line number Diff line
@@ -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 int rpaphp_register_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 */

drivers/pci/hotplug/rpaphp_core.c

+10 −11
Original line number Diff line number Diff line
@@ -63,27 +63,26 @@ module_param(debug, bool, 0644); 
 */

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;



	down(&rpaphp_sem);

	switch (value) {

	case 0:

		retval = rpaphp_set_attention_status(slot, LED_OFF);

		hotplug_slot->info->attention_status = 0;

		break;

	case 1:

	default:

		retval = rpaphp_set_attention_status(slot, LED_ON);

		hotplug_slot->info->attention_status = 1;

		break;

	case 2:

		retval = rpaphp_set_attention_status(slot, LED_ID);

		hotplug_slot->info->attention_status = 2;

		break;

	default:

		value = 1;

		break;

	}

	up(&rpaphp_sem);

	return retval;



	rc = rtas_set_indicator(DR_INDICATOR, slot->index, value);

	if (!rc)

		hotplug_slot->info->attention_status = value;



	return rc;

}



/**

drivers/pci/hotplug/rpaphp_slot.c

+0 −12
Original line number Diff line number Diff line
@@ -184,15 +184,3 @@ int rpaphp_register_slot(struct slot *slot) 
	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;

}