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

Commit a4f2473d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: atmel: Convert to snd_card_new() with a device pointer 



Also remove superfluous snd_card_set_dev() calls.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 4a875580

sound/atmel/abdac.c

+4 −9
Original line number Diff line number Diff line
@@ -429,8 +429,9 @@ static int atmel_abdac_probe(struct platform_device *pdev) 
	}

	clk_enable(pclk);



	retval = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,

			THIS_MODULE, sizeof(struct atmel_abdac), &card);

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

			      SNDRV_DEFAULT_STR1, THIS_MODULE,

			      sizeof(struct atmel_abdac), &card);

	if (retval) {

		dev_dbg(&pdev->dev, "could not create sound card device\n");

		goto out_put_sample_clk;
@@ -467,8 +468,6 @@ static int atmel_abdac_probe(struct platform_device *pdev) 
		goto out_unmap_regs;

	}



	snd_card_set_dev(card, &pdev->dev);



	if (pdata->dws.dma_dev) {

		dma_cap_mask_t mask;
@@ -492,7 +491,7 @@ static int atmel_abdac_probe(struct platform_device *pdev) 
	if (!pdata->dws.dma_dev || !dac->dma.chan) {

		dev_dbg(&pdev->dev, "DMA not available\n");

		retval = -ENODEV;

		goto out_unset_card_dev;

		goto out_unmap_regs;

	}



	strcpy(card->driver, "Atmel ABDAC");
@@ -521,9 +520,6 @@ static int atmel_abdac_probe(struct platform_device *pdev) 
out_release_dma:

	dma_release_channel(dac->dma.chan);

	dac->dma.chan = NULL;

out_unset_card_dev:

	snd_card_set_dev(card, NULL);

	free_irq(irq, dac);

out_unmap_regs:

	iounmap(dac->regs);

out_free_card:
@@ -579,7 +575,6 @@ static int atmel_abdac_remove(struct platform_device *pdev) 


	dma_release_channel(dac->dma.chan);

	dac->dma.chan = NULL;

	snd_card_set_dev(card, NULL);

	iounmap(dac->regs);

	free_irq(dac->irq, dac);

	snd_card_free(card);

sound/atmel/ac97c.c

+3 −7
Original line number Diff line number Diff line
@@ -945,8 +945,9 @@ static int atmel_ac97c_probe(struct platform_device *pdev) 
	}

	clk_enable(pclk);



	retval = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,

			THIS_MODULE, sizeof(struct atmel_ac97c), &card);

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

			      SNDRV_DEFAULT_STR1, THIS_MODULE,

			      sizeof(struct atmel_ac97c), &card);

	if (retval) {

		dev_dbg(&pdev->dev, "could not create sound card device\n");

		goto err_snd_card_new;
@@ -990,8 +991,6 @@ static int atmel_ac97c_probe(struct platform_device *pdev) 
		chip->reset_pin = -EINVAL;

	}



	snd_card_set_dev(card, &pdev->dev);



	atmel_ac97c_reset(chip);



	/* Enable overrun interrupt from codec channel */
@@ -1113,8 +1112,6 @@ static int atmel_ac97c_probe(struct platform_device *pdev) 
		chip->dma.tx_chan = NULL;

	}

err_ac97_bus:

	snd_card_set_dev(card, NULL);



	if (gpio_is_valid(chip->reset_pin))

		gpio_free(chip->reset_pin);
@@ -1195,7 +1192,6 @@ static int atmel_ac97c_remove(struct platform_device *pdev) 
		chip->dma.tx_chan = NULL;

	}



	snd_card_set_dev(card, NULL);

	snd_card_free(card);



	return 0;