aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/sb
diff options
context:
space:
mode:
Diffstat (limited to 'sound/isa/sb')
-rw-r--r--sound/isa/sb/es968.c3
-rw-r--r--sound/isa/sb/sb16_main.c4
-rw-r--r--sound/isa/sb/sb8.c2
-rw-r--r--sound/isa/sb/sb_common.c2
4 files changed, 5 insertions, 6 deletions
diff --git a/sound/isa/sb/es968.c b/sound/isa/sb/es968.c
index d4d65b84265a..d4b218726ce7 100644
--- a/sound/isa/sb/es968.c
+++ b/sound/isa/sb/es968.c
@@ -70,8 +70,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_es968_pnpids);
70 70
71#define DRIVER_NAME "snd-card-es968" 71#define DRIVER_NAME "snd-card-es968"
72 72
73static irqreturn_t snd_card_es968_interrupt(int irq, void *dev_id, 73static irqreturn_t snd_card_es968_interrupt(int irq, void *dev_id)
74 struct pt_regs *regs)
75{ 74{
76 struct snd_sb *chip = dev_id; 75 struct snd_sb *chip = dev_id;
77 76
diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c
index f183f1845a36..383911b9e74d 100644
--- a/sound/isa/sb/sb16_main.c
+++ b/sound/isa/sb/sb16_main.c
@@ -395,7 +395,7 @@ static int snd_sb16_capture_trigger(struct snd_pcm_substream *substream,
395 return result; 395 return result;
396} 396}
397 397
398irqreturn_t snd_sb16dsp_interrupt(int irq, void *dev_id, struct pt_regs *regs) 398irqreturn_t snd_sb16dsp_interrupt(int irq, void *dev_id)
399{ 399{
400 struct snd_sb *chip = dev_id; 400 struct snd_sb *chip = dev_id;
401 unsigned char status; 401 unsigned char status;
@@ -405,7 +405,7 @@ irqreturn_t snd_sb16dsp_interrupt(int irq, void *dev_id, struct pt_regs *regs)
405 status = snd_sbmixer_read(chip, SB_DSP4_IRQSTATUS); 405 status = snd_sbmixer_read(chip, SB_DSP4_IRQSTATUS);
406 spin_unlock(&chip->mixer_lock); 406 spin_unlock(&chip->mixer_lock);
407 if ((status & SB_IRQTYPE_MPUIN) && chip->rmidi_callback) 407 if ((status & SB_IRQTYPE_MPUIN) && chip->rmidi_callback)
408 chip->rmidi_callback(irq, chip->rmidi->private_data, regs); 408 chip->rmidi_callback(irq, chip->rmidi->private_data);
409 if (status & SB_IRQTYPE_8BIT) { 409 if (status & SB_IRQTYPE_8BIT) {
410 ok = 0; 410 ok = 0;
411 if (chip->mode & SB_MODE_PLAYBACK_8) { 411 if (chip->mode & SB_MODE_PLAYBACK_8) {
diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c
index 141400c01426..268ebd34703e 100644
--- a/sound/isa/sb/sb8.c
+++ b/sound/isa/sb/sb8.c
@@ -63,7 +63,7 @@ struct snd_sb8 {
63 struct snd_sb *chip; 63 struct snd_sb *chip;
64}; 64};
65 65
66static irqreturn_t snd_sb8_interrupt(int irq, void *dev_id, struct pt_regs *regs) 66static irqreturn_t snd_sb8_interrupt(int irq, void *dev_id)
67{ 67{
68 struct snd_sb *chip = dev_id; 68 struct snd_sb *chip = dev_id;
69 69
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c
index f17de2bdd9e0..c62a9e3d2ae4 100644
--- a/sound/isa/sb/sb_common.c
+++ b/sound/isa/sb/sb_common.c
@@ -205,7 +205,7 @@ static int snd_sbdsp_dev_free(struct snd_device *device)
205int snd_sbdsp_create(struct snd_card *card, 205int snd_sbdsp_create(struct snd_card *card,
206 unsigned long port, 206 unsigned long port,
207 int irq, 207 int irq,
208 irqreturn_t (*irq_handler)(int, void *, struct pt_regs *), 208 irq_handler_t irq_handler,
209 int dma8, 209 int dma8,
210 int dma16, 210 int dma16,
211 unsigned short hardware, 211 unsigned short hardware,