diff options
| author | Rob Herring <robh@kernel.org> | 2021-10-08 14:29:10 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2021-10-08 14:30:12 -0500 |
| commit | a70ae18b9e954d52148f153e8bdea8da55b2959e (patch) | |
| tree | 187866f62d259c13c1a99f96a1b4193d8b87ed42 /drivers | |
| parent | 6663ae07d995f5fbe2988a19858b2f87e68cf929 (diff) | |
| parent | b2d70c0dbf2731a37d1c7bcc86ab2387954d5f56 (diff) | |
| download | linux-a70ae18b9e954d52148f153e8bdea8da55b2959e.tar.bz2 | |
Merge branch 'dt/linus' into dt/next
Merge fixes to avoid binding schema warnings.
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/device.c | 6 | ||||
| -rw-r--r-- | drivers/of/property.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/of/device.c b/drivers/of/device.c index 5b043ee30824..b0800c260f64 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -85,7 +85,11 @@ of_dma_set_restricted_buffer(struct device *dev, struct device_node *np) break; } - if (i != count && of_reserved_mem_device_init_by_idx(dev, of_node, i)) + /* + * Attempt to initialize a restricted-dma-pool region if one was found. + * Note that count can hold a negative error code. + */ + if (i < count && of_reserved_mem_device_init_by_idx(dev, of_node, i)) dev_warn(dev, "failed to initialise \"restricted-dma-pool\" memory node\n"); } diff --git a/drivers/of/property.c b/drivers/of/property.c index 3fd74bb34819..a3483484a5a2 100644 --- a/drivers/of/property.c +++ b/drivers/of/property.c @@ -1291,7 +1291,6 @@ DEFINE_SIMPLE_PROP(pwms, "pwms", "#pwm-cells") DEFINE_SIMPLE_PROP(resets, "resets", "#reset-cells") DEFINE_SIMPLE_PROP(leds, "leds", NULL) DEFINE_SIMPLE_PROP(backlight, "backlight", NULL) -DEFINE_SIMPLE_PROP(phy_handle, "phy-handle", NULL) DEFINE_SUFFIX_PROP(regulators, "-supply", NULL) DEFINE_SUFFIX_PROP(gpio, "-gpio", "#gpio-cells") @@ -1380,7 +1379,6 @@ static const struct supplier_bindings of_supplier_bindings[] = { { .parse_prop = parse_resets, }, { .parse_prop = parse_leds, }, { .parse_prop = parse_backlight, }, - { .parse_prop = parse_phy_handle, }, { .parse_prop = parse_gpio_compat, }, { .parse_prop = parse_interrupts, }, { .parse_prop = parse_regulators, }, |