[PATCH] drm/nouveau: comment out unused _nouveau_parent_ctor

[PATCH] drm/nouveau: comment out unused _nouveau_parent_ctor

[Marcin Slusarz]

Signed-off-by: Marcin Slusarz <marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 drivers/gpu/drm/nouveau/core/core/parent.c         | 2 ++
 drivers/gpu/drm/nouveau/core/include/core/parent.h | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/nouveau/core/core/parent.c b/drivers/gpu/drm/nouveau/core/core/parent.c
index a1ea034..0e7733c 100644
--- a/drivers/gpu/drm/nouveau/core/core/parent.c
+++ b/drivers/gpu/drm/nouveau/core/core/parent.c
@@ -101,6 +101,7 @@ nouveau_parent_create_(struct nouveau_object *parent,
 	return 0;
 }
 
+#if 0
 int
 _nouveau_parent_ctor(struct nouveau_object *parent,
 		     struct nouveau_object *engine,
@@ -117,6 +118,7 @@ _nouveau_parent_ctor(struct nouveau_object *parent,
 
 	return 0;
 }
+#endif
 
 void
 nouveau_parent_destroy(struct nouveau_parent *parent)
diff --git a/drivers/gpu/drm/nouveau/core/include/core/parent.h b/drivers/gpu/drm/nouveau/core/include/core/parent.h
index d3aa251..58bf6b5 100644
--- a/drivers/gpu/drm/nouveau/core/include/core/parent.h
+++ b/drivers/gpu/drm/nouveau/core/include/core/parent.h
@@ -50,9 +50,12 @@ int  nouveau_parent_create_(struct nouveau_object *, struct nouveau_object *,
 			    int size, void **);
 void nouveau_parent_destroy(struct nouveau_parent *);
 
+#if 0
 int  _nouveau_parent_ctor(struct nouveau_object *, struct nouveau_object *,
 			  struct nouveau_oclass *, void *, u32,
 			  struct nouveau_object **);
+#endif
+
 void _nouveau_parent_dtor(struct nouveau_object *);
 #define _nouveau_parent_init _nouveau_object_init
 #define _nouveau_parent_fini _nouveau_object_fini
-- 
1.7.12

Re: [PATCH] drm/nouveau: comment out unused _nouveau_parent_ctor

[Ben Skeggs]

On Mon, Oct 08, 2012 at 12:49:28AM +0200, Marcin Slusarz wrote:
> Signed-off-by: Marcin Slusarz <marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>  drivers/gpu/drm/nouveau/core/core/parent.c         | 2 ++
>  drivers/gpu/drm/nouveau/core/include/core/parent.h | 3 +++
>  2 files changed, 5 insertions(+)
Feel free to just kill it completely.  There's a few bits and pieces
of left-overs like this around the place, I'll be killing them as
I run across them too.

What do you think?

Ben.

> 
> diff --git a/drivers/gpu/drm/nouveau/core/core/parent.c b/drivers/gpu/drm/nouveau/core/core/parent.c
> index a1ea034..0e7733c 100644
> --- a/drivers/gpu/drm/nouveau/core/core/parent.c
> +++ b/drivers/gpu/drm/nouveau/core/core/parent.c
> @@ -101,6 +101,7 @@ nouveau_parent_create_(struct nouveau_object *parent,
>  	return 0;
>  }
>  
> +#if 0
>  int
>  _nouveau_parent_ctor(struct nouveau_object *parent,
>  		     struct nouveau_object *engine,
> @@ -117,6 +118,7 @@ _nouveau_parent_ctor(struct nouveau_object *parent,
>  
>  	return 0;
>  }
> +#endif
>  
>  void
>  nouveau_parent_destroy(struct nouveau_parent *parent)
> diff --git a/drivers/gpu/drm/nouveau/core/include/core/parent.h b/drivers/gpu/drm/nouveau/core/include/core/parent.h
> index d3aa251..58bf6b5 100644
> --- a/drivers/gpu/drm/nouveau/core/include/core/parent.h
> +++ b/drivers/gpu/drm/nouveau/core/include/core/parent.h
> @@ -50,9 +50,12 @@ int  nouveau_parent_create_(struct nouveau_object *, struct nouveau_object *,
>  			    int size, void **);
>  void nouveau_parent_destroy(struct nouveau_parent *);
>  
> +#if 0
>  int  _nouveau_parent_ctor(struct nouveau_object *, struct nouveau_object *,
>  			  struct nouveau_oclass *, void *, u32,
>  			  struct nouveau_object **);
> +#endif
> +
>  void _nouveau_parent_dtor(struct nouveau_object *);
>  #define _nouveau_parent_init _nouveau_object_init
>  #define _nouveau_parent_fini _nouveau_object_fini
> -- 
> 1.7.12
> 
> _______________________________________________
> Nouveau mailing list
> Nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
> http://lists.freedesktop.org/mailman/listinfo/nouveau

Re: [PATCH] drm/nouveau: comment out unused _nouveau_parent_ctor

[Marcin Slusarz]

On Mon, Oct 08, 2012 at 11:07:34AM +1000, Ben Skeggs wrote:
> On Mon, Oct 08, 2012 at 12:49:28AM +0200, Marcin Slusarz wrote:
> > Signed-off-by: Marcin Slusarz <marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> > ---
> >  drivers/gpu/drm/nouveau/core/core/parent.c         | 2 ++
> >  drivers/gpu/drm/nouveau/core/include/core/parent.h | 3 +++
> >  2 files changed, 5 insertions(+)
> Feel free to just kill it completely.  There's a few bits and pieces
> of left-overs like this around the place, I'll be killing them as
> I run across them too.

OK.

---
From: Marcin Slusarz <marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Subject: [PATCH] drm/nouveau: remove unused _nouveau_parent_ctor

Signed-off-by: Marcin Slusarz <marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 drivers/gpu/drm/nouveau/core/core/parent.c         | 17 -----------------
 drivers/gpu/drm/nouveau/core/include/core/parent.h |  3 ---
 2 files changed, 20 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/core/core/parent.c b/drivers/gpu/drm/nouveau/core/core/parent.c
index a1ea034..db7c549 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,
 	return 0;
 }
 
-int
-_nouveau_parent_ctor(struct nouveau_object *parent,
-		     struct nouveau_object *engine,
-		     struct nouveau_oclass *oclass, void *data, u32 size,
-		     struct nouveau_object **pobject)
-{
-	struct nouveau_parent *object;
-	int ret;
-
-	ret = nouveau_parent_create(parent, engine, oclass, 0, NULL, 0, &object);
-	*pobject = nv_object(object);
-	if (ret)
-		return ret;
-
-	return 0;
-}
-
 void
 nouveau_parent_destroy(struct nouveau_parent *parent)
 {
diff --git a/drivers/gpu/drm/nouveau/core/include/core/parent.h b/drivers/gpu/drm/nouveau/core/include/core/parent.h
index d3aa251..3c2e940 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 *,
 			    int size, void **);
 void nouveau_parent_destroy(struct nouveau_parent *);
 
-int  _nouveau_parent_ctor(struct nouveau_object *, struct nouveau_object *,
-			  struct nouveau_oclass *, void *, u32,
-			  struct nouveau_object **);
 void _nouveau_parent_dtor(struct nouveau_object *);
 #define _nouveau_parent_init _nouveau_object_init
 #define _nouveau_parent_fini _nouveau_object_fini
-- 
1.7.12