diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-14 08:02:59 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-22 05:17:53 +0300 |
| commit | 4e7659fc5b54925964142988a2f6888cd35c893e (patch) | |
| tree | 9bc82d511b07639f4a3118c5f55ab92bc0be04ca /drivers/gpu/drm/nouveau/include | |
| parent | 630ec6c0d31e0d3b2d8aa641f252e83dfa4a9345 (diff) | |
| download | linux-4e7659fc5b54925964142988a2f6888cd35c893e.tar.xz | |
drm/nouveau/gpio: namespace + nvidia gpu names (no binary change)
The namespace of NVKM is being changed to nvkm_ instead of nouveau_,
which will be used for the DRM part of the driver. This is being
done in order to make it very clear as to what part of the driver a
given symbol belongs to, and as a minor step towards splitting the
DRM driver out to be able to stand on its own (for virt).
Because there's already a large amount of churn here anyway, this is
as good a time as any to also switch to NVIDIA's device and chipset
naming to ease collaboration with them.
A comparison of objdump disassemblies proves no code changes.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/include')
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h index 8b60c5de6cb9..ca5099a81b5a 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h @@ -1,8 +1,6 @@ -#ifndef __NOUVEAU_GPIO_H__ -#define __NOUVEAU_GPIO_H__ - +#ifndef __NVKM_GPIO_H__ +#define __NVKM_GPIO_H__ #include <core/subdev.h> -#include <core/device.h> #include <core/event.h> #include <subdev/bios.h> @@ -20,28 +18,27 @@ struct nvkm_gpio_ntfy_rep { u8 mask; }; -struct nouveau_gpio { - struct nouveau_subdev base; +struct nvkm_gpio { + struct nvkm_subdev base; struct nvkm_event event; - void (*reset)(struct nouveau_gpio *, u8 func); - int (*find)(struct nouveau_gpio *, int idx, u8 tag, u8 line, + void (*reset)(struct nvkm_gpio *, u8 func); + int (*find)(struct nvkm_gpio *, int idx, u8 tag, u8 line, struct dcb_gpio_func *); - int (*set)(struct nouveau_gpio *, int idx, u8 tag, u8 line, int state); - int (*get)(struct nouveau_gpio *, int idx, u8 tag, u8 line); + int (*set)(struct nvkm_gpio *, int idx, u8 tag, u8 line, int state); + int (*get)(struct nvkm_gpio *, int idx, u8 tag, u8 line); }; -static inline struct nouveau_gpio * -nouveau_gpio(void *obj) +static inline struct nvkm_gpio * +nvkm_gpio(void *obj) { - return (void *)nouveau_subdev(obj, NVDEV_SUBDEV_GPIO); + return (void *)nvkm_subdev(obj, NVDEV_SUBDEV_GPIO); } -extern struct nouveau_oclass *nv10_gpio_oclass; -extern struct nouveau_oclass *nv50_gpio_oclass; -extern struct nouveau_oclass *nv94_gpio_oclass; -extern struct nouveau_oclass *nvd0_gpio_oclass; -extern struct nouveau_oclass *nve0_gpio_oclass; - +extern struct nvkm_oclass *nv10_gpio_oclass; +extern struct nvkm_oclass *nv50_gpio_oclass; +extern struct nvkm_oclass *g94_gpio_oclass; +extern struct nvkm_oclass *gf110_gpio_oclass; +extern struct nvkm_oclass *gk104_gpio_oclass; #endif |