diff options
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) | |||
886 | 886 | ||
887 | if (++vuart_bus_priv.use_count == 1) { | 887 | if (++vuart_bus_priv.use_count == 1) { |
888 | 888 | ||
889 | result = ps3_alloc_vuart_irq(PS3_BINDING_CPU_ANY, | 889 | result = ps3_vuart_irq_setup(PS3_BINDING_CPU_ANY, |
890 | (void*)&vuart_bus_priv.bmp.status, &vuart_bus_priv.virq); | 890 | (void*)&vuart_bus_priv.bmp.status, &vuart_bus_priv.virq); |
891 | 891 | ||
892 | if (result) { | 892 | if (result) { |
893 | dev_dbg(&dev->core, | 893 | dev_dbg(&dev->core, |
894 | "%s:%d: ps3_alloc_vuart_irq failed (%d)\n", | 894 | "%s:%d: ps3_vuart_irq_setup failed (%d)\n", |
895 | __func__, __LINE__, result); | 895 | __func__, __LINE__, result); |
896 | result = -EPERM; | 896 | result = -EPERM; |
897 | goto fail_alloc_irq; | 897 | goto fail_alloc_irq; |
@@ -937,7 +937,7 @@ static int ps3_vuart_probe(struct device *_dev) | |||
937 | fail_probe: | 937 | fail_probe: |
938 | ps3_vuart_set_interrupt_mask(dev, 0); | 938 | ps3_vuart_set_interrupt_mask(dev, 0); |
939 | fail_request_irq: | 939 | fail_request_irq: |
940 | ps3_free_vuart_irq(vuart_bus_priv.virq); | 940 | ps3_vuart_irq_destroy(vuart_bus_priv.virq); |
941 | vuart_bus_priv.virq = NO_IRQ; | 941 | vuart_bus_priv.virq = NO_IRQ; |
942 | fail_alloc_irq: | 942 | fail_alloc_irq: |
943 | --vuart_bus_priv.use_count; | 943 | --vuart_bus_priv.use_count; |
@@ -975,7 +975,7 @@ static int ps3_vuart_remove(struct device *_dev) | |||
975 | if (--vuart_bus_priv.use_count == 0) { | 975 | if (--vuart_bus_priv.use_count == 0) { |
976 | BUG(); | 976 | BUG(); |
977 | free_irq(vuart_bus_priv.virq, &vuart_bus_priv); | 977 | free_irq(vuart_bus_priv.virq, &vuart_bus_priv); |
978 | ps3_free_vuart_irq(vuart_bus_priv.virq); | 978 | ps3_vuart_irq_destroy(vuart_bus_priv.virq); |
979 | vuart_bus_priv.virq = NO_IRQ; | 979 | vuart_bus_priv.virq = NO_IRQ; |
980 | } | 980 | } |
981 | 981 | ||