Commit e7d65181 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/gpio: 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 ce7b4f60
...@@ -19,7 +19,7 @@ struct nvkm_gpio_ntfy_rep { ...@@ -19,7 +19,7 @@ struct nvkm_gpio_ntfy_rep {
}; };
struct nvkm_gpio { struct nvkm_gpio {
struct nvkm_subdev base; struct nvkm_subdev subdev;
struct nvkm_event event; struct nvkm_event event;
......
...@@ -43,7 +43,7 @@ static int ...@@ -43,7 +43,7 @@ static int
nvkm_gpio_find(struct nvkm_gpio *gpio, int idx, u8 tag, u8 line, nvkm_gpio_find(struct nvkm_gpio *gpio, int idx, u8 tag, u8 line,
struct dcb_gpio_func *func) 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); struct nvkm_bios *bios = nvkm_bios(gpio);
u8 ver, len; u8 ver, len;
u16 data; u16 data;
...@@ -168,7 +168,7 @@ _nvkm_gpio_fini(struct nvkm_object *object, bool suspend) ...@@ -168,7 +168,7 @@ _nvkm_gpio_fini(struct nvkm_object *object, bool suspend)
impl->intr_mask(gpio, NVKM_GPIO_TOGGLED, mask, 0); impl->intr_mask(gpio, NVKM_GPIO_TOGGLED, mask, 0);
impl->intr_stat(gpio, &mask, &mask); 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[] = { static struct dmi_system_id gpio_reset_ids[] = {
...@@ -188,7 +188,7 @@ _nvkm_gpio_init(struct nvkm_object *object) ...@@ -188,7 +188,7 @@ _nvkm_gpio_init(struct nvkm_object *object)
struct nvkm_gpio *gpio = nvkm_gpio(object); struct nvkm_gpio *gpio = nvkm_gpio(object);
int ret; int ret;
ret = nvkm_subdev_init(&gpio->base); ret = nvkm_subdev_init(&gpio->subdev);
if (ret) if (ret)
return ret; return ret;
...@@ -203,7 +203,7 @@ _nvkm_gpio_dtor(struct nvkm_object *object) ...@@ -203,7 +203,7 @@ _nvkm_gpio_dtor(struct nvkm_object *object)
{ {
struct nvkm_gpio *gpio = (void *)object; struct nvkm_gpio *gpio = (void *)object;
nvkm_event_fini(&gpio->event); nvkm_event_fini(&gpio->event);
nvkm_subdev_destroy(&gpio->base); nvkm_subdev_destroy(&gpio->subdev);
} }
int int
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment