bus/arm-cci: Streamline devicetree handling a bit

Rather than iterating over child nodes explicitly testing for
availability, we can just use the other helper which already subsumes
that check. Also, the availability check is already NULL-safe, so get
rid of a redundant check in cci_probe(), too.

Acked-by: Punit Agrawal <punit.agrawal@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Robin Murphy 2018-02-15 18:51:44 +00:00 коммит произвёл Arnd Bergmann
Родитель 03057f2626
Коммит 3ee5e821f3
1 изменённых файлов: 2 добавлений и 5 удалений

Просмотреть файл

@ -448,13 +448,10 @@ static int cci_probe_ports(struct device_node *np)
if (!ports)
return -ENOMEM;
for_each_child_of_node(np, cp) {
for_each_available_child_of_node(np, cp) {
if (!of_match_node(arm_cci_ctrl_if_matches, cp))
continue;
if (!of_device_is_available(cp))
continue;
i = nb_ace + nb_ace_lite;
if (i >= nb_cci_ports)
@ -534,7 +531,7 @@ static int cci_probe(void)
struct resource res;
np = of_find_matching_node(NULL, arm_cci_matches);
if(!np || !of_device_is_available(np))
if (!of_device_is_available(np))
return -ENODEV;
ret = of_address_to_resource(np, 0, &res);