diff options
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/core/parent.c | 17 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/include/core/parent.h | 3 |
2 files changed, 0 insertions, 20 deletions
diff --git a/drivers/gpu/drm/nouveau/core/core/parent.c b/drivers/gpu/drm/nouveau/core/core/parent.c index a1ea034611d5..db7c54943102 100644 --- a/drivers/gpu/drm/nouveau/core/core/parent.c +++ b/drivers/gpu/drm/nouveau/core/core/parent.c | |||
| @@ -101,23 +101,6 @@ nouveau_parent_create_(struct nouveau_object *parent, | |||
| 101 | return 0; | 101 | return 0; |
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | int | ||
| 105 | _nouveau_parent_ctor(struct nouveau_object *parent, | ||
| 106 | struct nouveau_object *engine, | ||
| 107 | struct nouveau_oclass *oclass, void *data, u32 size, | ||
| 108 | struct nouveau_object **pobject) | ||
| 109 | { | ||
| 110 | struct nouveau_parent *object; | ||
| 111 | int ret; | ||
| 112 | |||
| 113 | ret = nouveau_parent_create(parent, engine, oclass, 0, NULL, 0, &object); | ||
| 114 | *pobject = nv_object(object); | ||
| 115 | if (ret) | ||
| 116 | return ret; | ||
| 117 | |||
| 118 | return 0; | ||
| 119 | } | ||
| 120 | |||
| 121 | void | 104 | void |
| 122 | nouveau_parent_destroy(struct nouveau_parent *parent) | 105 | nouveau_parent_destroy(struct nouveau_parent *parent) |
| 123 | { | 106 | { |
diff --git a/drivers/gpu/drm/nouveau/core/include/core/parent.h b/drivers/gpu/drm/nouveau/core/include/core/parent.h index d3aa251a5eb6..3c2e940eb0f8 100644 --- a/drivers/gpu/drm/nouveau/core/include/core/parent.h +++ b/drivers/gpu/drm/nouveau/core/include/core/parent.h | |||
| @@ -50,9 +50,6 @@ int nouveau_parent_create_(struct nouveau_object *, struct nouveau_object *, | |||
| 50 | int size, void **); | 50 | int size, void **); |
| 51 | void nouveau_parent_destroy(struct nouveau_parent *); | 51 | void nouveau_parent_destroy(struct nouveau_parent *); |
| 52 | 52 | ||
| 53 | int _nouveau_parent_ctor(struct nouveau_object *, struct nouveau_object *, | ||
| 54 | struct nouveau_oclass *, void *, u32, | ||
| 55 | struct nouveau_object **); | ||
| 56 | void _nouveau_parent_dtor(struct nouveau_object *); | 53 | void _nouveau_parent_dtor(struct nouveau_object *); |
| 57 | #define _nouveau_parent_init _nouveau_object_init | 54 | #define _nouveau_parent_init _nouveau_object_init |
| 58 | #define _nouveau_parent_fini _nouveau_object_fini | 55 | #define _nouveau_parent_fini _nouveau_object_fini |
