Skip to content

Commit 56b9f30

Browse files
rddunlapmarckleinebudde
authored andcommitted
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: Randy Dunlap <[email protected]> Reported-by: Geert Uytterhoeven <[email protected]> Cc: Stephane Grosjean <[email protected]> Cc: Wolfgang Grandegger <[email protected]> Cc: Marc Kleine-Budde <[email protected]> [mkl: convert all users of dump_mem(), too] Signed-off-by: Marc Kleine-Budde <[email protected]>
1 parent 006cd13 commit 56b9f30

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ static struct peak_usb_adapter *peak_usb_adapters_list[] = {
5353
* dump memory
5454
*/
5555
#define DUMP_WIDTH 16
56-
void dump_mem(char *prompt, void *p, int l)
56+
void pcan_dump_mem(char *prompt, void *p, int l)
5757
{
5858
pr_info("%s dumping %s (%d bytes):\n",
5959
PCAN_USB_DRIVER_NAME, prompt ? prompt : "memory", l);
@@ -203,9 +203,9 @@ static void peak_usb_read_bulk_callback(struct urb *urb)
203203
if (dev->state & PCAN_USB_STATE_STARTED) {
204204
err = dev->adapter->dev_decode_buf(dev, urb);
205205
if (err)
206-
dump_mem("received usb message",
207-
urb->transfer_buffer,
208-
urb->transfer_buffer_length);
206+
pcan_dump_mem("received usb message",
207+
urb->transfer_buffer,
208+
urb->transfer_buffer_length);
209209
}
210210
}
211211

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ struct peak_usb_device {
131131
struct peak_usb_device *next_siblings;
132132
};
133133

134-
void dump_mem(char *prompt, void *p, int l);
134+
void pcan_dump_mem(char *prompt, void *p, int l);
135135

136136
/* common timestamp management */
137137
void peak_usb_init_time_ref(struct peak_time_ref *time_ref,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,8 @@ static int pcan_usb_pro_wait_rsp(struct peak_usb_device *dev,
292292
if (!rec_len) {
293293
netdev_err(dev->netdev,
294294
"got unprocessed record in msg\n");
295-
dump_mem("rcvd rsp msg", pum->u.rec_buffer,
296-
actual_length);
295+
pcan_dump_mem("rcvd rsp msg", pum->u.rec_buffer,
296+
actual_length);
297297
break;
298298
}
299299

@@ -756,8 +756,8 @@ static int pcan_usb_pro_decode_buf(struct peak_usb_device *dev, struct urb *urb)
756756

757757
fail:
758758
if (err)
759-
dump_mem("received msg",
760-
urb->transfer_buffer, urb->actual_length);
759+
pcan_dump_mem("received msg",
760+
urb->transfer_buffer, urb->actual_length);
761761

762762
return err;
763763
}

0 commit comments

Comments
 (0)