Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56b9f301 authored by Randy Dunlap's avatar Randy Dunlap Committed by Marc Kleine-Budde
Browse files

can: usb: peak: rename peak_usb dump_mem function 



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

Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Reported-by: default avatarGeert 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>
[mkl: convert all users of dump_mem(), too]
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 006cd138

drivers/net/can/usb/peak_usb/pcan_usb_core.c

+4 −4
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static struct peak_usb_adapter *peak_usb_adapters_list[] = { 
 * 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);
@@ -203,7 +203,7 @@ static void peak_usb_read_bulk_callback(struct urb *urb) 
		if (dev->state & PCAN_USB_STATE_STARTED) {

			err = dev->adapter->dev_decode_buf(dev, urb);

			if (err)

				dump_mem("received usb message",

				pcan_dump_mem("received usb message",

					      urb->transfer_buffer,

					      urb->transfer_buffer_length);

		}

drivers/net/can/usb/peak_usb/pcan_usb_core.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/net/can/usb/peak_usb/pcan_usb_pro.c

+4 −4
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static int pcan_usb_pro_wait_rsp(struct peak_usb_device *dev, 
			if (!rec_len) {

				netdev_err(dev->netdev,

					   "got unprocessed record in msg\n");

				dump_mem("rcvd rsp msg", pum->u.rec_buffer,

				pcan_dump_mem("rcvd rsp msg", pum->u.rec_buffer,

					      actual_length);

				break;

			}
@@ -756,7 +756,7 @@ static int pcan_usb_pro_decode_buf(struct peak_usb_device *dev, struct urb *urb) 


fail:

	if (err)

		dump_mem("received msg",

		pcan_dump_mem("received msg",

			      urb->transfer_buffer, urb->actual_length);



	return err;