Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

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

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ struct nvkm_gpio_ntfy_rep { 
};



struct nvkm_gpio {

	struct nvkm_subdev base;

	struct nvkm_subdev subdev;



	struct nvkm_event event;

drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c

+4 −4
Original line number Diff line number Diff line
@@ -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