From patchwork Sun Sep 2 17:13:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Randy.Dunlap" X-Patchwork-Id: 181202 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2DC752C0093 for ; Mon, 3 Sep 2012 03:14:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754450Ab2IBRNc (ORCPT ); Sun, 2 Sep 2012 13:13:32 -0400 Received: from oproxy11-pub.bluehost.com ([173.254.64.10]:41662 "HELO oproxy11-pub.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754265Ab2IBRNa (ORCPT ); Sun, 2 Sep 2012 13:13:30 -0400 Received: (qmail 10268 invoked by uid 0); 2 Sep 2012 17:13:29 -0000 Received: from unknown (HELO box742.bluehost.com) (66.147.244.242) by oproxy11.bluehost.com with SMTP; 2 Sep 2012 17:13:29 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenotime.net; s=default; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:References:Subject:CC:To:MIME-Version:From:Date:Message-ID; bh=NROYiNwHuO3z7xKQio3wvZsFtiYyzCR5trIElNFaU78=; b=GXqqZcdR88wVKJz6q/nQRjKqaYd5NDQL05W1/eEdcJbrk7OYZes0DIy5UN3hO48W4ZyG75O6fWkM4crgov4fDC3h/ToJmh5g29ACQdJic6XQsq+7++MH1OcTt6SP8QZR; Received: from [50.53.38.135] (port=42238 helo=[192.168.1.2]) by box742.bluehost.com with esmtpsa (TLSv1:CAMELLIA256-SHA:256) (Exim 4.76) (envelope-from ) id 1T8Djl-0000av-Hf; Sun, 02 Sep 2012 11:13:29 -0600 Message-ID: <504393A7.8040007@xenotime.net> Date: Sun, 02 Sep 2012 10:13:11 -0700 From: Randy Dunlap User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110323 Thunderbird/3.1.9 MIME-Version: 1.0 To: netdev@vger.kernel.org CC: Geert Uytterhoeven , linux-kernel@vger.kernel.org, David Miller , Stephane Grosjean , Wolfgang Grandegger , Marc Kleine-Budde , linux-can@vger.kernel.org Subject: [PATCH] net/can: rename peak_usb dump_mem function References: <1346577700-8156-1-git-send-email-geert@linux-m68k.org> In-Reply-To: <1346577700-8156-1-git-send-email-geert@linux-m68k.org> X-Identified-User: {1807:box742.bluehost.com:xenotime:xenotime.net} {sentby:smtp auth 50.53.38.135 authed with rdunlap@xenotime.net} Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: 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(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 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,