media: pxa_camera: Use devm_platform_get_and_ioremap_resource()
Convert platform_get_resource(), devm_ioremap_resource() to a single call to devm_platform_get_and_ioremap_resource(), as this is exactly what this function does. Signed-off-by: Yangtao Li <frank.li@vivo.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
parent
74db874ef5
commit
f3e76caadf
|
@ -2274,9 +2274,15 @@ static int pxa_camera_probe(struct platform_device *pdev)
|
||||||
int irq;
|
int irq;
|
||||||
int err = 0, i;
|
int err = 0, i;
|
||||||
|
|
||||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
/*
|
||||||
|
* Request the regions.
|
||||||
|
*/
|
||||||
|
base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
|
||||||
|
if (IS_ERR(base))
|
||||||
|
return PTR_ERR(base);
|
||||||
|
|
||||||
irq = platform_get_irq(pdev, 0);
|
irq = platform_get_irq(pdev, 0);
|
||||||
if (!res || irq < 0)
|
if (irq < 0)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
pcdev = devm_kzalloc(&pdev->dev, sizeof(*pcdev), GFP_KERNEL);
|
pcdev = devm_kzalloc(&pdev->dev, sizeof(*pcdev), GFP_KERNEL);
|
||||||
|
@ -2338,13 +2344,6 @@ static int pxa_camera_probe(struct platform_device *pdev)
|
||||||
spin_lock_init(&pcdev->lock);
|
spin_lock_init(&pcdev->lock);
|
||||||
mutex_init(&pcdev->mlock);
|
mutex_init(&pcdev->mlock);
|
||||||
|
|
||||||
/*
|
|
||||||
* Request the regions.
|
|
||||||
*/
|
|
||||||
base = devm_ioremap_resource(&pdev->dev, res);
|
|
||||||
if (IS_ERR(base))
|
|
||||||
return PTR_ERR(base);
|
|
||||||
|
|
||||||
pcdev->irq = irq;
|
pcdev->irq = irq;
|
||||||
pcdev->base = base;
|
pcdev->base = base;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue