{"id":807425,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807425/?format=json","project":{"id":35,"url":"http://patchwork.ozlabs.org/api/1.0/projects/35/?format=json","name":"Linux I2C development","link_name":"linux-i2c","list_id":"linux-i2c.vger.kernel.org","list_email":"linux-i2c@vger.kernel.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<1504073857-122449-4-git-send-email-preid@electromag.com.au>","date":"2017-08-30T06:17:36","name":"[v3,3/4] i2c: designware: rename i2c_dw_plat_prepare_clk to i2c_dw_prepare_clk","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"b7fea130f35cb0c82cf5e0b1bad8554dd5481c0d","submitter":{"id":66145,"url":"http://patchwork.ozlabs.org/api/1.0/people/66145/?format=json","name":"Phil Reid","email":"preid@electromag.com.au"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-i2c/patch/1504073857-122449-4-git-send-email-preid@electromag.com.au/mbox/","series":[{"id":531,"url":"http://patchwork.ozlabs.org/api/1.0/series/531/?format=json","date":"2017-08-30T06:17:35","name":"i2c: designware: add i2c gpio recovery option","version":3,"mbox":"http://patchwork.ozlabs.org/series/531/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807425/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=linux-i2c-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xhwKS4wcwz9t0M\n\tfor ;\n\tWed, 30 Aug 2017 16:17:48 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1750851AbdH3GRp (ORCPT );\n\tWed, 30 Aug 2017 02:17:45 -0400","from anchovy3.45ru.net.au ([203.30.46.155]:45732 \"EHLO\n\tanchovy.45ru.net.au\" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org\n\twith ESMTP id S1750835AbdH3GRo (ORCPT\n\t); Wed, 30 Aug 2017 02:17:44 -0400","(qmail 1146 invoked by uid 5089); 30 Aug 2017 06:17:41 -0000","by simscan 1.2.0 ppid: 1088, pid: 1090, t: 0.0273s\n\tscanners: regex: 1.2.0 attach: 1.2.0 clamav: 0.88.3/m:40/d:1950","from unknown (HELO preid-centos7.electromag.com.au)\n\t(preid@electromag.com.au@203.59.230.133)\n\tby anchovy2.45ru.net.au with ESMTPA; 30 Aug 2017 06:17:41 -0000","by preid-centos7.electromag.com.au (Postfix, from userid 1000)\n\tid 38BA3333CE9F9; Wed, 30 Aug 2017 14:17:40 +0800 (AWST)"],"X-RBL":"$rbltext","From":"Phil Reid ","To":"jarkko.nikula@linux.intel.com, andriy.shevchenko@linux.intel.com,\n\tmika.westerberg@linux.intel.com, wsa@the-dreams.de,\n\ttim@krieglstein.org, preid@electromag.com.au, linux-i2c@vger.kernel.org","Subject":"[PATCH v3 3/4] i2c: designware: rename i2c_dw_plat_prepare_clk to\n\ti2c_dw_prepare_clk","Date":"Wed, 30 Aug 2017 14:17:36 +0800","Message-Id":"<1504073857-122449-4-git-send-email-preid@electromag.com.au>","X-Mailer":"git-send-email 1.8.3.1","In-Reply-To":"<1504073857-122449-1-git-send-email-preid@electromag.com.au>","References":"<1504073857-122449-1-git-send-email-preid@electromag.com.au>","Sender":"linux-i2c-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"linux-i2c@vger.kernel.org"},"content":"For consistency with the reset of the file rename function and parameter to\nbe consistent with the reset of the common file.\n\nSigned-off-by: Phil Reid \n---\n drivers/i2c/busses/i2c-designware-common.c | 10 +++++-----\n drivers/i2c/busses/i2c-designware-core.h | 2 +-\n drivers/i2c/busses/i2c-designware-platdrv.c | 6 +++---\n 3 files changed, 9 insertions(+), 9 deletions(-)","diff":"diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c\nindex b79f342..3d684c6 100644\n--- a/drivers/i2c/busses/i2c-designware-common.c\n+++ b/drivers/i2c/busses/i2c-designware-common.c\n@@ -186,15 +186,15 @@ unsigned long i2c_dw_clk_rate(struct dw_i2c_dev *dev)\n \treturn dev->get_clk_rate_khz(dev);\n }\n \n-int i2c_dw_plat_prepare_clk(struct dw_i2c_dev *i_dev, bool prepare)\n+int i2c_dw_prepare_clk(struct dw_i2c_dev *dev, bool prepare)\n {\n-\tif (IS_ERR(i_dev->clk))\n-\t\treturn PTR_ERR(i_dev->clk);\n+\tif (IS_ERR(dev->clk))\n+\t\treturn PTR_ERR(dev->clk);\n \n \tif (prepare)\n-\t\treturn clk_prepare_enable(i_dev->clk);\n+\t\treturn clk_prepare_enable(dev->clk);\n \n-\tclk_disable_unprepare(i_dev->clk);\n+\tclk_disable_unprepare(dev->clk);\n \treturn 0;\n }\n \ndiff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h\nindex b2a31cb..fef44b5 100644\n--- a/drivers/i2c/busses/i2c-designware-core.h\n+++ b/drivers/i2c/busses/i2c-designware-core.h\n@@ -299,7 +299,7 @@ struct dw_i2c_dev {\n void __i2c_dw_enable(struct dw_i2c_dev *dev, bool enable);\n void __i2c_dw_enable_and_wait(struct dw_i2c_dev *dev, bool enable);\n unsigned long i2c_dw_clk_rate(struct dw_i2c_dev *dev);\n-int i2c_dw_plat_prepare_clk(struct dw_i2c_dev *i_dev, bool prepare);\n+int i2c_dw_prepare_clk(struct dw_i2c_dev *dev, bool prepare);\n int i2c_dw_acquire_lock(struct dw_i2c_dev *dev);\n void i2c_dw_release_lock(struct dw_i2c_dev *dev);\n int i2c_dw_wait_bus_not_busy(struct dw_i2c_dev *dev);\ndiff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c\nindex 14e7fab..58f55a8 100644\n--- a/drivers/i2c/busses/i2c-designware-platdrv.c\n+++ b/drivers/i2c/busses/i2c-designware-platdrv.c\n@@ -325,7 +325,7 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)\n \t\ti2c_dw_configure_master(dev);\n \n \tdev->clk = devm_clk_get(&pdev->dev, NULL);\n-\tif (!i2c_dw_plat_prepare_clk(dev, true)) {\n+\tif (!i2c_dw_prepare_clk(dev, true)) {\n \t\tdev->get_clk_rate_khz = i2c_dw_get_clk_rate_khz;\n \n \t\tif (!dev->sda_hold_time && ht)\n@@ -422,7 +422,7 @@ static int dw_i2c_plat_runtime_suspend(struct device *dev)\n \tstruct dw_i2c_dev *i_dev = dev_get_drvdata(dev);\n \n \ti_dev->disable(i_dev);\n-\ti2c_dw_plat_prepare_clk(i_dev, false);\n+\ti2c_dw_prepare_clk(i_dev, false);\n \n \treturn 0;\n }\n@@ -431,7 +431,7 @@ static int dw_i2c_plat_resume(struct device *dev)\n {\n \tstruct dw_i2c_dev *i_dev = dev_get_drvdata(dev);\n \n-\ti2c_dw_plat_prepare_clk(i_dev, true);\n+\ti2c_dw_prepare_clk(i_dev, true);\n \ti_dev->init(i_dev);\n \n \treturn 0;\n","prefixes":["v3","3/4"]}