diff options
| author | Olof Johansson | 2018-07-14 23:43:05 +0200 |
|---|---|---|
| committer | Olof Johansson | 2018-07-14 23:43:05 +0200 |
| commit | 472624550507d80828d6c620be734329ad49280e (patch) | |
| tree | d9fc893e165d591b566e0e4116fd534a86380f03 | |
| parent | Merge tag 'scmi-update-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | misc: vexpress/syscfg: Use devm_ioremap_resource() to map memory (diff) | |
| download | kernel-qcow2-linux-472624550507d80828d6c620be734329ad49280e.tar.gz kernel-qcow2-linux-472624550507d80828d6c620be734329ad49280e.tar.xz kernel-qcow2-linux-472624550507d80828d6c620be734329ad49280e.zip | |
Merge tag 'vexpress-update-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/drivers
ARMv7 Vexpress update/cleanup for v4.19
Just single cleanup patch to use devm_ioremap_resource in place of
devm_request_mem_region and devm_ioremap.
* tag 'vexpress-update-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
misc: vexpress/syscfg: Use devm_ioremap_resource() to map memory
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | drivers/misc/vexpress-syscfg.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/misc/vexpress-syscfg.c b/drivers/misc/vexpress-syscfg.c index 80a6f199077c..6c3591cdf855 100644 --- a/drivers/misc/vexpress-syscfg.c +++ b/drivers/misc/vexpress-syscfg.c @@ -258,13 +258,9 @@ static int vexpress_syscfg_probe(struct platform_device *pdev) INIT_LIST_HEAD(&syscfg->funcs); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!devm_request_mem_region(&pdev->dev, res->start, - resource_size(res), pdev->name)) - return -EBUSY; - - syscfg->base = devm_ioremap(&pdev->dev, res->start, resource_size(res)); - if (!syscfg->base) - return -EFAULT; + syscfg->base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(syscfg->base)) + return PTR_ERR(syscfg->base); /* Must use dev.parent (MFD), as that's where DT phandle points at... */ bridge = vexpress_config_bridge_register(pdev->dev.parent, |