projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa
[cascardo/linux.git]
/
sound
/
pci
/
ad1889.c
diff --git
a/sound/pci/ad1889.c
b/sound/pci/ad1889.c
index
0786d0e
..
a66d515
100644
(file)
--- a/
sound/pci/ad1889.c
+++ b/
sound/pci/ad1889.c
@@
-40,7
+40,6
@@
#include <linux/compiler.h>
#include <linux/delay.h>
#include <linux/compiler.h>
#include <linux/delay.h>
-#include <sound/driver.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/initval.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/initval.h>
@@
-596,9
+595,7
@@
static struct snd_pcm_ops snd_ad1889_capture_ops = {
};
static irqreturn_t
};
static irqreturn_t
-snd_ad1889_interrupt(int irq,
- void *dev_id,
- struct pt_regs *regs)
+snd_ad1889_interrupt(int irq, void *dev_id)
{
unsigned long st;
struct snd_ad1889 *chip = dev_id;
{
unsigned long st;
struct snd_ad1889 *chip = dev_id;
@@
-860,7
+857,7
@@
snd_ad1889_free(struct snd_ad1889 *chip)
synchronize_irq(chip->irq);
if (chip->irq >= 0)
synchronize_irq(chip->irq);
if (chip->irq >= 0)
- free_irq(chip->irq,
(void*)
chip);
+ free_irq(chip->irq, chip);
skip_hw:
if (chip->iobase)
skip_hw:
if (chip->iobase)
@@
-947,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,
spin_lock_init(&chip->lock); /* only now can we call ad1889_free */
if (request_irq(pci->irq, snd_ad1889_interrupt,
- IRQF_
DISABLED|IRQF_SHARED, card->driver, (void*)
chip)) {
+ IRQF_
SHARED, card->driver,
chip)) {
printk(KERN_ERR PFX "cannot obtain IRQ %d\n", pci->irq);
snd_ad1889_free(chip);
return -EBUSY;
printk(KERN_ERR PFX "cannot obtain IRQ %d\n", pci->irq);
snd_ad1889_free(chip);
return -EBUSY;
@@
-1057,7
+1054,7
@@
static struct pci_device_id snd_ad1889_ids[] = {
};
MODULE_DEVICE_TABLE(pci, snd_ad1889_ids);
};
MODULE_DEVICE_TABLE(pci, snd_ad1889_ids);
-static struct pci_driver ad1889_pci = {
+static struct pci_driver ad1889_pci
_driver
= {
.name = "AD1889 Audio",
.id_table = snd_ad1889_ids,
.probe = snd_ad1889_probe,
.name = "AD1889 Audio",
.id_table = snd_ad1889_ids,
.probe = snd_ad1889_probe,
@@
-1067,13
+1064,13
@@
static struct pci_driver ad1889_pci = {
static int __init
alsa_ad1889_init(void)
{
static int __init
alsa_ad1889_init(void)
{
- return pci_register_driver(&ad1889_pci);
+ return pci_register_driver(&ad1889_pci
_driver
);
}
static void __exit
alsa_ad1889_fini(void)
{
}
static void __exit
alsa_ad1889_fini(void)
{
- pci_unregister_driver(&ad1889_pci);
+ pci_unregister_driver(&ad1889_pci
_driver
);
}
module_init(alsa_ad1889_init);
}
module_init(alsa_ad1889_init);