[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <152848872711.14051.2066441875532387495.stgit@bhelgaas-glaptop.roam.corp.google.com>
Date: Fri, 08 Jun 2018 15:12:07 -0500
From: Bjorn Helgaas <helgaas@...nel.org>
To: linux-pci@...r.kernel.org
Cc: Oza Pawandeep <poza@...eaurora.org>, linux-kernel@...r.kernel.org
Subject: [PATCH v1 1/9] PCI/portdrv: Rename resume_iter() to prevent name
collision
From: Bjorn Helgaas <bhelgaas@...gle.com>
Rename resume_iter() to prevent a name collision in a future patch. No
functional change intended.
Signed-off-by: Bjorn Helgaas <bhelgaas@...gle.com>
---
drivers/pci/pcie/portdrv_pci.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index 973f1b80a038..b8b99dd07c0c 100644
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -173,7 +173,7 @@ static pci_ers_result_t pcie_portdrv_slot_reset(struct pci_dev *dev)
return PCI_ERS_RESULT_RECOVERED;
}
-static int resume_iter(struct device *device, void *data)
+static int err_resume_iter(struct device *device, void *data)
{
struct pcie_device *pcie_device;
struct pcie_port_service_driver *driver;
@@ -193,7 +193,7 @@ static int resume_iter(struct device *device, void *data)
static void pcie_portdrv_err_resume(struct pci_dev *dev)
{
- device_for_each_child(&dev->dev, NULL, resume_iter);
+ device_for_each_child(&dev->dev, NULL, err_resume_iter);
}
/*
Powered by blists - more mailing lists