staging: ozwpan: Replace oz_trace with oz_dbg

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / staging / ozwpan / ozpd.c

diff --git a/drivers/staging/ozwpan/ozpd.c b/drivers/staging/ozwpan/ozpd.c
index d67dff2..28adbb4 100644 (file)
--- a/drivers/staging/ozwpan/ozpd.c
+++ b/drivers/staging/ozwpan/ozpd.c
@@ -9,6 +9,7 @@
 #include <linux/sched.h>
 #include <linux/netdevice.h>
 #include <linux/errno.h>
+#include "ozdbg.h"
 #include "ozconfig.h"
 #include "ozprotocol.h"
 #include "ozeltbuf.h"
@@ -123,16 +124,16 @@ void oz_pd_set_state(struct oz_pd *pd, unsigned state)
 #ifdef WANT_TRACE
        switch (state) {
        case OZ_PD_S_IDLE:
-               oz_trace("PD State: OZ_PD_S_IDLE\n");
+               oz_pd_dbg(pd, ON, "PD State: OZ_PD_S_IDLE\n");
                break;
        case OZ_PD_S_CONNECTED:
-               oz_trace("PD State: OZ_PD_S_CONNECTED\n");
+               oz_pd_dbg(pd, ON, "PD State: OZ_PD_S_CONNECTED\n");
                break;
        case OZ_PD_S_STOPPED:
-               oz_trace("PD State: OZ_PD_S_STOPPED\n");
+               oz_pd_dbg(pd, ON, "PD State: OZ_PD_S_STOPPED\n");
                break;
        case OZ_PD_S_SLEEP:
-               oz_trace("PD State: OZ_PD_S_SLEEP\n");
+               oz_pd_dbg(pd, ON, "PD State: OZ_PD_S_SLEEP\n");
                break;
        }
 #endif /* WANT_TRACE */
@@ -189,7 +190,7 @@ void oz_pd_destroy(struct oz_pd *pd)
        struct oz_tx_frame *f;
        struct oz_isoc_stream *st;
        struct oz_farewell *fwell;
-       oz_trace("Destroying PD\n");
+       oz_pd_dbg(pd, ON, "Destroying PD\n");
        /* Delete any streams.
         */
        e = pd->stream_list.next;
@@ -235,13 +236,14 @@ int oz_services_start(struct oz_pd *pd, u16 apps, int resume)
 {
        const struct oz_app_if *ai;
        int rc = 0;
-       oz_trace("oz_services_start(0x%x) resume(%d)\n", apps, resume);
+       oz_pd_dbg(pd, ON, "%s: (0x%x) resume(%d)\n", __func__, apps, resume);
        for (ai = g_app_if; ai < &g_app_if[OZ_APPID_MAX]; ai++) {
                if (apps & (1<<ai->app_id)) {
                        if (ai->start(pd, resume)) {
                                rc = -1;
-                               oz_trace("Unabled to start service %d\n",
-                                       ai->app_id);
+                               oz_pd_dbg(pd, ON,
+                                         "Unable to start service %d\n",
+                                         ai->app_id);
                                break;
                        }
                        oz_polling_lock_bh();
@@ -259,7 +261,7 @@ int oz_services_start(struct oz_pd *pd, u16 apps, int resume)
 void oz_services_stop(struct oz_pd *pd, u16 apps, int pause)
 {
        const struct oz_app_if *ai;
-       oz_trace("oz_stop_services(0x%x) pause(%d)\n", apps, pause);
+       oz_pd_dbg(pd, ON, "%s: (0x%x) pause(%d)\n", __func__, apps, pause);
        for (ai = g_app_if; ai < &g_app_if[OZ_APPID_MAX]; ai++) {
                if (apps & (1<<ai->app_id)) {
                        oz_polling_lock_bh();
@@ -301,7 +303,7 @@ void oz_pd_heartbeat(struct oz_pd *pd, u16 apps)
 void oz_pd_stop(struct oz_pd *pd)
 {
        u16 stop_apps = 0;
-       oz_trace("oz_pd_stop() State = 0x%x\n", pd->state);
+       oz_dbg(ON, "oz_pd_stop() State = 0x%x\n", pd->state);
        oz_pd_indicate_farewells(pd);
        oz_polling_lock_bh();
        stop_apps = pd->total_apps;
@@ -314,7 +316,7 @@ void oz_pd_stop(struct oz_pd *pd)
        /* Remove from PD list.*/
        list_del(&pd->link);
        oz_polling_unlock_bh();
-       oz_trace("pd ref count = %d\n", atomic_read(&pd->ref_count));
+       oz_dbg(ON, "pd ref count = %d\n", atomic_read(&pd->ref_count));
        oz_timer_delete(pd, 0);
        oz_pd_put(pd);
 }
@@ -333,8 +335,8 @@ int oz_pd_sleep(struct oz_pd *pd)
        if (pd->keep_alive_j && pd->session_id) {
                oz_pd_set_state(pd, OZ_PD_S_SLEEP);
                pd->pulse_time_j = jiffies + pd->keep_alive_j;
-               oz_trace("Sleep Now %lu until %lu\n",
-                       jiffies, pd->pulse_time_j);
+               oz_dbg(ON, "Sleep Now %lu until %lu\n",
+                      jiffies, pd->pulse_time_j);
        } else {
                do_stop = 1;
        }
@@ -384,8 +386,8 @@ static void oz_tx_isoc_free(struct oz_pd *pd, struct oz_tx_frame *f)
        } else {
                kfree(f);
        }
-       oz_trace2(OZ_TRACE_TX_FRAMES, "Releasing ISOC Frame isoc_nb= %d\n",
-                                               pd->nb_queued_isoc_frames);
+       oz_dbg(TX_FRAMES, "Releasing ISOC Frame isoc_nb= %d\n",
+              pd->nb_queued_isoc_frames);
 }
 /*------------------------------------------------------------------------------
  * Context: softirq or process
@@ -540,18 +542,16 @@ static int oz_send_next_queued_frame(struct oz_pd *pd, int more_data)
                if ((int)atomic_read(&g_submitted_isoc) <
                                                        OZ_MAX_SUBMITTED_ISOC) {
                        if (dev_queue_xmit(skb) < 0) {
-                               oz_trace2(OZ_TRACE_TX_FRAMES,
-                                               "Dropping ISOC Frame\n");
+                               oz_dbg(TX_FRAMES, "Dropping ISOC Frame\n");
                                return -1;
                        }
                        atomic_inc(&g_submitted_isoc);
-                       oz_trace2(OZ_TRACE_TX_FRAMES,
-                                       "Sending ISOC Frame, nb_isoc= %d\n",
-                                               pd->nb_queued_isoc_frames);
+                       oz_dbg(TX_FRAMES, "Sending ISOC Frame, nb_isoc= %d\n",
+                              pd->nb_queued_isoc_frames);
                        return 0;
                } else {
                        kfree_skb(skb);
-                       oz_trace2(OZ_TRACE_TX_FRAMES, "Dropping ISOC Frame>\n");
+                       oz_dbg(TX_FRAMES, "Dropping ISOC Frame>\n");
                        return -1;
                }
        }
@@ -561,7 +561,7 @@ static int oz_send_next_queued_frame(struct oz_pd *pd, int more_data)
        spin_unlock(&pd->tx_frame_lock);
        if (more_data)
                oz_set_more_bit(skb);
-       oz_trace2(OZ_TRACE_TX_FRAMES, "TX frame PN=0x%x\n", f->hdr.pkt_num);
+       oz_dbg(TX_FRAMES, "TX frame PN=0x%x\n", f->hdr.pkt_num);
        if (skb) {
                if (dev_queue_xmit(skb) < 0)
                        return -1;
@@ -627,7 +627,7 @@ static int oz_send_isoc_frame(struct oz_pd *pd)
                return 0;
        skb = alloc_skb(total_size + OZ_ALLOCATED_SPACE(dev), GFP_ATOMIC);
        if (skb == NULL) {
-               oz_trace("Cannot alloc skb\n");
+               oz_dbg(ON, "Cannot alloc skb\n");
                oz_elt_info_free_chain(&pd->elt_buff, &list);
                return -1;
        }
@@ -675,8 +675,8 @@ void oz_retire_tx_frames(struct oz_pd *pd, u8 lpn)
                diff = (lpn - (pkt_num & OZ_LAST_PN_MASK)) & OZ_LAST_PN_MASK;
                if ((diff > OZ_LAST_PN_HALF_CYCLE) || (pkt_num == 0))
                        break;
-               oz_trace2(OZ_TRACE_TX_FRAMES, "Releasing pkt_num= %u, nb= %d\n",
-                                                pkt_num, pd->nb_queued_frames);
+               oz_dbg(TX_FRAMES, "Releasing pkt_num= %u, nb= %d\n",
+                      pkt_num, pd->nb_queued_frames);
                if (first == NULL)
                        first = e;
                last = e;
@@ -835,9 +835,8 @@ int oz_send_isoc_unit(struct oz_pd *pd, u8 ep_num, const u8 *data, int len)
                        struct oz_tx_frame *isoc_unit = NULL;
                        int nb = pd->nb_queued_isoc_frames;
                        if (nb >= pd->isoc_latency) {
-                               oz_trace2(OZ_TRACE_TX_FRAMES,
-                                               "Dropping ISOC Unit nb= %d\n",
-                                                                       nb);
+                               oz_dbg(TX_FRAMES, "Dropping ISOC Unit nb= %d\n",
+                                      nb);
                                goto out;
                        }
                        isoc_unit = oz_tx_frame_alloc(pd);
@@ -849,9 +848,9 @@ int oz_send_isoc_unit(struct oz_pd *pd, u8 ep_num, const u8 *data, int len)
                        list_add_tail(&isoc_unit->link, &pd->tx_queue);
                        pd->nb_queued_isoc_frames++;
                        spin_unlock_bh(&pd->tx_frame_lock);
-                       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_dbg(TX_FRAMES,
+                              "Added ISOC Frame to Tx Queue isoc_nb= %d, nb= %d\n",
+                              pd->nb_queued_isoc_frames, pd->nb_queued_frames);
                        return 0;
                }