diff options
Diffstat (limited to 'drivers/power/reset/nvmem-reboot-mode.c')
-rw-r--r-- | drivers/power/reset/nvmem-reboot-mode.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/power/reset/nvmem-reboot-mode.c b/drivers/power/reset/nvmem-reboot-mode.c index 2086e96400..1a9422800e 100644 --- a/drivers/power/reset/nvmem-reboot-mode.c +++ b/drivers/power/reset/nvmem-reboot-mode.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) Vaisala Oyj. All rights reserved. */ @@ -34,7 +34,7 @@ static int nvmem_reboot_mode_write(struct reboot_mode_driver *reboot, return ret; } -static int nvmem_reboot_mode_probe(struct device_d *dev) +static int nvmem_reboot_mode_probe(struct device *dev) { struct nvmem_reboot_mode *nvmem_rbm; struct nvmem_cell *cell; @@ -43,12 +43,8 @@ static int nvmem_reboot_mode_probe(struct device_d *dev) int ret; cell = nvmem_cell_get(dev, "reboot-mode"); - if (IS_ERR(cell)) { - ret = PTR_ERR(cell); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to get the nvmem cell reboot-mode: %pe\n", cell); - return ret; - } + if (IS_ERR(cell)) + return dev_errp_probe(dev, cell, "getting nvmem cell 'reboot-mode'\n"); nvmem_rbm = xzalloc(sizeof(*nvmem_rbm)); @@ -82,8 +78,9 @@ static const struct of_device_id nvmem_reboot_mode_of_match[] = { { .compatible = "nvmem-reboot-mode" }, { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, nvmem_reboot_mode_of_match); -static struct driver_d nvmem_reboot_mode_driver = { +static struct driver nvmem_reboot_mode_driver = { .probe = nvmem_reboot_mode_probe, .name = "nvmem-reboot-mode", .of_compatible = nvmem_reboot_mode_of_match, |