summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartosz Markowski <bartosz.markowski@tieto.com>2011-09-20 12:39:33 +0200
committerPhilippe LANGLAIS <philippe.langlais@stericsson.com>2011-10-13 10:16:02 +0200
commit094b2544078c90d139f6e61cc7a54767b120d6b4 (patch)
tree2f5836542d1facf5edc85415e3df906b8d07a66f
parentcf2c9e38752a57e95ec70d1cb3b1409ae8d45eb3 (diff)
cw1200: Remove confusing warnings
When bus error occurs, there is an existing recovery from this situation. These traces are confusining only and do not have any other impact. ST-Ericsson ID: 355083 Change-Id: I710bc79cdfe7d787994cfd1842ba1293756f968e Signed-off-by: Bartosz Markowski <bartosz.markowski@tieto.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31468 Reviewed-by: QABUILD Reviewed-by: QATEST Reviewed-by: Dmitry TARNYAGIN <dmitry.tarnyagin@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33523 Tested-by: Dmitry TARNYAGIN <dmitry.tarnyagin@stericsson.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
-rw-r--r--drivers/staging/cw1200/bh.c4
-rw-r--r--drivers/staging/cw1200/cw1200_sdio.c8
2 files changed, 1 insertions, 11 deletions
diff --git a/drivers/staging/cw1200/bh.c b/drivers/staging/cw1200/bh.c
index 4c4a3bf86ad..231213a9cda 100644
--- a/drivers/staging/cw1200/bh.c
+++ b/drivers/staging/cw1200/bh.c
@@ -206,10 +206,6 @@ static int cw1200_bh_read_ctrl_reg(struct cw1200_common *priv,
if (ret)
printk(KERN_ERR
"[BH] Failed to read control register.\n");
- else
- printk(KERN_WARNING
- "[BH] Second attempt to read control "
- "register passed. This is a firmware bug.\n");
}
return ret;
diff --git a/drivers/staging/cw1200/cw1200_sdio.c b/drivers/staging/cw1200/cw1200_sdio.c
index 279dff144ae..1257e68648a 100644
--- a/drivers/staging/cw1200/cw1200_sdio.c
+++ b/drivers/staging/cw1200/cw1200_sdio.c
@@ -50,13 +50,7 @@ static int cw1200_sdio_memcpy_fromio(struct sbus_priv *self,
unsigned int addr,
void *dst, int count)
{
- int ret = sdio_memcpy_fromio(self->func, dst, addr, count);
- if (ret) {
- printk(KERN_ERR "!!! Can't read %d bytes from 0x%.8X."
- " Err %d.\n",
- count, addr, ret);
- }
- return ret;
+ return sdio_memcpy_fromio(self->func, dst, addr, count);
}
static int cw1200_sdio_memcpy_toio(struct sbus_priv *self,