ffb drm dead code removal..

ffb drm dead code removal..

[Dave Airlie]

Dave,
	I want to apply the following to the ffb DRM it is dead code as
the DRM doesn't use the macro anymore... if you have no issues I'll send
it on to Linus..

I've no way to build the ffb driver at all at the moment, if anyone builds
sparc kernels with ffb regularly I don't suppose you could checkout DRM
cvs and build it against the kernel to see if it still builds...

Dave.

diff -Nru a/drivers/char/drm/ffb_drv.c b/drivers/char/drm/ffb_drv.c
--- a/drivers/char/drm/ffb_drv.c	Sun Aug 29 22:39:49 2004
+++ b/drivers/char/drm/ffb_drv.c	Sun Aug 29 22:39:49 2004
@@ -40,7 +40,6 @@
 	.get_unmapped_area	= ffb_get_unmapped_area,		\
 }

-#define DRIVER_COUNT_CARDS()	ffb_count_card_instances()
 /* Allocate private structure and fill it */
 #define DRIVER_PRESETUP()	do {		\
 	int _ret;				\
@@ -220,34 +219,6 @@
 }

 static int ffb_presetup(drm_device_t *);
-
-static int __init ffb_count_card_instances(void)
-{
-	int root, total, instance;
-
-	total = ffb_count_siblings(prom_root_node);
-	root = prom_getchild(prom_root_node);
-	for (root = prom_searchsiblings(root, "upa"); root;
-	     root = prom_searchsiblings(prom_getsibling(root), "upa"))
-		total += ffb_count_siblings(root);
-
-	ffb_position = kmalloc(sizeof(ffb_position_t) * total, GFP_KERNEL);
-
-	/* Actual failure will be caught during ffb_presetup b/c we can't catch
-	 * it easily here.
-	 */
-	if (!ffb_position)
-		return -ENOMEM;
-
-	instance = ffb_scan_siblings(prom_root_node, 0);
-
-	root = prom_getchild(prom_root_node);
-	for (root = prom_searchsiblings(root, "upa"); root;
-	     root = prom_searchsiblings(prom_getsibling(root), "upa"))
-		instance = ffb_scan_siblings(root, instance);
-
-	return total;
-}

 static drm_map_t *ffb_find_map(struct file *filp, unsigned long off)
 {

Re: ffb drm dead code removal..

[David S. Miller]

On Sun, 29 Aug 2004 13:45:14 +0100 (IST)
Dave Airlie <airlied@linux.ie> wrote:

> 	I want to apply the following to the ffb DRM it is dead code as
> the DRM doesn't use the macro anymore... if you have no issues I'll send
> it on to Linus..

Looks fine to me.