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

Commit 5a7fa6b0 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/mxs-saif' and 'asoc/topic/nuc900' into asoc-next

parents 6e685ea6 5396ecf7 3a96878e

sound/soc/mxs/mxs-saif.c

+5 −5
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ static int mxs_saif_probe(struct platform_device *pdev) 
	struct device_node *np = pdev->dev.of_node;

	struct resource *iores;

	struct mxs_saif *saif;

	int ret = 0;

	int irq, ret = 0;

	struct device_node *master;



	if (!np)
@@ -763,16 +763,16 @@ static int mxs_saif_probe(struct platform_device *pdev) 
	if (IS_ERR(saif->base))

		return PTR_ERR(saif->base);



	saif->irq = platform_get_irq(pdev, 0);

	if (saif->irq < 0) {

		ret = saif->irq;

	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		ret = irq;

		dev_err(&pdev->dev, "failed to get irq resource: %d\n",

			ret);

		return ret;

	}



	saif->dev = &pdev->dev;

	ret = devm_request_irq(&pdev->dev, saif->irq, mxs_saif_irq, 0,

	ret = devm_request_irq(&pdev->dev, irq, mxs_saif_irq, 0,

			       dev_name(&pdev->dev), saif);

	if (ret) {

		dev_err(&pdev->dev, "failed to request irq\n");

sound/soc/mxs/mxs-saif.h

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ struct mxs_saif { 
	unsigned int mclk;

	unsigned int mclk_in_use;

	void __iomem *base;

	int irq;

	unsigned int id;

	unsigned int master_id;

	unsigned int cur_rate;

sound/soc/nuc900/nuc900-pcm.c

+0 −6
Original line number Diff line number Diff line
@@ -306,11 +306,6 @@ static struct snd_pcm_ops nuc900_dma_ops = { 
	.mmap		= nuc900_dma_mmap,

};



static void nuc900_dma_free_dma_buffers(struct snd_pcm *pcm)

{

	snd_pcm_lib_preallocate_free_for_all(pcm);

}



static int nuc900_dma_new(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_card *card = rtd->card->snd_card;
@@ -330,7 +325,6 @@ static int nuc900_dma_new(struct snd_soc_pcm_runtime *rtd) 
static struct snd_soc_platform_driver nuc900_soc_platform = {

	.ops		= &nuc900_dma_ops,

	.pcm_new	= nuc900_dma_new,

	.pcm_free	= nuc900_dma_free_dma_buffers,

};



static int nuc900_soc_platform_probe(struct platform_device *pdev)