From: Wenyou Yang <wenyou.yang@microchip.com>
To: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Cc: <linux-kernel@vger.kernel.org>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
Sakari Ailus <sakari.ailus@iki.fi>,
"Jonathan Corbet" <corbet@lwn.net>,
Hans Verkuil <hverkuil@xs4all.nl>,
<linux-arm-kernel@lists.infradead.org>,
Linux Media Mailing List <linux-media@vger.kernel.org>,
Wenyou Yang <wenyou.yang@microchip.com>
Subject: [PATCH v3 4/5] media: atmel-isc: Remove unnecessary member
Date: Thu, 28 Sep 2017 16:18:27 +0800 [thread overview]
Message-ID: <20170928081828.20335-5-wenyou.yang@microchip.com> (raw)
In-Reply-To: <20170928081828.20335-1-wenyou.yang@microchip.com>
Remove the memeber *config from the isc_subdev_entity struct,
the member is useless afterward.
Signed-off-by: Wenyou Yang <wenyou.yang@microchip.com>
---
Changes in v3: None
Changes in v2: None
drivers/media/platform/atmel/atmel-isc.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/media/platform/atmel/atmel-isc.c b/drivers/media/platform/atmel/atmel-isc.c
index f092c95587c1..0ff9dfbfff70 100644
--- a/drivers/media/platform/atmel/atmel-isc.c
+++ b/drivers/media/platform/atmel/atmel-isc.c
@@ -83,7 +83,6 @@ struct isc_subdev_entity {
struct v4l2_subdev *sd;
struct v4l2_async_subdev *asd;
struct v4l2_async_notifier notifier;
- struct v4l2_subdev_pad_config *config;
u32 pfe_cfg0;
@@ -984,6 +983,7 @@ static int isc_try_fmt(struct isc_device *isc, struct v4l2_format *f,
{
struct isc_format *isc_fmt;
struct v4l2_pix_format *pixfmt = &f->fmt.pix;
+ struct v4l2_subdev_pad_config pad_cfg;
struct v4l2_subdev_format format = {
.which = V4L2_SUBDEV_FORMAT_TRY,
};
@@ -1014,7 +1014,7 @@ static int isc_try_fmt(struct isc_device *isc, struct v4l2_format *f,
v4l2_fill_mbus_format(&format.format, pixfmt, mbus_code);
ret = v4l2_subdev_call(isc->current_subdev->sd, pad, set_fmt,
- isc->current_subdev->config, &format);
+ &pad_cfg, &format);
if (ret < 0)
return ret;
@@ -1479,8 +1479,6 @@ static void isc_async_unbind(struct v4l2_async_notifier *notifier,
struct isc_device, v4l2_dev);
cancel_work_sync(&isc->awb_work);
video_unregister_device(&isc->video_dev);
- if (isc->current_subdev->config)
- v4l2_subdev_free_pad_config(isc->current_subdev->config);
v4l2_ctrl_handler_free(&isc->ctrls.handler);
}
@@ -1633,10 +1631,6 @@ static int isc_async_complete(struct v4l2_async_notifier *notifier)
INIT_LIST_HEAD(&isc->dma_queue);
spin_lock_init(&isc->dma_queue_lock);
- sd_entity->config = v4l2_subdev_alloc_pad_config(sd_entity->sd);
- if (!sd_entity->config)
- return -ENOMEM;
-
ret = isc_formats_init(isc);
if (ret < 0) {
v4l2_err(&isc->v4l2_dev,
--
2.13.0
next prev parent reply other threads:[~2017-09-28 8:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-28 8:18 [PATCH v3 0/5] media: atmel-isc: Rework the format list and clock provider Wenyou Yang
2017-09-28 8:18 ` [PATCH v3 1/5] media: atmel-isc: Add spin lock for clock enable ops Wenyou Yang
2017-09-28 8:18 ` [PATCH v3 2/5] media: atmel-isc: Add prepare and unprepare ops Wenyou Yang
2017-09-28 8:18 ` [PATCH v3 3/5] media: atmel-isc: Enable the clocks during probe Wenyou Yang
2017-09-28 21:25 ` Sakari Ailus
2017-10-09 5:49 ` Yang, Wenyou
2017-10-09 7:58 ` Sakari Ailus
2017-10-09 10:01 ` Yang, Wenyou
2017-09-28 8:18 ` Wenyou Yang [this message]
2017-09-28 8:18 ` [PATCH v3 5/5] media: atmel-isc: Rework the format list Wenyou Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170928081828.20335-5-wenyou.yang@microchip.com \
--to=wenyou.yang@microchip.com \
--cc=corbet@lwn.net \
--cc=hverkuil@xs4all.nl \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@s-opensource.com \
--cc=nicolas.ferre@microchip.com \
--cc=sakari.ailus@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome