of_pci: use of_property_read_u32_array()

of_pci_get_devfn() and of_pci_parse_bus_range() somehow didn't use
of_property_read_u32_array() though it was long available, basically
open-coding it.  Using the modern DT API saves several bytes and
also adds some prop sanity checks as a bonus...

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Rob Herring <robh@kernel.org>

diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c
index 0162e4ba30e2c5ec678e3080186b38c4ac435130..e9ec931f5b9a565c7963dc8f3cf1b1c686effa23 100644 (file)
--- a/drivers/of/of_pci.c
+++ b/drivers/of/of_pci.c
@@ -57,15 +57,14 @@ EXPORT_SYMBOL_GPL(of_pci_find_child_device);
  */
 int of_pci_get_devfn(struct device_node *np)
 {
-       unsigned int size;
-       const __be32 *reg;
-
-       reg = of_get_property(np, "reg", &size);
+       u32 reg[5];
+       int error;
 
-       if (!reg || size < 5 * sizeof(__be32))
-               return -EINVAL;
+       error = of_property_read_u32_array(np, "reg", reg, ARRAY_SIZE(reg));
+       if (error)
+               return error;
 
-       return (be32_to_cpup(reg) >> 8) & 0xff;
+       return (reg[0] >> 8) & 0xff;
 }
 EXPORT_SYMBOL_GPL(of_pci_get_devfn);
 
@@ -78,16 +77,17 @@ EXPORT_SYMBOL_GPL(of_pci_get_devfn);
  */
 int of_pci_parse_bus_range(struct device_node *node, struct resource *res)
 {
-       const __be32 *values;
-       int len;
+       u32 bus_range[2];
+       int error;
 
-       values = of_get_property(node, "bus-range", &len);
-       if (!values || len < sizeof(*values) * 2)
-               return -EINVAL;
+       error = of_property_read_u32_array(node, "bus-range", bus_range,
+                                          ARRAY_SIZE(bus_range));
+       if (error)
+               return error;
 
        res->name = node->name;
-       res->start = be32_to_cpup(values++);
-       res->end = be32_to_cpup(values);
+       res->start = bus_range[0];
+       res->end = bus_range[1];
        res->flags = IORESOURCE_BUS;
 
        return 0;