From: Sowjanya Komatineni <skomatineni@nvidia.com> To: skomatineni@nvidia.com, thierry.reding@gmail.com, jonathanh@nvidia.com, frankc@nvidia.com, hverkuil@xs4all.nl, sakari.ailus@iki.fi, robh+dt@kernel.org, helen.koike@collabora.com Cc: digetx@gmail.com, sboyd@kernel.org, gregkh@linuxfoundation.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org Subject: [RFC PATCH v3 04/18] i2c: tegra: Remove NULL pointer check before clk_enable/disable/prepare/unprepare Date: Tue, 14 Jul 2020 21:20:41 -0700 [thread overview] Message-ID: <1594786855-26506-5-git-send-email-skomatineni@nvidia.com> (raw) In-Reply-To: <1594786855-26506-1-git-send-email-skomatineni@nvidia.com> clk_enable, clk_disable, clk_prepare, and clk_unprepare APIs have implementation for checking clk pointer not NULL and clock consumers can safely call these APIs without NULL pointer check. So, this patch cleans up Tegra i2c driver to remove explicit checks before these APIs. Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com> --- drivers/i2c/busses/i2c-tegra.c | 64 +++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 41 deletions(-) diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index 3be1018..c91307b9 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -655,21 +655,17 @@ static int __maybe_unused tegra_i2c_runtime_resume(struct device *dev) if (ret) return ret; - if (!i2c_dev->hw->has_single_clk_source) { - ret = clk_enable(i2c_dev->fast_clk); - if (ret < 0) { - dev_err(i2c_dev->dev, - "Enabling fast clk failed, err %d\n", ret); - return ret; - } + ret = clk_enable(i2c_dev->fast_clk); + if (ret < 0) { + dev_err(i2c_dev->dev, + "Enabling fast clk failed, err %d\n", ret); + return ret; } - if (i2c_dev->slow_clk) { - ret = clk_enable(i2c_dev->slow_clk); - if (ret < 0) { - dev_err(dev, "failed to enable slow clock: %d\n", ret); - return ret; - } + ret = clk_enable(i2c_dev->slow_clk); + if (ret < 0) { + dev_err(dev, "failed to enable slow clock: %d\n", ret); + return ret; } ret = clk_enable(i2c_dev->div_clk); @@ -688,12 +684,8 @@ static int __maybe_unused tegra_i2c_runtime_suspend(struct device *dev) struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev); clk_disable(i2c_dev->div_clk); - - if (i2c_dev->slow_clk) - clk_disable(i2c_dev->slow_clk); - - if (!i2c_dev->hw->has_single_clk_source) - clk_disable(i2c_dev->fast_clk); + clk_disable(i2c_dev->slow_clk); + clk_disable(i2c_dev->fast_clk); return pinctrl_pm_select_idle_state(i2c_dev->dev); } @@ -1716,20 +1708,16 @@ static int tegra_i2c_probe(struct platform_device *pdev) platform_set_drvdata(pdev, i2c_dev); - if (!i2c_dev->hw->has_single_clk_source) { - ret = clk_prepare(i2c_dev->fast_clk); - if (ret < 0) { - dev_err(i2c_dev->dev, "Clock prepare failed %d\n", ret); - return ret; - } + ret = clk_prepare(i2c_dev->fast_clk); + if (ret < 0) { + dev_err(i2c_dev->dev, "Clock prepare failed %d\n", ret); + return ret; } - if (i2c_dev->slow_clk) { - ret = clk_prepare(i2c_dev->slow_clk); - if (ret < 0) { - dev_err(dev, "failed to prepare slow clock: %d\n", ret); - goto unprepare_fast_clk; - } + ret = clk_prepare(i2c_dev->slow_clk); + if (ret < 0) { + dev_err(dev, "failed to prepare slow clock: %d\n", ret); + goto unprepare_fast_clk; } if (i2c_dev->bus_clk_rate > I2C_MAX_FAST_MODE_FREQ && @@ -1843,12 +1831,10 @@ static int tegra_i2c_probe(struct platform_device *pdev) clk_unprepare(i2c_dev->div_clk); unprepare_slow_clk: - if (i2c_dev->is_vi) - clk_unprepare(i2c_dev->slow_clk); + clk_unprepare(i2c_dev->slow_clk); unprepare_fast_clk: - if (!i2c_dev->hw->has_single_clk_source) - clk_unprepare(i2c_dev->fast_clk); + clk_unprepare(i2c_dev->fast_clk); return ret; } @@ -1867,12 +1853,8 @@ static int tegra_i2c_remove(struct platform_device *pdev) tegra_i2c_runtime_suspend(&pdev->dev); clk_unprepare(i2c_dev->div_clk); - - if (i2c_dev->slow_clk) - clk_unprepare(i2c_dev->slow_clk); - - if (!i2c_dev->hw->has_single_clk_source) - clk_unprepare(i2c_dev->fast_clk); + clk_unprepare(i2c_dev->slow_clk); + clk_unprepare(i2c_dev->fast_clk); tegra_i2c_release_dma(i2c_dev); return 0; -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Sowjanya Komatineni <skomatineni@nvidia.com> To: <skomatineni@nvidia.com>, <thierry.reding@gmail.com>, <jonathanh@nvidia.com>, <frankc@nvidia.com>, <hverkuil@xs4all.nl>, <sakari.ailus@iki.fi>, <robh+dt@kernel.org>, <helen.koike@collabora.com> Cc: <digetx@gmail.com>, <sboyd@kernel.org>, <gregkh@linuxfoundation.org>, <linux-media@vger.kernel.org>, <devicetree@vger.kernel.org>, <linux-tegra@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-i2c@vger.kernel.org> Subject: [RFC PATCH v3 04/18] i2c: tegra: Remove NULL pointer check before clk_enable/disable/prepare/unprepare Date: Tue, 14 Jul 2020 21:20:41 -0700 [thread overview] Message-ID: <1594786855-26506-5-git-send-email-skomatineni@nvidia.com> (raw) In-Reply-To: <1594786855-26506-1-git-send-email-skomatineni@nvidia.com> clk_enable, clk_disable, clk_prepare, and clk_unprepare APIs have implementation for checking clk pointer not NULL and clock consumers can safely call these APIs without NULL pointer check. So, this patch cleans up Tegra i2c driver to remove explicit checks before these APIs. Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com> --- drivers/i2c/busses/i2c-tegra.c | 64 +++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 41 deletions(-) diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index 3be1018..c91307b9 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -655,21 +655,17 @@ static int __maybe_unused tegra_i2c_runtime_resume(struct device *dev) if (ret) return ret; - if (!i2c_dev->hw->has_single_clk_source) { - ret = clk_enable(i2c_dev->fast_clk); - if (ret < 0) { - dev_err(i2c_dev->dev, - "Enabling fast clk failed, err %d\n", ret); - return ret; - } + ret = clk_enable(i2c_dev->fast_clk); + if (ret < 0) { + dev_err(i2c_dev->dev, + "Enabling fast clk failed, err %d\n", ret); + return ret; } - if (i2c_dev->slow_clk) { - ret = clk_enable(i2c_dev->slow_clk); - if (ret < 0) { - dev_err(dev, "failed to enable slow clock: %d\n", ret); - return ret; - } + ret = clk_enable(i2c_dev->slow_clk); + if (ret < 0) { + dev_err(dev, "failed to enable slow clock: %d\n", ret); + return ret; } ret = clk_enable(i2c_dev->div_clk); @@ -688,12 +684,8 @@ static int __maybe_unused tegra_i2c_runtime_suspend(struct device *dev) struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev); clk_disable(i2c_dev->div_clk); - - if (i2c_dev->slow_clk) - clk_disable(i2c_dev->slow_clk); - - if (!i2c_dev->hw->has_single_clk_source) - clk_disable(i2c_dev->fast_clk); + clk_disable(i2c_dev->slow_clk); + clk_disable(i2c_dev->fast_clk); return pinctrl_pm_select_idle_state(i2c_dev->dev); } @@ -1716,20 +1708,16 @@ static int tegra_i2c_probe(struct platform_device *pdev) platform_set_drvdata(pdev, i2c_dev); - if (!i2c_dev->hw->has_single_clk_source) { - ret = clk_prepare(i2c_dev->fast_clk); - if (ret < 0) { - dev_err(i2c_dev->dev, "Clock prepare failed %d\n", ret); - return ret; - } + ret = clk_prepare(i2c_dev->fast_clk); + if (ret < 0) { + dev_err(i2c_dev->dev, "Clock prepare failed %d\n", ret); + return ret; } - if (i2c_dev->slow_clk) { - ret = clk_prepare(i2c_dev->slow_clk); - if (ret < 0) { - dev_err(dev, "failed to prepare slow clock: %d\n", ret); - goto unprepare_fast_clk; - } + ret = clk_prepare(i2c_dev->slow_clk); + if (ret < 0) { + dev_err(dev, "failed to prepare slow clock: %d\n", ret); + goto unprepare_fast_clk; } if (i2c_dev->bus_clk_rate > I2C_MAX_FAST_MODE_FREQ && @@ -1843,12 +1831,10 @@ static int tegra_i2c_probe(struct platform_device *pdev) clk_unprepare(i2c_dev->div_clk); unprepare_slow_clk: - if (i2c_dev->is_vi) - clk_unprepare(i2c_dev->slow_clk); + clk_unprepare(i2c_dev->slow_clk); unprepare_fast_clk: - if (!i2c_dev->hw->has_single_clk_source) - clk_unprepare(i2c_dev->fast_clk); + clk_unprepare(i2c_dev->fast_clk); return ret; } @@ -1867,12 +1853,8 @@ static int tegra_i2c_remove(struct platform_device *pdev) tegra_i2c_runtime_suspend(&pdev->dev); clk_unprepare(i2c_dev->div_clk); - - if (i2c_dev->slow_clk) - clk_unprepare(i2c_dev->slow_clk); - - if (!i2c_dev->hw->has_single_clk_source) - clk_unprepare(i2c_dev->fast_clk); + clk_unprepare(i2c_dev->slow_clk); + clk_unprepare(i2c_dev->fast_clk); tegra_i2c_release_dma(i2c_dev); return 0; -- 2.7.4
next prev parent reply other threads:[~2020-07-15 4:20 UTC|newest] Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-15 4:20 [RFC PATCH v3 00/18] Support for Tegra video capture from external sensor Sowjanya Komatineni 2020-07-15 4:20 ` Sowjanya Komatineni 2020-07-15 4:20 ` [RFC PATCH v3 02/18] arm64: tegra: Add missing clocks and power-domains to Tegra210 VI I2C Sowjanya Komatineni 2020-07-15 4:20 ` Sowjanya Komatineni [not found] ` <1594786855-26506-3-git-send-email-skomatineni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2020-07-16 13:25 ` Thierry Reding 2020-07-16 13:25 ` Thierry Reding 2020-07-15 4:20 ` Sowjanya Komatineni [this message] 2020-07-15 4:20 ` [RFC PATCH v3 04/18] i2c: tegra: Remove NULL pointer check before clk_enable/disable/prepare/unprepare Sowjanya Komatineni 2020-07-16 20:25 ` Dmitry Osipenko 2020-07-15 4:20 ` [RFC PATCH v3 05/18] i2c: tegra: Fix the error path in tegra_i2c_runtime_resume Sowjanya Komatineni 2020-07-15 4:20 ` Sowjanya Komatineni 2020-07-15 4:20 ` [RFC PATCH v3 07/18] i2c: tegra: Avoid tegra_i2c_init_dma() for Tegra210 vi i2c Sowjanya Komatineni 2020-07-15 4:20 ` Sowjanya Komatineni 2020-07-15 4:20 ` [RFC PATCH v3 09/18] media: tegra-video: Enable TPG based on kernel config Sowjanya Komatineni 2020-07-15 4:20 ` Sowjanya Komatineni 2020-07-15 4:20 ` [RFC PATCH v3 12/18] media: tegra-video: Add support for external sensor capture Sowjanya Komatineni 2020-07-15 4:20 ` Sowjanya Komatineni 2020-07-15 4:20 ` [RFC PATCH v3 13/18] media: tegra-video: Add support for selection ioctl ops Sowjanya Komatineni 2020-07-15 4:20 ` Sowjanya Komatineni 2020-07-15 4:20 ` [RFC PATCH v3 14/18] gpu: host1x: mipi: Update tegra_mipi_request() to be node based Sowjanya Komatineni 2020-07-15 4:20 ` Sowjanya Komatineni [not found] ` <1594786855-26506-15-git-send-email-skomatineni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2020-07-16 20:26 ` Dmitry Osipenko 2020-07-16 20:26 ` Dmitry Osipenko 2020-07-15 4:20 ` [RFC PATCH v3 15/18] gpu: host1x: mipi: Use readl_relaxed_poll_timeout in tegra_mipi_wait Sowjanya Komatineni 2020-07-15 4:20 ` Sowjanya Komatineni 2020-07-15 4:20 ` [RFC PATCH v3 16/18] gpu: host1x: mipi: Split tegra_mipi_calibrate and tegra_mipi_wait Sowjanya Komatineni 2020-07-15 4:20 ` Sowjanya Komatineni [not found] ` <1594786855-26506-17-git-send-email-skomatineni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2020-07-16 20:38 ` Dmitry Osipenko 2020-07-16 20:38 ` Dmitry Osipenko [not found] ` <a06dec8f-7042-767b-545b-048685a7683d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2020-07-16 21:09 ` Sowjanya Komatineni 2020-07-16 21:09 ` Sowjanya Komatineni [not found] ` <20d63eca-4b2b-584e-a391-a4fb64a16b40-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2020-07-16 21:18 ` Dmitry Osipenko 2020-07-16 21:18 ` Dmitry Osipenko 2020-07-16 22:49 ` Sowjanya Komatineni 2020-07-16 22:49 ` Sowjanya Komatineni 2020-07-16 23:01 ` Dmitry Osipenko 2020-07-16 23:06 ` Sowjanya Komatineni 2020-07-16 23:06 ` Sowjanya Komatineni [not found] ` <4690e682-8495-2327-87c7-c2f06a7a479d-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2020-07-16 23:09 ` Sowjanya Komatineni 2020-07-16 23:09 ` Sowjanya Komatineni [not found] ` <66812127-38cf-2af3-51c0-50edbe446e73-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2020-07-16 23:47 ` Dmitry Osipenko 2020-07-16 23:47 ` Dmitry Osipenko 2020-07-17 0:16 ` Sowjanya Komatineni 2020-07-17 0:16 ` Sowjanya Komatineni [not found] ` <550f1796-67ca-5856-223d-c68360243954-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2020-07-17 4:46 ` Sowjanya Komatineni 2020-07-17 4:46 ` Sowjanya Komatineni 2020-07-17 15:01 ` Dmitry Osipenko [not found] ` <080b30c7-1dce-dd2f-dd96-40f6e25da4d6-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2020-07-17 15:41 ` Sowjanya Komatineni 2020-07-17 15:41 ` Sowjanya Komatineni [not found] ` <b125deab-7900-6266-d405-4d7f029089b4-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2020-07-17 20:14 ` Dmitry Osipenko 2020-07-17 20:14 ` Dmitry Osipenko [not found] ` <1594786855-26506-1-git-send-email-skomatineni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2020-07-15 4:20 ` [RFC PATCH v3 01/18] dt-bindings: i2c: tegra: Document Tegra210 VI I2C clocks and power-domains Sowjanya Komatineni 2020-07-15 4:20 ` Sowjanya Komatineni [not found] ` <1594786855-26506-2-git-send-email-skomatineni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2020-07-16 13:25 ` Thierry Reding 2020-07-16 13:25 ` Thierry Reding 2020-07-15 4:20 ` [RFC PATCH v3 03/18] i2c: tegra: Don't mark VI I2C as IRQ safe runtime PM Sowjanya Komatineni 2020-07-15 4:20 ` Sowjanya Komatineni 2020-07-15 4:20 ` [RFC PATCH v3 06/18] i2c: tegra: Fix runtime resume to re-init VI I2C Sowjanya Komatineni 2020-07-15 4:20 ` Sowjanya Komatineni 2020-07-15 4:20 ` [RFC PATCH v3 08/18] media: tegra-video: Fix channel format alignment Sowjanya Komatineni 2020-07-15 4:20 ` Sowjanya Komatineni 2020-07-15 4:20 ` [RFC PATCH v3 10/18] media: tegra-video: Update format lookup to offset based Sowjanya Komatineni 2020-07-15 4:20 ` Sowjanya Komatineni 2020-07-15 4:20 ` [RFC PATCH v3 11/18] dt-bindings: tegra: Update VI and CSI bindings with port info Sowjanya Komatineni 2020-07-15 4:20 ` Sowjanya Komatineni [not found] ` <1594786855-26506-12-git-send-email-skomatineni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2020-07-16 19:09 ` Rob Herring 2020-07-16 19:09 ` Rob Herring 2020-07-15 4:20 ` [RFC PATCH v3 17/18] media: tegra-video: Add CSI MIPI pads calibration Sowjanya Komatineni 2020-07-15 4:20 ` Sowjanya Komatineni 2020-07-15 4:20 ` [RFC PATCH v3 18/18] media: tegra-video: Compute settle times based on the clock rate Sowjanya Komatineni 2020-07-15 4:20 ` Sowjanya Komatineni 2020-07-17 10:54 ` [RFC PATCH v3 00/18] Support for Tegra video capture from external sensor Hans Verkuil 2020-07-17 10:54 ` Hans Verkuil [not found] ` <f03bdb89-df7c-e9e8-1512-d57e5d2332bf-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org> 2020-07-17 16:34 ` Sowjanya Komatineni 2020-07-17 16:34 ` Sowjanya Komatineni 2020-07-17 17:08 ` Hans Verkuil 2020-07-17 17:23 ` Sowjanya Komatineni 2020-07-17 17:23 ` Sowjanya Komatineni [not found] ` <5694f74a-be8e-7a95-1739-0a5fc9820597-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2020-07-17 17:38 ` Sowjanya Komatineni 2020-07-17 17:38 ` Sowjanya Komatineni [not found] ` <9aa8be89-d181-2dca-36ca-ea118bd5b0a7-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2020-07-17 17:48 ` Sowjanya Komatineni 2020-07-17 17:48 ` Sowjanya Komatineni [not found] ` <2f9ecba7-3d05-8a68-f2ad-546470780642-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2020-07-20 4:41 ` Sowjanya Komatineni 2020-07-20 4:41 ` Sowjanya Komatineni
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1594786855-26506-5-git-send-email-skomatineni@nvidia.com \ --to=skomatineni@nvidia.com \ --cc=devicetree@vger.kernel.org \ --cc=digetx@gmail.com \ --cc=frankc@nvidia.com \ --cc=gregkh@linuxfoundation.org \ --cc=helen.koike@collabora.com \ --cc=hverkuil@xs4all.nl \ --cc=jonathanh@nvidia.com \ --cc=linux-i2c@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-tegra@vger.kernel.org \ --cc=robh+dt@kernel.org \ --cc=sakari.ailus@iki.fi \ --cc=sboyd@kernel.org \ --cc=thierry.reding@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.