From d03e0f2748a7da3911fd54af16eb07f325ce830f Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Mon, 28 Mar 2016 14:24:29 +0200 Subject: [PATCH] drm/nouveau/iccsense: remove read function Signed-off-by: Karol Herbst Reviewed-by: Martin Peres Signed-off-by: Ben Skeggs --- .../nouveau/include/nvkm/subdev/iccsense.h | 1 - .../drm/nouveau/nvkm/subdev/iccsense/base.c | 29 +++++++++---------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/iccsense.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/iccsense.h index 530c6215fe4f..c3defcd34d51 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/iccsense.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/iccsense.h @@ -12,6 +12,5 @@ struct nvkm_iccsense { }; int gf100_iccsense_new(struct nvkm_device *, int index, struct nvkm_iccsense **); -int nvkm_iccsense_read(struct nvkm_iccsense *iccsense, u8 idx); int nvkm_iccsense_read_all(struct nvkm_iccsense *iccsense); #endif diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c index c44a85228074..bf1b94ec6ed4 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c @@ -95,27 +95,24 @@ nvkm_iccsense_ina3221_read(struct nvkm_iccsense *iccsense, 40 * 8); } -int -nvkm_iccsense_read(struct nvkm_iccsense *iccsense, u8 idx) -{ - struct nvkm_iccsense_rail *rail; - - if (!iccsense || idx >= iccsense->rail_count) - return -EINVAL; - - rail = &iccsense->rails[idx]; - if (!rail->read) - return -ENODEV; - - return rail->read(iccsense, rail); -} - int nvkm_iccsense_read_all(struct nvkm_iccsense *iccsense) { int result = 0, i; + + if (!iccsense) + return -EINVAL; + + if (iccsense->rail_count == 0) + return -ENODEV; + for (i = 0; i < iccsense->rail_count; ++i) { - int res = nvkm_iccsense_read(iccsense, i); + int res; + struct nvkm_iccsense_rail *rail = &iccsense->rails[i]; + if (!rail->read) + return -ENODEV; + + res = rail->read(iccsense, rail); if (res >= 0) result += res; else