diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/ide | |
parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-io.c | 2 | ||||
-rw-r--r-- | drivers/ide/legacy/hd.c | 2 | ||||
-rw-r--r-- | drivers/ide/legacy/macide.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index ba6039b55b41..2614f41b5074 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
@@ -1562,7 +1562,7 @@ static void unexpected_intr (int irq, ide_hwgroup_t *hwgroup) | |||
1562 | * on the hwgroup and the process begins again. | 1562 | * on the hwgroup and the process begins again. |
1563 | */ | 1563 | */ |
1564 | 1564 | ||
1565 | irqreturn_t ide_intr (int irq, void *dev_id, struct pt_regs *regs) | 1565 | irqreturn_t ide_intr (int irq, void *dev_id) |
1566 | { | 1566 | { |
1567 | unsigned long flags; | 1567 | unsigned long flags; |
1568 | ide_hwgroup_t *hwgroup = (ide_hwgroup_t *)dev_id; | 1568 | ide_hwgroup_t *hwgroup = (ide_hwgroup_t *)dev_id; |
diff --git a/drivers/ide/legacy/hd.c b/drivers/ide/legacy/hd.c index 4ab931145673..b1d5291531b7 100644 --- a/drivers/ide/legacy/hd.c +++ b/drivers/ide/legacy/hd.c | |||
@@ -673,7 +673,7 @@ static int hd_getgeo(struct block_device *bdev, struct hd_geometry *geo) | |||
673 | * be forgotten about... | 673 | * be forgotten about... |
674 | */ | 674 | */ |
675 | 675 | ||
676 | static irqreturn_t hd_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 676 | static irqreturn_t hd_interrupt(int irq, void *dev_id) |
677 | { | 677 | { |
678 | void (*handler)(void) = do_hd; | 678 | void (*handler)(void) = do_hd; |
679 | 679 | ||
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c index d655da749144..b1730d7e414c 100644 --- a/drivers/ide/legacy/macide.c +++ b/drivers/ide/legacy/macide.c | |||
@@ -78,7 +78,7 @@ int macide_ack_intr(ide_hwif_t* hwif) | |||
78 | } | 78 | } |
79 | 79 | ||
80 | #ifdef CONFIG_BLK_DEV_MAC_MEDIABAY | 80 | #ifdef CONFIG_BLK_DEV_MAC_MEDIABAY |
81 | static void macide_mediabay_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 81 | static void macide_mediabay_interrupt(int irq, void *dev_id) |
82 | { | 82 | { |
83 | int state = baboon->mb_status & 0x04; | 83 | int state = baboon->mb_status & 0x04; |
84 | 84 | ||