Re: [PATCH] mmc: sdhci: Fix strings broken across multiple lines

2015-11-19 Thread Marek Vasut 
On Thursday, November 19, 2015 at 12:52:06 PM, Ulf Hansson wrote:
> On 18 November 2015 at 10:47, Marek Vasut  wrote:
> > 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 
> > Cc: Ulf Hansson 

Hi!

> Future wise, no need to add a Cc tag here. You should send the patch
> to me anyway.

Are CC tags now frowned upon? In case I have multiple distinct patches
(which go to distinct lists/recipients) in a queue, I use these CC tags
to track who to keep in a loop. Is there some better way to do this?

> Thanks, applied for next!

Thanks.

> FYI: There were some check patch warnings, but I decided to ignore
> them as those are related to the use of the DBG macro.

Oh yeah, the DBG() macro struck me as slightly odd. We should probably
use dev_err() or pr_err() where applicable.

> Kind regards
> Uffe

[..]

Best regards,
Marek Vasut
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] mmc: sdhci: Fix strings broken across multiple lines

2015-11-19 Thread Marek Vasut 
On Thursday, November 19, 2015 at 01:05:15 PM, Ulf Hansson wrote:
> On 19 November 2015 at 12:58, Marek Vasut  wrote:
> > On Thursday, November 19, 2015 at 12:52:06 PM, Ulf Hansson wrote:
> >> On 18 November 2015 at 10:47, Marek Vasut  wrote:
> >> > 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 
> >> > Cc: Ulf Hansson 
> > 
> > Hi!
> > 
> >> Future wise, no need to add a Cc tag here. You should send the patch
> >> to me anyway.
> > 
> > Are CC tags now frowned upon? In case I have multiple distinct patches
> > (which go to distinct lists/recipients) in a queue, I use these CC tags
> > to track who to keep in a loop. Is there some better way to do this?
> 
> As this was a separate patch I didn't quite understand the Cc.
> If the patch is a part of a patchset, it makes more sense if it
> involves different subsystems/maintainers.

It does, but the patches are orthogonal in my case, so I am sending them
using git send-email -1 or such.

> Anyway, no big deal for me! If I don't like the Cc tag, I can easily
> remove it when applying.

Thanks :-)

Best regards,
Marek Vasut
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] mmc: sdhci: Fix strings broken across multiple lines

2015-11-18 Thread Marek Vasut 
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 
Cc: Ulf Hansson 
---
 drivers/mmc/host/sdhci.c | 57 +++-
 1 file changed, 23 insertions(+), 34 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index b48565e..2b17cc1 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -768,8 +768,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, 
struct mmc_command *cmd)
if (unlikely(broken)) {
for_each_sg(data->sg, sg, data->sg_len, i) {
if (sg->length & 0x3) {
-   DBG("Reverting to PIO because of "
-   "transfer size (%d)\n",
+   DBG("Reverting to PIO because of 
transfer size (%d)\n",
sg->length);
host->flags &= ~SDHCI_REQ_USE_DMA;
break;
@@ -803,8 +802,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, 
struct mmc_command *cmd)
if (unlikely(broken)) {
for_each_sg(data->sg, sg, data->sg_len, i) {
if (sg->offset & 0x3) {
-   DBG("Reverting to PIO because of "
-   "bad alignment\n");
+   DBG("Reverting to PIO because of bad 
alignment\n");
host->flags &= ~SDHCI_REQ_USE_DMA;
break;
}
@@ -1016,8 +1014,8 @@ void sdhci_send_command(struct sdhci_host *host, struct 
mmc_command *cmd)
 
while (sdhci_readl(host, SDHCI_PRESENT_STATE) & mask) {
if (timeout == 0) {
-   pr_err("%s: Controller never released "
-   "inhibit bit(s).\n", mmc_hostname(host->mmc));
+   pr_err("%s: Controller never released inhibit 
bit(s).\n",
+  mmc_hostname(host->mmc));
sdhci_dumpregs(host);
cmd->error = -EIO;
tasklet_schedule(>finish_tasklet);
@@ -1254,8 +1252,8 @@ clock_set:
while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL))
& SDHCI_CLOCK_INT_STABLE)) {
if (timeout == 0) {
-   pr_err("%s: Internal clock never "
-   "stabilised.\n", mmc_hostname(host->mmc));
+   pr_err("%s: Internal clock never stabilised.\n",
+  mmc_hostname(host->mmc));
sdhci_dumpregs(host);
return;
}
@@ -1540,8 +1538,8 @@ static void sdhci_do_set_ios(struct sdhci_host *host, 
struct mmc_ios *ios)
else if (ios->drv_type == MMC_SET_DRIVER_TYPE_D)
ctrl_2 |= SDHCI_CTRL_DRV_TYPE_D;
else {
-   pr_warn("%s: invalid driver type, default to "
-   "driver type B\n", mmc_hostname(mmc));
+   pr_warn("%s: invalid driver type, default to 
driver type B\n",
+   mmc_hostname(mmc));
ctrl_2 |= SDHCI_CTRL_DRV_TYPE_B;
}
 
@@ -2015,10 +2013,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, 
u32 opcode)
spin_lock_irqsave(>lock, flags);
 
if (!host->tuning_done) {
-   pr_info(DRIVER_NAME ": Timeout waiting for "
-   "Buffer Read Ready interrupt during tuning "
-   "procedure, falling back to fixed sampling "
-   "clock\n");
+   pr_info(DRIVER_NAME ": Timeout waiting for Buffer Read 
Ready interrupt during tuning procedure, falling back to fixed sampling 
clock\n");
ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2);
ctrl &= ~SDHCI_CTRL_TUNED_CLK;
ctrl &= ~SDHCI_CTRL_EXEC_TUNING;
@@ -2046,9 +2041,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 
opcode)
sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2);
}
if (!(ctrl & SDHCI_CTRL_TUNED_CLK)) {
-   pr_info(DRIVER_NAME ": Tuning procedure"
-   " failed, falling back to fixed