change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/parport/parport_amiga.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /* Low-level parallel port routines for the Amiga built-in port
2
3
  *
3
4
  * Author: Joerg Dorchain <joerg@dorchain.net>
..
..
@@ -27,16 +28,10 @@
27
28
 #include <asm/amigaints.h>
28
29
 
29
30
 #undef DEBUG
30
-#ifdef DEBUG
31
-#define DPRINTK printk
32
-#else
33
-#define DPRINTK(x...)	do { } while (0)
34
-#endif
35
-
36
31
 
37
32
 static void amiga_write_data(struct parport *p, unsigned char data)
38
33
 {
39
-	DPRINTK(KERN_DEBUG "write_data %c\n",data);
34
+	pr_debug("write_data %c\n", data);
40
35
 	/* Triggers also /STROBE. This behavior cannot be changed */
41
36
 	ciaa.prb = data;
42
37
 	mb();
..
..
@@ -58,13 +53,13 @@
58
53
 
59
54
 static void amiga_write_control(struct parport *p, unsigned char control)
60
55
 {
61
-	DPRINTK(KERN_DEBUG "write_control %02x\n",control);
56
+	pr_debug("write_control %02x\n", control);
62
57
 	/* No implementation possible */
63
58
 }
64
59
 	
65
60
 static unsigned char amiga_read_control( struct parport *p)
66
61
 {
67
-	DPRINTK(KERN_DEBUG "read_control \n");
62
+	pr_debug("read_control\n");
68
63
 	return control_amiga_to_pc(0);
69
64
 }
70
65
 
..
..
@@ -72,7 +67,7 @@
72
67
 {
73
68
 	unsigned char old;
74
69
 
75
-	DPRINTK(KERN_DEBUG "frob_control mask %02x, value %02x\n",mask,val);
70
+	pr_debug("frob_control mask %02x, value %02x\n", mask, val);
76
71
 	old = amiga_read_control(p);
77
72
 	amiga_write_control(p, (old & ~mask) ^ val);
78
73
 	return old;
..
..
@@ -98,7 +93,7 @@
98
93
 	unsigned char status;
99
94
 
100
95
 	status = status_amiga_to_pc(ciab.pra & 7);
101
-	DPRINTK(KERN_DEBUG "read_status %02x\n", status);
96
+	pr_debug("read_status %02x\n", status);
102
97
 	return status;
103
98
 }
104
99
 
..
..
@@ -114,14 +109,14 @@
114
109
 
115
110
 static void amiga_data_forward(struct parport *p)
116
111
 {
117
-	DPRINTK(KERN_DEBUG "forward\n");
112
+	pr_debug("forward\n");
118
113
 	ciaa.ddrb = 0xff; /* all pins output */
119
114
 	mb();
120
115
 }
121
116
 
122
117
 static void amiga_data_reverse(struct parport *p)
123
118
 {
124
-	DPRINTK(KERN_DEBUG "reverse\n");
119
+	pr_debug("reverse\n");
125
120
 	ciaa.ddrb = 0; /* all pins input */
126
121
 	mb();
127
122
 }
..
..
@@ -211,7 +206,7 @@
211
206
 	if (err)
212
207
 		goto out_irq;
213
208
 
214
-	printk(KERN_INFO "%s: Amiga built-in port using irq\n", p->name);
209
+	pr_info("%s: Amiga built-in port using irq\n", p->name);
215
210
 	/* XXX: set operating mode */
216
211
 	parport_announce_port(p);
217
212