[1/2,media] au0828: use standard demod pads struct
diff mbox

Message ID b8604bfcb3878cd1b1f1d0f0ad6ddc6374703946.1456928097.git.mchehab@osg.samsung.com
State New
Headers show

Commit Message

Mauro Carvalho Chehab March 2, 2016, 2:16 p.m. UTC
As we want au0828 to use the core function to create the MC
graphs, use enum demod_pad_index instead of
enum au8522_media_pads.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
---
 drivers/media/dvb-frontends/au8522.h         | 9 ---------
 drivers/media/dvb-frontends/au8522_decoder.c | 8 ++++----
 drivers/media/dvb-frontends/au8522_priv.h    | 3 ++-
 drivers/media/usb/au0828/au0828-core.c       | 2 +-
 drivers/media/usb/au0828/au0828-video.c      | 8 ++++----
 include/media/v4l2-mc.h                      | 1 +
 6 files changed, 12 insertions(+), 19 deletions(-)

Comments

kbuild test robot March 2, 2016, 3:34 p.m. UTC | #1
Hi Mauro,

[auto build test WARNING on sailus-media/master]
[cannot apply to v4.5-rc6 next-20160302]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url:    https://github.com/0day-ci/linux/commits/Mauro-Carvalho-Chehab/Don-t-duplicate-a-function-to-create-graph-on-au0828/20160302-221912
base:   git://linuxtv.org/media_tree.git master
reproduce: make htmldocs

All warnings (new ones prefixed by >>):

   include/linux/init.h:1: warning: no structured comments found
   kernel/sys.c:1: warning: no structured comments found
   drivers/dma-buf/seqno-fence.c:1: warning: no structured comments found
   drivers/dma-buf/reservation.c:1: warning: no structured comments found
   include/linux/reservation.h:1: warning: no structured comments found
>> include/media/v4l2-mc.h:98: warning: Enum value 'DEMOD_PAD_AUDIO_OUT' not described in enum 'demod_pad_index'
   include/media/v4l2-mc.h:137: warning: No description found for parameter 'vdev'
   include/media/v4l2-mc.h:151: warning: No description found for parameter 'vdev'
   include/linux/spi/spi.h:540: warning: No description found for parameter 'max_transfer_size'

vim +98 include/media/v4l2-mc.h

953a457e Mauro Carvalho Chehab 2016-01-29   82  };
e4001e95 Mauro Carvalho Chehab 2016-01-29   83  
e4001e95 Mauro Carvalho Chehab 2016-01-29   84  /**
e4001e95 Mauro Carvalho Chehab 2016-01-29   85   * enum demod_pad_index - analog TV pad index for MEDIA_ENT_F_ATV_DECODER
e4001e95 Mauro Carvalho Chehab 2016-01-29   86   *
e4001e95 Mauro Carvalho Chehab 2016-01-29   87   * @DEMOD_PAD_IF_INPUT:	IF input sink pad.
e4001e95 Mauro Carvalho Chehab 2016-01-29   88   * @DEMOD_PAD_VID_OUT:	Video output source pad.
e4001e95 Mauro Carvalho Chehab 2016-01-29   89   * @DEMOD_PAD_VBI_OUT:	Vertical Blank Interface (VBI) output source pad.
e4001e95 Mauro Carvalho Chehab 2016-01-29   90   * @DEMOD_NUM_PADS:	Maximum number of output pads.
e4001e95 Mauro Carvalho Chehab 2016-01-29   91   */
e4001e95 Mauro Carvalho Chehab 2016-01-29   92  enum demod_pad_index {
e4001e95 Mauro Carvalho Chehab 2016-01-29   93  	DEMOD_PAD_IF_INPUT,
e4001e95 Mauro Carvalho Chehab 2016-01-29   94  	DEMOD_PAD_VID_OUT,
e4001e95 Mauro Carvalho Chehab 2016-01-29   95  	DEMOD_PAD_VBI_OUT,
0f925abc Mauro Carvalho Chehab 2016-03-02   96  	DEMOD_PAD_AUDIO_OUT,
e4001e95 Mauro Carvalho Chehab 2016-01-29   97  	DEMOD_NUM_PADS
e4001e95 Mauro Carvalho Chehab 2016-01-29  @98  };
54d0dbac Mauro Carvalho Chehab 2016-02-05   99  
eee7d353 Mauro Carvalho Chehab 2016-02-11  100  /* We don't need to include pci.h or usb.h here */
eee7d353 Mauro Carvalho Chehab 2016-02-11  101  struct pci_dev;
eee7d353 Mauro Carvalho Chehab 2016-02-11  102  struct usb_device;
7047f298 Mauro Carvalho Chehab 2016-02-05  103  
7047f298 Mauro Carvalho Chehab 2016-02-05  104  #ifdef CONFIG_MEDIA_CONTROLLER
54d0dbac Mauro Carvalho Chehab 2016-02-05  105  /**
54d0dbac Mauro Carvalho Chehab 2016-02-05  106   * v4l2_mc_create_media_graph() - create Media Controller links at the graph.

:::::: The code at line 98 was first introduced by commit
:::::: e4001e955bec5566848624635cfb2d353ebac507 [media] v4l2-mc: add analog TV demodulator pad index macros

:::::: TO: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
:::::: CC: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

Patch
diff mbox

diff --git a/drivers/media/dvb-frontends/au8522.h b/drivers/media/dvb-frontends/au8522.h
index d7a997fada7f..78bf3f73e58d 100644
--- a/drivers/media/dvb-frontends/au8522.h
+++ b/drivers/media/dvb-frontends/au8522.h
@@ -89,13 +89,4 @@  enum au8522_audio_input {
 	AU8522_AUDIO_NONE,
 	AU8522_AUDIO_SIF,
 };
-
-enum au8522_media_pads {
-	AU8522_PAD_INPUT,
-	AU8522_PAD_VID_OUT,
-	AU8522_PAD_VBI_OUT,
-	AU8522_PAD_AUDIO_OUT,
-
-	AU8522_NUM_PADS
-};
 #endif /* __AU8522_H__ */
diff --git a/drivers/media/dvb-frontends/au8522_decoder.c b/drivers/media/dvb-frontends/au8522_decoder.c
index 0ab9f1eb8a29..add246382806 100644
--- a/drivers/media/dvb-frontends/au8522_decoder.c
+++ b/drivers/media/dvb-frontends/au8522_decoder.c
@@ -763,10 +763,10 @@  static int au8522_probe(struct i2c_client *client,
 	v4l2_i2c_subdev_init(sd, client, &au8522_ops);
 #if defined(CONFIG_MEDIA_CONTROLLER)
 
-	state->pads[AU8522_PAD_INPUT].flags = MEDIA_PAD_FL_SINK;
-	state->pads[AU8522_PAD_VID_OUT].flags = MEDIA_PAD_FL_SOURCE;
-	state->pads[AU8522_PAD_VBI_OUT].flags = MEDIA_PAD_FL_SOURCE;
-	state->pads[AU8522_PAD_AUDIO_OUT].flags = MEDIA_PAD_FL_SOURCE;
+	state->pads[DEMOD_PAD_IF_INPUT].flags = MEDIA_PAD_FL_SINK;
+	state->pads[DEMOD_PAD_VID_OUT].flags = MEDIA_PAD_FL_SOURCE;
+	state->pads[DEMOD_PAD_VBI_OUT].flags = MEDIA_PAD_FL_SOURCE;
+	state->pads[DEMOD_PAD_AUDIO_OUT].flags = MEDIA_PAD_FL_SOURCE;
 	sd->entity.function = MEDIA_ENT_F_ATV_DECODER;
 
 	ret = media_entity_pads_init(&sd->entity, ARRAY_SIZE(state->pads),
diff --git a/drivers/media/dvb-frontends/au8522_priv.h b/drivers/media/dvb-frontends/au8522_priv.h
index 505215a21ddd..f5a9438f6ce5 100644
--- a/drivers/media/dvb-frontends/au8522_priv.h
+++ b/drivers/media/dvb-frontends/au8522_priv.h
@@ -30,6 +30,7 @@ 
 #include <linux/videodev2.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ctrls.h>
+#include <media/v4l2-mc.h>
 #include <linux/i2c.h>
 #include "dvb_frontend.h"
 #include "au8522.h"
@@ -70,7 +71,7 @@  struct au8522_state {
 	struct v4l2_ctrl_handler hdl;
 
 #ifdef CONFIG_MEDIA_CONTROLLER
-	struct media_pad pads[AU8522_NUM_PADS];
+	struct media_pad pads[DEMOD_NUM_PADS];
 #endif
 };
 
diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c
index ca1e5ebf3b6b..6da4e5749f3a 100644
--- a/drivers/media/usb/au0828/au0828-core.c
+++ b/drivers/media/usb/au0828/au0828-core.c
@@ -218,7 +218,7 @@  static void au0828_media_graph_notify(struct media_entity *new,
 	switch (new->function) {
 	case MEDIA_ENT_F_AUDIO_MIXER:
 		ret = media_create_pad_link(dev->decoder,
-					    AU8522_PAD_AUDIO_OUT,
+					    DEMOD_PAD_AUDIO_OUT,
 					    new, 0,
 					    MEDIA_LNK_FL_ENABLED);
 		if (ret)
diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c
index 1958de192608..b82deda02643 100644
--- a/drivers/media/usb/au0828/au0828-video.c
+++ b/drivers/media/usb/au0828/au0828-video.c
@@ -686,16 +686,16 @@  static int au0828_create_media_graph(struct au0828_dev *dev)
 	if (tuner) {
 		dev->tuner = tuner;
 		ret = media_create_pad_link(tuner, TUNER_PAD_OUTPUT,
-					    decoder, AU8522_PAD_INPUT, 0);
+					    decoder, DEMOD_PAD_IF_INPUT, 0);
 		if (ret)
 			return ret;
 	}
-	ret = media_create_pad_link(decoder, AU8522_PAD_VID_OUT,
+	ret = media_create_pad_link(decoder, DEMOD_PAD_VID_OUT,
 				    &dev->vdev.entity, 0,
 				    MEDIA_LNK_FL_ENABLED);
 	if (ret)
 		return ret;
-	ret = media_create_pad_link(decoder, AU8522_PAD_VBI_OUT,
+	ret = media_create_pad_link(decoder, DEMOD_PAD_VBI_OUT,
 				    &dev->vbi_dev.entity, 0,
 				    MEDIA_LNK_FL_ENABLED);
 	if (ret)
@@ -723,7 +723,7 @@  static int au0828_create_media_graph(struct au0828_dev *dev)
 		case AU0828_VMUX_SVIDEO:
 			/* FIXME: fix the decoder PAD */
 			ret = media_create_pad_link(ent, 0, decoder,
-						    AU8522_PAD_INPUT, 0);
+						    DEMOD_PAD_IF_INPUT, 0);
 			if (ret)
 				return ret;
 			break;
diff --git a/include/media/v4l2-mc.h b/include/media/v4l2-mc.h
index 5cbc20923faf..2d880e035490 100644
--- a/include/media/v4l2-mc.h
+++ b/include/media/v4l2-mc.h
@@ -93,6 +93,7 @@  enum demod_pad_index {
 	DEMOD_PAD_IF_INPUT,
 	DEMOD_PAD_VID_OUT,
 	DEMOD_PAD_VBI_OUT,
+	DEMOD_PAD_AUDIO_OUT,
 	DEMOD_NUM_PADS
 };