From: Sebastian Reichel <sebastian.reichel@collabora.com>
To: Sebastian Reichel <sre@kernel.org>
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel@collabora.com,
Sebastian Reichel <sebastian.reichel@collabora.com>
Subject: [PATCH 5/7] power: supply: sbs-manager: use dev_err_probe
Date: Tue, 9 Mar 2021 19:04:05 +0100 [thread overview]
Message-ID: <20210309180407.650943-6-sebastian.reichel@collabora.com> (raw)
In-Reply-To: <20210309180407.650943-1-sebastian.reichel@collabora.com>
Introduce usage of dev_err_probe in probe routine, which
makes the code slightly more readable and removes some
lines of code. It also removes PROBE_DEFER errors being
logged by default.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
drivers/power/supply/sbs-manager.c | 55 +++++++++---------------------
1 file changed, 17 insertions(+), 38 deletions(-)
diff --git a/drivers/power/supply/sbs-manager.c b/drivers/power/supply/sbs-manager.c
index cd2bf0b247fe..bd2af3ef1021 100644
--- a/drivers/power/supply/sbs-manager.c
+++ b/drivers/power/supply/sbs-manager.c
@@ -294,10 +294,8 @@ static int sbsm_gpio_setup(struct sbsm_data *data)
gc->owner = THIS_MODULE;
ret = devm_gpiochip_add_data(dev, gc, data);
- if (ret) {
- dev_err(dev, "devm_gpiochip_add_data failed: %d\n", ret);
- return ret;
- }
+ if (ret)
+ return dev_err_probe(dev, ret, "devm_gpiochip_add_data failed\n");
return ret;
}
@@ -349,11 +347,8 @@ static int sbsm_probe(struct i2c_client *client,
data->supported_bats = ret & SBSM_MASK_BAT_SUPPORTED;
data->muxc = i2c_mux_alloc(adapter, dev, SBSM_MAX_BATS, 0,
I2C_MUX_LOCKED, &sbsm_select, NULL);
- if (!data->muxc) {
- dev_err(dev, "failed to alloc i2c mux\n");
- ret = -ENOMEM;
- goto err_mux_alloc;
- }
+ if (!data->muxc)
+ return dev_err_probe(dev, -ENOMEM, "failed to alloc i2c mux\n");
data->muxc->priv = data;
ret = devm_add_action_or_reset(dev, sbsm_del_mux_adapter, data);
@@ -368,45 +363,29 @@ static int sbsm_probe(struct i2c_client *client,
break;
}
}
- if (ret) {
- dev_err(dev, "failed to register i2c mux channel %d\n", i + 1);
- goto err_mux_register;
- }
+ if (ret)
+ return dev_err_probe(dev, ret, "failed to register i2c mux channel %d\n", i + 1);
- psy_desc = devm_kmemdup(dev, &sbsm_default_psy_desc,
- sizeof(struct power_supply_desc),
- GFP_KERNEL);
- if (!psy_desc) {
- ret = -ENOMEM;
- goto err_psy;
- }
+ psy_desc = devm_kmemdup(dev, &sbsm_default_psy_desc, sizeof(*psy_desc), GFP_KERNEL);
+ if (!psy_desc)
+ return -ENOMEM;
+
+ psy_desc->name = devm_kasprintf(dev, GFP_KERNEL, "sbsm-%s", dev_name(&client->dev));
+ if (!psy_desc->name)
+ return -ENOMEM;
- psy_desc->name = devm_kasprintf(dev, GFP_KERNEL, "sbsm-%s",
- dev_name(&client->dev));
- if (!psy_desc->name) {
- ret = -ENOMEM;
- goto err_psy;
- }
ret = sbsm_gpio_setup(data);
if (ret < 0)
- goto err_psy;
+ return ret;
psy_cfg.drv_data = data;
psy_cfg.of_node = dev->of_node;
data->psy = devm_power_supply_register(dev, psy_desc, &psy_cfg);
- if (IS_ERR(data->psy)) {
- ret = PTR_ERR(data->psy);
- dev_err(dev, "failed to register power supply %s\n",
- psy_desc->name);
- goto err_psy;
- }
+ if (IS_ERR(data->psy))
+ return dev_err_probe(dev, PTR_ERR(data->psy),
+ "failed to register power supply %s\n", psy_desc->name);
return 0;
-
-err_psy:
-err_mux_register:
-err_mux_alloc:
- return ret;
}
static const struct i2c_device_id sbsm_ids[] = {
--
2.30.1
next prev parent reply other threads:[~2021-03-09 18:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-09 18:04 [PATCH 0/7] Cleanup SBS power-supply drivers Sebastian Reichel
2021-03-09 18:04 ` [PATCH 1/7] power: supply: sbs-battery: use dev_err_probe Sebastian Reichel
2021-03-09 18:04 ` [PATCH 2/7] power: supply: sbs-charger: " Sebastian Reichel
2021-03-09 18:04 ` [PATCH 3/7] power: supply: sbs-charger: drop unused gpio includes Sebastian Reichel
2021-03-09 18:04 ` [PATCH 4/7] power: supply: sbs-manager: use managed i2c_mux_adapter Sebastian Reichel
2021-03-09 18:04 ` Sebastian Reichel [this message]
2021-03-09 18:04 ` [PATCH 6/7] power: supply: sbs-manager: update gpio include Sebastian Reichel
2021-03-09 18:04 ` [PATCH 7/7] power: supply: core: reduce loglevel for probe defer info Sebastian Reichel
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=20210309180407.650943-6-sebastian.reichel@collabora.com \
--to=sebastian.reichel@collabora.com \
--cc=kernel@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=sre@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 NNTP newsgroup(s).