2011-05-21 12:24:53

by Pavel Machek

Subject: spitz pm: adjust messages

Charger error is something that should be reported to the syslog; do
it. If temperature reading fails, we do not want to charge the
battery, anyway.

Signed-off-by: Pavel Machek <[email protected]>

diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index 785880f..513588c 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -317,6 +302,8 @@ static void sharpsl_charge_off(void)

static void sharpsl_charge_error(void)
{
+ dev_warn(sharpsl_pm.dev, "Charger Error\n");
+
sharpsl_pm_led(SHARPSL_LED_ERROR);
sharpsl_pm.machinfo->charge(0);
sharpsl_pm.charge_mode = CHRG_ERROR;
@@ -513,8 +500,10 @@ static int sharpsl_check_battery_temp(void)
val = get_select_val(buff);

dev_dbg(sharpsl_pm.dev, "Temperature: %d\n", val);
- if (val > sharpsl_pm.machinfo->charge_on_temp) {
- printk(KERN_WARNING "Not charging: temperature out of limits.\n");
+ /* FIXME: this should catch battery read errors, but we should
+ probably avoid charging in <0C temperatures, too. */
+ if ((val < 0) || (val > sharpsl_pm.machinfo->charge_on_temp)) {
+ dev_warn(sharpsl_pm.dev, "Not charging: temperature %d out of limits.\n", val);
return -1;
}

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

2011-05-21 17:27:44

by Marek Vasut

Subject: Re: spitz pm: adjust messages

On Saturday, May 21, 2011 02:24:50 PM Pavel Machek wrote:
> Charger error is something that should be reported to the syslog; do
> it. If temperature reading fails, we do not want to charge the
> battery, anyway.
>
> Signed-off-by: Pavel Machek <[email protected]>
>
> diff --git a/arch/arm/mach-pxa/sharpsl_pm.c
> b/arch/arm/mach-pxa/sharpsl_pm.c index 785880f..513588c 100644
> --- a/arch/arm/mach-pxa/sharpsl_pm.c
> +++ b/arch/arm/mach-pxa/sharpsl_pm.c
> @@ -317,6 +302,8 @@ static void sharpsl_charge_off(void)
>
> static void sharpsl_charge_error(void)
> {
> + dev_warn(sharpsl_pm.dev, "Charger Error\n");
> +
> sharpsl_pm_led(SHARPSL_LED_ERROR);
> sharpsl_pm.machinfo->charge(0);
> sharpsl_pm.charge_mode = CHRG_ERROR;
> @@ -513,8 +500,10 @@ static int sharpsl_check_battery_temp(void)
> val = get_select_val(buff);
>
> dev_dbg(sharpsl_pm.dev, "Temperature: %d\n", val);
> - if (val > sharpsl_pm.machinfo->charge_on_temp) {
> - printk(KERN_WARNING "Not charging: temperature out of limits.\n");
> + /* FIXME: this should catch battery read errors, but we should
> + probably avoid charging in <0C temperatures, too. */
> + if ((val < 0) || (val > sharpsl_pm.machinfo->charge_on_temp)) {
> + dev_warn(sharpsl_pm.dev, "Not charging: temperature %d out of
> limits.\n", val); return -1;
> }

Acked-by: Marek Vasut <[email protected]>

2011-05-22 12:43:25

by Sergei Shtylyov

Subject: Re: spitz pm: adjust messages

Hello.

On 21-05-2011 16:24, Pavel Machek wrote:

> Charger error is something that should be reported to the syslog; do
> it. If temperature reading fails, we do not want to charge the
> battery, anyway.

> Signed-off-by: Pavel Machek <[email protected]>

> diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
> index 785880f..513588c 100644
> --- a/arch/arm/mach-pxa/sharpsl_pm.c
> +++ b/arch/arm/mach-pxa/sharpsl_pm.c
[...]
> @@ -513,8 +500,10 @@ static int sharpsl_check_battery_temp(void)
> val = get_select_val(buff);
>
> dev_dbg(sharpsl_pm.dev, "Temperature: %d\n", val);
> - if (val> sharpsl_pm.machinfo->charge_on_temp) {
> - printk(KERN_WARNING "Not charging: temperature out of limits.\n");
> + /* FIXME: this should catch battery read errors, but we should
> + probably avoid charging in<0C temperatures, too. */

The preferred style of the multi-line comments is this:

/*
* bla
* bla
*/

WBR, Sergei

2011-05-26 13:49:46

by Pavel Machek

Subject: Re: spitz pm: adjust messages

Eric, it should probably be you merging this and surrounding
patches... Any comments? Merge?
Pavel

On Sat 2011-05-21 14:24:50, Pavel Machek wrote:
> Charger error is something that should be reported to the syslog; do
> it. If temperature reading fails, we do not want to charge the
> battery, anyway.
>
> Signed-off-by: Pavel Machek <[email protected]>
>
> diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
> index 785880f..513588c 100644
> --- a/arch/arm/mach-pxa/sharpsl_pm.c
> +++ b/arch/arm/mach-pxa/sharpsl_pm.c
> @@ -317,6 +302,8 @@ static void sharpsl_charge_off(void)
>
> static void sharpsl_charge_error(void)
> {
> + dev_warn(sharpsl_pm.dev, "Charger Error\n");
> +
> sharpsl_pm_led(SHARPSL_LED_ERROR);
> sharpsl_pm.machinfo->charge(0);
> sharpsl_pm.charge_mode = CHRG_ERROR;
> @@ -513,8 +500,10 @@ static int sharpsl_check_battery_temp(void)
> val = get_select_val(buff);
>
> dev_dbg(sharpsl_pm.dev, "Temperature: %d\n", val);
> - if (val > sharpsl_pm.machinfo->charge_on_temp) {
> - printk(KERN_WARNING "Not charging: temperature out of limits.\n");
> + /* FIXME: this should catch battery read errors, but we should
> + probably avoid charging in <0C temperatures, too. */
> + if ((val < 0) || (val > sharpsl_pm.machinfo->charge_on_temp)) {
> + dev_warn(sharpsl_pm.dev, "Not charging: temperature %d out of limits.\n", val);
> return -1;
> }
>
> --
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html