[PATCH 1/9] [kdrive] Remove unused KdCardAttr from KdCardInfo
Mikhail Gusarov
dottedmag at dottedmag.net
Sat Jan 2 06:32:51 PST 2010
Card attrs are unused in all current kdrive servers, so
remove it completely to avoid allocating and passing dummy
values to KdCardInfoAdd.
Signed-off-by: Mikhail Gusarov <dottedmag at dottedmag.net>
---
hw/kdrive/ephyr/ephyrinit.c | 6 +-----
hw/kdrive/fake/fakeinit.c | 4 +---
hw/kdrive/fbdev/fbinit.c | 4 +---
hw/kdrive/src/kdrive.h | 20 --------------------
hw/kdrive/src/kinfo.c | 2 --
5 files changed, 3 insertions(+), 33 deletions(-)
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
index 2b72b4e..2f4e632 100644
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@@ -45,12 +45,8 @@ void processScreenArg (char *screen_size, char *parent_id) ;
void
InitCard (char *name)
{
- KdCardAttr attr;
-
EPHYR_DBG("mark");
-
-
- KdCardInfoAdd (&ephyrFuncs, &attr, 0);
+ KdCardInfoAdd (&ephyrFuncs, 0);
}
void
diff --git a/hw/kdrive/fake/fakeinit.c b/hw/kdrive/fake/fakeinit.c
index 0472a71..87c221d 100644
--- a/hw/kdrive/fake/fakeinit.c
+++ b/hw/kdrive/fake/fakeinit.c
@@ -28,9 +28,7 @@
void
InitCard (char *name)
{
- KdCardAttr attr;
-
- KdCardInfoAdd (&fakeFuncs, &attr, 0);
+ KdCardInfoAdd (&fakeFuncs, 0);
}
void
diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c
index 77d66f4..93646f6 100644
--- a/hw/kdrive/fbdev/fbinit.c
+++ b/hw/kdrive/fbdev/fbinit.c
@@ -28,9 +28,7 @@
void
InitCard (char *name)
{
- KdCardAttr attr;
-
- KdCardInfoAdd (&fbdevFuncs, &attr, 0);
+ KdCardInfoAdd (&fbdevFuncs, 0);
}
void
diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h
index 2041d71..91977b3 100644
--- a/hw/kdrive/src/kdrive.h
+++ b/hw/kdrive/src/kdrive.h
@@ -63,28 +63,9 @@
#define Status int
-/*
- * Configuration information per video card
- */
-
-typedef struct _KdCardAttr {
- CARD32 io;
- CARD32 address[KD_MAX_CARD_ADDRESS];
- int naddr;
-
- /* PCI bus info */
- CARD16 vendorID;
- CARD16 deviceID;
- CARD8 domain;
- CARD8 bus;
- CARD8 slot;
- CARD8 func;
-} KdCardAttr;
-
typedef struct _KdCardInfo {
struct _KdCardFuncs *cfuncs;
void *closure;
- KdCardAttr attr;
void *driver;
struct _KdScreenInfo *screenList;
int selected;
@@ -527,7 +508,6 @@ KdBacktrace (int signum);
/* kinfo.c */
KdCardInfo *
KdCardInfoAdd (KdCardFuncs *funcs,
- KdCardAttr *attr,
void *closure);
KdCardInfo *
diff --git a/hw/kdrive/src/kinfo.c b/hw/kdrive/src/kinfo.c
index 95afc79..0825ee2 100644
--- a/hw/kdrive/src/kinfo.c
+++ b/hw/kdrive/src/kinfo.c
@@ -29,7 +29,6 @@ KdCardInfo *kdCardInfo;
KdCardInfo *
KdCardInfoAdd (KdCardFuncs *funcs,
- KdCardAttr *attr,
void *closure)
{
KdCardInfo *ci, **prev;
@@ -40,7 +39,6 @@ KdCardInfoAdd (KdCardFuncs *funcs,
for (prev = &kdCardInfo; *prev; prev = &(*prev)->next);
*prev = ci;
ci->cfuncs = funcs;
- ci->attr = *attr;
ci->closure = closure;
ci->screenList = 0;
ci->selected = 0;
--
1.6.3.3
More information about the xorg-devel
mailing list