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

Commit 85e4d95d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'test/pci-rename' into topic/misc

parents b028b818 ce1fd369

Documentation/DocBook/writing-an-alsa-driver.tmpl

+5 −5
Original line number Diff line number Diff line
@@ -1164,7 +1164,7 @@ 
          }

          chip->port = pci_resource_start(pci, 0);

          if (request_irq(pci->irq, snd_mychip_interrupt,

                          IRQF_SHARED, "My Chip", chip)) {

                          IRQF_SHARED, KBUILD_MODNAME, chip)) {

                  printk(KERN_ERR "cannot grab irq %d\n", pci->irq);

                  snd_mychip_free(chip);

                  return -EBUSY;
@@ -1197,7 +1197,7 @@ 


  /* pci_driver definition */

  static struct pci_driver driver = {

          .name = "My Own Chip",

          .name = KBUILD_MODNAME,

          .id_table = snd_mychip_ids,

          .probe = snd_mychip_probe,

          .remove = __devexit_p(snd_mychip_remove),
@@ -1340,7 +1340,7 @@ 
          <programlisting>

<![CDATA[

  if (request_irq(pci->irq, snd_mychip_interrupt,

                  IRQF_SHARED, "My Chip", chip)) {

                  IRQF_SHARED, KBUILD_MODNAME, chip)) {

          printk(KERN_ERR "cannot grab irq %d\n", pci->irq);

          snd_mychip_free(chip);

          return -EBUSY;
@@ -1616,7 +1616,7 @@ 
          <programlisting>

<![CDATA[

  static struct pci_driver driver = {

          .name = "My Own Chip",

          .name = KBUILD_MODNAME,

          .id_table = snd_mychip_ids,

          .probe = snd_mychip_probe,

          .remove = __devexit_p(snd_mychip_remove),
@@ -5816,7 +5816,7 @@ struct _snd_pcm_runtime { 
        <programlisting>

<![CDATA[

  static struct pci_driver driver = {

          .name = "My Chip",

          .name = KBUILD_MODNAME,

          .id_table = snd_my_ids,

          .probe = snd_my_probe,

          .remove = __devexit_p(snd_my_remove),

sound/pci/ad1889.c

+2 −2
Original line number Diff line number Diff line
@@ -944,7 +944,7 @@ snd_ad1889_create(struct snd_card *card, 
	spin_lock_init(&chip->lock);	/* only now can we call ad1889_free */



	if (request_irq(pci->irq, snd_ad1889_interrupt,

			IRQF_SHARED, card->driver, chip)) {

			IRQF_SHARED, KBUILD_MODNAME, chip)) {

		printk(KERN_ERR PFX "cannot obtain IRQ %d\n", pci->irq);

		snd_ad1889_free(chip);

		return -EBUSY;
@@ -1055,7 +1055,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_ad1889_ids) = { 
MODULE_DEVICE_TABLE(pci, snd_ad1889_ids);



static struct pci_driver ad1889_pci_driver = {

	.name = "AD1889 Audio",

	.name = KBUILD_MODNAME,

	.id_table = snd_ad1889_ids,

	.probe = snd_ad1889_probe,

	.remove = __devexit_p(snd_ad1889_remove),

sound/pci/ali5451/ali5451.c

+2 −2
Original line number Diff line number Diff line
@@ -2090,7 +2090,7 @@ static int __devinit snd_ali_resources(struct snd_ali *codec) 
	codec->port = pci_resource_start(codec->pci, 0);



	if (request_irq(codec->pci->irq, snd_ali_card_interrupt,

			IRQF_SHARED, "ALI 5451", codec)) {

			IRQF_SHARED, KBUILD_MODNAME, codec)) {

		snd_printk(KERN_ERR "Unable to request irq.\n");

		return -EBUSY;

	}
@@ -2295,7 +2295,7 @@ static void __devexit snd_ali_remove(struct pci_dev *pci) 
}



static struct pci_driver driver = {

	.name = "ALI 5451",

	.name = KBUILD_MODNAME,

	.id_table = snd_ali_ids,

	.probe = snd_ali_probe,

	.remove = __devexit_p(snd_ali_remove),

sound/pci/als300.c

+2 −2
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ static int __devinit snd_als300_create(struct snd_card *card, 
		irq_handler = snd_als300_interrupt;



	if (request_irq(pci->irq, irq_handler, IRQF_SHARED,

			card->shortname, chip)) {

			KBUILD_MODNAME, chip)) {

		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);

		snd_als300_free(chip);

		return -EBUSY;
@@ -846,7 +846,7 @@ static int __devinit snd_als300_probe(struct pci_dev *pci, 
}



static struct pci_driver driver = {

	.name = "ALS300",

	.name = KBUILD_MODNAME,

	.id_table = snd_als300_ids,

	.probe = snd_als300_probe,

	.remove = __devexit_p(snd_als300_remove),

sound/pci/als4000.c

+1 −1
Original line number Diff line number Diff line
@@ -1036,7 +1036,7 @@ static int snd_als4000_resume(struct pci_dev *pci) 




static struct pci_driver driver = {

	.name = "ALS4000",

	.name = KBUILD_MODNAME,

	.id_table = snd_als4000_ids,

	.probe = snd_card_als4000_probe,

	.remove = __devexit_p(snd_card_als4000_remove),