forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5
kernel/drivers/media/usb/dvb-usb-v2/mxl111sf.c
....@@ -1,11 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * Copyright (C) 2010-2014 Michael Krufky (mkrufky@linuxtv.org)
34 *
4
- * This program is free software; you can redistribute it and/or modify it
5
- * under the terms of the GNU General Public License as published by the Free
6
- * Software Foundation, version 2.
7
- *
8
- * see Documentation/media/dvb-drivers/dvb-usb.rst for more information
5
+ * see Documentation/driver-api/media/drivers/dvb-usb.rst for more information
96 */
107
118 #include <linux/vmalloc.h>
....@@ -140,7 +137,7 @@
140137 if (mask != 0xff) {
141138 ret = mxl111sf_read_reg(state, addr, &val);
142139 #if 1
143
- /* dont know why this usually errors out on the first try */
140
+ /* don't know why this usually errors out on the first try */
144141 if (mxl_fail(ret))
145142 pr_err("error writing addr: 0x%02x, mask: 0x%02x, data: 0x%02x, retrying...",
146143 addr, mask, data);
....@@ -783,7 +780,7 @@
783780 if (mxl_fail(ret))
784781 goto fail;
785782
786
- /* dont care if this fails */
783
+ /* don't care if this fails */
787784 mxl111sf_init_port_expander(state);
788785
789786 adap->fe[fe_id] = dvb_attach(mxl111sf_demod_attach, state,
....@@ -892,11 +889,13 @@
892889 #ifdef CONFIG_MEDIA_CONTROLLER_DVB
893890 state->tuner.function = MEDIA_ENT_F_TUNER;
894891 state->tuner.name = "mxl111sf tuner";
895
- state->tuner_pads[TUNER_PAD_RF_INPUT].flags = MEDIA_PAD_FL_SINK;
896
- state->tuner_pads[TUNER_PAD_OUTPUT].flags = MEDIA_PAD_FL_SOURCE;
892
+ state->tuner_pads[MXL111SF_PAD_RF_INPUT].flags = MEDIA_PAD_FL_SINK;
893
+ state->tuner_pads[MXL111SF_PAD_RF_INPUT].sig_type = PAD_SIGNAL_ANALOG;
894
+ state->tuner_pads[MXL111SF_PAD_OUTPUT].flags = MEDIA_PAD_FL_SOURCE;
895
+ state->tuner_pads[MXL111SF_PAD_OUTPUT].sig_type = PAD_SIGNAL_ANALOG;
897896
898897 ret = media_entity_pads_init(&state->tuner,
899
- TUNER_NUM_PADS, state->tuner_pads);
898
+ MXL111SF_NUM_PADS, state->tuner_pads);
900899 if (ret)
901900 return ret;
902901