Skip to content

Commit 98ad273

Browse files
Wenyou Yangehristev
authored andcommitted
media: atmel-isc: Remove unnecessary member
Remove the memeber *config from the isc_subdev_entity struct, the member is useless afterward. Signed-off-by: Wenyou Yang <wenyou.yang@microchip.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
1 parent 7e13613 commit 98ad273

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

drivers/media/platform/atmel/atmel-isc.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ struct isc_subdev_entity {
8383
struct v4l2_subdev *sd;
8484
struct v4l2_async_subdev *asd;
8585
struct v4l2_async_notifier notifier;
86-
struct v4l2_subdev_pad_config *config;
8786

8887
u32 pfe_cfg0;
8988

@@ -1000,6 +999,7 @@ static int isc_try_fmt(struct isc_device *isc, struct v4l2_format *f,
1000999
{
10011000
struct isc_format *isc_fmt;
10021001
struct v4l2_pix_format *pixfmt = &f->fmt.pix;
1002+
struct v4l2_subdev_pad_config pad_cfg;
10031003
struct v4l2_subdev_format format = {
10041004
.which = V4L2_SUBDEV_FORMAT_TRY,
10051005
};
@@ -1030,7 +1030,7 @@ static int isc_try_fmt(struct isc_device *isc, struct v4l2_format *f,
10301030

10311031
v4l2_fill_mbus_format(&format.format, pixfmt, mbus_code);
10321032
ret = v4l2_subdev_call(isc->current_subdev->sd, pad, set_fmt,
1033-
isc->current_subdev->config, &format);
1033+
&pad_cfg, &format);
10341034
if (ret < 0)
10351035
return ret;
10361036

@@ -1495,8 +1495,6 @@ static void isc_async_unbind(struct v4l2_async_notifier *notifier,
14951495
struct isc_device, v4l2_dev);
14961496
cancel_work_sync(&isc->awb_work);
14971497
video_unregister_device(&isc->video_dev);
1498-
if (isc->current_subdev->config)
1499-
v4l2_subdev_free_pad_config(isc->current_subdev->config);
15001498
v4l2_ctrl_handler_free(&isc->ctrls.handler);
15011499
}
15021500

@@ -1648,10 +1646,6 @@ static int isc_async_complete(struct v4l2_async_notifier *notifier)
16481646
INIT_LIST_HEAD(&isc->dma_queue);
16491647
spin_lock_init(&isc->dma_queue_lock);
16501648

1651-
sd_entity->config = v4l2_subdev_alloc_pad_config(sd_entity->sd);
1652-
if (!sd_entity->config)
1653-
return -ENOMEM;
1654-
16551649
ret = isc_formats_init(isc);
16561650
if (ret < 0) {
16571651
v4l2_err(&isc->v4l2_dev,

0 commit comments

Comments
 (0)