update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/pci/ivtv/ivtv-driver.c
..
..
@@ -23,7 +23,6 @@
23
23
  * Driver for the Conexant CX23415/CX23416 chip.
24
24
  * Author: Kevin Thayer (nufan_wfk at yahoo.com)
25
25
  * License: GPL
26
- * http://www.ivtvdriver.org
27
26
  *
28
27
  * -----
29
28
  * MPG600/MPG160 support by  T.Adachi <tadachi@tadachi-net.com>
..
..
@@ -723,7 +722,7 @@
723
722
 		IVTV_ERR("              %s based\n", chipname);
724
723
 		IVTV_ERR("Defaulting to %s card\n", itv->card->name);
725
724
 		IVTV_ERR("Please mail the vendor/device and subsystem vendor/device IDs and what kind of\n");
726
-		IVTV_ERR("card you have to the ivtv-devel mailinglist (www.ivtvdriver.org)\n");
725
+		IVTV_ERR("card you have to the linux-media mailinglist (www.linuxtv.org)\n");
727
726
 		IVTV_ERR("Prefix your subject line with [UNKNOWN IVTV CARD].\n");
728
727
 	}
729
728
 	itv->v4l2_cap = itv->card->v4l2_capabilities;
..
..
@@ -738,8 +737,6 @@
738
737
  */
739
738
 static int ivtv_init_struct1(struct ivtv *itv)
740
739
 {
741
-	struct sched_param param = { .sched_priority = 99 };
742
-
743
740
 	itv->base_addr = pci_resource_start(itv->pdev, 0);
744
741
 	itv->enc_mbox.max_mbox = 2; /* the encoder has 3 mailboxes (0-2) */
745
742
 	itv->dec_mbox.max_mbox = 1; /* the decoder has 2 mailboxes (0-1) */
..
..
@@ -759,7 +756,7 @@
759
756
 		return -1;
760
757
 	}
761
758
 	/* must use the FIFO scheduler as it is realtime sensitive */
762
-	sched_setscheduler(itv->irq_worker_task, SCHED_FIFO, &param);
759
+	sched_set_fifo(itv->irq_worker_task);
763
760
 
764
761
 	kthread_init_work(&itv->irq_work, ivtv_irq_work_handler);
765
762
 
..
..
@@ -910,7 +907,7 @@
910
907
 
911
908
 	/* check which i2c devices are actually found */
912
909
 	for (i = 0; i < 32; i++) {
913
-		u32 device = 1 << i;
910
+		u32 device = BIT(i);
914
911
 
915
912
 		if (!(device & hw))
916
913
 			continue;
..
..
@@ -1042,7 +1039,7 @@
1042
1039
 	/* map io memory */
1043
1040
 	IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",
1044
1041
 		   (u64)itv->base_addr + IVTV_ENCODER_OFFSET, IVTV_ENCODER_SIZE);
1045
-	itv->enc_mem = ioremap_nocache(itv->base_addr + IVTV_ENCODER_OFFSET,
1042
+	itv->enc_mem = ioremap(itv->base_addr + IVTV_ENCODER_OFFSET,
1046
1043
 				       IVTV_ENCODER_SIZE);
1047
1044
 	if (!itv->enc_mem) {
1048
1045
 		IVTV_ERR("ioremap failed. Can't get a window into CX23415/6 encoder memory\n");
..
..
@@ -1056,7 +1053,7 @@
1056
1053
 	if (itv->has_cx23415) {
1057
1054
 		IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",
1058
1055
 				(u64)itv->base_addr + IVTV_DECODER_OFFSET, IVTV_DECODER_SIZE);
1059
-		itv->dec_mem = ioremap_nocache(itv->base_addr + IVTV_DECODER_OFFSET,
1056
+		itv->dec_mem = ioremap(itv->base_addr + IVTV_DECODER_OFFSET,
1060
1057
 				IVTV_DECODER_SIZE);
1061
1058
 		if (!itv->dec_mem) {
1062
1059
 			IVTV_ERR("ioremap failed. Can't get a window into CX23415 decoder memory\n");
..
..
@@ -1075,7 +1072,7 @@
1075
1072
 	IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",
1076
1073
 		   (u64)itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);
1077
1074
 	itv->reg_mem =
1078
-	    ioremap_nocache(itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);
1075
+	    ioremap(itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);
1079
1076
 	if (!itv->reg_mem) {
1080
1077
 		IVTV_ERR("ioremap failed. Can't get a window into CX23415/6 register space\n");
1081
1078
 		IVTV_ERR("Each capture card with a CX23415/6 needs 64 kB of vmalloc address space for this window\n");