On Mon, Oct 06, 2014 at 06:54:54PM +0300, Laurent Pinchart wrote:
> 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@xxxxxxxxxxxxxxxx>
Reviewed-by: Felipe Balbi <balbi@xxxxxx>
> ---
> drivers/usb/host/isp1760-hcd.c | 4 ++--
> drivers/usb/host/isp1760-hcd.h | 4 ++--
> drivers/usb/host/isp1760-if.c | 6 +++---
> 3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
> index b93f71d..c9b2bc2 100644
> --- a/drivers/usb/host/isp1760-hcd.c
> +++ b/drivers/usb/host/isp1760-hcd.c
> @@ -2182,7 +2182,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)
hmm, unrelate but this driver is tristate. This __init should go.
> {
> urb_listitem_cachep = kmem_cache_create("isp1760_urb_listitem",
> sizeof(struct urb_listitem), 0, SLAB_TEMPORARY |
> @@ -2209,7 +2209,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 50a7bdd..6e4ccb4 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,
> 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 686aaba..043ba03 100644
> --- a/drivers/usb/host/isp1760-if.c
> +++ b/drivers/usb/host/isp1760-if.c
> @@ -390,7 +390,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)
> @@ -407,7 +407,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);
> @@ -421,6 +421,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);
> --
> 2.0.4
>
--
balbi
Attachment:
signature.asc
Description: Digital signature
