Commit ddbc9bc9 authored by matt mooney's avatar matt mooney Committed by Greg Kroah-Hartman

staging: usbip: vhci.h: coding style cleanup

Fix a few alignment issues and remove extraneous lines.
Signed-off-by: default avatarmatt mooney <mfm@muteddisk.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 09e0650b
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/usb/hcd.h> #include <linux/usb/hcd.h>
struct vhci_device { struct vhci_device {
struct usb_device *udev; struct usb_device *udev;
...@@ -33,12 +32,11 @@ struct vhci_device { ...@@ -33,12 +32,11 @@ struct vhci_device {
/* speed of a remote device */ /* speed of a remote device */
enum usb_device_speed speed; enum usb_device_speed speed;
/* vhci root-hub port to which this device is attached */ /* vhci root-hub port to which this device is attached */
__u32 rhport; __u32 rhport;
struct usbip_device ud; struct usbip_device ud;
/* lock for the below link lists */ /* lock for the below link lists */
spinlock_t priv_lock; spinlock_t priv_lock;
...@@ -54,7 +52,6 @@ struct vhci_device { ...@@ -54,7 +52,6 @@ struct vhci_device {
wait_queue_head_t waitq_tx; wait_queue_head_t waitq_tx;
}; };
/* urb->hcpriv, use container_of() */ /* urb->hcpriv, use container_of() */
struct vhci_priv { struct vhci_priv {
unsigned long seqnum; unsigned long seqnum;
...@@ -64,7 +61,6 @@ struct vhci_priv { ...@@ -64,7 +61,6 @@ struct vhci_priv {
struct urb *urb; struct urb *urb;
}; };
struct vhci_unlink { struct vhci_unlink {
/* seqnum of this request */ /* seqnum of this request */
unsigned long seqnum; unsigned long seqnum;
...@@ -85,12 +81,12 @@ struct vhci_unlink { ...@@ -85,12 +81,12 @@ struct vhci_unlink {
/* for usb_bus.hcpriv */ /* for usb_bus.hcpriv */
struct vhci_hcd { struct vhci_hcd {
spinlock_t lock; spinlock_t lock;
u32 port_status[VHCI_NPORTS]; u32 port_status[VHCI_NPORTS];
unsigned resuming:1; unsigned resuming:1;
unsigned long re_timeout; unsigned long re_timeout;
atomic_t seqnum; atomic_t seqnum;
...@@ -102,11 +98,9 @@ struct vhci_hcd { ...@@ -102,11 +98,9 @@ struct vhci_hcd {
struct vhci_device vdev[VHCI_NPORTS]; struct vhci_device vdev[VHCI_NPORTS];
}; };
extern struct vhci_hcd *the_controller; extern struct vhci_hcd *the_controller;
extern struct attribute_group dev_attr_group; extern struct attribute_group dev_attr_group;
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/* prototype declaration */ /* prototype declaration */
...@@ -116,10 +110,9 @@ void rh_port_disconnect(int rhport); ...@@ -116,10 +110,9 @@ void rh_port_disconnect(int rhport);
int vhci_rx_loop(void *data); int vhci_rx_loop(void *data);
int vhci_tx_loop(void *data); int vhci_tx_loop(void *data);
struct urb *pickup_urb_and_free_priv(struct vhci_device *vdev, struct urb *pickup_urb_and_free_priv(struct vhci_device *vdev, __u32 seqnum);
__u32 seqnum);
#define hardware (&the_controller->pdev.dev) #define hardware (&the_controller->pdev.dev)
static inline struct vhci_device *port_to_vdev(__u32 port) static inline struct vhci_device *port_to_vdev(__u32 port)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment