mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/watchdog/sa1100_wdt.c
..
..
@@ -1,13 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0+
1
2
 /*
2
3
  *	Watchdog driver for the SA11x0/PXA2xx
3
4
  *
4
5
  *	(c) Copyright 2000 Oleg Drokin <green@crimea.edu>
5
6
  *	    Based on SoftDog driver by Alan Cox <alan@lxorguk.ukuu.org.uk>
6
- *
7
- *	This program is free software; you can redistribute it and/or
8
- *	modify it under the terms of the GNU General Public License
9
- *	as published by the Free Software Foundation; either version
10
- *	2 of the License, or (at your option) any later version.
11
7
  *
12
8
  *	Neither Oleg Drokin nor iXcelerator.com admit liability nor provide
13
9
  *	warranty for any of this software. This material is provided
..
..
@@ -59,7 +55,7 @@
59
55
 	writel_relaxed(OSSR_M3, OSSR);
60
56
 	writel_relaxed(OWER_WME, OWER);
61
57
 	writel_relaxed(readl_relaxed(OIER) | OIER_E3, OIER);
62
-	return nonseekable_open(inode, file);
58
+	return stream_open(inode, file);
63
59
 }
64
60
 
65
61
 /*
..
..
@@ -131,7 +127,7 @@
131
127
 
132
128
 		pre_margin = oscr_freq * time;
133
129
 		writel_relaxed(readl_relaxed(OSCR) + pre_margin, OSMR3);
134
-		/*fall through*/
130
+		fallthrough;
135
131
 
136
132
 	case WDIOC_GETTIMEOUT:
137
133
 		ret = put_user(pre_margin / oscr_freq, p);
..
..
@@ -145,6 +141,7 @@
145
141
 	.llseek		= no_llseek,
146
142
 	.write		= sa1100dog_write,
147
143
 	.unlocked_ioctl	= sa1100dog_ioctl,
144
+	.compat_ioctl	= compat_ptr_ioctl,
148
145
 	.open		= sa1100dog_open,
149
146
 	.release	= sa1100dog_release,
150
147
 };