diff options
| author | Yangtao Li <frank.li@vivo.com> | 2023-07-06 18:10:50 +0800 |
|---|---|---|
| committer | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2023-07-19 12:57:48 +0200 |
| commit | f3e76caadf62f2db32c63bbdb3531a816c205d6d (patch) | |
| tree | 2ffe04479e092d395212a9efa2541c3bb8b2c564 | |
| parent | 74db874ef577de97dc335d9ba85139ffacde8014 (diff) | |
| download | linux-stable-f3e76caadf62f2db32c63bbdb3531a816c205d6d.tar.gz linux-stable-f3e76caadf62f2db32c63bbdb3531a816c205d6d.tar.bz2 linux-stable-f3e76caadf62f2db32c63bbdb3531a816c205d6d.zip | |
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>
| -rw-r--r-- | drivers/media/platform/intel/pxa_camera.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/media/platform/intel/pxa_camera.c b/drivers/media/platform/intel/pxa_camera.c index 8c2bb1eb5360..f229c5f02b3c 100644 --- a/drivers/media/platform/intel/pxa_camera.c +++ b/drivers/media/platform/intel/pxa_camera.c @@ -2274,9 +2274,15 @@ static int pxa_camera_probe(struct platform_device *pdev) int irq; 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); - if (!res || irq < 0) + if (irq < 0) return -ENODEV; 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); 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->base = base; |