diff options
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/briq_panel.c | 10 | ||||
-rw-r--r-- | drivers/char/hvc_console.c | 2 | ||||
-rw-r--r-- | drivers/char/viotape.c | 12 |
3 files changed, 7 insertions, 17 deletions
diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c index ed53f541d9e8..b6f2639f903d 100644 --- a/drivers/char/briq_panel.c +++ b/drivers/char/briq_panel.c | |||
@@ -91,11 +91,6 @@ static ssize_t briq_panel_read(struct file *file, char __user *buf, size_t count | |||
91 | unsigned short c; | 91 | unsigned short c; |
92 | unsigned char cp; | 92 | unsigned char cp; |
93 | 93 | ||
94 | #if 0 /* Can't seek (pread) on this device */ | ||
95 | if (ppos != &file->f_pos) | ||
96 | return -ESPIPE; | ||
97 | #endif | ||
98 | |||
99 | if (!vfd_is_open) | 94 | if (!vfd_is_open) |
100 | return -ENODEV; | 95 | return -ENODEV; |
101 | 96 | ||
@@ -139,11 +134,6 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_ | |||
139 | size_t indx = len; | 134 | size_t indx = len; |
140 | int i, esc = 0; | 135 | int i, esc = 0; |
141 | 136 | ||
142 | #if 0 /* Can't seek (pwrite) on this device */ | ||
143 | if (ppos != &file->f_pos) | ||
144 | return -ESPIPE; | ||
145 | #endif | ||
146 | |||
147 | if (!vfd_is_open) | 137 | if (!vfd_is_open) |
148 | return -EBUSY; | 138 | return -EBUSY; |
149 | 139 | ||
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c index 322bc5f7d86b..b3ab42e0dd4a 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c | |||
@@ -674,7 +674,7 @@ static const cpumask_t cpus_in_xmon = CPU_MASK_NONE; | |||
674 | * calling hvc_poll() who determines whether a console adapter support | 674 | * calling hvc_poll() who determines whether a console adapter support |
675 | * interrupts. | 675 | * interrupts. |
676 | */ | 676 | */ |
677 | int khvcd(void *unused) | 677 | static int khvcd(void *unused) |
678 | { | 678 | { |
679 | int poll_mask; | 679 | int poll_mask; |
680 | struct hvc_struct *hp; | 680 | struct hvc_struct *hp; |
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c index 13faf8d17482..db57277117bb 100644 --- a/drivers/char/viotape.c +++ b/drivers/char/viotape.c | |||
@@ -873,12 +873,12 @@ free_op: | |||
873 | } | 873 | } |
874 | 874 | ||
875 | const struct file_operations viotap_fops = { | 875 | const struct file_operations viotap_fops = { |
876 | owner: THIS_MODULE, | 876 | .owner = THIS_MODULE, |
877 | read: viotap_read, | 877 | .read = viotap_read, |
878 | write: viotap_write, | 878 | .write = viotap_write, |
879 | ioctl: viotap_ioctl, | 879 | .ioctl = viotap_ioctl, |
880 | open: viotap_open, | 880 | .open = viotap_open, |
881 | release: viotap_release, | 881 | .release = viotap_release, |
882 | }; | 882 | }; |
883 | 883 | ||
884 | /* Handle interrupt events for tape */ | 884 | /* Handle interrupt events for tape */ |