Skip to content

Commit

Permalink
staging: usbip: vhci_sysfs.c: coding style cleanup
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
matt mooney authored and Greg Kroah-Hartman committed May 6, 2011
1 parent 5ef6ace commit bd608f6
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions drivers/staging/usbip/vhci_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand All @@ -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) {
Expand All @@ -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;
Expand Down

0 comments on commit bd608f6

Please sign in to comment.