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 3/4] PCI: pciehp: Replace pciehp_set_attention_status()
Date: Sun, 11 Aug 2019 22:59:43 +0300 [thread overview]
Message-ID: <20190811195944.23765-4-efremov@linux.com> (raw)
In-Reply-To: <20190811195944.23765-1-efremov@linux.com>
This patch replaces pciehp_set_attention_status() with
pciehp_set_indicators().
Signed-off-by: Denis Efremov <efremov@linux.com>
---
drivers/pci/hotplug/pciehp.h | 4 +++-
drivers/pci/hotplug/pciehp_hpc.c | 25 -------------------------
2 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 17305a6f01f1..9a2a2d0db9d2 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -181,7 +181,6 @@ void pciehp_get_power_status(struct controller *ctrl, u8 *status);
void pciehp_set_indicators(struct controller *ctrl,
enum pciehp_indicator pwr,
enum pciehp_indicator attn);
-void pciehp_set_attention_status(struct controller *ctrl, u8 status);
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);
@@ -200,6 +199,9 @@ int pciehp_get_attention_status(struct hotplug_slot *hotplug_slot, u8 *status);
int pciehp_set_raw_indicator_status(struct hotplug_slot *h_slot, u8 status);
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))
+
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 68b880bc30db..fb4bea16063a 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -418,31 +418,6 @@ int pciehp_set_raw_indicator_status(struct hotplug_slot *hotplug_slot,
return 0;
}
-void pciehp_set_attention_status(struct controller *ctrl, u8 value)
-{
- u16 slot_cmd;
-
- if (!ATTN_LED(ctrl))
- return;
-
- switch (value) {
- case 0: /* turn off */
- slot_cmd = PCI_EXP_SLTCTL_ATTN_IND_OFF;
- break;
- case 1: /* turn on */
- slot_cmd = PCI_EXP_SLTCTL_ATTN_IND_ON;
- break;
- case 2: /* turn blink */
- slot_cmd = PCI_EXP_SLTCTL_ATTN_IND_BLINK;
- break;
- default:
- return;
- }
- pcie_write_cmd_nowait(ctrl, slot_cmd, PCI_EXP_SLTCTL_AIC);
- ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n", __func__,
- pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL, slot_cmd);
-}
-
void pciehp_set_indicators(struct controller *ctrl,
enum pciehp_indicator pwr,
enum pciehp_indicator attn)
--
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 ` Denis Efremov [this message]
2019-08-12 6:32 ` [PATCH v2 3/4] PCI: pciehp: Replace pciehp_set_attention_status() Lukas Wunner
2019-08-12 18:28 ` sathyanarayanan kuppuswamy
2019-08-11 19:59 ` [PATCH v2 4/4] PCI: pciehp: Replace pciehp_green_led_{on,off,blink}() Denis Efremov
2019-08-12 18:45 ` 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-4-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.