From 0bbe0eb85fecce825158f2e1e3f03f53d01e0a7b Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 29 Jan 2018 18:57:21 -0600
Subject: [PATCH] PCI/DPC: Squash dpc_rp_pio_print_tlp_header() into dpc_rp_pio_print_error()
Git-commit: 0bbe0eb85fecce825158f2e1e3f03f53d01e0a7b
Patch-mainline: v4.16-rc1
References: FATE#325195
Separating dpc_rp_pio_print_tlp_header() doesn't really provide any useful
abstraction, so squash it into its caller, dpc_rp_pio_print_error(). 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>
Acked-by: Takashi Iwai <tiwai@suse.de>
---
drivers/pci/pcie/pcie-dpc.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/pci/pcie/pcie-dpc.c b/drivers/pci/pcie/pcie-dpc.c
index a6b8d1496322..16019d1ecc2c 100644
--- a/drivers/pci/pcie/pcie-dpc.c
+++ b/drivers/pci/pcie/pcie-dpc.c
@@ -142,13 +142,6 @@ static void dpc_work(struct work_struct *work)
ctl | PCI_EXP_DPC_CTL_INT_EN);
}
-static void dpc_rp_pio_print_tlp_header(struct device *dev,
- struct rp_pio_header_log_regs *t)
-{
- dev_err(dev, "TLP Header: %#010x %#010x %#010x %#010x\n",
- t->dw0, t->dw1, t->dw2, t->dw3);
-}
-
static void dpc_rp_pio_print_error(struct dpc_dev *dpc,
struct dpc_rp_pio_regs *rp_pio)
{
@@ -172,7 +165,9 @@ static void dpc_rp_pio_print_error(struct dpc_dev *dpc,
rp_pio->first_error == i ? " (First)" : "");
}
- dpc_rp_pio_print_tlp_header(dev, &rp_pio->header_log);
+ dev_err(dev, "TLP Header: %#010x %#010x %#010x %#010x\n",
+ rp_pio->header_log.dw0, rp_pio->header_log.dw1,
+ rp_pio->header_log.dw2, rp_pio->header_log.dw3);
if (dpc->rp_log_size == 4)
return;
--
2.19.2