From mboxrd@z Thu Jan 1 00:00:00 1970 From: Randy Dunlap Subject: [PATCH] net/can: rename peak_usb dump_mem function Date: Sun, 02 Sep 2012 10:13:11 -0700 Message-ID: <504393A7.8040007@xenotime.net> References: <1346577700-8156-1-git-send-email-geert@linux-m68k.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: Geert Uytterhoeven , linux-kernel@vger.kernel.org, David Miller , Stephane Grosjean , Wolfgang Grandegger , Marc Kleine-Budde , linux-can@vger.kernel.org To: netdev@vger.kernel.org Return-path: In-Reply-To: <1346577700-8156-1-git-send-email-geert@linux-m68k.org> Sender: linux-can-owner@vger.kernel.org List-Id: netdev.vger.kernel.org From: Randy Dunlap 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 Reported-by: Geert Uytterhoeven Cc: Stephane Grosjean Cc: Wolfgang Grandegger Cc: Marc Kleine-Budde --- 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,