projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-2.6'
[powerpc.git]
/
drivers
/
usb
/
host
/
ehci-ps3.c
diff --git
a/drivers/usb/host/ehci-ps3.c
b/drivers/usb/host/ehci-ps3.c
index
4d781a2
..
37b83ba
100644
(file)
--- a/
drivers/usb/host/ehci-ps3.c
+++ b/
drivers/usb/host/ehci-ps3.c
@@
-73,13
+73,6
@@
static const struct hc_driver ps3_ehci_hc_driver = {
#endif
};
#endif
};
-#if !defined(DEBUG)
-#undef dev_dbg
-static inline int __attribute__ ((format (printf, 2, 3))) dev_dbg(
- const struct device *_dev, const char *fmt, ...) {return 0;}
-#endif
-
-
static int ps3_ehci_sb_probe(struct ps3_system_bus_device *dev)
{
int result;
static int ps3_ehci_sb_probe(struct ps3_system_bus_device *dev)
{
int result;
@@
-104,7
+97,7
@@
static int ps3_ehci_sb_probe(struct ps3_system_bus_device *dev)
dev_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__,
__LINE__, dev->m_region->lpar_addr);
dev_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__,
__LINE__, dev->m_region->lpar_addr);
- result = ps3_
alloc_io_irq
(PS3_BINDING_CPU_ANY, dev->interrupt_id, &virq);
+ result = ps3_
io_irq_setup
(PS3_BINDING_CPU_ANY, dev->interrupt_id, &virq);
if (result) {
dev_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n",
if (result) {
dev_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n",
@@
-162,7
+155,7
@@
fail_add_hcd:
fail_ioremap:
usb_put_hcd(hcd);
fail_create_hcd:
fail_ioremap:
usb_put_hcd(hcd);
fail_create_hcd:
- ps3_
free_io_irq
(virq);
+ ps3_
io_irq_destroy
(virq);
fail_irq:
ps3_free_mmio_region(dev->m_region);
fail_mmio:
fail_irq:
ps3_free_mmio_region(dev->m_region);
fail_mmio: