修改内核路径

hc

2024-05-14 bedbef8ad3e75a304af6361af235302bcc61d06b

 kernel/drivers/watchdog/mtx-1_wdt.c
..
..
@@ -39,7 +39,7 @@
39
39
 #include <linux/platform_device.h>
40
40
 #include <linux/io.h>
41
41
 #include <linux/uaccess.h>
42
-#include <linux/gpio.h>
42
+#include <linux/gpio/consumer.h>
43
43
 
44
44
 #include <asm/mach-au1x00/au1000.h>
45
45
 
..
..
@@ -55,7 +55,7 @@
55
55
 	int queue;
56
56
 	int default_ticks;
57
57
 	unsigned long inuse;
58
-	unsigned gpio;
58
+	struct gpio_desc *gpiod;
59
59
 	unsigned int gstate;
60
60
 } mtx1_wdt_device;
61
61
 
..
..
@@ -67,7 +67,7 @@
67
67
 
68
68
 	/* toggle wdt gpio */
69
69
 	mtx1_wdt_device.gstate = !mtx1_wdt_device.gstate;
70
-	gpio_set_value(mtx1_wdt_device.gpio, mtx1_wdt_device.gstate);
70
+	gpiod_set_value(mtx1_wdt_device.gpiod, mtx1_wdt_device.gstate);
71
71
 
72
72
 	if (mtx1_wdt_device.queue && ticks)
73
73
 		mod_timer(&mtx1_wdt_device.timer, jiffies + MTX1_WDT_INTERVAL);
..
..
@@ -90,7 +90,7 @@
90
90
 	if (!mtx1_wdt_device.queue) {
91
91
 		mtx1_wdt_device.queue = 1;
92
92
 		mtx1_wdt_device.gstate = 1;
93
-		gpio_set_value(mtx1_wdt_device.gpio, 1);
93
+		gpiod_set_value(mtx1_wdt_device.gpiod, 1);
94
94
 		mod_timer(&mtx1_wdt_device.timer, jiffies + MTX1_WDT_INTERVAL);
95
95
 	}
96
96
 	mtx1_wdt_device.running++;
..
..
@@ -105,7 +105,7 @@
105
105
 	if (mtx1_wdt_device.queue) {
106
106
 		mtx1_wdt_device.queue = 0;
107
107
 		mtx1_wdt_device.gstate = 0;
108
-		gpio_set_value(mtx1_wdt_device.gpio, 0);
108
+		gpiod_set_value(mtx1_wdt_device.gpiod, 0);
109
109
 	}
110
110
 	ticks = mtx1_wdt_device.default_ticks;
111
111
 	spin_unlock_irqrestore(&mtx1_wdt_device.lock, flags);
..
..
@@ -118,7 +118,7 @@
118
118
 {
119
119
 	if (test_and_set_bit(0, &mtx1_wdt_device.inuse))
120
120
 		return -EBUSY;
121
-	return nonseekable_open(inode, file);
121
+	return stream_open(inode, file);
122
122
 }
123
123
 
124
124
 
..
..
@@ -181,6 +181,7 @@
181
181
 	.owner		= THIS_MODULE,
182
182
 	.llseek		= no_llseek,
183
183
 	.unlocked_ioctl	= mtx1_wdt_ioctl,
184
+	.compat_ioctl	= compat_ptr_ioctl,
184
185
 	.open		= mtx1_wdt_open,
185
186
 	.write		= mtx1_wdt_write,
186
187
 	.release	= mtx1_wdt_release,
..
..
@@ -198,12 +199,11 @@
198
199
 {
199
200
 	int ret;
200
201
 
201
-	mtx1_wdt_device.gpio = pdev->resource[0].start;
202
-	ret = devm_gpio_request_one(&pdev->dev, mtx1_wdt_device.gpio,
203
-				GPIOF_OUT_INIT_HIGH, "mtx1-wdt");
204
-	if (ret < 0) {
202
+	mtx1_wdt_device.gpiod = devm_gpiod_get(&pdev->dev,
203
+					       NULL, GPIOD_OUT_HIGH);
204
+	if (IS_ERR(mtx1_wdt_device.gpiod)) {
205
205
 		dev_err(&pdev->dev, "failed to request gpio");
206
-		return ret;
206
+		return PTR_ERR(mtx1_wdt_device.gpiod);
207
207
 	}
208
208
 
209
209
 	spin_lock_init(&mtx1_wdt_device.lock);