From patchwork Thu Apr 4 13:54:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2393081 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) by patchwork2.kernel.org (Postfix) with ESMTP id D6247DF25A for ; Thu, 4 Apr 2013 13:58:55 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id r34Dsqtq018126; Thu, 4 Apr 2013 08:54:52 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r34DspTr021969; Thu, 4 Apr 2013 08:54:52 -0500 Received: from dlelxv24.itg.ti.com (172.17.1.199) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.2.342.3; Thu, 4 Apr 2013 08:54:51 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id r34DspJn024153; Thu, 4 Apr 2013 08:54:51 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id B86EF80627; Thu, 4 Apr 2013 07:54:51 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp51.itg.ti.com (dflp51.itg.ti.com [128.247.22.94]) by linux.omap.com (Postfix) with ESMTP id 1C7E580626 for ; Thu, 4 Apr 2013 07:54:51 -0600 (CST) Received: from neches.ext.ti.com (neches.ext.ti.com [192.91.81.29]) by dflp51.itg.ti.com (8.13.7/8.13.8) with ESMTP id r34DsoaI002717 for ; Thu, 4 Apr 2013 08:54:50 -0500 (CDT) Received: from mail6.bemta12.messagelabs.com (mail6.bemta12.messagelabs.com [216.82.250.247]) by neches.ext.ti.com (8.13.7/8.13.7) with ESMTP id r34DsnEx031389 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 4 Apr 2013 08:54:49 -0500 Received: from [216.82.250.51:37459] by server-8.bemta-12.messagelabs.com id 16/67-11537-9268D515; Thu, 04 Apr 2013 13:54:49 +0000 X-Env-Sender: arnd@arndb.de X-Msg-Ref: server-2.tower-108.messagelabs.com!1365083686!10990452!1 X-Originating-IP: [212.227.126.187] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjEyNi4xODcgPT4gNjc1NDE=\n,sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjEyNi4xODcgPT4gNjc1NDE=\n X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6777 invoked from network); 4 Apr 2013 13:54:47 -0000 Received: from moutng.kundenserver.de (HELO moutng.kundenserver.de) (212.227.126.187) by server-2.tower-108.messagelabs.com with RC4-SHA encrypted SMTP; 4 Apr 2013 13:54:47 -0000 Received: from klappe2.localnet (HSI-KBW-46-223-90-92.hsi.kabel-badenwuerttemberg.de [46.223.90.92]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0MFAcd-1UQHjI3OnL-00GGfm; Thu, 04 Apr 2013 15:54:31 +0200 From: Arnd Bergmann To: Subject: [PATCH] i2c: davinci: rename "i2c_recover_bus" function Date: Thu, 4 Apr 2013 13:54:29 +0000 User-Agent: KMail/1.12.2 (Linux/3.8.0-16-generic; KDE/4.3.2; x86_64; ; ) MIME-Version: 1.0 Message-ID: <201304041354.30024.arnd@arndb.de> X-Provags-ID: V02:K0:w65IPadwW5YgIBdojOBOG3x1oY6Dl7o1p1EvFeRlVW0 lqa9adD5Uyes+AyUvf1lspH9EakfMlfbu4IR3r5bNo9yL6OvBr KSD654hpB+KSh2WKmFvJ6/dkbRCgG+FS2N3HnyoHExWirCBgjw PfJZT23qL2lAwy4pZ7WB/oc7FuJNhkKpwIxIQKjKjOdX2E/8dm KcueA2Z9+WDH1xnL88tF1PEAn4xmhuQClxxvCIqhZdp01Z7y46 /XTUKUyX9z4LV2kL4Riiw0aybqpl3LkKsNcObkQ0uYdrkeWLEe wvmpcsahpIqpaz+oluaaiBgy9wojkW9x1oI4tRc/SgUYFc4X1I tRXyASHNQeE18Zq4STL4= CC: Viresh Kumar , , Ben Dooks , Wolfram Sang X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com As of commit 5f9296ba "i2c: Add bus recovery infrastructure", there is now a global function with the same name, which clashes with the davinci specific one. The obvious solution is to rename the function with a davinci prefix. Signed-off-by: Arnd Bergmann Cc: Viresh Kumar Cc: linux-i2c@vger.kernel.org Cc: davinci-linux-open-source@linux.davincidsp.com Cc: Wolfram Sang Cc: Ben Dooks Acked-by: Viresh Kumar diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index 7d1e590..3acc65a 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c @@ -155,7 +155,7 @@ static void generic_i2c_clock_pulse(unsigned int scl_pin) /* This routine does i2c bus recovery as specified in the * i2c protocol Rev. 03 section 3.16 titled "Bus clear" */ -static void i2c_recover_bus(struct davinci_i2c_dev *dev) +static void i2c_davinci_recover_bus(struct davinci_i2c_dev *dev) { u32 flag = 0; struct davinci_i2c_platform_data *pdata = dev->pdata; @@ -289,7 +289,7 @@ static int i2c_davinci_wait_bus_not_busy(struct davinci_i2c_dev *dev, return -ETIMEDOUT; } else { to_cnt = 0; - i2c_recover_bus(dev); + i2c_davinci_recover_bus(dev); i2c_davinci_init(dev); } } @@ -379,7 +379,7 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop) dev->adapter.timeout); if (r == 0) { dev_err(dev->dev, "controller timed out\n"); - i2c_recover_bus(dev); + i2c_davinci_recover_bus(dev); i2c_davinci_init(dev); dev->buf_len = 0; return -ETIMEDOUT;