Skip to content

Commit

Permalink
staging: ks7010: replace DPRINTK traces in favour of netdev_*
Browse files Browse the repository at this point in the history 
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 <sergio.paracuellos@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Sergio Paracuellos authored and Greg Kroah-Hartman committed Mar 19, 2018
1 parent 7acf400 commit 5259b32
Show file tree
Hide file tree
Showing 4 changed files with 130 additions and 136 deletions.
84 changes: 42 additions & 42 deletions drivers/staging/ks7010/ks7010_sdio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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;
Expand All @@ -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) ||
Expand All @@ -200,15 +200,15 @@ 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)
goto queue_delayed_work;

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);
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}
Expand All @@ -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;
}

Expand Down Expand Up @@ -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];
Expand All @@ -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;
Expand All @@ -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);
}
}
Expand All @@ -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,
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand All @@ -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) {
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}
Expand All @@ -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)
Expand All @@ -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;
}
}
Expand Down Expand Up @@ -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);
Expand All @@ -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 */
Expand Down Expand Up @@ -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;
}

Expand All @@ -905,21 +905,21 @@ 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);
sdio_claim_host(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;
}

Expand Down Expand Up @@ -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;
}

Expand Down
Loading

0 comments on commit 5259b32

Please sign in to comment.