diff options
Diffstat (limited to 'drivers/nvmem/rmem.c')
| -rw-r--r-- | drivers/nvmem/rmem.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/nvmem/rmem.c b/drivers/nvmem/rmem.c index e103cec448..afa0dd78c8 100644 --- a/drivers/nvmem/rmem.c +++ b/drivers/nvmem/rmem.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Nicolas Saenz Julienne <nsaenzjulienne@suse.de> */ @@ -9,7 +9,7 @@ #include <init.h> struct rmem { - struct device_d *dev; + struct device *dev; const struct resource *mem; }; @@ -21,17 +21,13 @@ static int rmem_read(void *context, unsigned int offset, bytes, offset, 0); } -static struct nvmem_bus rmem_nvmem_bus = { - .read = rmem_read, -}; - -static int rmem_probe(struct device_d *dev) +static int rmem_probe(struct device *dev) { struct nvmem_config config = { }; struct resource *mem; struct rmem *priv; - mem = dev_request_mem_resource(dev, 0); + mem = dev_get_resource(dev, IORESOURCE_MEM, 0); if (IS_ERR(mem)) return PTR_ERR(mem); @@ -45,7 +41,7 @@ static int rmem_probe(struct device_d *dev) config.priv = priv; config.name = "rmem"; config.size = resource_size(mem); - config.bus = &rmem_nvmem_bus; + config.reg_read = rmem_read; return PTR_ERR_OR_ZERO(nvmem_register(&config)); } @@ -54,8 +50,9 @@ static const struct of_device_id rmem_match[] = { { .compatible = "nvmem-rmem", }, { /* sentinel */ }, }; +MODULE_DEVICE_TABLE(of, rmem_match); -static struct driver_d rmem_driver = { +static struct driver rmem_driver = { .name = "rmem", .of_compatible = rmem_match, .probe = rmem_probe, |