diff options
Diffstat (limited to 'drivers/staging/ozwpan/ozurbparanoia.c')
| -rw-r--r-- | drivers/staging/ozwpan/ozurbparanoia.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/drivers/staging/ozwpan/ozurbparanoia.c b/drivers/staging/ozwpan/ozurbparanoia.c index 55b9afbbe47b..cf6278a198a8 100644 --- a/drivers/staging/ozwpan/ozurbparanoia.c +++ b/drivers/staging/ozwpan/ozurbparanoia.c @@ -4,37 +4,39 @@ * ----------------------------------------------------------------------------- */ #include <linux/usb.h> -#include "ozconfig.h" +#include "ozdbg.h" + #ifdef WANT_URB_PARANOIA + #include "ozurbparanoia.h" -#include "oztrace.h" -/*----------------------------------------------------------------------------- - */ + #define OZ_MAX_URBS 1000 struct urb *g_urb_memory[OZ_MAX_URBS]; int g_nb_urbs; DEFINE_SPINLOCK(g_urb_mem_lock); -/*----------------------------------------------------------------------------- - */ + void oz_remember_urb(struct urb *urb) { unsigned long irq_state; + spin_lock_irqsave(&g_urb_mem_lock, irq_state); if (g_nb_urbs < OZ_MAX_URBS) { g_urb_memory[g_nb_urbs++] = urb; - oz_trace("%lu: urb up = %d %p\n", jiffies, g_nb_urbs, urb); + oz_dbg(ON, "urb up = %d %p\n", g_nb_urbs, urb); } else { - oz_trace("ERROR urb buffer full\n"); + oz_dbg(ON, "ERROR urb buffer full\n"); } spin_unlock_irqrestore(&g_urb_mem_lock, irq_state); } -/*------------------------------------------------------------------------------ + +/* */ int oz_forget_urb(struct urb *urb) { unsigned long irq_state; int i; int rc = -1; + spin_lock_irqsave(&g_urb_mem_lock, irq_state); for (i = 0; i < g_nb_urbs; i++) { if (g_urb_memory[i] == urb) { @@ -42,8 +44,7 @@ int oz_forget_urb(struct urb *urb) if (--g_nb_urbs > i) memcpy(&g_urb_memory[i], &g_urb_memory[i+1], (g_nb_urbs - i) * sizeof(struct urb *)); - oz_trace("%lu: urb down = %d %p\n", - jiffies, g_nb_urbs, urb); + oz_dbg(ON, "urb down = %d %p\n", g_nb_urbs, urb); } } spin_unlock_irqrestore(&g_urb_mem_lock, irq_state); |