This commit reviews debug and error messages in code located
in ks7010_sdio source file avoiding to use 'error' or 'ks7010'
because this file is using netdev_* functions and has non
sense to repeat information in log messages.
Signed-off-by: Sergio Paracuellos <sergio.paracuel...@gmail.com>
---
drivers/staging/ks7010/ks7010_sdio.c | 38 +++++++++++++++++-------------------
1 file changed, 18 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/ks7010/ks7010_sdio.c
b/drivers/staging/ks7010/ks7010_sdio.c
index 4fde8d8..19ce50f 100644
--- a/drivers/staging/ks7010/ks7010_sdio.c
+++ b/drivers/staging/ks7010/ks7010_sdio.c
@@ -194,7 +194,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_REG, GCR_B_DOZE);
if (ret) {
- netdev_err(priv->net_dev, " error : GCR_B_REG\n");
+ netdev_err(priv->net_dev, "write GCR_B_REG\n");
goto set_sleep_mode;
}
atomic_set(&priv->sleepstatus.status, 1);
@@ -215,7 +215,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_REG, WAKEUP_REQ);
if (ret) {
- netdev_err(priv->net_dev, " error : WAKEUP_REG\n");
+ netdev_err(priv->net_dev, "write WAKEUP_REG\n");
goto set_sleep_mode;
}
atomic_set(&priv->sleepstatus.status, 0);
@@ -234,7 +234,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_REG, WAKEUP_REQ);
if (ret)
- netdev_err(priv->net_dev, " error : WAKEUP_REG\n");
+ netdev_err(priv->net_dev, "write WAKEUP_REG\n");
priv->last_wakeup = jiffies;
++priv->wakeup_count;
@@ -276,7 +276,7 @@ static void _ks_wlan_hw_power_save(struct ks_wlan_private
*priv)
ret = ks7010_sdio_readb(priv, INT_PENDING_REG, &byte);
if (ret) {
- netdev_err(priv->net_dev, " error : INT_PENDING_REG\n");
+ netdev_err(priv->net_dev, "read INT_PENDING_REG\n");
goto queue_delayed_work;
}
if (byte)
@@ -284,7 +284,7 @@ static void _ks_wlan_hw_power_save(struct ks_wlan_private
*priv)
ret = ks7010_sdio_writeb(priv, GCR_B_REG, GCR_B_DOZE);
if (ret) {
- netdev_err(priv->net_dev, " error : GCR_B_REG\n");
+ netdev_err(priv->net_dev, "write GCR_B_REG\n");
goto queue_delayed_work;
}
atomic_set(&priv->psstatus.status, PS_SNOOZE);
@@ -355,13 +355,13 @@ static int write_to_device(struct ks_wlan_private *priv,
unsigned char *buffer,
ret = ks7010_sdio_write(priv, DATA_WINDOW, buffer, size);
if (ret) {
- netdev_err(priv->net_dev, " write error : retval=%d\n", ret);
+ netdev_err(priv->net_dev, "write DATA_WINDOW\n");
return ret;
}
ret = ks7010_sdio_writeb(priv, WRITE_STATUS_REG, REG_STATUS_BUSY);
if (ret) {
- netdev_err(priv->net_dev, " error : WRITE_STATUS_REG\n");
+ netdev_err(priv->net_dev, "write WRITE_STATUS_REG\n");
return ret;
}
@@ -469,7 +469,7 @@ static void ks_wlan_hw_rx(struct ks_wlan_private *priv,
uint16_t size)
#endif
ret = ks7010_sdio_writeb(priv, READ_STATUS_REG,
REG_STATUS_IDLE);
if (ret)
- netdev_err(priv->net_dev, " error : READ_STATUS_REG\n");
+ netdev_err(priv->net_dev, "write READ_STATUS_REG\n");
/* length check fail */
return;
@@ -482,7 +482,7 @@ static void ks_wlan_hw_rx(struct ks_wlan_private *priv,
uint16_t size)
ret = ks7010_sdio_writeb(priv, READ_STATUS_REG, REG_STATUS_IDLE);
if (ret)
- netdev_err(priv->net_dev, " error : READ_STATUS_REG\n");
+ netdev_err(priv->net_dev, "write READ_STATUS_REG\n");
if (atomic_read(&priv->psstatus.confirm_wait)) {
if (is_hif_conf(event)) {
@@ -543,7 +543,7 @@ static void ks7010_rw_function(struct work_struct *work)
/* read (WriteStatus/ReadDataSize FN1:00_0014) */
ret = ks7010_sdio_readb(priv, WSTATUS_RSIZE_REG, &byte);
if (ret) {
- netdev_err(priv->net_dev, " error : WSTATUS_RSIZE_REG
psstatus=%d\n",
+ netdev_err(priv->net_dev, "read WSTATUS_RSIZE_REG
psstatus=%d\n",
atomic_read(&priv->psstatus.status));
goto release_host;
}
@@ -575,7 +575,7 @@ static void ks_sdio_interrupt(struct sdio_func *func)
ret = ks7010_sdio_readb(priv, INT_PENDING_REG, &status);
if (ret) {
- netdev_err(priv->net_dev, "error : INT_PENDING_REG\n");
+ netdev_err(priv->net_dev, "read INT_PENDING_REG\n");
goto queue_delayed_work;
}
@@ -588,7 +588,7 @@ static void ks_sdio_interrupt(struct sdio_func *func)
atomic_read(&priv->psstatus.status) == PS_SNOOZE) {
ret = ks7010_sdio_readb(priv, GCR_B_REG, &byte);
if (ret) {
- netdev_err(priv->net_dev, " error : GCR_B_REG\n");
+ netdev_err(priv->net_dev, "read GCR_B_REG\n");
goto queue_delayed_work;
}
if (byte == GCR_B_ACTIVE) {
@@ -604,7 +604,7 @@ static void ks_sdio_interrupt(struct sdio_func *func)
/* read (WriteStatus/ReadDataSize FN1:00_0014) */
ret = ks7010_sdio_readb(priv, WSTATUS_RSIZE_REG, &byte);
if (ret) {
- netdev_err(priv->net_dev, " error :
WSTATUS_RSIZE_REG\n");
+ netdev_err(priv->net_dev, "read WSTATUS_RSIZE_REG\n");
goto queue_delayed_work;
}
rsize = byte & RSIZE_MASK;
@@ -939,7 +939,7 @@ static void ks7010_sdio_init_irqs(struct sdio_func *func,
ret = ks7010_sdio_writeb(priv, INT_PENDING_REG, 0xff);
sdio_release_host(func);
if (ret)
- netdev_err(priv->net_dev, " error : INT_PENDING_REG\n");
+ netdev_err(priv->net_dev, "write INT_PENDING_REG\n");
/* enable ks7010sdio interrupt */
byte = (INT_GCR_B | INT_READ_STATUS | INT_WRITE_STATUS);
@@ -947,7 +947,7 @@ static void ks7010_sdio_init_irqs(struct sdio_func *func,
ret = ks7010_sdio_writeb(priv, INT_ENABLE_REG, byte);
sdio_release_host(func);
if (ret)
- netdev_err(priv->net_dev, " err : INT_ENABLE_REG\n");
+ netdev_err(priv->net_dev, "write INT_ENABLE_REG\n");
}
static void ks7010_private_init(struct ks_wlan_private *priv,
@@ -1018,12 +1018,11 @@ static int ks7010_sdio_probe(struct sdio_func *func,
/* private memory allocate */
netdev = alloc_etherdev(sizeof(*priv));
if (!netdev) {
- dev_err(&card->func->dev, "ks7010 : Unable to alloc new net
device\n");
+ dev_err(&card->func->dev, "Unable to alloc new net device\n");
goto err_release_irq;
}
if (dev_alloc_name(netdev, "wlan%d") < 0) {
- dev_err(&card->func->dev,
- "ks7010 : Couldn't get name!\n");
+ dev_err(&card->func->dev, "Couldn't get name!\n");
goto err_free_netdev;
}
@@ -1037,8 +1036,7 @@ static int ks7010_sdio_probe(struct sdio_func *func,
ret = ks7010_upload_firmware(card);
if (ret) {
netdev_err(priv->net_dev,
- "ks7010: firmware load failed !! return code = %d\n",
- ret);
+ "firmware load failed !! ret = %d\n", ret);
goto err_free_netdev;
}
--
2.7.4
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
