All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
To: Linux Media Mailing List <linux-media@vger.kernel.org>
Cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>,
	Mauro Carvalho Chehab <mchehab@infradead.org>,
	Antti Palosaari <crope@iki.fi>
Subject: [PATCH v2 11/14] media: si2157: declare its own pads
Date: Sat, 15 Sep 2018 17:14:26 -0300	[thread overview]
Message-ID: <dbf8228f8e14b1c3009e788beac6dceaf9159b7e.1537042262.git.mchehab+samsung@kernel.org> (raw)
In-Reply-To: <cover.1537042262.git.mchehab+samsung@kernel.org>
In-Reply-To: <cover.1537042262.git.mchehab+samsung@kernel.org>

As we don't need anymore to share pad numbers with similar
drivers, use its own pad definition instead of a global
model.

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 drivers/media/tuners/si2157.c      | 15 ++++++++-------
 drivers/media/tuners/si2157_priv.h |  9 ++++++++-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c
index 0e39810922fc..d389f1fc237a 100644
--- a/drivers/media/tuners/si2157.c
+++ b/drivers/media/tuners/si2157.c
@@ -467,14 +467,15 @@ static int si2157_probe(struct i2c_client *client,
 
 		dev->ent.name = KBUILD_MODNAME;
 		dev->ent.function = MEDIA_ENT_F_TUNER;
-		dev->pad[TUNER_PAD_RF_INPUT].flags = MEDIA_PAD_FL_SINK;
-		dev->pad[TUNER_PAD_RF_INPUT].sig_type = PAD_SIGNAL_ANALOG;
-		dev->pad[TUNER_PAD_OUTPUT].flags = MEDIA_PAD_FL_SOURCE;
-		dev->pad[TUNER_PAD_OUTPUT].sig_type = PAD_SIGNAL_ANALOG;
-		dev->pad[TUNER_PAD_AUD_OUT].flags = MEDIA_PAD_FL_SOURCE;
-		dev->pad[TUNER_PAD_AUD_OUT].sig_type = PAD_SIGNAL_AUDIO;
 
-		ret = media_entity_pads_init(&dev->ent, TUNER_NUM_PADS,
+		dev->pad[SI2157_PAD_RF_INPUT].flags = MEDIA_PAD_FL_SINK;
+		dev->pad[SI2157_PAD_RF_INPUT].sig_type = PAD_SIGNAL_ANALOG;
+		dev->pad[SI2157_PAD_VID_OUT].flags = MEDIA_PAD_FL_SOURCE;
+		dev->pad[SI2157_PAD_VID_OUT].sig_type = PAD_SIGNAL_ANALOG;
+		dev->pad[SI2157_PAD_AUD_OUT].flags = MEDIA_PAD_FL_SOURCE;
+		dev->pad[SI2157_PAD_AUD_OUT].sig_type = PAD_SIGNAL_AUDIO;
+
+		ret = media_entity_pads_init(&dev->ent, SI2157_NUM_PADS,
 					     &dev->pad[0]);
 
 		if (ret)
diff --git a/drivers/media/tuners/si2157_priv.h b/drivers/media/tuners/si2157_priv.h
index e6436f74abaa..129a35e4e11b 100644
--- a/drivers/media/tuners/si2157_priv.h
+++ b/drivers/media/tuners/si2157_priv.h
@@ -21,6 +21,13 @@
 #include <media/v4l2-mc.h>
 #include "si2157.h"
 
+enum si2157_pads {
+       SI2157_PAD_RF_INPUT,
+       SI2157_PAD_VID_OUT,
+       SI2157_PAD_AUD_OUT,
+       SI2157_NUM_PADS
+};
+
 /* state struct */
 struct si2157_dev {
 	struct mutex i2c_mutex;
@@ -35,7 +42,7 @@ struct si2157_dev {
 #if defined(CONFIG_MEDIA_CONTROLLER)
 	struct media_device	*mdev;
 	struct media_entity	ent;
-	struct media_pad	pad[TUNER_NUM_PADS];
+	struct media_pad	pad[SI2157_NUM_PADS];
 #endif
 
 };
-- 
2.17.1

  parent reply	other threads:[~2018-09-16  1:34 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-15 20:14 [PATCH v2 00/14] Better handle pads for tuning/decoder part of the devices Mauro Carvalho Chehab
2018-09-15 20:14 ` [PATCH v2 01/14] media: v4l2: remove VBI output pad Mauro Carvalho Chehab
2018-09-15 20:14 ` [PATCH v2 02/14] media: v4l2: taint pads with the signal types for consumer devices Mauro Carvalho Chehab
2018-09-17 10:19   ` kbuild test robot
2018-09-15 20:14 ` [PATCH v2 03/14] v4l2-mc: switch it to use the new approach to setup pipelines Mauro Carvalho Chehab
2018-09-15 20:14 ` [PATCH v2 04/14] media: v4l2-mc: add print messages when media graph fails Mauro Carvalho Chehab
2018-09-15 20:14 ` [PATCH v2 05/14] media: dvb: use signals to discover pads Mauro Carvalho Chehab
2018-09-15 20:14 ` [PATCH v2 06/14] media: au0828: use signals instead of hardcoding a pad number Mauro Carvalho Chehab
2018-09-15 20:14 ` [PATCH v2 07/14] media: au8522: declare its own pads Mauro Carvalho Chehab
2018-09-15 20:14 ` [PATCH v2 08/14] media: msp3400: " Mauro Carvalho Chehab
2018-09-15 20:14 ` [PATCH v2 09/14] media: saa7115: " Mauro Carvalho Chehab
2018-09-15 20:14 ` [PATCH v2 10/14] media: tvp5150: " Mauro Carvalho Chehab
2018-09-15 20:14 ` Mauro Carvalho Chehab [this message]
2018-09-15 20:14 ` [PATCH v2 12/14] media: saa7134: " Mauro Carvalho Chehab
2018-09-15 20:14 ` [PATCH v2 13/14] media: mxl111sf: " Mauro Carvalho Chehab
2018-09-15 20:14 ` [PATCH v2 14/14] media: v4l2-mc: get rid of global pad indexes Mauro Carvalho Chehab
2018-09-15 20:34 ` [PATCH v2 00/14] Better handle pads for tuning/decoder part of the devices Mauro Carvalho Chehab

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=dbf8228f8e14b1c3009e788beac6dceaf9159b7e.1537042262.git.mchehab+samsung@kernel.org \
    --to=mchehab+samsung@kernel.org \
    --cc=crope@iki.fi \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.