Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / staging / ozwpan / ozpd.c

diff --git a/drivers/staging/ozwpan/ozpd.c b/drivers/staging/ozwpan/ozpd.c
index f8b9da080c4b65c5b079fcfe8d9eea9bdd5f41a6..d67dff2430adbb46381a0b39c0fb26be70d8a68e 100644 (file)
--- a/drivers/staging/ozwpan/ozpd.c
+++ b/drivers/staging/ozwpan/ozpd.c
@@ -15,7 +15,6 @@
 #include "ozpd.h"
 #include "ozproto.h"
 #include "oztrace.h"
-#include "ozevent.h"
 #include "ozcdev.h"
 #include "ozusbsvc.h"
 #include <asm/unaligned.h>
@@ -121,7 +120,6 @@ static void oz_def_app_rx(struct oz_pd *pd, struct oz_elt *elt)
 void oz_pd_set_state(struct oz_pd *pd, unsigned state)
 {
        pd->state = state;
-       oz_event_log(OZ_EVT_PD_STATE, 0, 0, NULL, state);
 #ifdef WANT_TRACE
        switch (state) {
        case OZ_PD_S_IDLE:
@@ -544,7 +542,6 @@ static int oz_send_next_queued_frame(struct oz_pd *pd, int more_data)
                        if (dev_queue_xmit(skb) < 0) {
                                oz_trace2(OZ_TRACE_TX_FRAMES,
                                                "Dropping ISOC Frame\n");
-                               oz_event_log(OZ_EVT_TX_ISOC_DROP, 0, 0, NULL, 0);
                                return -1;
                        }
                        atomic_inc(&g_submitted_isoc);
@@ -555,7 +552,6 @@ static int oz_send_next_queued_frame(struct oz_pd *pd, int more_data)
                } else {
                        kfree_skb(skb);
                        oz_trace2(OZ_TRACE_TX_FRAMES, "Dropping ISOC Frame>\n");
-                       oz_event_log(OZ_EVT_TX_ISOC_DROP, 0, 0, NULL, 0);
                        return -1;
                }
        }
@@ -567,10 +563,6 @@ static int oz_send_next_queued_frame(struct oz_pd *pd, int more_data)
                oz_set_more_bit(skb);
        oz_trace2(OZ_TRACE_TX_FRAMES, "TX frame PN=0x%x\n", f->hdr.pkt_num);
        if (skb) {
-               oz_event_log(OZ_EVT_TX_FRAME,
-                       0,
-                       (((u16)f->hdr.control)<<8)|f->hdr.last_pkt_num,
-                       NULL, f->hdr.pkt_num);
                if (dev_queue_xmit(skb) < 0)
                        return -1;
 
@@ -659,7 +651,6 @@ static int oz_send_isoc_frame(struct oz_pd *pd)
                memcpy(elt, ei->data, ei->length);
                elt = oz_next_elt(elt);
        }
-       oz_event_log(OZ_EVT_TX_ISOC, 0, 0, NULL, 0);
        dev_queue_xmit(skb);
        oz_elt_info_free_chain(&pd->elt_buff, &list);
        return 0;
@@ -768,8 +759,6 @@ int oz_isoc_stream_delete(struct oz_pd *pd, u8 ep_num)
 static void oz_isoc_destructor(struct sk_buff *skb)
 {
        atomic_dec(&g_submitted_isoc);
-       oz_event_log(OZ_EVT_TX_ISOC_DONE, atomic_read(&g_submitted_isoc),
-               0, skb, 0);
 }
 /*------------------------------------------------------------------------------
  * Context: softirq
@@ -863,25 +852,19 @@ int oz_send_isoc_unit(struct oz_pd *pd, u8 ep_num, const u8 *data, int len)
                        oz_trace2(OZ_TRACE_TX_FRAMES,
                        "Added ISOC Frame to Tx Queue isoc_nb= %d, nb= %d\n",
                        pd->nb_queued_isoc_frames, pd->nb_queued_frames);
-                       oz_event_log(OZ_EVT_TX_ISOC, nb_units, iso.frame_number,
-                                       skb, atomic_read(&g_submitted_isoc));
                        return 0;
                }
 
                /*In ANYTIME mode Xmit unit immediately*/
                if (atomic_read(&g_submitted_isoc) < OZ_MAX_SUBMITTED_ISOC) {
                        atomic_inc(&g_submitted_isoc);
-                       oz_event_log(OZ_EVT_TX_ISOC, nb_units, iso.frame_number,
-                                       skb, atomic_read(&g_submitted_isoc));
-                       if (dev_queue_xmit(skb) < 0) {
-                               oz_event_log(OZ_EVT_TX_ISOC_DROP, 0, 0, NULL, 0);
+                       if (dev_queue_xmit(skb) < 0)
                                return -1;
-                       } else
+                       else
                                return 0;
                }
 
-out:   oz_event_log(OZ_EVT_TX_ISOC_DROP, 0, 0, NULL, 0);
-       kfree_skb(skb);
+out:   kfree_skb(skb);
        return -1;
 
        }