musb_hdrc: DEBUG settings irrelevant

DEBUG settings irrelevant; see appended.

Build fixes for musb_hdrc on DaVinci.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c
index a7ab673c58c001e88e8686033ef620c8d35d1510..cbc440be5bbb4a07b4d75f77817e0cf206b6cd4b 100644 (file)
--- a/drivers/usb/musb/cppi_dma.c
+++ b/drivers/usb/musb/cppi_dma.c
@@ -110,7 +110,7 @@ static void __devinit cppi_pool_init(struct cppi *cppi, struct cppi_channel *c)
                struct cppi_descriptor  *bd;
                dma_addr_t              dma;
 
-               bd = dma_pool_alloc(cppi->pool, SLAB_KERNEL, &dma);
+               bd = dma_pool_alloc(cppi->pool, GFP_KERNEL, &dma);
                bd->dma = dma;
                cppi_bd_free(c, bd);
        }

diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index 9e3b0f5543515356dafb4c111ef2d7c34f08e476..36b67f4b201974721a534e56a3f4ce3f9f8b0574 100644 (file)
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -144,12 +144,12 @@ static int vbus_state = -1;
  * With unloaded systems, using the shared workqueue seems to suffice
  * to satisfy the 100msec A_WAIT_VRISE timeout...
  */
-static void evm_deferred_drvvbus(void *_musb)
+static void evm_deferred_drvvbus(struct work_struct *ignored)
 {
        davinci_i2c_expander_op(0x3a, USB_DRVVBUS, vbus_state);
        vbus_state = !vbus_state;
 }
-DECLARE_WORK(evm_vbus_work, evm_deferred_drvvbus, 0);
+DECLARE_WORK(evm_vbus_work, evm_deferred_drvvbus);
 
 #endif /* modified board */
 #endif /* EVM */
@@ -400,11 +400,6 @@ int __devinit musb_platform_init(struct musb *musb)
        if (revision == 0)
                return -ENODEV;
 
-#ifdef CONFIG_MACH_DAVINCI_EVM
-       if (machine_is_davinci_evm())
-               evm_vbus_work.data = musb;
-#endif
-
        if (is_host_enabled(musb))
                setup_timer(&otg_workaround, otg_timer, (unsigned long) musb);