* [PATCH] net/can: rename peak_usb dump_mem function [not found] <1346577700-8156-1-git-send-email-geert@linux-m68k.org> @ 2012-09-02 17:13 ` Randy Dunlap 2012-09-03 9:02 ` Marc Kleine-Budde 2012-09-21 21:42 ` Randy Dunlap 0 siblings, 2 replies; 4+ messages in thread From: Randy Dunlap @ 2012-09-02 17:13 UTC (permalink / raw) To: netdev Cc: Geert Uytterhoeven, linux-kernel, David Miller, Stephane Grosjean, Wolfgang Grandegger, Marc Kleine-Budde, linux-can From: Randy Dunlap <rdunlap@xenotime.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@xenotime.net> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Stephane Grosjean <s.grosjean@peak-system.com> Cc: Wolfgang Grandegger <wg@grandegger.com> Cc: Marc Kleine-Budde <mkl@pengutronix.de> --- 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, ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net/can: rename peak_usb dump_mem function 2012-09-02 17:13 ` [PATCH] net/can: rename peak_usb dump_mem function Randy Dunlap @ 2012-09-03 9:02 ` Marc Kleine-Budde 2012-09-21 21:42 ` Randy Dunlap 1 sibling, 0 replies; 4+ messages in thread From: Marc Kleine-Budde @ 2012-09-03 9:02 UTC (permalink / raw) To: Randy Dunlap Cc: netdev, Geert Uytterhoeven, linux-kernel, David Miller, Stephane Grosjean, Wolfgang Grandegger, linux-can [-- Attachment #1: Type: text/plain, Size: 900 bytes --] On 09/02/2012 07:13 PM, Randy Dunlap wrote: > From: Randy Dunlap <rdunlap@xenotime.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. :) I've converted the users of peak's dump_mem() function, too. Now it compiles. Should this go into v3.6, or is v3.7 early enough? Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 259 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net/can: rename peak_usb dump_mem function 2012-09-02 17:13 ` [PATCH] net/can: rename peak_usb dump_mem function Randy Dunlap 2012-09-03 9:02 ` Marc Kleine-Budde @ 2012-09-21 21:42 ` Randy Dunlap 2012-09-21 21:52 ` Marc Kleine-Budde 1 sibling, 1 reply; 4+ messages in thread From: Randy Dunlap @ 2012-09-21 21:42 UTC (permalink / raw) To: Randy Dunlap Cc: netdev, Geert Uytterhoeven, linux-kernel, David Miller, Stephane Grosjean, Wolfgang Grandegger, Marc Kleine-Budde, linux-can On 09/02/2012 10:13 AM, Randy Dunlap wrote: > From: Randy Dunlap <rdunlap@xenotime.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@xenotime.net> > Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> > Cc: Stephane Grosjean <s.grosjean@peak-system.com> > Cc: Wolfgang Grandegger <wg@grandegger.com> > Cc: Marc Kleine-Budde <mkl@pengutronix.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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net/can: rename peak_usb dump_mem function 2012-09-21 21:42 ` Randy Dunlap @ 2012-09-21 21:52 ` Marc Kleine-Budde 0 siblings, 0 replies; 4+ messages in thread From: Marc Kleine-Budde @ 2012-09-21 21:52 UTC (permalink / raw) To: Randy Dunlap Cc: netdev, Geert Uytterhoeven, linux-kernel, David Miller, Stephane Grosjean, Wolfgang Grandegger, linux-can [-- Attachment #1: Type: text/plain, Size: 1214 bytes --] On 09/21/2012 11:42 PM, Randy Dunlap wrote: > On 09/02/2012 10:13 AM, Randy Dunlap wrote: > >> From: Randy Dunlap <rdunlap@xenotime.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@xenotime.net> >> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> >> Cc: Stephane Grosjean <s.grosjean@peak-system.com> >> Cc: Wolfgang Grandegger <wg@grandegger.com> >> Cc: Marc Kleine-Budde <mkl@pengutronix.de> > > > ping. The patch is already part of can-next and will be included in the next pull request to David. regards, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 259 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-09-21 21:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1346577700-8156-1-git-send-email-geert@linux-m68k.org>
2012-09-02 17:13 ` [PATCH] net/can: rename peak_usb dump_mem function Randy Dunlap
2012-09-03 9:02 ` Marc Kleine-Budde
2012-09-21 21:42 ` Randy Dunlap
2012-09-21 21:52 ` Marc Kleine-Budde
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).