| Message ID | 20200916062128.190819-1-miaoqinglang@huawei.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [-next] PCI: rpadlpar: use for_each_child_of_node() and for_each_node_by_name | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (27e2fbcd815a088d7d83c7158f76b6e95ab07c50) |
| snowpatch_ozlabs/build-ppc64le | warning | Upstream build failed, couldn't test patch |
| snowpatch_ozlabs/build-ppc64be | warning | Upstream build failed, couldn't test patch |
| snowpatch_ozlabs/build-ppc64e | warning | Upstream build failed, couldn't test patch |
| snowpatch_ozlabs/build-pmac32 | warning | Upstream build failed, couldn't test patch |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 27 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
On Wed, Sep 16, 2020 at 02:21:28PM +0800, Qinglang Miao wrote: > Use for_each_child_of_node() and for_each_node_by_name macro > instead of open coding it. > > Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com> Applied to pci/hotplug for v5.10, thanks! > --- > drivers/pci/hotplug/rpadlpar_core.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c > index f979b7098..0a3c80ba6 100644 > --- a/drivers/pci/hotplug/rpadlpar_core.c > +++ b/drivers/pci/hotplug/rpadlpar_core.c > @@ -40,13 +40,13 @@ static DEFINE_MUTEX(rpadlpar_mutex); > static struct device_node *find_vio_slot_node(char *drc_name) > { > struct device_node *parent = of_find_node_by_name(NULL, "vdevice"); > - struct device_node *dn = NULL; > + struct device_node *dn; > int rc; > > if (!parent) > return NULL; > > - while ((dn = of_get_next_child(parent, dn))) { > + for_each_child_of_node(parent, dn) { > rc = rpaphp_check_drc_props(dn, drc_name, NULL); > if (rc == 0) > break; > @@ -60,10 +60,10 @@ static struct device_node *find_vio_slot_node(char *drc_name) > static struct device_node *find_php_slot_pci_node(char *drc_name, > char *drc_type) > { > - struct device_node *np = NULL; > + struct device_node *np; > int rc; > > - while ((np = of_find_node_by_name(np, "pci"))) { > + for_each_node_by_name(np, "pci") { > rc = rpaphp_check_drc_props(np, drc_name, drc_type); > if (rc == 0) > break; > -- > 2.23.0 >
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c index f979b7098..0a3c80ba6 100644 --- a/drivers/pci/hotplug/rpadlpar_core.c +++ b/drivers/pci/hotplug/rpadlpar_core.c @@ -40,13 +40,13 @@ static DEFINE_MUTEX(rpadlpar_mutex); static struct device_node *find_vio_slot_node(char *drc_name) { struct device_node *parent = of_find_node_by_name(NULL, "vdevice"); - struct device_node *dn = NULL; + struct device_node *dn; int rc; if (!parent) return NULL; - while ((dn = of_get_next_child(parent, dn))) { + for_each_child_of_node(parent, dn) { rc = rpaphp_check_drc_props(dn, drc_name, NULL); if (rc == 0) break; @@ -60,10 +60,10 @@ static struct device_node *find_vio_slot_node(char *drc_name) static struct device_node *find_php_slot_pci_node(char *drc_name, char *drc_type) { - struct device_node *np = NULL; + struct device_node *np; int rc; - while ((np = of_find_node_by_name(np, "pci"))) { + for_each_node_by_name(np, "pci") { rc = rpaphp_check_drc_props(np, drc_name, drc_type); if (rc == 0) break;
Use for_each_child_of_node() and for_each_node_by_name macro instead of open coding it. Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com> --- drivers/pci/hotplug/rpadlpar_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)