[PATCH 8/8] xfree86: Remove useless module setup functions where appropriate
Adam Jackson
ajax at redhat.com
Tue Sep 21 16:05:26 PDT 2010
Signed-off-by: Adam Jackson <ajax at redhat.com>
---
hw/xfree86/fbdevhw/fbdevhw.c | 10 +---------
hw/xfree86/i2c/bt829_module.c | 9 +--------
hw/xfree86/i2c/fi1236_module.c | 9 +--------
hw/xfree86/i2c/msp3430_module.c | 9 +--------
hw/xfree86/i2c/tda8425_module.c | 9 +--------
hw/xfree86/i2c/tda9850_module.c | 9 +--------
hw/xfree86/i2c/tda9885_module.c | 9 +--------
hw/xfree86/i2c/uda1380_module.c | 9 +--------
hw/xfree86/int10/xf86int10module.c | 23 +----------------------
hw/xfree86/vbe/vbe_module.c | 10 +---------
10 files changed, 10 insertions(+), 96 deletions(-)
diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index f50d562..a5b59e7 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -21,8 +21,6 @@
#define PAGE_MASK (~(getpagesize() - 1))
-static MODULESETUPPROTO(fbdevhwSetup);
-
static XF86ModuleVersionInfo fbdevHWVersRec =
{
"fbdevhw",
@@ -39,16 +37,10 @@ static XF86ModuleVersionInfo fbdevHWVersRec =
_X_EXPORT XF86ModuleData fbdevhwModuleData = {
&fbdevHWVersRec,
- fbdevhwSetup,
+ NULL,
NULL
};
-static pointer
-fbdevhwSetup(pointer module, pointer opts, int *errmaj, int *errmin)
-{
- return (pointer)1;
-}
-
#include <fcntl.h>
#include <errno.h>
#include <sys/mman.h>
diff --git a/hw/xfree86/i2c/bt829_module.c b/hw/xfree86/i2c/bt829_module.c
index c885b8e..d87dfa7 100644
--- a/hw/xfree86/i2c/bt829_module.c
+++ b/hw/xfree86/i2c/bt829_module.c
@@ -4,8 +4,6 @@
#include "xf86Module.h"
-static MODULESETUPPROTO(bt829Setup);
-
static XF86ModuleVersionInfo bt829VersRec =
{
"bt829",
@@ -20,9 +18,4 @@ static XF86ModuleVersionInfo bt829VersRec =
{0,0,0,0}
};
-_X_EXPORT XF86ModuleData bt829ModuleData = { &bt829VersRec, bt829Setup, NULL };
-
-static pointer
-bt829Setup(pointer module, pointer opts, int *errmaj, int *errmin) {
- return (pointer)1;
-}
+_X_EXPORT XF86ModuleData bt829ModuleData = { &bt829VersRec, NULL, NULL };
diff --git a/hw/xfree86/i2c/fi1236_module.c b/hw/xfree86/i2c/fi1236_module.c
index 4016ad0..a63f922 100644
--- a/hw/xfree86/i2c/fi1236_module.c
+++ b/hw/xfree86/i2c/fi1236_module.c
@@ -4,8 +4,6 @@
#include "xf86Module.h"
-static MODULESETUPPROTO(fi1236Setup);
-
static XF86ModuleVersionInfo fi1236VersRec =
{
"fi1236",
@@ -22,11 +20,6 @@ static XF86ModuleVersionInfo fi1236VersRec =
_X_EXPORT XF86ModuleData fi1236ModuleData = {
&fi1236VersRec,
- fi1236Setup,
+ NULL,
NULL
};
-
-static pointer
-fi1236Setup(pointer module, pointer opts, int *errmaj, int *errmin) {
- return (pointer)1;
-}
diff --git a/hw/xfree86/i2c/msp3430_module.c b/hw/xfree86/i2c/msp3430_module.c
index 66b14a2..2ebf1f7 100644
--- a/hw/xfree86/i2c/msp3430_module.c
+++ b/hw/xfree86/i2c/msp3430_module.c
@@ -4,8 +4,6 @@
#include "xf86Module.h"
-static MODULESETUPPROTO(msp3430Setup);
-
static XF86ModuleVersionInfo msp3430VersRec =
{
"msp3430",
@@ -22,11 +20,6 @@ static XF86ModuleVersionInfo msp3430VersRec =
_X_EXPORT XF86ModuleData msp3430ModuleData = {
&msp3430VersRec,
- msp3430Setup,
+ NULL,
NULL
};
-
-static pointer
-msp3430Setup(pointer module, pointer opts, int *errmaj, int *errmin) {
- return (pointer)1;
-}
diff --git a/hw/xfree86/i2c/tda8425_module.c b/hw/xfree86/i2c/tda8425_module.c
index 7906e5e..ef301b7 100644
--- a/hw/xfree86/i2c/tda8425_module.c
+++ b/hw/xfree86/i2c/tda8425_module.c
@@ -4,8 +4,6 @@
#include "xf86Module.h"
-static MODULESETUPPROTO(tda8425Setup);
-
static XF86ModuleVersionInfo tda8425VersRec =
{
"tda8425",
@@ -22,11 +20,6 @@ static XF86ModuleVersionInfo tda8425VersRec =
_X_EXPORT XF86ModuleData tda8425ModuleData = {
&tda8425VersRec,
- tda8425Setup,
+ NULL,
NULL
};
-
-static pointer
-tda8425Setup(pointer module, pointer opts, int *errmaj, int *errmin) {
- return (pointer)1;
-}
diff --git a/hw/xfree86/i2c/tda9850_module.c b/hw/xfree86/i2c/tda9850_module.c
index 84f7e86..8256e78 100644
--- a/hw/xfree86/i2c/tda9850_module.c
+++ b/hw/xfree86/i2c/tda9850_module.c
@@ -4,8 +4,6 @@
#include "xf86Module.h"
-static MODULESETUPPROTO(tda9850Setup);
-
static XF86ModuleVersionInfo tda9850VersRec =
{
"tda9850",
@@ -22,11 +20,6 @@ static XF86ModuleVersionInfo tda9850VersRec =
_X_EXPORT XF86ModuleData tda9850ModuleData = {
&tda9850VersRec,
- tda9850Setup,
+ NULL,
NULL
};
-
-static pointer
-tda9850Setup(pointer module, pointer opts, int *errmaj, int *errmin) {
- return (pointer)1;
-}
diff --git a/hw/xfree86/i2c/tda9885_module.c b/hw/xfree86/i2c/tda9885_module.c
index 0ce85bb..3394c18 100644
--- a/hw/xfree86/i2c/tda9885_module.c
+++ b/hw/xfree86/i2c/tda9885_module.c
@@ -4,8 +4,6 @@
#include "xf86Module.h"
-static MODULESETUPPROTO(tda9885Setup);
-
static XF86ModuleVersionInfo tda9885VersRec =
{
"tda9885",
@@ -22,11 +20,6 @@ static XF86ModuleVersionInfo tda9885VersRec =
_X_EXPORT XF86ModuleData tda9885ModuleData = {
&tda9885VersRec,
- tda9885Setup,
+ NULL,
NULL
};
-
-static pointer
-tda9885Setup(pointer module, pointer opts, int *errmaj, int *errmin) {
- return (pointer)1;
-}
diff --git a/hw/xfree86/i2c/uda1380_module.c b/hw/xfree86/i2c/uda1380_module.c
index 895f8c6..67b623e 100644
--- a/hw/xfree86/i2c/uda1380_module.c
+++ b/hw/xfree86/i2c/uda1380_module.c
@@ -4,8 +4,6 @@
#include "xf86Module.h"
-static MODULESETUPPROTO(uda1380Setup);
-
static XF86ModuleVersionInfo uda1380VersRec =
{
"uda1380",
@@ -22,11 +20,6 @@ static XF86ModuleVersionInfo uda1380VersRec =
_X_EXPORT XF86ModuleData uda1380ModuleData = {
&uda1380VersRec,
- uda1380Setup,
+ NULL,
NULL
};
-
-static pointer
-uda1380Setup(pointer module, pointer opts, int *errmaj, int *errmin) {
- return (pointer)1;
-}
diff --git a/hw/xfree86/int10/xf86int10module.c b/hw/xfree86/int10/xf86int10module.c
index b4e5865..41e349e 100644
--- a/hw/xfree86/int10/xf86int10module.c
+++ b/hw/xfree86/int10/xf86int10module.c
@@ -22,8 +22,6 @@
#define combine(a,b) concat(a,b)
#define NAME(x) combine(MOD_NAME,x)
-static MODULESETUPPROTO(NAME(Setup));
-
static XF86ModuleVersionInfo NAME(VersRec) =
{
STRING(NAME( )),
@@ -40,25 +38,6 @@ static XF86ModuleVersionInfo NAME(VersRec) =
_X_EXPORT XF86ModuleData NAME(ModuleData) = {
&NAME(VersRec),
- NAME(Setup),
+ NULL,
NULL
};
-
-static pointer
-NAME(Setup)(pointer module, pointer opts, int *errmaj, int *errmin)
-{
- static Bool setupDone = FALSE;
-
- if (!setupDone) {
- setupDone = TRUE;
- /*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- */
- }
- /*
- * The return value must be non-NULL on success even though there
- * is no TearDownProc.
- */
- return (pointer)1;
-}
diff --git a/hw/xfree86/vbe/vbe_module.c b/hw/xfree86/vbe/vbe_module.c
index cf37ef9..e8f2e74 100644
--- a/hw/xfree86/vbe/vbe_module.c
+++ b/hw/xfree86/vbe/vbe_module.c
@@ -6,8 +6,6 @@
#include "xf86str.h"
#include "vbe.h"
-static MODULESETUPPROTO(vbeSetup);
-
static XF86ModuleVersionInfo vbeVersRec =
{
"vbe",
@@ -22,10 +20,4 @@ static XF86ModuleVersionInfo vbeVersRec =
{0,0,0,0}
};
-_X_EXPORT XF86ModuleData vbeModuleData = { &vbeVersRec, vbeSetup, NULL };
-
-static pointer
-vbeSetup(pointer module, pointer opts, int *errmaj, int *errmin)
-{
- return (pointer)1;
-}
+_X_EXPORT XF86ModuleData vbeModuleData = { &vbeVersRec, NULL, NULL };
--
1.7.2.2
More information about the xorg-devel
mailing list