Applied "ASoC: qcom: Drop __func__ usage from log prints" to the asoc tree
Subsystems (3)
Mark Brown
maintainerThe patch
ASoC: qcom: Drop __func__ usage from log prints
has been applied to the asoc tree at
git://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
Quoted 1 line
From
b6e643adfd68258e16babaf36353c9668384350fMon Sep 17 00:00:00 2001
From: Bjorn Andersson <[email protected]>
Date: Mon, 30 Jan 2017 13:03:37 -0800
Subject: [PATCH] ASoC: qcom: Drop __func__ usage from log prints
The combination of dev_err() and __func__ make most of these log prints over 100 chars long. Remove the usage of __func__ to clean the kernel log and as the usage is not necessary to identify the individual log prints.
--- sound/soc/qcom/lpass-apq8016.c | 15 +++--- sound/soc/qcom/lpass-cpu.c | 86 ++++++++++++++------------------ sound/soc/qcom/lpass-platform.c | 106 ++++++++++++++++++++-------------------- sound/soc/qcom/storm.c | 22 +++------ 4 files changed, 103 insertions(+), 126 deletions(-)
sound/soc/qcom/lpass-apq8016.c +7 -8
@@ -175,29 +175,28 @@ static int apq8016_lpass_init(struct platform_device *pdev) drvdata->pcnoc_mport_clk =devm_clk_get (dev,"pcnoc-mport-clk" );if (IS_ERR (drvdata->pcnoc_mport_clk)) { -dev_err (&pdev->dev,"%s() error getting pcnoc-mport-clk: %ld\n" , - __func__,PTR_ERR (drvdata->pcnoc_mport_clk)); +dev_err (&pdev->dev,"error getting pcnoc-mport-clk: %ld\n" , +PTR_ERR (drvdata->pcnoc_mport_clk));return PTR_ERR (drvdata->pcnoc_mport_clk); } ret =clk_prepare_enable (drvdata->pcnoc_mport_clk);if (ret) { -dev_err (&pdev->dev,"%s() Error enabling pcnoc-mport-clk: %d\n" , - __func__, ret); +dev_err (&pdev->dev,"Error enabling pcnoc-mport-clk: %d\n" , + ret);return ret; } drvdata->pcnoc_sway_clk =devm_clk_get (dev,"pcnoc-sway-clk" );if (IS_ERR (drvdata->pcnoc_sway_clk)) { -dev_err (&pdev->dev,"%s() error getting pcnoc-sway-clk: %ld\n" , - __func__,PTR_ERR (drvdata->pcnoc_sway_clk)); +dev_err (&pdev->dev,"error getting pcnoc-sway-clk: %ld\n" , +PTR_ERR (drvdata->pcnoc_sway_clk));return PTR_ERR (drvdata->pcnoc_sway_clk); } ret =clk_prepare_enable (drvdata->pcnoc_sway_clk);if (ret) { -dev_err (&pdev->dev,"%s() Error enabling pcnoc_sway_clk: %d\n" , - __func__, ret); +dev_err (&pdev->dev,"Error enabling pcnoc_sway_clk: %d\n" , ret);return ret; }
sound/soc/qcom/lpass-cpu.c +36 -50
226 lines not on this page · raw message
sound/soc/qcom/lpass-platform.c +52 -54
264 lines not on this page · raw message
sound/soc/qcom/storm.c +8 -14
@@ -36,8 +36,7 @@ static int storm_ops_hw_params(struct snd_pcm_substream *substream, bitwidth =snd_pcm_format_width (format);if (bitwidth <0 ) { -dev_err (card->dev,"%s() invalid bit width given: %d\n" , - __func__, bitwidth); +dev_err (card->dev,"invalid bit width given: %d\n" , bitwidth);return bitwidth; }
@@ -50,8 +49,8 @@ static int storm_ops_hw_params(struct snd_pcm_substream *substream, ret =snd_soc_dai_set_sysclk (soc_runtime->cpu_dai,0 , sysclk_freq,0 );if (ret) { -dev_err (card->dev,"%s() error setting sysclk to %u: %d\n" , - __func__, sysclk_freq, ret); +dev_err (card->dev,"error setting sysclk to %u: %d\n" , + sysclk_freq, ret);return ret; }
@@ -76,16 +75,14 @@ static int storm_parse_of(struct snd_soc_card *card) dai_link->cpu_of_node =of_parse_phandle (np,"cpu" ,0 );if (!dai_link->cpu_of_node) { -dev_err (card->dev,"%s() error getting cpu phandle\n" , - __func__); +dev_err (card->dev,"error getting cpu phandle\n" );return -EINVAL ; } dai_link->platform_of_node = dai_link->cpu_of_node; dai_link->codec_of_node =of_parse_phandle (np,"codec" ,0 );if (!dai_link->codec_of_node) { -dev_err (card->dev,"%s() error getting codec phandle\n" , - __func__); +dev_err (card->dev,"error getting codec phandle\n" );return -EINVAL ; }
@@ -106,8 +103,7 @@ static int storm_platform_probe(struct platform_device *pdev) ret =snd_soc_of_parse_card_name (card,"qcom,model" );if (ret) { -dev_err (&pdev->dev,"%s() error parsing card name: %d\n" , - __func__, ret); +dev_err (&pdev->dev,"error parsing card name: %d\n" , ret);return ret; }
@@ -116,15 +112,13 @@ static int storm_platform_probe(struct platform_device *pdev) ret =storm_parse_of (card);if (ret) { -dev_err (&pdev->dev,"%s() error resolving dai links: %d\n" , - __func__, ret); +dev_err (&pdev->dev,"error resolving dai links: %d\n" , ret);return ret; } ret =devm_snd_soc_register_card (&pdev->dev, card);if (ret) -dev_err (&pdev->dev,"%s() error registering soundcard: %d\n" , - __func__, ret); +dev_err (&pdev->dev,"error registering soundcard: %d\n" , ret);return ret;
Signature · 1 line
2.11.0