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/watchdog | |
parent | 12763d0fe56899d3729d0e6755446ed7c740a88a (diff) | |
download | barebox-e70b9d7a74698f1374244b2251216428db920aed.tar.gz barebox-e70b9d7a74698f1374244b2251216428db920aed.tar.xz |
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/watchdog')
-rw-r--r-- | drivers/watchdog/gpio_wdt.c | 2 | ||||
-rw-r--r-- | drivers/watchdog/imxwd.c | 4 | ||||
-rw-r--r-- | drivers/watchdog/rave-sp-wdt.c | 2 | ||||
-rw-r--r-- | drivers/watchdog/wd_core.c | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/watchdog/gpio_wdt.c b/drivers/watchdog/gpio_wdt.c index 4de49dcee3..c5da28467b 100644 --- a/drivers/watchdog/gpio_wdt.c +++ b/drivers/watchdog/gpio_wdt.c @@ -83,7 +83,7 @@ static int gpio_wdt_set_timeout(struct watchdog *wdd, unsigned int new_timeout) static int gpio_wdt_probe(struct device_d *dev) { - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; struct gpio_wdt_priv *priv; enum gpiod_flags gflags; unsigned int hw_margin; diff --git a/drivers/watchdog/imxwd.c b/drivers/watchdog/imxwd.c index 5e9962866f..0cc1d07ba2 100644 --- a/drivers/watchdog/imxwd.c +++ b/drivers/watchdog/imxwd.c @@ -269,9 +269,9 @@ static int imx_wd_probe(struct device_d *dev) priv->wd.timeout_max = priv->ops->timeout_max; priv->wd.hwdev = dev; priv->dev = dev; - priv->bigendian = of_device_is_big_endian(dev->device_node); + priv->bigendian = of_device_is_big_endian(dev->of_node); - priv->ext_reset = of_property_read_bool(dev->device_node, + priv->ext_reset = of_property_read_bool(dev->of_node, "fsl,ext-reset-output"); if (IS_ENABLED(CONFIG_WATCHDOG_IMX)) { diff --git a/drivers/watchdog/rave-sp-wdt.c b/drivers/watchdog/rave-sp-wdt.c index 26540395cb..f5531d9d37 100644 --- a/drivers/watchdog/rave-sp-wdt.c +++ b/drivers/watchdog/rave-sp-wdt.c @@ -286,7 +286,7 @@ static int rave_sp_wdt_get_boot_source(struct param_d *param, void *priv) static int rave_sp_wdt_add_params(struct rave_sp_wdt *sp_wd) { struct watchdog *wdd = &sp_wd->wdd; - struct device_node *np = wdd->hwdev->device_node; + struct device_node *np = wdd->hwdev->of_node; struct param_d *p; sp_wd->boot_source_cell = of_nvmem_cell_get(np, "boot-source"); diff --git a/drivers/watchdog/wd_core.c b/drivers/watchdog/wd_core.c index aa5dee8d20..a872580d78 100644 --- a/drivers/watchdog/wd_core.c +++ b/drivers/watchdog/wd_core.c @@ -144,7 +144,7 @@ static unsigned int dev_get_watchdog_priority(struct device_d *dev) unsigned int priority = WATCHDOG_DEFAULT_PRIORITY; if (dev) - of_property_read_u32(dev->device_node, "watchdog-priority", + of_property_read_u32(dev->of_node, "watchdog-priority", &priority); return priority; @@ -194,7 +194,7 @@ int watchdog_register(struct watchdog *wd) int ret = 0; if (wd->hwdev) - alias = of_alias_get(wd->hwdev->device_node); + alias = of_alias_get(wd->hwdev->of_node); if (alias) ret = watchdog_register_dev(wd, alias, DEVICE_ID_SINGLE); @@ -309,7 +309,7 @@ EXPORT_SYMBOL(watchdog_get_default); int watchdog_get_alias_id_from(struct watchdog *wd, struct device_node *root) { - struct device_node *dstnp, *srcnp = wd->hwdev ? wd->hwdev->device_node : NULL; + struct device_node *dstnp, *srcnp = wd->hwdev ? wd->hwdev->of_node : NULL; char *name; if (!srcnp) @@ -322,7 +322,7 @@ int watchdog_get_alias_id_from(struct watchdog *wd, struct device_node *root) if (!dstnp) return -ENODEV; - return of_alias_get_id_from(root, wd->hwdev->device_node, "watchdog"); + return of_alias_get_id_from(root, wd->hwdev->of_node, "watchdog"); } EXPORT_SYMBOL(watchdog_get_alias_id_from); |