Commit a69bb3c3 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai

sound: oxygen: use static driver name

When allocating resources, use a fixed name instead of reading it from
the model structure.  This allows us to allocate the resources before
the actual model is known.
Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6ed91157
...@@ -34,6 +34,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>"); ...@@ -34,6 +34,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
MODULE_DESCRIPTION("C-Media CMI8788 helper library"); MODULE_DESCRIPTION("C-Media CMI8788 helper library");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
#define DRIVER "oxygen"
static inline int oxygen_uart_input_ready(struct oxygen *chip) static inline int oxygen_uart_input_ready(struct oxygen *chip)
{ {
...@@ -481,7 +482,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, ...@@ -481,7 +482,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
if (err < 0) if (err < 0)
goto err_card; goto err_card;
err = pci_request_regions(pci, model->chip); err = pci_request_regions(pci, DRIVER);
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR "cannot reserve PCI resources\n"); snd_printk(KERN_ERR "cannot reserve PCI resources\n");
goto err_pci_enable; goto err_pci_enable;
...@@ -517,7 +518,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, ...@@ -517,7 +518,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
chip->model.init(chip); chip->model.init(chip);
err = request_irq(pci->irq, oxygen_interrupt, IRQF_SHARED, err = request_irq(pci->irq, oxygen_interrupt, IRQF_SHARED,
chip->model.chip, chip); DRIVER, chip);
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR "cannot grab interrupt %d\n", pci->irq); snd_printk(KERN_ERR "cannot grab interrupt %d\n", pci->irq);
goto err_card; goto err_card;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment