Skip to contentSkip to conversation

regulator: palmas: Removing duplicated code

PATCH Applied J Keerthy 3 participants 5 messages Feb 18, 2013 – Feb 28, 2013

Subsystems (2)
lore
Share & tools
lore

J Keerthy

author
#0 lore raw

PATCH 3/4 regulator: palmas: Removing duplicated code

Removing duplicate assignment in the existing code.

---
 drivers/regulator/palmas-regulator.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
drivers/regulator/palmas-regulator.c +0 -5
index c9e912f..22c6ae2 100644
@@ -566,11 +566,6 @@ static void palmas_dt_to_pdata(struct device *dev,
 			pdata->reg_init[idx]->mode_sleep = prop;
 
 		ret = of_property_read_u32(palmas_matches[idx].of_node,
-				"ti,warm_reset", &prop);
-		if (!ret)
-			pdata->reg_init[idx]->warm_reset = prop;
-
-		ret = of_property_read_u32(palmas_matches[idx].of_node,
 				"ti,tstep", &prop);
 		if (!ret)
 			pdata->reg_init[idx]->tstep = prop;
Signature · 1 line
1.7.5.4
#1 lore raw
Quoted 13 lines · J Keerthy

Removing duplicate assignment in the existing code.

---
 drivers/regulator/palmas-regulator.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
drivers/regulator/palmas-regulator.c +0 -0
index c9e912f..22c6ae2 100644
@@ -566,11 +566,6 @@ static void palmas_dt_to_pdata(struct device *dev,
 			pdata->reg_init[idx]->mode_sleep = prop;

drivers/regulator/palmas-regulator.c static void palmas_dt_to_pdata(struct device *dev, · line 571

Quoted 10 lines
drivers/regulator/palmas-regulator.c +0 -5
 
 		ret = of_property_read_u32(palmas_matches[idx].of_node,
-				"ti,warm_reset", &prop);
-		if (!ret)
-			pdata->reg_init[idx]->warm_reset = prop;
-
-		ret = of_property_read_u32(palmas_matches[idx].of_node,
 				"ti,tstep", &prop);
 		if (!ret)
 			pdata->reg_init[idx]->tstep = prop;

This hunk has already been upstreamed by Axel Lin.

http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=commit;h=f33d0081ff3ffb7180a9794e60318458d7671b36

Graeme

author
#2 lore raw
Quoted 28 lines

-----Original Message-----
From: Graeme Gregory [mailto:[email protected]]
Sent: Monday, February 18, 2013 1:54 PM
To: J, KEERTHY
Cc: [email protected]; [email protected]; linux- [email protected]
Subject: Re: [PATCH 3/4] regulator: palmas: Removing duplicated code

Review

Quoted 8 lines · J Keerthy

Removing duplicate assignment in the existing code.

---
 drivers/regulator/palmas-regulator.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
(quoted diff) +0 -0

b/drivers/regulator/palmas-regulator.c

drivers/regulator/palmas-regulator.c static void palmas_dt_to_pdata(struct device

Quoted 4 lines

index c9e912f..22c6ae2 100644

drivers/regulator/palmas-regulator.c +0 -0
@@ -566,11 +566,6 @@ static void palmas_dt_to_pdata(struct device

*dev,

Quoted 2 lines
drivers/regulator/palmas-regulator.c +0 -0
 			pdata->reg_init[idx]->mode_sleep = prop;
 
Quoted 10 lines

drivers/regulator/palmas-regulator.c static void palmas_dt_to_pdata(struct device *dev, · line 571

Quoted 9 lines
drivers/regulator/palmas-regulator.c +0 -5
 		ret = of_property_read_u32(palmas_matches[idx].of_node,
-				"ti,warm_reset", &prop);
-		if (!ret)
-			pdata->reg_init[idx]->warm_reset = prop;
-
-		ret = of_property_read_u32(palmas_matches[idx].of_node,
 				"ti,tstep", &prop);
 		if (!ret)
 			pdata->reg_init[idx]->tstep = prop;

This hunk has already been upstreamed by Axel Lin.

Ok. Thanks Graeme. I had missed this.

Quoted 5 lines

http://git.kernel.org/?p=linux/kernel/git/next/linux-
next.git;a=commit;h=f33d0081ff3ffb7180a9794e60318458d7671b36

Graeme

#3 lore raw
In reply to J Keerthy
Quoted 1 line · J Keerthy

Removing duplicate assignment in the existing code.

...

Quoted 1 line
drivers/regulator/palmas-regulator.c +0 -0

...

drivers/regulator/palmas-regulator.c static void palmas_dt_to_pdata(struct device *dev, · line 573

Quoted 9 lines
drivers/regulator/palmas-regulator.c +0 -5
@@ -566,11 +566,6 @@ static void palmas_dt_to_pdata(struct device *dev,
 			pdata->reg_init[idx]->mode_sleep = prop;
 
 		ret = of_property_read_u32(palmas_matches[idx].of_node,
-				"ti,warm_reset", &prop);
-		if (!ret)
-			pdata->reg_init[idx]->warm_reset = prop;
-
-		ret = of_property_read_u32(palmas_matches[idx].of_node,

Can you point out where the duplicate of that is; I don't see any other assignment to warm_reset.

author
#4 lore raw

Hello Stephen,

Quoted 18 lines

-----Original Message-----
From: Stephen Warren [mailto:[email protected]]
Sent: Thursday, February 28, 2013 12:05 AM
To: J, KEERTHY
Cc: [email protected]; [email protected]; linux- [email protected]; [email protected]
Subject: Re: [PATCH 3/4] regulator: palmas: Removing duplicated code

Quoted 1 line · J Keerthy

Removing duplicate assignment in the existing code.

...

Quoted 2 lines
drivers/regulator/palmas-regulator.c +0 -0

...

drivers/regulator/palmas-regulator.c static void palmas_dt_to_pdata(struct device

Quoted 1 line
drivers/regulator/palmas-regulator.c +0 -0
@@ -566,11 +566,6 @@ static void palmas_dt_to_pdata(struct device

*dev,

Quoted 2 lines
drivers/regulator/palmas-regulator.c +0 -0
 			pdata->reg_init[idx]->mode_sleep = prop;
 
Quoted 9 lines

drivers/regulator/palmas-regulator.c static void palmas_dt_to_pdata(struct device *dev, · line 573

Quoted 6 lines
drivers/regulator/palmas-regulator.c +0 -5
 		ret = of_property_read_u32(palmas_matches[idx].of_node,
-				"ti,warm_reset", &prop);
-		if (!ret)
-			pdata->reg_init[idx]->warm_reset = prop;
-
-		ret = of_property_read_u32(palmas_matches[idx].of_node,

Can you point out where the duplicate of that is; I don't see any other assignment to warm_reset.

As pointed out by Graeme this is already fixed.

Regards,
Keerthy