thermal: fix build error at thermal_sys.c

with the commit 67ff19 (Thermal: Make Thermal trip points writeable) build error is introduced,

the following was reported from Fengguang Wu,

drivers/thermal/thermal_sys.c: In function 'create_trip_attrs':
drivers/thermal/thermal_sys.c:1216:3: error: 'count' undeclared (first use in this function) drivers/thermal/thermal_sys.c:1216:3: note: each undeclared identifier is reported only once for each function it appears in

link:
http://www.spinics.net/lists/linux-kernel-janitors/msg12174.html

use the indx instead.

Cc Durgadoss R <[email protected]>

Signed-off-by Devendra Naga <[email protected]>

---

This patch is build-tested only.

 drivers/thermal/thermal_sys.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/thermal/thermal_sys.c +1 -1

index 9f56250..1b4aa9d 100644
@@ -1259,7 +1259,7 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int flag)
 		snprintf(tz->trip_type_attrs[indx].name, THERMAL_NAME_LENGTH,
 			 "trip_point_%d_type", indx);
 
-		sysfs_attr_init(&tz->trip_type_attrs[count].attr.attr);
+		sysfs_attr_init(&tz->trip_type_attrs[indx].attr.attr);
 		tz->trip_type_attrs[indx].attr.attr.name =
 						tz->trip_type_attrs[indx].name;
 		tz->trip_type_attrs[indx].attr.attr.mode = S_IRUGO;

Quoted 5 lines · Devendra Naga

with the commit 67ff19 (Thermal: Make Thermal trip points writeable) build error is introduced,

the following was reported from Fengguang Wu,

Quoted 8 lines

drivers/thermal/thermal_sys.c: In function 'create_trip_attrs':
drivers/thermal/thermal_sys.c:1216:3: error: 'count' undeclared (first use in this function) drivers/thermal/thermal_sys.c:1216:3: note: each undeclared identifier is reported only once for each function it appears in

link:
http://www.spinics.net/lists/linux-kernel-janitors/msg12174.html

use the indx instead.

Thanks for the fix.

Quoted 5 lines

Cc Durgadoss R <[email protected]>

Signed-off-by Devendra Naga <[email protected]>

---

This patch is build-tested only.

Something the original submitter apparently didn't do. Durga, can you please build-test all your commits from now on? I don't even understand how you managed to test your code if it did not build...

The broken commit isn't upstream yet, so in the interest of bisectability I would recommend that the original commit is fixed and the branch in which this broken commit was is rebased. Only then, ask Linux to pull from it.

Thanks.

Quoted 17 lines

 drivers/thermal/thermal_sys.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/thermal/thermal_sys.c +1 -1

index 9f56250..1b4aa9d 100644
@@ -1259,7 +1259,7 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int flag)
 		snprintf(tz->trip_type_attrs[indx].name, THERMAL_NAME_LENGTH,
 			 "trip_point_%d_type", indx);
 
-		sysfs_attr_init(&tz->trip_type_attrs[count].attr.attr);
+		sysfs_attr_init(&tz->trip_type_attrs[indx].attr.attr);
 		tz->trip_type_attrs[indx].attr.attr.name =
 						tz->trip_type_attrs[indx].name;
 		tz->trip_type_attrs[indx].attr.attr.mode = S_IRUGO;

BTW: what is the rule for linux-next?
I refreshed the patches, did some test, and sent to mailing list saying that I want to push them to linux-next, please review. And then I got bug report from linux-next...
shouldn't them be merged after I sending git pull request?

Hi Rui,

Quoted 5 lines · Zhang Rui

BTW: what is the rule for linux-next?
I refreshed the patches, did some test, and sent to mailing list saying that I want to push them to linux-next, please review. And then I got bug report from linux-next...
shouldn't them be merged after I sending git pull request?

Your tree is set for linux-next inclusion.
This means that, every day,
the current state of (one branch of) your tree makes it into that day's linux-next. linux-next receives some testing so you may receive bug reports that way (most frequently merge and build issues.)

But patches don't go from linux-next to Linus's upstream tree automatically. Whenever you want your patches to actually go to Linus, you must ask Linus explicitly to pull them.

So, when a build issue is found in linux-next, the right thing to do is to blast the faulty branch and recreate it without the build breakage, then have it go in at least one linux-next iterations to make sure you did get things right this time, and only then ask Linus to pull from your branch.

so "my tree is set for linux-next inclusion" means that, all the stuff will be merged in linux-next automatically, even if I have not asked linux-next to pull my changes, right?

-----Original Message-----
From: Jean Delvare [mailto:[email protected]]
Sent: Sunday, July 22, 2012 4:28 PM
To: Devendra Naga; Zhang, Rui
Cc: Brown, Len; Andrew Morton; Joe Perches; [email protected]; Fengguang Wu; R, Durgadoss
Subject: Re: [PATCH] thermal: fix build error at thermal_sys.c

Quoted 7 lines · Devendra Naga

with the commit 67ff19 (Thermal: Make Thermal trip points writeable) build error is introduced,

the following was reported from Fengguang Wu,

drivers/thermal/thermal_sys.c: In function 'create_trip_attrs':
drivers/thermal/thermal_sys.c:1216:3: error: 'count' undeclared (first use in this

function)

Quoted 1 line

drivers/thermal/thermal_sys.c:1216:3: note: each undeclared identifier is

reported only once for each function it appears in

Quoted 5 lines

link:
http://www.spinics.net/lists/linux-kernel-janitors/msg12174.html

use the indx instead.

Thanks for the fix.

Quoted 4 lines

Cc Durgadoss R <[email protected]>

Signed-off-by Devendra Naga <[email protected]>

---

Quoted 1 line

This patch is build-tested only.

Something the original submitter apparently didn't do. Durga, can you please build-test all your commits from now on? I don't even understand how you managed to test your code if it did not build...