diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2018-01-30 13:12:43 -0500 |
---|---|---|
committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-01-30 16:26:09 -0500 |
commit | f5ec5a0737afd28416a5b45b4ffe0465920baec7 (patch) | |
tree | 349601c21e71168288d717737438bcc502496e66 | |
parent | a88b304e6164199ca98f76a49faedc85f0b3cc49 (diff) |
PCI/DPC: Push dpc->rp_pio_status assignment into dpc_rp_pio_get_info()
Move the dpc->rp_pio_status assignment into dpc_rp_pio_get_info() since
that's where we read rp_pio->status anway. No functional change intended.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Sinan Kaya <okaya@codeaurora.org>
-rw-r--r-- | drivers/pci/pcie/pcie-dpc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/pcie/pcie-dpc.c b/drivers/pci/pcie/pcie-dpc.c index fb7ddbe96811..7b96169a808c 100644 --- a/drivers/pci/pcie/pcie-dpc.c +++ b/drivers/pci/pcie/pcie-dpc.c | |||
@@ -158,6 +158,8 @@ static void dpc_rp_pio_get_info(struct dpc_dev *dpc, | |||
158 | dev_err(dev, "rp_pio_status: %#010x, rp_pio_mask: %#010x\n", | 158 | dev_err(dev, "rp_pio_status: %#010x, rp_pio_mask: %#010x\n", |
159 | rp_pio->status, rp_pio->mask); | 159 | rp_pio->status, rp_pio->mask); |
160 | 160 | ||
161 | dpc->rp_pio_status = rp_pio->status; | ||
162 | |||
161 | pci_read_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_SEVERITY, | 163 | pci_read_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_SEVERITY, |
162 | &rp_pio->severity); | 164 | &rp_pio->severity); |
163 | pci_read_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_SYSERROR, | 165 | pci_read_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_SYSERROR, |
@@ -213,7 +215,6 @@ static void dpc_process_rp_pio_error(struct dpc_dev *dpc) | |||
213 | 215 | ||
214 | dpc_rp_pio_get_info(dpc, &rp_pio_regs); | 216 | dpc_rp_pio_get_info(dpc, &rp_pio_regs); |
215 | 217 | ||
216 | dpc->rp_pio_status = rp_pio_regs.status; | ||
217 | } | 218 | } |
218 | 219 | ||
219 | static irqreturn_t dpc_irq(int irq, void *context) | 220 | static irqreturn_t dpc_irq(int irq, void *context) |