diff options
author | Jingoo Han <jg1.han@samsung.com> | 2014-06-11 01:00:05 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-19 23:01:36 -0400 |
commit | c9d53c0f2d23c792e4b9cf1551b63de4516f839e (patch) | |
tree | 0d3c822d06e99c37998aaa89a86696ba800871fb /drivers/gpu/drm/armada | |
parent | 7171511eaec5bf23fb06078f59784a3a0626b38f (diff) |
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/gpu/drm/armada')
-rw-r--r-- | drivers/gpu/drm/armada/armada_crtc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c index 81c34f949dfc..3aedf9e993e6 100644 --- a/drivers/gpu/drm/armada/armada_crtc.c +++ b/drivers/gpu/drm/armada/armada_crtc.c | |||
@@ -1039,11 +1039,9 @@ int armada_drm_crtc_create(struct drm_device *dev, unsigned num, | |||
1039 | if (ret) | 1039 | if (ret) |
1040 | return ret; | 1040 | return ret; |
1041 | 1041 | ||
1042 | base = devm_request_and_ioremap(dev->dev, res); | 1042 | base = devm_ioremap_resource(dev->dev, res); |
1043 | if (!base) { | 1043 | if (IS_ERR(base)) |
1044 | DRM_ERROR("failed to ioremap register\n"); | 1044 | return PTR_ERR(base); |
1045 | return -ENOMEM; | ||
1046 | } | ||
1047 | 1045 | ||
1048 | dcrtc = kzalloc(sizeof(*dcrtc), GFP_KERNEL); | 1046 | dcrtc = kzalloc(sizeof(*dcrtc), GFP_KERNEL); |
1049 | if (!dcrtc) { | 1047 | if (!dcrtc) { |