diff options
| author | Geoff Levand <geoffrey.levand@am.sony.com> | 2007-04-30 23:01:01 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-02 12:04:31 +0200 |
| commit | dc4f60c25ae71e8278dcf909486e4aa34de7eecb (patch) | |
| tree | b6715d447588d05038cc1f655874df513d312f86 /drivers/ps3/vuart.c | |
| parent | [POWERPC] PS3: Remove duplicate variable assignement (diff) | |
| download | linux-dc4f60c25ae71e8278dcf909486e4aa34de7eecb.tar.xz linux-dc4f60c25ae71e8278dcf909486e4aa34de7eecb.zip | |
[POWERPC] PS3: Interrupt routine fixups.
Fixups for the ps3 interrupt routines to support all HV device
in a generic way.
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/ps3/vuart.c')
| -rw-r--r-- | drivers/ps3/vuart.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ps3/vuart.c b/drivers/ps3/vuart.c index 7d7cab1d91b4..ec2d36a1bc67 100644 --- a/drivers/ps3/vuart.c +++ b/drivers/ps3/vuart.c @@ -886,12 +886,12 @@ static int ps3_vuart_probe(struct device *_dev) if (++vuart_bus_priv.use_count == 1) { - result = ps3_alloc_vuart_irq(PS3_BINDING_CPU_ANY, + result = ps3_vuart_irq_setup(PS3_BINDING_CPU_ANY, (void*)&vuart_bus_priv.bmp.status, &vuart_bus_priv.virq); if (result) { dev_dbg(&dev->core, - "%s:%d: ps3_alloc_vuart_irq failed (%d)\n", + "%s:%d: ps3_vuart_irq_setup failed (%d)\n", __func__, __LINE__, result); result = -EPERM; goto fail_alloc_irq; @@ -937,7 +937,7 @@ static int ps3_vuart_probe(struct device *_dev) fail_probe: ps3_vuart_set_interrupt_mask(dev, 0); fail_request_irq: - ps3_free_vuart_irq(vuart_bus_priv.virq); + ps3_vuart_irq_destroy(vuart_bus_priv.virq); vuart_bus_priv.virq = NO_IRQ; fail_alloc_irq: --vuart_bus_priv.use_count; @@ -975,7 +975,7 @@ static int ps3_vuart_remove(struct device *_dev) if (--vuart_bus_priv.use_count == 0) { BUG(); free_irq(vuart_bus_priv.virq, &vuart_bus_priv); - ps3_free_vuart_irq(vuart_bus_priv.virq); + ps3_vuart_irq_destroy(vuart_bus_priv.virq); vuart_bus_priv.virq = NO_IRQ; } |