drm/nouveau/gpio: cosmetic changes

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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h
index ca5099a81b5a22985053a6c80f8e1d732fb4e144..f409cbb2bce7849a45c5f897504831e0eb01c8fd 100644 (file)
--- 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 f60284f3b8b50e8fa4348afddebc3c49b199b9f0..1f10e7e773c2782de19806ccffab81bcb946063f 100644 (file)
--- 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