diff options
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/ehci-ps3.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/ohci-ppc-of.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/ohci-ps3.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c index 93107453f124..37b83ba09969 100644 --- a/drivers/usb/host/ehci-ps3.c +++ b/drivers/usb/host/ehci-ps3.c | |||
@@ -97,7 +97,7 @@ static int ps3_ehci_sb_probe(struct ps3_system_bus_device *dev) | |||
97 | dev_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__, | 97 | dev_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__, |
98 | __LINE__, dev->m_region->lpar_addr); | 98 | __LINE__, dev->m_region->lpar_addr); |
99 | 99 | ||
100 | result = ps3_alloc_io_irq(PS3_BINDING_CPU_ANY, dev->interrupt_id, &virq); | 100 | result = ps3_io_irq_setup(PS3_BINDING_CPU_ANY, dev->interrupt_id, &virq); |
101 | 101 | ||
102 | if (result) { | 102 | if (result) { |
103 | dev_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n", | 103 | dev_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n", |
@@ -155,7 +155,7 @@ fail_add_hcd: | |||
155 | fail_ioremap: | 155 | fail_ioremap: |
156 | usb_put_hcd(hcd); | 156 | usb_put_hcd(hcd); |
157 | fail_create_hcd: | 157 | fail_create_hcd: |
158 | ps3_free_io_irq(virq); | 158 | ps3_io_irq_destroy(virq); |
159 | fail_irq: | 159 | fail_irq: |
160 | ps3_free_mmio_region(dev->m_region); | 160 | ps3_free_mmio_region(dev->m_region); |
161 | fail_mmio: | 161 | fail_mmio: |
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c index 08e237c7bc43..c43b66acd4d5 100644 --- a/drivers/usb/host/ohci-ppc-of.c +++ b/drivers/usb/host/ohci-ppc-of.c | |||
@@ -97,8 +97,8 @@ ohci_hcd_ppc_of_probe(struct of_device *op, const struct of_device_id *match) | |||
97 | return -ENODEV; | 97 | return -ENODEV; |
98 | 98 | ||
99 | is_bigendian = | 99 | is_bigendian = |
100 | device_is_compatible(dn, "ohci-bigendian") || | 100 | of_device_is_compatible(dn, "ohci-bigendian") || |
101 | device_is_compatible(dn, "ohci-be"); | 101 | of_device_is_compatible(dn, "ohci-be"); |
102 | 102 | ||
103 | dev_dbg(&op->dev, "initializing PPC-OF USB Controller\n"); | 103 | dev_dbg(&op->dev, "initializing PPC-OF USB Controller\n"); |
104 | 104 | ||
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c index c849f72b508a..d7cf07288b0b 100644 --- a/drivers/usb/host/ohci-ps3.c +++ b/drivers/usb/host/ohci-ps3.c | |||
@@ -99,7 +99,7 @@ static int ps3_ohci_sb_probe(struct ps3_system_bus_device *dev) | |||
99 | dev_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__, | 99 | dev_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__, |
100 | __LINE__, dev->m_region->lpar_addr); | 100 | __LINE__, dev->m_region->lpar_addr); |
101 | 101 | ||
102 | result = ps3_alloc_io_irq(PS3_BINDING_CPU_ANY, dev->interrupt_id, &virq); | 102 | result = ps3_io_irq_setup(PS3_BINDING_CPU_ANY, dev->interrupt_id, &virq); |
103 | 103 | ||
104 | if (result) { | 104 | if (result) { |
105 | dev_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n", | 105 | dev_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n", |
@@ -157,7 +157,7 @@ fail_add_hcd: | |||
157 | fail_ioremap: | 157 | fail_ioremap: |
158 | usb_put_hcd(hcd); | 158 | usb_put_hcd(hcd); |
159 | fail_create_hcd: | 159 | fail_create_hcd: |
160 | ps3_free_io_irq(virq); | 160 | ps3_io_irq_destroy(virq); |
161 | fail_irq: | 161 | fail_irq: |
162 | ps3_free_mmio_region(dev->m_region); | 162 | ps3_free_mmio_region(dev->m_region); |
163 | fail_mmio: | 163 | fail_mmio: |