Skip to content

Commit 6f97f52

Browse files
lgl88911MaureenHelm
authored andcommitted
driver: usdhc: modify LOG message
LOG API will auto add \r\n at output end, remove the \r\n at the end of debug messge. Fix misspelled. Signed-off-by: Frank Li <lgl88911@163.com>
1 parent 664aaf0 commit 6f97f52

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

drivers/disk/usdhc.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,7 +1141,7 @@ static int usdhc_wait_cmd_done(struct usdhc_priv *priv,
11411141
if (!error) {
11421142
error = usdhc_cmd_rsp(priv);
11431143
} else {
1144-
LOG_ERR("CMD%d Polling ERROR\r\n",
1144+
LOG_ERR("CMD%d Polling ERROR",
11451145
priv->op_context.cmd.index);
11461146
}
11471147

@@ -2366,7 +2366,7 @@ static int usdhc_sd_init(struct usdhc_priv *priv)
23662366
priv->card_info.card_flags |= USDHC_SDHC_FLAG;
23672367
} else {
23682368
/* SDSC card */
2369-
LOG_ERR("USDHC SDSC not implemented yet!\r\n");
2369+
LOG_ERR("USDHC SDSC not implemented yet!");
23702370
return -ENOTSUP;
23712371
}
23722372

@@ -2379,7 +2379,7 @@ static int usdhc_sd_init(struct usdhc_priv *priv)
23792379
SDHC_APP_SEND_OP_COND, app_cmd_41_arg,
23802380
SDHC_RSP_TYPE_R1, SDHC_RSP_TYPE_R3, 1);
23812381
if (ret) {
2382-
LOG_ERR("APP Condition CMD failed:%d\r\n", ret);
2382+
LOG_ERR("APP Condition CMD failed:%d", ret);
23832383
return ret;
23842384
}
23852385
if (cmd->response[0U] & SD_OCR_PWR_BUSY_FLAG) {
@@ -2406,7 +2406,7 @@ static int usdhc_sd_init(struct usdhc_priv *priv)
24062406
ret = usdhc_vol_switch(priv);
24072407
}
24082408
if (ret) {
2409-
LOG_ERR("Voltage switch failed: %d\r\n", ret);
2409+
LOG_ERR("Voltage switch failed: %d", ret);
24102410
return ret;
24112411
}
24122412
priv->card_info.voltage = SD_VOL_1_8_V;
@@ -2422,7 +2422,7 @@ static int usdhc_sd_init(struct usdhc_priv *priv)
24222422
sdhc_decode_cid(&priv->card_info.cid,
24232423
priv->card_info.raw_cid);
24242424
} else {
2425-
LOG_ERR("All send CID CMD failed: %d\r\n", ret);
2425+
LOG_ERR("All send CID CMD failed: %d", ret);
24262426
return ret;
24272427
}
24282428

@@ -2433,7 +2433,7 @@ static int usdhc_sd_init(struct usdhc_priv *priv)
24332433
if (!ret) {
24342434
priv->card_info.relative_addr = (cmd->response[0U] >> 16U);
24352435
} else {
2436-
LOG_ERR("Send relative address CMD failed: %d\r\n", ret);
2436+
LOG_ERR("Send relative address CMD failed: %d", ret);
24372437
return ret;
24382438
}
24392439

@@ -2448,7 +2448,7 @@ static int usdhc_sd_init(struct usdhc_priv *priv)
24482448
&priv->card_info.sd_block_count,
24492449
&priv->card_info.sd_block_size);
24502450
} else {
2451-
LOG_ERR("Send CSD CMD failed: %d\r\n", ret);
2451+
LOG_ERR("Send CSD CMD failed: %d", ret);
24522452
return ret;
24532453
}
24542454

@@ -2458,7 +2458,7 @@ static int usdhc_sd_init(struct usdhc_priv *priv)
24582458

24592459
ret = usdhc_xfer(priv);
24602460
if (ret || (cmd->response[0U] & SDHC_R1ERR_All_FLAG)) {
2461-
LOG_ERR("Select card CMD failed: %d\r\n", ret);
2461+
LOG_ERR("Select card CMD failed: %d", ret);
24622462
return -EIO;
24632463
}
24642464

@@ -2471,7 +2471,7 @@ static int usdhc_sd_init(struct usdhc_priv *priv)
24712471
SDHC_RSP_TYPE_R1, SDHC_RSP_TYPE_R1, 0);
24722472

24732473
if (ret) {
2474-
LOG_ERR("Send SCR following APP CMD failed: %d\r\n", ret);
2474+
LOG_ERR("Send SCR following APP CMD failed: %d", ret);
24752475
return ret;
24762476
}
24772477

@@ -2528,7 +2528,7 @@ static int usdhc_sd_init(struct usdhc_priv *priv)
25282528
SDHC_RSP_TYPE_R1, SDHC_RSP_TYPE_R1, 1);
25292529

25302530
if (ret) {
2531-
LOG_ERR("Set bus width failed: %d\r\n", ret);
2531+
LOG_ERR("Set bus width failed: %d", ret);
25322532
return ret;
25332533
}
25342534
usdhc_set_bus_width(base, USDHC_DATA_BUS_WIDTH_4BIT);
@@ -2539,15 +2539,15 @@ static int usdhc_sd_init(struct usdhc_priv *priv)
25392539
ret = usdhc_select_fun(priv, SD_GRP_DRIVER_STRENGTH_MODE,
25402540
priv->card_info.driver_strength);
25412541
if (ret) {
2542-
LOG_ERR("Set SD driver strehgth failed: %d\r\n", ret);
2542+
LOG_ERR("Set SD driver strength failed: %d", ret);
25432543
return ret;
25442544
}
25452545

25462546
/* set sd card current limit */
25472547
ret = usdhc_select_fun(priv, SD_GRP_CURRENT_LIMIT_MODE,
25482548
priv->card_info.max_current);
25492549
if (ret) {
2550-
LOG_ERR("Set SD current limit failed: %d\r\n", ret);
2550+
LOG_ERR("Set SD current limit failed: %d", ret);
25512551
return ret;
25522552
}
25532553
}
@@ -2558,15 +2558,15 @@ static int usdhc_sd_init(struct usdhc_priv *priv)
25582558

25592559
ret = usdhc_xfer(priv);
25602560
if (ret || cmd->response[0U] & SDHC_R1ERR_All_FLAG) {
2561-
LOG_ERR("Set block size failed: %d\r\n", ret);
2561+
LOG_ERR("Set block size failed: %d", ret);
25622562
return -EIO;
25632563
}
25642564

25652565
if (priv->card_info.version > SD_SPEC_VER1_0) {
25662566
/* select bus timing */
25672567
ret = usdhc_select_bus_timing(priv);
25682568
if (ret) {
2569-
LOG_ERR("Select bus timing failed: %d\r\n", ret);
2569+
LOG_ERR("Select bus timing failed: %d", ret);
25702570
return ret;
25712571
}
25722572
}
@@ -2582,7 +2582,7 @@ static int usdhc_sd_init(struct usdhc_priv *priv)
25822582
}
25832583

25842584
if (ret) {
2585-
LOG_ERR("USDHC bus device initalization failed!\r\n");
2585+
LOG_ERR("USDHC bus device initalization failed!");
25862586
}
25872587

25882588
return ret;
@@ -2627,7 +2627,7 @@ static int usdhc_board_access_init(struct usdhc_priv *priv)
26272627
}
26282628

26292629
if (!priv->detect_gpio) {
2630-
LOG_INF("USDHC detection other than GPIO not implemented!\r\n");
2630+
LOG_INF("USDHC detection other than GPIO not implemented!");
26312631
return 0;
26322632
}
26332633

@@ -2647,13 +2647,13 @@ static int usdhc_board_access_init(struct usdhc_priv *priv)
26472647

26482648
if (gpio_level == 0) {
26492649
priv->inserted = false;
2650-
LOG_ERR("NO SD inserted!\r\n");
2650+
LOG_ERR("NO SD inserted!");
26512651

26522652
return -ENODEV;
26532653
}
26542654

26552655
priv->inserted = true;
2656-
LOG_INF("SD inserted!\r\n");
2656+
LOG_INF("SD inserted!");
26572657

26582658
return 0;
26592659
}

0 commit comments

Comments
 (0)