From e7d65181045898a6da80add0392765e253b0023c Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 20 Aug 2015 14:54:06 +1000 Subject: [PATCH] drm/nouveau/gpio: cosmetic changes This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h index ca5099a81b5a..f409cbb2bce7 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h @@ -19,7 +19,7 @@ struct nvkm_gpio_ntfy_rep { }; struct nvkm_gpio { - struct nvkm_subdev base; + struct nvkm_subdev subdev; struct nvkm_event event; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c index f60284f3b8b5..1f10e7e773c2 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c @@ -43,7 +43,7 @@ static int nvkm_gpio_find(struct nvkm_gpio *gpio, int idx, u8 tag, u8 line, struct dcb_gpio_func *func) { - struct nvkm_device *device = gpio->base.device; + struct nvkm_device *device = gpio->subdev.device; struct nvkm_bios *bios = nvkm_bios(gpio); u8 ver, len; u16 data; @@ -168,7 +168,7 @@ _nvkm_gpio_fini(struct nvkm_object *object, bool suspend) impl->intr_mask(gpio, NVKM_GPIO_TOGGLED, mask, 0); impl->intr_stat(gpio, &mask, &mask); - return nvkm_subdev_fini(&gpio->base, suspend); + return nvkm_subdev_fini(&gpio->subdev, suspend); } static struct dmi_system_id gpio_reset_ids[] = { @@ -188,7 +188,7 @@ _nvkm_gpio_init(struct nvkm_object *object) struct nvkm_gpio *gpio = nvkm_gpio(object); int ret; - ret = nvkm_subdev_init(&gpio->base); + ret = nvkm_subdev_init(&gpio->subdev); if (ret) return ret; @@ -203,7 +203,7 @@ _nvkm_gpio_dtor(struct nvkm_object *object) { struct nvkm_gpio *gpio = (void *)object; nvkm_event_fini(&gpio->event); - nvkm_subdev_destroy(&gpio->base); + nvkm_subdev_destroy(&gpio->subdev); } int -- 2.20.1