From bddc418787cccb2ba92b5e601d1d9b04f4668946 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 2 Mar 2016 09:48:36 -0300 Subject: [PATCH] [media] au0828: use standard demod pads struct 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 --- 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 | 2 ++ 6 files changed, 13 insertions(+), 19 deletions(-) diff --git a/drivers/media/dvb-frontends/au8522.h b/drivers/media/dvb-frontends/au8522.h index d7a997f..78bf3f7 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 0ab9f1e..add2463 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 505215a..f5a9438 100644 --- a/drivers/media/dvb-frontends/au8522_priv.h +++ b/drivers/media/dvb-frontends/au8522_priv.h @@ -30,6 +30,7 @@ #include #include #include +#include #include #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 ca1e5eb..6da4e57 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 1958de1..b82deda 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 5cbc209..9dff7ad 100644 --- a/include/media/v4l2-mc.h +++ b/include/media/v4l2-mc.h @@ -87,12 +87,14 @@ enum if_aud_dec_pad_index { * @DEMOD_PAD_IF_INPUT: IF input sink pad. * @DEMOD_PAD_VID_OUT: Video output source pad. * @DEMOD_PAD_VBI_OUT: Vertical Blank Interface (VBI) output source pad. + * @DEMOD_PAD_AUDIO_OUT: Audio output source pad. * @DEMOD_NUM_PADS: Maximum number of output pads. */ enum demod_pad_index { DEMOD_PAD_IF_INPUT, DEMOD_PAD_VID_OUT, DEMOD_PAD_VBI_OUT, + DEMOD_PAD_AUDIO_OUT, DEMOD_NUM_PADS }; -- 2.7.4