2002-06-13 03:46:08

by Robert Kuebel

[permalink] [raw]
Subject: [PATCH] [TRIVIAL] tdfxfb - compiler warning

When tdfxfb is compiled into the kernel proper, tdfxfb_remove is not
needed. Don't compile it if we don't need it. There is one other
reference to tdfxfb_remove in tdfxfb.c but, __devexit_p() takes care of
it.

Patch is against 2.4.19-pre10.

Rob.

diff -aur linux-clean/drivers/video/tdfxfb.c linux-dirty/drivers/video/tdfxfb.c
--- linux-clean/drivers/video/tdfxfb.c Mon Feb 25 14:38:07 2002
+++ linux-dirty/drivers/video/tdfxfb.c Sat Jun 8 12:32:23 2002
@@ -464,7 +464,9 @@
* PCI driver prototypes
*/
static int tdfxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id);
+#ifdef MODULE
static void tdfxfb_remove(struct pci_dev *pdev);
+#endif

static int currcon = 0;

@@ -2037,6 +2039,7 @@
return 0;
}

+#ifdef MODULE
/**
* tdfxfb_remove - Device removal
*
@@ -2061,6 +2064,7 @@
iounmap(fb_info.regbase_virt);
iounmap(fb_info.bufbase_virt);
}
+#endif

int __init tdfxfb_init(void)
{


2002-06-13 05:18:01

by Rusty Russell

[permalink] [raw]
Subject: Re: [PATCH] [TRIVIAL] tdfxfb - compiler warning

In message <20020613034600.GA3927@cartman> you write:
> When tdfxfb is compiled into the kernel proper, tdfxfb_remove is not
> needed. Don't compile it if we don't need it. There is one other
> reference to tdfxfb_remove in tdfxfb.c but, __devexit_p() takes care of
> it.

It'd already defined as __devexit, which (unless hotplug is enabled)
discards the result.

Rusty.
--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.