update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/usb/dvb-usb-v2/mxl111sf.c
..
..
@@ -1,11 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Copyright (C) 2010-2014 Michael Krufky (mkrufky@linuxtv.org)
3
4
  *
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
9
6
  */
10
7
 
11
8
 #include <linux/vmalloc.h>
..
..
@@ -140,7 +137,7 @@
140
137
 	if (mask != 0xff) {
141
138
 		ret = mxl111sf_read_reg(state, addr, &val);
142
139
 #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 */
144
141
 		if (mxl_fail(ret))
145
142
 			pr_err("error writing addr: 0x%02x, mask: 0x%02x, data: 0x%02x, retrying...",
146
143
 			       addr, mask, data);
..
..
@@ -783,7 +780,7 @@
783
780
 	if (mxl_fail(ret))
784
781
 		goto fail;
785
782
 
786
-	/* dont care if this fails */
783
+	/* don't care if this fails */
787
784
 	mxl111sf_init_port_expander(state);
788
785
 
789
786
 	adap->fe[fe_id] = dvb_attach(mxl111sf_demod_attach, state,
..
..
@@ -892,11 +889,13 @@
892
889
 #ifdef CONFIG_MEDIA_CONTROLLER_DVB
893
890
 	state->tuner.function = MEDIA_ENT_F_TUNER;
894
891
 	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;
897
896
 
898
897
 	ret = media_entity_pads_init(&state->tuner,
899
-				     TUNER_NUM_PADS, state->tuner_pads);
898
+				     MXL111SF_NUM_PADS, state->tuner_pads);
900
899
 	if (ret)
901
900
 		return ret;
902
901