Member is_probed in struct pci_dev indicates whether a pci device is in a
probing process. Rename it to is_probing to match its function as well as
the comments. Rename pci_physfn_is_probed() to pci_physfn_is_probing()
for the same purpose. No functional change.
Signed-off-by: Yicong Yang <yangyicong@xxxxxxxxxxxxx>
---
drivers/pci/pci-driver.c | 10 +++++-----
include/linux/pci.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 0454ca0..56179ce 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -320,10 +320,10 @@ static long local_pci_probe(void *_ddi)
return 0;
}
-static bool pci_physfn_is_probed(struct pci_dev *dev)
+static bool pci_physfn_is_probing(struct pci_dev *dev)
{
#ifdef CONFIG_PCI_IOV
- return dev->is_virtfn && dev->physfn->is_probed;
+ return dev->is_virtfn && dev->physfn->is_probing;
#else
return false;
#endif
@@ -341,7 +341,7 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,
* on the right node.
*/
node = dev_to_node(&dev->dev);
- dev->is_probed = 1;
+ dev->is_probing = 1;
cpu_hotplug_disable();
@@ -350,7 +350,7 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,
* device is probed from work_on_cpu() of the Physical device.
*/
if (node < 0 || node >= MAX_NUMNODES || !node_online(node) ||
- pci_physfn_is_probed(dev))
+ pci_physfn_is_probing(dev))
cpu = nr_cpu_ids;
else
cpu = cpumask_any_and(cpumask_of_node(node), cpu_online_mask);
@@ -360,7 +360,7 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,
else
error = local_pci_probe(&ddi);
- dev->is_probed = 0;
+ dev->is_probing = 0;
cpu_hotplug_enable();
return error;
}
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 3840a54..1c31dd2 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -419,7 +419,7 @@ struct pci_dev {
unsigned int io_window_1k:1; /* Intel bridge 1K I/O windows */
unsigned int irq_managed:1;
unsigned int non_compliant_bars:1; /* Broken BARs; ignore them */
- unsigned int is_probed:1; /* Device probing in progress */
+ unsigned int is_probing:1; /* Device probing in progress */
unsigned int link_active_reporting:1;/* Device capable of reporting link active */
unsigned int no_vf_scan:1; /* Don't scan for VFs after IOV enablement */
pci_dev_flags_t dev_flags;
--
2.8.1
