Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: usbip: userspace: whitespace cleanup

Signed-off-by: matt mooney <mfm@muteddisk.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

matt mooney and committed by
Greg Kroah-Hartman
9abec452 33df2286

+40 -40
+5 -5
drivers/staging/usbip/userspace/COPYING
··· 55 55 56 56 The precise terms and conditions for copying, distribution and 57 57 modification follow. 58 - 58 + 59 59 GNU GENERAL PUBLIC LICENSE 60 60 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 61 61 ··· 110 110 License. (Exception: if the Program itself is interactive but 111 111 does not normally print such an announcement, your work based on 112 112 the Program is not required to print an announcement.) 113 - 113 + 114 114 These requirements apply to the modified work as a whole. If 115 115 identifiable sections of that work are not derived from the Program, 116 116 and can be reasonably considered independent and separate works in ··· 168 168 access to copy the source code from the same place counts as 169 169 distribution of the source code, even though third parties are not 170 170 compelled to copy the source along with the object code. 171 - 171 + 172 172 4. You may not copy, modify, sublicense, or distribute the Program 173 173 except as expressly provided under this License. Any attempt 174 174 otherwise to copy, modify, sublicense or distribute the Program is ··· 225 225 226 226 This section is intended to make thoroughly clear what is believed to 227 227 be a consequence of the rest of this License. 228 - 228 + 229 229 8. If the distribution and/or use of the Program is restricted in 230 230 certain countries either by patents or by copyrighted interfaces, the 231 231 original copyright holder who places the Program under this License ··· 278 278 POSSIBILITY OF SUCH DAMAGES. 279 279 280 280 END OF TERMS AND CONDITIONS 281 - 281 + 282 282 How to Apply These Terms to Your New Programs 283 283 284 284 If you develop a new program, and you want it to be of the greatest
+20 -20
drivers/staging/usbip/userspace/README
··· 48 48 - Bind usbip.ko to the device of busid 1-2. 49 49 - A usb device 1-2 is now exportable to other hosts! 50 50 - Use 'usbip_bind_driver --other 1-2' when you want to shutdown exporting 51 - and use the device locally. 51 + and use the device locally. 52 52 53 53 54 54 client:# insmod usbip_common_mod.ko ··· 87 87 List USB devices 88 88 - busid 3-3.2 (04bb:0206) 89 89 3-3.2:1.0 -> usb-storage 90 - 90 + 91 91 - busid 3-3.1 (08bb:2702) 92 92 3-3.1:1.0 -> snd-usb-audio 93 93 3-3.1:1.1 -> snd-usb-audio 94 - 94 + 95 95 - busid 3-3 (0409:0058) 96 96 3-3:1.0 -> hub 97 - 97 + 98 98 - busid 3-2 (0711:0902) 99 99 3-2:1.0 -> none 100 - 100 + 101 101 - busid 1-1 (05a9:a511) 102 102 1-1:1.0 -> ov511 103 - 103 + 104 104 - busid 4-1 (046d:08b2) 105 105 4-1:1.0 -> none 106 106 4-1:1.1 -> none 107 107 4-1:1.2 -> none 108 - 108 + 109 109 - busid 5-2 (058f:9254) 110 110 5-2:1.0 -> hub 111 - 111 + 112 112 -------------------------------------------------------------------------------------------------------- 113 113 Mark the device of busid 3-3.2 as exportable. 114 114 115 115 trois:# usbip_bind_driver --usbip 3-3.2 116 - ** (process:24621): DEBUG: 3-3.2:1.0 -> none 116 + ** (process:24621): DEBUG: 3-3.2:1.0 -> none 117 117 ** (process:24621): DEBUG: write "add 3-3.2" to /sys/bus/usb/drivers/usbip/match_busid 118 118 ** Message: bind 3-3.2 to usbip, complete! 119 - 119 + 120 120 trois:# usbip_bind_driver --list 121 121 List USB devices 122 122 - busid 3-3.2 (04bb:0206) ··· 141 141 : /sys/devices/pci0000:00/0000:00:1f.2/usb1/1-1 142 142 : (Defined at Interface level) / unknown subclass / unknown protocol (00/00/00) 143 143 : 0 - Mass Storage / SCSI / Bulk (Zip) (08/06/50) 144 - 144 + 145 145 1-2.2.1: Apple Computer, Inc. : unknown product (05ac:0203) 146 146 : /sys/devices/pci0000:00/0000:00:1f.2/usb1/1-2/1-2.2/1-2.2.1 147 147 : (Defined at Interface level) / unknown subclass / unknown protocol (00/00/00) 148 148 : 0 - Human Interface Devices / Boot Interface Subclass / Keyboard (03/01/01) 149 - 149 + 150 150 1-2.2.3: OmniVision Technologies, Inc. : OV511+ WebCam (05a9:a511) 151 151 : /sys/devices/pci0000:00/0000:00:1f.2/usb1/1-2/1-2.2/1-2.2.3 152 152 : (Defined at Interface level) / unknown subclass / unknown protocol (00/00/00) 153 153 : 0 - Vendor Specific Class / unknown subclass / unknown protocol (ff/00/00) 154 - 154 + 155 155 3-1: Logitech, Inc. : QuickCam Pro 4000 (046d:08b2) 156 156 : /sys/devices/pci0000:00/0000:00:1e.0/0000:02:0a.0/usb3/3-1 157 157 : (Defined at Interface level) / unknown subclass / unknown protocol (00/00/00) 158 158 : 0 - Data / unknown subclass / unknown protocol (0a/ff/00) 159 159 : 1 - Audio / Control Device / unknown protocol (01/01/00) 160 160 : 2 - Audio / Streaming / unknown protocol (01/02/00) 161 - 161 + 162 162 4-1: Logitech, Inc. : QuickCam Express (046d:0870) 163 163 : /sys/devices/pci0000:00/0000:00:1e.0/0000:02:0a.1/usb4/4-1 164 164 : Vendor Specific Class / Vendor Specific Subclass / Vendor Specific Protocol (ff/ff/ff) 165 165 : 0 - Vendor Specific Class / Vendor Specific Subclass / Vendor Specific Protocol (ff/ff/ff) 166 - 166 + 167 167 4-2: Texas Instruments Japan : unknown product (08bb:2702) 168 168 : /sys/devices/pci0000:00/0000:00:1e.0/0000:02:0a.1/usb4/4-2 169 169 : (Defined at Interface level) / unknown subclass / unknown protocol (00/00/00) 170 170 : 0 - Audio / Control Device / unknown protocol (01/01/00) 171 171 : 1 - Audio / Streaming / unknown protocol (01/02/00) 172 - 172 + 173 173 -------------------------------------------------------------------------------------------------------- 174 174 Attach a remote usb device! 175 175 176 176 deux:# usbip --attach 10.0.0.3 1-1 177 177 port 0 attached 178 - 178 + 179 179 -------------------------------------------------------------------------------------------------------- 180 180 Show what devices are attached to this client. 181 181 ··· 183 183 Port 00: <Port in Use> at Full Speed(12Mbps) 184 184 Prolific Technology, Inc. : unknown product (067b:3507) 185 185 6-1 -> usbip://10.0.0.3:3240/1-1 (remote bus/dev 001/004) 186 - 6-1:1.0 used by usb-storage 186 + 6-1:1.0 used by usb-storage 187 187 /sys/class/scsi_device/0:0:0:0/device 188 188 /sys/class/scsi_host/host0/device 189 189 /sys/block/sda/device 190 - 190 + 191 191 -------------------------------------------------------------------------------------------------------- 192 192 Detach the imported device. 193 193 194 194 deux:# usbip --detach 0 195 195 port 0 detached 196 - 196 + 197 197 -------------------------------------------------------------------------------------------------------- 198 198 199 199
+1 -1
drivers/staging/usbip/userspace/configure.ac
··· 93 93 *) AC_MSG_ERROR(bad value ${enableval} for --enable-usbids-install) ;; 94 94 esac]) 95 95 AM_CONDITIONAL(INSTALL_USBIDS, test x$usbids = xinstall) 96 - 96 + 97 97 98 98 99 99 GLIB2_REQUIRED=2.6.0
+3 -3
drivers/staging/usbip/userspace/doc/usbip_bind_driver.8
··· 7 7 [\fIoptions\fR] 8 8 9 9 .SH DESCRIPTION 10 - Driver bindings for USB devices can be changed using 11 - this program. It is used to export and unexport USB 10 + Driver bindings for USB devices can be changed using 11 + this program. It is used to export and unexport USB 12 12 devices over USB/IP. 13 13 14 14 .SH OPTIONS ··· 34 34 - Bind usbip.ko to the device of busid 1-2. 35 35 - A usb device 1-2 is now exportable to other hosts! 36 36 37 - server:# usbip_bind_driver --other 1-2 37 + server:# usbip_bind_driver --other 1-2 38 38 - Shutdown exporting and use the device locally. 39 39 40 40 .SH "SEE ALSO"
+1 -1
drivers/staging/usbip/userspace/libsrc/stub_driver.c
··· 87 87 } 88 88 89 89 if (retries == 0) 90 - err("usbip_status not ready after %d retries", 90 + err("usbip_status not ready after %d retries", 91 91 SYSFS_OPEN_RETRIES); 92 92 else if (retries < SYSFS_OPEN_RETRIES) 93 93 info("warning: usbip_status ready after %d retries",
+5 -5
drivers/staging/usbip/userspace/src/bind-driver.c
··· 177 177 return -1; 178 178 } 179 179 180 - for (i = 0; i < ninterface; i++) { 181 - char driver[PATH_MAX]; 180 + for (i = 0; i < ninterface; i++) { 181 + char driver[PATH_MAX]; 182 182 int ret; 183 183 184 184 bzero(&driver, sizeof(driver)); 185 185 186 - getdriver(busid, configvalue, i, driver, PATH_MAX-1); 186 + getdriver(busid, configvalue, i, driver, PATH_MAX-1); 187 187 188 188 g_debug(" %s:%d.%d -> %s ", busid, configvalue, i, driver); 189 189 ··· 226 226 return -1; 227 227 } 228 228 229 - for (i = 0; i < ninterface; i++) { 229 + for (i = 0; i < ninterface; i++) { 230 230 int ret; 231 231 232 232 ret = bind_interface(busid, configvalue, i, "usbip"); ··· 527 527 } 528 528 #endif 529 529 } 530 - 530 + 531 531 if (be_local == 0) 532 532 use_device_by_usbip(busid); 533 533 }
+3 -3
drivers/staging/usbip/userspace/src/usbip.c
··· 619 619 if (geteuid() != 0) 620 620 g_warning("running non-root?"); 621 621 622 - ret = usbip_names_init(USBIDS_FILE); 623 - if (ret) 624 - notice("failed to open %s", USBIDS_FILE); 622 + ret = usbip_names_init(USBIDS_FILE); 623 + if (ret) 624 + notice("failed to open %s", USBIDS_FILE); 625 625 626 626 for (;;) { 627 627 int c;
+2 -2
drivers/staging/usbip/userspace/src/usbip_network.h
··· 96 96 } __attribute__((packed)); 97 97 98 98 struct op_export_reply { 99 - int returncode; 99 + int returncode; 100 100 } __attribute__((packed)); 101 101 102 102 ··· 118 118 } __attribute__((packed)); 119 119 120 120 struct op_unexport_reply { 121 - int returncode; 121 + int returncode; 122 122 } __attribute__((packed)); 123 123 124 124 #define PACK_OP_UNEXPORT_REQUEST(pack, request) do {\