Skip to content

Commit 2e4456f

Browse files
Marek Vasutstorulf
Marek Vasut
authored and
storulf
committed
mmc: sdhci: Fix strings broken across multiple lines
This is a trivial patch which fixes printed strings split across two or more lines in the source. I tried to grep for some error output*, but I couldn't find it easily because it was broken across multiple lines. This patch makes my life easier. * in particular "Timeout waiting for hardware interrupt." Signed-off-by: Marek Vasut <marex@denx.de> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent ffedbd2 commit 2e4456f

File tree

1 file changed

+23
-34
lines changed

1 file changed

+23
-34
lines changed

‎drivers/mmc/host/sdhci.c

Lines changed: 23 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -768,8 +768,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)
768768
if (unlikely(broken)) {
769769
for_each_sg(data->sg, sg, data->sg_len, i) {
770770
if (sg->length & 0x3) {
771-
DBG("Reverting to PIO because of "
772-
"transfer size (%d)\n",
771+
DBG("Reverting to PIO because of transfer size (%d)\n",
773772
sg->length);
774773
host->flags &= ~SDHCI_REQ_USE_DMA;
775774
break;
@@ -803,8 +802,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)
803802
if (unlikely(broken)) {
804803
for_each_sg(data->sg, sg, data->sg_len, i) {
805804
if (sg->offset & 0x3) {
806-
DBG("Reverting to PIO because of "
807-
"bad alignment\n");
805+
DBG("Reverting to PIO because of bad alignment\n");
808806
host->flags &= ~SDHCI_REQ_USE_DMA;
809807
break;
810808
}
@@ -1016,8 +1014,8 @@ void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
10161014

10171015
while (sdhci_readl(host, SDHCI_PRESENT_STATE) & mask) {
10181016
if (timeout == 0) {
1019-
pr_err("%s: Controller never released "
1020-
"inhibit bit(s).\n", mmc_hostname(host->mmc));
1017+
pr_err("%s: Controller never released inhibit bit(s).\n",
1018+
mmc_hostname(host->mmc));
10211019
sdhci_dumpregs(host);
10221020
cmd->error = -EIO;
10231021
tasklet_schedule(&host->finish_tasklet);
@@ -1254,8 +1252,8 @@ void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
12541252
while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL))
12551253
& SDHCI_CLOCK_INT_STABLE)) {
12561254
if (timeout == 0) {
1257-
pr_err("%s: Internal clock never "
1258-
"stabilised.\n", mmc_hostname(host->mmc));
1255+
pr_err("%s: Internal clock never stabilised.\n",
1256+
mmc_hostname(host->mmc));
12591257
sdhci_dumpregs(host);
12601258
return;
12611259
}
@@ -1540,8 +1538,8 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)
15401538
else if (ios->drv_type == MMC_SET_DRIVER_TYPE_D)
15411539
ctrl_2 |= SDHCI_CTRL_DRV_TYPE_D;
15421540
else {
1543-
pr_warn("%s: invalid driver type, default to "
1544-
"driver type B\n", mmc_hostname(mmc));
1541+
pr_warn("%s: invalid driver type, default to driver type B\n",
1542+
mmc_hostname(mmc));
15451543
ctrl_2 |= SDHCI_CTRL_DRV_TYPE_B;
15461544
}
15471545

@@ -2015,10 +2013,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
20152013
spin_lock_irqsave(&host->lock, flags);
20162014

20172015
if (!host->tuning_done) {
2018-
pr_info(DRIVER_NAME ": Timeout waiting for "
2019-
"Buffer Read Ready interrupt during tuning "
2020-
"procedure, falling back to fixed sampling "
2021-
"clock\n");
2016+
pr_info(DRIVER_NAME ": Timeout waiting for Buffer Read Ready interrupt during tuning procedure, falling back to fixed sampling clock\n");
20222017
ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2);
20232018
ctrl &= ~SDHCI_CTRL_TUNED_CLK;
20242019
ctrl &= ~SDHCI_CTRL_EXEC_TUNING;
@@ -2046,9 +2041,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
20462041
sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2);
20472042
}
20482043
if (!(ctrl & SDHCI_CTRL_TUNED_CLK)) {
2049-
pr_info(DRIVER_NAME ": Tuning procedure"
2050-
" failed, falling back to fixed sampling"
2051-
" clock\n");
2044+
pr_info(DRIVER_NAME ": Tuning procedure failed, falling back to fixed sampling clock\n");
20522045
err = -EIO;
20532046
}
20542047

@@ -2293,8 +2286,8 @@ static void sdhci_timeout_timer(unsigned long data)
22932286
spin_lock_irqsave(&host->lock, flags);
22942287

22952288
if (host->mrq) {
2296-
pr_err("%s: Timeout waiting for hardware "
2297-
"interrupt.\n", mmc_hostname(host->mmc));
2289+
pr_err("%s: Timeout waiting for hardware interrupt.\n",
2290+
mmc_hostname(host->mmc));
22982291
sdhci_dumpregs(host);
22992292

23002293
if (host->data) {
@@ -2325,9 +2318,8 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask, u32 *mask)
23252318
BUG_ON(intmask == 0);
23262319

23272320
if (!host->cmd) {
2328-
pr_err("%s: Got command interrupt 0x%08x even "
2329-
"though no command operation was in progress.\n",
2330-
mmc_hostname(host->mmc), (unsigned)intmask);
2321+
pr_err("%s: Got command interrupt 0x%08x even though no command operation was in progress.\n",
2322+
mmc_hostname(host->mmc), (unsigned)intmask);
23312323
sdhci_dumpregs(host);
23322324
return;
23332325
}
@@ -2356,8 +2348,7 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask, u32 *mask)
23562348
*/
23572349
if (host->cmd->flags & MMC_RSP_BUSY) {
23582350
if (host->cmd->data)
2359-
DBG("Cannot wait for busy signal when also "
2360-
"doing a data transfer");
2351+
DBG("Cannot wait for busy signal when also doing a data transfer");
23612352
else if (!(host->quirks & SDHCI_QUIRK_NO_BUSY_IRQ)
23622353
&& !host->busy_handle) {
23632354
/* Mark that command complete before busy is ended */
@@ -2451,9 +2442,8 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
24512442
}
24522443
}
24532444

2454-
pr_err("%s: Got data interrupt 0x%08x even "
2455-
"though no data operation was in progress.\n",
2456-
mmc_hostname(host->mmc), (unsigned)intmask);
2445+
pr_err("%s: Got data interrupt 0x%08x even though no data operation was in progress.\n",
2446+
mmc_hostname(host->mmc), (unsigned)intmask);
24572447
sdhci_dumpregs(host);
24582448

24592449
return;
@@ -2896,9 +2886,8 @@ int sdhci_add_host(struct sdhci_host *host)
28962886
host->version = (host->version & SDHCI_SPEC_VER_MASK)
28972887
>> SDHCI_SPEC_VER_SHIFT;
28982888
if (host->version > SDHCI_SPEC_300) {
2899-
pr_err("%s: Unknown controller version (%d). "
2900-
"You may experience problems.\n", mmc_hostname(mmc),
2901-
host->version);
2889+
pr_err("%s: Unknown controller version (%d). You may experience problems.\n",
2890+
mmc_hostname(mmc), host->version);
29022891
}
29032892

29042893
caps[0] = (host->quirks & SDHCI_QUIRK_MISSING_CAPS) ? host->caps :
@@ -3031,8 +3020,8 @@ int sdhci_add_host(struct sdhci_host *host)
30313020
if (host->max_clk == 0 || host->quirks &
30323021
SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN) {
30333022
if (!host->ops->get_max_clock) {
3034-
pr_err("%s: Hardware doesn't specify base clock "
3035-
"frequency.\n", mmc_hostname(mmc));
3023+
pr_err("%s: Hardware doesn't specify base clock frequency.\n",
3024+
mmc_hostname(mmc));
30363025
return -ENODEV;
30373026
}
30383027
host->max_clk = host->ops->get_max_clock(host);
@@ -3294,8 +3283,8 @@ int sdhci_add_host(struct sdhci_host *host)
32943283
mmc->ocr_avail_mmc &= host->ocr_avail_mmc;
32953284

32963285
if (mmc->ocr_avail == 0) {
3297-
pr_err("%s: Hardware doesn't report any "
3298-
"support voltages.\n", mmc_hostname(mmc));
3286+
pr_err("%s: Hardware doesn't report any support voltages.\n",
3287+
mmc_hostname(mmc));
32993288
return -ENODEV;
33003289
}
33013290

0 commit comments

Comments
 (0)