Message ID | 20170627080858.12218-1-colin.king@canonical.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 27/06/17 11:08, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Array thresolds should be named thresholds, rename it. Also make it static > static const char * const > > Signed-off-by: Colin Ian King <colin.king@canonical.com> Thanks for doing this, Reviewed-by: Martin Peres <martin.peres@free.fr> > --- > drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c > index e93b2410c38b..6449771b9dc6 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c > @@ -83,7 +83,7 @@ nvkm_therm_sensor_event(struct nvkm_therm *therm, enum nvkm_therm_thrs thrs, > { > struct nvkm_subdev *subdev = &therm->subdev; > bool active; > - const char *thresolds[] = { > + static const char * const thresholds[] = { > "fanboost", "downclock", "critical", "shutdown" > }; > int temperature = therm->func->temp_get(therm); > @@ -94,10 +94,10 @@ nvkm_therm_sensor_event(struct nvkm_therm *therm, enum nvkm_therm_thrs thrs, > if (dir == NVKM_THERM_THRS_FALLING) > nvkm_info(subdev, > "temperature (%i C) went below the '%s' threshold\n", > - temperature, thresolds[thrs]); > + temperature, thresholds[thrs]); > else > nvkm_info(subdev, "temperature (%i C) hit the '%s' threshold\n", > - temperature, thresolds[thrs]); > + temperature, thresholds[thrs]); > > active = (dir == NVKM_THERM_THRS_RISING); > switch (thrs) { >
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c index e93b2410c38b..6449771b9dc6 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c @@ -83,7 +83,7 @@ nvkm_therm_sensor_event(struct nvkm_therm *therm, enum nvkm_therm_thrs thrs, { struct nvkm_subdev *subdev = &therm->subdev; bool active; - const char *thresolds[] = { + static const char * const thresholds[] = { "fanboost", "downclock", "critical", "shutdown" }; int temperature = therm->func->temp_get(therm); @@ -94,10 +94,10 @@ nvkm_therm_sensor_event(struct nvkm_therm *therm, enum nvkm_therm_thrs thrs, if (dir == NVKM_THERM_THRS_FALLING) nvkm_info(subdev, "temperature (%i C) went below the '%s' threshold\n", - temperature, thresolds[thrs]); + temperature, thresholds[thrs]); else nvkm_info(subdev, "temperature (%i C) hit the '%s' threshold\n", - temperature, thresolds[thrs]); + temperature, thresholds[thrs]); active = (dir == NVKM_THERM_THRS_RISING); switch (thrs) {