Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: au8522: declare its own pads

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>

+14 -7
+6 -6
drivers/media/dvb-frontends/au8522_decoder.c
··· 718 718 v4l2_i2c_subdev_init(sd, client, &au8522_ops); 719 719 #if defined(CONFIG_MEDIA_CONTROLLER) 720 720 721 - state->pads[DEMOD_PAD_IF_INPUT].flags = MEDIA_PAD_FL_SINK; 722 - state->pads[DEMOD_PAD_IF_INPUT].sig_type = PAD_SIGNAL_ANALOG; 723 - state->pads[DEMOD_PAD_VID_OUT].flags = MEDIA_PAD_FL_SOURCE; 724 - state->pads[DEMOD_PAD_VID_OUT].sig_type = PAD_SIGNAL_DV; 725 - state->pads[DEMOD_PAD_AUDIO_OUT].flags = MEDIA_PAD_FL_SOURCE; 726 - state->pads[DEMOD_PAD_AUDIO_OUT].sig_type = PAD_SIGNAL_AUDIO; 721 + state->pads[AU8522_PAD_IF_INPUT].flags = MEDIA_PAD_FL_SINK; 722 + state->pads[AU8522_PAD_IF_INPUT].sig_type = PAD_SIGNAL_ANALOG; 723 + state->pads[AU8522_PAD_VID_OUT].flags = MEDIA_PAD_FL_SOURCE; 724 + state->pads[AU8522_PAD_VID_OUT].sig_type = PAD_SIGNAL_DV; 725 + state->pads[AU8522_PAD_AUDIO_OUT].flags = MEDIA_PAD_FL_SOURCE; 726 + state->pads[AU8522_PAD_AUDIO_OUT].sig_type = PAD_SIGNAL_AUDIO; 727 727 sd->entity.function = MEDIA_ENT_F_ATV_DECODER; 728 728 729 729 ret = media_entity_pads_init(&sd->entity, ARRAY_SIZE(state->pads),
+8 -1
drivers/media/dvb-frontends/au8522_priv.h
··· 40 40 #define AU8522_DIGITAL_MODE 1 41 41 #define AU8522_SUSPEND_MODE 2 42 42 43 + enum au8522_pads { 44 + AU8522_PAD_IF_INPUT, 45 + AU8522_PAD_VID_OUT, 46 + AU8522_PAD_AUDIO_OUT, 47 + AU8522_NUM_PADS 48 + }; 49 + 43 50 struct au8522_state { 44 51 struct i2c_client *c; 45 52 struct i2c_adapter *i2c; ··· 78 71 struct v4l2_ctrl_handler hdl; 79 72 80 73 #ifdef CONFIG_MEDIA_CONTROLLER 81 - struct media_pad pads[DEMOD_NUM_PADS]; 74 + struct media_pad pads[AU8522_NUM_PADS]; 82 75 #endif 83 76 }; 84 77