PCI/DPC: Squash dpc_rp_pio_print_tlp_header() into dpc_rp_pio_print_error()
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 30 Jan 2018 00:57:21 +0000 (18:57 -0600)
committerBjorn Helgaas <helgaas@kernel.org>
Tue, 30 Jan 2018 21:25:45 +0000 (15:25 -0600)
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>
drivers/pci/pcie/pcie-dpc.c

index a6b8d1496322bcc9901aa5267310137e065ab444..16019d1ecc2c2e13f866f5e2b42a19b287226eea 100644 (file)
@@ -142,13 +142,6 @@ static void dpc_work(struct work_struct *work)
                              ctl | PCI_EXP_DPC_CTL_INT_EN);
 }
 
                              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)
 {
 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)" : "");
        }
 
                        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;
 
        if (dpc->rp_log_size == 4)
                return;