summaryrefslogtreecommitdiffstats
path: root/drivers/bus/brcmstb_gisb.c
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2014-06-11 07:00:05 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-20 05:01:36 +0200
commitc9d53c0f2d23c792e4b9cf1551b63de4516f839e (patch)
tree0d3c822d06e99c37998aaa89a86696ba800871fb /drivers/bus/brcmstb_gisb.c
parentLinux 3.16-rc1 (diff)
downloadlinux-c9d53c0f2d23c792e4b9cf1551b63de4516f839e.tar.xz
linux-c9d53c0f2d23c792e4b9cf1551b63de4516f839e.zip
devres: remove devm_request_and_ioremap()
devm_request_and_ioremap() was obsoleted by the commit 7509657 ("lib: devres: Introduce devm_ioremap_resource()") and has been deprecated for a long time. So, let's remove this function. In addition, all usages of devm_request_and_ioremap() are also removed. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/bus/brcmstb_gisb.c')
-rw-r--r--drivers/bus/brcmstb_gisb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/bus/brcmstb_gisb.c b/drivers/bus/brcmstb_gisb.c
index 6159b7752a64..f2cd6a2d40b4 100644
--- a/drivers/bus/brcmstb_gisb.c
+++ b/drivers/bus/brcmstb_gisb.c
@@ -212,9 +212,9 @@ static int brcmstb_gisb_arb_probe(struct platform_device *pdev)
mutex_init(&gdev->lock);
INIT_LIST_HEAD(&gdev->next);
- gdev->base = devm_request_and_ioremap(&pdev->dev, r);
- if (!gdev->base)
- return -ENOMEM;
+ gdev->base = devm_ioremap_resource(&pdev->dev, r);
+ if (IS_ERR(gdev->base))
+ return PTR_ERR(gdev->base);
err = devm_request_irq(&pdev->dev, timeout_irq,
brcmstb_gisb_timeout_handler, 0, pdev->name,