usb: isp1760: Prefix init_kmem_once and deinit_kmem_cache with isp1760_

The two functions are specific to the driver but have very generic
names, subject to collisions. Rename them.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
index aa894a127b2ca542e6ca4707bfb041aeefc17455..0ae1719efb2b3f7237465cee87759ddfc4af5ae9 100644 (file)
--- a/drivers/usb/host/isp1760-hcd.c
+++ b/drivers/usb/host/isp1760-hcd.c
@@ -2177,7 +2177,7 @@ static const struct hc_driver isp1760_hc_driver = {
        .clear_tt_buffer_complete       = isp1760_clear_tt_buffer_complete,
 };
 
-int __init init_kmem_once(void)
+int __init isp1760_init_kmem_once(void)
 {
        urb_listitem_cachep = kmem_cache_create("isp1760_urb_listitem",
                        sizeof(struct urb_listitem), 0, SLAB_TEMPORARY |
@@ -2204,7 +2204,7 @@ int __init init_kmem_once(void)
        return 0;
 }
 
-void deinit_kmem_cache(void)
+void isp1760_deinit_kmem_cache(void)
 {
        kmem_cache_destroy(qtd_cachep);
        kmem_cache_destroy(qh_cachep);

diff --git a/drivers/usb/host/isp1760-hcd.h b/drivers/usb/host/isp1760-hcd.h
index 372d2e5f1210226d764678dbaffebb8402177bd1..f97c9d62559511f681a07f4c2c330c2018e4b308 100644 (file)
--- a/drivers/usb/host/isp1760-hcd.h
+++ b/drivers/usb/host/isp1760-hcd.h
@@ -7,8 +7,8 @@ int isp1760_register(phys_addr_t res_start, resource_size_t res_len, int irq,
                     const char *busname, unsigned int devflags);
 void isp1760_unregister(struct device *dev);
 
-int init_kmem_once(void);
-void deinit_kmem_cache(void);
+int isp1760_init_kmem_once(void);
+void isp1760_deinit_kmem_cache(void);
 
 /* EHCI capability registers */
 #define HC_CAPLENGTH           0x00

diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c
index 03243b0dbe09bc36a3bc6f4e1a2fcdc31c1af6c3..e268b20a1cb0f2be9f90cf0cf1728da48f5fe87e 100644 (file)
--- a/drivers/usb/host/isp1760-if.c
+++ b/drivers/usb/host/isp1760-if.c
@@ -301,7 +301,7 @@ static int __init isp1760_init(void)
 {
        int ret, any_ret = -ENODEV;
 
-       init_kmem_once();
+       isp1760_init_kmem_once();
 
        ret = platform_driver_register(&isp1760_plat_driver);
        if (!ret)
@@ -313,7 +313,7 @@ static int __init isp1760_init(void)
 #endif
 
        if (any_ret)
-               deinit_kmem_cache();
+               isp1760_deinit_kmem_cache();
        return any_ret;
 }
 module_init(isp1760_init);
@@ -324,6 +324,6 @@ static void __exit isp1760_exit(void)
 #ifdef CONFIG_PCI
        pci_unregister_driver(&isp1761_pci_driver);
 #endif
-       deinit_kmem_cache();
+       isp1760_deinit_kmem_cache();
 }
 module_exit(isp1760_exit);