diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2022-12-14 13:35:08 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-01-10 15:43:46 +0100 |
commit | e70b9d7a74698f1374244b2251216428db920aed (patch) | |
tree | b8091531241075d04501751b5236ab54afbe48c2 /drivers/power | |
parent | 12763d0fe56899d3729d0e6755446ed7c740a88a (diff) | |
download | barebox-e70b9d7a74698f1374244b2251216428db920aed.tar.gz |
Rename device_d::device_node to device_d::of_node
Linux struct device has the member of_node for the device_node pointer.
Rename this in barebox accordingly to minimize the necessary changes
when porting Linux code. This was done with the semantic patch:
@@ struct device_d E; @@
- E.device_node
+ E.of_node
@@ struct device_d *E; @@
- E->device_node
+ E->of_node
Plus some manual adjustments.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Marco Felsch <m.felsch@pengutronix.de>
Link: https://lore.barebox.org/20221214123512.189688-2-s.hauer@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/power')
-rw-r--r-- | drivers/power/reset/gpio-poweroff.c | 2 | ||||
-rw-r--r-- | drivers/power/reset/gpio-restart.c | 4 | ||||
-rw-r--r-- | drivers/power/reset/reboot-mode.c | 4 | ||||
-rw-r--r-- | drivers/power/reset/syscon-poweroff.c | 8 | ||||
-rw-r--r-- | drivers/power/reset/syscon-reboot-mode.c | 4 | ||||
-rw-r--r-- | drivers/power/reset/syscon-reboot.c | 12 |
6 files changed, 17 insertions, 17 deletions
diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c index 45b0d274e7..0cda8ceef6 100644 --- a/drivers/power/reset/gpio-poweroff.c +++ b/drivers/power/reset/gpio-poweroff.c @@ -45,7 +45,7 @@ static struct poweroff_handler handler; static int gpio_poweroff_probe(struct device_d *dev) { - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; bool input = false; enum gpiod_flags flags; diff --git a/drivers/power/reset/gpio-restart.c b/drivers/power/reset/gpio-restart.c index 72c690a3cf..65a4407a7d 100644 --- a/drivers/power/reset/gpio-restart.c +++ b/drivers/power/reset/gpio-restart.c @@ -45,7 +45,7 @@ static void __noreturn gpio_restart_handle(struct restart_handler *this) static int gpio_restart_probe(struct device_d *dev) { - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; struct gpio_restart *gpio_restart; bool open_source = false; u32 property; @@ -71,7 +71,7 @@ static int gpio_restart_probe(struct device_d *dev) gpio_restart->inactive_delay_ms = 100; gpio_restart->wait_delay_ms = 3000; - ret = of_property_read_u32(dev->device_node, "priority", &property); + ret = of_property_read_u32(dev->of_node, "priority", &property); if (!ret) gpio_restart->restart_handler.priority = property; diff --git a/drivers/power/reset/reboot-mode.c b/drivers/power/reset/reboot-mode.c index 5761128f8e..70be774be0 100644 --- a/drivers/power/reset/reboot-mode.c +++ b/drivers/power/reset/reboot-mode.c @@ -53,7 +53,7 @@ static int of_reboot_mode_fixup(struct device_node *root, void *ctx) struct reboot_mode_driver *reboot = ctx; struct device_node *dstnp, *srcnp, *dstparent; - srcnp = reboot->dev->device_node; + srcnp = reboot->dev->of_node; dstnp = of_get_node_by_reproducible_name(root, srcnp); if (dstnp) { @@ -120,7 +120,7 @@ int reboot_mode_register(struct reboot_mode_driver *reboot, const u32 *reboot_mode, size_t nelems) { struct property *prop; - struct device_node *np = reboot->dev->device_node; + struct device_node *np = reboot->dev->of_node; const char *alias; size_t nmodes = 0; int i = 0; diff --git a/drivers/power/reset/syscon-poweroff.c b/drivers/power/reset/syscon-poweroff.c index 3664c4d8bd..239e549819 100644 --- a/drivers/power/reset/syscon-poweroff.c +++ b/drivers/power/reset/syscon-poweroff.c @@ -30,19 +30,19 @@ static int syscon_poweroff_probe(struct device_d *dev) { int mask_err, value_err; - map = syscon_regmap_lookup_by_phandle(dev->device_node, "regmap"); + map = syscon_regmap_lookup_by_phandle(dev->of_node, "regmap"); if (IS_ERR(map)) { dev_err(dev, "unable to get syscon"); return PTR_ERR(map); } - if (of_property_read_u32(dev->device_node, "offset", &offset)) { + if (of_property_read_u32(dev->of_node, "offset", &offset)) { dev_err(dev, "unable to read 'offset'"); return -EINVAL; } - value_err = of_property_read_u32(dev->device_node, "value", &value); - mask_err = of_property_read_u32(dev->device_node, "mask", &mask); + value_err = of_property_read_u32(dev->of_node, "value", &value); + mask_err = of_property_read_u32(dev->of_node, "mask", &mask); if (value_err && mask_err) { dev_err(dev, "unable to read 'value' and 'mask'"); return -EINVAL; diff --git a/drivers/power/reset/syscon-reboot-mode.c b/drivers/power/reset/syscon-reboot-mode.c index 0cbc9d0803..69530a409e 100644 --- a/drivers/power/reset/syscon-reboot-mode.c +++ b/drivers/power/reset/syscon-reboot-mode.c @@ -51,7 +51,7 @@ static int syscon_reboot_mode_probe(struct device_d *dev) int ret, i, nelems; struct syscon_reboot_mode *syscon_rbm; struct reboot_mode_driver *reboot_template; - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; u32 *magic; nelems = of_property_count_elems_of_size(np, "offset", sizeof(__be32)); @@ -67,7 +67,7 @@ static int syscon_reboot_mode_probe(struct device_d *dev) syscon_rbm->reboot = *reboot_template; syscon_rbm->reboot.dev = dev; - syscon_rbm->map = syscon_node_to_regmap(dev->parent->device_node); + syscon_rbm->map = syscon_node_to_regmap(dev->parent->of_node); if (IS_ERR(syscon_rbm->map)) return PTR_ERR(syscon_rbm->map); diff --git a/drivers/power/reset/syscon-reboot.c b/drivers/power/reset/syscon-reboot.c index b6b8db75ca..1c3f7666ee 100644 --- a/drivers/power/reset/syscon-reboot.c +++ b/drivers/power/reset/syscon-reboot.c @@ -42,18 +42,18 @@ static int syscon_reboot_probe(struct device_d *dev) if (!ctx) return -ENOMEM; - ctx->map = syscon_regmap_lookup_by_phandle(dev->device_node, "regmap"); + ctx->map = syscon_regmap_lookup_by_phandle(dev->of_node, "regmap"); if (IS_ERR(ctx->map)) { - ctx->map = syscon_node_to_regmap(dev->parent->device_node); + ctx->map = syscon_node_to_regmap(dev->parent->of_node); if (IS_ERR(ctx->map)) return PTR_ERR(ctx->map); } - if (of_property_read_u32(dev->device_node, "offset", &ctx->offset)) + if (of_property_read_u32(dev->of_node, "offset", &ctx->offset)) return -EINVAL; - value_err = of_property_read_u32(dev->device_node, "value", &ctx->value); - mask_err = of_property_read_u32(dev->device_node, "mask", &ctx->mask); + value_err = of_property_read_u32(dev->of_node, "value", &ctx->value); + mask_err = of_property_read_u32(dev->of_node, "mask", &ctx->mask); if (value_err && mask_err) { dev_err(dev, "unable to read 'value' and 'mask'"); return -EINVAL; @@ -71,7 +71,7 @@ static int syscon_reboot_probe(struct device_d *dev) ctx->restart_handler.name = "syscon-reboot"; ctx->restart_handler.restart = syscon_restart_handle; ctx->restart_handler.priority = 192; - ctx->restart_handler.of_node = dev->device_node; + ctx->restart_handler.of_node = dev->of_node; err = restart_handler_register(&ctx->restart_handler); if (err) |