V4L/DVB: tm6000: README - add vbi

[safe/jmp/linux-2.6] / drivers / uwb / neh.c

diff --git a/drivers/uwb/neh.c b/drivers/uwb/neh.c
index 48b4ece..697e56a 100644 (file)
--- a/drivers/uwb/neh.c
+++ b/drivers/uwb/neh.c
@@ -83,11 +83,10 @@
  */
 #include <linux/kernel.h>
 #include <linux/timer.h>
+#include <linux/slab.h>
 #include <linux/err.h>
 
 #include "uwb-internal.h"
-#define D_LOCAL 0
-#include <linux/uwb/debug.h>
 
 /*
  * UWB Radio Controller Notification/Event Handle
@@ -152,7 +151,7 @@ void uwb_rc_neh_put(struct uwb_rc_neh *neh)
  *      0xff is invalid, so they must not be used. Initialization
  *      fills up those two in the bitmap so they are not allocated.
  *
- * We spread the allocation around to reduce the posiblity of two
+ * We spread the allocation around to reduce the possibility of two
  * consecutive opened @neh's getting the same context ID assigned (to
  * avoid surprises with late events that timed out long time ago). So
  * first we search from where @rc->ctx_roll is, if not found, we
@@ -349,7 +348,7 @@ struct uwb_rc_neh *uwb_rc_neh_lookup(struct uwb_rc *rc,
 }
 
 
-/**
+/*
  * Process notifications coming from the radio control interface
  *
  * @rc:    UWB Radio Control Interface descriptor
@@ -401,23 +400,6 @@ void uwb_rc_notif(struct uwb_rc *rc, struct uwb_rceb *rceb, ssize_t size)
        uwb_evt->notif.size = size;
        uwb_evt->notif.rceb = rceb;
 
-       switch (le16_to_cpu(rceb->wEvent)) {
-               /* Trap some vendor specific events
-                *
-                * FIXME: move this to handling in ptc-est, where we
-                * register a NULL event handler for these two guys
-                * using the Intel IDs.
-                */
-       case 0x0103:
-               dev_info(dev, "FIXME: DEVICE ADD\n");
-               return;
-       case 0x0104:
-               dev_info(dev, "FIXME: DEVICE RM\n");
-               return;
-       default:
-               break;
-       }
-
        uwbd_event_queue(uwb_evt);
 }
 
@@ -496,8 +478,6 @@ void uwb_rc_neh_grok(struct uwb_rc *rc, void *buf, size_t buf_size)
        size_t size, real_size, event_size;
        int needtofree;
 
-       d_fnstart(3, dev, "(rc %p buf %p %zu buf_size)\n", rc, buf, buf_size);
-       d_printf(2, dev, "groking event block: %zu bytes\n", buf_size);
        itr = buf;
        size = buf_size;
        while (size > 0) {
@@ -545,10 +525,7 @@ void uwb_rc_neh_grok(struct uwb_rc *rc, void *buf, size_t buf_size)
 
                itr += real_size;
                size -= real_size;
-               d_printf(2, dev, "consumed %zd bytes, %zu left\n",
-                        event_size, size);
        }
-       d_fnend(3, dev, "(rc %p buf %p %zu buf_size) = void\n", rc, buf, buf_size);
 }
 EXPORT_SYMBOL_GPL(uwb_rc_neh_grok);