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

media: msp3400: 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>

+11 -5
+4 -4
drivers/media/i2c/msp3400-driver.c
··· 703 703 v4l2_i2c_subdev_init(sd, client, &msp_ops); 704 704 705 705 #if defined(CONFIG_MEDIA_CONTROLLER) 706 - state->pads[IF_AUD_DEC_PAD_IF_INPUT].flags = MEDIA_PAD_FL_SINK; 707 - state->pads[IF_AUD_DEC_PAD_IF_INPUT].sig_type = PAD_SIGNAL_AUDIO; 708 - state->pads[IF_AUD_DEC_PAD_OUT].flags = MEDIA_PAD_FL_SOURCE; 709 - state->pads[IF_AUD_DEC_PAD_OUT].sig_type = PAD_SIGNAL_AUDIO; 706 + state->pads[MSP3400_PAD_IF_INPUT].flags = MEDIA_PAD_FL_SINK; 707 + state->pads[MSP3400_PAD_IF_INPUT].sig_type = PAD_SIGNAL_AUDIO; 708 + state->pads[MSP3400_PAD_OUT].flags = MEDIA_PAD_FL_SOURCE; 709 + state->pads[MSP3400_PAD_OUT].sig_type = PAD_SIGNAL_AUDIO; 710 710 711 711 sd->entity.function = MEDIA_ENT_F_IF_AUD_DECODER; 712 712
+7 -1
drivers/media/i2c/msp3400-driver.h
··· 52 52 extern bool msp_dolby; 53 53 extern int msp_stereo_thresh; 54 54 55 + enum msp3400_pads { 56 + MSP3400_PAD_IF_INPUT, 57 + MSP3400_PAD_OUT, 58 + MSP3400_NUM_PADS 59 + }; 60 + 55 61 struct msp_state { 56 62 struct v4l2_subdev sd; 57 63 struct v4l2_ctrl_handler hdl; ··· 112 106 unsigned int watch_stereo:1; 113 107 114 108 #if IS_ENABLED(CONFIG_MEDIA_CONTROLLER) 115 - struct media_pad pads[IF_AUD_DEC_PAD_NUM_PADS]; 109 + struct media_pad pads[MSP3400_NUM_PADS]; 116 110 #endif 117 111 }; 118 112