Unverified Commit 1cdd255a authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: fsl_easrc: Fix several warnings" from Shengjiu Wang <shengjiu.wang@nxp.com>: 

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(-)

--
2.21.0
parents d8bc1b05 d73d682a

sound/soc/fsl/fsl_easrc.c

+18 −24
Original line number Diff line number Diff line
@@ -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:
@@ -390,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,
@@ -964,7 +963,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,7 +1124,7 @@ static int fsl_easrc_process_format(struct fsl_asrc_pair *ctx, 
	return 0;

}



int fsl_easrc_set_ctx_format(struct fsl_asrc_pair *ctx,

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)

{
@@ -1198,10 +1197,9 @@ 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;

	struct fsl_asrc *easrc;



	if (!ctx)
@@ -1209,7 +1207,6 @@ 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),
@@ -1242,7 +1239,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,17 +1284,15 @@ 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;

	struct device *dev;



	if (!ctx)

		return;



	easrc = ctx->asrc;

	dev = &easrc->pdev->dev;



	spin_lock_irqsave(&easrc->lock, lock_flags);
@@ -1314,7 +1309,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 +1327,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,7 +1374,7 @@ 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,

static struct dma_chan *fsl_easrc_get_dma_channel(struct fsl_asrc_pair *ctx,

						  bool dir)

{

	struct fsl_asrc *easrc = ctx->asrc;
@@ -1391,7 +1386,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,