AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/drivers/video/console/newport_con.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * newport_con.c: Abscon for newport hardware
3
4
  * 
..
..
@@ -23,7 +24,6 @@
23
24
 #include <asm/io.h>
24
25
 #include <linux/uaccess.h>
25
26
 #include <asm/page.h>
26
-#include <asm/pgtable.h>
27
27
 #include <asm/gio_device.h>
28
28
 
29
29
 #include <video/newport.h>
..
..
@@ -125,6 +125,8 @@
125
125
 		npregs->go.hostrw0 = *data++ << 24;
126
126
 
127
127
 	return logo;
128
+#else
129
+	return NULL;
128
130
 #endif /* CONFIG_LOGO_SGI_CLUT224 */
129
131
 }
130
132
 
..
..
@@ -356,12 +358,12 @@
356
358
 
357
359
 	if (ystart < yend) {
358
360
 		newport_clear_screen(sx << 3, ystart, xend, yend,
359
-				     (vc->vc_color & 0xf0) >> 4);
361
+				     (vc->state.color & 0xf0) >> 4);
360
362
 	} else {
361
363
 		newport_clear_screen(sx << 3, ystart, xend, 1023,
362
-				     (vc->vc_color & 0xf0) >> 4);
364
+				     (vc->state.color & 0xf0) >> 4);
363
365
 		newport_clear_screen(sx << 3, 0, xend, yend,
364
-				     (vc->vc_color & 0xf0) >> 4);
366
+				     (vc->state.color & 0xf0) >> 4);
365
367
 	}
366
368
 }
367
369
 
..
..
@@ -586,11 +588,11 @@
586
588
 			topscan = (topscan + (lines << 4)) & 0x3ff;
587
589
 			newport_clear_lines(vc->vc_rows - lines,
588
590
 					    vc->vc_rows - 1,
589
-					    (vc->vc_color & 0xf0) >> 4);
591
+					    (vc->state.color & 0xf0) >> 4);
590
592
 		} else {
591
593
 			topscan = (topscan + (-lines << 4)) & 0x3ff;
592
594
 			newport_clear_lines(0, lines - 1,
593
-					    (vc->vc_color & 0xf0) >> 4);
595
+					    (vc->state.color & 0xf0) >> 4);
594
596
 		}
595
597
 		npregs->cset.topscan = (topscan - 1) & 0x3ff;
596
598
 		return false;
..
..
@@ -671,11 +673,6 @@
671
673
 	return true;
672
674
 }
673
675
 
674
-static int newport_set_origin(struct vc_data *vc)
675
-{
676
-	return 0;
677
-}
678
-
679
676
 static void newport_save_screen(struct vc_data *vc) { }
680
677
 
681
678
 const struct consw newport_con = {
..
..
@@ -692,7 +689,6 @@
692
689
 	.con_blank	  = newport_blank,
693
690
 	.con_font_set	  = newport_font_set,
694
691
 	.con_font_default = newport_font_default,
695
-	.con_set_origin	  = newport_set_origin,
696
692
 	.con_save_screen  = newport_save_screen
697
693
 };
698
694
 
..
..
@@ -744,18 +740,6 @@
744
740
 	.probe = newport_probe,
745
741
 	.remove = newport_remove,
746
742
 };
747
-
748
-int __init newport_console_init(void)
749
-{
750
-	return gio_register_driver(&newport_driver);
751
-}
752
-
753
-void __exit newport_console_exit(void)
754
-{
755
-	gio_unregister_driver(&newport_driver);
756
-}
757
-
758
-module_init(newport_console_init);
759
-module_exit(newport_console_exit);
743
+module_driver(newport_driver, gio_register_driver, gio_unregister_driver);
760
744
 
761
745
 MODULE_LICENSE("GPL");