update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/pci/saa7134/saa7134.h
..
..
@@ -1,18 +1,9 @@
1
+/* SPDX-License-Identifier: GPL-2.0-or-later */
1
2
 /*
2
3
  *
3
4
  * v4l2 device driver for philips saa7134 based TV cards
4
5
  *
5
6
  * (c) 2001,02 Gerd Knorr <kraxel@bytesex.org>
6
- *
7
- *  This program is free software; you can redistribute it and/or modify
8
- *  it under the terms of the GNU General Public License as published by
9
- *  the Free Software Foundation; either version 2 of the License, or
10
- *  (at your option) any later version.
11
- *
12
- *  This program is distributed in the hope that it will be useful,
13
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
14
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
- *  GNU General Public License for more details.
16
7
  */
17
8
 
18
9
 #define SAA7134_VERSION "0, 2, 17"
..
..
@@ -107,7 +98,6 @@
107
98
 };
108
99
 
109
100
 struct saa7134_format {
110
-	char           *name;
111
101
 	unsigned int   fourcc;
112
102
 	unsigned int   depth;
113
103
 	unsigned int   pm;
..
..
@@ -123,9 +113,7 @@
123
113
 struct saa7134_card_ir {
124
114
 	struct rc_dev		*dev;
125
115
 
126
-	char                    name[32];
127
116
 	char                    phys[32];
128
-	unsigned                users;
129
117
 
130
118
 	u32			polling;
131
119
 	u32			last_gpio;
..
..
@@ -521,7 +509,7 @@
521
509
 	void			   *vaddr;
522
510
 	struct scatterlist	   *sglist;
523
511
 	int                        sglen;
524
-	int                        nr_pages;
512
+	unsigned long              nr_pages;
525
513
 	unsigned int               dma_blk;
526
514
 	unsigned int               read_offset;
527
515
 	unsigned int               read_count;
..
..
@@ -545,6 +533,12 @@
545
533
 	void                       (*signal_change)(struct saa7134_dev *dev);
546
534
 	void                       (*irq_ts_done)(struct saa7134_dev *dev,
547
535
 						  unsigned long status);
536
+};
537
+
538
+enum saa7134_pads {
539
+	SAA7134_PAD_IF_INPUT,
540
+	SAA7134_PAD_VID_OUT,
541
+	SAA7134_NUM_PADS
548
542
 };
549
543
 
550
544
 /* global device status */
..
..
@@ -674,7 +668,7 @@
674
668
 	struct media_pad input_pad[SAA7134_INPUT_MAX + 1];
675
669
 
676
670
 	struct media_entity demod;
677
-	struct media_pad demod_pad[DEMOD_NUM_PADS];
671
+	struct media_pad demod_pad[SAA7134_NUM_PADS];
678
672
 
679
673
 	struct media_pad video_pad, vbi_pad;
680
674
 	struct media_entity *decoder;
..
..
@@ -917,13 +911,13 @@
917
911
 void saa7134_input_fini(struct saa7134_dev *dev);
918
912
 void saa7134_input_irq(struct saa7134_dev *dev);
919
913
 void saa7134_probe_i2c_ir(struct saa7134_dev *dev);
920
-int saa7134_ir_start(struct saa7134_dev *dev);
921
-void saa7134_ir_stop(struct saa7134_dev *dev);
914
+int saa7134_ir_open(struct rc_dev *dev);
915
+void saa7134_ir_close(struct rc_dev *dev);
922
916
 #else
923
917
 #define saa7134_input_init1(dev)	((void)0)
924
918
 #define saa7134_input_fini(dev)		((void)0)
925
919
 #define saa7134_input_irq(dev)		((void)0)
926
920
 #define saa7134_probe_i2c_ir(dev)	((void)0)
927
-#define saa7134_ir_start(dev)		((void)0)
928
-#define saa7134_ir_stop(dev)		((void)0)
921
+#define saa7134_ir_open(dev)		((void)0)
922
+#define saa7134_ir_close(dev)		((void)0)
929
923
 #endif