Commit 82af2b7f authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/adau1977', 'asoc/topic/arizona',... 

Merge remote-tracking branches 'asoc/topic/adau1977', 'asoc/topic/arizona', 'asoc/topic/atmel', 'asoc/topic/au1x' and 'asoc/topic/bcm' into asoc-next
parents 94e26c07 68feed90 4dbcc5ff 0515760f 052fba77 cc6e2563

sound/atmel/ac97c.c

+6 −3
Original line number Diff line number Diff line
@@ -783,7 +783,9 @@ static int atmel_ac97c_probe(struct platform_device *pdev) 
		dev_dbg(&pdev->dev, "no peripheral clock\n");

		return PTR_ERR(pclk);

	}

	clk_prepare_enable(pclk);

	retval = clk_prepare_enable(pclk);

	if (retval)

		goto err_prepare_enable;



	retval = snd_card_new(&pdev->dev, SNDRV_DEFAULT_IDX1,

			      SNDRV_DEFAULT_STR1, THIS_MODULE,
@@ -879,6 +881,7 @@ static int atmel_ac97c_probe(struct platform_device *pdev) 
	snd_card_free(card);

err_snd_card_new:

	clk_disable_unprepare(pclk);

err_prepare_enable:

	clk_put(pclk);

	return retval;

}
@@ -897,9 +900,9 @@ static int atmel_ac97c_resume(struct device *pdev) 
{

	struct snd_card *card = dev_get_drvdata(pdev);

	struct atmel_ac97c *chip = card->private_data;

	int ret = clk_prepare_enable(chip->pclk);



	clk_prepare_enable(chip->pclk);

	return 0;

	return ret;

}



static SIMPLE_DEV_PM_OPS(atmel_ac97c_pm, atmel_ac97c_suspend, atmel_ac97c_resume);

sound/soc/atmel/atmel-classd.c

+0 −1
Original line number Diff line number Diff line
@@ -652,7 +652,6 @@ static int atmel_classd_probe(struct platform_device *pdev) 
	}



	snd_soc_card_set_drvdata(card, dd);

	platform_set_drvdata(pdev, card);



	ret = atmel_classd_asoc_card_init(dev, card);

	if (ret) {

sound/soc/atmel/atmel-pdmic.c

+0 −1
Original line number Diff line number Diff line
@@ -694,7 +694,6 @@ static int atmel_pdmic_probe(struct platform_device *pdev) 
	}



	snd_soc_card_set_drvdata(card, dd);

	platform_set_drvdata(pdev, card);



	ret = atmel_pdmic_asoc_card_init(dev, card);

	if (ret) {

sound/soc/au1x/db1200.c

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

}



static struct snd_soc_ops db1200_i2s_wm8731_ops = {

static const struct snd_soc_ops db1200_i2s_wm8731_ops = {

	.startup	= db1200_i2s_startup,

};

sound/soc/au1x/dbdma2.c

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

}



static struct snd_pcm_ops au1xpsc_pcm_ops = {

static const struct snd_pcm_ops au1xpsc_pcm_ops = {

	.open		= au1xpsc_pcm_open,

	.close		= au1xpsc_pcm_close,

	.ioctl		= snd_pcm_lib_ioctl,