.. | .. |
---|
29 | 29 | #include <linux/bitops.h> |
---|
30 | 30 | #include <linux/ioport.h> |
---|
31 | 31 | #include <linux/uaccess.h> |
---|
| 32 | +#include <linux/io.h> |
---|
32 | 33 | |
---|
33 | 34 | #include <asm/coldfire.h> |
---|
34 | 35 | #include <asm/m54xxsim.h> |
---|
.. | .. |
---|
85 | 86 | |
---|
86 | 87 | clear_bit(WDT_OK_TO_CLOSE, &wdt_status); |
---|
87 | 88 | wdt_enable(); |
---|
88 | | - return nonseekable_open(inode, file); |
---|
| 89 | + return stream_open(inode, file); |
---|
89 | 90 | } |
---|
90 | 91 | |
---|
91 | 92 | static ssize_t m54xx_wdt_write(struct file *file, const char *data, |
---|
.. | .. |
---|
154 | 155 | |
---|
155 | 156 | heartbeat = time; |
---|
156 | 157 | wdt_enable(); |
---|
157 | | - /* Fall through */ |
---|
| 158 | + fallthrough; |
---|
158 | 159 | |
---|
159 | 160 | case WDIOC_GETTIMEOUT: |
---|
160 | 161 | ret = put_user(heartbeat, (int *)arg); |
---|
.. | .. |
---|
183 | 184 | .llseek = no_llseek, |
---|
184 | 185 | .write = m54xx_wdt_write, |
---|
185 | 186 | .unlocked_ioctl = m54xx_wdt_ioctl, |
---|
| 187 | + .compat_ioctl = compat_ptr_ioctl, |
---|
186 | 188 | .open = m54xx_wdt_open, |
---|
187 | 189 | .release = m54xx_wdt_release, |
---|
188 | 190 | }; |
---|