diff options
Diffstat (limited to 'drivers/watchdog/rave-sp-wdt.c')
| -rw-r--r-- | drivers/watchdog/rave-sp-wdt.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/watchdog/rave-sp-wdt.c b/drivers/watchdog/rave-sp-wdt.c index dc673ee35f..b4fc18cb8b 100644 --- a/drivers/watchdog/rave-sp-wdt.c +++ b/drivers/watchdog/rave-sp-wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Driver for watchdog aspect of for Zodiac Inflight Innovations RAVE @@ -252,6 +252,7 @@ static const struct of_device_id rave_sp_wdt_of_match[] = { }, { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, rave_sp_wdt_of_match); static int rave_sp_wdt_set_boot_source(struct param_d *param, void *priv) { @@ -286,7 +287,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"); @@ -299,13 +300,10 @@ static int rave_sp_wdt_add_params(struct rave_sp_wdt *sp_wd) rave_sp_wdt_set_boot_source, rave_sp_wdt_get_boot_source, &sp_wd->boot_source, "%u", sp_wd); - if (IS_ERR(p)) - return PTR_ERR(p); - - return 0; + return PTR_ERR_OR_ZERO(p); } -static int rave_sp_wdt_probe(struct device_d *dev) +static int rave_sp_wdt_probe(struct device *dev) { struct rave_sp_wdt *sp_wd; const char *reset_reason; @@ -418,7 +416,7 @@ static int rave_sp_wdt_probe(struct device_d *dev) return 0; } -static struct driver_d rave_sp_wdt_driver = { +static struct driver rave_sp_wdt_driver = { .name = "rave-sp-wdt", .probe = rave_sp_wdt_probe, .of_compatible = DRV_OF_COMPAT(rave_sp_wdt_of_match), |