struct device *parent)
 {
        struct amba_device *dev;
-       const void *prop;
        int ret;
 
        pr_debug("Creating amba device %pOF\n", node);
                of_device_make_bus_id(&dev->dev);
 
        /* Allow the HW Peripheral ID to be overridden */
-       prop = of_get_property(node, "arm,primecell-periphid", NULL);
-       if (prop)
-               dev->periphid = of_read_ulong(prop, 1);
+       of_property_read_u32(node, "arm,primecell-periphid", &dev->periphid);
 
        ret = of_address_to_resource(node, 0, &dev->res);
        if (ret) {
 
         * Ignore node with gpio-hog property since its gpios are all provided
         * by its parent.
         */
-       if (of_find_property(np, "gpio-hog", NULL))
+       if (of_property_read_bool(np, "gpio-hog"))
                return NULL;
 
        if (of_parse_phandle_with_args(np, prop_name, "#gpio-cells", index,