p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

media: mxl111sf: 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>
This commit is contained in:
Mauro Carvalho Chehab 2018-08-01 06:57:19 -04:00
parent 3aa13787c8
commit db7da96ba8
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/usb/dvb-usb-v2/mxl111sf.c
View File

@ -892,13 +892,13 @@ static int mxl111sf_attach_tuner(struct dvb_usb_adapter *adap)
#ifdef CONFIG_MEDIA_CONTROLLER_DVB #ifdef CONFIG_MEDIA_CONTROLLER_DVB
state->tuner.function = MEDIA_ENT_F_TUNER; state->tuner.function = MEDIA_ENT_F_TUNER;
state->tuner.name = "mxl111sf tuner"; state->tuner.name = "mxl111sf tuner";
state->tuner_pads[TUNER_PAD_RF_INPUT].flags = MEDIA_PAD_FL_SINK; state->tuner_pads[MXL111SF_PAD_RF_INPUT].flags = MEDIA_PAD_FL_SINK;
state->tuner_pads[TUNER_PAD_RF_INPUT].sig_type = PAD_SIGNAL_ANALOG; state->tuner_pads[MXL111SF_PAD_RF_INPUT].sig_type = PAD_SIGNAL_ANALOG;
state->tuner_pads[TUNER_PAD_OUTPUT].flags = MEDIA_PAD_FL_SOURCE; state->tuner_pads[MXL111SF_PAD_OUTPUT].flags = MEDIA_PAD_FL_SOURCE;
state->tuner_pads[TUNER_PAD_OUTPUT].sig_type = PAD_SIGNAL_ANALOG; state->tuner_pads[MXL111SF_PAD_OUTPUT].sig_type = PAD_SIGNAL_ANALOG;
ret = media_entity_pads_init(&state->tuner, ret = media_entity_pads_init(&state->tuner,
TUNER_NUM_PADS, state->tuner_pads); MXL111SF_NUM_PADS, state->tuner_pads);
if (ret) if (ret)
return ret; return ret;

8
drivers/media/usb/dvb-usb-v2/mxl111sf.h
View File

@ -52,6 +52,12 @@ struct mxl111sf_adap_state {
int (*fe_sleep)(struct dvb_frontend *); int (*fe_sleep)(struct dvb_frontend *);
}; };
enum mxl111sf_pads {
MXL111SF_PAD_RF_INPUT,
MXL111SF_PAD_OUTPUT,
MXL111SF_NUM_PADS
};
struct mxl111sf_state { struct mxl111sf_state {
struct dvb_usb_device *d; struct dvb_usb_device *d;
@ -94,7 +100,7 @@ struct mxl111sf_state {
struct mutex msg_lock; struct mutex msg_lock;
#ifdef CONFIG_MEDIA_CONTROLLER_DVB #ifdef CONFIG_MEDIA_CONTROLLER_DVB
struct media_entity tuner; struct media_entity tuner;
struct media_pad tuner_pads[2]; struct media_pad tuner_pads[MXL111SF_NUM_PADS];
#endif #endif
}; };