diff options
Diffstat (limited to 'sound/oss/dmasound/dmasound_awacs.c')
-rw-r--r-- | sound/oss/dmasound/dmasound_awacs.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c index 9ae659f82430..37773b1deea5 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 | ||
@@ -465,7 +465,7 @@ tas_dmasound_init(void) | |||
465 | val = pmac_call_feature(PMAC_FTR_READ_GPIO, NULL, gpio_headphone_detect, 0); | 465 | val = pmac_call_feature(PMAC_FTR_READ_GPIO, NULL, gpio_headphone_detect, 0); |
466 | pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, gpio_headphone_detect, val | 0x80); | 466 | pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, gpio_headphone_detect, val | 0x80); |
467 | /* Trigger it */ | 467 | /* Trigger it */ |
468 | headphone_intr(0,NULL,NULL); | 468 | headphone_intr(0, NULL); |
469 | } | 469 | } |
470 | } | 470 | } |
471 | if (!gpio_headphone_irq) { | 471 | if (!gpio_headphone_irq) { |
@@ -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; |
@@ -1499,7 +1499,7 @@ static int awacs_sleep_notify(struct pmu_sleep_notifier *self, int when) | |||
1499 | write_audio_gpio(gpio_audio_reset, !gpio_audio_reset_pol); | 1499 | write_audio_gpio(gpio_audio_reset, !gpio_audio_reset_pol); |
1500 | msleep(150); | 1500 | msleep(150); |
1501 | tas_leave_sleep(); /* Stub for now */ | 1501 | tas_leave_sleep(); /* Stub for now */ |
1502 | headphone_intr(0,NULL,NULL); | 1502 | headphone_intr(0, NULL); |
1503 | break; | 1503 | break; |
1504 | case AWACS_DACA: | 1504 | case AWACS_DACA: |
1505 | msleep(10); /* Check this !!! */ | 1505 | msleep(10); /* Check this !!! */ |