mirror of
https://github.com/torvalds/linux
synced 2024-09-21 11:38:48 +00:00
[media] soc_camera/pxa_camera: Convert to devm_ioremap_resource()
Use the newly introduced devm_ioremap_resource() instead of devm_request_and_ioremap() which provides more consistent error handling. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
2e2d612d80
commit
8efdb13543
|
@ -15,6 +15,7 @@
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <linux/dma-mapping.h>
|
#include <linux/dma-mapping.h>
|
||||||
|
#include <linux/err.h>
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
#include <linux/fs.h>
|
#include <linux/fs.h>
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
|
@ -1710,9 +1711,10 @@ static int pxa_camera_probe(struct platform_device *pdev)
|
||||||
/*
|
/*
|
||||||
* Request the regions.
|
* Request the regions.
|
||||||
*/
|
*/
|
||||||
base = devm_request_and_ioremap(&pdev->dev, res);
|
base = devm_ioremap_resource(&pdev->dev, res);
|
||||||
if (!base)
|
if (IS_ERR(base))
|
||||||
return -ENOMEM;
|
return PTR_ERR(base);
|
||||||
|
|
||||||
pcdev->irq = irq;
|
pcdev->irq = irq;
|
||||||
pcdev->base = base;
|
pcdev->base = base;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue