Commit c6ce0861 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/i2c: switch to instanced constructor 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent b240b212

drivers/gpu/drm/nouveau/include/nvkm/core/device.h

+0 −2
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ struct nvkm_device { 
		struct notifier_block nb;

	} acpi;



	struct nvkm_i2c *i2c;

	struct nvkm_subdev *ibus;

	struct nvkm_iccsense *iccsense;

	struct nvkm_instmem *imem;
@@ -137,7 +136,6 @@ struct nvkm_device_chip { 
#include <core/layout.h>

#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE

	int (*i2c     )(struct nvkm_device *, int idx, struct nvkm_i2c **);

	int (*ibus    )(struct nvkm_device *, int idx, struct nvkm_subdev **);

	int (*iccsense)(struct nvkm_device *, int idx, struct nvkm_iccsense **);

	int (*imem    )(struct nvkm_device *, int idx, struct nvkm_instmem **);

drivers/gpu/drm/nouveau/include/nvkm/core/layout.h

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
NVKM_LAYOUT_ONCE(NVKM_SUBDEV_VBIOS   , struct nvkm_bios    ,     bios)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_DEVINIT , struct nvkm_devinit ,  devinit)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_GPIO    , struct nvkm_gpio    ,     gpio)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_I2C     , struct nvkm_i2c     ,      i2c)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_FUSE    , struct nvkm_fuse    ,     fuse)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_BUS     , struct nvkm_bus     ,      bus)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_FB      , struct nvkm_fb      ,       fb)

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

+9 −9
Original line number Diff line number Diff line
@@ -85,15 +85,15 @@ struct nvkm_i2c { 
struct nvkm_i2c_bus *nvkm_i2c_bus_find(struct nvkm_i2c *, int);

struct nvkm_i2c_aux *nvkm_i2c_aux_find(struct nvkm_i2c *, int);



int nv04_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int nv4e_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int nv50_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int g94_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int gf117_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int gf119_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int gk104_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int gk110_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int gm200_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int nv04_i2c_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_i2c **);

int nv4e_i2c_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_i2c **);

int nv50_i2c_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_i2c **);

int g94_i2c_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_i2c **);

int gf117_i2c_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_i2c **);

int gf119_i2c_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_i2c **);

int gk104_i2c_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_i2c **);

int gk110_i2c_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_i2c **);

int gm200_i2c_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_i2c **);



static inline int

nvkm_rdi2cr(struct i2c_adapter *adap, u8 addr, u8 reg)

drivers/gpu/drm/nouveau/nvkm/core/subdev.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ nvkm_subdev_type[NVKM_SUBDEV_NR] = { 
#include <core/layout.h>

#undef NVKM_LAYOUT_ONCE

#undef NVKM_LAYOUT_INST

	[NVKM_SUBDEV_I2C     ] = "i2c",

	[NVKM_SUBDEV_IBUS    ] = "priv",

	[NVKM_SUBDEV_ICCSENSE] = "iccsense",

	[NVKM_SUBDEV_INSTMEM ] = "imem",

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

+84 −85

File changed.

Preview size limit exceeded, changes collapsed.