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

staging: usbip: usbip_event.c: 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 f9eacc98
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* USA. * USA.
*/ */
#include "usbip_common.h"
#include <linux/kthread.h> #include <linux/kthread.h>
#include "usbip_common.h"
static int event_handler(struct usbip_device *ud) static int event_handler(struct usbip_device *ud)
{ {
...@@ -36,21 +36,18 @@ static int event_handler(struct usbip_device *ud) ...@@ -36,21 +36,18 @@ static int event_handler(struct usbip_device *ud)
*/ */
if (ud->event & USBIP_EH_SHUTDOWN) { if (ud->event & USBIP_EH_SHUTDOWN) {
ud->eh_ops.shutdown(ud); ud->eh_ops.shutdown(ud);
ud->event &= ~USBIP_EH_SHUTDOWN; ud->event &= ~USBIP_EH_SHUTDOWN;
} }
/* Reset the device. */ /* Reset the device. */
if (ud->event & USBIP_EH_RESET) { if (ud->event & USBIP_EH_RESET) {
ud->eh_ops.reset(ud); ud->eh_ops.reset(ud);
ud->event &= ~USBIP_EH_RESET; ud->event &= ~USBIP_EH_RESET;
} }
/* Mark the device as unusable. */ /* Mark the device as unusable. */
if (ud->event & USBIP_EH_UNUSABLE) { if (ud->event & USBIP_EH_UNUSABLE) {
ud->eh_ops.unusable(ud); ud->eh_ops.unusable(ud);
ud->event &= ~USBIP_EH_UNUSABLE; ud->event &= ~USBIP_EH_UNUSABLE;
} }
...@@ -75,6 +72,7 @@ static int event_handler_loop(void *data) ...@@ -75,6 +72,7 @@ static int event_handler_loop(void *data)
if (event_handler(ud) < 0) if (event_handler(ud) < 0)
break; break;
} }
return 0; return 0;
} }
...@@ -89,6 +87,7 @@ int usbip_start_eh(struct usbip_device *ud) ...@@ -89,6 +87,7 @@ int usbip_start_eh(struct usbip_device *ud)
"Unable to start control thread\n"); "Unable to start control thread\n");
return PTR_ERR(ud->eh); return PTR_ERR(ud->eh);
} }
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(usbip_start_eh); EXPORT_SYMBOL_GPL(usbip_start_eh);
...@@ -106,11 +105,8 @@ EXPORT_SYMBOL_GPL(usbip_stop_eh); ...@@ -106,11 +105,8 @@ EXPORT_SYMBOL_GPL(usbip_stop_eh);
void usbip_event_add(struct usbip_device *ud, unsigned long event) void usbip_event_add(struct usbip_device *ud, unsigned long event)
{ {
spin_lock(&ud->lock); spin_lock(&ud->lock);
ud->event |= event; ud->event |= event;
wake_up(&ud->eh_waitq); wake_up(&ud->eh_waitq);
spin_unlock(&ud->lock); spin_unlock(&ud->lock);
} }
EXPORT_SYMBOL_GPL(usbip_event_add); EXPORT_SYMBOL_GPL(usbip_event_add);
...@@ -120,10 +116,8 @@ int usbip_event_happened(struct usbip_device *ud) ...@@ -120,10 +116,8 @@ int usbip_event_happened(struct usbip_device *ud)
int happened = 0; int happened = 0;
spin_lock(&ud->lock); spin_lock(&ud->lock);
if (ud->event != 0) if (ud->event != 0)
happened = 1; happened = 1;
spin_unlock(&ud->lock); spin_unlock(&ud->lock);
return happened; return happened;
......
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