aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2015-01-20 17:55:49 -0500
committerFelipe Balbi <balbi@ti.com>2015-01-27 10:38:41 -0500
commit5a6356ac62c8fa732e260123feb73655f7d919e6 (patch)
tree6a62adb73d154a66d2b9e6b61facec023d789679 /drivers
parent30573751daf60835ad1dba8b040b6a345f49120a (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/host/isp1760-hcd.c4
-rw-r--r--drivers/usb/host/isp1760-hcd.h4
-rw-r--r--drivers/usb/host/isp1760-if.c6
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
index aa894a127b2c..0ae1719efb2b 100644
--- 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 = {
2177 .clear_tt_buffer_complete = isp1760_clear_tt_buffer_complete, 2177 .clear_tt_buffer_complete = isp1760_clear_tt_buffer_complete,
2178}; 2178};
2179 2179
2180int __init init_kmem_once(void) 2180int __init isp1760_init_kmem_once(void)
2181{ 2181{
2182 urb_listitem_cachep = kmem_cache_create("isp1760_urb_listitem", 2182 urb_listitem_cachep = kmem_cache_create("isp1760_urb_listitem",
2183 sizeof(struct urb_listitem), 0, SLAB_TEMPORARY | 2183 sizeof(struct urb_listitem), 0, SLAB_TEMPORARY |
@@ -2204,7 +2204,7 @@ int __init init_kmem_once(void)
2204 return 0; 2204 return 0;
2205} 2205}
2206 2206
2207void deinit_kmem_cache(void) 2207void isp1760_deinit_kmem_cache(void)
2208{ 2208{
2209 kmem_cache_destroy(qtd_cachep); 2209 kmem_cache_destroy(qtd_cachep);
2210 kmem_cache_destroy(qh_cachep); 2210 kmem_cache_destroy(qh_cachep);
diff --git a/drivers/usb/host/isp1760-hcd.h b/drivers/usb/host/isp1760-hcd.h
index 372d2e5f1210..f97c9d625595 100644
--- 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,
7 const char *busname, unsigned int devflags); 7 const char *busname, unsigned int devflags);
8void isp1760_unregister(struct device *dev); 8void isp1760_unregister(struct device *dev);
9 9
10int init_kmem_once(void); 10int isp1760_init_kmem_once(void);
11void deinit_kmem_cache(void); 11void isp1760_deinit_kmem_cache(void);
12 12
13/* EHCI capability registers */ 13/* EHCI capability registers */
14#define HC_CAPLENGTH 0x00 14#define HC_CAPLENGTH 0x00
diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c
index 03243b0dbe09..e268b20a1cb0 100644
--- a/drivers/usb/host/isp1760-if.c
+++ b/drivers/usb/host/isp1760-if.c
@@ -301,7 +301,7 @@ static int __init isp1760_init(void)
301{ 301{
302 int ret, any_ret = -ENODEV; 302 int ret, any_ret = -ENODEV;
303 303
304 init_kmem_once(); 304 isp1760_init_kmem_once();
305 305
306 ret = platform_driver_register(&isp1760_plat_driver); 306 ret = platform_driver_register(&isp1760_plat_driver);
307 if (!ret) 307 if (!ret)
@@ -313,7 +313,7 @@ static int __init isp1760_init(void)
313#endif 313#endif
314 314
315 if (any_ret) 315 if (any_ret)
316 deinit_kmem_cache(); 316 isp1760_deinit_kmem_cache();
317 return any_ret; 317 return any_ret;
318} 318}
319module_init(isp1760_init); 319module_init(isp1760_init);
@@ -324,6 +324,6 @@ static void __exit isp1760_exit(void)
324#ifdef CONFIG_PCI 324#ifdef CONFIG_PCI
325 pci_unregister_driver(&isp1761_pci_driver); 325 pci_unregister_driver(&isp1761_pci_driver);
326#endif 326#endif
327 deinit_kmem_cache(); 327 isp1760_deinit_kmem_cache();
328} 328}
329module_exit(isp1760_exit); 329module_exit(isp1760_exit);