Merge remote-tracking branches 'asoc/topic/mxs-saif' and 'asoc/topic/nuc900' into asoc-next
This commit is contained in:
commit
5a7fa6b0d2
|
@ -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");
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue