From: Denis Efremov <efremov@linux.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Lukas Wunner <lukas@wunner.de>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Denis Efremov <efremov@linux.com>
Subject: [PATCH v2 4/4] PCI: pciehp: Replace pciehp_green_led_{on,off,blink}()
Date: Sun, 11 Aug 2019 22:59:44 +0300 [thread overview]
Message-ID: <20190811195944.23765-5-efremov@linux.com> (raw)
In-Reply-To: <20190811195944.23765-1-efremov@linux.com>
This patch replaces pciehp_green_led_{on,off,blink}() with
pciehp_set_indicators().
Reviewed-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Denis Efremov <efremov@linux.com>
---
drivers/pci/hotplug/pciehp.h | 12 ++++++++---
drivers/pci/hotplug/pciehp_hpc.c | 36 --------------------------------
2 files changed, 9 insertions(+), 39 deletions(-)
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 9a2a2d0db9d2..6cdcb1ca561f 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -183,9 +183,6 @@ void pciehp_set_indicators(struct controller *ctrl,
enum pciehp_indicator 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);
@@ -202,6 +199,15 @@ int pciehp_get_raw_indicator_status(struct hotplug_slot *h_slot, u8 *status);
#define pciehp_set_attention_status(ctrl, status) \
pciehp_set_indicators(ctrl, PWR_NONE, (status == 0 ? ATTN_OFF : status))
+#define pciehp_green_led_on(ctrl) \
+ pciehp_set_indicators(ctrl, PWR_ON, ATTN_NONE)
+
+#define pciehp_green_led_off(ctrl) \
+ pciehp_set_indicators(ctrl, PWR_OFF, ATTN_NONE)
+
+#define pciehp_green_led_blink(ctrl) \
+ pciehp_set_indicators(ctrl, PWR_BLINK, ATTN_NONE)
+
static inline const char *slot_name(struct controller *ctrl)
{
return hotplug_slot_name(&ctrl->hotplug_slot);
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index fb4bea16063a..8362d24405fd 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -456,42 +456,6 @@ void pciehp_set_indicators(struct controller *ctrl,
cmd);
}
-void pciehp_green_led_on(struct controller *ctrl)
-{
- if (!PWR_LED(ctrl))
- return;
-
- pcie_write_cmd_nowait(ctrl, PCI_EXP_SLTCTL_PWR_IND_ON,
- PCI_EXP_SLTCTL_PIC);
- ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n", __func__,
- pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL,
- PCI_EXP_SLTCTL_PWR_IND_ON);
-}
-
-void pciehp_green_led_off(struct controller *ctrl)
-{
- if (!PWR_LED(ctrl))
- return;
-
- pcie_write_cmd_nowait(ctrl, PCI_EXP_SLTCTL_PWR_IND_OFF,
- PCI_EXP_SLTCTL_PIC);
- ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n", __func__,
- pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL,
- PCI_EXP_SLTCTL_PWR_IND_OFF);
-}
-
-void pciehp_green_led_blink(struct controller *ctrl)
-{
- if (!PWR_LED(ctrl))
- return;
-
- pcie_write_cmd_nowait(ctrl, PCI_EXP_SLTCTL_PWR_IND_BLINK,
- PCI_EXP_SLTCTL_PIC);
- ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n", __func__,
- pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL,
- PCI_EXP_SLTCTL_PWR_IND_BLINK);
-}
-
int pciehp_power_on_slot(struct controller *ctrl)
{
struct pci_dev *pdev = ctrl_dev(ctrl);
--
2.21.0
next prev parent reply other threads:[~2019-08-11 20:00 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-11 19:59 [PATCH v2 0/4] Simplify PCIe hotplug indicator control Denis Efremov
2019-08-11 19:59 ` [PATCH v2 1/4] PCI: pciehp: Add pciehp_set_indicators() to jointly set LED indicators Denis Efremov
2019-08-12 6:30 ` Lukas Wunner
2019-08-12 18:25 ` sathyanarayanan kuppuswamy
2019-08-12 18:49 ` sathyanarayanan kuppuswamy
2019-08-12 20:40 ` Lukas Wunner
2019-08-12 21:03 ` sathyanarayanan kuppuswamy
2019-08-12 20:03 ` Bjorn Helgaas
2019-08-11 19:59 ` [PATCH v2 2/4] PCI: pciehp: Switch LED indicators with a single write Denis Efremov
2019-08-12 18:27 ` sathyanarayanan kuppuswamy
2019-08-11 19:59 ` [PATCH v2 3/4] PCI: pciehp: Replace pciehp_set_attention_status() Denis Efremov
2019-08-12 6:32 ` Lukas Wunner
2019-08-12 18:28 ` sathyanarayanan kuppuswamy
2019-08-11 19:59 ` Denis Efremov [this message]
2019-08-12 18:45 ` [PATCH v2 4/4] PCI: pciehp: Replace pciehp_green_led_{on,off,blink}() sathyanarayanan kuppuswamy
2019-08-12 20:03 ` Bjorn Helgaas
2019-08-12 21:14 ` Denis Efremov
2019-08-12 22:12 ` Bjorn Helgaas
2019-08-12 20:02 ` [PATCH v2 0/4] Simplify PCIe hotplug indicator control Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190811195944.23765-5-efremov@linux.com \
--to=efremov@linux.com \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lukas@wunner.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.