ASoC: fsl_easrc: Fix several warnings
Subsystems (3)
PATCH 2/3 ASoC: fsl_easrc: Fix -Wunused-but-set-variable
In reply to Shengjiu WangObtained with:
$ make W=1
sound/soc/fsl/fsl_easrc.c: In function 'fsl_easrc_set_rs_ratio':sound/soc/fsl/fsl_easrc.c:182:15: warning: variable 'int_bits' set but not used [-Wunused-but-set-variable]
unsigned int int_bits;
^
sound/soc/fsl/fsl_easrc.c: In function 'fsl_easrc_set_ctx_organziation':
sound/soc/fsl/fsl_easrc.c:1204:17: warning: variable 'dev' set but not used [-Wunused-but-set-variable]
struct device *dev;
^
sound/soc/fsl/fsl_easrc.c: In function 'fsl_easrc_release_context':
sound/soc/fsl/fsl_easrc.c:1294:17: warning: variable 'dev' set but not used [-Wunused-but-set-variable]
struct device *dev;
^--- sound/soc/fsl/fsl_easrc.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
sound/soc/fsl/fsl_easrc.c +3 -8
@@ -179,22 +179,21 @@ static int fsl_easrc_set_rs_ratio(struct fsl_asrc_pair *ctx)struct fsl_easrc_ctx_priv *ctx_priv = ctx->private;unsigned int in_rate = ctx_priv->in_params.norm_rate;unsigned int out_rate = ctx_priv->out_params.norm_rate; -unsigned int int_bits;unsigned int frac_bits;u64 val;u32 *r;switch (easrc_priv->rs_num_taps) {case EASRC_RS_32_TAPS : - int_bits =5 ; +/* integer bits = 5; */ frac_bits =39 ;break ;case EASRC_RS_64_TAPS : - int_bits =6 ; +/* integer bits = 6; */ frac_bits =38 ;break ;case EASRC_RS_128_TAPS : - int_bits =7 ; +/* integer bits = 7; */ frac_bits =37 ;break ;default :
@@ -1201,7 +1200,6 @@ static int fsl_easrc_set_ctx_format(struct fsl_asrc_pair *ctx,static int fsl_easrc_set_ctx_organziation (struct fsl_asrc_pair *ctx) {struct fsl_easrc_ctx_priv *ctx_priv; -struct device *dev;struct fsl_asrc *easrc;if (!ctx)
@@ -1209,7 +1207,6 @@ static int fsl_easrc_set_ctx_organziation(struct fsl_asrc_pair *ctx) easrc = ctx->asrc; ctx_priv = ctx->private; - dev = &easrc->pdev->dev;/* input interleaving parameters */ regmap_update_bits(easrc->regmap, REG_EASRC_CIA(ctx->index),
@@ -1291,13 +1288,11 @@ static void fsl_easrc_release_context(struct fsl_asrc_pair *ctx) {unsigned long lock_flags;struct fsl_asrc *easrc; -struct device *dev;if (!ctx)return ; easrc = ctx->asrc; - dev = &easrc->pdev->dev;spin_lock_irqsave (&easrc->lock, lock_flags);
Signature · 1 line
2.21.0
PATCH 1/3 ASoC: fsl_easrc: Fix -Wmissing-prototypes warning
In reply to Shengjiu WangObtained with:
$ make W=1
sound/soc/fsl/fsl_easrc.c:967:5: warning: no previous prototype for function 'fsl_easrc_config_context' [-Wmissing-prototypes] int fsl_easrc_config_context(struct fsl_asrc *easrc, unsigned int ctx_id)
^
sound/soc/fsl/fsl_easrc.c:967:1: note: declare 'static' if the function is not intended to be used outside of this translation unit int fsl_easrc_config_context(struct fsl_asrc *easrc, unsigned int ctx_id)
^
staticsound/soc/fsl/fsl_easrc.c:1128:5: warning: no previous prototype for function 'fsl_easrc_set_ctx_format' [-Wmissing-prototypes] int fsl_easrc_set_ctx_format(struct fsl_asrc_pair *ctx,
^
sound/soc/fsl/fsl_easrc.c:1128:1: note: declare 'static' if the function is not intended to be used outside of this translation unit int fsl_easrc_set_ctx_format(struct fsl_asrc_pair *ctx,
^
staticsound/soc/fsl/fsl_easrc.c:1201:5: warning: no previous prototype for function 'fsl_easrc_set_ctx_organziation' [-Wmissing-prototypes] int fsl_easrc_set_ctx_organziation(struct fsl_asrc_pair *ctx)
^
sound/soc/fsl/fsl_easrc.c:1201:1: note: declare 'static' if the function is not intended to be used outside of this translation unit int fsl_easrc_set_ctx_organziation(struct fsl_asrc_pair *ctx)
^
staticsound/soc/fsl/fsl_easrc.c:1245:5: warning: no previous prototype for function 'fsl_easrc_request_context' [-Wmissing-prototypes] int fsl_easrc_request_context(int channels, struct fsl_asrc_pair *ctx)
^
sound/soc/fsl/fsl_easrc.c:1245:1: note: declare 'static' if the function is not intended to be used outside of this translation unit int fsl_easrc_request_context(int channels, struct fsl_asrc_pair *ctx)
^
staticsound/soc/fsl/fsl_easrc.c:1290:6: warning: no previous prototype for function 'fsl_easrc_release_context' [-Wmissing-prototypes] void fsl_easrc_release_context(struct fsl_asrc_pair *ctx)
^
sound/soc/fsl/fsl_easrc.c:1290:1: note: declare 'static' if the function is not intended to be used outside of this translation unit void fsl_easrc_release_context(struct fsl_asrc_pair *ctx)
^
staticsound/soc/fsl/fsl_easrc.c:1317:5: warning: no previous prototype for function 'fsl_easrc_start_context' [-Wmissing-prototypes] int fsl_easrc_start_context(struct fsl_asrc_pair *ctx)
^
sound/soc/fsl/fsl_easrc.c:1317:1: note: declare 'static' if the function is not intended to be used outside of this translation unit int fsl_easrc_start_context(struct fsl_asrc_pair *ctx)
^
staticsound/soc/fsl/fsl_easrc.c:1335:5: warning: no previous prototype for function 'fsl_easrc_stop_context' [-Wmissing-prototypes] int fsl_easrc_stop_context(struct fsl_asrc_pair *ctx)
^
sound/soc/fsl/fsl_easrc.c:1335:1: note: declare 'static' if the function is not intended to be used outside of this translation unit int fsl_easrc_stop_context(struct fsl_asrc_pair *ctx)
^
staticsound/soc/fsl/fsl_easrc.c:1382:18: warning: no previous prototype for function 'fsl_easrc_get_dma_channel' [-Wmissing-prototypes] struct dma_chan *fsl_easrc_get_dma_channel(struct fsl_asrc_pair *ctx,
^
sound/soc/fsl/fsl_easrc.c:1382:1: note: declare 'static' if the function is not intended to be used outside of this translation unit struct dma_chan *fsl_easrc_get_dma_channel(struct fsl_asrc_pair *ctx,
^
static
--- sound/soc/fsl/fsl_easrc.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
sound/soc/fsl/fsl_easrc.c +11 -12
@@ -964,7 +964,7 @@ static int fsl_easrc_release_slot(struct fsl_asrc *easrc, unsigned int ctx_id)* * Configure the register relate with context. */ -int fsl_easrc_config_context (struct fsl_asrc *easrc,unsigned int ctx_id) +static int fsl_easrc_config_context (struct fsl_asrc *easrc,unsigned int ctx_id) {struct fsl_easrc_ctx_priv *ctx_priv;struct fsl_asrc_pair *ctx;
@@ -1125,9 +1125,9 @@ static int fsl_easrc_process_format(struct fsl_asrc_pair *ctx,return 0 ; } -int fsl_easrc_set_ctx_format (struct fsl_asrc_pair *ctx, -snd_pcm_format_t *in_raw_format, -snd_pcm_format_t *out_raw_format) +static int fsl_easrc_set_ctx_format (struct fsl_asrc_pair *ctx, +snd_pcm_format_t *in_raw_format, +snd_pcm_format_t *out_raw_format) {struct fsl_asrc *easrc = ctx->asrc;struct fsl_easrc_ctx_priv *ctx_priv = ctx->private;
@@ -1198,7 +1198,7 @@ int fsl_easrc_set_ctx_format(struct fsl_asrc_pair *ctx,* to conform with this format. Interleaving parameters are accessed * through the ASRC_CTRL_IN_ACCESSa and ASRC_CTRL_OUT_ACCESSa registers */ -int fsl_easrc_set_ctx_organziation (struct fsl_asrc_pair *ctx) +static int fsl_easrc_set_ctx_organziation (struct fsl_asrc_pair *ctx) {struct fsl_easrc_ctx_priv *ctx_priv;struct device *dev;
@@ -1242,7 +1242,7 @@ int fsl_easrc_set_ctx_organziation(struct fsl_asrc_pair *ctx)* Returns a negative number on error and >=0 as context id * on success */ -int fsl_easrc_request_context (int channels,struct fsl_asrc_pair *ctx) +static int fsl_easrc_request_context (int channels,struct fsl_asrc_pair *ctx) {enum asrc_pair_index index =ASRC_INVALID_PAIR ;struct fsl_asrc *easrc = ctx->asrc;
@@ -1287,7 +1287,7 @@ int fsl_easrc_request_context(int channels, struct fsl_asrc_pair *ctx)* * This funciton is mainly doing the revert thing in request context */ -void fsl_easrc_release_context (struct fsl_asrc_pair *ctx) +static void fsl_easrc_release_context (struct fsl_asrc_pair *ctx) {unsigned long lock_flags;struct fsl_asrc *easrc;
@@ -1314,7 +1314,7 @@ void fsl_easrc_release_context(struct fsl_asrc_pair *ctx)* * Enable the DMA request and context */ -int fsl_easrc_start_context (struct fsl_asrc_pair *ctx) +static int fsl_easrc_start_context (struct fsl_asrc_pair *ctx) {struct fsl_asrc *easrc = ctx->asrc;
@@ -1332,7 +1332,7 @@ int fsl_easrc_start_context(struct fsl_asrc_pair *ctx)* * Disable the DMA request and context */ -int fsl_easrc_stop_context (struct fsl_asrc_pair *ctx) +static int fsl_easrc_stop_context (struct fsl_asrc_pair *ctx) {struct fsl_asrc *easrc = ctx->asrc;int val, i;
@@ -1379,8 +1379,8 @@ int fsl_easrc_stop_context(struct fsl_asrc_pair *ctx)return 0 ; } -struct dma_chan *fsl_easrc_get_dma_channel (struct fsl_asrc_pair *ctx, -bool dir) +static struct dma_chan *fsl_easrc_get_dma_channel (struct fsl_asrc_pair *ctx, +bool dir) {struct fsl_asrc *easrc = ctx->asrc;enum asrc_pair_index index = ctx->index;
@@ -1391,7 +1391,6 @@ struct dma_chan *fsl_easrc_get_dma_channel(struct fsl_asrc_pair *ctx,return dma_request_slave_channel (&easrc->pdev->dev, name); }; -EXPORT_SYMBOL_GPL (fsl_easrc_get_dma_channel);static const unsigned int easrc_rates[] = {8000 ,11025 ,12000 ,16000 ,
Signature · 1 line
2.21.0
cover ASoC: fsl_easrc: Fix several warnings
Fix several warnings with "make W=1"
Shengjiu Wang (3):
ASoC: fsl_easrc: Fix -Wmissing-prototypes warning
ASoC: fsl_easrc: Fix -Wunused-but-set-variable
ASoC: fsl_easrc: Fix "Function parameter not described" warnings
sound/soc/fsl/fsl_easrc.c | 42 +++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 24 deletions(-)
Signature · 1 line
2.21.0
PATCH 3/3 ASoC: fsl_easrc: Fix "Function parameter not described" warnings
Obtained with:
$ make W=1
sound/soc/fsl/fsl_easrc.c:403: warning: Function parameter or member 'easrc' not described in 'fsl_easrc_normalize_filter' sound/soc/fsl/fsl_easrc.c:403: warning: Function parameter or member 'infilter' not described in 'fsl_easrc_normalize_filter' sound/soc/fsl/fsl_easrc.c:403: warning: Function parameter or member 'outfilter' not described in 'fsl_easrc_normalize_filter' sound/soc/fsl/fsl_easrc.c:403: warning: Function parameter or member 'shift' not described in 'fsl_easrc_normalize_filter'
--- sound/soc/fsl/fsl_easrc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/fsl/fsl_easrc.c +4 -4
@@ -389,11 +389,11 @@ static int fsl_easrc_resampler_config(struct fsl_asrc *easrc)* For input int[16, 24, 32] -> output float32 * scale it by multiplying filter coefficients by 2^-15, 2^-23, 2^-31 * input: -* asrc: Structure pointer of fsl_asrc -* infilter : Pointer to non-scaled input filter -* shift: The multiply factor +* @easrc: Structure pointer of fsl_asrc +* @infilter : Pointer to non-scaled input filter +* @shift: The multiply factor * output: -* outfilter: scaled filter +* @outfilter: scaled filter */ static int fsl_easrc_normalize_filter(struct fsl_asrc *easrc, u64 *infilter,
Signature · 1 line
2.21.0
Re: [PATCH 1/3] ASoC: fsl_easrc: Fix -Wmissing-prototypes warning
In reply to Shengjiu WangQuoted 55 lines · Shengjiu Wang
Obtained with:
$ make W=1
sound/soc/fsl/fsl_easrc.c:967:5: warning: no previous prototype for function 'fsl_easrc_config_context' [-Wmissing-prototypes] intfsl_easrc_config_context(struct fsl_asrc *easrc, unsigned int ctx_id)^
sound/soc/fsl/fsl_easrc.c:967:1: note: declare 'static' if the function is not intended to be used outside of this translation unit intfsl_easrc_config_context(struct fsl_asrc *easrc, unsigned int ctx_id)
^
staticsound/soc/fsl/fsl_easrc.c:1128:5: warning: no previous prototype for function 'fsl_easrc_set_ctx_format' [-Wmissing-prototypes] int fsl_easrc_set_ctx_format(structfsl_asrc_pair*ctx,^
sound/soc/fsl/fsl_easrc.c:1128:1: note: declare 'static' if the function is not intended to be used outside of this translation unit int fsl_easrc_set_ctx_format(structfsl_asrc_pair*ctx,
^
staticsound/soc/fsl/fsl_easrc.c:1201:5: warning: no previous prototype for function 'fsl_easrc_set_ctx_organziation' [-Wmissing-prototypes] intfsl_easrc_set_ctx_organziation(struct fsl_asrc_pair *ctx)^
sound/soc/fsl/fsl_easrc.c:1201:1: note: declare 'static' if the function is not intended to be used outside of this translation unit intfsl_easrc_set_ctx_organziation(struct fsl_asrc_pair *ctx)
^
staticsound/soc/fsl/fsl_easrc.c:1245:5: warning: no previous prototype for function 'fsl_easrc_request_context' [-Wmissing-prototypes] intfsl_easrc_request_context(int channels, struct fsl_asrc_pair *ctx)^
sound/soc/fsl/fsl_easrc.c:1245:1: note: declare 'static' if the function is not intended to be used outside of this translation unit intfsl_easrc_request_context(int channels, struct fsl_asrc_pair *ctx)
^
staticsound/soc/fsl/fsl_easrc.c:1290:6: warning: no previous prototype for function 'fsl_easrc_release_context' [-Wmissing-prototypes] voidfsl_easrc_release_context(struct fsl_asrc_pair *ctx)^
sound/soc/fsl/fsl_easrc.c:1290:1: note: declare 'static' if the function is not intended to be used outside of this translation unit voidfsl_easrc_release_context(struct fsl_asrc_pair *ctx)
^
staticsound/soc/fsl/fsl_easrc.c:1317:5: warning: no previous prototype for function 'fsl_easrc_start_context' [-Wmissing-prototypes] intfsl_easrc_start_context(struct fsl_asrc_pair *ctx)^
sound/soc/fsl/fsl_easrc.c:1317:1: note: declare 'static' if the function is not intended to be used outside of this translation unit intfsl_easrc_start_context(struct fsl_asrc_pair *ctx)
^
staticsound/soc/fsl/fsl_easrc.c:1335:5: warning: no previous prototype for function 'fsl_easrc_stop_context' [-Wmissing-prototypes] intfsl_easrc_stop_context(struct fsl_asrc_pair *ctx)^
sound/soc/fsl/fsl_easrc.c:1335:1: note: declare 'static' if the function is not intended to be used outside of this translation unit intfsl_easrc_stop_context(struct fsl_asrc_pair *ctx)
^
staticsound/soc/fsl/fsl_easrc.c:1382:18: warning: no previous prototype for function 'fsl_easrc_get_dma_channel' [-Wmissing-prototypes] structdma_chan*fsl_easrc_get_dma_channel(structfsl_asrc_pair*ctx,^
Quoted 8 lines
sound/soc/fsl/fsl_easrc.c:1382:1: note: declare 'static' if the function is not intended to be used outside of this translation unit structdma_chan*fsl_easrc_get_dma_channel(structfsl_asrc_pair*ctx,
^
staticFixes 955ac624058f ("ASoC: fsl_easrc: Add EASRC ASoC CPU DAI drivers")Signed-off-by Shengjiu Wang <[email protected]>Reported-by kbuild test robot <[email protected]>
Re: [PATCH 2/3] ASoC: fsl_easrc: Fix -Wunused-but-set-variable
In reply to Shengjiu WangQuoted 15 lines · Shengjiu Wang
Obtained with:
$ make W=1
sound/soc/fsl/fsl_easrc.c: In function 'fsl_easrc_set_rs_ratio':sound/soc/fsl/fsl_easrc.c:182:15: warning: variable 'int_bits' set but not used [-Wunused-but-set-variable]unsigned int int_bits; ^ sound/soc/fsl/fsl_easrc.c: In function 'fsl_easrc_set_ctx_organziation': sound/soc/fsl/fsl_easrc.c:1204:17: warning: variable 'dev' set but not used [-Wunused-but-set-variable] struct device *dev; ^ sound/soc/fsl/fsl_easrc.c: In function 'fsl_easrc_release_context': sound/soc/fsl/fsl_easrc.c:1294:17: warning: variable 'dev' set but not used [-Wunused-but-set-variable] struct device *dev; ^
Quoted 3 lines
Fixes 955ac624058f ("ASoC: fsl_easrc: Add EASRC ASoC CPU DAI drivers")Signed-off-by Shengjiu Wang <[email protected]>Reported-by kbuild test robot <[email protected]>
Re: [PATCH 3/3] ASoC: fsl_easrc: Fix "Function parameter not described" warnings
In reply to Shengjiu WangQuoted 11 lines · Shengjiu Wang
Obtained with:
$ make W=1
sound/soc/fsl/fsl_easrc.c:403: warning: Function parameter or member 'easrc' not described in 'fsl_easrc_normalize_filter'sound/soc/fsl/fsl_easrc.c:403: warning: Function parameter or member 'infilter' not described in 'fsl_easrc_normalize_filter'sound/soc/fsl/fsl_easrc.c:403: warning: Function parameter or member 'outfilter' not described in 'fsl_easrc_normalize_filter'sound/soc/fsl/fsl_easrc.c:403: warning: Function parameter or member 'shift' not described in 'fsl_easrc_normalize_filter'Fixes 955ac624058f ("ASoC: fsl_easrc: Add EASRC ASoC CPU DAI drivers")Signed-off-by Shengjiu Wang <[email protected]>Reported-by kbuild test robot <[email protected]>
Mark Brown
maintainerQuoted 8 lines · Shengjiu Wang
Fix several warnings with "make W=1"
Shengjiu Wang (3):
ASoC:fsl_easrc: Fix -Wmissing-prototypes warning
ASoC:fsl_easrc: Fix -Wunused-but-set-variable
ASoC:fsl_easrc: Fix "Function parameter not described" warnings[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/3] ASoC: fsl_easrc: Fix -Wmissing-prototypes warning
commit: e4cc0aaac390a87f80ae542c75d4c84de08816f9
[2/3] ASoC: fsl_easrc: Fix -Wunused-but-set-variable
commit: 633a2c7d6e621e748d69423fa85be88c7dcd4f94
[3/3] ASoC: fsl_easrc: Fix "Function parameter not described" warnings
commit: d73d682a9e87fa494868e8094fcc5b6a6b505464All 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