From: Anton Vorontsov <anton.vorontsov@linaro.org>
To: Arun Murthy <arun.murthy@stericsson.com>
Cc: dwmw2@infradead.org, linux-kernel@vger.kernel.org,
karl.komierowski@stericsson.com, johan.palsson@stericsson.com,
linus.walleij@linaro.org
Subject: [PATCH 3/6] ab8500_fg: Get rid of 'struct v_to_cap'
Date: Wed, 14 Mar 2012 05:05:09 +0400 [thread overview]
Message-ID: <20120314010509.GC10798@oksana.dev.rtsoft.ru> (raw)
In-Reply-To: <20120314005901.GB1778@oksana.dev.rtsoft.ru>
The struct is duplicated, plus when used it causes the following
warnings:
CHECK drivers/power/ab8500_fg.c
ab8500_fg.c:818:13: warning: incorrect type in assignment (different base types)
ab8500_fg.c:818:13: expected struct v_to_cap *tbl
ab8500_fg.c:818:13: got struct abx500_v_to_cap *const v_to_cap_tbl
CC drivers/power/ab8500_fg.o
ab8500_fg.c: In function 'ab8500_fg_volt_to_capacity':
ab8500_fg.c:818:6: warning: assignment from incompatible pointer type [enabled by default]
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
---
drivers/power/ab8500_fg.c | 2 +-
include/linux/mfd/abx500/ab8500-bm.h | 10 ----------
2 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index 41ccb70..180c21a 100644
--- a/drivers/power/ab8500_fg.c
+++ b/drivers/power/ab8500_fg.c
@@ -812,7 +812,7 @@ static int ab8500_fg_bat_voltage(struct ab8500_fg *di)
static int ab8500_fg_volt_to_capacity(struct ab8500_fg *di, int voltage)
{
int i, tbl_size;
- struct v_to_cap *tbl;
+ struct abx500_v_to_cap *tbl;
int cap = 0;
tbl = di->bat->bat_type[di->bat->batt_id].v_to_cap_tbl,
diff --git a/include/linux/mfd/abx500/ab8500-bm.h b/include/linux/mfd/abx500/ab8500-bm.h
index f61b7b9..44d8620 100644
--- a/include/linux/mfd/abx500/ab8500-bm.h
+++ b/include/linux/mfd/abx500/ab8500-bm.h
@@ -255,16 +255,6 @@ struct batres_vs_temp {
int resist;
};
-/**
- * struct v_to_cap - Table for translating voltage to capacity
- * @voltage: Voltage in mV
- * @capacity: Capacity in percent
- */
-struct v_to_cap {
- int voltage;
- int capacity;
-};
-
/* Forward declaration */
struct ab8500_fg;
--
1.7.9
next prev parent reply other threads:[~2012-03-14 1:05 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-29 16:24 [PATCH 0/4] AB8500 Battery Management Driver Arun Murthy
2012-02-29 16:24 ` [PATCH 1/4] power: abx500-chargalg: Add abx500 charging algorithm Arun Murthy
2012-02-29 16:24 ` [PATCH 2/4] power: ab8500-charger: AB8500 charger driver Arun Murthy
2012-02-29 17:50 ` Andi
2012-02-29 18:21 ` Arun Murthy
2012-02-29 16:24 ` [PATCH 3/4] power: ab8500-fg: A8500 fuel gauge driver Arun Murthy
2012-02-29 16:24 ` [PATCH 4/4] power: ab8500-btemp: AB8500 battery temperature driver Arun Murthy
2012-03-14 0:59 ` [PATCH 0/4] AB8500 Battery Management Driver Anton Vorontsov
2012-03-14 1:04 ` [PATCH 1/6] ab8500_charger: Convert to the new USB OTG calls Anton Vorontsov
2012-03-14 4:03 ` Arun MURTHY
2012-03-14 1:05 ` [PATCH 2/6] ab8500_btemp: Get rid of 'enum adc_therm' Anton Vorontsov
2012-03-14 4:25 ` Arun MURTHY
2012-03-14 1:05 ` Anton Vorontsov [this message]
2012-03-14 4:36 ` [PATCH 3/6] ab8500_fg: Get rid of 'struct v_to_cap' Arun MURTHY
2012-03-14 1:05 ` [PATCH 4/6] ab8500_fg: Get rid of 'struct battery_type' Anton Vorontsov
2012-03-14 4:36 ` Arun MURTHY
2012-03-14 1:05 ` [PATCH 5/6] ab8500_fg: Fix copy-paste error Anton Vorontsov
2012-03-14 4:36 ` Arun MURTHY
2012-03-14 5:45 ` Arun MURTHY
2012-03-14 1:05 ` [PATCH 6/6] ab8500: Turn unneeded global symbols into local ones Anton Vorontsov
2012-03-14 4:37 ` Arun MURTHY
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=20120314010509.GC10798@oksana.dev.rtsoft.ru \
--to=anton.vorontsov@linaro.org \
--cc=arun.murthy@stericsson.com \
--cc=dwmw2@infradead.org \
--cc=johan.palsson@stericsson.com \
--cc=karl.komierowski@stericsson.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@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