Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
mmc: core: Cleanup printing of speed mode at card insertion
The current print of the bus speed mode in mmc_add_card() has grown over
the years and is now difficult to parse. Let's clean up the code and also
take the opportunity to properly announce "DDR" for eMMCs as
"high speed DDR", which is according to the eMMC spec.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/r/20240913102836.6144-2-victorshihgli@gmail.com
+20
-16
+20
-16
drivers/mmc/core/bus.c
+20
-16
drivers/mmc/core/bus.c
···
299
299
{
300
300
int ret;
301
301
const char *type;
302
+
const char *speed_mode = "";
302
303
const char *uhs_bus_speed_mode = "";
303
304
static const char *const uhs_speeds[] = {
304
305
[UHS_SDR12_BUS_SPEED] = "SDR12 ",
···
343
342
break;
344
343
}
345
344
345
+
if (mmc_card_hs(card))
346
+
speed_mode = "high speed ";
347
+
else if (mmc_card_uhs(card))
348
+
speed_mode = "ultra high speed ";
349
+
else if (mmc_card_ddr52(card))
350
+
speed_mode = "high speed DDR ";
351
+
else if (mmc_card_hs200(card))
352
+
speed_mode = "HS200 ";
353
+
else if (mmc_card_hs400es(card))
354
+
speed_mode = "HS400 Enhanced strobe ";
355
+
else if (mmc_card_hs400(card))
356
+
speed_mode = "HS400 ";
357
+
346
358
if (mmc_card_uhs(card) &&
347
359
(card->sd_bus_speed < ARRAY_SIZE(uhs_speeds)))
348
360
uhs_bus_speed_mode = uhs_speeds[card->sd_bus_speed];
349
361
350
-
if (mmc_host_is_spi(card->host)) {
351
-
pr_info("%s: new %s%s%s card on SPI\n",
352
-
mmc_hostname(card->host),
353
-
mmc_card_hs(card) ? "high speed " : "",
354
-
mmc_card_ddr52(card) ? "DDR " : "",
355
-
type);
356
-
} else {
357
-
pr_info("%s: new %s%s%s%s%s%s card at address %04x\n",
358
-
mmc_hostname(card->host),
359
-
mmc_card_uhs(card) ? "ultra high speed " :
360
-
(mmc_card_hs(card) ? "high speed " : ""),
361
-
mmc_card_hs400(card) ? "HS400 " :
362
-
(mmc_card_hs200(card) ? "HS200 " : ""),
363
-
mmc_card_hs400es(card) ? "Enhanced strobe " : "",
364
-
mmc_card_ddr52(card) ? "DDR " : "",
362
+
if (mmc_host_is_spi(card->host))
363
+
pr_info("%s: new %s%s card on SPI\n",
364
+
mmc_hostname(card->host), speed_mode, type);
365
+
else
366
+
pr_info("%s: new %s%s%s card at address %04x\n",
367
+
mmc_hostname(card->host), speed_mode,
365
368
uhs_bus_speed_mode, type, card->rca);
366
-
}
367
369
368
370
mmc_add_card_debugfs(card);
369
371
card->dev.of_node = mmc_of_find_child_device(card->host, 0);