Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a641ed5e authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/blackfin', 'asoc/topic/build',... 

Merge remote-tracking branches 'asoc/topic/blackfin', 'asoc/topic/build', 'asoc/topic/cirrus' and 'asoc/topic/compress' into asoc-next
parents 82af2b7f bf9790bc 2dc3b7b0 7f8159ac aeb6fa0f

sound/soc/blackfin/bf5xx-ac97-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ static int bf5xx_pcm_copy_user(struct snd_pcm_substream *substream, 
}

#endif



static struct snd_pcm_ops bf5xx_pcm_ac97_ops = {

static const struct snd_pcm_ops bf5xx_pcm_ac97_ops = {

	.open		= bf5xx_pcm_open,

	.ioctl		= snd_pcm_lib_ioctl,

	.hw_params	= bf5xx_pcm_hw_params,

sound/soc/blackfin/bf5xx-i2s-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ static int bf5xx_pcm_silence(struct snd_pcm_substream *substream, 
	return 0;

}



static struct snd_pcm_ops bf5xx_pcm_i2s_ops = {

static const struct snd_pcm_ops bf5xx_pcm_i2s_ops = {

	.open		= bf5xx_pcm_open,

	.ioctl		= snd_pcm_lib_ioctl,

	.hw_params	= bf5xx_pcm_hw_params,

sound/soc/blackfin/bf6xx-i2s.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static int bfin_i2s_resume(struct snd_soc_dai *dai) 
#define BFIN_I2S_FORMATS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE | \

		SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)



static struct snd_soc_dai_ops bfin_i2s_dai_ops = {

static const struct snd_soc_dai_ops bfin_i2s_dai_ops = {

	.hw_params	= bfin_i2s_hw_params,

	.set_fmt	= bfin_i2s_set_dai_fmt,

};

sound/soc/blackfin/bf6xx-sport.c

+17 −21
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ int sport_config_tx_dma(struct sport_device *sport, void *buf, 


	setup_desc(sport->tx_desc, buf, fragcount, fragsize,

		   cfg | DMAEN, count, sport->wdsize);



	return 0;

}

EXPORT_SYMBOL(sport_config_tx_dma);
@@ -199,7 +198,6 @@ int sport_config_rx_dma(struct sport_device *sport, void *buf, 


	setup_desc(sport->rx_desc, buf, fragcount, fragsize,

		   cfg | DMAEN, count, sport->wdsize);



	return 0;

}

EXPORT_SYMBOL(sport_config_rx_dma);
@@ -388,26 +386,24 @@ struct sport_device *sport_create(struct platform_device *pdev) 
	int ret;



	sport = kzalloc(sizeof(*sport), GFP_KERNEL);

	if (!sport) {

		dev_err(dev, "Unable to allocate memory for sport device\n");

	if (!sport)

		return NULL;

	}



	sport->pdev = pdev;



	ret = sport_get_resource(sport);

	if (ret) {

		kfree(sport);

		return NULL;

	}

	if (ret)

		goto free_data;



	ret = sport_request_resource(sport);

	if (ret) {

		kfree(sport);

		return NULL;

	}

	if (ret)

		goto free_data;



	dev_dbg(dev, "SPORT create success\n");

	return sport;

free_data:

	kfree(sport);

	return NULL;

}

EXPORT_SYMBOL(sport_create);

sound/soc/cirrus/edb93xx.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static int edb93xx_hw_params(struct snd_pcm_substream *substream, 
				      SND_SOC_CLOCK_OUT);

}



static struct snd_soc_ops edb93xx_ops = {

static const struct snd_soc_ops edb93xx_ops = {

	.hw_params	= edb93xx_hw_params,

};