From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Andrew F. Davis" Subject: Re: [PATCH v2 2/6] power: bq27x00_battery: Renaming for consistency Date: Sun, 2 Aug 2015 12:41:19 -0500 Message-ID: <55BE563F.8050102@ti.com> References: <1438112353-19704-1-git-send-email-afd@ti.com> <1438112353-19704-3-git-send-email-afd@ti.com> <20150802073132.GA3720@amd> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from comal.ext.ti.com ([198.47.26.152]:56610 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751568AbbHBRmA (ORCPT ); Sun, 2 Aug 2015 13:42:00 -0400 In-Reply-To: <20150802073132.GA3720@amd> Sender: linux-pm-owner@vger.kernel.org List-Id: linux-pm@vger.kernel.org To: Pavel Machek Cc: =?windows-1252?Q?Pali_Roh=E1r?= , Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse , Dan Murphy , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org On 08/02/2015 02:31 AM, Pavel Machek wrote: > On Tue 2015-07-28 14:39:09, Andrew F. Davis wrote: >> Rename functions that are used by multiple devices. New devices >> have been added and the function names and driver name are no longer >> general enough for the functionality they provide. >> >> Signed-off-by: Andrew F. Davis >> --- >> MAINTAINERS | 4 +- >> arch/arm/configs/omap2plus_defconfig | 2 +- >> arch/unicore32/Kconfig | 2 +- >> drivers/power/Kconfig | 22 +- >> drivers/power/Makefile | 2 +- >> .../power/{bq27x00_battery.c =3D> bq27xxx_battery.c} | 333 > > Can you elaborate why this is good idea? > > This will break people's patches, and I guess people understand that > 27123 might be handled by 27x00 driver, too... > > I feel like this is just a better, more correct name now that this=20 driver supports more than just the bq27000 and bq27200. >> drivers/w1/slaves/w1_bq27000.c | 4 +- >> .../power/{bq27x00_battery.h =3D> bq27xxx_battery.h} | 4 +- >> 8 files changed, 187 insertions(+), 186 deletions(-) >> rename drivers/power/{bq27x00_battery.c =3D> bq27xxx_battery.c} (7= 0%) >> rename include/linux/power/{bq27x00_battery.h =3D> bq27xxx_battery= =2Eh} (85%) >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index 8133cef..8143fa25 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -7212,10 +7212,10 @@ NOKIA N900 POWER SUPPLY DRIVERS >> M: Pali Roh=E1r >> S: Maintained >> F: include/linux/power/bq2415x_charger.h >> -F: include/linux/power/bq27x00_battery.h >> +F: include/linux/power/bq27xxx_battery.h >> F: include/linux/power/isp1704_charger.h >> F: drivers/power/bq2415x_charger.c >> -F: drivers/power/bq27x00_battery.c >> +F: drivers/power/bq27xxx_battery.c >> F: drivers/power/isp1704_charger.c >> F: drivers/power/rx51_battery.c >> >> diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs= /omap2plus_defconfig >> index ac521e7..a79232c 100644 >> --- a/arch/arm/configs/omap2plus_defconfig >> +++ b/arch/arm/configs/omap2plus_defconfig >> @@ -241,7 +241,7 @@ CONFIG_GPIO_TWL4030=3Dy >> CONFIG_GPIO_PALMAS=3Dy >> CONFIG_W1=3Dm >> CONFIG_HDQ_MASTER_OMAP=3Dm >> -CONFIG_BATTERY_BQ27x00=3Dm >> +CONFIG_BATTERY_BQ27XXX=3Dm >> CONFIG_CHARGER_ISP1704=3Dm >> CONFIG_CHARGER_TWL4030=3Dm >> CONFIG_CHARGER_BQ2415X=3Dm >> diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig >> index 928237a..c9faddc 100644 >> --- a/arch/unicore32/Kconfig >> +++ b/arch/unicore32/Kconfig >> @@ -222,7 +222,7 @@ config I2C_BATTERY_BQ27200 >> tristate "I2C Battery BQ27200 Support" >> select I2C_PUV3 >> select POWER_SUPPLY >> - select BATTERY_BQ27x00 >> + select BATTERY_BQ27XXX >> >> config I2C_EEPROM_AT24 >> tristate "I2C EEPROMs AT24 support" >> diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig >> index 08beeed..cafcfe2 100644 >> --- a/drivers/power/Kconfig >> +++ b/drivers/power/Kconfig >> @@ -157,26 +157,26 @@ config BATTERY_SBS >> Say Y to include support for SBS battery driver for SBS-complia= nt >> gas gauges. >> >> -config BATTERY_BQ27x00 >> - tristate "BQ27x00 battery driver" >> +config BATTERY_BQ27XXX >> + tristate "BQ27xxx battery driver" >> depends on I2C || I2C=3Dn >> help >> - Say Y here to enable support for batteries with BQ27x00 (I2C/HDQ= ) chips. >> + Say Y here to enable support for batteries with BQ27xxx (I2C/HDQ= ) chips. >> >> -config BATTERY_BQ27X00_I2C >> - bool "BQ27200/BQ27500 support" >> - depends on BATTERY_BQ27x00 >> +config BATTERY_BQ27XXX_I2C >> + bool "BQ27xxx I2C support" >> + depends on BATTERY_BQ27XXX >> depends on I2C >> default y >> help >> - Say Y here to enable support for batteries with BQ27x00 (I2C) ch= ips. >> + Say Y here to enable support for batteries with BQ27xxx (I2C) ch= ips. >> >> -config BATTERY_BQ27X00_PLATFORM >> - bool "BQ27000 support" >> - depends on BATTERY_BQ27x00 >> +config BATTERY_BQ27XXX_PLATFORM >> + bool "BQ27xxx HDQ support" >> + depends on BATTERY_BQ27XXX >> default y >> help >> - Say Y here to enable support for batteries with BQ27000 (HDQ) ch= ips. >> + Say Y here to enable support for batteries with BQ27xxx (HDQ) ch= ips. >> >> config BATTERY_DA9030 >> tristate "DA9030 battery driver" >> diff --git a/drivers/power/Makefile b/drivers/power/Makefile >> index 5752ce8..7a5bc96 100644 >> --- a/drivers/power/Makefile >> +++ b/drivers/power/Makefile >> @@ -29,7 +29,7 @@ obj-$(CONFIG_BATTERY_COLLIE) +=3D collie_battery.o >> obj-$(CONFIG_BATTERY_IPAQ_MICRO) +=3D ipaq_micro_battery.o >> obj-$(CONFIG_BATTERY_WM97XX) +=3D wm97xx_battery.o >> obj-$(CONFIG_BATTERY_SBS) +=3D sbs-battery.o >> -obj-$(CONFIG_BATTERY_BQ27x00) +=3D bq27x00_battery.o >> +obj-$(CONFIG_BATTERY_BQ27XXX) +=3D bq27xxx_battery.o >> obj-$(CONFIG_BATTERY_DA9030) +=3D da9030_battery.o >> obj-$(CONFIG_BATTERY_DA9052) +=3D da9052-battery.o >> obj-$(CONFIG_CHARGER_DA9150) +=3D da9150-charger.o >> diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27xxx= _battery.c >> similarity index 70% >> rename from drivers/power/bq27x00_battery.c >> rename to drivers/power/bq27xxx_battery.c >> index d0b2f3b..e72055c 100644 >> --- a/drivers/power/bq27x00_battery.c >> +++ b/drivers/power/bq27xxx_battery.c >> @@ -1,5 +1,5 @@ >> /* >> - * BQ27x00 battery driver >> + * BQ27xxx battery driver >> * >> * Copyright (C) 2008 Rodolfo Giometti >> * Copyright (C) 2008 Eurotech S.p.A. >> @@ -37,7 +37,7 @@ >> #include >> #include >> >> -#include >> +#include >> >> #define DRIVER_VERSION "1.2.0" >> >> @@ -83,17 +83,17 @@ >> #define BQ27425_REG_SOC (0x1C + BQ27425_REG_OFFSET) >> #define BQ27425_REG_DCAP (0x3C + BQ27425_REG_OFFSET) >> >> -#define BQ27000_RS 20 /* Resistor sense */ >> -#define BQ27x00_POWER_CONSTANT (256 * 29200 / 1000) >> +#define BQ27XXX_RS 20 /* Resistor sense */ >> +#define BQ27XXX_POWER_CONSTANT (256 * 29200 / 1000) >> >> -struct bq27x00_device_info; >> -struct bq27x00_access_methods { >> - int (*read)(struct bq27x00_device_info *di, u8 reg, bool single); >> +struct bq27xxx_device_info; >> +struct bq27xxx_access_methods { >> + int (*read)(struct bq27xxx_device_info *di, u8 reg, bool single); >> }; >> >> -enum bq27x00_chip { BQ27000, BQ27500, BQ27425, BQ27742, BQ27510}; >> +enum bq27xxx_chip { BQ27000, BQ27500, BQ27425, BQ27742, BQ27510}; >> >> -struct bq27x00_reg_cache { >> +struct bq27xxx_reg_cache { >> int temperature; >> int time_to_empty; >> int time_to_empty_avg; >> @@ -107,12 +107,12 @@ struct bq27x00_reg_cache { >> int health; >> }; >> >> -struct bq27x00_device_info { >> +struct bq27xxx_device_info { >> struct device *dev; >> int id; >> - enum bq27x00_chip chip; >> + enum bq27xxx_chip chip; >> >> - struct bq27x00_reg_cache cache; >> + struct bq27xxx_reg_cache cache; >> int charge_design_full; >> >> unsigned long last_update; >> @@ -120,7 +120,7 @@ struct bq27x00_device_info { >> >> struct power_supply *bat; >> >> - struct bq27x00_access_methods bus; >> + struct bq27xxx_access_methods bus; >> >> struct mutex lock; >> }; >> @@ -206,10 +206,10 @@ MODULE_PARM_DESC(poll_interval, >> "battery poll interval in seconds - 0 disables polling"); >> >> /* >> - * Common code for BQ27x00 devices >> + * Common code for BQ27xxx devices >> */ >> >> -static inline int bq27x00_read(struct bq27x00_device_info *di, u8 r= eg, >> +static inline int bq27xxx_read(struct bq27xxx_device_info *di, u8 r= eg, >> bool single) >> { >> if (di->chip =3D=3D BQ27425) >> @@ -222,7 +222,7 @@ static inline int bq27x00_read(struct bq27x00_de= vice_info *di, u8 reg, >> * differ from BQ27000 and BQ27200 in calculation of certain >> * parameters. Hence we need to check for the chip type. >> */ >> -static bool bq27xxx_is_chip_version_higher(struct bq27x00_device_in= fo *di) >> +static bool bq27xxx_is_chip_version_higher(struct bq27xxx_device_in= fo *di) >> { >> if (di->chip =3D=3D BQ27425 || di->chip =3D=3D BQ27500 || di->chi= p =3D=3D BQ27742 >> || di->chip =3D=3D BQ27510) >> @@ -234,18 +234,18 @@ static bool bq27xxx_is_chip_version_higher(str= uct bq27x00_device_info *di) >> * Return the battery Relative State-of-Charge >> * Or < 0 if something fails. >> */ >> -static int bq27x00_battery_read_rsoc(struct bq27x00_device_info *di= ) >> +static int bq27xxx_battery_read_rsoc(struct bq27xxx_device_info *di= ) >> { >> int rsoc; >> >> if (di->chip =3D=3D BQ27500 || di->chip =3D=3D BQ27742) >> - rsoc =3D bq27x00_read(di, BQ27500_REG_SOC, false); >> + rsoc =3D bq27xxx_read(di, BQ27500_REG_SOC, false); >> else if (di->chip =3D=3D BQ27510) >> - rsoc =3D bq27x00_read(di, BQ27510_REG_SOC, false); >> + rsoc =3D bq27xxx_read(di, BQ27510_REG_SOC, false); >> else if (di->chip =3D=3D BQ27425) >> - rsoc =3D bq27x00_read(di, BQ27425_REG_SOC, false); >> + rsoc =3D bq27xxx_read(di, BQ27425_REG_SOC, false); >> else >> - rsoc =3D bq27x00_read(di, BQ27000_REG_RSOC, true); >> + rsoc =3D bq27xxx_read(di, BQ27000_REG_RSOC, true); >> >> if (rsoc < 0) >> dev_dbg(di->dev, "error reading relative State-of-Charge\n"); >> @@ -257,11 +257,11 @@ static int bq27x00_battery_read_rsoc(struct bq= 27x00_device_info *di) >> * Return a battery charge value in =B5Ah >> * Or < 0 if something fails. >> */ >> -static int bq27x00_battery_read_charge(struct bq27x00_device_info *= di, u8 reg) >> +static int bq27xxx_battery_read_charge(struct bq27xxx_device_info *= di, u8 reg) >> { >> int charge; >> >> - charge =3D bq27x00_read(di, reg, false); >> + charge =3D bq27xxx_read(di, reg, false); >> if (charge < 0) { >> dev_dbg(di->dev, "error reading charge register %02x: %d\n", >> reg, charge); >> @@ -271,7 +271,7 @@ static int bq27x00_battery_read_charge(struct bq= 27x00_device_info *di, u8 reg) >> if (bq27xxx_is_chip_version_higher(di)) >> charge *=3D 1000; >> else >> - charge =3D charge * 3570 / BQ27000_RS; >> + charge =3D charge * 3570 / BQ27XXX_RS; >> >> return charge; >> } >> @@ -280,7 +280,7 @@ static int bq27x00_battery_read_charge(struct bq= 27x00_device_info *di, u8 reg) >> * Return the battery Nominal available capaciy in =B5Ah >> * Or < 0 if something fails. >> */ >> -static inline int bq27x00_battery_read_nac(struct bq27x00_device_in= fo *di) >> +static inline int bq27xxx_battery_read_nac(struct bq27xxx_device_in= fo *di) >> { >> int flags; >> bool is_bq27500 =3D di->chip =3D=3D BQ27500; >> @@ -288,39 +288,39 @@ static inline int bq27x00_battery_read_nac(str= uct bq27x00_device_info *di) >> bool is_higher =3D bq27xxx_is_chip_version_higher(di); >> bool flags_1b =3D !(is_bq27500 || is_bq27742); >> >> - flags =3D bq27x00_read(di, BQ27x00_REG_FLAGS, flags_1b); >> + flags =3D bq27xxx_read(di, BQ27x00_REG_FLAGS, flags_1b); >> if (flags >=3D 0 && !is_higher && (flags & BQ27000_FLAG_CI)) >> return -ENODATA; >> >> - return bq27x00_battery_read_charge(di, BQ27x00_REG_NAC); >> + return bq27xxx_battery_read_charge(di, BQ27x00_REG_NAC); >> } >> >> /* >> * Return the battery Last measured discharge in =B5Ah >> * Or < 0 if something fails. >> */ >> -static inline int bq27x00_battery_read_lmd(struct bq27x00_device_in= fo *di) >> +static inline int bq27xxx_battery_read_lmd(struct bq27xxx_device_in= fo *di) >> { >> - return bq27x00_battery_read_charge(di, BQ27x00_REG_LMD); >> + return bq27xxx_battery_read_charge(di, BQ27x00_REG_LMD); >> } >> >> /* >> * Return the battery Initial last measured discharge in =B5Ah >> * Or < 0 if something fails. >> */ >> -static int bq27x00_battery_read_ilmd(struct bq27x00_device_info *di= ) >> +static int bq27xxx_battery_read_ilmd(struct bq27xxx_device_info *di= ) >> { >> int ilmd; >> >> if (bq27xxx_is_chip_version_higher(di)) { >> if (di->chip =3D=3D BQ27425) >> - ilmd =3D bq27x00_read(di, BQ27425_REG_DCAP, false); >> + ilmd =3D bq27xxx_read(di, BQ27425_REG_DCAP, false); >> else if (di->chip =3D=3D BQ27510) >> - ilmd =3D bq27x00_read(di, BQ27510_REG_DCAP, false); >> + ilmd =3D bq27xxx_read(di, BQ27510_REG_DCAP, false); >> else >> - ilmd =3D bq27x00_read(di, BQ27500_REG_DCAP, false); >> + ilmd =3D bq27xxx_read(di, BQ27500_REG_DCAP, false); >> } else { >> - ilmd =3D bq27x00_read(di, BQ27000_REG_ILMD, true); >> + ilmd =3D bq27xxx_read(di, BQ27000_REG_ILMD, true); >> } >> >> if (ilmd < 0) { >> @@ -331,7 +331,7 @@ static int bq27x00_battery_read_ilmd(struct bq27= x00_device_info *di) >> if (bq27xxx_is_chip_version_higher(di)) >> ilmd *=3D 1000; >> else >> - ilmd =3D ilmd * 256 * 3570 / BQ27000_RS; >> + ilmd =3D ilmd * 256 * 3570 / BQ27XXX_RS; >> >> return ilmd; >> } >> @@ -340,11 +340,11 @@ static int bq27x00_battery_read_ilmd(struct bq= 27x00_device_info *di) >> * Return the battery Available energy in =B5Wh >> * Or < 0 if something fails. >> */ >> -static int bq27x00_battery_read_energy(struct bq27x00_device_info *= di) >> +static int bq27xxx_battery_read_energy(struct bq27xxx_device_info *= di) >> { >> int ae; >> >> - ae =3D bq27x00_read(di, BQ27x00_REG_AE, false); >> + ae =3D bq27xxx_read(di, BQ27x00_REG_AE, false); >> if (ae < 0) { >> dev_dbg(di->dev, "error reading available energy\n"); >> return ae; >> @@ -353,7 +353,7 @@ static int bq27x00_battery_read_energy(struct bq= 27x00_device_info *di) >> if (di->chip =3D=3D BQ27500) >> ae *=3D 1000; >> else >> - ae =3D ae * 29200 / BQ27000_RS; >> + ae =3D ae * 29200 / BQ27XXX_RS; >> >> return ae; >> } >> @@ -362,11 +362,11 @@ static int bq27x00_battery_read_energy(struct = bq27x00_device_info *di) >> * Return the battery temperature in tenths of degree Kelvin >> * Or < 0 if something fails. >> */ >> -static int bq27x00_battery_read_temperature(struct bq27x00_device_i= nfo *di) >> +static int bq27xxx_battery_read_temperature(struct bq27xxx_device_i= nfo *di) >> { >> int temp; >> >> - temp =3D bq27x00_read(di, BQ27x00_REG_TEMP, false); >> + temp =3D bq27xxx_read(di, BQ27x00_REG_TEMP, false); >> if (temp < 0) { >> dev_err(di->dev, "error reading temperature\n"); >> return temp; >> @@ -382,14 +382,14 @@ static int bq27x00_battery_read_temperature(st= ruct bq27x00_device_info *di) >> * Return the battery Cycle count total >> * Or < 0 if something fails. >> */ >> -static int bq27x00_battery_read_cyct(struct bq27x00_device_info *di= ) >> +static int bq27xxx_battery_read_cyct(struct bq27xxx_device_info *di= ) >> { >> int cyct; >> >> if (di->chip =3D=3D BQ27510) >> - cyct =3D bq27x00_read(di, BQ27510_REG_CYCT, false); >> + cyct =3D bq27xxx_read(di, BQ27510_REG_CYCT, false); >> else >> - cyct =3D bq27x00_read(di, BQ27x00_REG_CYCT, false); >> + cyct =3D bq27xxx_read(di, BQ27x00_REG_CYCT, false); >> if (cyct < 0) >> dev_err(di->dev, "error reading cycle count total\n"); >> >> @@ -400,11 +400,11 @@ static int bq27x00_battery_read_cyct(struct bq= 27x00_device_info *di) >> * Read a time register. >> * Return < 0 if something fails. >> */ >> -static int bq27x00_battery_read_time(struct bq27x00_device_info *di= , u8 reg) >> +static int bq27xxx_battery_read_time(struct bq27xxx_device_info *di= , u8 reg) >> { >> int tval; >> >> - tval =3D bq27x00_read(di, reg, false); >> + tval =3D bq27xxx_read(di, reg, false); >> if (tval < 0) { >> dev_dbg(di->dev, "error reading time register %02x: %d\n", >> reg, tval); >> @@ -421,11 +421,11 @@ static int bq27x00_battery_read_time(struct bq= 27x00_device_info *di, u8 reg) >> * Read a power avg register. >> * Return < 0 if something fails. >> */ >> -static int bq27x00_battery_read_pwr_avg(struct bq27x00_device_info = *di, u8 reg) >> +static int bq27xxx_battery_read_pwr_avg(struct bq27xxx_device_info = *di, u8 reg) >> { >> int tval; >> >> - tval =3D bq27x00_read(di, reg, false); >> + tval =3D bq27xxx_read(di, reg, false); >> if (tval < 0) { >> dev_err(di->dev, "error reading power avg rgister %02x: %d\n", >> reg, tval); >> @@ -435,18 +435,18 @@ static int bq27x00_battery_read_pwr_avg(struct= bq27x00_device_info *di, u8 reg) >> if (di->chip =3D=3D BQ27500) >> return tval; >> else >> - return (tval * BQ27x00_POWER_CONSTANT) / BQ27000_RS; >> + return (tval * BQ27XXX_POWER_CONSTANT) / BQ27XXX_RS; >> } >> >> /* >> * Read flag register. >> * Return < 0 if something fails. >> */ >> -static int bq27x00_battery_read_health(struct bq27x00_device_info *= di) >> +static int bq27xxx_battery_read_health(struct bq27xxx_device_info *= di) >> { >> int tval; >> >> - tval =3D bq27x00_read(di, BQ27x00_REG_FLAGS, false); >> + tval =3D bq27xxx_read(di, BQ27x00_REG_FLAGS, false); >> if (tval < 0) { >> dev_err(di->dev, "error reading flag register:%d\n", tval); >> return tval; >> @@ -475,16 +475,16 @@ static int bq27x00_battery_read_health(struct = bq27x00_device_info *di) >> return -1; >> } >> >> -static void bq27x00_update(struct bq27x00_device_info *di) >> +static void bq27xxx_battery_update(struct bq27xxx_device_info *di) >> { >> - struct bq27x00_reg_cache cache =3D {0, }; >> + struct bq27xxx_reg_cache cache =3D {0, }; >> bool is_bq27500 =3D di->chip =3D=3D BQ27500; >> bool is_bq27510 =3D di->chip =3D=3D BQ27510; >> bool is_bq27425 =3D di->chip =3D=3D BQ27425; >> bool is_bq27742 =3D di->chip =3D=3D BQ27742; >> bool flags_1b =3D !(is_bq27500 || is_bq27742); >> >> - cache.flags =3D bq27x00_read(di, BQ27x00_REG_FLAGS, flags_1b); >> + cache.flags =3D bq27xxx_read(di, BQ27x00_REG_FLAGS, flags_1b); >> if ((cache.flags & 0xff) =3D=3D 0xff) >> /* read error */ >> cache.flags =3D -1; >> @@ -500,41 +500,41 @@ static void bq27x00_update(struct bq27x00_devi= ce_info *di) >> cache.charge_full =3D -ENODATA; >> cache.health =3D -ENODATA; >> } else { >> - cache.capacity =3D bq27x00_battery_read_rsoc(di); >> + cache.capacity =3D bq27xxx_battery_read_rsoc(di); >> if (is_bq27742 || is_bq27510) >> cache.time_to_empty =3D >> - bq27x00_battery_read_time(di, >> + bq27xxx_battery_read_time(di, >> BQ27x00_REG_TTE); >> else if (!is_bq27425) { >> - cache.energy =3D bq27x00_battery_read_energy(di); >> + cache.energy =3D bq27xxx_battery_read_energy(di); >> cache.time_to_empty =3D >> - bq27x00_battery_read_time(di, >> + bq27xxx_battery_read_time(di, >> BQ27x00_REG_TTE); >> cache.time_to_empty_avg =3D >> - bq27x00_battery_read_time(di, >> + bq27xxx_battery_read_time(di, >> BQ27x00_REG_TTECP); >> cache.time_to_full =3D >> - bq27x00_battery_read_time(di, >> + bq27xxx_battery_read_time(di, >> BQ27x00_REG_TTF); >> } >> - cache.charge_full =3D bq27x00_battery_read_lmd(di); >> - cache.health =3D bq27x00_battery_read_health(di); >> + cache.charge_full =3D bq27xxx_battery_read_lmd(di); >> + cache.health =3D bq27xxx_battery_read_health(di); >> } >> - cache.temperature =3D bq27x00_battery_read_temperature(di); >> + cache.temperature =3D bq27xxx_battery_read_temperature(di); >> if (!is_bq27425) >> - cache.cycle_count =3D bq27x00_battery_read_cyct(di); >> + cache.cycle_count =3D bq27xxx_battery_read_cyct(di); >> if (is_bq27742) >> cache.power_avg =3D >> - bq27x00_battery_read_pwr_avg(di, >> + bq27xxx_battery_read_pwr_avg(di, >> BQ27742_POWER_AVG); >> else >> cache.power_avg =3D >> - bq27x00_battery_read_pwr_avg(di, >> + bq27xxx_battery_read_pwr_avg(di, >> BQ27x00_POWER_AVG); >> >> /* We only have to read charge design full once */ >> if (di->charge_design_full <=3D 0) >> - di->charge_design_full =3D bq27x00_battery_read_ilmd(di); >> + di->charge_design_full =3D bq27xxx_battery_read_ilmd(di); >> } >> >> if (di->cache.capacity !=3D cache.capacity) >> @@ -546,12 +546,12 @@ static void bq27x00_update(struct bq27x00_devi= ce_info *di) >> di->last_update =3D jiffies; >> } >> >> -static void bq27x00_battery_poll(struct work_struct *work) >> +static void bq27xxx_battery_poll(struct work_struct *work) >> { >> - struct bq27x00_device_info *di =3D >> - container_of(work, struct bq27x00_device_info, work.work); >> + struct bq27xxx_device_info *di =3D >> + container_of(work, struct bq27xxx_device_info, work.work); >> >> - bq27x00_update(di); >> + bq27xxx_battery_update(di); >> >> if (poll_interval > 0) { >> /* The timer does not have to be accurate. */ >> @@ -565,13 +565,13 @@ static void bq27x00_battery_poll(struct work_s= truct *work) >> * Note that current can be negative signed as well >> * Or 0 if something fails. >> */ >> -static int bq27x00_battery_current(struct bq27x00_device_info *di, >> +static int bq27xxx_battery_current(struct bq27xxx_device_info *di, >> union power_supply_propval *val) >> { >> int curr; >> int flags; >> >> - curr =3D bq27x00_read(di, BQ27x00_REG_AI, false); >> + curr =3D bq27xxx_read(di, BQ27x00_REG_AI, false); >> if (curr < 0) { >> dev_err(di->dev, "error reading current\n"); >> return curr; >> @@ -581,19 +581,19 @@ static int bq27x00_battery_current(struct bq27= x00_device_info *di, >> /* bq27500 returns signed value */ >> val->intval =3D (int)((s16)curr) * 1000; >> } else { >> - flags =3D bq27x00_read(di, BQ27x00_REG_FLAGS, false); >> + flags =3D bq27xxx_read(di, BQ27x00_REG_FLAGS, false); >> if (flags & BQ27000_FLAG_CHGS) { >> dev_dbg(di->dev, "negative current!\n"); >> curr =3D -curr; >> } >> >> - val->intval =3D curr * 3570 / BQ27000_RS; >> + val->intval =3D curr * 3570 / BQ27XXX_RS; >> } >> >> return 0; >> } >> >> -static int bq27x00_battery_status(struct bq27x00_device_info *di, >> +static int bq27xxx_battery_status(struct bq27xxx_device_info *di, >> union power_supply_propval *val) >> { >> int status; >> @@ -621,7 +621,7 @@ static int bq27x00_battery_status(struct bq27x00= _device_info *di, >> return 0; >> } >> >> -static int bq27x00_battery_capacity_level(struct bq27x00_device_inf= o *di, >> +static int bq27xxx_battery_capacity_level(struct bq27xxx_device_inf= o *di, >> union power_supply_propval *val) >> { >> int level; >> @@ -655,12 +655,12 @@ static int bq27x00_battery_capacity_level(stru= ct bq27x00_device_info *di, >> * Return the battery Voltage in millivolts >> * Or < 0 if something fails. >> */ >> -static int bq27x00_battery_voltage(struct bq27x00_device_info *di, >> +static int bq27xxx_battery_voltage(struct bq27xxx_device_info *di, >> union power_supply_propval *val) >> { >> int volt; >> >> - volt =3D bq27x00_read(di, BQ27x00_REG_VOLT, false); >> + volt =3D bq27xxx_read(di, BQ27x00_REG_VOLT, false); >> if (volt < 0) { >> dev_err(di->dev, "error reading voltage\n"); >> return volt; >> @@ -671,7 +671,7 @@ static int bq27x00_battery_voltage(struct bq27x0= 0_device_info *di, >> return 0; >> } >> >> -static int bq27x00_simple_value(int value, >> +static int bq27xxx_simple_value(int value, >> union power_supply_propval *val) >> { >> if (value < 0) >> @@ -682,17 +682,17 @@ static int bq27x00_simple_value(int value, >> return 0; >> } >> >> -static int bq27x00_battery_get_property(struct power_supply *psy, >> +static int bq27xxx_battery_get_property(struct power_supply *psy, >> enum power_supply_property psp, >> union power_supply_propval *val) >> { >> int ret =3D 0; >> - struct bq27x00_device_info *di =3D power_supply_get_drvdata(psy); >> + struct bq27xxx_device_info *di =3D power_supply_get_drvdata(psy); >> >> mutex_lock(&di->lock); >> if (time_is_before_jiffies(di->last_update + 5 * HZ)) { >> cancel_delayed_work_sync(&di->work); >> - bq27x00_battery_poll(&di->work.work); >> + bq27xxx_battery_poll(&di->work.work); >> } >> mutex_unlock(&di->lock); >> >> @@ -701,60 +701,60 @@ static int bq27x00_battery_get_property(struct= power_supply *psy, >> >> switch (psp) { >> case POWER_SUPPLY_PROP_STATUS: >> - ret =3D bq27x00_battery_status(di, val); >> + ret =3D bq27xxx_battery_status(di, val); >> break; >> case POWER_SUPPLY_PROP_VOLTAGE_NOW: >> - ret =3D bq27x00_battery_voltage(di, val); >> + ret =3D bq27xxx_battery_voltage(di, val); >> break; >> case POWER_SUPPLY_PROP_PRESENT: >> val->intval =3D di->cache.flags < 0 ? 0 : 1; >> break; >> case POWER_SUPPLY_PROP_CURRENT_NOW: >> - ret =3D bq27x00_battery_current(di, val); >> + ret =3D bq27xxx_battery_current(di, val); >> break; >> case POWER_SUPPLY_PROP_CAPACITY: >> - ret =3D bq27x00_simple_value(di->cache.capacity, val); >> + ret =3D bq27xxx_simple_value(di->cache.capacity, val); >> break; >> case POWER_SUPPLY_PROP_CAPACITY_LEVEL: >> - ret =3D bq27x00_battery_capacity_level(di, val); >> + ret =3D bq27xxx_battery_capacity_level(di, val); >> break; >> case POWER_SUPPLY_PROP_TEMP: >> - ret =3D bq27x00_simple_value(di->cache.temperature, val); >> + ret =3D bq27xxx_simple_value(di->cache.temperature, val); >> if (ret =3D=3D 0) >> val->intval -=3D 2731; >> break; >> case POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW: >> - ret =3D bq27x00_simple_value(di->cache.time_to_empty, val); >> + ret =3D bq27xxx_simple_value(di->cache.time_to_empty, val); >> break; >> case POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG: >> - ret =3D bq27x00_simple_value(di->cache.time_to_empty_avg, val); >> + ret =3D bq27xxx_simple_value(di->cache.time_to_empty_avg, val); >> break; >> case POWER_SUPPLY_PROP_TIME_TO_FULL_NOW: >> - ret =3D bq27x00_simple_value(di->cache.time_to_full, val); >> + ret =3D bq27xxx_simple_value(di->cache.time_to_full, val); >> break; >> case POWER_SUPPLY_PROP_TECHNOLOGY: >> val->intval =3D POWER_SUPPLY_TECHNOLOGY_LION; >> break; >> case POWER_SUPPLY_PROP_CHARGE_NOW: >> - ret =3D bq27x00_simple_value(bq27x00_battery_read_nac(di), val); >> + ret =3D bq27xxx_simple_value(bq27xxx_battery_read_nac(di), val); >> break; >> case POWER_SUPPLY_PROP_CHARGE_FULL: >> - ret =3D bq27x00_simple_value(di->cache.charge_full, val); >> + ret =3D bq27xxx_simple_value(di->cache.charge_full, val); >> break; >> case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN: >> - ret =3D bq27x00_simple_value(di->charge_design_full, val); >> + ret =3D bq27xxx_simple_value(di->charge_design_full, val); >> break; >> case POWER_SUPPLY_PROP_CYCLE_COUNT: >> - ret =3D bq27x00_simple_value(di->cache.cycle_count, val); >> + ret =3D bq27xxx_simple_value(di->cache.cycle_count, val); >> break; >> case POWER_SUPPLY_PROP_ENERGY_NOW: >> - ret =3D bq27x00_simple_value(di->cache.energy, val); >> + ret =3D bq27xxx_simple_value(di->cache.energy, val); >> break; >> case POWER_SUPPLY_PROP_POWER_AVG: >> - ret =3D bq27x00_simple_value(di->cache.power_avg, val); >> + ret =3D bq27xxx_simple_value(di->cache.power_avg, val); >> break; >> case POWER_SUPPLY_PROP_HEALTH: >> - ret =3D bq27x00_simple_value(di->cache.health, val); >> + ret =3D bq27xxx_simple_value(di->cache.health, val); >> break; >> case POWER_SUPPLY_PROP_MANUFACTURER: >> val->strval =3D BQ27XXX_MANUFACTURER; >> @@ -766,15 +766,15 @@ static int bq27x00_battery_get_property(struct= power_supply *psy, >> return ret; >> } >> >> -static void bq27x00_external_power_changed(struct power_supply *psy= ) >> +static void bq27xxx_external_power_changed(struct power_supply *psy= ) >> { >> - struct bq27x00_device_info *di =3D power_supply_get_drvdata(psy); >> + struct bq27xxx_device_info *di =3D power_supply_get_drvdata(psy); >> >> cancel_delayed_work_sync(&di->work); >> schedule_delayed_work(&di->work, 0); >> } >> >> -static int bq27x00_powersupply_init(struct bq27x00_device_info *di, >> +static int bq27xxx_powersupply_init(struct bq27xxx_device_info *di, >> const char *name) >> { >> int ret; >> @@ -800,10 +800,10 @@ static int bq27x00_powersupply_init(struct bq2= 7x00_device_info *di, >> psy_desc->properties =3D bq27x00_battery_props; >> psy_desc->num_properties =3D ARRAY_SIZE(bq27x00_battery_props); >> } >> - psy_desc->get_property =3D bq27x00_battery_get_property; >> - psy_desc->external_power_changed =3D bq27x00_external_power_change= d; >> + psy_desc->get_property =3D bq27xxx_battery_get_property; >> + psy_desc->external_power_changed =3D bq27xxx_external_power_change= d; >> >> - INIT_DELAYED_WORK(&di->work, bq27x00_battery_poll); >> + INIT_DELAYED_WORK(&di->work, bq27xxx_battery_poll); >> mutex_init(&di->lock); >> >> di->bat =3D power_supply_register_no_ws(di->dev, psy_desc, &psy_c= fg); >> @@ -815,17 +815,17 @@ static int bq27x00_powersupply_init(struct bq2= 7x00_device_info *di, >> >> dev_info(di->dev, "support ver. %s enabled\n", DRIVER_VERSION); >> >> - bq27x00_update(di); >> + bq27xxx_battery_update(di); >> >> return 0; >> } >> >> -static void bq27x00_powersupply_unregister(struct bq27x00_device_in= fo *di) >> +static void bq27xxx_powersupply_unregister(struct bq27xxx_device_in= fo *di) >> { >> /* >> - * power_supply_unregister call bq27x00_battery_get_property which >> - * call bq27x00_battery_poll. >> - * Make sure that bq27x00_battery_poll will not call >> + * power_supply_unregister call bq27xxx_battery_get_property which >> + * call bq27xxx_battery_poll. >> + * Make sure that bq27xxx_battery_poll will not call >> * schedule_delayed_work again after unregister (which cause OOPS= ). >> */ >> poll_interval =3D 0; >> @@ -838,7 +838,7 @@ static void bq27x00_powersupply_unregister(struc= t bq27x00_device_info *di) >> } >> >> /* i2c specific code */ >> -#ifdef CONFIG_BATTERY_BQ27X00_I2C >> +#ifdef CONFIG_BATTERY_BQ27XXX_I2C >> >> /* If the system has several batteries we need a different name fo= r each >> * of them... >> @@ -846,7 +846,8 @@ static void bq27x00_powersupply_unregister(struc= t bq27x00_device_info *di) >> static DEFINE_IDR(battery_id); >> static DEFINE_MUTEX(battery_mutex); >> >> -static int bq27x00_read_i2c(struct bq27x00_device_info *di, u8 reg,= bool single) >> +static int bq27xxx_battery_i2c_read(struct bq27xxx_device_info *di,= u8 reg, >> + bool single) >> { >> struct i2c_client *client =3D to_i2c_client(di->dev); >> struct i2c_msg msg[2]; >> @@ -880,11 +881,11 @@ static int bq27x00_read_i2c(struct bq27x00_dev= ice_info *di, u8 reg, bool single) >> return ret; >> } >> >> -static int bq27x00_battery_probe(struct i2c_client *client, >> - const struct i2c_device_id *id) >> +static int bq27xxx_battery_i2c_probe(struct i2c_client *client, >> + const struct i2c_device_id *id) >> { >> char *name; >> - struct bq27x00_device_info *di; >> + struct bq27xxx_device_info *di; >> int num; >> int retval =3D 0; >> >> @@ -910,9 +911,9 @@ static int bq27x00_battery_probe(struct i2c_clie= nt *client, >> di->id =3D num; >> di->dev =3D &client->dev; >> di->chip =3D id->driver_data; >> - di->bus.read =3D &bq27x00_read_i2c; >> + di->bus.read =3D &bq27xxx_battery_i2c_read; >> >> - retval =3D bq27x00_powersupply_init(di, name); >> + retval =3D bq27xxx_powersupply_init(di, name); >> if (retval) >> goto batt_failed; >> >> @@ -928,11 +929,11 @@ batt_failed: >> return retval; >> } >> >> -static int bq27x00_battery_remove(struct i2c_client *client) >> +static int bq27xxx_battery_i2c_remove(struct i2c_client *client) >> { >> - struct bq27x00_device_info *di =3D i2c_get_clientdata(client); >> + struct bq27xxx_device_info *di =3D i2c_get_clientdata(client); >> >> - bq27x00_powersupply_unregister(di); >> + bq27xxx_powersupply_unregister(di); >> >> mutex_lock(&battery_mutex); >> idr_remove(&battery_id, di->id); >> @@ -941,7 +942,7 @@ static int bq27x00_battery_remove(struct i2c_cli= ent *client) >> return 0; >> } >> >> -static const struct i2c_device_id bq27x00_id[] =3D { >> +static const struct i2c_device_id bq27xxx_id[] =3D { >> { "bq27200", BQ27000 }, /* bq27200 is same as bq27000, but with i= 2c */ >> { "bq27500", BQ27500 }, >> { "bq27425", BQ27425 }, >> @@ -949,47 +950,47 @@ static const struct i2c_device_id bq27x00_id[]= =3D { >> { "bq27510", BQ27510 }, >> {}, >> }; >> -MODULE_DEVICE_TABLE(i2c, bq27x00_id); >> +MODULE_DEVICE_TABLE(i2c, bq27xxx_id); >> >> -static struct i2c_driver bq27x00_battery_driver =3D { >> +static struct i2c_driver bq27xxx_battery_i2c_driver =3D { >> .driver =3D { >> - .name =3D "bq27x00-battery", >> + .name =3D "bq27xxx-battery", >> }, >> - .probe =3D bq27x00_battery_probe, >> - .remove =3D bq27x00_battery_remove, >> - .id_table =3D bq27x00_id, >> + .probe =3D bq27xxx_battery_i2c_probe, >> + .remove =3D bq27xxx_battery_i2c_remove, >> + .id_table =3D bq27xxx_id, >> }; >> >> -static inline int bq27x00_battery_i2c_init(void) >> +static inline int bq27xxx_battery_i2c_init(void) >> { >> - int ret =3D i2c_add_driver(&bq27x00_battery_driver); >> + int ret =3D i2c_add_driver(&bq27xxx_battery_i2c_driver); >> >> if (ret) >> - pr_err("Unable to register BQ27x00 i2c driver\n"); >> + pr_err("Unable to register BQ27xxx i2c driver\n"); >> >> return ret; >> } >> >> -static inline void bq27x00_battery_i2c_exit(void) >> +static inline void bq27xxx_battery_i2c_exit(void) >> { >> - i2c_del_driver(&bq27x00_battery_driver); >> + i2c_del_driver(&bq27xxx_battery_i2c_driver); >> } >> >> #else >> >> -static inline int bq27x00_battery_i2c_init(void) { return 0; } >> -static inline void bq27x00_battery_i2c_exit(void) {}; >> +static inline int bq27xxx_battery_i2c_init(void) { return 0; } >> +static inline void bq27xxx_battery_i2c_exit(void) {}; >> >> #endif >> >> /* platform specific code */ >> -#ifdef CONFIG_BATTERY_BQ27X00_PLATFORM >> +#ifdef CONFIG_BATTERY_BQ27XXX_PLATFORM >> >> -static int bq27000_read_platform(struct bq27x00_device_info *di, u8= reg, >> - bool single) >> +static int bq27xxx_battery_platform_read(struct bq27xxx_device_info= *di, u8 reg, >> + bool single) >> { >> struct device *dev =3D di->dev; >> - struct bq27000_platform_data *pdata =3D dev->platform_data; >> + struct bq27xxx_platform_data *pdata =3D dev->platform_data; >> unsigned int timeout =3D 3; >> int upper, lower; >> int temp; >> @@ -1019,10 +1020,10 @@ static int bq27000_read_platform(struct bq27= x00_device_info *di, u8 reg, >> return pdata->read(dev, reg); >> } >> >> -static int bq27000_battery_probe(struct platform_device *pdev) >> +static int bq27xxx_battery_platform_probe(struct platform_device *p= dev) >> { >> - struct bq27x00_device_info *di; >> - struct bq27000_platform_data *pdata =3D pdev->dev.platform_data; >> + struct bq27xxx_device_info *di; >> + struct bq27xxx_platform_data *pdata =3D pdev->dev.platform_data; >> const char *name; >> >> if (!pdata) { >> @@ -1045,47 +1046,47 @@ static int bq27000_battery_probe(struct plat= form_device *pdev) >> di->chip =3D BQ27000; >> >> name =3D pdata->name ?: dev_name(&pdev->dev); >> - di->bus.read =3D &bq27000_read_platform; >> + di->bus.read =3D &bq27xxx_battery_platform_read; >> >> - return bq27x00_powersupply_init(di, name); >> + return bq27xxx_powersupply_init(di, name); >> } >> >> -static int bq27000_battery_remove(struct platform_device *pdev) >> +static int bq27xxx_battery_platform_remove(struct platform_device *= pdev) >> { >> - struct bq27x00_device_info *di =3D platform_get_drvdata(pdev); >> + struct bq27xxx_device_info *di =3D platform_get_drvdata(pdev); >> >> - bq27x00_powersupply_unregister(di); >> + bq27xxx_powersupply_unregister(di); >> >> return 0; >> } >> >> -static struct platform_driver bq27000_battery_driver =3D { >> - .probe =3D bq27000_battery_probe, >> - .remove =3D bq27000_battery_remove, >> +static struct platform_driver bq27xxx_battery_platform_driver =3D { >> + .probe =3D bq27xxx_battery_platform_probe, >> + .remove =3D bq27xxx_battery_platform_remove, >> .driver =3D { >> .name =3D "bq27000-battery", >> }, >> }; >> >> -static inline int bq27x00_battery_platform_init(void) >> +static inline int bq27xxx_battery_platform_init(void) >> { >> - int ret =3D platform_driver_register(&bq27000_battery_driver); >> + int ret =3D platform_driver_register(&bq27xxx_battery_platform_dri= ver); >> >> if (ret) >> - pr_err("Unable to register BQ27000 platform driver\n"); >> + pr_err("Unable to register BQ27xxx platform driver\n"); >> >> return ret; >> } >> >> -static inline void bq27x00_battery_platform_exit(void) >> +static inline void bq27xxx_battery_platform_exit(void) >> { >> - platform_driver_unregister(&bq27000_battery_driver); >> + platform_driver_unregister(&bq27xxx_battery_platform_driver); >> } >> >> #else >> >> -static inline int bq27x00_battery_platform_init(void) { return 0; } >> -static inline void bq27x00_battery_platform_exit(void) {}; >> +static inline int bq27xxx_battery_platform_init(void) { return 0; } >> +static inline void bq27xxx_battery_platform_exit(void) {}; >> >> #endif >> >> @@ -1093,33 +1094,33 @@ static inline void bq27x00_battery_platform_= exit(void) {}; >> * Module stuff >> */ >> >> -static int __init bq27x00_battery_init(void) >> +static int __init bq27xxx_battery_init(void) >> { >> int ret; >> >> - ret =3D bq27x00_battery_i2c_init(); >> + ret =3D bq27xxx_battery_i2c_init(); >> if (ret) >> return ret; >> >> - ret =3D bq27x00_battery_platform_init(); >> + ret =3D bq27xxx_battery_platform_init(); >> if (ret) >> - bq27x00_battery_i2c_exit(); >> + bq27xxx_battery_i2c_exit(); >> >> return ret; >> } >> -module_init(bq27x00_battery_init); >> +module_init(bq27xxx_battery_init); >> >> -static void __exit bq27x00_battery_exit(void) >> +static void __exit bq27xxx_battery_exit(void) >> { >> - bq27x00_battery_platform_exit(); >> - bq27x00_battery_i2c_exit(); >> + bq27xxx_battery_platform_exit(); >> + bq27xxx_battery_i2c_exit(); >> } >> -module_exit(bq27x00_battery_exit); >> +module_exit(bq27xxx_battery_exit); >> >> -#ifdef CONFIG_BATTERY_BQ27X00_PLATFORM >> +#ifdef CONFIG_BATTERY_BQ27XXX_PLATFORM >> MODULE_ALIAS("platform:bq27000-battery"); >> #endif >> >> MODULE_AUTHOR("Rodolfo Giometti "); >> -MODULE_DESCRIPTION("BQ27x00 battery monitor driver"); >> +MODULE_DESCRIPTION("BQ27xxx battery monitor driver"); >> MODULE_LICENSE("GPL"); >> diff --git a/drivers/w1/slaves/w1_bq27000.c b/drivers/w1/slaves/w1_b= q27000.c >> index caafb17..8480531 100644 >> --- a/drivers/w1/slaves/w1_bq27000.c >> +++ b/drivers/w1/slaves/w1_bq27000.c >> @@ -15,7 +15,7 @@ >> #include >> #include >> #include >> -#include >> +#include >> >> #include "../w1.h" >> #include "../w1_int.h" >> @@ -39,7 +39,7 @@ static int w1_bq27000_read(struct device *dev, uns= igned int reg) >> return val; >> } >> >> -static struct bq27000_platform_data bq27000_battery_info =3D { >> +static struct bq27xxx_platform_data bq27000_battery_info =3D { >> .read =3D w1_bq27000_read, >> .name =3D "bq27000-battery", >> }; >> diff --git a/include/linux/power/bq27x00_battery.h b/include/linux/p= ower/bq27xxx_battery.h >> similarity index 85% >> rename from include/linux/power/bq27x00_battery.h >> rename to include/linux/power/bq27xxx_battery.h >> index a857f71..e70a93a 100644 >> --- a/include/linux/power/bq27x00_battery.h >> +++ b/include/linux/power/bq27xxx_battery.h >> @@ -2,7 +2,7 @@ >> #define __LINUX_BQ27X00_BATTERY_H__ >> >> /** >> - * struct bq27000_plaform_data - Platform data for bq27000 devices >> + * struct bq27xxx_plaform_data - Platform data for bq27xxx devices >> * @name: Name of the battery. If NULL the driver will fallback to= "bq27000". >> * @read: HDQ read callback. >> * This function should provide access to the HDQ bus the battery = is >> @@ -11,7 +11,7 @@ >> * register to be read. The return value should either be the cont= ent of >> * the passed register or an error value. >> */ >> -struct bq27000_platform_data { >> +struct bq27xxx_platform_data { >> const char *name; >> int (*read)(struct device *dev, unsigned int); >> }; > --=20 Andrew F. Davis