diff options
author | Dan Willemsen <dwillemsen@nvidia.com> | 2015-02-16 16:40:07 -0500 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:12:37 -0400 |
commit | e6292247ad8abd27c5a9c4f80cdce849ea8bd50b (patch) | |
tree | 1adffab6dd6aaa4668af22db2a5d1351538048a4 /drivers/gpu/nvgpu/vgpu | |
parent | d4b3b74044d9eff0ce5b34aa98b818cfbf6bfb78 (diff) |
gpu: remove devm_request_and_ioremap
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/vgpu.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) | |||
169 | goto fail; | 169 | goto fail; |
170 | } | 170 | } |
171 | 171 | ||
172 | g->bar1 = devm_request_and_ioremap(&dev->dev, r); | 172 | g->bar1 = devm_ioremap_resource(&dev->dev, r); |
173 | if (!g->bar1) { | 173 | if (IS_ERR(g->bar1)) { |
174 | dev_err(dev_from_gk20a(g), "failed to remap gk20a bar1\n"); | 174 | dev_err(dev_from_gk20a(g), "failed to remap gk20a bar1\n"); |
175 | err = -ENXIO; | 175 | err = PTR_ERR(g->bar1); |
176 | goto fail; | 176 | goto fail; |
177 | } | 177 | } |
178 | 178 | ||