diff options
Diffstat (limited to 'drivers/of')
-rw-r--r-- | drivers/of/dynamic.c | 3 | ||||
-rw-r--r-- | drivers/of/property.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index 08fd823edac9..fe64430b438a 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -286,7 +286,6 @@ int of_detach_node(struct device_node *np) { struct of_reconfig_data rd; unsigned long flags; - int rc = 0; memset(&rd, 0, sizeof(rd)); rd.dn = np; @@ -301,7 +300,7 @@ int of_detach_node(struct device_node *np) of_reconfig_notify(OF_RECONFIG_DETACH_NODE, &rd); - return rc; + return 0; } EXPORT_SYMBOL_GPL(of_detach_node); diff --git a/drivers/of/property.c b/drivers/of/property.c index b4916dcc9e72..252e4f600155 100644 --- a/drivers/of/property.c +++ b/drivers/of/property.c @@ -1206,6 +1206,7 @@ DEFINE_SIMPLE_PROP(interrupt_parent, "interrupt-parent", NULL) DEFINE_SIMPLE_PROP(dmas, "dmas", "#dma-cells") DEFINE_SIMPLE_PROP(power_domains, "power-domains", "#power-domain-cells") DEFINE_SIMPLE_PROP(hwlocks, "hwlocks", "#hwlock-cells") +DEFINE_SIMPLE_PROP(extcon, "extcon", NULL) DEFINE_SUFFIX_PROP(regulators, "-supply", NULL) DEFINE_SUFFIX_PROP(gpio, "-gpio", "#gpio-cells") DEFINE_SUFFIX_PROP(gpios, "-gpios", "#gpio-cells") @@ -1230,6 +1231,7 @@ static const struct supplier_bindings of_supplier_bindings[] = { { .parse_prop = parse_dmas, }, { .parse_prop = parse_power_domains, }, { .parse_prop = parse_hwlocks, }, + { .parse_prop = parse_extcon, }, { .parse_prop = parse_regulators, }, { .parse_prop = parse_gpio, }, { .parse_prop = parse_gpios, }, |