On Fri, Nov 28, 2014 at 03:20:51PM +0100, Peter Feuerer wrote: > added critical trip point which represents the temperature limit. Nitpic, Add ^ > Added return -EINVAL in case wrong trip point is provided. Add (we are going to add it with this patch, it wasn't added previously). It's a nitpic. But this is more consistent with typical commit message language. I might normally just fix that upon commit, but since I had a few questions on the last one, if that results in a V2, please correct this as well. > > Cc: platform-driver-x86@xxxxxxxxxxxxxxx > Cc: Darren Hart <dvhart@xxxxxxxxxxxxx> > Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > Cc: Andreas Mohr <andi@xxxxxxxx> > Cc: Borislav Petkov <bp@xxxxxxx> > Cc: Javi Merino <javi.merino@xxxxxxx> > Signed-off-by: Peter Feuerer <peter@xxxxxxxx> > --- > drivers/platform/x86/acerhdf.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c > index 7fe7dbf..91b16c8 100644 > --- a/drivers/platform/x86/acerhdf.c > +++ b/drivers/platform/x86/acerhdf.c > @@ -443,6 +443,10 @@ static int acerhdf_get_trip_type(struct thermal_zone_device *thermal, int trip, > { > if (trip == 0) > *type = THERMAL_TRIP_ACTIVE; > + else if (trip == 1) > + *type = THERMAL_TRIP_CRITICAL; > + else > + return -EINVAL; > > return 0; > } > @@ -463,6 +467,10 @@ static int acerhdf_get_trip_temp(struct thermal_zone_device *thermal, int trip, > { > if (trip == 0) > *temp = fanon; > + else if (trip == 1) > + *temp = ACERHDF_TEMP_CRIT; > + else > + return -EINVAL; > > return 0; > } > @@ -713,7 +721,7 @@ static int acerhdf_register_thermal(void) > if (IS_ERR(cl_dev)) > return -EINVAL; > > - thz_dev = thermal_zone_device_register("acerhdf", 1, 0, NULL, > + thz_dev = thermal_zone_device_register("acerhdf", 2, 0, NULL, > &acerhdf_dev_ops, > &acerhdf_zone_params, 0, > (kernelmode) ? interval*1000 : 0); > -- > 2.1.3 > > -- Darren Hart Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html