diff options
Diffstat (limited to 'sound/oss/dmasound/dmasound_awacs.c')
-rw-r--r-- | sound/oss/dmasound/dmasound_awacs.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c index 9ae659f82430..3bd19c36fcd9 100644 --- a/sound/oss/dmasound/dmasound_awacs.c +++ b/sound/oss/dmasound/dmasound_awacs.c | |||
@@ -281,9 +281,9 @@ static int PMacSetFormat(int format); | |||
281 | static int PMacSetVolume(int volume); | 281 | static int PMacSetVolume(int volume); |
282 | static void PMacPlay(void); | 282 | static void PMacPlay(void); |
283 | static void PMacRecord(void); | 283 | static void PMacRecord(void); |
284 | static irqreturn_t pmac_awacs_tx_intr(int irq, void *devid, struct pt_regs *regs); | 284 | static irqreturn_t pmac_awacs_tx_intr(int irq, void *devid); |
285 | static irqreturn_t pmac_awacs_rx_intr(int irq, void *devid, struct pt_regs *regs); | 285 | static irqreturn_t pmac_awacs_rx_intr(int irq, void *devid); |
286 | static irqreturn_t pmac_awacs_intr(int irq, void *devid, struct pt_regs *regs); | 286 | static irqreturn_t pmac_awacs_intr(int irq, void *devid); |
287 | static void awacs_write(int val); | 287 | static void awacs_write(int val); |
288 | static int awacs_get_volume(int reg, int lshift); | 288 | static int awacs_get_volume(int reg, int lshift); |
289 | static int awacs_volume_setter(int volume, int n, int mute, int lshift); | 289 | static int awacs_volume_setter(int volume, int n, int mute, int lshift); |
@@ -398,7 +398,7 @@ read_audio_gpio(int gpio_addr) | |||
398 | * Headphone interrupt via GPIO (Tumbler, Snapper, DACA) | 398 | * Headphone interrupt via GPIO (Tumbler, Snapper, DACA) |
399 | */ | 399 | */ |
400 | static irqreturn_t | 400 | static irqreturn_t |
401 | headphone_intr(int irq, void *devid, struct pt_regs *regs) | 401 | headphone_intr(int irq, void *devid) |
402 | { | 402 | { |
403 | unsigned long flags; | 403 | unsigned long flags; |
404 | 404 | ||
@@ -1037,7 +1037,7 @@ static void PMacRecord(void) | |||
1037 | */ | 1037 | */ |
1038 | 1038 | ||
1039 | static irqreturn_t | 1039 | static irqreturn_t |
1040 | pmac_awacs_tx_intr(int irq, void *devid, struct pt_regs *regs) | 1040 | pmac_awacs_tx_intr(int irq, void *devid) |
1041 | { | 1041 | { |
1042 | int i = write_sq.front; | 1042 | int i = write_sq.front; |
1043 | int stat; | 1043 | int stat; |
@@ -1129,7 +1129,7 @@ printk("dmasound_pmac: tx-irq: xfer died - patching it up...\n") ; | |||
1129 | 1129 | ||
1130 | 1130 | ||
1131 | static irqreturn_t | 1131 | static irqreturn_t |
1132 | pmac_awacs_rx_intr(int irq, void *devid, struct pt_regs *regs) | 1132 | pmac_awacs_rx_intr(int irq, void *devid) |
1133 | { | 1133 | { |
1134 | int stat ; | 1134 | int stat ; |
1135 | /* For some reason on my PowerBook G3, I get one interrupt | 1135 | /* For some reason on my PowerBook G3, I get one interrupt |
@@ -1212,7 +1212,7 @@ printk("dmasound_pmac: rx-irq: DIED - attempting resurection\n"); | |||
1212 | 1212 | ||
1213 | 1213 | ||
1214 | static irqreturn_t | 1214 | static irqreturn_t |
1215 | pmac_awacs_intr(int irq, void *devid, struct pt_regs *regs) | 1215 | pmac_awacs_intr(int irq, void *devid) |
1216 | { | 1216 | { |
1217 | int ctrl; | 1217 | int ctrl; |
1218 | int status; | 1218 | int status; |