From: Dmitry Osipenko <digetx@gmail.com>
To: Sebastian Reichel <sre@kernel.org>,
Rob Herring <robh+dt@kernel.org>, Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
David Heidelberg <david@ixit.cz>
Cc: linux-pm@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
Jonghwa Lee <jonghwa3.lee@samsung.com>,
John Stultz <john.stultz@linaro.org>,
Vinay Simha BN <simhavcs@gmail.com>
Subject: [PATCH v2 4/9] power: supply: smb347-charger: Use resource-managed API
Date: Sun, 7 Jun 2020 17:41:08 +0300 [thread overview]
Message-ID: <20200607144113.10202-5-digetx@gmail.com> (raw)
In-Reply-To: <20200607144113.10202-1-digetx@gmail.com>
From: David Heidelberg <david@ixit.cz>
Simplify code, more convenient to use with Device Tree.
Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: David Heidelberg <david@ixit.cz>
---
drivers/power/supply/smb347-charger.c | 75 +++++++++++----------------
1 file changed, 29 insertions(+), 46 deletions(-)
diff --git a/drivers/power/supply/smb347-charger.c b/drivers/power/supply/smb347-charger.c
index f99026d81f2a..60894105fcbd 100644
--- a/drivers/power/supply/smb347-charger.c
+++ b/drivers/power/supply/smb347-charger.c
@@ -836,21 +836,31 @@ static int smb347_irq_init(struct smb347_charger *smb,
struct i2c_client *client)
{
const struct smb347_charger_platform_data *pdata = smb->pdata;
- int ret, irq = gpio_to_irq(pdata->irq_gpio);
+ unsigned long irqflags = IRQF_ONESHOT;
+ int ret;
- ret = gpio_request_one(pdata->irq_gpio, GPIOF_IN, client->name);
- if (ret < 0)
- goto fail;
+ /* Requesting GPIO for IRQ is only needed in non-DT way */
+ if (!client->irq) {
+ int irq = gpio_to_irq(pdata->irq_gpio);
+
+ ret = devm_gpio_request_one(smb->dev, pdata->irq_gpio,
+ GPIOF_IN, client->name);
+ if (ret < 0)
+ return ret;
+
+ irqflags |= IRQF_TRIGGER_FALLING;
+ client->irq = irq;
+ }
- ret = request_threaded_irq(irq, NULL, smb347_interrupt,
- IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
- client->name, smb);
+ ret = devm_request_threaded_irq(smb->dev, client->irq, NULL,
+ smb347_interrupt, irqflags,
+ client->name, smb);
if (ret < 0)
- goto fail_gpio;
+ return ret;
ret = smb347_set_writable(smb, true);
if (ret < 0)
- goto fail_irq;
+ return ret;
/*
* Configure the STAT output to be suitable for interrupts: disable
@@ -860,20 +870,10 @@ static int smb347_irq_init(struct smb347_charger *smb,
CFG_STAT_ACTIVE_HIGH | CFG_STAT_DISABLED,
CFG_STAT_DISABLED);
if (ret < 0)
- goto fail_readonly;
+ client->irq = 0;
smb347_set_writable(smb, false);
- client->irq = irq;
- return 0;
-fail_readonly:
- smb347_set_writable(smb, false);
-fail_irq:
- free_irq(irq, smb);
-fail_gpio:
- gpio_free(pdata->irq_gpio);
-fail:
- client->irq = 0;
return ret;
}
@@ -1251,32 +1251,24 @@ static int smb347_probe(struct i2c_client *client,
mains_usb_cfg.num_supplicants = ARRAY_SIZE(battery);
mains_usb_cfg.drv_data = smb;
if (smb->pdata->use_mains) {
- smb->mains = power_supply_register(dev, &smb347_mains_desc,
- &mains_usb_cfg);
+ smb->mains = devm_power_supply_register(dev, &smb347_mains_desc,
+ &mains_usb_cfg);
if (IS_ERR(smb->mains))
return PTR_ERR(smb->mains);
}
if (smb->pdata->use_usb) {
- smb->usb = power_supply_register(dev, &smb347_usb_desc,
- &mains_usb_cfg);
- if (IS_ERR(smb->usb)) {
- if (smb->pdata->use_mains)
- power_supply_unregister(smb->mains);
+ smb->usb = devm_power_supply_register(dev, &smb347_usb_desc,
+ &mains_usb_cfg);
+ if (IS_ERR(smb->usb))
return PTR_ERR(smb->usb);
- }
}
battery_cfg.drv_data = smb;
- smb->battery = power_supply_register(dev, &smb347_battery_desc,
- &battery_cfg);
- if (IS_ERR(smb->battery)) {
- if (smb->pdata->use_usb)
- power_supply_unregister(smb->usb);
- if (smb->pdata->use_mains)
- power_supply_unregister(smb->mains);
+ smb->battery = devm_power_supply_register(dev, &smb347_battery_desc,
+ &battery_cfg);
+ if (IS_ERR(smb->battery))
return PTR_ERR(smb->battery);
- }
/*
* Interrupt pin is optional. If it is connected, we setup the
@@ -1299,17 +1291,8 @@ static int smb347_remove(struct i2c_client *client)
{
struct smb347_charger *smb = i2c_get_clientdata(client);
- if (client->irq) {
+ if (client->irq)
smb347_irq_disable(smb);
- free_irq(client->irq, smb);
- gpio_free(smb->pdata->irq_gpio);
- }
-
- power_supply_unregister(smb->battery);
- if (smb->pdata->use_usb)
- power_supply_unregister(smb->usb);
- if (smb->pdata->use_mains)
- power_supply_unregister(smb->mains);
return 0;
}
--
2.26.0
next prev parent reply other threads:[~2020-06-07 14:45 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-07 14:41 [PATCH v2 0/9] Summit SMB3xx driver & device-tree Dmitry Osipenko
2020-06-07 14:41 ` [PATCH v2 1/9] dt-bindings: power: supply: Add device-tree binding for Summit SMB3xx Dmitry Osipenko
2020-07-13 23:39 ` Rob Herring
2020-07-16 17:24 ` Dmitry Osipenko
2020-06-07 14:41 ` [PATCH v2 2/9] dt-bindings: battery: Add temperature properties Dmitry Osipenko
2020-07-13 23:46 ` Rob Herring
2020-07-16 17:24 ` Dmitry Osipenko
2020-06-07 14:41 ` [PATCH v2 3/9] power: supply: Support battery temperature device-tree properties Dmitry Osipenko
2020-06-07 14:41 ` Dmitry Osipenko [this message]
2020-06-07 14:41 ` [PATCH v2 5/9] power: supply: smb347-charger: Implement device-tree support Dmitry Osipenko
2020-06-07 14:41 ` [PATCH v2 6/9] power: supply: smb347-charger: Support SMB345 and SMB358 Dmitry Osipenko
2020-06-07 14:41 ` [PATCH v2 7/9] power: supply: smb347-charger: Remove virtual smb347-battery Dmitry Osipenko
2020-06-07 14:41 ` [PATCH v2 8/9] power: supply: smb347-charger: Replace mutex with IRQ disable/enable Dmitry Osipenko
2020-06-07 14:41 ` [PATCH v2 9/9] ARM: dts: qcom: apq8064-nexus7: Add SMB345 charger node Dmitry Osipenko
2020-07-08 7:42 ` [PATCH v2 0/9] Summit SMB3xx driver & device-tree 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=20200607144113.10202-5-digetx@gmail.com \
--to=digetx@gmail.com \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=david@ixit.cz \
--cc=devicetree@vger.kernel.org \
--cc=john.stultz@linaro.org \
--cc=jonghwa3.lee@samsung.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=simhavcs@gmail.com \
--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).