From: Anton Vorontsov <anton.vorontsov@linaro.org>
To: mathieu.poirier@linaro.org
Cc: linux-kernel@vger.kernel.org, dwmw2@infradead.org
Subject: Re: [PATCH 34/57] power: ab8500_fg: add power cut feature for ab8505
Date: Thu, 27 Sep 2012 17:01:15 -0700 [thread overview]
Message-ID: <20120928000115.GA20560@lizard> (raw)
In-Reply-To: <1348589574-25655-35-git-send-email-mathieu.poirier@linaro.org>
On Tue, Sep 25, 2012 at 10:12:31AM -0600, mathieu.poirier@linaro.org wrote:
> From: Rikard Olsson <rikard.p.olsson@stericsson.com>
>
> Add support for a power cut feature which allows user to
> configure when ab8505 should shut down system due to low
> battery.
>
> Signed-off-by: Rikard Olsson <rikard.p.olsson@stericsson.com>
> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> Reviewed-by: Martin SJOBLOM <martin.w.sjoblom@stericsson.com>
> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
> ---
> drivers/power/ab8500_fg.c | 488 +++++++++++++++++++++++++++++++++-
> include/linux/mfd/abx500.h | 10 +
> include/linux/mfd/abx500/ab8500-bm.h | 8 +
> 3 files changed, 502 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
> index 5e4a46b..fde189a 100644
> --- a/drivers/power/ab8500_fg.c
> +++ b/drivers/power/ab8500_fg.c
> @@ -2351,6 +2351,64 @@ static int ab8500_fg_init_hw_registers(struct ab8500_fg *di)
> dev_err(di->dev, "BattOk init write failed.\n");
> goto out;
> }
> +
> + if ((is_ab8505(di->parent) || is_ab9540(di->parent)) &&
> + abx500_get_chip_id(di->dev) >= AB8500_CUT2P0) {
> + ret = abx500_set_register_interruptible(di->dev, AB8500_RTC,
> + AB8505_RTC_PCUT_MAX_TIME_REG,
> + di->bat->fg_params->pcut_max_time);
> +
No need for this empty line.
> + if (ret) {
> + dev_err(di->dev,
> + "%s write failed AB8505_RTC_PCUT_MAX_TIME_REG\n",
> + __func__);
> + goto out;
> + };
> +
> + ret = abx500_set_register_interruptible(di->dev, AB8500_RTC,
> + AB8505_RTC_PCUT_FLAG_TIME_REG,
> + di->bat->fg_params->pcut_flag_time);
> +
Ditto...
> + if (ret) {
> + dev_err(di->dev,
> + "%s write failed AB8505_RTC_PCUT_FLAG_TIME_REG\n",
> + __func__);
Wrong indentation.
> + goto out;
No need for these gotos. Just return.
[...]
> return ret;
> }
> @@ -2572,22 +2630,433 @@ static ssize_t ab8500_show_capacity(struct device *dev,
> return scnprintf(buf, PAGE_SIZE, "%d\n", capacity);
> }
>
> +static ssize_t ab8505_powercut_flagtime_read(struct device *dev,
> + struct device_attribute *attr,
> + char *buf)
> +{
> + int ret;
> + u8 reg_value;
> + struct power_supply *psy = dev_get_drvdata(dev);
> + struct ab8500_fg *di;
> +
> + di = to_ab8500_fg_device_info(psy);
This can go into the initializer.
> +
> + ret = abx500_get_register_interruptible(di->dev, AB8500_RTC,
> + AB8505_RTC_PCUT_FLAG_TIME_REG, ®_value);
> +
> + if (ret < 0) {
> + dev_err(dev, "Failed to read AB8505_RTC_PCUT_FLAG_TIME_REG\n");
> + goto fail;
As there's just one fail case, we can just return early, no need for
the label.
> + }
> +
> + return scnprintf(buf, PAGE_SIZE, "%d\n", (reg_value & 0x7F));
> +
> +fail:
> + return ret;
> +}
> +
> +static ssize_t ab8505_powercut_flagtime_write(struct device *dev,
> + struct device_attribute *attr,
> + const char *buf, size_t count)
> +{
> + int ret;
> + long unsigned reg_value;
> + struct power_supply *psy = dev_get_drvdata(dev);
> + struct ab8500_fg *di;
> +
> + di = to_ab8500_fg_device_info(psy);
Into initializer...
> +
> + if (kstrtoul(buf, 10, ®_value) != 0)
> + goto fail;
> +
> + if (reg_value > 0x7F) {
> + dev_err(dev, "Incorrect parameter, echo 0 (1.98s) - 127 (15.625ms) for flagtime\n");
> + goto fail;
No need for 'fail' label, we can just return in both cases.
Plus, currently the code would return success, even if kstroul failed
or on incorrect reg_value. That's not right, I guess the function
should return -EINVAL.
> + }
> +
> + ret = abx500_set_register_interruptible(di->dev, AB8500_RTC,
> + AB8505_RTC_PCUT_FLAG_TIME_REG, (u8)reg_value);
> +
> + if (ret < 0)
> + dev_err(dev, "Failed to set AB8505_RTC_PCUT_FLAG_TIME_REG\n");
> +
> +fail:
> + return count;
> +}
> +
> +static ssize_t ab8505_powercut_maxtime_read(struct device *dev,
> + struct device_attribute *attr,
> + char *buf)
> +{
> + int ret;
> + u8 reg_value;
> + struct power_supply *psy = dev_get_drvdata(dev);
> + struct ab8500_fg *di;
> +
> + di = to_ab8500_fg_device_info(psy);
Can go into initializer.
> +
> + ret = abx500_get_register_interruptible(di->dev, AB8500_RTC,
> + AB8505_RTC_PCUT_MAX_TIME_REG, ®_value);
> +
> + if (ret < 0) {
> + dev_err(dev, "Failed to read AB8505_RTC_PCUT_MAX_TIME_REG\n");
> + goto fail;
No need for goto.
> + }
> +
> + return scnprintf(buf, PAGE_SIZE, "%d\n", (reg_value & 0x7F));
> +
> +fail:
> + return ret;
> +
> +}
> +
> +static ssize_t ab8505_powercut_maxtime_write(struct device *dev,
> + struct device_attribute *attr,
> + const char *buf, size_t count)
> +{
> + int ret;
> + long unsigned int reg_value;
> + struct power_supply *psy = dev_get_drvdata(dev);
> + struct ab8500_fg *di;
> +
> + di = to_ab8500_fg_device_info(psy);
Initializer.
> +
> + if (kstrtoul(buf, 10, ®_value) != 0)
> + goto fail;
> +
> + if (reg_value > 0x7F) {
> + dev_err(dev, "Incorrect parameter, echo 0 (0.0s) - 127 (1.98s) for maxtime\n");
> + goto fail;
No need for gotos, and should return -EINVAL on errors.
> + }
> +
> + ret = abx500_set_register_interruptible(di->dev, AB8500_RTC,
> + AB8505_RTC_PCUT_MAX_TIME_REG, (u8)reg_value);
> +
> + if (ret < 0)
> + dev_err(dev, "Failed to set AB8505_RTC_PCUT_MAX_TIME_REG\n");
> +
> +fail:
> + return count;
> +}
> +
> +static ssize_t ab8505_powercut_restart_read(struct device *dev,
> + struct device_attribute *attr,
> + char *buf)
> +{
> + int ret;
> + u8 reg_value;
> + struct power_supply *psy = dev_get_drvdata(dev);
> + struct ab8500_fg *di;
> +
> + di = to_ab8500_fg_device_info(psy);
can be initializer.
> +
> + ret = abx500_get_register_interruptible(di->dev, AB8500_RTC,
> + AB8505_RTC_PCUT_RESTART_REG, ®_value);
> +
unneeded empty line.
> + if (ret < 0) {
> + dev_err(dev, "Failed to read AB8505_RTC_PCUT_RESTART_REG\n");
> + goto fail;
no need for goto.
.....and more similar stuff in this stuff....
Does it make sense to write a macro that constructs all these
similar functions? Would save numerous lines of code.
[...]
> static struct device_attribute ab8500_fg_sysfs_psy_attrs[] = {
> __ATTR(capacity, S_IRUGO, ab8500_show_capacity, NULL),
> };
>
> +static struct device_attribute ab8505_fg_sysfs_psy_attrs[] = {
> + __ATTR(powercut_flagtime, (S_IRUGO | S_IWUGO),
> + ab8505_powercut_flagtime_read,
> + ab8505_powercut_flagtime_write),
> + __ATTR(powercut_maxtime, (S_IRUGO | S_IWUGO),
> + ab8505_powercut_maxtime_read,
> + ab8505_powercut_maxtime_write),
> + __ATTR(powercut_restart_max, (S_IRUGO | S_IWUGO),
> + ab8505_powercut_restart_read,
> + ab8505_powercut_restart_write),
> + __ATTR(powercut_timer, S_IRUGO, ab8505_powercut_timer_read, NULL),
> + __ATTR(powercut_restart_counter, S_IRUGO,
> + ab8505_powercut_restart_counter_read, NULL),
> + __ATTR(powercut_enable, (S_IRUGO | S_IWUGO), ab8505_powercut_read,
> + ab8505_powercut_write),
> + __ATTR(powercut_flag, S_IRUGO, ab8505_powercut_flag_read, NULL),
> + __ATTR(powercut_debounce_time, (S_IRUGO | S_IWUGO),
> + ab8505_powercut_debounce_read,
> + ab8505_powercut_debounce_write),
> + __ATTR(powercut_enable_status, S_IRUGO,
> + ab8505_powercut_enable_status_read, NULL),
Quite inconsistent wrapping. But that's just nitpicking...
Thanks,
Anton.
next prev parent reply other threads:[~2012-09-28 0:04 UTC|newest]
Thread overview: 108+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 16:11 [PATCH 00/57] power: Upgrade to ux500 battery management driver mathieu.poirier
2012-09-25 16:11 ` [PATCH 01/57] power: ab8500_bm: Charger current step-up/down mathieu.poirier
2012-09-28 3:41 ` Anton Vorontsov
2012-09-25 16:11 ` [PATCH 02/57] power: ab8500_bm: Don't clear the CCMuxOffset bit mathieu.poirier
2012-09-28 3:42 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 03/57] power: ab8500_btemp: Detect battery type in workqueue mathieu.poirier
2012-09-25 16:12 ` [PATCH 04/57] power: ab8500: bm: movimg back to ab8500 platform data managment mathieu.poirier
2012-09-27 2:42 ` Anton Vorontsov
2012-09-27 2:53 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 05/57] power: ab8500_bm: Rename the power_loss function mathieu.poirier
2012-09-25 16:12 ` [PATCH 06/57] power: ab8500_bm: Skip first CCEOC irq for instant current mathieu.poirier
2012-09-25 16:12 ` [PATCH 07/57] power: ab8500_bm: Detect removed charger mathieu.poirier
2012-09-27 3:09 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 08/57] power: ab8500_fg: flush sync on suspend mathieu.poirier
2012-09-27 3:11 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 09/57] power: ab8500_fg: usleep_range instead of short msleep mathieu.poirier
2012-09-27 2:36 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 10/57] power: ab8500_charger: Handle gpadc errors mathieu.poirier
2012-09-25 16:12 ` [PATCH 11/57] power: Recharge condition not optimal for battery mathieu.poirier
2012-09-27 3:29 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 12/57] power: ab8500_fg: balance IRQ enable mathieu.poirier
2012-09-25 16:12 ` [PATCH 13/57] power: ab8500_bm: Ignore false btemp low interrupt mathieu.poirier
2012-09-27 3:32 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 14/57] power: Adds support for Car/Travel Adapters mathieu.poirier
2012-09-25 16:12 ` [PATCH 15/57] power: ab8500_fg: Round capacity output mathieu.poirier
2012-09-25 16:12 ` [PATCH 16/57] power: bm remove superfluous BTEMP thermal comp mathieu.poirier
2012-09-25 16:12 ` [PATCH 17/57] power: ab8500_bm: Added support for BATT_OVV mathieu.poirier
2012-09-27 3:36 ` Anton Vorontsov
2012-09-28 18:24 ` Mathieu Poirier
2012-09-28 18:26 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 18/57] power: Add sysfs interfaces for capacity mathieu.poirier
2012-09-27 7:08 ` Anton Vorontsov
2012-09-28 18:26 ` Mathieu Poirier
2012-09-28 19:11 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 19/57] power: remove unused defines mathieu.poirier
2012-09-25 16:12 ` [PATCH 20/57] power: Adds support for legacy USB chargers mathieu.poirier
2012-09-27 7:15 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 21/57] power: Overflow in current calculation mathieu.poirier
2012-09-25 16:12 ` [PATCH 22/57] power: AB workaround for invalid charger mathieu.poirier
2012-09-25 16:12 ` [PATCH 23/57] power: Add plaform data charger configurables mathieu.poirier
2012-09-25 16:12 ` [PATCH 24/57] power: ab8500_fg: Adjust for RF bursts voltage drops mathieu.poirier
2012-09-25 16:12 ` [PATCH 25/57] power: ab8500: adaptation to ab version mathieu.poirier
2012-09-25 16:12 ` [PATCH 26/57] power: charge: update watchdog for pm2xxx support mathieu.poirier
2012-09-25 16:12 ` [PATCH 27/57] power: sysfs interface update mathieu.poirier
2012-09-27 7:20 ` Anton Vorontsov
2012-09-28 18:26 ` Mathieu Poirier
2012-09-25 16:12 ` [PATCH 28/57] power: ab8500 - Accessing Autopower register fails mathieu.poirier
2012-09-25 16:12 ` [PATCH 29/57] power: ab8500_fg: Goto INIT_RECOVERY when charger removed mathieu.poirier
2012-09-25 16:12 ` [PATCH 30/57] power: ab8500: Flush & sync all works mathieu.poirier
2012-09-27 7:23 ` Anton Vorontsov
2012-09-28 18:28 ` Mathieu Poirier
2012-09-28 19:54 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 31/57] power: ab8500_fg: fix to use correct battery charge full design mathieu.poirier
2012-09-27 7:27 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 32/57] power: ab8500_charger: Do not touch VBUSOVV bits mathieu.poirier
2012-09-25 16:12 ` [PATCH 33/57] power: u8500_charger: Delay for USB enumeration mathieu.poirier
2012-09-27 7:42 ` Anton Vorontsov
2012-09-28 16:56 ` Mathieu Poirier
2012-09-28 17:09 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 34/57] power: ab8500_fg: add power cut feature for ab8505 mathieu.poirier
2012-09-28 0:01 ` Anton Vorontsov [this message]
2012-09-25 16:12 ` [PATCH 35/57] power: ab8500_fg: Report unscaled capacity mathieu.poirier
2012-09-25 16:12 ` [PATCH 36/57] power: add backup battery charge voltages mathieu.poirier
2012-09-25 16:12 ` [PATCH 37/57] power: ab8500_bm: Quick re-attach charging behaviour mathieu.poirier
2012-09-28 0:13 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 38/57] power: l9540: Charge only mode fixes mathieu.poirier
2012-09-28 0:27 ` Anton Vorontsov
2012-09-28 18:32 ` Mathieu Poirier
2012-09-25 16:12 ` [PATCH 39/57] power: ab8500_charger: Prevent auto drop of VBUS mathieu.poirier
2012-09-28 0:52 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 40/57] power: ab8500: ADC for battery thermistor mathieu.poirier
2012-09-28 0:57 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 41/57] power: ab8500_btemp: Filter btemp readings mathieu.poirier
2012-09-25 16:12 ` [PATCH 42/57] power: charging: Allow capacity to raise from 1% mathieu.poirier
2012-09-25 16:12 ` [PATCH 43/57] power: charging: Add AB8505_USB_LINK_STATUS mathieu.poirier
2012-09-25 16:12 ` [PATCH 44/57] power: ab8500: remove unecesary define flag mathieu.poirier
2012-09-28 1:05 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 45/57] power: ab8500: defer btemp filtering while init mathieu.poirier
2012-09-28 1:08 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 46/57] power: chargealg: Realign with upstream version mathieu.poirier
2012-09-28 1:17 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 47/57] power: Harmonising platform data declaration/handling mathieu.poirier
2012-09-28 1:11 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 48/57] power: ab8500 : quick re-attach for ext charger mathieu.poirier
2012-09-28 1:19 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 49/57] power: Cancelling status charging notification mathieu.poirier
2012-09-28 2:16 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 50/57] power: ab8500-chargalg: update battery health on safety timer exp mathieu.poirier
2012-09-28 2:21 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 51/57] power: ab8500: Re-alignment with internal developement mathieu.poirier
2012-09-28 2:35 ` Anton Vorontsov
2012-09-28 2:45 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 52/57] power: abx500_chargalg: Use hrtimer mathieu.poirier
2012-09-28 2:47 ` Anton Vorontsov
2012-09-28 18:33 ` Mathieu Poirier
2012-09-28 19:41 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 53/57] power: ab8500_fg: Moving structure definitions to header file mathieu.poirier
2012-09-28 2:51 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 54/57] power: ab8500_charger: Use USBLink1Status Register mathieu.poirier
2012-09-28 2:56 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 55/57] power: ab8500_charger: Add UsbLineCtrl2 reference mathieu.poirier
2012-09-28 2:58 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 56/57] power: abx500_chargalg: Fix quick re-attach charger issue mathieu.poirier
2012-09-28 3:00 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 57/57] power: ab8500_charger: Limit USB charger current mathieu.poirier
2012-09-27 3:38 ` [PATCH 00/57] power: Upgrade to ux500 battery management driver Anton Vorontsov
2012-09-27 22:08 ` Mathieu Poirier
2012-09-28 0:36 ` Anton Vorontsov
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=20120928000115.GA20560@lizard \
--to=anton.vorontsov@linaro.org \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.poirier@linaro.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).