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

[media] 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 e7356888 b9d4e7b0

+29 -36
+5 -4
drivers/media/pci/cx18/cx18-alsa-main.c
··· 145 145 /* This is a no-op for us. We'll use the cx->instance */ 146 146 147 147 /* (2) Create a card instance */ 148 - ret = snd_card_create(SNDRV_DEFAULT_IDX1, /* use first available id */ 149 - SNDRV_DEFAULT_STR1, /* xid from end of shortname*/ 150 - THIS_MODULE, 0, &sc); 148 + ret = snd_card_new(&cx->pci_dev->dev, 149 + SNDRV_DEFAULT_IDX1, /* use first available id */ 150 + SNDRV_DEFAULT_STR1, /* xid from end of shortname*/ 151 + THIS_MODULE, 0, &sc); 151 152 if (ret) { 152 - CX18_ALSA_ERR("%s: snd_card_create() failed with err %d\n", 153 + CX18_ALSA_ERR("%s: snd_card_new() failed with err %d\n", 153 154 __func__, ret); 154 155 goto err_exit; 155 156 }
+2 -3
drivers/media/pci/cx23885/cx23885-alsa.c
··· 489 489 return NULL; 490 490 } 491 491 492 - err = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, 492 + err = snd_card_new(&dev->pci->dev, 493 + SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, 493 494 THIS_MODULE, sizeof(struct cx23885_audio_dev), &card); 494 495 if (err < 0) 495 496 goto error; ··· 500 499 chip->pci = dev->pci; 501 500 chip->card = card; 502 501 spin_lock_init(&chip->lock); 503 - 504 - snd_card_set_dev(card, &dev->pci->dev); 505 502 506 503 err = snd_cx23885_pcm(chip, 0, "CX23885 Digital"); 507 504 if (err < 0)
+3 -4
drivers/media/pci/cx25821/cx25821-alsa.c
··· 645 645 return -ENOENT; 646 646 } 647 647 648 - err = snd_card_create(index[devno], id[devno], THIS_MODULE, 649 - sizeof(struct cx25821_audio_dev), &card); 648 + err = snd_card_new(&dev->pci->dev, index[devno], id[devno], 649 + THIS_MODULE, 650 + sizeof(struct cx25821_audio_dev), &card); 650 651 if (err < 0) { 651 652 pr_info("DEBUG ERROR: cannot create snd_card_new in %s\n", 652 653 __func__); ··· 682 681 __func__); 683 682 goto error; 684 683 } 685 - 686 - snd_card_set_dev(card, &chip->pci->dev); 687 684 688 685 strcpy(card->shortname, "cx25821"); 689 686 sprintf(card->longname, "%s at 0x%lx irq %d", chip->dev->name,
+2 -4
drivers/media/pci/cx88/cx88-alsa.c
··· 852 852 chip->irq = pci->irq; 853 853 synchronize_irq(chip->irq); 854 854 855 - snd_card_set_dev(card, &pci->dev); 856 - 857 855 *rchip = chip; 858 856 *core_ptr = core; 859 857 ··· 874 876 return (-ENOENT); 875 877 } 876 878 877 - err = snd_card_create(index[devno], id[devno], THIS_MODULE, 878 - sizeof(snd_cx88_card_t), &card); 879 + err = snd_card_new(&pci->dev, index[devno], id[devno], THIS_MODULE, 880 + sizeof(snd_cx88_card_t), &card); 879 881 if (err < 0) 880 882 return err; 881 883
+5 -4
drivers/media/pci/ivtv/ivtv-alsa-main.c
··· 145 145 /* This is a no-op for us. We'll use the itv->instance */ 146 146 147 147 /* (2) Create a card instance */ 148 - ret = snd_card_create(SNDRV_DEFAULT_IDX1, /* use first available id */ 149 - SNDRV_DEFAULT_STR1, /* xid from end of shortname*/ 150 - THIS_MODULE, 0, &sc); 148 + ret = snd_card_new(&itv->pdev->dev, 149 + SNDRV_DEFAULT_IDX1, /* use first available id */ 150 + SNDRV_DEFAULT_STR1, /* xid from end of shortname*/ 151 + THIS_MODULE, 0, &sc); 151 152 if (ret) { 152 - IVTV_ALSA_ERR("%s: snd_card_create() failed with err %d\n", 153 + IVTV_ALSA_ERR("%s: snd_card_new() failed with err %d\n", 153 154 __func__, ret); 154 155 goto err_exit; 155 156 }
+2 -4
drivers/media/pci/saa7134/saa7134-alsa.c
··· 1072 1072 if (!enable[devnum]) 1073 1073 return -ENODEV; 1074 1074 1075 - err = snd_card_create(index[devnum], id[devnum], THIS_MODULE, 1076 - sizeof(snd_card_saa7134_t), &card); 1075 + err = snd_card_new(&dev->pci->dev, index[devnum], id[devnum], 1076 + THIS_MODULE, sizeof(snd_card_saa7134_t), &card); 1077 1077 if (err < 0) 1078 1078 return err; 1079 1079 ··· 1114 1114 1115 1115 if ((err = snd_card_saa7134_pcm(chip, 0)) < 0) 1116 1116 goto __nodev; 1117 - 1118 - snd_card_set_dev(card, &chip->pci->dev); 1119 1117 1120 1118 /* End of "creation" */ 1121 1119
+2 -3
drivers/media/usb/cx231xx/cx231xx-audio.c
··· 665 665 cx231xx_info("cx231xx-audio.c: probing for cx231xx " 666 666 "non standard usbaudio\n"); 667 667 668 - err = snd_card_create(index[devnr], "Cx231xx Audio", THIS_MODULE, 669 - 0, &card); 668 + err = snd_card_new(&dev->udev->dev, index[devnr], "Cx231xx Audio", 669 + THIS_MODULE, 0, &card); 670 670 if (err < 0) 671 671 return err; 672 672 ··· 682 682 pcm->info_flags = 0; 683 683 pcm->private_data = dev; 684 684 strcpy(pcm->name, "Conexant cx231xx Capture"); 685 - snd_card_set_dev(card, &dev->udev->dev); 686 685 strcpy(card->driver, "Cx231xx-Audio"); 687 686 strcpy(card->shortname, "Cx231xx Audio"); 688 687 strcpy(card->longname, "Conexant cx231xx Audio");
+2 -3
drivers/media/usb/em28xx/em28xx-audio.c
··· 900 900 printk(KERN_INFO 901 901 "em28xx-audio.c: Copyright (C) 2007-2014 Mauro Carvalho Chehab\n"); 902 902 903 - err = snd_card_create(index[devnr], "Em28xx Audio", THIS_MODULE, 0, 904 - &card); 903 + err = snd_card_new(&dev->udev->dev, index[devnr], "Em28xx Audio", 904 + THIS_MODULE, 0, &card); 905 905 if (err < 0) 906 906 return err; 907 907 ··· 918 918 pcm->private_data = dev; 919 919 strcpy(pcm->name, "Empia 28xx Capture"); 920 920 921 - snd_card_set_dev(card, &dev->udev->dev); 922 921 strcpy(card->driver, "Em28xx-Audio"); 923 922 strcpy(card->shortname, "Em28xx Audio"); 924 923 strcpy(card->longname, "Empia Em28xx Audio");
+2 -4
drivers/media/usb/stk1160/stk1160-ac97.c
··· 98 98 * Just want a card to access ac96 controls, 99 99 * the actual capture interface will be handled by snd-usb-audio 100 100 */ 101 - rc = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, 102 - THIS_MODULE, 0, &card); 101 + rc = snd_card_new(dev->dev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, 102 + THIS_MODULE, 0, &card); 103 103 if (rc < 0) 104 104 return rc; 105 - 106 - snd_card_set_dev(card, dev->dev); 107 105 108 106 /* TODO: I'm not sure where should I get these names :-( */ 109 107 snprintf(card->shortname, sizeof(card->shortname),
+2 -1
drivers/media/usb/tlg2300/pd-alsa.c
··· 300 300 struct snd_pcm *pcm; 301 301 int ret; 302 302 303 - ret = snd_card_create(-1, "Telegent", THIS_MODULE, 0, &card); 303 + ret = snd_card_new(&p->interface->dev, -1, "Telegent", 304 + THIS_MODULE, 0, &card); 304 305 if (ret != 0) 305 306 return ret; 306 307
+2 -2
drivers/media/usb/tm6000/tm6000-alsa.c
··· 431 431 if (!enable[devnr]) 432 432 return -ENOENT; 433 433 434 - rc = snd_card_create(index[devnr], "tm6000", THIS_MODULE, 0, &card); 434 + rc = snd_card_new(&dev->udev->dev, index[devnr], "tm6000", 435 + THIS_MODULE, 0, &card); 435 436 if (rc < 0) { 436 437 snd_printk(KERN_ERR "cannot create card instance %d\n", devnr); 437 438 return rc; ··· 446 445 le16_to_cpu(dev->udev->descriptor.idVendor), 447 446 le16_to_cpu(dev->udev->descriptor.idProduct)); 448 447 snd_component_add(card, component); 449 - snd_card_set_dev(card, &dev->udev->dev); 450 448 451 449 chip = kzalloc(sizeof(struct snd_tm6000_card), GFP_KERNEL); 452 450 if (!chip) {