From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 30 Jan 2018 18:12:53 +0000 (-0600)
Subject: PCI/DPC: Squash dpc_rp_pio_get_info() into dpc_process_rp_pio_error()
X-Git-Tag: v4.16-rc1~60^2~17^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=716f0f732ff9eedcf31ff887a4ac7be3ac9bc1c0;p=thirdparty%2Fkernel%2Flinux.git

PCI/DPC: Squash dpc_rp_pio_get_info() into dpc_process_rp_pio_error()

dpc_process_rp_pio_error() only calls dpc_rp_pio_get_info(), so squash them
together.  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>
---

diff --git a/drivers/pci/pcie/pcie-dpc.c b/drivers/pci/pcie/pcie-dpc.c
index 468440e8fb6f9..0f4eb6111ab4c 100644
--- a/drivers/pci/pcie/pcie-dpc.c
+++ b/drivers/pci/pcie/pcie-dpc.c
@@ -122,7 +122,7 @@ static void dpc_work(struct work_struct *work)
 			      ctl | PCI_EXP_DPC_CTL_INT_EN);
 }
 
-static void dpc_rp_pio_get_info(struct dpc_dev *dpc)
+static void dpc_process_rp_pio_error(struct dpc_dev *dpc)
 {
 	struct device *dev = &dpc->dev->device;
 	struct pci_dev *pdev = dpc->dev->port;
@@ -179,12 +179,6 @@ static void dpc_rp_pio_get_info(struct dpc_dev *dpc)
 	}
 }
 
-static void dpc_process_rp_pio_error(struct dpc_dev *dpc)
-{
-	dpc_rp_pio_get_info(dpc);
-
-}
-
 static irqreturn_t dpc_irq(int irq, void *context)
 {
 	struct dpc_dev *dpc = (struct dpc_dev *)context;