From: Jonathan Cameron <jic23@kernel.org>
To: linux-iio@vger.kernel.org
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Subject: [PATCH 1/5] iio: adc: cc10001: Add local struct device *dev variable to avoid repitition
Date: Sun, 16 Oct 2022 18:09:46 +0100 [thread overview]
Message-ID: <20221016170950.387751-2-jic23@kernel.org> (raw)
In-Reply-To: <20221016170950.387751-1-jic23@kernel.org>
From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
There are lots of uses of this in probe() and we are about to introduce
some more, so add a local variable to simplify this.
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
drivers/iio/adc/cc10001_adc.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/iio/adc/cc10001_adc.c b/drivers/iio/adc/cc10001_adc.c
index e16ac935693b..eeaea1362ed1 100644
--- a/drivers/iio/adc/cc10001_adc.c
+++ b/drivers/iio/adc/cc10001_adc.c
@@ -307,14 +307,15 @@ static int cc10001_adc_channel_init(struct iio_dev *indio_dev,
static int cc10001_adc_probe(struct platform_device *pdev)
{
- struct device_node *node = pdev->dev.of_node;
+ struct device *dev = &pdev->dev;
+ struct device_node *node = dev->of_node;
struct cc10001_adc_device *adc_dev;
unsigned long adc_clk_rate;
struct iio_dev *indio_dev;
unsigned long channel_map;
int ret;
- indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*adc_dev));
+ indio_dev = devm_iio_device_alloc(dev, sizeof(*adc_dev));
if (indio_dev == NULL)
return -ENOMEM;
@@ -326,7 +327,7 @@ static int cc10001_adc_probe(struct platform_device *pdev)
channel_map &= ~ret;
}
- adc_dev->reg = devm_regulator_get(&pdev->dev, "vref");
+ adc_dev->reg = devm_regulator_get(dev, "vref");
if (IS_ERR(adc_dev->reg))
return PTR_ERR(adc_dev->reg);
@@ -334,7 +335,7 @@ static int cc10001_adc_probe(struct platform_device *pdev)
if (ret)
return ret;
- indio_dev->name = dev_name(&pdev->dev);
+ indio_dev->name = dev_name(dev);
indio_dev->info = &cc10001_adc_info;
indio_dev->modes = INDIO_DIRECT_MODE;
@@ -344,23 +345,23 @@ static int cc10001_adc_probe(struct platform_device *pdev)
goto err_disable_reg;
}
- adc_dev->adc_clk = devm_clk_get(&pdev->dev, "adc");
+ adc_dev->adc_clk = devm_clk_get(dev, "adc");
if (IS_ERR(adc_dev->adc_clk)) {
- dev_err(&pdev->dev, "failed to get the clock\n");
+ dev_err(dev, "failed to get the clock\n");
ret = PTR_ERR(adc_dev->adc_clk);
goto err_disable_reg;
}
ret = clk_prepare_enable(adc_dev->adc_clk);
if (ret) {
- dev_err(&pdev->dev, "failed to enable the clock\n");
+ dev_err(dev, "failed to enable the clock\n");
goto err_disable_reg;
}
adc_clk_rate = clk_get_rate(adc_dev->adc_clk);
if (!adc_clk_rate) {
ret = -EINVAL;
- dev_err(&pdev->dev, "null clock rate!\n");
+ dev_err(dev, "null clock rate!\n");
goto err_disable_clk;
}
--
2.37.2
next prev parent reply other threads:[~2022-10-16 17:10 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-16 17:09 [PATCH 0/5] iio: adc: cc10001: Devm conversion Jonathan Cameron
2022-10-16 17:09 ` Jonathan Cameron [this message]
2022-10-16 17:09 ` [PATCH 2/5] iio: adc: cc10001: Add devm_add_action_or_reset() to disable regulator Jonathan Cameron
2022-10-16 17:09 ` [PATCH 3/5] iio: adc: cc10001: Use devm_clk_get_enabled() to avoid boilerplate Jonathan Cameron
2022-10-31 11:19 ` Sa, Nuno
2022-10-16 17:09 ` [PATCH 4/5] iio: adc: cc10001: Use devm_ to call device power down Jonathan Cameron
2022-10-16 17:09 ` [PATCH 5/5] iio: adc: cc10001: Switch remaining IIO calls in probe to devm_ forms Jonathan Cameron
2022-10-31 11:17 ` Sa, Nuno
2022-10-29 12:43 ` [PATCH 0/5] iio: adc: cc10001: Devm conversion Jonathan Cameron
2022-10-31 11:19 ` Sa, Nuno
2022-11-06 11:48 ` Jonathan Cameron
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=20221016170950.387751-2-jic23@kernel.org \
--to=jic23@kernel.org \
--cc=Jonathan.Cameron@huawei.com \
--cc=linux-iio@vger.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