[alsa-devel] [PATCH] ASoC: atmel_ssc_dai: fix spelling mistake: "Stoping" -> "Stopping"
From: Colin Ian King colin.king@canonical.com
Trivial fix to spelling mistake in pr_debug message text
Signed-off-by: Colin Ian King colin.king@canonical.com --- sound/soc/atmel/atmel_ssc_dai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index a1e2c5682dcd..1c7af0ca98ec 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -820,7 +820,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, if (ret < 0) { printk(KERN_WARNING "atmel_ssc_dai: request_irq failure\n"); - pr_debug("Atmel_ssc_dai: Stoping clock\n"); + pr_debug("Atmel_ssc_dai: Stopping clock\n"); clk_disable(ssc_p->ssc->clk); return ret; }
On 30/03/2018 at 16:44:20 +0100, Colin King wrote:
From: Colin Ian King colin.king@canonical.com
Trivial fix to spelling mistake in pr_debug message text
Acked-by: Alexandre Belloni alexandre.belloni@bootlin.com
Signed-off-by: Colin Ian King colin.king@canonical.com
sound/soc/atmel/atmel_ssc_dai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index a1e2c5682dcd..1c7af0ca98ec 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -820,7 +820,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, if (ret < 0) { printk(KERN_WARNING "atmel_ssc_dai: request_irq failure\n");
pr_debug("Atmel_ssc_dai: Stoping clock\n");
pr_debug("Atmel_ssc_dai: Stopping clock\n"); clk_disable(ssc_p->ssc->clk); return ret;-- 2.15.1
On 31/03/2018 at 10:54, Alexandre Belloni wrote:
On 30/03/2018 at 16:44:20 +0100, Colin King wrote:
From: Colin Ian King colin.king@canonical.com
Trivial fix to spelling mistake in pr_debug message text
Acked-by: Alexandre Belloni alexandre.belloni@bootlin.com
Acked-by: Nicolas Ferre nicolas.ferre@microchip.com
Signed-off-by: Colin Ian King colin.king@canonical.com
sound/soc/atmel/atmel_ssc_dai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index a1e2c5682dcd..1c7af0ca98ec 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -820,7 +820,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, if (ret < 0) { printk(KERN_WARNING "atmel_ssc_dai: request_irq failure\n");
pr_debug("Atmel_ssc_dai: Stoping clock\n");
pr_debug("Atmel_ssc_dai: Stopping clock\n"); clk_disable(ssc_p->ssc->clk); return ret;-- 2.15.1
On Fri, Mar 30, 2018 at 04:44:20PM +0100, Colin King wrote:
From: Colin Ian King colin.king@canonical.com
Hello Colin,
Trivial fix to spelling mistake in pr_debug message text
would you mind making this patch a bit less non-trivial and change pr_debug to dev_dbg dropping Atmel_ssc_dai prefix?
Thank you.
Signed-off-by: Colin Ian King colin.king@canonical.com
sound/soc/atmel/atmel_ssc_dai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index a1e2c5682dcd..1c7af0ca98ec 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -820,7 +820,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, if (ret < 0) { printk(KERN_WARNING "atmel_ssc_dai: request_irq failure\n");
pr_debug("Atmel_ssc_dai: Stoping clock\n");
pr_debug("Atmel_ssc_dai: Stopping clock\n"); clk_disable(ssc_p->ssc->clk); return ret;-- 2.15.1
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
On Tue, 2018-04-03 at 15:45 +0200, Ladislav Michl wrote:
On Fri, Mar 30, 2018 at 04:44:20PM +0100, Colin King wrote:
From: Colin Ian King colin.king@canonical.com
Hello Colin,
Trivial fix to spelling mistake in pr_debug message text
would you mind making this patch a bit less non-trivial and change pr_debug to dev_dbg dropping Atmel_ssc_dai prefix?
Presumably, then all the pr_<foo> calls should be changed. Something like: --- sound/soc/atmel/atmel_ssc_dai.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-)
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index a1e2c5682dcd..594228156b2d 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -291,11 +291,10 @@ static int atmel_ssc_startup(struct snd_pcm_substream *substream, int dir, dir_mask; int ret;
- pr_debug("atmel_ssc_startup: SSC_SR=0x%x\n", - ssc_readl(ssc_p->ssc->regs, SR)); + dev_dbg(dai->dev, "SSC_SR=0x%x\n", ssc_readl(ssc_p->ssc->regs, SR));
/* Enable PMC peripheral clock for this SSC */ - pr_debug("atmel_ssc_dai: Starting clock\n"); + dev_dbg(dai->dev, "Starting clock\n"); clk_enable(ssc_p->ssc->clk); ssc_p->mck_rate = clk_get_rate(ssc_p->ssc->clk);
@@ -385,7 +384,7 @@ static void atmel_ssc_shutdown(struct snd_pcm_substream *substream, spin_unlock_irq(&ssc_p->lock);
/* Shutdown the SSC clock. */ - pr_debug("atmel_ssc_dai: Stopping clock\n"); + dev_dbg(dai->dev, "Stopping clock\n"); clk_disable(ssc_p->ssc->clk); }
@@ -794,13 +793,12 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, break;
default: - printk(KERN_WARNING "atmel_ssc_dai: unsupported DAI format 0x%x\n", - ssc_p->daifmt); + dev_warn(dai->dev, "unsupported DAI format 0x%x\n", + ssc_p->daifmt); return -EINVAL; } - pr_debug("atmel_ssc_hw_params: " - "RCMR=%08x RFMR=%08x TCMR=%08x TFMR=%08x\n", - rcmr, rfmr, tcmr, tfmr); + dev_dbg(dai->dev, "RCMR=%08x RFMR=%08x TCMR=%08x TFMR=%08x\n", + rcmr, rfmr, tcmr, tfmr);
if (!ssc_p->initialized) { if (!ssc_p->ssc->pdata->use_dma) { @@ -818,9 +816,8 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, ret = request_irq(ssc_p->ssc->irq, atmel_ssc_interrupt, 0, ssc_p->name, ssc_p); if (ret < 0) { - printk(KERN_WARNING - "atmel_ssc_dai: request_irq failure\n"); - pr_debug("Atmel_ssc_dai: Stoping clock\n"); + dev_warn(dai->dev, "request_irq failure\n"); + dev_dbg(dai->dev, "Stopping clock\n"); clk_disable(ssc_p->ssc->clk); return ret; } @@ -839,7 +836,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, ssc_writel(ssc_p->ssc->regs, TCMR, tcmr); ssc_writel(ssc_p->ssc->regs, TFMR, tfmr);
- pr_debug("atmel_ssc_dai,hw_params: SSC initialized\n"); + dev_dbg(dai->dev, "SSC initialized\n"); return 0; }
@@ -862,9 +859,9 @@ static int atmel_ssc_prepare(struct snd_pcm_substream *substream, ssc_writel(ssc_p->ssc->regs, CR, dma_params->mask->ssc_disable); ssc_writel(ssc_p->ssc->regs, IDR, dma_params->mask->ssc_error);
- pr_debug("%s enabled SSC_SR=0x%08x\n", - dir ? "receive" : "transmit", - ssc_readl(ssc_p->ssc->regs, SR)); + dev_dbg(dai->dev, "%s enabled SSC_SR=0x%08x\n", + dir ? "receive" : "transmit", + ssc_readl(ssc_p->ssc->regs, SR)); return 0; }
@@ -1050,21 +1047,18 @@ static void asoc_ssc_exit(struct device *dev) int atmel_ssc_set_audio(int ssc_id) { struct ssc_device *ssc; - int ret;
/* If we can grab the SSC briefly to parent the DAI device off it */ ssc = ssc_request(ssc_id); if (IS_ERR(ssc)) { pr_err("Unable to parent ASoC SSC DAI on SSC: %ld\n", - PTR_ERR(ssc)); + PTR_ERR(ssc)); return PTR_ERR(ssc); - } else { - ssc_info[ssc_id].ssc = ssc; }
- ret = asoc_ssc_init(&ssc->pdev->dev); + ssc_info[ssc_id].ssc = ssc;
- return ret; + return asoc_ssc_init(&ssc->pdev->dev); } EXPORT_SYMBOL_GPL(atmel_ssc_set_audio);
On Tue, Apr 03, 2018 at 08:49:57AM -0700, Joe Perches wrote:
On Tue, 2018-04-03 at 15:45 +0200, Ladislav Michl wrote:
On Fri, Mar 30, 2018 at 04:44:20PM +0100, Colin King wrote:
From: Colin Ian King colin.king@canonical.com
Hello Colin,
Trivial fix to spelling mistake in pr_debug message text
would you mind making this patch a bit less non-trivial and change pr_debug to dev_dbg dropping Atmel_ssc_dai prefix?
Presumably, then all the pr_<foo> calls should be changed.
Yes, that's what non-trivial means here :)
Something like:
sound/soc/atmel/atmel_ssc_dai.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-)
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index a1e2c5682dcd..594228156b2d 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -291,11 +291,10 @@ static int atmel_ssc_startup(struct snd_pcm_substream *substream, int dir, dir_mask; int ret;
- pr_debug("atmel_ssc_startup: SSC_SR=0x%x\n",
ssc_readl(ssc_p->ssc->regs, SR));
dev_dbg(dai->dev, "SSC_SR=0x%x\n", ssc_readl(ssc_p->ssc->regs, SR));
/* Enable PMC peripheral clock for this SSC */
- pr_debug("atmel_ssc_dai: Starting clock\n");
- dev_dbg(dai->dev, "Starting clock\n"); clk_enable(ssc_p->ssc->clk); ssc_p->mck_rate = clk_get_rate(ssc_p->ssc->clk);
@@ -385,7 +384,7 @@ static void atmel_ssc_shutdown(struct snd_pcm_substream *substream, spin_unlock_irq(&ssc_p->lock);
/* Shutdown the SSC clock. */
- pr_debug("atmel_ssc_dai: Stopping clock\n");
- dev_dbg(dai->dev, "Stopping clock\n"); clk_disable(ssc_p->ssc->clk);
}
@@ -794,13 +793,12 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, break;
default:
printk(KERN_WARNING "atmel_ssc_dai: unsupported DAI format 0x%x\n",ssc_p->daifmt);
dev_warn(dai->dev, "unsupported DAI format 0x%x\n",ssc_p->daifmt);
- pr_debug("atmel_ssc_hw_params: "
"RCMR=%08x RFMR=%08x TCMR=%08x TFMR=%08x\n",rcmr, rfmr, tcmr, tfmr);
dev_dbg(dai->dev, "RCMR=%08x RFMR=%08x TCMR=%08x TFMR=%08x\n",
rcmr, rfmr, tcmr, tfmr);if (!ssc_p->initialized) { if (!ssc_p->ssc->pdata->use_dma) {
@@ -818,9 +816,8 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, ret = request_irq(ssc_p->ssc->irq, atmel_ssc_interrupt, 0, ssc_p->name, ssc_p); if (ret < 0) {
printk(KERN_WARNING"atmel_ssc_dai: request_irq failure\n");pr_debug("Atmel_ssc_dai: Stoping clock\n");
dev_warn(dai->dev, "request_irq failure\n");dev_dbg(dai->dev, "Stopping clock\n"); clk_disable(ssc_p->ssc->clk); return ret;@@ -839,7 +836,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, ssc_writel(ssc_p->ssc->regs, TCMR, tcmr); ssc_writel(ssc_p->ssc->regs, TFMR, tfmr);
- pr_debug("atmel_ssc_dai,hw_params: SSC initialized\n");
- dev_dbg(dai->dev, "SSC initialized\n"); return 0;
}
@@ -862,9 +859,9 @@ static int atmel_ssc_prepare(struct snd_pcm_substream *substream, ssc_writel(ssc_p->ssc->regs, CR, dma_params->mask->ssc_disable); ssc_writel(ssc_p->ssc->regs, IDR, dma_params->mask->ssc_error);
- pr_debug("%s enabled SSC_SR=0x%08x\n",
dir ? "receive" : "transmit",ssc_readl(ssc_p->ssc->regs, SR));
- dev_dbg(dai->dev, "%s enabled SSC_SR=0x%08x\n",
dir ? "receive" : "transmit",ssc_readl(ssc_p->ssc->regs, SR));}
@@ -1050,21 +1047,18 @@ static void asoc_ssc_exit(struct device *dev) int atmel_ssc_set_audio(int ssc_id) { struct ssc_device *ssc;
int ret;
/* If we can grab the SSC briefly to parent the DAI device off it */ ssc = ssc_request(ssc_id); if (IS_ERR(ssc)) { pr_err("Unable to parent ASoC SSC DAI on SSC: %ld\n",
PTR_ERR(ssc));
PTR_ERR(ssc));
Well, these are usefull, but unrelated changes. But while there, above pr_error deserves to be replaced with dev_err as well.
return PTR_ERR(ssc);
} else {
ssc_info[ssc_id].ssc = ssc;}
ret = asoc_ssc_init(&ssc->pdev->dev);
- ssc_info[ssc_id].ssc = ssc;
- return ret;
- return asoc_ssc_init(&ssc->pdev->dev);
} EXPORT_SYMBOL_GPL(atmel_ssc_set_audio);
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
On Tue, 2018-04-03 at 19:30 +0200, Ladislav Michl wrote:
On Tue, Apr 03, 2018 at 08:49:57AM -0700, Joe Perches wrote:
On Tue, 2018-04-03 at 15:45 +0200, Ladislav Michl wrote:
On Fri, Mar 30, 2018 at 04:44:20PM +0100, Colin King wrote:
From: Colin Ian King colin.king@canonical.com
Hello Colin,
Trivial fix to spelling mistake in pr_debug message text
would you mind making this patch a bit less non-trivial and change pr_debug to dev_dbg dropping Atmel_ssc_dai prefix?
Presumably, then all the pr_<foo> calls should be changed.
Yes, that's what non-trivial means here :)
More useful would be less specific originally.
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
[]
@@ -1050,21 +1047,18 @@ static void asoc_ssc_exit(struct device *dev) int atmel_ssc_set_audio(int ssc_id) { struct ssc_device *ssc;
int ret;
/* If we can grab the SSC briefly to parent the DAI device off it */ ssc = ssc_request(ssc_id); if (IS_ERR(ssc)) { pr_err("Unable to parent ASoC SSC DAI on SSC: %ld\n",
PTR_ERR(ssc));
PTR_ERR(ssc));Well, these are usefull, but unrelated changes. But while there, above pr_error deserves to be replaced with dev_err as well.
No dai device.
On Tue, Apr 03, 2018 at 11:17:03AM -0700, Joe Perches wrote:
On Tue, 2018-04-03 at 19:30 +0200, Ladislav Michl wrote:
On Tue, Apr 03, 2018 at 08:49:57AM -0700, Joe Perches wrote:
On Tue, 2018-04-03 at 15:45 +0200, Ladislav Michl wrote:
On Fri, Mar 30, 2018 at 04:44:20PM +0100, Colin King wrote:
From: Colin Ian King colin.king@canonical.com
Hello Colin,
Trivial fix to spelling mistake in pr_debug message text
would you mind making this patch a bit less non-trivial and change pr_debug to dev_dbg dropping Atmel_ssc_dai prefix?
Presumably, then all the pr_<foo> calls should be changed.
Yes, that's what non-trivial means here :)
More useful would be less specific originally.
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
[]
@@ -1050,21 +1047,18 @@ static void asoc_ssc_exit(struct device *dev) int atmel_ssc_set_audio(int ssc_id) { struct ssc_device *ssc;
int ret;
/* If we can grab the SSC briefly to parent the DAI device off it */ ssc = ssc_request(ssc_id); if (IS_ERR(ssc)) { pr_err("Unable to parent ASoC SSC DAI on SSC: %ld\n",
PTR_ERR(ssc));
PTR_ERR(ssc));Well, these are usefull, but unrelated changes. But while there, above pr_error deserves to be replaced with dev_err as well.
No dai device.
As all call sites are already providing error message, so what about just removing this one completely?
On Tue, 2018-04-03 at 20:54 +0200, Ladislav Michl wrote:
No dai device.
As all call sites are already providing error message, so what about just removing this one completely?
No idea, none of this is code I know or care about. Do what's appropriate.
On Tue, Apr 03, 2018 at 03:45:40PM +0200, Ladislav Michl wrote:
On Fri, Mar 30, 2018 at 04:44:20PM +0100, Colin King wrote:
From: Colin Ian King colin.king@canonical.com
Hello Colin,
Trivial fix to spelling mistake in pr_debug message text
would you mind making this patch a bit less non-trivial and change pr_debug to dev_dbg dropping Atmel_ssc_dai prefix?
Thank you.
Trivial patches should just be trivial instead of evolving into a thread that lasts for days.
I sometimes write trivial clean up patches for things like:
arch/x86/lib/csum-partial_64.c:97 do_csum() warn: inconsistent indenting 88 /* last up to 7 8byte blocks */ 89 count %= 8; 90 while (count) { 91 asm("addq %1,%0\n\t" 92 "adcq %2,%0\n" 93 : "=r" (result) 94 : "m" (*(unsigned long *)buff), 95 "r" (zero), "0" (result)); 96 --count; 97 buff += 8; 98 }
Why is "buff += 8;" indented too far? And why does every line end in a space character? And I think about it for 10 minutes and then delete my patch because it's too much hassle to deal with for something small.
regards, dan carpenter
On 04/04/18 11:24, Dan Carpenter wrote:
On Tue, Apr 03, 2018 at 03:45:40PM +0200, Ladislav Michl wrote:
On Fri, Mar 30, 2018 at 04:44:20PM +0100, Colin King wrote:
From: Colin Ian King colin.king@canonical.com
Hello Colin,
Trivial fix to spelling mistake in pr_debug message text
would you mind making this patch a bit less non-trivial and change pr_debug to dev_dbg dropping Atmel_ssc_dai prefix?
Thank you.
Trivial patches should just be trivial instead of evolving into a thread that lasts for days.
Yep, this feels like this scenario for sure.
I sometimes write trivial clean up patches for things like:
arch/x86/lib/csum-partial_64.c:97 do_csum() warn: inconsistent indenting 88 /* last up to 7 8byte blocks */ 89 count %= 8; 90 while (count) { 91 asm("addq %1,%0\n\t" 92 "adcq %2,%0\n" 93 : "=r" (result) 94 : "m" (*(unsigned long *)buff), 95 "r" (zero), "0" (result)); 96 --count; 97 buff += 8; 98 }
Why is "buff += 8;" indented too far? And why does every line end in a space character? And I think about it for 10 minutes and then delete my patch because it's too much hassle to deal with for something small.
Same here. Hence stuff never gets fixed.
regards, dan carpenter
-- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Apr 04, 2018 at 11:41:23AM +0100, Colin Ian King wrote:
On 04/04/18 11:24, Dan Carpenter wrote:
On Tue, Apr 03, 2018 at 03:45:40PM +0200, Ladislav Michl wrote:
On Fri, Mar 30, 2018 at 04:44:20PM +0100, Colin King wrote:
From: Colin Ian King colin.king@canonical.com
Hello Colin,
Trivial fix to spelling mistake in pr_debug message text
would you mind making this patch a bit less non-trivial and change pr_debug to dev_dbg dropping Atmel_ssc_dai prefix?
Thank you.
Trivial patches should just be trivial instead of evolving into a thread that lasts for days.
Yep, this feels like this scenario for sure.
And this scenario happens because I wanted to avoid all that work preparing trivial patch. In the other words, this thread could be few mails shorter if anyone else took a chance ;-)
[...]
space character? And I think about it for 10 minutes and then delete my patch because it's too much hassle to deal with for something small.
...leading into many small glitches never polished...
Same here. Hence stuff never gets fixed.
For sure, hassle with sending a patch and crediting everyone who contributed properly is order of magnitude more time consuming than preparing patch itself.
So here's my last contribution to this painful thread. If you do not like it, it's your turn :)
(and it'll be needed as Mark does not like patches being sended this way, oh well, whoever sent original patch should first figure out why driver outputs debug message just after warning one - so the simplest fix would be just deleting that line)
-- >8 --
From: Joe Perches joe@perches.com Subject: [PATCH] ASoC: atmel_ssc_dai: Replace pr_debug with dev_dbg
Use dev_dbg for debug output, remove registration error message as every user of atmel_ssc_set_audio prints its own error.
Signed-off-by: Joe Perches joe@perches.com Signed-off-by: Ladislav Michl ladis@linux-mips.org [Colin Ian King: fix spelling mistake: "Stoping" -> "Stopping"] Signed-off-by: Colin Ian King colin.king@canonical.com --- sound/soc/atmel/atmel_ssc_dai.c | 42 +++++++++++++-------------------- 1 file changed, 17 insertions(+), 25 deletions(-)
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index a1e2c5682dcd..45c4730e9939 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -291,11 +291,10 @@ static int atmel_ssc_startup(struct snd_pcm_substream *substream, int dir, dir_mask; int ret;
- pr_debug("atmel_ssc_startup: SSC_SR=0x%x\n", - ssc_readl(ssc_p->ssc->regs, SR)); + dev_dbg(dai->dev, "SSC_SR=0x%x\n", ssc_readl(ssc_p->ssc->regs, SR));
/* Enable PMC peripheral clock for this SSC */ - pr_debug("atmel_ssc_dai: Starting clock\n"); + dev_dbg(dai->dev, "Starting clock\n"); clk_enable(ssc_p->ssc->clk); ssc_p->mck_rate = clk_get_rate(ssc_p->ssc->clk);
@@ -385,7 +384,7 @@ static void atmel_ssc_shutdown(struct snd_pcm_substream *substream, spin_unlock_irq(&ssc_p->lock);
/* Shutdown the SSC clock. */ - pr_debug("atmel_ssc_dai: Stopping clock\n"); + dev_dbg(dai->dev, "Stopping clock\n"); clk_disable(ssc_p->ssc->clk); }
@@ -794,13 +793,12 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, break;
default: - printk(KERN_WARNING "atmel_ssc_dai: unsupported DAI format 0x%x\n", - ssc_p->daifmt); + dev_warn(dai->dev, "unsupported DAI format 0x%x\n", + ssc_p->daifmt); return -EINVAL; } - pr_debug("atmel_ssc_hw_params: " - "RCMR=%08x RFMR=%08x TCMR=%08x TFMR=%08x\n", - rcmr, rfmr, tcmr, tfmr); + dev_dbg(dai->dev, "RCMR=%08x RFMR=%08x TCMR=%08x TFMR=%08x\n", + rcmr, rfmr, tcmr, tfmr);
if (!ssc_p->initialized) { if (!ssc_p->ssc->pdata->use_dma) { @@ -818,9 +816,9 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, ret = request_irq(ssc_p->ssc->irq, atmel_ssc_interrupt, 0, ssc_p->name, ssc_p); if (ret < 0) { - printk(KERN_WARNING - "atmel_ssc_dai: request_irq failure\n"); - pr_debug("Atmel_ssc_dai: Stoping clock\n"); + dev_warn(dai->dev, + "unable to request irq (%d), stopping clock\n", + ret); clk_disable(ssc_p->ssc->clk); return ret; } @@ -839,7 +837,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, ssc_writel(ssc_p->ssc->regs, TCMR, tcmr); ssc_writel(ssc_p->ssc->regs, TFMR, tfmr);
- pr_debug("atmel_ssc_dai,hw_params: SSC initialized\n"); + dev_dbg(dai->dev, "SSC initialized\n"); return 0; }
@@ -862,9 +860,9 @@ static int atmel_ssc_prepare(struct snd_pcm_substream *substream, ssc_writel(ssc_p->ssc->regs, CR, dma_params->mask->ssc_disable); ssc_writel(ssc_p->ssc->regs, IDR, dma_params->mask->ssc_error);
- pr_debug("%s enabled SSC_SR=0x%08x\n", - dir ? "receive" : "transmit", - ssc_readl(ssc_p->ssc->regs, SR)); + dev_dbg(dai->dev, "%s enabled SSC_SR=0x%08x\n", + dir ? "receive" : "transmit", + ssc_readl(ssc_p->ssc->regs, SR)); return 0; }
@@ -1050,21 +1048,15 @@ static void asoc_ssc_exit(struct device *dev) int atmel_ssc_set_audio(int ssc_id) { struct ssc_device *ssc; - int ret;
/* If we can grab the SSC briefly to parent the DAI device off it */ ssc = ssc_request(ssc_id); - if (IS_ERR(ssc)) { - pr_err("Unable to parent ASoC SSC DAI on SSC: %ld\n", - PTR_ERR(ssc)); + if (IS_ERR(ssc)) return PTR_ERR(ssc); - } else { - ssc_info[ssc_id].ssc = ssc; - }
- ret = asoc_ssc_init(&ssc->pdev->dev); + ssc_info[ssc_id].ssc = ssc;
- return ret; + return asoc_ssc_init(&ssc->pdev->dev); } EXPORT_SYMBOL_GPL(atmel_ssc_set_audio);
On Wed, Apr 04, 2018 at 01:24:26PM +0300, Dan Carpenter wrote:
Trivial patches should just be trivial instead of evolving into a thread that lasts for days.
Indeed, and it's usually easier to just send a further trivial patch rather than just talk about it.
Why is "buff += 8;" indented too far? And why does every line end in a space character? And I think about it for 10 minutes and then delete my patch because it's too much hassle to deal with for something small.
The other option is to just send it and not worry too much about it getting applied or not.
The patch
ASoC: atmel_ssc_dai: fix spelling mistake: "Stoping" -> "Stopping"
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
From 78a7d414d5a8e3ea7bc5a636311cfb7ce593ce37 Mon Sep 17 00:00:00 2001
From: Colin Ian King colin.king@canonical.com Date: Fri, 30 Mar 2018 16:44:20 +0100 Subject: [PATCH] ASoC: atmel_ssc_dai: fix spelling mistake: "Stoping" -> "Stopping"
Trivial fix to spelling mistake in pr_debug message text
Signed-off-by: Colin Ian King colin.king@canonical.com Acked-by: Alexandre Belloni alexandre.belloni@bootlin.com Acked-by: Nicolas Ferre nicolas.ferre@microchip.com Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/atmel/atmel_ssc_dai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index a1e2c5682dcd..1c7af0ca98ec 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -820,7 +820,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, if (ret < 0) { printk(KERN_WARNING "atmel_ssc_dai: request_irq failure\n"); - pr_debug("Atmel_ssc_dai: Stoping clock\n"); + pr_debug("Atmel_ssc_dai: Stopping clock\n"); clk_disable(ssc_p->ssc->clk); return ret; }
The patch
ASoC: atmel_ssc_dai: fix spelling mistake: "Stoping" -> "Stopping"
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
From 78a7d414d5a8e3ea7bc5a636311cfb7ce593ce37 Mon Sep 17 00:00:00 2001
From: Colin Ian King colin.king@canonical.com Date: Fri, 30 Mar 2018 16:44:20 +0100 Subject: [PATCH] ASoC: atmel_ssc_dai: fix spelling mistake: "Stoping" -> "Stopping"
Trivial fix to spelling mistake in pr_debug message text
Signed-off-by: Colin Ian King colin.king@canonical.com Acked-by: Alexandre Belloni alexandre.belloni@bootlin.com Acked-by: Nicolas Ferre nicolas.ferre@microchip.com Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/atmel/atmel_ssc_dai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index a1e2c5682dcd..1c7af0ca98ec 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -820,7 +820,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, if (ret < 0) { printk(KERN_WARNING "atmel_ssc_dai: request_irq failure\n"); - pr_debug("Atmel_ssc_dai: Stoping clock\n"); + pr_debug("Atmel_ssc_dai: Stopping clock\n"); clk_disable(ssc_p->ssc->clk); return ret; }
The patch
ASoC: atmel_ssc_dai: fix spelling mistake: "Stoping" -> "Stopping"
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
From 78a7d414d5a8e3ea7bc5a636311cfb7ce593ce37 Mon Sep 17 00:00:00 2001
From: Colin Ian King colin.king@canonical.com Date: Fri, 30 Mar 2018 16:44:20 +0100 Subject: [PATCH] ASoC: atmel_ssc_dai: fix spelling mistake: "Stoping" -> "Stopping"
Trivial fix to spelling mistake in pr_debug message text
Signed-off-by: Colin Ian King colin.king@canonical.com Acked-by: Alexandre Belloni alexandre.belloni@bootlin.com Acked-by: Nicolas Ferre nicolas.ferre@microchip.com Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/atmel/atmel_ssc_dai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index a1e2c5682dcd..1c7af0ca98ec 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -820,7 +820,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, if (ret < 0) { printk(KERN_WARNING "atmel_ssc_dai: request_irq failure\n"); - pr_debug("Atmel_ssc_dai: Stoping clock\n"); + pr_debug("Atmel_ssc_dai: Stopping clock\n"); clk_disable(ssc_p->ssc->clk); return ret; }
participants (8)
-
Alexandre Belloni -
Colin Ian King -
Colin King
-
Dan Carpenter -
Joe Perches -
Ladislav Michl -
Mark Brown -
Nicolas Ferre