staging: vc04_services: Drop vchiq_log_trace() in favour of dev_dbg

[sfrench/cifs-2.6.git] / drivers / staging / vc04_services / interface / vchiq_arm / vchiq_arm.c

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 56326b59a718a1b1ef851450a710ae8a9cf1d87a..e337b838764784ffdf0e2296039a16a297b7240d 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -255,8 +255,7 @@ create_pagelist(struct vchiq_instance *instance, char *buf, char __user *ubuf,
        pagelist = dma_alloc_coherent(instance->state->dev, pagelist_size, &dma_addr,
                                      GFP_KERNEL);
 
-       vchiq_log_trace(instance->state->dev, VCHIQ_ARM,
-                       "%s - %pK", __func__, pagelist);
+       dev_dbg(instance->state->dev, "arm: %pK\n", pagelist);
 
        if (!pagelist)
                return NULL;
@@ -407,8 +406,7 @@ free_pagelist(struct vchiq_instance *instance, struct vchiq_pagelist_info *pagel
        struct page **pages = pagelistinfo->pages;
        unsigned int num_pages = pagelistinfo->num_pages;
 
-       vchiq_log_trace(instance->state->dev, VCHIQ_ARM,
-                       "%s - %pK, %d", __func__, pagelistinfo->pagelist, actual);
+       dev_dbg(instance->state->dev, "arm: %pK, %d\n", pagelistinfo->pagelist, actual);
 
        /*
         * NOTE: dma_unmap_sg must be called before the
@@ -708,8 +706,7 @@ int vchiq_initialise(struct vchiq_instance **instance_out)
        ret = 0;
 
 failed:
-       vchiq_log_trace(state->dev, VCHIQ_CORE,
-                       "%s(%p): returning %d", __func__, instance, ret);
+       dev_dbg(state->dev, "core: (%p): returning %d\n", instance, ret);
 
        return ret;
 }
@@ -742,8 +739,7 @@ int vchiq_shutdown(struct vchiq_instance *instance)
 
        mutex_unlock(&state->mutex);
 
-       vchiq_log_trace(state->dev, VCHIQ_CORE,
-                       "%s(%p): returning %d", __func__, instance, status);
+       dev_dbg(state->dev, "core: (%p): returning %d\n", instance, status);
 
        free_bulk_waiter(instance);
        kfree(instance);
@@ -763,8 +759,8 @@ int vchiq_connect(struct vchiq_instance *instance)
        struct vchiq_state *state = instance->state;
 
        if (mutex_lock_killable(&state->mutex)) {
-               vchiq_log_trace(state->dev, VCHIQ_CORE,
-                               "%s: call to mutex_lock failed", __func__);
+               dev_dbg(state->dev,
+                       "core: call to mutex_lock failed\n");
                status = -EAGAIN;
                goto failed;
        }
@@ -776,8 +772,7 @@ int vchiq_connect(struct vchiq_instance *instance)
        mutex_unlock(&state->mutex);
 
 failed:
-       vchiq_log_trace(state->dev, VCHIQ_CORE,
-                       "%s(%p): returning %d", __func__, instance, status);
+       dev_dbg(state->dev, "core: (%p): returning %d\n", instance, status);
 
        return status;
 }
@@ -808,8 +803,7 @@ vchiq_add_service(struct vchiq_instance *instance,
                status = -EINVAL;
        }
 
-       vchiq_log_trace(state->dev, VCHIQ_CORE,
-                       "%s(%p): returning %d", __func__, instance, status);
+       dev_dbg(state->dev, "core: (%p): returning %d\n", instance, status);
 
        return status;
 }
@@ -840,8 +834,7 @@ vchiq_open_service(struct vchiq_instance *instance,
        }
 
 failed:
-       vchiq_log_trace(state->dev, VCHIQ_CORE,
-                       "%s(%p): returning %d", __func__, instance, status);
+       dev_dbg(state->dev, "core: (%p): returning %d\n", instance, status);
 
        return status;
 }
@@ -1010,8 +1003,7 @@ add_completion(struct vchiq_instance *instance, enum vchiq_reason reason,
        while ((insert - instance->completion_remove) >= MAX_COMPLETIONS) {
                /* Out of space - wait for the client */
                DEBUG_TRACE(SERVICE_CALLBACK_LINE);
-               vchiq_log_trace(instance->state->dev, VCHIQ_CORE,
-                               "%s - completion queue full", __func__);
+               dev_dbg(instance->state->dev, "core: completion queue full\n");
                DEBUG_COUNT(COMPLETION_QUEUE_FULL_COUNT);
                if (wait_for_completion_interruptible(&instance->remove_event)) {
                        vchiq_log_debug(instance->state->dev, VCHIQ_ARM,
@@ -1099,11 +1091,11 @@ service_callback(struct vchiq_instance *instance, enum vchiq_reason reason,
        vchiq_service_get(service);
        rcu_read_unlock();
 
-       vchiq_log_trace(service->state->dev, VCHIQ_ARM,
-                       "%s - service %lx(%d,%p), reason %d, header %lx, instance %lx, bulk_userdata %lx",
-                       __func__, (unsigned long)user_service, service->localport,
-                       user_service->userdata, reason, (unsigned long)header,
-                       (unsigned long)instance, (unsigned long)bulk_userdata);
+       dev_dbg(service->state->dev,
+               "arm: service %lx(%d,%p), reason %d, header %lx, instance %lx, bulk_userdata %lx\n",
+               (unsigned long)user_service, service->localport,
+               user_service->userdata, reason, (unsigned long)header,
+               (unsigned long)instance, (unsigned long)bulk_userdata);
 
        if (header && user_service->is_vchi) {
                spin_lock(&msg_queue_spinlock);
@@ -1112,8 +1104,7 @@ service_callback(struct vchiq_instance *instance, enum vchiq_reason reason,
                        spin_unlock(&msg_queue_spinlock);
                        DEBUG_TRACE(SERVICE_CALLBACK_LINE);
                        DEBUG_COUNT(MSG_QUEUE_FULL_COUNT);
-                       vchiq_log_trace(service->state->dev, VCHIQ_ARM,
-                                       "%s - msg queue full", __func__);
+                       dev_dbg(service->state->dev, "arm: msg queue full\n");
                        /*
                         * If there is no MESSAGE_AVAILABLE in the completion
                         * queue, add one
@@ -1405,8 +1396,8 @@ vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service,
        local_uc = ++arm_state->videocore_use_count;
        ++(*entity_uc);
 
-       vchiq_log_trace(state->dev, VCHIQ_SUSPEND, "%s %s count %d, state count %d",
-                       __func__, entity, *entity_uc, local_uc);
+       dev_dbg(state->dev, "suspend: %s count %d, state count %d\n",
+               entity, *entity_uc, local_uc);
 
        write_unlock_bh(&arm_state->susp_res_lock);
 
@@ -1425,7 +1416,7 @@ vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service,
        }
 
 out:
-       vchiq_log_trace(state->dev, VCHIQ_SUSPEND, "%s exit %d", __func__, ret);
+       dev_dbg(state->dev, "suspend: exit %d\n", ret);
        return ret;
 }
 
@@ -1463,14 +1454,14 @@ vchiq_release_internal(struct vchiq_state *state, struct vchiq_service *service)
        --arm_state->videocore_use_count;
        --(*entity_uc);
 
-       vchiq_log_trace(state->dev, VCHIQ_SUSPEND, "%s %s count %d, state count %d",
-                       __func__, entity, *entity_uc, arm_state->videocore_use_count);
+       dev_dbg(state->dev, "suspend: %s count %d, state count %d\n",
+               entity, *entity_uc, arm_state->videocore_use_count);
 
 unlock:
        write_unlock_bh(&arm_state->susp_res_lock);
 
 out:
-       vchiq_log_trace(state->dev, VCHIQ_SUSPEND, "%s exit %d", __func__, ret);
+       dev_dbg(state->dev, "suspend: exit %d\n", ret);
        return ret;
 }