tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Also remove superfluous snd_card_set_dev() calls.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

Takashi Iwai a4f2473d 4a875580

+7 -16
+4 -9
sound/atmel/abdac.c
··· 429 429 } 430 430 clk_enable(pclk); 431 431 432 - retval = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, 433 - THIS_MODULE, sizeof(struct atmel_abdac), &card); 432 + retval = snd_card_new(&pdev->dev, SNDRV_DEFAULT_IDX1, 433 + SNDRV_DEFAULT_STR1, THIS_MODULE, 434 + sizeof(struct atmel_abdac), &card); 434 435 if (retval) { 435 436 dev_dbg(&pdev->dev, "could not create sound card device\n"); 436 437 goto out_put_sample_clk; ··· 468 467 goto out_unmap_regs; 469 468 } 470 469 471 - snd_card_set_dev(card, &pdev->dev); 472 - 473 470 if (pdata->dws.dma_dev) { 474 471 dma_cap_mask_t mask; 475 472 ··· 491 492 if (!pdata->dws.dma_dev || !dac->dma.chan) { 492 493 dev_dbg(&pdev->dev, "DMA not available\n"); 493 494 retval = -ENODEV; 494 - goto out_unset_card_dev; 495 + goto out_unmap_regs; 495 496 } 496 497 497 498 strcpy(card->driver, "Atmel ABDAC"); ··· 520 521 out_release_dma: 521 522 dma_release_channel(dac->dma.chan); 522 523 dac->dma.chan = NULL; 523 - out_unset_card_dev: 524 - snd_card_set_dev(card, NULL); 525 - free_irq(irq, dac); 526 524 out_unmap_regs: 527 525 iounmap(dac->regs); 528 526 out_free_card: ··· 575 579 576 580 dma_release_channel(dac->dma.chan); 577 581 dac->dma.chan = NULL; 578 - snd_card_set_dev(card, NULL); 579 582 iounmap(dac->regs); 580 583 free_irq(dac->irq, dac); 581 584 snd_card_free(card);
+3 -7
sound/atmel/ac97c.c
··· 945 945 } 946 946 clk_enable(pclk); 947 947 948 - retval = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, 949 - THIS_MODULE, sizeof(struct atmel_ac97c), &card); 948 + retval = snd_card_new(&pdev->dev, SNDRV_DEFAULT_IDX1, 949 + SNDRV_DEFAULT_STR1, THIS_MODULE, 950 + sizeof(struct atmel_ac97c), &card); 950 951 if (retval) { 951 952 dev_dbg(&pdev->dev, "could not create sound card device\n"); 952 953 goto err_snd_card_new; ··· 990 989 } else { 991 990 chip->reset_pin = -EINVAL; 992 991 } 993 - 994 - snd_card_set_dev(card, &pdev->dev); 995 992 996 993 atmel_ac97c_reset(chip); 997 994 ··· 1112 1113 chip->dma.tx_chan = NULL; 1113 1114 } 1114 1115 err_ac97_bus: 1115 - snd_card_set_dev(card, NULL); 1116 - 1117 1116 if (gpio_is_valid(chip->reset_pin)) 1118 1117 gpio_free(chip->reset_pin); 1119 1118 ··· 1192 1195 chip->dma.tx_chan = NULL; 1193 1196 } 1194 1197 1195 - snd_card_set_dev(card, NULL); 1196 1198 snd_card_free(card); 1197 1199 1198 1200 return 0;