Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d03e0f27 authored by Karol Herbst's avatar Karol Herbst Committed by Ben Skeggs
Browse files

drm/nouveau/iccsense: remove read function 



Signed-off-by: default avatarKarol Herbst <nouveau@karolherbst.de>
Reviewed-by: default avatarMartin Peres <martin.peres@free.fr>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 7d28dbae

drivers/gpu/drm/nouveau/include/nvkm/subdev/iccsense.h

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c

+10 −13
Original line number Diff line number Diff line
@@ -96,26 +96,23 @@ nvkm_iccsense_ina3221_read(struct nvkm_iccsense *iccsense, 
}



int

nvkm_iccsense_read(struct nvkm_iccsense *iccsense, u8 idx)

nvkm_iccsense_read_all(struct nvkm_iccsense *iccsense)

{

	struct nvkm_iccsense_rail *rail;

	int result = 0, i;



	if (!iccsense || idx >= iccsense->rail_count)

	if (!iccsense)

		return -EINVAL;



	rail = &iccsense->rails[idx];

	if (!rail->read)

	if (iccsense->rail_count == 0)

		return -ENODEV;



	return rail->read(iccsense, rail);

}



int

nvkm_iccsense_read_all(struct nvkm_iccsense *iccsense)

{

	int result = 0, i;

	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