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

Commit 5b920d92 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/i2c: cosmetic changes 



This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent e7d65181

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

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ struct nvkm_i2c_board_info { 
};



struct nvkm_i2c {

	struct nvkm_subdev base;

	struct nvkm_subdev subdev;

	struct nvkm_event event;



	struct nvkm_i2c_port *(*find)(struct nvkm_i2c *, u8 index);

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

+3 −3
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ _nvkm_i2c_fini(struct nvkm_object *object, bool suspend) 
		impl->aux_stat(i2c, &mask, &mask, &mask, &mask);

	}



	return nvkm_subdev_fini(&i2c->base, suspend);

	return nvkm_subdev_fini(&i2c->subdev, suspend);

fail:

	list_for_each_entry_continue_reverse(port, &i2c->ports, head) {

		nv_ofuncs(port)->init(nv_object(port));
@@ -429,7 +429,7 @@ _nvkm_i2c_init(struct nvkm_object *object) 
	struct nvkm_i2c_port *port;

	int ret;



	ret = nvkm_subdev_init(&i2c->base);

	ret = nvkm_subdev_init(&i2c->subdev);

	if (ret == 0) {

		list_for_each_entry(port, &i2c->ports, head) {

			ret = nv_ofuncs(port)->init(nv_object(port));
@@ -459,7 +459,7 @@ _nvkm_i2c_dtor(struct nvkm_object *object) 
		nvkm_object_ref(NULL, (struct nvkm_object **)&port);

	}



	nvkm_subdev_destroy(&i2c->base);

	nvkm_subdev_destroy(&i2c->subdev);

}



static struct nvkm_oclass *

drivers/gpu/drm/nouveau/nvkm/subdev/i2c/g94.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ g94_aux(struct nvkm_i2c_port *base, bool retry, 
	AUX_DBG("%d: 0x%08x %d\n", type, addr, size);



	ret = auxch_init(aux, ch);

	if (ret)

	if (ret < 0)

		goto out;



	stat = nv_rd32(aux, 0x00e4e8 + (ch * 0x50));

drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf110.c

+4 −4
Original line number Diff line number Diff line
@@ -26,17 +26,17 @@ 
static int

gf110_i2c_sense_scl(struct nvkm_i2c_port *base)

{

	struct nv50_i2c_priv *priv = (void *)nvkm_i2c(base);

	struct nvkm_i2c *i2c = (void *)nvkm_i2c(base);

	struct nv50_i2c_port *port = (void *)base;

	return !!(nv_rd32(priv, port->addr) & 0x00000010);

	return !!(nv_rd32(i2c, port->addr) & 0x00000010);

}



static int

gf110_i2c_sense_sda(struct nvkm_i2c_port *base)

{

	struct nv50_i2c_priv *priv = (void *)nvkm_i2c(base);

	struct nvkm_i2c *i2c = (void *)nvkm_i2c(base);

	struct nv50_i2c_port *port = (void *)base;

	return !!(nv_rd32(priv, port->addr) & 0x00000020);

	return !!(nv_rd32(i2c, port->addr) & 0x00000020);

}



static const struct nvkm_i2c_func

drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gm204.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ gm204_aux(struct nvkm_i2c_port *base, bool retry, 
	AUX_DBG("%d: 0x%08x %d\n", type, addr, size);



	ret = auxch_init(aux, ch);

	if (ret)

	if (ret < 0)

		goto out;



	stat = nv_rd32(aux, 0x00d958 + (ch * 0x50));