Skip to contentSkip to conversation

mfd/axp20x: change battery cell name to fuel gauge

PATCH Applied Todd E Brandt 3 participants 4 messages Jan 7, 2015 – Jan 21, 2015

Subsystems (3)

v1 of 4 Applied Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 mfd/axp20x: change battery cell name to fuel gauge

mfd/axp20x: change battery cell name to fuel gauge

Name changes to the battery cell structure to a
more generic cell type: fuel gauge.

----

 drivers/mfd/axp20x.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/mfd/axp20x.c +5 -5
index b1b580a..e75717e 100644
@@ -87,7 +87,7 @@ static struct resource axp20x_pek_resources[] = {
 	},
 };
 
-static struct resource axp288_battery_resources[] = {
+static struct resource axp288_fuel_gauge_resources[] = {
 	{
 		.start = AXP288_IRQ_QWBTU,
 		.end   = AXP288_IRQ_QWBTU,
@@ -236,7 +236,7 @@ static const struct i2c_device_id axp20x_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
 
-static const struct acpi_device_id axp20x_acpi_match[] = {
+static struct acpi_device_id axp20x_acpi_match[] = {
 	{
 		.id = "INT33F4",
 		.driver_data = AXP288_ID,
@@ -350,9 +350,9 @@ static struct mfd_cell axp288_cells[] = {
 		.resources = axp288_charger_resources,
 	},
 	{
-		.name = "axp288_battery",
-		.num_resources = ARRAY_SIZE(axp288_battery_resources),
-		.resources = axp288_battery_resources,
+		.name = "axp288_fuel_gauge",
+		.num_resources = ARRAY_SIZE(axp288_fuel_gauge_resources),
+		.resources = axp288_fuel_gauge_resources,
 	},
 	{
 		.name = "axp288_pmic_acpi",
Acked-by on v1 1/3
#1 lore raw
Quoted 2 lines · On Wed, 7 Jan 2015 13:24:50 -0800 Todd E Brandt…

mfd/axp20x: change battery cell name to fuel gauge

Quoted 43 lines

Name changes to the battery cell structure to a
more generic cell type: fuel gauge.

----

 drivers/mfd/axp20x.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/mfd/axp20x.c +5 -5
index b1b580a..e75717e 100644
@@ -87,7 +87,7 @@ static struct resource axp20x_pek_resources[] = {
 	},
 };
 
-static struct resource axp288_battery_resources[] = {
+static struct resource axp288_fuel_gauge_resources[] = {
 	{
 		.start = AXP288_IRQ_QWBTU,
 		.end   = AXP288_IRQ_QWBTU,
@@ -236,7 +236,7 @@ static const struct i2c_device_id axp20x_i2c_id[]
 = { };
 MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
 
-static const struct acpi_device_id axp20x_acpi_match[] = {
+static struct acpi_device_id axp20x_acpi_match[] = {
 	{
 		.id = "INT33F4",
 		.driver_data = AXP288_ID,
@@ -350,9 +350,9 @@ static struct mfd_cell axp288_cells[] = {
 		.resources = axp288_charger_resources,
 	},
 	{
-		.name = "axp288_battery",
-		.num_resources =
 ARRAY_SIZE(axp288_battery_resources),
-		.resources = axp288_battery_resources,
+		.name = "axp288_fuel_gauge",
+		.num_resources =
 ARRAY_SIZE(axp288_fuel_gauge_resources),
+		.resources = axp288_fuel_gauge_resources,
 	},

drivers/mfd/axp20x.c static struct mfd_cell axp288_cells[] = { · line 358

Quoted 2 lines
drivers/mfd/axp20x.c +0 -0
 	{
 		.name = "axp288_pmic_acpi",

[Jacob Pan]

#2 lore raw
In reply to Todd E Brandt
Quoted 24 lines · Todd E Brandt

mfd/axp20x: change battery cell name to fuel gauge

Name changes to the battery cell structure to a
more generic cell type: fuel gauge.

----

 drivers/mfd/axp20x.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/mfd/axp20x.c +1 -1
index b1b580a..e75717e 100644
@@ -87,7 +87,7 @@ static struct resource axp20x_pek_resources[] = {
 	},
 };
 
-static struct resource axp288_battery_resources[] = {
+static struct resource axp288_fuel_gauge_resources[] = {
 	{
 		.start = AXP288_IRQ_QWBTU,
 		.end   = AXP288_IRQ_QWBTU,

drivers/mfd/axp20x.c static const struct i2c_device_id axp20x_i2c_id[] = { · line 239

Quoted 5 lines
drivers/mfd/axp20x.c +1 -1
@@ -236,7 +236,7 @@ static const struct i2c_device_id axp20x_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
 
-static const struct acpi_device_id axp20x_acpi_match[] = {
+static struct acpi_device_id axp20x_acpi_match[] = {

Why have you dropped the cost qualifier here?

[...]

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#3 lore raw
Quoted 29 lines · Lee Jones
Quoted 27 lines · Todd E Brandt

mfd/axp20x: change battery cell name to fuel gauge

Name changes to the battery cell structure to a
more generic cell type: fuel gauge.

----

 drivers/mfd/axp20x.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/mfd/axp20x.c +1 -1
index b1b580a..e75717e 100644
@@ -87,7 +87,7 @@ static struct resource axp20x_pek_resources[] = {
 	},
 };
 
-static struct resource axp288_battery_resources[] = {
+static struct resource axp288_fuel_gauge_resources[] = {
 	{
 		.start = AXP288_IRQ_QWBTU,
 		.end   = AXP288_IRQ_QWBTU,
@@ -236,7 +236,7 @@ static const struct i2c_device_id axp20x_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
 
Quoted 4 lines

drivers/mfd/axp20x.c static const struct i2c_device_id axp20x_i2c_id[] = { · line 239

Quoted 2 lines
drivers/mfd/axp20x.c +1 -1
-static const struct acpi_device_id axp20x_acpi_match[] = {
+static struct acpi_device_id axp20x_acpi_match[] = {

Why have you dropped the cost qualifier here?

That's a bug, I shouldn't have removed the const qualifier, I'll submit a v2 patch with this change removed. Thanks for the catch.

Quoted 8 lines

[...]

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog