From: Hans Hu <hanshu-oc@zhaoxin.com>
To: <wsa@kernel.org>, <linux-i2c@vger.kernel.org>
Cc: <andi.shyti@kernel.org>, <cobechen@zhaoxin.com>, <hanshu-oc@zhaoxin.com>
Subject: [PATCH v5 1/8] i2c: wmt: create wmt_i2c_init for general init
Date: Thu, 28 Dec 2023 11:17:39 +0800 [thread overview]
Message-ID: <98561c2550e96a44a514d661950f4ae89007b73d.1703733126.git.hanshu-oc@zhaoxin.com> (raw)
In-Reply-To: <cover.1703733126.git.hanshu-oc@zhaoxin.com>
v4->v5:
add previous prototype 'static' for wmt_i2c_init().
Some common initialization actions are put in the function
wmt_i2c_init(), which is convenient to share with zhaoxin.
Signed-off-by: Hans Hu <hanshu-oc@zhaoxin.com>
---
drivers/i2c/busses/i2c-wmt.c | 67 +++++++++++++++++++-----------------
1 file changed, 36 insertions(+), 31 deletions(-)
diff --git a/drivers/i2c/busses/i2c-wmt.c b/drivers/i2c/busses/i2c-wmt.c
index ec2a8da134e5..f1888f100d83 100644
--- a/drivers/i2c/busses/i2c-wmt.c
+++ b/drivers/i2c/busses/i2c-wmt.c
@@ -286,6 +286,38 @@ static irqreturn_t wmt_i2c_isr(int irq, void *data)
return IRQ_HANDLED;
}
+static int wmt_i2c_init(struct platform_device *pdev, struct wmt_i2c_dev **pi2c_dev)
+{
+ int err;
+ struct wmt_i2c_dev *i2c_dev;
+ struct device_node *np = pdev->dev.of_node;
+
+ i2c_dev = devm_kzalloc(&pdev->dev, sizeof(*i2c_dev), GFP_KERNEL);
+ if (!i2c_dev)
+ return -ENOMEM;
+
+ i2c_dev->base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
+ if (IS_ERR(i2c_dev->base))
+ return PTR_ERR(i2c_dev->base);
+
+ i2c_dev->irq = irq_of_parse_and_map(np, 0);
+ if (!i2c_dev->irq)
+ return -EINVAL;
+
+ err = devm_request_irq(&pdev->dev, i2c_dev->irq, wmt_i2c_isr,
+ 0, pdev->name, i2c_dev);
+ if (err)
+ return dev_err_probe(&pdev->dev, err,
+ "failed to request irq %i\n", i2c_dev->irq);
+
+ i2c_dev->dev = &pdev->dev;
+ init_completion(&i2c_dev->complete);
+ platform_set_drvdata(pdev, i2c_dev);
+
+ *pi2c_dev = i2c_dev;
+ return 0;
+}
+
static int wmt_i2c_reset_hardware(struct wmt_i2c_dev *i2c_dev)
{
int err;
@@ -327,19 +359,9 @@ static int wmt_i2c_probe(struct platform_device *pdev)
int err;
u32 clk_rate;
- i2c_dev = devm_kzalloc(&pdev->dev, sizeof(*i2c_dev), GFP_KERNEL);
- if (!i2c_dev)
- return -ENOMEM;
-
- i2c_dev->base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
- if (IS_ERR(i2c_dev->base))
- return PTR_ERR(i2c_dev->base);
-
- i2c_dev->irq = irq_of_parse_and_map(np, 0);
- if (!i2c_dev->irq) {
- dev_err(&pdev->dev, "irq missing or invalid\n");
- return -EINVAL;
- }
+ err = wmt_i2c_init(pdev, &i2c_dev);
+ if (err)
+ return err;
i2c_dev->clk = of_clk_get(np, 0);
if (IS_ERR(i2c_dev->clk)) {
@@ -351,15 +373,6 @@ static int wmt_i2c_probe(struct platform_device *pdev)
if (!err && (clk_rate == I2C_MAX_FAST_MODE_FREQ))
i2c_dev->tcr = TCR_FAST_MODE;
- i2c_dev->dev = &pdev->dev;
-
- err = devm_request_irq(&pdev->dev, i2c_dev->irq, wmt_i2c_isr, 0,
- "i2c", i2c_dev);
- if (err) {
- dev_err(&pdev->dev, "failed to request irq %i\n", i2c_dev->irq);
- return err;
- }
-
adap = &i2c_dev->adapter;
i2c_set_adapdata(adap, i2c_dev);
strscpy(adap->name, "WMT I2C adapter", sizeof(adap->name));
@@ -368,21 +381,13 @@ static int wmt_i2c_probe(struct platform_device *pdev)
adap->dev.parent = &pdev->dev;
adap->dev.of_node = pdev->dev.of_node;
- init_completion(&i2c_dev->complete);
-
err = wmt_i2c_reset_hardware(i2c_dev);
if (err) {
dev_err(&pdev->dev, "error initializing hardware\n");
return err;
}
- err = i2c_add_adapter(adap);
- if (err)
- return err;
-
- platform_set_drvdata(pdev, i2c_dev);
-
- return 0;
+ return i2c_add_adapter(adap);
}
static void wmt_i2c_remove(struct platform_device *pdev)
--
2.34.1
next prev parent reply other threads:[~2023-12-28 3:17 UTC|newest]
Thread overview: 133+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-02 2:53 [PATCH v3 00/12] i2c: add zhaoxin i2c controller driver Hans Hu
2023-11-02 2:53 ` [PATCH v3 01/12] i2c: wmt: Reduce redundant: bus busy check Hans Hu
2023-12-22 9:33 ` Wolfram Sang
2023-11-02 2:53 ` [PATCH v3 02/12] i2c: wmt: Reduce redundant: wait event complete Hans Hu
2023-12-22 9:34 ` Wolfram Sang
2023-11-02 2:53 ` [PATCH v3 03/12] i2c: wmt: Reduce redundant: clock mode setting Hans Hu
2023-12-22 9:36 ` Wolfram Sang
2023-11-02 2:53 ` [PATCH v3 04/12] i2c: wmt: Reduce redundant: REG_CR setting Hans Hu
2023-12-22 9:38 ` Wolfram Sang
2023-12-22 10:15 ` Wolfram Sang
2023-11-02 2:53 ` [PATCH v3 05/12] i2c: wmt: Reduce redundant: function parameter Hans Hu
2023-12-22 9:48 ` Wolfram Sang
2023-11-02 2:53 ` [PATCH v3 06/12] i2c: wmt: delete .remove_new Hans Hu
2023-12-22 9:51 ` Wolfram Sang
2023-11-02 2:53 ` [PATCH v3 07/12] i2c: wmt: create wmt_i2c_init for general init Hans Hu
2023-12-22 10:26 ` Wolfram Sang
2023-12-22 10:55 ` Hans Hu
2023-12-22 11:00 ` Wolfram Sang
2023-11-02 2:53 ` [PATCH v3 08/12] i2c: wmt: rename marcos with prefix WMTI2C_ Hans Hu
2023-11-02 2:53 ` [PATCH v3 09/12] i2c: wmt: adjust line length to meet style Hans Hu
2023-11-02 2:54 ` [PATCH v3 10/12] i2c: wmt: split out common files Hans Hu
2023-11-02 2:54 ` [PATCH v3 11/12] i2c: via-common: add zhaoxin platform Hans Hu
2023-11-02 2:54 ` [PATCH v3 12/12] i2c: add zhaoxin i2c controller driver Hans Hu
2023-11-08 9:50 ` [PATCH v3 00/12] " Wolfram Sang
2023-12-27 4:39 ` [PATCH v4 0/8] " Hans Hu
2023-12-27 4:39 ` [PATCH v4 1/8] i2c: wmt: create wmt_i2c_init for general init Hans Hu
2023-12-27 19:00 ` Wolfram Sang
2023-12-28 2:05 ` Hans Hu
2023-12-27 4:39 ` [PATCH v4 2/8] i2c: wmt: rename marcos with prefix WMTI2C_ Hans Hu
2023-12-27 4:39 ` [PATCH v4 3/8] i2c: wmt: adjust line length to meet style Hans Hu
2023-12-27 4:39 ` [PATCH v4 4/8] i2c: wmt: split out common files Hans Hu
2023-12-27 4:39 ` [PATCH v4 5/8] i2c: wmt: rename with prefix VIAI2C_ and viai2c_ Hans Hu
2023-12-27 4:39 ` [PATCH v4 6/8] i2c: wmt: fix a bug when thread blocked Hans Hu
2023-12-27 4:39 ` [PATCH v4 7/8] i2c: wmt: add platform type VIAI2C_PLAT_WMT Hans Hu
2023-12-27 4:39 ` [PATCH v4 8/8] i2c: add zhaoxin i2c controller driver Hans Hu
2023-12-28 3:17 ` [PATCH v5 0/8] " Hans Hu
2023-12-28 3:17 ` Hans Hu [this message]
2023-12-28 3:17 ` [PATCH v5 2/8] i2c: wmt: rename marcos with prefix WMTI2C_ Hans Hu
2023-12-28 3:17 ` [PATCH v5 3/8] i2c: wmt: adjust line length to meet style Hans Hu
2023-12-28 3:17 ` [PATCH v5 4/8] i2c: wmt: split out common files Hans Hu
2023-12-28 3:17 ` [PATCH v5 5/8] i2c: wmt: rename with prefix VIAI2C_ and viai2c_ Hans Hu
2023-12-28 3:17 ` [PATCH v5 6/8] i2c: wmt: fix a bug when thread blocked Hans Hu
2023-12-28 3:17 ` [PATCH v5 7/8] i2c: wmt: add platform type VIAI2C_PLAT_WMT Hans Hu
2023-12-28 3:17 ` [PATCH v5 8/8] i2c: add zhaoxin i2c controller driver Hans Hu
2023-12-29 5:17 ` kernel test robot
2023-12-29 6:30 ` [PATCH v6 0/8] " Hans Hu
2023-12-29 6:30 ` [PATCH v6 1/8] i2c: wmt: create wmt_i2c_init for general init Hans Hu
2024-01-03 12:56 ` Andi Shyti
2024-01-04 1:44 ` Hans Hu
2023-12-29 6:30 ` [PATCH v6 2/8] i2c: wmt: rename marcos with prefix WMTI2C_ Hans Hu
2024-01-03 13:29 ` Andi Shyti
2023-12-29 6:30 ` [PATCH v6 3/8] i2c: wmt: adjust line length to meet style Hans Hu
2024-01-03 16:52 ` Andi Shyti
2024-01-04 1:49 ` Hans Hu
2023-12-29 6:30 ` [PATCH v6 4/8] i2c: wmt: split out common files Hans Hu
2024-01-03 17:21 ` Andi Shyti
2024-01-04 2:04 ` Hans Hu
2024-01-04 9:22 ` Andi Shyti
2024-01-04 9:45 ` Hans Hu
2024-01-04 12:36 ` Andi Shyti
2023-12-29 6:30 ` [PATCH v6 5/8] i2c: wmt: rename with prefix VIAI2C_ and viai2c_ Hans Hu
2024-01-03 18:45 ` Andi Shyti
2024-01-04 2:12 ` Hans Hu
2023-12-29 6:30 ` [PATCH v6 6/8] i2c: wmt: fix a bug when thread blocked Hans Hu
2024-01-03 19:39 ` Andi Shyti
2024-01-04 2:30 ` Hans Hu
2024-01-04 9:18 ` Andi Shyti
2024-01-04 10:02 ` Hans Hu
2024-01-04 12:37 ` Andi Shyti
2023-12-29 6:30 ` [PATCH v6 7/8] i2c: wmt: add platform type VIAI2C_PLAT_WMT Hans Hu
2023-12-29 6:30 ` [PATCH v6 8/8] i2c: add zhaoxin i2c controller driver Hans Hu
2024-01-03 20:02 ` Andi Shyti
2024-01-04 2:40 ` Hans Hu
2024-01-03 20:03 ` [PATCH v6 0/8] " Andi Shyti
2024-01-05 7:51 ` [PATCH v7 0/6] " Hans Hu
2024-01-05 7:51 ` [PATCH v7 1/6] i2c: wmt: create wmt_i2c_init for general init Hans Hu
2024-01-15 15:17 ` Krzysztof Kozlowski
2024-01-16 1:43 ` Hans Hu
2024-01-21 23:56 ` Andi Shyti
2024-02-21 12:10 ` Wolfram Sang
2024-01-05 7:51 ` [PATCH v7 2/6] i2c: wmt: split out common files Hans Hu
2024-02-21 12:19 ` Wolfram Sang
2024-01-05 7:51 ` [PATCH v7 3/6] i2c: wmt: rename something Hans Hu
2024-02-21 12:34 ` Wolfram Sang
2024-01-05 7:51 ` [PATCH v7 4/6] i2c: wmt: fix a bug when thread blocked Hans Hu
2024-02-21 12:37 ` Wolfram Sang
2024-02-22 9:03 ` Hans Hu
2024-02-22 9:37 ` Wolfram Sang
2024-02-22 10:42 ` Hans Hu
2024-02-22 17:26 ` Wolfram Sang
2024-01-05 7:51 ` [PATCH v7 5/6] i2c: wmt: add platform type VIAI2C_PLAT_WMT Hans Hu
2024-02-21 12:39 ` Wolfram Sang
2024-02-22 8:50 ` Hans Hu
2024-01-05 7:51 ` [PATCH v7 6/6] i2c: add zhaoxin i2c controller driver Hans Hu
2024-02-21 12:44 ` Wolfram Sang
2024-02-22 8:49 ` Hans Hu
2024-02-27 6:36 ` [PATCH v8 0/6] " Hans Hu
2024-02-27 6:36 ` [PATCH v8 1/6] i2c: wmt: create wmt_i2c_init for general init Hans Hu
2024-02-27 6:36 ` [PATCH v8 2/6] i2c: wmt: split out common files Hans Hu
2024-02-27 6:36 ` [PATCH v8 3/6] i2c: wmt: rename something Hans Hu
2024-02-27 6:36 ` [PATCH v8 4/6] i2c: wmt: fix a bug when thread blocked Hans Hu
2024-03-04 9:41 ` Wolfram Sang
2024-02-27 6:36 ` [PATCH v8 5/6] i2c: wmt: add platform type VIAI2C_PLAT_WMT Hans Hu
2024-03-04 9:46 ` Wolfram Sang
2024-02-27 6:36 ` [PATCH v8 6/6] i2c: add zhaoxin i2c controller driver Hans Hu
2024-03-04 9:49 ` Wolfram Sang
2024-03-04 23:01 ` [SPAM] " Andi Shyti
2024-03-05 2:45 ` Hans Hu
2024-03-06 11:50 ` Andi Shyti
2024-03-06 16:54 ` Wolfram Sang
2024-03-06 21:24 ` [PATCH v9 0/6] " Andi Shyti
2024-03-06 21:24 ` [PATCH v9 1/6] i2c: wmt: create wmt_i2c_init for general init Andi Shyti
2024-03-06 21:24 ` [PATCH v9 2/6] i2c: wmt: split out common files Andi Shyti
2024-03-06 21:24 ` [PATCH v9 3/6] i2c: wmt: rename something Andi Shyti
2024-03-06 21:24 ` [PATCH v9 4/6] i2c: wmt: fix a bug when thread blocked Andi Shyti
2024-03-06 21:24 ` [PATCH v9 5/6] i2c: wmt: add platform type VIAI2C_PLAT_WMT Andi Shyti
2024-03-06 21:24 ` [PATCH v9 6/6] i2c: add zhaoxin i2c controller driver Andi Shyti
2024-03-08 1:22 ` [PATCH v9 0/6] " Hans Hu
2024-03-08 12:30 ` Andi Shyti
2024-04-03 23:29 ` Andi Shyti
2024-04-07 1:36 ` Hans Hu
2024-04-08 2:54 ` [PATCH v10 " Hans Hu
2024-04-08 2:54 ` [PATCH v10 1/6] i2c: wmt: create wmt_i2c_init for general init Hans Hu
2024-04-23 11:23 ` Andi Shyti
2024-04-08 2:54 ` [PATCH v10 2/6] i2c: wmt: split out common files Hans Hu
2024-04-08 2:54 ` [PATCH v10 3/6] i2c: wmt: rename something Hans Hu
2024-04-23 11:54 ` Andi Shyti
2024-04-08 2:54 ` [PATCH v10 4/6] i2c: wmt: fix a bug when thread blocked Hans Hu
2024-04-08 2:54 ` [PATCH v10 5/6] i2c: wmt: add platform type VIAI2C_PLAT_WMT Hans Hu
2024-04-08 2:54 ` [PATCH v10 6/6] i2c: add zhaoxin i2c controller driver Hans Hu
2024-04-23 12:02 ` [PATCH v10 0/6] " Andi Shyti
2024-04-23 12:16 ` Hans Hu
2024-04-29 0:20 ` Andi Shyti
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=98561c2550e96a44a514d661950f4ae89007b73d.1703733126.git.hanshu-oc@zhaoxin.com \
--to=hanshu-oc@zhaoxin.com \
--cc=andi.shyti@kernel.org \
--cc=cobechen@zhaoxin.com \
--cc=linux-i2c@vger.kernel.org \
--cc=wsa@kernel.org \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).