[PATCH] thermal: fix build error at thermal_sys.c

[PATCH] thermal: fix build error at thermal_sys.c

[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)
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 <durgadoss.r@intel.com>
Signed-off-by: Devendra Naga <develkernel412222@gmail.com>
---

This patch is build-tested only.

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

diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 9f56250..1b4aa9d 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -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;
-- 
1.7.9.5

Re: [PATCH] thermal: fix build error at thermal_sys.c

[Jean Delvare]

On Sun, 22 Jul 2012 13:55:22 +0545, Devendra Naga wrote:
> 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.

Thanks for the fix.

> Cc: Durgadoss R <durgadoss.r@intel.com>
> Signed-off-by: Devendra Naga <develkernel412222@gmail.com>
> ---
> 
> 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.

> 
>  drivers/thermal/thermal_sys.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
> index 9f56250..1b4aa9d 100644
> --- a/drivers/thermal/thermal_sys.c
> +++ b/drivers/thermal/thermal_sys.c
> @@ -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;

-- 
Jean Delvare

Re: [PATCH] thermal: fix build error at thermal_sys.c

[Zhang Rui]

Hi, all,

sorry for the stupid mistake.
Actually, I did some functionality test myself, and run all patch set
for some time. This is a problem that I have fixed already, but I'm
wondering why it shows up again. Anyway, sorry again for the mistake!

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?

thanks,
rui



On 日, 2012-07-22 at 12:58 +0200, Jean Delvare wrote:
> On Sun, 22 Jul 2012 13:55:22 +0545, Devendra Naga wrote:
> > 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.
> 
> Thanks for the fix.
> 
> > Cc: Durgadoss R <durgadoss.r@intel.com>
> > Signed-off-by: Devendra Naga <develkernel412222@gmail.com>
> > ---
> > 
> > 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.
> 
> > 
> >  drivers/thermal/thermal_sys.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
> > index 9f56250..1b4aa9d 100644
> > --- a/drivers/thermal/thermal_sys.c
> > +++ b/drivers/thermal/thermal_sys.c
> > @@ -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;
> 

Re: [PATCH] thermal: fix build error at thermal_sys.c

[Jean Delvare]

Hi Rui,

On Mon, 23 Jul 2012 10:02:16 +0800, Zhang Rui wrote:
> 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.

-- 
Jean Delvare

Re: [PATCH] thermal: fix build error at thermal_sys.c

[Zhang Rui]

On 一, 2012-07-23 at 08:54 +0200, Jean Delvare wrote:
> Hi Rui,
> 
> On Mon, 23 Jul 2012 10:02:16 +0800, Zhang Rui wrote:
> > 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.
> 
I know they should stay in linux-next for a while before asking Linus to
pull them, but I did not expect them to go into linux-next immediately
when I submitted all the patches into my next branch and sent out for
review.

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?

sorry for the mistake again.

thanks,
rui

Re: [PATCH] thermal: fix build error at thermal_sys.c

[Jean Delvare]

On Mon, 23 Jul 2012 15:28:07 +0800, Zhang Rui wrote:
> 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?

Yes, exactly. You never have to ask "linux-next to pull your changes",
it is an automatic daily event. If you think some patches aren't ready
to go to linux-next then put them in a different branch of your tree.

-- 
Jean Delvare

RE: [PATCH] thermal: fix build error at thermal_sys.c

[R, Durgadoss]

Hi Jean,

> -----Original Message-----
> From: Jean Delvare [mailto:khali@linux-fr.org]
> Sent: Sunday, July 22, 2012 4:28 PM
> To: Devendra Naga; Zhang, Rui
> Cc: Brown, Len; Andrew Morton; Joe Perches; linux-kernel@vger.kernel.org;
> Fengguang Wu; R, Durgadoss
> Subject: Re: [PATCH] thermal: fix build error at thermal_sys.c
> 
> On Sun, 22 Jul 2012 13:55:22 +0545, Devendra Naga wrote:
> > 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.
> 
> Thanks for the fix.
> 
> > Cc: Durgadoss R <durgadoss.r@intel.com>
> > Signed-off-by: Devendra Naga <develkernel412222@gmail.com>
> > ---
> >
> > 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...
> 

I did build and functionality test also (as I had other patches to test on top of this),
on these patch sets; but wondering how it got introduced in this patch set..

Anyway, I will take care of these stupidities going forward.

Thanks,
Durga