From: Dmitry Osipenko <digetx@gmail.com>
To: "Thierry Reding" <thierry.reding@gmail.com>,
"Jonathan Hunter" <jonathanh@nvidia.com>,
"Laxman Dewangan" <ldewangan@nvidia.com>,
"Wolfram Sang" <wsa@the-dreams.de>,
"Michał Mirosław" <mirq-linux@rere.qmqm.pl>,
"Andy Shevchenko" <andy.shevchenko@gmail.com>
Cc: linux-i2c@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v8 14/32] i2c: tegra: Clean up probe function
Date: Wed, 23 Sep 2020 01:51:37 +0300 [thread overview]
Message-ID: <20200922225155.10798-15-digetx@gmail.com> (raw)
In-Reply-To: <20200922225155.10798-1-digetx@gmail.com>
The driver's probe function code is a bit difficult to read. This patch
reorders code of the probe function, forming groups of code that are easy
to work with. The probe tear-down order now matches the driver-removal
order.
Reviewed-by: Thierry Reding <treding@nvidia.com>
Tested-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/i2c/busses/i2c-tegra.c | 100 ++++++++++++++++-----------------
1 file changed, 49 insertions(+), 51 deletions(-)
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 9486fcba655c..56981a5506ae 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -440,6 +440,9 @@ static int tegra_i2c_init_dma(struct tegra_i2c_dev *i2c_dev)
i2c_dev->tx_dma_chan = chan;
+ i2c_dev->dma_buf_size = i2c_dev->hw->quirks->max_write_len +
+ I2C_PACKET_HEADER_SIZE;
+
dma_buf = dma_alloc_coherent(i2c_dev->dev, i2c_dev->dma_buf_size,
&dma_phys, GFP_KERNEL | __GFP_NOWARN);
if (!dma_buf) {
@@ -1694,34 +1697,42 @@ static int tegra_i2c_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct tegra_i2c_dev *i2c_dev;
struct resource *res;
- void __iomem *base;
- phys_addr_t base_phys;
- int irq;
int ret;
- base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
- if (IS_ERR(base))
- return PTR_ERR(base);
-
- base_phys = res->start;
-
- irq = platform_get_irq(pdev, 0);
- if (irq < 0)
- return irq;
-
i2c_dev = devm_kzalloc(&pdev->dev, sizeof(*i2c_dev), GFP_KERNEL);
if (!i2c_dev)
return -ENOMEM;
- i2c_dev->base = base;
- i2c_dev->base_phys = base_phys;
- i2c_dev->adapter.algo = &tegra_i2c_algo;
- i2c_dev->adapter.retries = 1;
- i2c_dev->adapter.timeout = 6 * HZ;
- i2c_dev->irq = irq;
+ platform_set_drvdata(pdev, i2c_dev);
+
+ init_completion(&i2c_dev->msg_complete);
+ init_completion(&i2c_dev->dma_complete);
+
+ i2c_dev->hw = of_device_get_match_data(&pdev->dev);
i2c_dev->cont_id = pdev->id;
i2c_dev->dev = &pdev->dev;
+ i2c_dev->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
+ if (IS_ERR(i2c_dev->base))
+ return PTR_ERR(i2c_dev->base);
+
+ i2c_dev->base_phys = res->start;
+
+ ret = platform_get_irq(pdev, 0);
+ if (ret < 0)
+ return ret;
+
+ i2c_dev->irq = ret;
+
+ /* interrupt will be enabled during of transfer time */
+ irq_set_status_flags(i2c_dev->irq, IRQ_NOAUTOEN);
+
+ ret = devm_request_irq(&pdev->dev, i2c_dev->irq, tegra_i2c_isr,
+ IRQF_NO_SUSPEND, dev_name(&pdev->dev),
+ i2c_dev);
+ if (ret)
+ return ret;
+
i2c_dev->rst = devm_reset_control_get_exclusive(&pdev->dev, "i2c");
if (IS_ERR(i2c_dev->rst)) {
dev_err_probe(&pdev->dev, PTR_ERR(i2c_dev->rst),
@@ -1735,14 +1746,9 @@ static int tegra_i2c_probe(struct platform_device *pdev)
if (ret)
return ret;
- i2c_dev->hw = of_device_get_match_data(&pdev->dev);
- i2c_dev->adapter.quirks = i2c_dev->hw->quirks;
- i2c_dev->dma_buf_size = i2c_dev->adapter.quirks->max_write_len +
- I2C_PACKET_HEADER_SIZE;
- init_completion(&i2c_dev->msg_complete);
- init_completion(&i2c_dev->dma_complete);
-
- platform_set_drvdata(pdev, i2c_dev);
+ ret = tegra_i2c_init_dma(i2c_dev);
+ if (ret)
+ goto release_clocks;
/*
* VI I2C is in VE power domain which is not always on and not
@@ -1760,49 +1766,41 @@ static int tegra_i2c_probe(struct platform_device *pdev)
goto put_rpm;
}
- if (i2c_dev->hw->supports_bus_clear)
- i2c_dev->adapter.bus_recovery_info = &tegra_i2c_recovery_info;
-
- ret = tegra_i2c_init_dma(i2c_dev);
- if (ret < 0)
- goto put_rpm;
-
ret = tegra_i2c_init(i2c_dev);
- if (ret) {
- dev_err(&pdev->dev, "Failed to initialize i2c controller\n");
- goto release_dma;
- }
-
- irq_set_status_flags(i2c_dev->irq, IRQ_NOAUTOEN);
-
- ret = devm_request_irq(&pdev->dev, i2c_dev->irq, tegra_i2c_isr,
- IRQF_NO_SUSPEND, dev_name(&pdev->dev), i2c_dev);
if (ret)
- goto release_dma;
+ goto put_rpm;
i2c_set_adapdata(&i2c_dev->adapter, i2c_dev);
+ i2c_dev->adapter.dev.of_node = pdev->dev.of_node;
+ i2c_dev->adapter.dev.parent = &pdev->dev;
+ i2c_dev->adapter.retries = 1;
+ i2c_dev->adapter.timeout = 6 * HZ;
+ i2c_dev->adapter.quirks = i2c_dev->hw->quirks;
i2c_dev->adapter.owner = THIS_MODULE;
i2c_dev->adapter.class = I2C_CLASS_DEPRECATED;
+ i2c_dev->adapter.algo = &tegra_i2c_algo;
+ i2c_dev->adapter.nr = pdev->id;
+
+ if (i2c_dev->hw->supports_bus_clear)
+ i2c_dev->adapter.bus_recovery_info = &tegra_i2c_recovery_info;
+
strlcpy(i2c_dev->adapter.name, dev_name(&pdev->dev),
sizeof(i2c_dev->adapter.name));
- i2c_dev->adapter.dev.parent = &pdev->dev;
- i2c_dev->adapter.nr = pdev->id;
- i2c_dev->adapter.dev.of_node = pdev->dev.of_node;
ret = i2c_add_numbered_adapter(&i2c_dev->adapter);
if (ret)
- goto release_dma;
+ goto put_rpm;
pm_runtime_put(&pdev->dev);
return 0;
-release_dma:
- tegra_i2c_release_dma(i2c_dev);
-
put_rpm:
pm_runtime_put_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev);
+
+ tegra_i2c_release_dma(i2c_dev);
+release_clocks:
tegra_i2c_release_clocks(i2c_dev);
return ret;
--
2.27.0
next prev parent reply other threads:[~2020-09-22 22:54 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-22 22:51 [PATCH v8 00/32] Improvements for Tegra I2C driver Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 01/32] i2c: tegra: Make tegra_i2c_flush_fifos() usable in atomic transfer Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 02/32] i2c: tegra: Add missing pm_runtime_put() Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 03/32] i2c: tegra: Handle potential error of tegra_i2c_flush_fifos() Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 04/32] i2c: tegra: Mask interrupt in tegra_i2c_issue_bus_clear() Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 05/32] i2c: tegra: Initialize div-clk rate unconditionally Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 06/32] i2c: tegra: Remove i2c_dev.clk_divisor_non_hs_mode member Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 07/32] i2c: tegra: Runtime PM always available on Tegra Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 08/32] i2c: tegra: Remove error message used for devm_request_irq() failure Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 09/32] i2c: tegra: Use reset_control_reset() Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 10/32] i2c: tegra: Use devm_platform_get_and_ioremap_resource() Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 11/32] i2c: tegra: Use platform_get_irq() Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 12/32] i2c: tegra: Use clk-bulk helpers Dmitry Osipenko
2020-09-29 19:33 ` Wolfram Sang
2020-09-29 21:01 ` Dmitry Osipenko
2020-09-29 21:46 ` Wolfram Sang
2020-09-22 22:51 ` [PATCH v8 13/32] i2c: tegra: Move out all device-tree parsing into tegra_i2c_parse_dt() Dmitry Osipenko
2020-09-22 22:51 ` Dmitry Osipenko [this message]
2020-09-22 22:51 ` [PATCH v8 15/32] i2c: tegra: Reorder location of functions in the code Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 16/32] i2c: tegra: Clean up variable types Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 17/32] i2c: tegra: Remove outdated barrier() Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 18/32] i2c: tegra: Remove likely/unlikely from the code Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 19/32] i2c: tegra: Remove redundant check in tegra_i2c_issue_bus_clear() Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 20/32] i2c: tegra: Remove "dma" variable from tegra_i2c_xfer_msg() Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 21/32] i2c: tegra: Rename wait/poll functions Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 22/32] i2c: tegra: Factor out error recovery from tegra_i2c_xfer_msg() Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 23/32] i2c: tegra: Factor out packet header setup " Dmitry Osipenko
2020-09-29 21:16 ` Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 24/32] i2c: tegra: Factor out register polling into separate function Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 25/32] i2c: tegra: Factor out hardware initialization " Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 26/32] i2c: tegra: Check errors for both positive and negative values Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 27/32] i2c: tegra: Improve formatting of variables Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 28/32] i2c: tegra: Clean up variable names Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 29/32] i2c: tegra: Clean up printk messages Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 30/32] i2c: tegra: Clean up and improve comments Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 31/32] i2c: tegra: Clean up whitespaces, newlines and indentation Dmitry Osipenko
2020-09-22 22:51 ` [PATCH v8 32/32] i2c: tegra: Improve driver module description Dmitry Osipenko
2020-09-23 1:19 ` [PATCH v8 00/32] Improvements for Tegra I2C driver Dmitry Osipenko
2020-09-23 7:01 ` Wolfram Sang
2020-09-23 16:10 ` Dmitry Osipenko
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=20200922225155.10798-15-digetx@gmail.com \
--to=digetx@gmail.com \
--cc=andy.shevchenko@gmail.com \
--cc=jonathanh@nvidia.com \
--cc=ldewangan@nvidia.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=mirq-linux@rere.qmqm.pl \
--cc=thierry.reding@gmail.com \
--cc=wsa@the-dreams.de \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).