[alsa-devel] [PATCH RESEND 7/8] ASoC: samsung: s3c24xx_uda134x: debug/error trace cleanup
Switch from pr_* to dev_* macros and drop some debug traces.
Signed-off-by: Sylwester Nawrocki s.nawrocki@samsung.com ---
Rebased onto topic/samsung branch.
sound/soc/samsung/s3c24xx_uda134x.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/sound/soc/samsung/s3c24xx_uda134x.c b/sound/soc/samsung/s3c24xx_uda134x.c index 13e52fb..1619e76 100644 --- a/sound/soc/samsung/s3c24xx_uda134x.c +++ b/sound/soc/samsung/s3c24xx_uda134x.c @@ -62,18 +62,18 @@ static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream) #endif
mutex_lock(&clk_lock); - pr_debug("%s %d\n", __func__, clk_users); + if (clk_users == 0) { xtal = clk_get(rtd->dev, "xtal"); if (IS_ERR(xtal)) { - printk(KERN_ERR "%s cannot get xtal\n", __func__); + dev_err(rtd->dev, "%s cannot get xtal\n", __func__); ret = PTR_ERR(xtal); } else { pclk = clk_get(&s3c24xx_uda134x_snd_device->dev, "pclk"); if (IS_ERR(pclk)) { - printk(KERN_ERR "%s cannot get pclk\n", - __func__); + dev_err(rtd->dev, "%s cannot get pclk\n", + __func__); clk_put(xtal); ret = PTR_ERR(pclk); } @@ -99,8 +99,8 @@ static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream) SNDRV_PCM_HW_PARAM_RATE, &hw_constraints_rates); if (ret < 0) - printk(KERN_ERR "%s cannot set constraints\n", - __func__); + dev_err(rtd->dev, "%s cannot set constraints\n", + __func__); #endif } return ret; @@ -109,7 +109,6 @@ static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream) static void s3c24xx_uda134x_shutdown(struct snd_pcm_substream *substream) { mutex_lock(&clk_lock); - pr_debug("%s %d\n", __func__, clk_users); clk_users -= 1; if (clk_users == 0) { clk_put(xtal); @@ -156,18 +155,19 @@ static int s3c24xx_uda134x_hw_params(struct snd_pcm_substream *substream, clk_source = S3C24XX_CLKSRC_PCLK; div = bi % 33; } - pr_debug("%s desired rate %lu, %d\n", __func__, rate, bi); + + dev_dbg(rtd->dev, "%s desired rate %lu, %d\n", __func__, rate, bi);
clk = (fs_mode == S3C2410_IISMOD_384FS ? 384 : 256) * rate; - pr_debug("%s will use: %s %s %d sysclk %d err %ld\n", __func__, - fs_mode == S3C2410_IISMOD_384FS ? "384FS" : "256FS", - clk_source == S3C24XX_CLKSRC_MPLL ? "MPLLin" : "PCLK", - div, clk, err); + + dev_dbg(rtd->dev, "%s will use: %s %s %d sysclk %d err %ld\n", __func__, + fs_mode == S3C2410_IISMOD_384FS ? "384FS" : "256FS", + clk_source == S3C24XX_CLKSRC_MPLL ? "MPLLin" : "PCLK", + div, clk, err);
if ((err * 100 / rate) > 5) { - printk(KERN_ERR "S3C24XX_UDA134X: effective frequency " - "too different from desired (%ld%%)\n", - err * 100 / rate); + dev_err(rtd->dev, "effective frequency too different " + "from desired (%ld%%)\n", err * 100 / rate); return -EINVAL; }
-- 1.9.1
On 08/05/2016 12:03 PM, Mark Brown wrote:
On Fri, Aug 05, 2016 at 11:47:09AM +0200, Sylwester Nawrocki wrote:
Switch from pr_* to dev_* macros and drop some debug traces.
I've only got patch 7 here, what's the story with the other patches?
I didn't resend them since I got notification they are already applied (1/8...6/8). Should I resend all patches as in this branch: https://git.linuxtv.org/snawrocki/samsung.git/log/?h=for-v4.9/asoc/s3c24xx_u... ?
On Fri, Aug 05, 2016 at 12:20:58PM +0200, Sylwester Nawrocki wrote:
I've only got patch 7 here, what's the story with the other patches?
I didn't resend them since I got notification they are already applied (1/8...6/8). Should I resend all patches as in this branch: https://git.linuxtv.org/snawrocki/samsung.git/log/?h=for-v4.9/asoc/s3c24xx_u...
No, don't resend already applied patches! If you are posting a patch series the patch series needs to be internally consistent. The fact that a patch may at some point have been included in some other series is not relevant later. The point with numbering things in a series is so people can tell what order the series is in, it means nothing outside of that.
On 08/05/2016 12:45 PM, Mark Brown wrote:
On Fri, Aug 05, 2016 at 12:20:58PM +0200, Sylwester Nawrocki wrote:
I've only got patch 7 here, what's the story with the other patches?
I didn't resend them since I got notification they are already applied (1/8...6/8). Should I resend all patches as in this branch: https://git.linuxtv.org/snawrocki/samsung.git/log/?h=for-v4.9/asoc/s3c24xx_u...
No, don't resend already applied patches! If you are posting a patch series the patch series needs to be internally consistent. The fact that a patch may at some point have been included in some other series is not relevant later. The point with numbering things in a series is so people can tell what order the series is in, it means nothing outside of that.
Right, I should have omitted the numbering and should just have resent as a standalone patch.
participants (2)
-
Mark Brown -
Sylwester Nawrocki