From: Laurent Pinchart Date: Mon, 6 Jul 2020 18:35:43 +0000 (+0200) Subject: media: ti-vpe: cal: Remove flags field from struct cal_dev X-Git-Tag: v5.10.7~1904^2~153 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0a19960a6c6cdeee9327c71d4f0d9dee199fb887;p=platform%2Fkernel%2Flinux-rpi.git media: ti-vpe: cal: Remove flags field from struct cal_dev The cal_dev flags field is a copy of data->flags. Use the latter and remove the former. Signed-off-by: Laurent Pinchart Reviewed-by: Tomi Valkeinen Reviewed-by: Benoit Parrot Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c index 89f6fd2..d04caa4 100644 --- a/drivers/media/platform/ti-vpe/cal.c +++ b/drivers/media/platform/ti-vpe/cal.c @@ -326,9 +326,6 @@ struct cal_dev { struct platform_device *pdev; struct v4l2_device v4l2_dev; - /* Controller flags for special cases */ - unsigned int flags; - const struct cal_data *data; /* Control Module handle */ @@ -2249,8 +2246,6 @@ static int cal_probe(struct platform_device *pdev) return -ENODEV; } - dev->flags = dev->data->flags; - /* set pseudo v4l2 device name so we can use v4l2_printk */ strscpy(dev->v4l2_dev.name, CAL_MODULE_NAME, sizeof(dev->v4l2_dev.name)); @@ -2402,7 +2397,7 @@ static int cal_runtime_resume(struct device *dev) { struct cal_dev *caldev = dev_get_drvdata(dev); - if (caldev->flags & DRA72_CAL_PRE_ES2_LDO_DISABLE) { + if (caldev->data->flags & DRA72_CAL_PRE_ES2_LDO_DISABLE) { /* * Apply errata on both port everytime we (re-)enable * the clock