From: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name>
To: Michael Krufky <mkrufky@linuxtv.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Andy Walls <awalls@md.metrocast.net>,
linux-kernel <linux-kernel@vger.kernel.org>,
linux-media@vger.kernel.org, Hans Verkuil <hverkuil@xs4all.nl>
Subject: [PATCH v12 2/8] cx25840: g_std operation really implements querystd operation
Date: Mon, 29 Apr 2019 18:16:53 +0200 [thread overview]
Message-ID: <9490ba236364690f582815c125b3e5208a4778a2.1556554056.git.mail@maciej.szmigiero.name> (raw)
In-Reply-To: <cover.1556554056.git.mail@maciej.szmigiero.name>
cx25840 driver g_std operation queries the currently detected video signal,
however this is what querystd operation should do, so let's rename the
handler.
None of the existing cx25840 driver users ever called the g_std operation,
one of them calls querystd on each of its subdevs but then the result is
only used to implement VIDIOC_QUERYSTD (as it should).
Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
---
drivers/media/i2c/cx25840/cx25840-core.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/media/i2c/cx25840/cx25840-core.c b/drivers/media/i2c/cx25840/cx25840-core.c
index 0bf30222cf93..2bcaf239b0d2 100644
--- a/drivers/media/i2c/cx25840/cx25840-core.c
+++ b/drivers/media/i2c/cx25840/cx25840-core.c
@@ -1772,7 +1772,7 @@ static int cx25840_s_stream(struct v4l2_subdev *sd, int enable)
}
/* Query the current detected video format */
-static int cx25840_g_std(struct v4l2_subdev *sd, v4l2_std_id *std)
+static int cx25840_querystd(struct v4l2_subdev *sd, v4l2_std_id *std)
{
struct i2c_client *client = v4l2_get_subdevdata(sd);
@@ -1800,8 +1800,9 @@ static int cx25840_g_std(struct v4l2_subdev *sd, v4l2_std_id *std)
u32 fmt = (cx25840_read4(client, 0x40c) >> 8) & 0xf;
*std = stds[ fmt ];
- v4l_dbg(1, cx25840_debug, client, "g_std fmt = %x, v4l2_std_id = 0x%x\n",
- fmt, (unsigned int)stds[ fmt ]);
+ v4l_dbg(1, cx25840_debug, client,
+ "querystd fmt = %x, v4l2_std_id = 0x%x\n",
+ fmt, (unsigned int)stds[fmt]);
return 0;
}
@@ -5081,7 +5082,7 @@ static const struct v4l2_subdev_audio_ops cx25840_audio_ops = {
static const struct v4l2_subdev_video_ops cx25840_video_ops = {
.s_std = cx25840_s_std,
- .g_std = cx25840_g_std,
+ .querystd = cx25840_querystd,
.s_routing = cx25840_s_video_routing,
.s_stream = cx25840_s_stream,
.g_input_status = cx25840_g_input_status,
next prev parent reply other threads:[~2019-04-29 16:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-29 16:16 [PATCH v12 0/8] [media] Add analog mode support for Medion MD95700 Maciej S. Szmigiero
2019-04-29 16:16 ` [PATCH v12 1/8] cx25840: don't open-code cx25840_reset() inside cx25840_load_fw() Maciej S. Szmigiero
2019-04-29 16:16 ` Maciej S. Szmigiero [this message]
2019-04-29 16:16 ` [PATCH v12 3/8] cx25840: implement g_std operation Maciej S. Szmigiero
2019-04-29 16:16 ` [PATCH v12 4/8] cx25840: add pin to pad mapping and output format configuration Maciej S. Szmigiero
2019-04-29 16:16 ` [PATCH v12 5/8] cx25840: set_fmt operation should clamp out-of-range picture sizes Maciej S. Szmigiero
2019-04-29 16:16 ` [PATCH v12 6/8] [media] cxusb: implement Medion MD95700 digital / analog coexistence Maciej S. Szmigiero
2019-04-29 16:16 ` [PATCH v12 7/8] [media] cxusb: add analog mode support for Medion MD95700 Maciej S. Szmigiero
2019-04-29 16:16 ` [PATCH v12 8/8] [media] cxusb: add raw " Maciej S. Szmigiero
2020-06-03 14:33 ` [PATCH v12 0/8] [media] Add analog " Lukas Straub
2020-06-03 14:36 ` Maciej S. Szmigiero
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=9490ba236364690f582815c125b3e5208a4778a2.1556554056.git.mail@maciej.szmigiero.name \
--to=mail@maciej.szmigiero.name \
--cc=awalls@md.metrocast.net \
--cc=hverkuil@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=mkrufky@linuxtv.org \
/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;
as well as URLs for NNTP newsgroup(s).