From 80c1b5a6c36b367a721721749628eb808b29e6fc Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Fri, 18 Sep 2020 11:32:02 -0700 Subject: [PATCH] qcacmn: Replace obsolete HIF_DBG() with hif_debug() Replace obsolete HIF_DBG() with hif_debug(). Change-Id: I462d75617359fd13eafa497045ddfb70c2025595 CRs-Fixed: 2779720 --- hif/src/ath_procfs.c | 20 +++---- hif/src/ce/ce_main.c | 31 +++++------ hif/src/ce/ce_service_srng.c | 2 +- hif/src/ce/ce_tasklet.c | 2 +- hif/src/dispatcher/dummy.c | 2 +- hif/src/hif_irq_affinity.c | 2 +- hif/src/hif_main.c | 4 +- hif/src/hif_napi.c | 42 ++++++-------- hif/src/ipcie/if_ipci.c | 6 +- hif/src/pcie/if_pci.c | 4 +- hif/src/snoc/if_snoc.c | 4 +- hif/src/usb/hif_usb.c | 21 ++++--- hif/src/usb/if_usb.c | 2 +- hif/src/usb/usbdrv.c | 105 +++++++++++++++++------------------ 14 files changed, 116 insertions(+), 131 deletions(-) diff --git a/hif/src/ath_procfs.c b/hif/src/ath_procfs.c index 09ec977ede..c131e80614 100644 --- a/hif/src/ath_procfs.c +++ b/hif/src/ath_procfs.c @@ -75,7 +75,7 @@ static ssize_t ath_procfs_diag_read(struct file *file, char __user *buf, if (!read_buffer) return -ENOMEM; - HIF_DBG("rd buff 0x%pK cnt %zu offset 0x%x buf 0x%pK", + hif_debug("rd buff 0x%pK cnt %zu offset 0x%x buf 0x%pK", read_buffer, count, (int)*pos, buf); tgt_info = hif_get_target_info_handle(GET_HIF_OPAQUE_HDL(hif_hdl)); @@ -97,8 +97,8 @@ static ssize_t ath_procfs_diag_read(struct file *file, char __user *buf, (tgt_info->target_type == TARGET_TYPE_QCN7605))) { memtype = ((uint32_t)(*pos) & 0xff000000) >> 24; offset = (uint32_t)(*pos) & 0xffffff; - HIF_DBG("%s: offset 0x%x memtype 0x%x, datalen %zu\n", - __func__, offset, memtype, count); + hif_debug("offset 0x%x memtype 0x%x, datalen %zu", + offset, memtype, count); rv = pld_athdiag_read(scn->qdf_dev->dev, offset, memtype, count, (uint8_t *)read_buffer); @@ -156,7 +156,7 @@ static ssize_t ath_procfs_diag_write(struct file *file, return -EFAULT; } - HIF_DBG("wr buff 0x%pK buf 0x%pK cnt %zu offset 0x%x value 0x%x", + hif_debug("wr buff 0x%pK buf 0x%pK cnt %zu offset 0x%x value 0x%x", write_buffer, buf, count, (int)*pos, *((uint32_t *) write_buffer)); @@ -179,8 +179,8 @@ static ssize_t ath_procfs_diag_write(struct file *file, (tgt_info->target_type == TARGET_TYPE_QCN7605))) { memtype = ((uint32_t)(*pos) & 0xff000000) >> 24; offset = (uint32_t)(*pos) & 0xffffff; - HIF_DBG("%s: offset 0x%x memtype 0x%x, datalen %zu\n", - __func__, offset, memtype, count); + hif_debug("offset 0x%x memtype 0x%x, datalen %zu", + offset, memtype, count); rv = pld_athdiag_write(scn->qdf_dev->dev, offset, memtype, count, (uint8_t *)write_buffer); @@ -239,8 +239,8 @@ int athdiag_procfs_init(void *scn) return -ENOMEM; } - HIF_DBG("/proc/%s/%s created", PROCFS_DIR, PROCFS_NAME); - return 0; /* everything is ok */ + hif_debug("/proc/%s/%s created", PROCFS_DIR, PROCFS_NAME); + return 0; } /* @@ -251,9 +251,9 @@ void athdiag_procfs_remove(void) { if (proc_dir) { remove_proc_entry(PROCFS_NAME, proc_dir); - HIF_DBG("/proc/%s/%s removed", PROCFS_DIR, PROCFS_NAME); + hif_debug("/proc/%s/%s removed", PROCFS_DIR, PROCFS_NAME); remove_proc_entry(PROCFS_DIR, NULL); - HIF_DBG("/proc/%s removed", PROCFS_DIR); + hif_debug("/proc/%s removed", PROCFS_DIR); proc_dir = NULL; } } diff --git a/hif/src/ce/ce_main.c b/hif/src/ce/ce_main.c index 174fb96774..075c69ec1d 100644 --- a/hif/src/ce/ce_main.c +++ b/hif/src/ce/ce_main.c @@ -1854,7 +1854,7 @@ void hif_enable_fastpath(struct hif_opaque_softc *hif_ctx) hif_warn("srng rings do not support fastpath"); return; } - HIF_DBG("%s, Enabling fastpath mode", __func__); + hif_debug("Enabling fastpath mode"); scn->fastpath_mode_on = true; } @@ -1914,8 +1914,7 @@ void ce_h2t_tx_ce_cleanup(struct CE_handle *ce_hdl) return; if (sc->fastpath_mode_on && ce_state->htt_tx_data) { - HIF_DBG("%s %d Fastpath mode ON, Cleaning up HTT Tx CE", - __func__, __LINE__); + hif_debug("Fastpath mode ON, Cleaning up HTT Tx CE"); sw_index = src_ring->sw_index; write_index = src_ring->sw_index; @@ -2384,8 +2383,8 @@ static int hif_completion_thread_startup(struct HIF_CE_state *hif_state) attr = hif_state->host_ce_config[pipe_num]; if (attr.src_nentries) { /* pipe used to send to target */ - HIF_DBG("%s: pipe_num:%d pipe_info:0x%pK", - __func__, pipe_num, pipe_info); + hif_debug("pipe_num:%d pipe_info:0x%pK", + pipe_num, pipe_info); ce_send_cb_register(pipe_info->ce_hdl, hif_pci_ce_send_done, pipe_info, attr.flags & CE_ATTR_DISABLE_INTR); @@ -2484,8 +2483,8 @@ static void hif_post_recv_buffers_failure(struct HIF_CE_pipe_info *pipe_info, qdf_spin_lock_bh(&pipe_info->recv_bufs_needed_lock); error_cnt_tmp = ++(*error_cnt); qdf_spin_unlock_bh(&pipe_info->recv_bufs_needed_lock); - HIF_DBG("%s: pipe_num %d, needed %d, err_cnt = %u, fail_type = %s", - __func__, pipe_info->pipe_num, bufs_needed_tmp, error_cnt_tmp, + hif_debug("pipe_num: %d, needed: %d, err_cnt: %u, fail_type: %s", + pipe_info->pipe_num, bufs_needed_tmp, error_cnt_tmp, failure_type_string); hif_record_ce_desc_event(scn, ce_id, failure_type, NULL, nbuf, bufs_needed_tmp, 0); @@ -3044,7 +3043,7 @@ static inline void hif_config_rri_on_ddr(struct hif_softc *scn) low_paddr = BITS0_TO_31(scn->paddr_rri_on_ddr); high_paddr = BITS32_TO_35(scn->paddr_rri_on_ddr); - HIF_DBG("%s using srri and drri from DDR", __func__); + hif_debug("using srri and drri from DDR"); WRITE_CE_DDR_ADDRESS_FOR_RRI_LOW(scn, low_paddr); WRITE_CE_DDR_ADDRESS_FOR_RRI_HIGH(scn, high_paddr); @@ -3620,17 +3619,17 @@ int hif_config_ce(struct hif_softc *scn) } scn->athdiag_procfs_inited = true; - HIF_DBG("%s: ce_init done", __func__); + hif_debug("ce_init done"); init_tasklet_workers(hif_hdl); - HIF_DBG("%s: X, ret = %d", __func__, rv); + hif_debug("X, ret = %d", rv); #ifdef ADRASTEA_SHADOW_REGISTERS - HIF_DBG("%s, Using Shadow Registers instead of CE Registers", __func__); + hif_debug("Using Shadow Registers instead of CE Registers"); for (i = 0; i < NUM_SHADOW_REGISTERS; i++) { - HIF_DBG("%s Shadow Register%d is mapped to address %x", - __func__, i, + hif_debug("Shadow Register%d is mapped to address %x", + i, (A_TARGET_READ(scn, (SHADOW_ADDRESS(i))) << 2)); } #endif @@ -3945,9 +3944,9 @@ int hif_map_service_to_pipe(struct hif_opaque_softc *hif_hdl, uint16_t svc_id, } } if (ul_updated == false) - HIF_DBG("ul pipe is NOT updated for service %d", svc_id); + hif_debug("ul pipe is NOT updated for service %d", svc_id); if (dl_updated == false) - HIF_DBG("dl pipe is NOT updated for service %d", svc_id); + hif_debug("dl pipe is NOT updated for service %d", svc_id); return status; } @@ -4011,7 +4010,7 @@ int hif_dump_ce_registers(struct hif_softc *scn) for (i = 0; i < scn->ce_count; i++, ce_reg_address += CE_OFFSET) { if (!scn->ce_id_to_state[i]) { - HIF_DBG("CE%d not used.", i); + hif_debug("CE%d not used", i); continue; } diff --git a/hif/src/ce/ce_service_srng.c b/hif/src/ce/ce_service_srng.c index 21b22c1687..fc5313e4eb 100644 --- a/hif/src/ce/ce_service_srng.c +++ b/hif/src/ce/ce_service_srng.c @@ -735,7 +735,7 @@ static void ce_srng_msi_ring_params_setup(struct hif_softc *scn, uint32_t ce_id, ring_params->msi_data = (ce_id % msi_data_count) + msi_data_start; ring_params->flags |= HAL_SRNG_MSI_INTR; - HIF_DBG("%s: ce_id %d, msi_addr %pK, msi_data %d", __func__, ce_id, + hif_debug("ce_id %d, msi_addr %pK, msi_data %d", ce_id, (void *)ring_params->msi_addr, ring_params->msi_data); } diff --git a/hif/src/ce/ce_tasklet.c b/hif/src/ce/ce_tasklet.c index b9de93c6a2..e88a6e913d 100644 --- a/hif/src/ce/ce_tasklet.c +++ b/hif/src/ce/ce_tasklet.c @@ -599,7 +599,7 @@ static inline bool hif_tasklet_schedule(struct hif_opaque_softc *hif_ctx, struct hif_softc *scn = HIF_GET_SOFTC(hif_ctx); if (test_bit(TASKLET_STATE_SCHED, &tasklet_entry->intr_tq.state)) { - HIF_DBG("tasklet scheduled, return"); + hif_debug("tasklet scheduled, return"); qdf_atomic_dec(&scn->active_tasklet_cnt); return false; } diff --git a/hif/src/dispatcher/dummy.c b/hif/src/dispatcher/dummy.c index cafbad589b..da36ca655b 100644 --- a/hif/src/dispatcher/dummy.c +++ b/hif/src/dispatcher/dummy.c @@ -30,7 +30,7 @@ */ void hif_dummy_bus_prevent_linkdown(struct hif_softc *scn, bool flag) { - HIF_DBG("wlan: %s pcie power collapse ignored", + hif_debug("wlan: %s pcie power collapse ignored", (flag ? "disable" : "enable")); } diff --git a/hif/src/hif_irq_affinity.c b/hif/src/hif_irq_affinity.c index 6b360ca67f..fe2685c5e3 100644 --- a/hif/src/hif_irq_affinity.c +++ b/hif/src/hif_irq_affinity.c @@ -455,7 +455,7 @@ static inline void hif_exec_bl_irq(struct qca_napi_data *napid, bool bl_flag) for (j = 0; j < exec_ctx->numirq; j++) irq_modify_status(exec_ctx->os_irq[j], IRQ_NO_BALANCING, 0); - HIF_DBG("%s: bl_flag %d CE %d", __func__, bl_flag, i); + hif_debug("bl_flag %d CE %d", bl_flag, i); } } diff --git a/hif/src/hif_main.c b/hif/src/hif_main.c index 4f6dd11afd..4c62f7be21 100644 --- a/hif/src/hif_main.c +++ b/hif/src/hif_main.c @@ -892,7 +892,7 @@ QDF_STATUS hif_enable(struct hif_opaque_softc *hif_ctx, struct device *dev, scn->hif_init_done = true; - HIF_DBG("%s: OK", __func__); + hif_debug("OK"); return QDF_STATUS_SUCCESS; @@ -926,7 +926,7 @@ void hif_disable(struct hif_opaque_softc *hif_ctx, enum hif_disable_type type) scn->notice_send = false; - HIF_DBG("%s: X", __func__); + hif_debug("X"); } #ifdef CE_TASKLET_DEBUG_ENABLE diff --git a/hif/src/hif_napi.c b/hif/src/hif_napi.c index f6cf6cb6e2..668a1033db 100644 --- a/hif/src/hif_napi.c +++ b/hif/src/hif_napi.c @@ -162,8 +162,7 @@ int hif_napi_create(struct hif_opaque_softc *hif_ctx, } else rc = 0; - HIF_DBG("%s: NAPI structures initialized, rc=%d", - __func__, rc); + hif_debug("NAPI structures initialized, rc=%d", rc); } for (i = 0; i < hif->ce_count; i++) { ce_state = hif->ce_id_to_state[i]; @@ -226,8 +225,7 @@ int hif_napi_create(struct hif_opaque_softc *hif_ctx, * protection as there should be no-one around yet */ napid->ce_map |= (0x01 << i); - HIF_DBG("%s: NAPI id %d created for pipe %d", __func__, - napii->id, i); + hif_debug("NAPI id %d created for pipe %d", napii->id, i); } /* no ces registered with the napi */ @@ -277,7 +275,7 @@ void hif_napi_rx_offld_flush_cb_register(struct hif_opaque_softc *hif_hdl, if (ce_state && (ce_state->htt_rx_data)) { napii = napid->napis[i]; napii->offld_flush_cb = offld_flush_handler; - HIF_DBG("Registering offload for ce_id %d NAPI callback for %d flush_cb %pK\n", + hif_debug("Registering offload for ce_id %d NAPI callback for %d flush_cb %pK", i, napii->id, napii->offld_flush_cb); } } @@ -302,8 +300,8 @@ void hif_napi_rx_offld_flush_cb_deregister(struct hif_opaque_softc *hif_hdl) ce_state = scn->ce_id_to_state[i]; if (ce_state && (ce_state->htt_rx_data)) { napii = napid->napis[i]; - HIF_DBG("deRegistering offld for ce_id %d NAPI callback for %d flush_cb %pK\n", - i, napii->id, napii->offld_flush_cb); + hif_debug("deRegistering offld for ce_id %d NAPI callback for %d flush_cb %pK", + i, napii->id, napii->offld_flush_cb); /* Not required */ napii->offld_flush_cb = NULL; } @@ -365,8 +363,7 @@ int hif_napi_destroy(struct hif_opaque_softc *hif_ctx, if (hif->napi_data.state == HIF_NAPI_CONF_UP) { if (force) { napi_disable(&(napii->napi)); - HIF_DBG("%s: NAPI entry %d force disabled", - __func__, id); + hif_debug("NAPI entry %d force disabled", id); NAPI_DEBUG("NAPI %d force disabled", id); } else { hif_err("Cannot destroy active NAPI %d", id); @@ -390,7 +387,7 @@ int hif_napi_destroy(struct hif_opaque_softc *hif_ctx, napid->napis[ce] = NULL; napii->scale = 0; qdf_mem_free(napii); - HIF_DBG("%s: NAPI %d destroyed\n", __func__, id); + hif_debug("NAPI %d destroyed", id); /* if there are no active instances and * if they are all destroyed, @@ -403,8 +400,7 @@ int hif_napi_destroy(struct hif_opaque_softc *hif_ctx, qdf_spinlock_destroy(&(napid->lock)); memset(napid, 0, sizeof(struct qca_napi_data)); - HIF_DBG("%s: no NAPI instances. Zapped.", - __func__); + hif_debug("no NAPI instances. Zapped"); } } } @@ -534,26 +530,21 @@ int hif_napi_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event, case NAPI_EVT_INT_STATE: { int on = (data != ((void *)0)); - HIF_DBG("%s: recved evnt: STATE_CMD %d; v = %d (state=0x%0x)", - __func__, event, - on, prev_state); + hif_debug("recved evnt: STATE_CMD %d; v = %d (state=0x%0x)", + event, on, prev_state); if (on) if (prev_state & HIF_NAPI_CONF_UP) { - HIF_DBG("%s: duplicate NAPI conf ON msg", - __func__); + hif_debug("Duplicate NAPI conf ON msg"); } else { - HIF_DBG("%s: setting state to ON", - __func__); + hif_debug("Setting state to ON"); napid->state |= HIF_NAPI_CONF_UP; } else /* off request */ if (prev_state & HIF_NAPI_CONF_UP) { - HIF_DBG("%s: setting state to OFF", - __func__); + hif_debug("Setting state to OFF"); napid->state &= ~HIF_NAPI_CONF_UP; } else { - HIF_DBG("%s: duplicate NAPI conf OFF msg", - __func__); + hif_debug("Duplicate NAPI conf OFF msg"); } break; } @@ -696,8 +687,7 @@ int hif_napi_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event, } } } else { - HIF_DBG("%s: no change in hif napi state (still %d)", - __func__, prev_state); + hif_debug("no change in hif napi state (still %d)", prev_state); } NAPI_DEBUG("<--[rc=%d]", rc); @@ -1668,7 +1658,7 @@ static inline void hif_napi_bl_irq(struct qca_napi_data *napid, bool bl_flag) else irq_modify_status(napii->irq, IRQ_NO_BALANCING, 0); - HIF_DBG("%s: bl_flag %d CE %d", __func__, bl_flag, i); + hif_debug("bl_flag %d CE %d", bl_flag, i); } } diff --git a/hif/src/ipcie/if_ipci.c b/hif/src/ipcie/if_ipci.c index 3c4b6fbd73..54d2425ab4 100644 --- a/hif/src/ipcie/if_ipci.c +++ b/hif/src/ipcie/if_ipci.c @@ -451,9 +451,9 @@ static int hif_ce_msi_configure_irq(struct hif_softc *scn) unsigned int msi_data = (ce_id % msi_data_count) + msi_irq_start; irq = pld_get_msi_irq(scn->qdf_dev->dev, msi_data); - HIF_DBG("%s: (ce_id %d, msi_data %d, irq %d tasklet %pK)", - __func__, ce_id, msi_data, irq, - &ce_sc->tasklets[ce_id]); + hif_debug("(ce_id %d, msi_data %d, irq %d tasklet %pK)", + ce_id, msi_data, irq, + &ce_sc->tasklets[ce_id]); /* implies the ce is also initialized */ if (!ce_sc->tasklets[ce_id].inited) diff --git a/hif/src/pcie/if_pci.c b/hif/src/pcie/if_pci.c index c3abe81167..331a59f0bd 100644 --- a/hif/src/pcie/if_pci.c +++ b/hif/src/pcie/if_pci.c @@ -2868,8 +2868,8 @@ static int hif_ce_msi_configure_irq(struct hif_softc *scn) if (host_ce_conf[ce_id].flags & CE_ATTR_DISABLE_INTR) continue; irq = pld_get_msi_irq(scn->qdf_dev->dev, msi_data); - HIF_DBG("%s: (ce_id %d, msi_data %d, irq %d tasklet %pK)", - __func__, ce_id, msi_data, irq, + hif_debug("(ce_id %d, msi_data %d, irq %d tasklet %pK)", + ce_id, msi_data, irq, &ce_sc->tasklets[ce_id]); /* implies the ce is also initialized */ diff --git a/hif/src/snoc/if_snoc.c b/hif/src/snoc/if_snoc.c index 4e61eaaa9c..360deba654 100644 --- a/hif/src/snoc/if_snoc.c +++ b/hif/src/snoc/if_snoc.c @@ -300,8 +300,8 @@ QDF_STATUS hif_snoc_enable_bus(struct hif_softc *ol_sc, /* the bus should remain on durring suspend for snoc */ hif_vote_link_up(GET_HIF_OPAQUE_HDL(ol_sc)); - HIF_DBG("%s: X - hif_type = 0x%x, target_type = 0x%x", - __func__, hif_type, target_type); + hif_debug("X - hif_type = 0x%x, target_type = 0x%x", + hif_type, target_type); return QDF_STATUS_SUCCESS; } diff --git a/hif/src/usb/hif_usb.c b/hif/src/usb/hif_usb.c index 26457cf8d7..7a98e456e3 100644 --- a/hif/src/usb/hif_usb.c +++ b/hif/src/usb/hif_usb.c @@ -76,7 +76,7 @@ static void usb_hif_usb_transmit_complete(struct urb *urb) struct HIF_USB_PIPE *pipe = urb_context->pipe; struct hif_usb_send_context *send_context; - HIF_DBG("+%s: pipe: %d, stat:%d, len:%d", __func__, + hif_debug("+: pipe: %d, stat:%d, len:%d", pipe->logical_pipe_num, urb->status, urb->actual_length); /* this urb is not pending anymore */ @@ -102,7 +102,7 @@ static void usb_hif_usb_transmit_complete(struct urb *urb) skb_queue_tail(&pipe->io_comp_queue, buf); HIF_USB_SCHEDULE_WORK(pipe); - HIF_DBG("-%s", __func__); + hif_debug("-"); } /** @@ -134,8 +134,8 @@ static QDF_STATUS hif_send_internal(struct HIF_DEVICE_USB *hif_usb_device, uint32_t head_data_len, tmp_frag_count = 0; unsigned char *data_ptr; - HIF_DBG("+%s pipe : %d, buf:0x%pK nbytes %u", - __func__, pipe_id, buf, nbytes); + hif_debug("+ pipe : %d, buf:0x%pK nbytes %u", + pipe_id, buf, nbytes); frag_count = qdf_nbuf_get_num_frags(buf); if (frag_count == 1) { @@ -231,10 +231,9 @@ static QDF_STATUS hif_send_internal(struct HIF_DEVICE_USB *hif_usb_device, if ((len % pipe->max_packet_size) == 0) /* hit a max packet boundary on this pipe */ - HIF_DBG - ("athusb bulk send submit:%d, 0x%X (ep:0x%2.2X), %d bytes", - pipe->logical_pipe_num, pipe->usb_pipe_handle, - pipe->ep_address, nbytes); + hif_debug("athusb bulk send submit:%d, 0x%X (ep:0x%2.2X), %d bytes", + pipe->logical_pipe_num, pipe->usb_pipe_handle, + pipe->ep_address, nbytes); usb_hif_enqueue_pending_transfer(pipe, urb_context); usb_status = usb_submit_urb(urb, GFP_ATOMIC); @@ -257,7 +256,7 @@ err: hif_err("athusb send failed %d", status); } - HIF_DBG("-%s pipe : %d", __func__, pipe_id); + hif_debug("- pipe: %d", pipe_id); return status; } @@ -936,8 +935,8 @@ void hif_usb_set_bundle_mode(struct hif_softc *scn, device->rx_bundle_buf_len = device->rx_bundle_cnt * HIF_USB_RX_BUNDLE_ONE_PKT_SIZE; - HIF_DBG("athusb bundle %s cnt %d", enabled ? "enabled" : "disabled", - rx_bundle_cnt); + hif_debug("athusb bundle %s cnt %d", enabled ? "enabled" : "disabled", + rx_bundle_cnt); } /** diff --git a/hif/src/usb/if_usb.c b/hif/src/usb/if_usb.c index c2f0e64c26..f1dbf14a69 100644 --- a/hif/src/usb/if_usb.c +++ b/hif/src/usb/if_usb.c @@ -60,7 +60,7 @@ hif_usb_diag_write_cold_reset(struct hif_softc *scn) if (tgt_info->target_type == TARGET_TYPE_QCN7605) return QDF_STATUS_SUCCESS; - HIF_DBG("%s: resetting SOC", __func__); + hif_debug("resetting SOC"); return hif_diag_write_access(hif_hdl, (ROME_USB_SOC_RESET_CONTROL_COLD_RST_LSB | diff --git a/hif/src/usb/usbdrv.c b/hif/src/usb/usbdrv.c index fb3037607f..0a89e49255 100644 --- a/hif/src/usb/usbdrv.c +++ b/hif/src/usb/usbdrv.c @@ -174,10 +174,10 @@ static QDF_STATUS usb_hif_alloc_pipe_resources usb_hif_free_urb_to_pipe(pipe, urb_context); } - HIF_DBG("athusb: alloc resources lpipe:%d hpipe:0x%X urbs:%d", - pipe->logical_pipe_num, - pipe->usb_pipe_handle, - pipe->urb_alloc); + hif_debug("athusb: alloc resources lpipe:%d hpipe:0x%X urbs:%d", + pipe->logical_pipe_num, + pipe->usb_pipe_handle, + pipe->urb_alloc); return status; } @@ -346,26 +346,26 @@ QDF_STATUS usb_hif_setup_pipe_resources(struct HIF_DEVICE_USB *device) endpoint = &iface_desc->endpoint[i].desc; if (IS_BULK_EP(endpoint->bmAttributes)) { - HIF_DBG("%s Bulk Ep:0x%2.2X maxpktsz:%d", - IS_DIR_IN(endpoint->bEndpointAddress) ? + hif_debug("%s Bulk Ep:0x%2.2X maxpktsz:%d", + IS_DIR_IN(endpoint->bEndpointAddress) ? "RX" : "TX", - endpoint->bEndpointAddress, - qdf_le16_to_cpu(endpoint->wMaxPacketSize)); + endpoint->bEndpointAddress, + qdf_le16_to_cpu(endpoint->wMaxPacketSize)); } else if (IS_INT_EP(endpoint->bmAttributes)) { - HIF_DBG("%s Int Ep:0x%2.2X maxpktsz:%d interval:%d", - IS_DIR_IN(endpoint->bEndpointAddress) ? + hif_debug("%s Int Ep:0x%2.2X maxpktsz:%d interval:%d", + IS_DIR_IN(endpoint->bEndpointAddress) ? "RX" : "TX", - endpoint->bEndpointAddress, - qdf_le16_to_cpu(endpoint->wMaxPacketSize), - endpoint->bInterval); + endpoint->bEndpointAddress, + qdf_le16_to_cpu(endpoint->wMaxPacketSize), + endpoint->bInterval); } else if (IS_ISOC_EP(endpoint->bmAttributes)) { /* TODO for ISO */ - HIF_DBG("%s ISOC Ep:0x%2.2X maxpktsz:%d interval:%d", - IS_DIR_IN(endpoint->bEndpointAddress) ? + hif_debug("%s ISOC Ep:0x%2.2X maxpktsz:%d interval:%d", + IS_DIR_IN(endpoint->bEndpointAddress) ? "RX" : "TX", - endpoint->bEndpointAddress, - qdf_le16_to_cpu(endpoint->wMaxPacketSize), - endpoint->bInterval); + endpoint->bEndpointAddress, + qdf_le16_to_cpu(endpoint->wMaxPacketSize), + endpoint->bInterval); } urbcount = 0; @@ -548,8 +548,7 @@ static void usb_hif_usb_recv_prestart_complete struct HIF_USB_PIPE *pipe = urb_context->pipe; struct hif_usb_softc *sc = HIF_GET_USB_SOFTC(pipe->device); - HIF_DBG("+%s: recv pipe: %d, stat:%d,len:%d urb:0x%pK", - __func__, + hif_debug("+: recv pipe: %d, stat:%d,len:%d urb:0x%pK", pipe->logical_pipe_num, urb->status, urb->actual_length, urb); @@ -606,7 +605,7 @@ static void usb_hif_usb_recv_prestart_complete usb_hif_start_recv_pipes(pipe->device); qdf_spin_unlock_irqrestore(&pipe->device->rx_prestart_lock); - HIF_DBG("-%s", __func__); + hif_debug("-"); } /** @@ -624,8 +623,7 @@ static void usb_hif_usb_recv_complete(struct urb *urb) struct HIF_USB_PIPE *pipe = urb_context->pipe; struct hif_usb_softc *sc = HIF_GET_USB_SOFTC(pipe->device); - HIF_DBG("+%s: recv pipe: %d, stat:%d,len:%d urb:0x%pK", - __func__, + hif_debug("+: recv pipe: %d, stat:%d,len:%d urb:0x%pK", pipe->logical_pipe_num, urb->status, urb->actual_length, urb); @@ -703,7 +701,7 @@ static void usb_hif_usb_recv_complete(struct urb *urb) sc->suspend_state); } - HIF_DBG("-%s", __func__); + hif_debug("-"); } /** @@ -726,11 +724,10 @@ static void usb_hif_usb_recv_bundle_complete(struct urb *urb) qdf_nbuf_t new_skb = NULL; uint8_t no_of_pkt_in_bundle; - HIF_DBG("+%s: recv pipe: %d, stat:%d,len:%d urb:0x%pK", - __func__, - pipe->logical_pipe_num, - urb->status, urb->actual_length, - urb); + hif_debug("+: recv pipe: %d, stat:%d,len:%d urb:0x%pK", + pipe->logical_pipe_num, + urb->status, urb->actual_length, + urb); /* this urb is not pending anymore */ usb_hif_remove_pending_transfer(urb_context); @@ -846,7 +843,7 @@ static void usb_hif_usb_recv_bundle_complete(struct urb *urb) } } - HIF_DBG("-%s", __func__); + hif_debug("-"); } /** @@ -892,11 +889,11 @@ static void usb_hif_post_recv_prestart_transfers(struct HIF_USB_PIPE *recv_pipe, usb_hif_usb_recv_prestart_complete, urb_context); - HIF_DBG("athusb bulk recv submit:%d, 0x%X (ep:0x%2.2X), %d bytes, buf:0x%pK", - recv_pipe->logical_pipe_num, - recv_pipe->usb_pipe_handle, - recv_pipe->ep_address, buffer_length, - urb_context->buf); + hif_debug("athusb bulk recv submit:%d, 0x%X (ep:0x%2.2X), %d bytes, buf:0x%pK", + recv_pipe->logical_pipe_num, + recv_pipe->usb_pipe_handle, + recv_pipe->ep_address, buffer_length, + urb_context->buf); usb_hif_enqueue_pending_transfer(recv_pipe, urb_context); usb_status = usb_submit_urb(urb, GFP_ATOMIC); @@ -955,11 +952,11 @@ static void usb_hif_post_recv_transfers(struct HIF_USB_PIPE *recv_pipe, buffer_length, usb_hif_usb_recv_complete, urb_context); - HIF_DBG("athusb bulk recv submit:%d, 0x%X (ep:0x%2.2X), %d bytes, buf:0x%pK", - recv_pipe->logical_pipe_num, - recv_pipe->usb_pipe_handle, - recv_pipe->ep_address, buffer_length, - urb_context->buf); + hif_debug("athusb bulk recv submit:%d, 0x%X (ep:0x%2.2X), %d bytes, buf:0x%pK", + recv_pipe->logical_pipe_num, + recv_pipe->usb_pipe_handle, + recv_pipe->ep_address, buffer_length, + urb_context->buf); usb_hif_enqueue_pending_transfer(recv_pipe, urb_context); @@ -1018,11 +1015,11 @@ static void usb_hif_post_recv_bundle_transfers(struct HIF_USB_PIPE *recv_pipe, usb_hif_usb_recv_bundle_complete, urb_context); - HIF_DBG("athusb bulk recv submit:%d, 0x%X (ep:0x%2.2X), %d bytes, buf:0x%pK", - recv_pipe->logical_pipe_num, - recv_pipe->usb_pipe_handle, - recv_pipe->ep_address, buffer_length, - urb_context->buf); + hif_debug("athusb bulk recv submit:%d, 0x%X (ep:0x%2.2X), %d bytes, buf:0x%pK", + recv_pipe->logical_pipe_num, + recv_pipe->usb_pipe_handle, + recv_pipe->ep_address, buffer_length, + urb_context->buf); usb_hif_enqueue_pending_transfer(recv_pipe, urb_context); @@ -1095,7 +1092,7 @@ void usb_hif_start_recv_pipes(struct HIF_DEVICE_USB *device) usb_hif_post_recv_transfers(pipe, buf_len); } - HIF_DBG("athusb bulk recv len %d", buf_len); + hif_debug("athusb bulk recv len %d", buf_len); if (!hif_usb_disable_rxdata2) { hif_info("Post URBs to RX_DATA2_PIPE: %d", @@ -1147,8 +1144,8 @@ QDF_STATUS usb_hif_submit_ctrl_out(struct HIF_DEVICE_USB *device, qdf_mem_copy(buf, (uint8_t *) data, size); } - HIF_DBG("ctrl-out req:0x%2.2X, value:0x%4.4X index:0x%4.4X, datasize:%d", - req, value, index, size); + hif_debug("ctrl-out req:0x%2.2X, value:0x%4.4X index:0x%4.4X, datasize:%d", + req, value, index, size); result = usb_control_msg(device->udev, usb_sndctrlpipe(device->udev, 0), @@ -1199,8 +1196,8 @@ QDF_STATUS usb_hif_submit_ctrl_in(struct HIF_DEVICE_USB *device, } } - HIF_DBG("ctrl-in req:0x%2.2X, value:0x%4.4X index:0x%4.4X, datasize:%d", - req, value, index, size); + hif_debug("ctrl-in req:0x%2.2X, value:0x%4.4X index:0x%4.4X, datasize:%d", + req, value, index, size); result = usb_control_msg(device->udev, usb_rcvctrlpipe(device->udev, 0), @@ -1244,7 +1241,7 @@ static void usb_hif_io_complete(struct HIF_USB_PIPE *pipe) HIF_ENTER(); while ((buf = skb_dequeue(&pipe->io_comp_queue))) { if (pipe->flags & HIF_USB_PIPE_FLAG_TX) { - HIF_DBG("+athusb xmit callback buf:0x%pK", buf); + hif_debug("+athusb xmit callback buf:0x%pK", buf); HtcHdr = (HTC_FRAME_HDR *) qdf_nbuf_get_frag_vaddr(buf, 0); @@ -1257,9 +1254,9 @@ static void usb_hif_io_complete(struct HIF_USB_PIPE *pipe) HtcHdr-> EndpointID, 0); #endif - HIF_DBG("-athusb xmit callback"); + hif_debug("-athusb xmit callback"); } else { - HIF_DBG("+athusb recv callback buf: 0x%pK", buf); + hif_debug("+athusb recv callback buf: 0x%pK", buf); qdf_nbuf_peek_header(buf, &data, &len); if (IS_FW_CRASH_DUMP(*((uint32_t *) data))) { @@ -1274,7 +1271,7 @@ static void usb_hif_io_complete(struct HIF_USB_PIPE *pipe) device->htc_callbacks.Context, buf, pipe->logical_pipe_num); } - HIF_DBG("-athusb recv callback"); + hif_debug("-athusb recv callback"); } }