[PATCH RFC 02/15] powerpc/eeh: Rename eeh_pe_get() to eeh_pe_find()
From: Sam Bobroff <hidden>
Date: 2019-10-02 06:25:03
Subsystem:
linux for powerpc (32-bit and 64-bit), pci enhanced error handling (eeh) for powerpc, the rest · Maintainers:
Madhavan Srinivasan, Mahesh J Salgaonkar, Linus Torvalds
There are now functions eeh_get_pe() and eeh_pe_get() which seems likely to cause confusion. Keep eeh_get_pe() because "get" is commonly used to refer to acquiring a reference (which it does), and rename eeh_pe_get() to eeh_pe_find() because it performs a search. Signed-off-by: Sam Bobroff <redacted> --- arch/powerpc/include/asm/eeh.h | 2 +- arch/powerpc/kernel/eeh.c | 2 +- arch/powerpc/kernel/eeh_pe.c | 12 ++++++------ arch/powerpc/platforms/powernv/eeh-powernv.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h
index 54ba958760f2..e6f461d07426 100644
--- a/arch/powerpc/include/asm/eeh.h
+++ b/arch/powerpc/include/asm/eeh.h@@ -288,7 +288,7 @@ int eeh_phb_pe_create(struct pci_controller *phb); int eeh_wait_state(struct eeh_pe *pe, int max_wait); struct eeh_pe *eeh_phb_pe_get(struct pci_controller *phb); struct eeh_pe *eeh_pe_next(struct eeh_pe *pe, struct eeh_pe *root); -struct eeh_pe *eeh_pe_get(struct pci_controller *phb, +struct eeh_pe *eeh_pe_find(struct pci_controller *phb, int pe_no, int config_addr); int eeh_add_to_parent_pe(struct eeh_dev *edev); int eeh_rmv_from_parent_pe(struct eeh_dev *edev);
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index d613e7ea7794..7e36ad0cfa2b 100644
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c@@ -1940,7 +1940,7 @@ static ssize_t eeh_force_recover_write(struct file *filp, return -ENODEV; /* Retrieve PE */ - pe = eeh_pe_get(hose, pe_no, 0); + pe = eeh_pe_find(hose, pe_no, 0); if (!pe) return -ENODEV;
diff --git a/arch/powerpc/kernel/eeh_pe.c b/arch/powerpc/kernel/eeh_pe.c
index d455df7b4928..fda52d1989c3 100644
--- a/arch/powerpc/kernel/eeh_pe.c
+++ b/arch/powerpc/kernel/eeh_pe.c@@ -315,7 +315,7 @@ void eeh_pe_dev_traverse(struct eeh_pe *root, } /** - * __eeh_pe_get - Check the PE address + * __eeh_pe_find - Check the PE address * @data: EEH PE * @flag: EEH device *
@@ -329,7 +329,7 @@ struct eeh_pe_get_flag { int config_addr; }; -static void *__eeh_pe_get(struct eeh_pe *pe, void *flag) +static void *__eeh_pe_find(struct eeh_pe *pe, void *flag) { struct eeh_pe_get_flag *tmp = (struct eeh_pe_get_flag *) flag;
@@ -371,14 +371,14 @@ static void *__eeh_pe_get(struct eeh_pe *pe, void *flag) * which is composed of PCI bus/device/function number, or unified * PE address. */ -struct eeh_pe *eeh_pe_get(struct pci_controller *phb, - int pe_no, int config_addr) +struct eeh_pe *eeh_pe_find(struct pci_controller *phb, + int pe_no, int config_addr) { struct eeh_pe *root = eeh_phb_pe_get(phb); struct eeh_pe_get_flag tmp = { pe_no, config_addr }; struct eeh_pe *pe; - pe = eeh_pe_traverse(root, __eeh_pe_get, &tmp); + pe = eeh_pe_traverse(root, __eeh_pe_find, &tmp); return pe; }
@@ -447,7 +447,7 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev) * PE should be composed of PCI bus and its subordinate * components. */ - pe = eeh_pe_get(pdn->phb, edev->pe_config_addr, config_addr); + pe = eeh_pe_find(pdn->phb, edev->pe_config_addr, config_addr); if (pe) { if (pe->type & EEH_PE_INVALID) { list_add_tail(&edev->entry, &pe->edevs);
diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c
index 25d1712b519d..e477e0b70968 100644
--- a/arch/powerpc/platforms/powernv/eeh-powernv.c
+++ b/arch/powerpc/platforms/powernv/eeh-powernv.c@@ -142,7 +142,7 @@ static ssize_t pnv_eeh_ei_write(struct file *filp, return -EINVAL; /* Retrieve PE */ - pe = eeh_pe_get(hose, pe_no, 0); + pe = eeh_pe_find(hose, pe_no, 0); if (!pe) return -ENODEV;
@@ -1425,7 +1425,7 @@ static int pnv_eeh_get_pe(struct pci_controller *hose, } /* Find the PE according to PE# */ - dev_pe = eeh_pe_get(hose, pe_no, 0); + dev_pe = eeh_pe_find(hose, pe_no, 0); if (!dev_pe) return -EEXIST;
--
2.22.0.216.g00a2a96fc9