From e6292247ad8abd27c5a9c4f80cdce849ea8bd50b Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Mon, 16 Feb 2015 13:40:07 -0800 Subject: gpu: remove devm_request_and_ioremap Signed-off-by: Dan Willemsen --- drivers/gpu/nvgpu/vgpu/vgpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/vgpu/vgpu.c') diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c index f9b97d97..25dcd8bb 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/vgpu.c @@ -169,10 +169,10 @@ static int vgpu_init_support(struct platform_device *dev) goto fail; } - g->bar1 = devm_request_and_ioremap(&dev->dev, r); - if (!g->bar1) { + g->bar1 = devm_ioremap_resource(&dev->dev, r); + if (IS_ERR(g->bar1)) { dev_err(dev_from_gk20a(g), "failed to remap gk20a bar1\n"); - err = -ENXIO; + err = PTR_ERR(g->bar1); goto fail; } -- cgit v1.2.2