aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/bluetooth/btmrvl_main.c14
-rw-r--r--drivers/bluetooth/btmrvl_sdio.c4
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index bb0d2c26a479..10973ac03fc9 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -42,7 +42,7 @@ void btmrvl_interrupt(struct btmrvl_private *priv)
42 priv->adapter->int_count++; 42 priv->adapter->int_count++;
43 43
44 if (priv->adapter->hs_state == HS_ACTIVATED) { 44 if (priv->adapter->hs_state == HS_ACTIVATED) {
45 BT_DBG("BT: HS DEACTIVATED in ISR!\n"); 45 BT_DBG("BT: HS DEACTIVATED in ISR!");
46 priv->adapter->hs_state = HS_DEACTIVATED; 46 priv->adapter->hs_state = HS_DEACTIVATED;
47 } 47 }
48 48
@@ -214,7 +214,7 @@ int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, u8 subcmd)
214 214
215 ret = btmrvl_send_sync_cmd(priv, BT_CMD_MODULE_CFG_REQ, &subcmd, 1); 215 ret = btmrvl_send_sync_cmd(priv, BT_CMD_MODULE_CFG_REQ, &subcmd, 1);
216 if (ret) 216 if (ret)
217 BT_ERR("module_cfg_cmd(%x) failed\n", subcmd); 217 BT_ERR("module_cfg_cmd(%x) failed", subcmd);
218 218
219 return ret; 219 return ret;
220} 220}
@@ -250,7 +250,7 @@ int btmrvl_send_hscfg_cmd(struct btmrvl_private *priv)
250 250
251 ret = btmrvl_send_sync_cmd(priv, BT_CMD_HOST_SLEEP_CONFIG, param, 2); 251 ret = btmrvl_send_sync_cmd(priv, BT_CMD_HOST_SLEEP_CONFIG, param, 2);
252 if (ret) 252 if (ret)
253 BT_ERR("HSCFG command failed\n"); 253 BT_ERR("HSCFG command failed");
254 254
255 return ret; 255 return ret;
256} 256}
@@ -268,7 +268,7 @@ int btmrvl_enable_ps(struct btmrvl_private *priv)
268 268
269 ret = btmrvl_send_sync_cmd(priv, BT_CMD_AUTO_SLEEP_MODE, &param, 1); 269 ret = btmrvl_send_sync_cmd(priv, BT_CMD_AUTO_SLEEP_MODE, &param, 1);
270 if (ret) 270 if (ret)
271 BT_ERR("PSMODE command failed\n"); 271 BT_ERR("PSMODE command failed");
272 272
273 return 0; 273 return 0;
274} 274}
@@ -281,7 +281,7 @@ int btmrvl_enable_hs(struct btmrvl_private *priv)
281 281
282 ret = btmrvl_send_sync_cmd(priv, BT_CMD_HOST_SLEEP_ENABLE, NULL, 0); 282 ret = btmrvl_send_sync_cmd(priv, BT_CMD_HOST_SLEEP_ENABLE, NULL, 0);
283 if (ret) { 283 if (ret) {
284 BT_ERR("Host sleep enable command failed\n"); 284 BT_ERR("Host sleep enable command failed");
285 return ret; 285 return ret;
286 } 286 }
287 287
@@ -328,7 +328,7 @@ int btmrvl_prepare_command(struct btmrvl_private *priv)
328 } else { 328 } else {
329 ret = priv->hw_wakeup_firmware(priv); 329 ret = priv->hw_wakeup_firmware(priv);
330 priv->adapter->hs_state = HS_DEACTIVATED; 330 priv->adapter->hs_state = HS_DEACTIVATED;
331 BT_DBG("BT: HS DEACTIVATED due to host activity!\n"); 331 BT_DBG("BT: HS DEACTIVATED due to host activity!");
332 } 332 }
333 } 333 }
334 334
@@ -493,7 +493,7 @@ static int btmrvl_download_cal_data(struct btmrvl_private *priv,
493 ret = btmrvl_send_sync_cmd(priv, BT_CMD_LOAD_CONFIG_DATA, data, 493 ret = btmrvl_send_sync_cmd(priv, BT_CMD_LOAD_CONFIG_DATA, data,
494 BT_CAL_HDR_LEN + len); 494 BT_CAL_HDR_LEN + len);
495 if (ret) 495 if (ret)
496 BT_ERR("Failed to download caibration data\n"); 496 BT_ERR("Failed to download caibration data");
497 497
498 return 0; 498 return 0;
499} 499}
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 550bce089fa6..416d792176c2 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -764,8 +764,8 @@ static void btmrvl_sdio_interrupt(struct sdio_func *func)
764 764
765 card = sdio_get_drvdata(func); 765 card = sdio_get_drvdata(func);
766 if (!card || !card->priv) { 766 if (!card || !card->priv) {
767 BT_ERR("sbi_interrupt(%p) card or priv is " 767 BT_ERR("sbi_interrupt(%p) card or priv is NULL, card=%p",
768 "NULL, card=%p\n", func, card); 768 func, card);
769 return; 769 return;
770 } 770 }
771 771