openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] sh-vou: use resource managed calls 

Simplify the sh-vou clean up by using devm_* were possible.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Magnus Damm <damm@opensource.se>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Hans Verkuil 2015-06-07 05:57:56 -03:00 committed by Mauro Carvalho Chehab
parent 41bdc3cf81
commit 4690271ce1
1 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/media/platform/sh_vou.c
View File

@ -1300,7 +1300,7 @@ static int sh_vou_probe(struct platform_device *pdev)
struct i2c_adapter *i2c_adap; struct i2c_adapter *i2c_adap;
struct video_device *vdev; struct video_device *vdev;
struct sh_vou_device *vou_dev; struct sh_vou_device *vou_dev;
struct resource *reg_res, *region; struct resource *reg_res;
struct v4l2_subdev *subdev; struct v4l2_subdev *subdev;
int irq, ret; int irq, ret;
@ -1312,7 +1312,7 @@ static int sh_vou_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
vou_dev = kzalloc(sizeof(*vou_dev), GFP_KERNEL); vou_dev = devm_kzalloc(&pdev->dev, sizeof(*vou_dev), GFP_KERNEL);
if (!vou_dev) if (!vou_dev)
return -ENOMEM; return -ENOMEM;
@ -1340,28 +1340,18 @@ static int sh_vou_probe(struct platform_device *pdev)
pix->sizeimage = VOU_MAX_IMAGE_WIDTH * 2 * 480; pix->sizeimage = VOU_MAX_IMAGE_WIDTH * 2 * 480;
pix->colorspace = V4L2_COLORSPACE_SMPTE170M; pix->colorspace = V4L2_COLORSPACE_SMPTE170M;
region = request_mem_region(reg_res->start, resource_size(reg_res), vou_dev->base = devm_ioremap_resource(&pdev->dev, reg_res);
pdev->name); if (IS_ERR(vou_dev->base))
if (!region) { return PTR_ERR(vou_dev->base);
dev_err(&pdev->dev, "VOU region already claimed\n");
ret = -EBUSY;
goto ereqmemreg;
}
vou_dev->base = ioremap(reg_res->start, resource_size(reg_res)); ret = devm_request_irq(&pdev->dev, irq, sh_vou_isr, 0, "vou", vou_dev);
if (!vou_dev->base) {
ret = -ENOMEM;
goto emap;
}
ret = request_irq(irq, sh_vou_isr, 0, "vou", vou_dev);
if (ret < 0) if (ret < 0)
goto ereqirq; return ret;
ret = v4l2_device_register(&pdev->dev, &vou_dev->v4l2_dev); ret = v4l2_device_register(&pdev->dev, &vou_dev->v4l2_dev);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "Error registering v4l2 device\n"); dev_err(&pdev->dev, "Error registering v4l2 device\n");
goto ev4l2devreg; return ret;
} }
vdev = &vou_dev->vdev; vdev = &vou_dev->vdev;
@ -1407,39 +1397,22 @@ static int sh_vou_probe(struct platform_device *pdev)
ei2cgadap: ei2cgadap:
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
v4l2_device_unregister(&vou_dev->v4l2_dev); v4l2_device_unregister(&vou_dev->v4l2_dev);
ev4l2devreg:
free_irq(irq, vou_dev);
ereqirq:
iounmap(vou_dev->base);
emap:
release_mem_region(reg_res->start, resource_size(reg_res));
ereqmemreg:
kfree(vou_dev);
return ret; return ret;
} }
static int sh_vou_remove(struct platform_device *pdev) static int sh_vou_remove(struct platform_device *pdev)
{ {
int irq = platform_get_irq(pdev, 0);
struct v4l2_device *v4l2_dev = platform_get_drvdata(pdev); struct v4l2_device *v4l2_dev = platform_get_drvdata(pdev);
struct sh_vou_device *vou_dev = container_of(v4l2_dev, struct sh_vou_device *vou_dev = container_of(v4l2_dev,
struct sh_vou_device, v4l2_dev); struct sh_vou_device, v4l2_dev);
struct v4l2_subdev *sd = list_entry(v4l2_dev->subdevs.next, struct v4l2_subdev *sd = list_entry(v4l2_dev->subdevs.next,
struct v4l2_subdev, list); struct v4l2_subdev, list);
struct i2c_client *client = v4l2_get_subdevdata(sd); struct i2c_client *client = v4l2_get_subdevdata(sd);
struct resource *reg_res;
if (irq > 0)
free_irq(irq, vou_dev);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
video_unregister_device(&vou_dev->vdev); video_unregister_device(&vou_dev->vdev);
i2c_put_adapter(client->adapter); i2c_put_adapter(client->adapter);
v4l2_device_unregister(&vou_dev->v4l2_dev); v4l2_device_unregister(&vou_dev->v4l2_dev);
iounmap(vou_dev->base);
reg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (reg_res)
release_mem_region(reg_res->start, resource_size(reg_res));
kfree(vou_dev);
return 0; return 0;
} }