netdev - Re: [PATCH] net/can: rename peak_usb dump

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <505CDF3F.6040009@xenotime.net>
Date:	Fri, 21 Sep 2012 14:42:23 -0700
From:	Randy Dunlap <rdunlap@...otime.net>
To:	Randy Dunlap <rdunlap@...otime.net>
CC:	netdev@...r.kernel.org, Geert Uytterhoeven <geert@...ux-m68k.org>,
	linux-kernel@...r.kernel.org, David Miller <davem@...emloft.net>,
	Stephane Grosjean <s.grosjean@...k-system.com>,
	Wolfgang Grandegger <wg@...ndegger.com>,
	Marc Kleine-Budde <mkl@...gutronix.de>,
	linux-can@...r.kernel.org
Subject: Re: [PATCH] net/can:  rename peak_usb dump_mem function

On 09/02/2012 10:13 AM, Randy Dunlap wrote:

> From: Randy Dunlap <rdunlap@...otime.net>
> 
> Rename generic-sounding function dump_mem() to pcan_dump_mem()
> so that it does not conflict with the dump_mem() function in
> arch/sh/include/asm/kdebug.h.
> 
> drivers/net/can/usb/peak_usb/pcan_usb_core.c: error: conflicting types for 'dump_mem':  => 56:6
> drivers/net/can/usb/peak_usb/pcan_usb_core.h: error: conflicting types for 'dump_mem':  => 134:6
> 
> Not tested.
> 
> Signed-off-by: Randy Dunlap <rdunlap@...otime.net>
> Reported-by: Geert Uytterhoeven <geert@...ux-m68k.org>
> Cc: Stephane Grosjean <s.grosjean@...k-system.com>
> Cc: Wolfgang Grandegger <wg@...ndegger.com>
> Cc: Marc Kleine-Budde <mkl@...gutronix.de>


ping.

> ---
>  drivers/net/can/usb/peak_usb/pcan_usb_core.c |    2 +-
>  drivers/net/can/usb/peak_usb/pcan_usb_core.h |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> --- lnx-36-rc4.orig/drivers/net/can/usb/peak_usb/pcan_usb_core.c
> +++ lnx-36-rc4/drivers/net/can/usb/peak_usb/pcan_usb_core.c
> @@ -53,7 +53,7 @@ static struct peak_usb_adapter *peak_usb
>   * dump memory
>   */
>  #define DUMP_WIDTH	16
> -void dump_mem(char *prompt, void *p, int l)
> +void pcan_dump_mem(char *prompt, void *p, int l)
>  {
>  	pr_info("%s dumping %s (%d bytes):\n",
>  		PCAN_USB_DRIVER_NAME, prompt ? prompt : "memory", l);
> --- lnx-36-rc4.orig/drivers/net/can/usb/peak_usb/pcan_usb_core.h
> +++ lnx-36-rc4/drivers/net/can/usb/peak_usb/pcan_usb_core.h
> @@ -131,7 +131,7 @@ struct peak_usb_device {
>  	struct peak_usb_device *next_siblings;
>  };
>  
> -void dump_mem(char *prompt, void *p, int l);
> +void pcan_dump_mem(char *prompt, void *p, int l);
>  
>  /* common timestamp management */
>  void peak_usb_init_time_ref(struct peak_time_ref *time_ref,
> 



-- 
~Randy
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html