These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / usb / musb / musbhsdma.c

diff --git a/kernel/drivers/usb/musb/musbhsdma.c b/kernel/drivers/usb/musb/musbhsdma.c
index ab7ec09..7539c31 100644 (file)
--- a/kernel/drivers/usb/musb/musbhsdma.c
+++ b/kernel/drivers/usb/musb/musbhsdma.c
@@ -357,7 +357,7 @@ done:
        return retval;
 }
 
-void dma_controller_destroy(struct dma_controller *c)
+void musbhs_dma_controller_destroy(struct dma_controller *c)
 {
        struct musb_dma_controller *controller = container_of(c,
                        struct musb_dma_controller, controller);
@@ -369,8 +369,10 @@ void dma_controller_destroy(struct dma_controller *c)
 
        kfree(controller);
 }
+EXPORT_SYMBOL_GPL(musbhs_dma_controller_destroy);
 
-struct dma_controller *dma_controller_create(struct musb *musb, void __iomem *base)
+struct dma_controller *musbhs_dma_controller_create(struct musb *musb,
+                                                   void __iomem *base)
 {
        struct musb_dma_controller *controller;
        struct device *dev = musb->controller;
@@ -398,7 +400,7 @@ struct dma_controller *dma_controller_create(struct musb *musb, void __iomem *ba
        if (request_irq(irq, dma_controller_irq, 0,
                        dev_name(musb->controller), &controller->controller)) {
                dev_err(dev, "request_irq %d failed!\n", irq);
-               dma_controller_destroy(&controller->controller);
+               musb_dma_controller_destroy(&controller->controller);
 
                return NULL;
        }
@@ -407,3 +409,4 @@ struct dma_controller *dma_controller_create(struct musb *musb, void __iomem *ba
 
        return &controller->controller;
 }
+EXPORT_SYMBOL_GPL(musbhs_dma_controller_create);