diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-07-11 13:28:26 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-07-11 13:28:26 +1000 |
| commit | bf22f6fe2d72b4d7e9035be8ceb340414cf490e3 (patch) | |
| tree | 14085d90de0428316479fe6de8a0c6d32e6e65e2 /drivers/char | |
| parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
| parent | 93ab471889c6662b42ce7da257f31f24c08d7d9e (diff) | |
| download | kernel_samsung_tuna-bf22f6fe2d72b4d7e9035be8ceb340414cf490e3.zip kernel_samsung_tuna-bf22f6fe2d72b4d7e9035be8ceb340414cf490e3.tar.gz kernel_samsung_tuna-bf22f6fe2d72b4d7e9035be8ceb340414cf490e3.tar.bz2 | |
Merge branch 'for-2.6.23' into merge
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 ed53f54..b6f2639 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 unsigned short c; unsigned char cp; -#if 0 /* Can't seek (pread) on this device */ - if (ppos != &file->f_pos) - return -ESPIPE; -#endif - if (!vfd_is_open) return -ENODEV; @@ -139,11 +134,6 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_ size_t indx = len; int i, esc = 0; -#if 0 /* Can't seek (pwrite) on this device */ - if (ppos != &file->f_pos) - return -ESPIPE; -#endif - if (!vfd_is_open) return -EBUSY; diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c index 322bc5f..b3ab42e 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; * calling hvc_poll() who determines whether a console adapter support * interrupts. */ -int khvcd(void *unused) +static int khvcd(void *unused) { int poll_mask; struct hvc_struct *hp; diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c index 13faf8d..db57277 100644 --- a/drivers/char/viotape.c +++ b/drivers/char/viotape.c @@ -873,12 +873,12 @@ free_op: } const struct file_operations viotap_fops = { - owner: THIS_MODULE, - read: viotap_read, - write: viotap_write, - ioctl: viotap_ioctl, - open: viotap_open, - release: viotap_release, + .owner = THIS_MODULE, + .read = viotap_read, + .write = viotap_write, + .ioctl = viotap_ioctl, + .open = viotap_open, + .release = viotap_release, }; /* Handle interrupt events for tape */ |