From 5259b3293617ea88842a658793ffaa61ea0e0ef4 Mon Sep 17 00:00:00 2001 From: Sergio Paracuellos Date: Thu, 15 Mar 2018 20:09:22 +0100 Subject: [PATCH] staging: ks7010: replace DPRINTK traces in favour of netdev_* This commit removes custom defined DPRINTK macro and replaces all the associated debug and other traces for preferred ones netdev_*. Signed-off-by: Sergio Paracuellos Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ks7010/ks7010_sdio.c | 84 ++++++++-------- drivers/staging/ks7010/ks_hostif.c | 138 ++++++++++++++------------- drivers/staging/ks7010/ks_wlan.h | 10 -- drivers/staging/ks7010/ks_wlan_net.c | 34 +++---- 4 files changed, 130 insertions(+), 136 deletions(-) diff --git a/drivers/staging/ks7010/ks7010_sdio.c b/drivers/staging/ks7010/ks7010_sdio.c index beb689b7d54e..50a7a15a93f1 100644 --- a/drivers/staging/ks7010/ks7010_sdio.c +++ b/drivers/staging/ks7010/ks7010_sdio.c @@ -118,7 +118,7 @@ static void ks_wlan_hw_sleep_doze_request(struct ks_wlan_private *priv) if (atomic_read(&priv->sleepstatus.status) == 0) { ret = ks7010_sdio_writeb(priv, GCR_B, GCR_B_DOZE); if (ret) { - DPRINTK(1, " error : GCR_B\n"); + netdev_err(priv->net_dev, " error : GCR_B\n"); goto set_sleep_mode; } atomic_set(&priv->sleepstatus.status, 1); @@ -139,7 +139,7 @@ static void ks_wlan_hw_sleep_wakeup_request(struct ks_wlan_private *priv) if (atomic_read(&priv->sleepstatus.status) == 1) { ret = ks7010_sdio_writeb(priv, WAKEUP, WAKEUP_REQ); if (ret) { - DPRINTK(1, " error : WAKEUP\n"); + netdev_err(priv->net_dev, " error : WAKEUP\n"); goto set_sleep_mode; } atomic_set(&priv->sleepstatus.status, 0); @@ -158,7 +158,7 @@ void ks_wlan_hw_wakeup_request(struct ks_wlan_private *priv) if (atomic_read(&priv->psstatus.status) == PS_SNOOZE) { ret = ks7010_sdio_writeb(priv, WAKEUP, WAKEUP_REQ); if (ret) - DPRINTK(1, " error : WAKEUP\n"); + netdev_err(priv->net_dev, " error : WAKEUP\n"); priv->last_wakeup = jiffies; ++priv->wakeup_count; @@ -185,11 +185,11 @@ static void _ks_wlan_hw_power_save(struct ks_wlan_private *priv) if (atomic_read(&priv->psstatus.status) == PS_SNOOZE) return; - DPRINTK(5, "\npsstatus.status=%d\npsstatus.confirm_wait=%d\npsstatus.snooze_guard=%d\ncnt_txqbody=%d\n", - atomic_read(&priv->psstatus.status), - atomic_read(&priv->psstatus.confirm_wait), - atomic_read(&priv->psstatus.snooze_guard), - cnt_txqbody(priv)); + netdev_dbg(priv->net_dev, "\npsstatus.status=%d\npsstatus.confirm_wait=%d\npsstatus.snooze_guard=%d\ncnt_txqbody=%d\n", + atomic_read(&priv->psstatus.status), + atomic_read(&priv->psstatus.confirm_wait), + atomic_read(&priv->psstatus.snooze_guard), + cnt_txqbody(priv)); if (atomic_read(&priv->psstatus.confirm_wait) || atomic_read(&priv->psstatus.snooze_guard) || @@ -200,7 +200,7 @@ static void _ks_wlan_hw_power_save(struct ks_wlan_private *priv) ret = ks7010_sdio_readb(priv, INT_PENDING, &byte); if (ret) { - DPRINTK(1, " error : INT_PENDING\n"); + netdev_err(priv->net_dev, " error : INT_PENDING\n"); goto queue_delayed_work; } if (byte) @@ -208,7 +208,7 @@ static void _ks_wlan_hw_power_save(struct ks_wlan_private *priv) ret = ks7010_sdio_writeb(priv, GCR_B, GCR_B_DOZE); if (ret) { - DPRINTK(1, " error : GCR_B\n"); + netdev_err(priv->net_dev, " error : GCR_B\n"); goto queue_delayed_work; } atomic_set(&priv->psstatus.status, PS_SNOOZE); @@ -240,7 +240,7 @@ static int enqueue_txdev(struct ks_wlan_private *priv, unsigned char *p, } if ((TX_DEVICE_BUFF_SIZE - 1) <= cnt_txqbody(priv)) { - DPRINTK(1, "tx buffer overflow\n"); + netdev_err(priv->net_dev, "tx buffer overflow\n"); ret = -EOVERFLOW; goto err_complete; } @@ -273,19 +273,19 @@ static int write_to_device(struct ks_wlan_private *priv, unsigned char *buffer, if (le16_to_cpu(hdr->event) < HIF_DATA_REQ || le16_to_cpu(hdr->event) > HIF_REQ_MAX) { - DPRINTK(1, "unknown event=%04X\n", hdr->event); + netdev_err(priv->net_dev, "unknown event=%04X\n", hdr->event); return 0; } ret = ks7010_sdio_write(priv, DATA_WINDOW, buffer, size); if (ret) { - DPRINTK(1, " write error : retval=%d\n", ret); + netdev_err(priv->net_dev, " write error : retval=%d\n", ret); return ret; } ret = ks7010_sdio_writeb(priv, WRITE_STATUS, REG_STATUS_BUSY); if (ret) { - DPRINTK(1, " error : WRITE_STATUS\n"); + netdev_err(priv->net_dev, " error : WRITE_STATUS\n"); return ret; } @@ -305,7 +305,7 @@ static void tx_device_task(struct ks_wlan_private *priv) if (priv->dev_state >= DEVICE_STATE_BOOT) { ret = write_to_device(priv, sp->sendp, sp->size); if (ret) { - DPRINTK(1, "write_to_device error !!(%d)\n", ret); + netdev_err(priv->net_dev, "write_to_device error !!(%d)\n", ret); queue_delayed_work(priv->wq, &priv->rw_dwork, 1); return; } @@ -331,7 +331,7 @@ int ks_wlan_hw_tx(struct ks_wlan_private *priv, void *p, unsigned long size, if (le16_to_cpu(hdr->event) < HIF_DATA_REQ || le16_to_cpu(hdr->event) > HIF_REQ_MAX) { - DPRINTK(1, "unknown event=%04X\n", hdr->event); + netdev_err(priv->net_dev, "unknown event=%04X\n", hdr->event); return 0; } @@ -373,7 +373,7 @@ static void ks_wlan_hw_rx(struct ks_wlan_private *priv, uint16_t size) /* receive data */ if (cnt_rxqbody(priv) >= (RX_DEVICE_BUFF_SIZE - 1)) { - DPRINTK(1, "rx buffer overflow\n"); + netdev_err(priv->net_dev, "rx buffer overflow\n"); return; } rx_buffer = &priv->rx_dev.rx_dev_buff[priv->rx_dev.qtail]; @@ -393,7 +393,7 @@ static void ks_wlan_hw_rx(struct ks_wlan_private *priv, uint16_t size) #endif ret = ks7010_sdio_writeb(priv, READ_STATUS, REG_STATUS_IDLE); if (ret) - DPRINTK(1, " error : READ_STATUS\n"); + netdev_err(priv->net_dev, " error : READ_STATUS\n"); /* length check fail */ return; @@ -406,11 +406,11 @@ static void ks_wlan_hw_rx(struct ks_wlan_private *priv, uint16_t size) ret = ks7010_sdio_writeb(priv, READ_STATUS, REG_STATUS_IDLE); if (ret) - DPRINTK(1, " error : READ_STATUS\n"); + netdev_err(priv->net_dev, " error : READ_STATUS\n"); if (atomic_read(&priv->psstatus.confirm_wait)) { if (IS_HIF_CONF(event)) { - DPRINTK(4, "IS_HIF_CONF true !!\n"); + netdev_dbg(priv->net_dev, "IS_HIF_CONF true !!\n"); atomic_dec(&priv->psstatus.confirm_wait); } } @@ -428,14 +428,14 @@ static void ks7010_rw_function(struct work_struct *work) /* wait after DOZE */ if (time_after(priv->last_doze + ((30 * HZ) / 1000), jiffies)) { - DPRINTK(4, "wait after DOZE\n"); + netdev_dbg(priv->net_dev, "wait after DOZE\n"); queue_delayed_work(priv->wq, &priv->rw_dwork, 1); return; } /* wait after WAKEUP */ while (time_after(priv->last_wakeup + ((30 * HZ) / 1000), jiffies)) { - DPRINTK(4, "wait after WAKEUP\n"); + netdev_dbg(priv->net_dev, "wait after WAKEUP\n"); dev_info(&priv->ks_sdio_card->func->dev, "wake: %lu %lu\n", priv->last_wakeup + (30 * HZ) / 1000, @@ -468,8 +468,8 @@ static void ks7010_rw_function(struct work_struct *work) /* read (WriteStatus/ReadDataSize FN1:00_0014) */ ret = ks7010_sdio_readb(priv, WSTATUS_RSIZE, &byte); if (ret) { - DPRINTK(1, " error : WSTATUS_RSIZE psstatus=%d\n", - atomic_read(&priv->psstatus.status)); + netdev_err(priv->net_dev, " error : WSTATUS_RSIZE psstatus=%d\n", + atomic_read(&priv->psstatus.status)); goto release_host; } @@ -500,7 +500,7 @@ static void ks_sdio_interrupt(struct sdio_func *func) ret = ks7010_sdio_readb(priv, INT_PENDING, &status); if (ret) { - DPRINTK(1, "error : INT_PENDING\n"); + netdev_err(priv->net_dev, "error : INT_PENDING\n"); goto queue_delayed_work; } @@ -513,7 +513,7 @@ static void ks_sdio_interrupt(struct sdio_func *func) atomic_read(&priv->psstatus.status) == PS_SNOOZE) { ret = ks7010_sdio_readb(priv, GCR_B, &byte); if (ret) { - DPRINTK(1, " error : GCR_B\n"); + netdev_err(priv->net_dev, " error : GCR_B\n"); goto queue_delayed_work; } if (byte == GCR_B_ACTIVE) { @@ -529,7 +529,7 @@ static void ks_sdio_interrupt(struct sdio_func *func) /* read (WriteStatus/ReadDataSize FN1:00_0014) */ ret = ks7010_sdio_readb(priv, WSTATUS_RSIZE, &byte); if (ret) { - DPRINTK(1, " error : WSTATUS_RSIZE\n"); + netdev_err(priv->net_dev, " error : WSTATUS_RSIZE\n"); goto queue_delayed_work; } rsize = byte & RSIZE_MASK; @@ -628,7 +628,7 @@ static int ks7010_sdio_data_compare(struct ks_wlan_private *priv, u32 address, if (memcmp(data, read_buf, size) != 0) { ret = -EIO; - DPRINTK(0, "data compare error (%d)\n", ret); + netdev_err(priv->net_dev, "data compare error (%d)\n", ret); goto err_free_read_buf; } @@ -659,7 +659,7 @@ static int ks7010_upload_firmware(struct ks_sdio_card *card) /* Firmware running ? */ ret = ks7010_sdio_readb(priv, GCR_A, &byte); if (byte == GCR_A_RUN) { - DPRINTK(0, "MAC firmware running ...\n"); + netdev_dbg(priv->net_dev, "MAC firmware running ...\n"); goto release_host_and_free; } @@ -715,7 +715,7 @@ static int ks7010_upload_firmware(struct ks_sdio_card *card) break; } if ((50) <= n) { - DPRINTK(1, "firmware can't start\n"); + netdev_err(priv->net_dev, "firmware can't start\n"); ret = -EIO; goto release_firmware; } @@ -740,7 +740,7 @@ static void ks7010_card_init(struct ks_wlan_private *priv) if (!wait_for_completion_interruptible_timeout (&priv->confirm_wait, 5 * HZ)) { - DPRINTK(1, "wait time out!! SME_START\n"); + netdev_dbg(priv->net_dev, "wait time out!! SME_START\n"); } if (priv->mac_address_valid && priv->version_size != 0) @@ -767,11 +767,11 @@ static void ks7010_card_init(struct ks_wlan_private *priv) if (!wait_for_completion_interruptible_timeout (&priv->confirm_wait, 5 * HZ)) { - DPRINTK(1, "wait time out!! wireless parameter set\n"); + netdev_dbg(priv->net_dev, "wait time out!! wireless parameter set\n"); } if (priv->dev_state >= DEVICE_STATE_PREINIT) { - DPRINTK(1, "DEVICE READY!!\n"); + netdev_dbg(priv->net_dev, "DEVICE READY!!\n"); priv->dev_state = DEVICE_STATE_READY; } } @@ -824,7 +824,7 @@ static int ks7010_sdio_probe(struct sdio_func *func, sdio_claim_host(func); ret = sdio_set_block_size(func, KS7010_IO_BLOCK_SIZE); - DPRINTK(5, "multi_block=%d sdio_set_block_size()=%d %d\n", + dev_dbg(&card->func->dev, "multi_block=%d sdio_set_block_size()=%d %d\n", func->card->cccr.multi_block, func->cur_blksize, ret); ret = sdio_enable_func(func); @@ -848,7 +848,7 @@ static int ks7010_sdio_probe(struct sdio_func *func, sdio_set_drvdata(func, card); - DPRINTK(5, "class = 0x%X, vendor = 0x%X, device = 0x%X\n", + dev_dbg(&card->func->dev, "class = 0x%X, vendor = 0x%X, device = 0x%X\n", func->class, func->vendor, func->device); /* private memory allocate */ @@ -893,9 +893,9 @@ static int ks7010_sdio_probe(struct sdio_func *func, ret = ks7010_upload_firmware(card); if (ret) { - dev_err(&card->func->dev, - "ks7010: firmware load failed !! return code = %d\n", - ret); + netdev_err(priv->net_dev, + "ks7010: firmware load failed !! return code = %d\n", + ret); goto err_free_netdev; } @@ -905,7 +905,7 @@ static int ks7010_sdio_probe(struct sdio_func *func, ret = ks7010_sdio_writeb(priv, INT_PENDING, 0xff); sdio_release_host(func); if (ret) - DPRINTK(1, " error : INT_PENDING\n"); + netdev_err(priv->net_dev, " error : INT_PENDING\n"); /* enable ks7010sdio interrupt */ byte = (INT_GCR_B | INT_READ_STATUS | INT_WRITE_STATUS); @@ -913,13 +913,13 @@ static int ks7010_sdio_probe(struct sdio_func *func, ret = ks7010_sdio_writeb(priv, INT_ENABLE, byte); sdio_release_host(func); if (ret) - DPRINTK(1, " err : INT_ENABLE\n"); + netdev_err(priv->net_dev, " err : INT_ENABLE\n"); priv->dev_state = DEVICE_STATE_BOOT; priv->wq = create_workqueue("wq"); if (!priv->wq) { - DPRINTK(1, "create_workqueue failed !!\n"); + netdev_err(priv->net_dev, "create_workqueue failed !!\n"); goto err_free_netdev; } @@ -959,7 +959,7 @@ static int send_stop_request(struct sdio_func *func) pp = kzalloc(hif_align_size(sizeof(*pp)), GFP_KERNEL); if (!pp) { - DPRINTK(3, "allocate memory failed..\n"); + netdev_err(card->priv->net_dev, "allocate memory failed..\n"); return -ENOMEM; } diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c index a25c0fb698b0..d644a1d7b564 100644 --- a/drivers/staging/ks7010/ks_hostif.c +++ b/drivers/staging/ks7010/ks_hostif.c @@ -88,7 +88,7 @@ static void ks_wlan_hw_wakeup_task(struct work_struct *work) &priv->psstatus.wakeup_wait, msecs_to_jiffies(20)); if (time_left <= 0) { - DPRINTK(1, "wake up timeout or interrupted !!!\n"); + netdev_dbg(priv->net_dev, "wake up timeout or interrupted !!!\n"); schedule_work(&priv->wakeup_work); return; } @@ -188,30 +188,30 @@ int get_current_ap(struct ks_wlan_private *priv, struct link_ap_info_t *ap_info) if (is_connect_status(priv->connect_status)) { memcpy(wrqu.ap_addr.sa_data, priv->current_ap.bssid, ETH_ALEN); - DPRINTK(3, - "IWEVENT: connect bssid=%pM\n", wrqu.ap_addr.sa_data); + netdev_dbg(priv->net_dev, + "IWEVENT: connect bssid=%pM\n", wrqu.ap_addr.sa_data); wireless_send_event(netdev, SIOCGIWAP, &wrqu, NULL); } - DPRINTK(4, "\n Link AP\n"); - DPRINTK(4, " bssid=%02X:%02X:%02X:%02X:%02X:%02X\n" + netdev_dbg(priv->net_dev, " Link AP\n"); + netdev_dbg(priv->net_dev, " bssid=%02X:%02X:%02X:%02X:%02X:%02X\n" " essid=%s\n" " rate_set=%02X,%02X,%02X,%02X,%02X,%02X,%02X,%02X\n" " channel=%d\n" " rssi=%d\n" " sq=%d\n" " capability=%04X\n", - ap->bssid[0], ap->bssid[1], ap->bssid[2], - ap->bssid[3], ap->bssid[4], ap->bssid[5], - &(ap->ssid.body[0]), - ap->rate_set.body[0], ap->rate_set.body[1], - ap->rate_set.body[2], ap->rate_set.body[3], - ap->rate_set.body[4], ap->rate_set.body[5], - ap->rate_set.body[6], ap->rate_set.body[7], - ap->channel, ap->rssi, ap->sq, ap->capability); - DPRINTK(4, "\n Link AP\n rsn.mode=%d\n rsn.size=%d\n", - ap_info->rsn_mode, ap_info->rsn.size); - DPRINTK(4, "\n ext_rate_set_size=%d\n rate_set_size=%d\n", - ap_info->ext_rate_set.size, ap_info->rate_set.size); + ap->bssid[0], ap->bssid[1], ap->bssid[2], + ap->bssid[3], ap->bssid[4], ap->bssid[5], + &(ap->ssid.body[0]), + ap->rate_set.body[0], ap->rate_set.body[1], + ap->rate_set.body[2], ap->rate_set.body[3], + ap->rate_set.body[4], ap->rate_set.body[5], + ap->rate_set.body[6], ap->rate_set.body[7], + ap->channel, ap->rssi, ap->sq, ap->capability); + netdev_dbg(priv->net_dev, " Link AP\n rsn.mode=%d\n rsn.size=%d\n", + ap_info->rsn_mode, ap_info->rsn.size); + netdev_dbg(priv->net_dev, " ext_rate_set_size=%d\n rate_set_size=%d\n", + ap_info->ext_rate_set.size, ap_info->rate_set.size); return 0; } @@ -296,7 +296,7 @@ int get_ap_information(struct ks_wlan_private *priv, struct ap_info_t *ap_info, case WLAN_EID_ERP_INFO: break; default: - DPRINTK(4, "unknown Element ID=%d\n", *bp); + netdev_err(priv->net_dev, "unknown Element ID=%d\n", *bp); break; } @@ -327,7 +327,7 @@ int hostif_data_indication_wpa(struct ks_wlan_private *priv, eth_proto = ntohs(eth_hdr->h_proto); if (eth_hdr->h_dest_snap != eth_hdr->h_source_snap) { - DPRINTK(1, "invalid data format\n"); + netdev_err(priv->net_dev, "invalid data format\n"); priv->nstats.rx_errors++; return -EINVAL; } @@ -338,8 +338,8 @@ int hostif_data_indication_wpa(struct ks_wlan_private *priv, (auth_type == TYPE_GMK2 && priv->wpa.group_suite == IW_AUTH_CIPHER_TKIP)) && key->key_len) { - DPRINTK(4, "TKIP: protocol=%04X: size=%u\n", - eth_proto, priv->rx_size); + netdev_dbg(priv->net_dev, "TKIP: protocol=%04X: size=%u\n", + eth_proto, priv->rx_size); /* MIC save */ memcpy(&recv_mic[0], (priv->rxp) + ((priv->rx_size) - 8), 8); priv->rx_size = priv->rx_size - 8; @@ -359,7 +359,7 @@ int hostif_data_indication_wpa(struct ks_wlan_private *priv, (now - mic_failure->last_failure_time) / HZ >= 60) { mic_failure->failure = 0; } - DPRINTK(4, "MIC FAILURE\n"); + netdev_err(priv->net_dev, "MIC FAILURE\n"); if (mic_failure->failure == 0) { mic_failure->failure = 1; mic_failure->counter = 0; @@ -415,12 +415,12 @@ void hostif_data_indication(struct ks_wlan_private *priv) /* source address check */ if (memcmp(&priv->eth_addr[0], eth_hdr->h_source, ETH_ALEN) == 0) { - DPRINTK(1, "invalid : source is own mac address !!\n"); - DPRINTK(1, - "eth_hdrernet->h_dest=%02X:%02X:%02X:%02X:%02X:%02X\n", - eth_hdr->h_source[0], eth_hdr->h_source[1], - eth_hdr->h_source[2], eth_hdr->h_source[3], - eth_hdr->h_source[4], eth_hdr->h_source[5]); + netdev_err(priv->net_dev, "invalid : source is own mac address !!\n"); + netdev_err(priv->net_dev, + "eth_hdrernet->h_dest=%02X:%02X:%02X:%02X:%02X:%02X\n", + eth_hdr->h_source[0], eth_hdr->h_source[1], + eth_hdr->h_source[2], eth_hdr->h_source[3], + eth_hdr->h_source[4], eth_hdr->h_source[5]); priv->nstats.rx_errors++; return; } @@ -446,7 +446,8 @@ void hostif_data_indication(struct ks_wlan_private *priv) priv->nstats.rx_dropped++; return; } - DPRINTK(4, "SNAP, rx_ind_size = %d\n", rx_ind_size); + netdev_dbg(priv->net_dev, "SNAP, rx_ind_size = %d\n", + rx_ind_size); size = ETH_ALEN * 2; skb_put_data(skb, priv->rxp, size); @@ -465,7 +466,8 @@ void hostif_data_indication(struct ks_wlan_private *priv) priv->nstats.rx_dropped++; return; } - DPRINTK(3, "NETBEUI/NetBIOS rx_ind_size=%d\n", rx_ind_size); + netdev_dbg(priv->net_dev, "NETBEUI/NetBIOS rx_ind_size=%d\n", + rx_ind_size); skb_put_data(skb, priv->rxp, 12); /* 8802/FDDI MAC copy */ @@ -478,7 +480,7 @@ void hostif_data_indication(struct ks_wlan_private *priv) aa1x_hdr = (struct ieee802_1x_hdr *)(priv->rxp + 14); break; default: /* other rx data */ - DPRINTK(2, "invalid data format\n"); + netdev_err(priv->net_dev, "invalid data format\n"); priv->nstats.rx_errors++; return; } @@ -511,8 +513,8 @@ void hostif_mib_get_confirm(struct ks_wlan_private *priv) if (mib_status) { /* in case of error */ - DPRINTK(1, "attribute=%08X, status=%08X\n", mib_attribute, - mib_status); + netdev_err(priv->net_dev, "attribute=%08X, status=%08X\n", + mib_attribute, mib_status); return; } @@ -545,9 +547,9 @@ void hostif_mib_get_confirm(struct ks_wlan_private *priv) break; case LOCAL_GAIN: memcpy(&priv->gain, priv->rxp, sizeof(priv->gain)); - DPRINTK(3, "tx_mode=%d, rx_mode=%d, tx_gain=%d, rx_gain=%d\n", - priv->gain.tx_mode, priv->gain.rx_mode, - priv->gain.tx_gain, priv->gain.rx_gain); + netdev_dbg(priv->net_dev, "tx_mode=%d, rx_mode=%d, tx_gain=%d, rx_gain=%d\n", + priv->gain.tx_mode, priv->gain.rx_mode, + priv->gain.tx_gain, priv->gain.rx_gain); break; case LOCAL_EEPROM_SUM: memcpy(&priv->eeprom_sum, priv->rxp, sizeof(priv->eeprom_sum)); @@ -565,7 +567,8 @@ void hostif_mib_get_confirm(struct ks_wlan_private *priv) } break; default: - DPRINTK(1, "mib_attribute=%08x\n", (unsigned int)mib_attribute); + netdev_err(priv->net_dev, "mib_attribute=%08x\n", + (unsigned int)mib_attribute); break; } } @@ -581,8 +584,8 @@ void hostif_mib_set_confirm(struct ks_wlan_private *priv) if (mib_status) { /* in case of error */ - DPRINTK(1, "error :: attribute=%08X, status=%08X\n", - mib_attribute, mib_status); + netdev_err(priv->net_dev, "error :: attribute=%08X, status=%08X\n", + mib_attribute, mib_status); } switch (mib_attribute) { @@ -706,7 +709,7 @@ void hostif_start_confirm(struct ks_wlan_private *priv) wireless_send_event(priv->net_dev, SIOCGIWAP, &wrqu, NULL); } #endif - DPRINTK(3, " scan_ind_count=%d\n", priv->scan_ind_count); + netdev_dbg(priv->net_dev, " scan_ind_count=%d\n", priv->scan_ind_count); hostif_sme_enqueue(priv, SME_START_CONFIRM); } @@ -734,8 +737,8 @@ void hostif_connect_indication(struct ks_wlan_private *priv) priv->connect_status = tmp + DISCONNECT_STATUS; break; default: - DPRINTK(1, "unknown connect_code=%d :: scan_ind_count=%d\n", - connect_code, priv->scan_ind_count); + netdev_dbg(priv->net_dev, "unknown connect_code=%d :: scan_ind_count=%d\n", + connect_code, priv->scan_ind_count); netif_carrier_off(netdev); tmp = FORCE_DISCONNECT & priv->connect_status; priv->connect_status = tmp + DISCONNECT_STATUS; @@ -757,8 +760,8 @@ void hostif_connect_indication(struct ks_wlan_private *priv) if (is_disconnect_status(priv->connect_status) && is_connect_status(old_status)) { eth_zero_addr(wrqu0.ap_addr.sa_data); - DPRINTK(3, "disconnect :: scan_ind_count=%d\n", - priv->scan_ind_count); + netdev_dbg(priv->net_dev, "disconnect :: scan_ind_count=%d\n", + priv->scan_ind_count); wireless_send_event(netdev, SIOCGIWAP, &wrqu0, NULL); } priv->scan_ind_count = 0; @@ -770,7 +773,7 @@ void hostif_scan_indication(struct ks_wlan_private *priv) int i; struct ap_info_t *ap_info; - DPRINTK(3, "scan_ind_count = %d\n", priv->scan_ind_count); + netdev_dbg(priv->net_dev, "scan_ind_count = %d\n", priv->scan_ind_count); ap_info = (struct ap_info_t *)(priv->rxp); if (priv->scan_ind_count) { @@ -787,14 +790,14 @@ void hostif_scan_indication(struct ks_wlan_private *priv) } priv->scan_ind_count++; if (priv->scan_ind_count < LOCAL_APLIST_MAX + 1) { - DPRINTK(4, " scan_ind_count=%d :: aplist.size=%d\n", + netdev_dbg(priv->net_dev, " scan_ind_count=%d :: aplist.size=%d\n", priv->scan_ind_count, priv->aplist.size); get_ap_information(priv, (struct ap_info_t *)(priv->rxp), &(priv->aplist.ap[priv->scan_ind_count - 1])); priv->aplist.size = priv->scan_ind_count; } else { - DPRINTK(4, " count over :: scan_ind_count=%d\n", - priv->scan_ind_count); + netdev_dbg(priv->net_dev, " count over :: scan_ind_count=%d\n", + priv->scan_ind_count); } } @@ -905,8 +908,8 @@ void hostif_bss_scan_confirm(struct ks_wlan_private *priv) union iwreq_data wrqu; result_code = get_DWORD(priv); - DPRINTK(2, "result=%d :: scan_ind_count=%d\n", result_code, - priv->scan_ind_count); + netdev_dbg(priv->net_dev, "result=%d :: scan_ind_count=%d\n", result_code, + priv->scan_ind_count); priv->sme_i.sme_flag &= ~SME_AP_SCAN; hostif_sme_enqueue(priv, SME_BSS_SCAN_CONFIRM); @@ -935,22 +938,23 @@ void hostif_phy_information_confirm(struct ks_wlan_private *priv) failed_count = get_DWORD(priv); fcs_error_count = get_DWORD(priv); - DPRINTK(4, "phyinfo confirm rssi=%d signal=%d\n", rssi, signal); + netdev_dbg(priv->net_dev, "phyinfo confirm rssi=%d signal=%d\n", + rssi, signal); priv->current_rate = (link_speed & RATE_MASK); wstats->qual.qual = signal; wstats->qual.level = 256 - rssi; wstats->qual.noise = 0; /* invalid noise value */ wstats->qual.updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM; - DPRINTK(3, "\n rssi=%u\n" + netdev_dbg(priv->net_dev, "\n rssi=%u\n" " signal=%u\n" " link_speed=%ux500Kbps\n" " transmitted_frame_count=%u\n" " received_fragment_count=%u\n" " failed_count=%u\n" " fcs_error_count=%u\n", - rssi, signal, link_speed, transmitted_frame_count, - received_fragment_count, failed_count, fcs_error_count); + rssi, signal, link_speed, transmitted_frame_count, + received_fragment_count, failed_count, fcs_error_count); /* wake_up_interruptible_all(&priv->confirm_wait); */ complete(&priv->confirm_wait); } @@ -958,7 +962,7 @@ void hostif_phy_information_confirm(struct ks_wlan_private *priv) static void hostif_mic_failure_confirm(struct ks_wlan_private *priv) { - DPRINTK(3, "mic_failure=%u\n", priv->wpa.mic_failure.failure); + netdev_dbg(priv->net_dev, "mic_failure=%u\n", priv->wpa.mic_failure.failure); hostif_sme_enqueue(priv, SME_MIC_FAILURE_CONFIRM); } @@ -1069,7 +1073,7 @@ int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *skb) skb_len = skb->len; if (skb_len > ETH_FRAME_LEN) { - DPRINTK(1, "bad length skb_len=%d\n", skb_len); + netdev_err(priv->net_dev, "bad length skb_len=%d\n", skb_len); ret = -EOVERFLOW; goto err_kfree_skb; } @@ -1106,8 +1110,8 @@ int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *skb) /* skb check */ eth = (struct ethhdr *)skb->data; if (memcmp(&priv->eth_addr[0], eth->h_source, ETH_ALEN) != 0) { - DPRINTK(1, "invalid mac address !!\n"); - DPRINTK(1, "ethernet->h_source=%pM\n", eth->h_source); + netdev_err(priv->net_dev, "invalid mac address !!\n"); + netdev_err(priv->net_dev, "ethernet->h_source=%pM\n", eth->h_source); ret = -ENXIO; goto err_kfree; } @@ -1122,7 +1126,7 @@ int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *skb) /* EtherType/Length check */ if (*(buffer + 1) + (*buffer << 8) > 1500) { /* ProtocolEAP = *(buffer+1) + (*buffer << 8); */ - /* DPRINTK(2, "Send [SNAP]Type %x\n",ProtocolEAP); */ + /* netdev_dbg(priv->net_dev, "Send [SNAP]Type %x\n",ProtocolEAP); */ /* SAP/CTL/OUI(6 byte) add */ *p++ = 0xAA; /* DSAP */ *p++ = 0xAA; /* SSAP */ @@ -1206,7 +1210,7 @@ int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *skb) priv->wpa.mic_failure.failure > 0) { if (keyinfo & WPA_KEY_INFO_ERROR && keyinfo & WPA_KEY_INFO_REQUEST) { - DPRINTK(3, " MIC ERROR Report SET : %04X\n", keyinfo); + netdev_err(priv->net_dev, " MIC ERROR Report SET : %04X\n", keyinfo); hostif_sme_enqueue(priv, SME_MIC_FAILURE_REQUEST); } if (priv->wpa.mic_failure.failure == 2) @@ -1554,7 +1558,7 @@ void hostif_sleep_request(struct ks_wlan_private *priv, atomic_set(&priv->sleepstatus.wakeup_request, 1); queue_delayed_work(priv->wq, &priv->rw_dwork, 1); } else { - DPRINTK(3, "invalid mode %ld\n", (long)mode); + netdev_err(priv->net_dev, "invalid mode %ld\n", (long)mode); return; } } @@ -1988,8 +1992,8 @@ void hostif_sme_mode_setup(struct ks_wlan_private *priv) hostif_infrastructure_set_request(priv); } else { hostif_infrastructure_set2_request(priv); - DPRINTK(2, - "Infra bssid = %pM\n", priv->reg.bssid); + netdev_dbg(priv->net_dev, + "Infra bssid = %pM\n", priv->reg.bssid); } break; case MODE_ADHOC: @@ -1998,8 +2002,8 @@ void hostif_sme_mode_setup(struct ks_wlan_private *priv) hostif_adhoc_set_request(priv); } else { hostif_adhoc_set2_request(priv); - DPRINTK(2, - "Adhoc bssid = %pM\n", priv->reg.bssid); + netdev_dbg(priv->net_dev, + "Adhoc bssid = %pM\n", priv->reg.bssid); } break; default: @@ -2245,8 +2249,8 @@ void hostif_sme_execute(struct ks_wlan_private *priv, int event) priv->wpa.mic_failure.failure - 1, priv->wpa.mic_failure.counter); } else { - DPRINTK(4, "SME_MIC_FAILURE_REQUEST: failure count=%u error?\n", - priv->wpa.mic_failure.failure); + netdev_err(priv->net_dev, "SME_MIC_FAILURE_REQUEST: failure count=%u error?\n", + priv->wpa.mic_failure.failure); } break; case SME_MIC_FAILURE_CONFIRM: diff --git a/drivers/staging/ks7010/ks_wlan.h b/drivers/staging/ks7010/ks_wlan.h index 3767079be00d..4fff7f7ebf1d 100644 --- a/drivers/staging/ks7010/ks_wlan.h +++ b/drivers/staging/ks7010/ks_wlan.h @@ -34,16 +34,6 @@ #include "ks7010_sdio.h" -#ifdef KS_WLAN_DEBUG -#define DPRINTK(n, fmt, args...) \ - do { \ - if (KS_WLAN_DEBUG > (n)) \ - pr_notice("%s: "fmt, __func__, ## args); \ - } while (0) -#else -#define DPRINTK(n, fmt, args...) -#endif - struct ks_wlan_parameter { u8 operation_mode; /* Operation Mode */ u8 channel; /* Channel */ diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c index d138eb2eaaa2..6106e79c5163 100644 --- a/drivers/staging/ks7010/ks_wlan_net.c +++ b/drivers/staging/ks7010/ks_wlan_net.c @@ -86,7 +86,7 @@ int ks_wlan_update_phy_information(struct ks_wlan_private *priv) { struct iw_statistics *wstats = &priv->wstats; - DPRINTK(4, "in_interrupt = %ld\n", in_interrupt()); + netdev_dbg(priv->net_dev, "in_interrupt = %ld\n", in_interrupt()); if (priv->dev_state < DEVICE_STATE_READY) return -EBUSY; /* not finished initialize */ @@ -103,7 +103,7 @@ int ks_wlan_update_phy_information(struct ks_wlan_private *priv) /* interruptible_sleep_on_timeout(&priv->confirm_wait, HZ/2); */ if (!wait_for_completion_interruptible_timeout (&priv->confirm_wait, HZ / 2)) { - DPRINTK(1, "wait time out!!\n"); + netdev_dbg(priv->net_dev, "wait time out!!\n"); } atomic_inc(&update_phyinfo); @@ -116,7 +116,7 @@ int ks_wlan_update_phy_information(struct ks_wlan_private *priv) static void ks_wlan_update_phyinfo_timeout(struct timer_list *unused) { - DPRINTK(4, "in_interrupt = %ld\n", in_interrupt()); + pr_debug("in_interrupt = %ld\n", in_interrupt()); atomic_set(&update_phyinfo, 0); } @@ -364,7 +364,7 @@ static int ks_wlan_set_wap(struct net_device *dev, struct iw_request_info *info, return -EOPNOTSUPP; } - DPRINTK(2, "bssid = %pM\n", priv->reg.bssid); + netdev_dbg(dev, "bssid = %pM\n", priv->reg.bssid); /* Write it to the card */ if (priv->need_commit) { @@ -677,8 +677,8 @@ static int ks_wlan_get_rate(struct net_device *dev, { struct ks_wlan_private *priv = netdev_priv(dev); - DPRINTK(2, "in_interrupt = %ld update_phyinfo = %d\n", - in_interrupt(), atomic_read(&update_phyinfo)); + netdev_dbg(dev, "in_interrupt = %ld update_phyinfo = %d\n", + in_interrupt(), atomic_read(&update_phyinfo)); if (priv->sleep_mode == SLP_SLEEP) return -EPERM; @@ -1435,7 +1435,7 @@ static inline char *ks_wlan_translate_scan(struct net_device *dev, pbuf += sprintf(pbuf, "%02x", ap->rsn_ie.body[i]); iwe.u.data.length += (ap->rsn_ie.size) * 2; - DPRINTK(4, "ap->rsn.size=%d\n", ap->rsn_ie.size); + netdev_dbg(dev, "ap->rsn.size=%d\n", ap->rsn_ie.size); current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, @@ -1457,8 +1457,8 @@ static inline char *ks_wlan_translate_scan(struct net_device *dev, pbuf += sprintf(pbuf, "%02x", ap->wpa_ie.body[i]); iwe.u.data.length += (ap->wpa_ie.size) * 2; - DPRINTK(4, "ap->rsn.size=%d\n", ap->wpa_ie.size); - DPRINTK(4, "iwe.u.data.length=%d\n", iwe.u.data.length); + netdev_dbg(dev, "ap->rsn.size=%d\n", ap->wpa_ie.size); + netdev_dbg(dev, "iwe.u.data.length=%d\n", iwe.u.data.length); current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, @@ -2320,10 +2320,10 @@ static int ks_wlan_set_wps_probe_req(struct net_device *dev, memcpy(priv->wps.ie, &len, sizeof(len)); p = memcpy(priv->wps.ie + 1, p, len); - DPRINTK(2, "%d(%#x): %02X %02X %02X %02X ... %02X %02X %02X\n", - priv->wps.ielen, priv->wps.ielen, p[0], p[1], p[2], p[3], - p[priv->wps.ielen - 3], p[priv->wps.ielen - 2], - p[priv->wps.ielen - 1]); + netdev_dbg(dev, "%d(%#x): %02X %02X %02X %02X ... %02X %02X %02X\n", + priv->wps.ielen, priv->wps.ielen, p[0], p[1], p[2], p[3], + p[priv->wps.ielen - 3], p[priv->wps.ielen - 2], + p[priv->wps.ielen - 1]); hostif_sme_enqueue(priv, SME_WPS_PROBE_REQUEST); @@ -2778,8 +2778,8 @@ void ks_wlan_tx_timeout(struct net_device *dev) { struct ks_wlan_private *priv = netdev_priv(dev); - DPRINTK(1, "head(%d) tail(%d)!!\n", priv->tx_dev.qhead, - priv->tx_dev.qtail); + netdev_dbg(dev, "head(%d) tail(%d)!!\n", priv->tx_dev.qhead, + priv->tx_dev.qtail); if (!netif_queue_stopped(dev)) netif_stop_queue(dev); priv->nstats.tx_errors++; @@ -2792,7 +2792,7 @@ int ks_wlan_start_xmit(struct sk_buff *skb, struct net_device *dev) struct ks_wlan_private *priv = netdev_priv(dev); int ret; - DPRINTK(3, "in_interrupt()=%ld\n", in_interrupt()); + netdev_dbg(dev, "in_interrupt()=%ld\n", in_interrupt()); if (!skb) { netdev_err(dev, "ks_wlan: skb == NULL!!!\n"); @@ -2810,7 +2810,7 @@ int ks_wlan_start_xmit(struct sk_buff *skb, struct net_device *dev) netif_trans_update(dev); if (ret) - DPRINTK(4, "hostif_data_request error: =%d\n", ret); + netdev_err(dev, "hostif_data_request error: =%d\n", ret); return 0; }