diff options
| author | matt mooney <mfm@muteddisk.com> | 2011-05-06 03:47:52 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-06 14:26:14 -0700 |
| commit | bd608f6cebed4d2ae4e22ef3cdd29968bdc746f5 (patch) | |
| tree | bf0e93dbf21ba3ec290867f3ea53cc806854010e | |
| parent | 5ef6aceb12564ad95b1d12c01503826eea4a58e4 (diff) | |
| download | linux-3.10-bd608f6cebed4d2ae4e22ef3cdd29968bdc746f5.tar.gz linux-3.10-bd608f6cebed4d2ae4e22ef3cdd29968bdc746f5.tar.bz2 linux-3.10-bd608f6cebed4d2ae4e22ef3cdd29968bdc746f5.zip | |
staging: usbip: vhci_sysfs.c: coding style cleanup
Fix a few alignment issues and remove extraneous lines.
Add braces to else clause.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/usbip/vhci_sysfs.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/staging/usbip/vhci_sysfs.c b/drivers/staging/usbip/vhci_sysfs.c index 3f2459f3041..4acded46fdf 100644 --- a/drivers/staging/usbip/vhci_sysfs.c +++ b/drivers/staging/usbip/vhci_sysfs.c @@ -52,20 +52,19 @@ static ssize_t show_status(struct device *dev, struct device_attribute *attr, struct vhci_device *vdev = port_to_vdev(i); spin_lock(&vdev->ud.lock); - out += sprintf(out, "%03u %03u ", i, vdev->ud.status); if (vdev->ud.status == VDEV_ST_USED) { out += sprintf(out, "%03u %08x ", - vdev->speed, vdev->devid); + vdev->speed, vdev->devid); out += sprintf(out, "%16p ", vdev->ud.tcp_socket); out += sprintf(out, "%s", dev_name(&vdev->udev->dev)); - } else + } else { out += sprintf(out, "000 000 000 0000000000000000 0-0"); + } out += sprintf(out, "\n"); - spin_unlock(&vdev->ud.lock); } @@ -126,6 +125,7 @@ static ssize_t store_detach(struct device *dev, struct device_attribute *attr, return -EINVAL; usbip_dbg_vhci_sysfs("Leave\n"); + return count; } static DEVICE_ATTR(detach, S_IWUSR, NULL, store_detach); @@ -182,8 +182,7 @@ static ssize_t store_attach(struct device *dev, struct device_attribute *attr, sscanf(buf, "%u %u %u %u", &rhport, &sockfd, &devid, &speed); usbip_dbg_vhci_sysfs("rhport(%u) sockfd(%u) devid(%u) speed(%u)\n", - rhport, sockfd, devid, speed); - + rhport, sockfd, devid, speed); /* check received parameters */ if (valid_args(rhport, speed) < 0) @@ -198,9 +197,7 @@ static ssize_t store_attach(struct device *dev, struct device_attribute *attr, /* begin a lock */ spin_lock(&the_controller->lock); - vdev = port_to_vdev(rhport); - spin_lock(&vdev->ud.lock); if (vdev->ud.status != VDEV_ST_NULL) { @@ -213,7 +210,7 @@ static ssize_t store_attach(struct device *dev, struct device_attribute *attr, } usbip_uinfo("rhport(%u) sockfd(%d) devid(%u) speed(%u)\n", - rhport, sockfd, devid, speed); + rhport, sockfd, devid, speed); vdev->devid = devid; vdev->speed = speed; |