On Tue, Aug 20, 2019 at 2:09 AM Denis Efremov <[email protected]> wrote: > > Remove pciehp_green_led_{on,off,blink}() and use pciehp_set_indicators() > instead, since the code is mostly the same. > > Signed-off-by: Denis Efremov <[email protected]> > --- > drivers/pci/hotplug/pciehp.h | 3 --- > drivers/pci/hotplug/pciehp_ctrl.c | 12 ++++++++--- > drivers/pci/hotplug/pciehp_hpc.c | 36 ------------------------------- > 3 files changed, 9 insertions(+), 42 deletions(-) > > diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h > index acda513f37d7..da429345cf70 100644 > --- a/drivers/pci/hotplug/pciehp.h > +++ b/drivers/pci/hotplug/pciehp.h > @@ -170,9 +170,6 @@ void pciehp_get_power_status(struct controller *ctrl, u8 > *status); > void pciehp_set_indicators(struct controller *ctrl, int pwr, int attn); > void pciehp_get_latch_status(struct controller *ctrl, u8 *status); > int pciehp_query_power_fault(struct controller *ctrl); > -void pciehp_green_led_on(struct controller *ctrl); > -void pciehp_green_led_off(struct controller *ctrl); > -void pciehp_green_led_blink(struct controller *ctrl); > bool pciehp_card_present(struct controller *ctrl); > bool pciehp_card_present_or_link_active(struct controller *ctrl); > int pciehp_check_link_status(struct controller *ctrl); > diff --git a/drivers/pci/hotplug/pciehp_ctrl.c > b/drivers/pci/hotplug/pciehp_ctrl.c > index 232f7bfcfce9..862fe86e87cc 100644 > --- a/drivers/pci/hotplug/pciehp_ctrl.c > +++ b/drivers/pci/hotplug/pciehp_ctrl.c > @@ -65,7 +65,9 @@ static int board_added(struct controller *ctrl) > return retval; > } > > - pciehp_green_led_blink(ctrl); > + pciehp_set_indicators(ctrl, PCI_EXP_SLTCTL_PWR_IND_BLINK, > + PCI_EXP_SLTCTL_ATTN_IND_NONE);
I think it woud be good if you provided a helper macro for setting one of the indicators rather than open coding the _NONE constant. e.g. #define set_power_indicator(ctrl, x) pciehp_set_indicators(ctrl, (x), PCI_EXP_SLTCTL_ATTN_IND_NONE); then you can do: set_power_indicator(ctrl, PCI_EXP_SLTCTL_PWR_IND_BLINK); which is a bit nicer to read.
