diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 15:40:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 15:40:57 -0400 |
commit | 37b05b17985ecc43a33e2a8cbdaa220115de4703 (patch) | |
tree | 8213bf790182711677018ed322a9ccf61470242e /drivers/usb/mon/mon_bin.c | |
parent | ce1d5b23a8d1e19866ab82bdec0dc41fde5273d8 (diff) | |
parent | 4953d141dc5db748475001cfbfdcc42e66cf900e (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (120 commits)
usb: don't update devnum for wusb devices
wusb: make ep0_reinit available for modules
wusb: devices dont use a set address
wusb: teach choose_address() about wireless devices
wusb: add link wusb-usb device
wusb: add authenticathed bit to usb_dev
USB: remove unnecessary type casting of urb->context
usb serial: more fixes and groundwork for tty changes
USB: replace remaining __FUNCTION__ occurrences
USB: usbfs: export the URB_NO_INTERRUPT flag to userspace
USB: fix compile problems in ehci-hcd
USB: ehci: qh_completions cleanup and bugfix
USB: cdc-acm: signedness fix
USB: add documentation about callbacks
USB: don't explicitly reenable root-hub status interrupts
USB: OHCI: turn off RD when remote wakeup is disabled
USB: HCDs use the do_remote_wakeup flag
USB: g_file_storage: ignore bulk-out data after invalid CBW
USB: serial: remove endpoints setting checks from core and header
USB: serial: remove unneeded number endpoints settings
...
Diffstat (limited to 'drivers/usb/mon/mon_bin.c')
-rw-r--r-- | drivers/usb/mon/mon_bin.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c index 1774ba5c4c3..49145534e06 100644 --- a/drivers/usb/mon/mon_bin.c +++ b/drivers/usb/mon/mon_bin.c | |||
@@ -1026,8 +1026,6 @@ mon_bin_poll(struct file *file, struct poll_table_struct *wait) | |||
1026 | return mask; | 1026 | return mask; |
1027 | } | 1027 | } |
1028 | 1028 | ||
1029 | #if 0 | ||
1030 | |||
1031 | /* | 1029 | /* |
1032 | * open and close: just keep track of how many times the device is | 1030 | * open and close: just keep track of how many times the device is |
1033 | * mapped, to use the proper memory allocation function. | 1031 | * mapped, to use the proper memory allocation function. |
@@ -1063,13 +1061,13 @@ static int mon_bin_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
1063 | return 0; | 1061 | return 0; |
1064 | } | 1062 | } |
1065 | 1063 | ||
1066 | struct vm_operations_struct mon_bin_vm_ops = { | 1064 | static struct vm_operations_struct mon_bin_vm_ops = { |
1067 | .open = mon_bin_vma_open, | 1065 | .open = mon_bin_vma_open, |
1068 | .close = mon_bin_vma_close, | 1066 | .close = mon_bin_vma_close, |
1069 | .fault = mon_bin_vma_fault, | 1067 | .fault = mon_bin_vma_fault, |
1070 | }; | 1068 | }; |
1071 | 1069 | ||
1072 | int mon_bin_mmap(struct file *filp, struct vm_area_struct *vma) | 1070 | static int mon_bin_mmap(struct file *filp, struct vm_area_struct *vma) |
1073 | { | 1071 | { |
1074 | /* don't do anything here: "fault" will set up page table entries */ | 1072 | /* don't do anything here: "fault" will set up page table entries */ |
1075 | vma->vm_ops = &mon_bin_vm_ops; | 1073 | vma->vm_ops = &mon_bin_vm_ops; |
@@ -1079,8 +1077,6 @@ int mon_bin_mmap(struct file *filp, struct vm_area_struct *vma) | |||
1079 | return 0; | 1077 | return 0; |
1080 | } | 1078 | } |
1081 | 1079 | ||
1082 | #endif /* 0 */ | ||
1083 | |||
1084 | static const struct file_operations mon_fops_binary = { | 1080 | static const struct file_operations mon_fops_binary = { |
1085 | .owner = THIS_MODULE, | 1081 | .owner = THIS_MODULE, |
1086 | .open = mon_bin_open, | 1082 | .open = mon_bin_open, |
@@ -1090,6 +1086,7 @@ static const struct file_operations mon_fops_binary = { | |||
1090 | .poll = mon_bin_poll, | 1086 | .poll = mon_bin_poll, |
1091 | .ioctl = mon_bin_ioctl, | 1087 | .ioctl = mon_bin_ioctl, |
1092 | .release = mon_bin_release, | 1088 | .release = mon_bin_release, |
1089 | .mmap = mon_bin_mmap, | ||
1093 | }; | 1090 | }; |
1094 | 1091 | ||
1095 | static int mon_bin_wait_event(struct file *file, struct mon_reader_bin *rp) | 1092 | static int mon_bin_wait_event(struct file *file, struct mon_reader_bin *rp) |