Commit 01055c01 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gpio: switch to instanced constructor 



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

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_gpio *gpio;

	struct nvkm_gsp *gsp;

	struct nvkm_i2c *i2c;

	struct nvkm_subdev *ibus;
@@ -139,7 +138,6 @@ struct nvkm_device_chip { 
#include <core/layout.h>

#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE

	int (*gpio    )(struct nvkm_device *, int idx, struct nvkm_gpio **);

	int (*gsp     )(struct nvkm_device *, int idx, struct nvkm_gsp **);

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

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

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

+1 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

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_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/gpio.h

+6 −6
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@ int nvkm_gpio_find(struct nvkm_gpio *, int idx, u8 tag, u8 line, 
int nvkm_gpio_set(struct nvkm_gpio *, int idx, u8 tag, u8 line, int state);

int nvkm_gpio_get(struct nvkm_gpio *, int idx, u8 tag, u8 line);



int nv10_gpio_new(struct nvkm_device *, int, struct nvkm_gpio **);

int nv50_gpio_new(struct nvkm_device *, int, struct nvkm_gpio **);

int g94_gpio_new(struct nvkm_device *, int, struct nvkm_gpio **);

int gf119_gpio_new(struct nvkm_device *, int, struct nvkm_gpio **);

int gk104_gpio_new(struct nvkm_device *, int, struct nvkm_gpio **);

int ga102_gpio_new(struct nvkm_device *, int, struct nvkm_gpio **);

int nv10_gpio_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gpio **);

int nv50_gpio_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gpio **);

int g94_gpio_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gpio **);

int gf119_gpio_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gpio **);

int gk104_gpio_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gpio **);

int ga102_gpio_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gpio **);

#endif

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_GPIO    ] = "gpio",

	[NVKM_SUBDEV_GSP     ] = "gsp",

	[NVKM_SUBDEV_I2C     ] = "i2c",

	[NVKM_SUBDEV_IBUS    ] = "priv",

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

+82 −83

File changed.

Preview size limit exceeded, changes collapsed.