diff options
author | Thierry Reding | 2013-01-21 11:09:07 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2013-01-25 21:21:46 +0100 |
commit | d65e8e4a1cae5f92f21d4efd6999d6fcbc9ddc0e (patch) | |
tree | 2a2c8d62eee598ebba5e3d490fca1ee4ea4ca6bc /drivers/media/platform/soc_camera | |
parent | iommu: Convert to devm_ioremap_resource() (diff) | |
download | kernel-qcow2-linux-d65e8e4a1cae5f92f21d4efd6999d6fcbc9ddc0e.tar.gz kernel-qcow2-linux-d65e8e4a1cae5f92f21d4efd6999d6fcbc9ddc0e.tar.xz kernel-qcow2-linux-d65e8e4a1cae5f92f21d4efd6999d6fcbc9ddc0e.zip |
media: Convert to devm_ioremap_resource()
Convert all uses of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() which provides more consistent error handling.
devm_ioremap_resource() provides its own error messages so all explicit
error messages can be removed from the failure code paths.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media/platform/soc_camera')
-rw-r--r-- | drivers/media/platform/soc_camera/mx2_camera.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c index 8bda2c908aba..1abdc7d9c744 100644 --- a/drivers/media/platform/soc_camera/mx2_camera.c +++ b/drivers/media/platform/soc_camera/mx2_camera.c @@ -1707,9 +1707,9 @@ static int mx27_camera_emma_init(struct platform_device *pdev) goto out; } - pcdev->base_emma = devm_request_and_ioremap(pcdev->dev, res_emma); - if (!pcdev->base_emma) { - err = -EADDRNOTAVAIL; + pcdev->base_emma = devm_ioremap_resource(pcdev->dev, res_emma); + if (IS_ERR(pcdev->base_emma)) { + err = PTR_ERR(pcdev->base_emma); goto out; } @@ -1824,9 +1824,9 @@ static int mx2_camera_probe(struct platform_device *pdev) INIT_LIST_HEAD(&pcdev->discard); spin_lock_init(&pcdev->lock); - pcdev->base_csi = devm_request_and_ioremap(&pdev->dev, res_csi); - if (!pcdev->base_csi) { - err = -EADDRNOTAVAIL; + pcdev->base_csi = devm_ioremap_resource(&pdev->dev, res_csi); + if (IS_ERR(pcdev->base_csi)) { + err = PTR_ERR(pcdev->base_csi); goto exit; } |