kdrive: Remove unused KdCardAttr from KdCardInfo
Card attrs are unused in all current kdrive servers, so remove it completely to avoid allocating and passing dummy values to KdCardInfoAdd. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
This commit is contained in:
parent
6c2b3a4247
commit
62883b499b
|
@ -50,12 +50,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
|
||||
|
|
|
@ -28,9 +28,7 @@
|
|||
void
|
||||
InitCard (char *name)
|
||||
{
|
||||
KdCardAttr attr;
|
||||
|
||||
KdCardInfoAdd (&fakeFuncs, &attr, 0);
|
||||
KdCardInfoAdd (&fakeFuncs, 0);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -28,9 +28,7 @@
|
|||
void
|
||||
InitCard (char *name)
|
||||
{
|
||||
KdCardAttr attr;
|
||||
|
||||
KdCardInfoAdd (&fbdevFuncs, &attr, 0);
|
||||
KdCardInfoAdd (&fbdevFuncs, 0);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -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;
|
||||
|
@ -526,7 +507,6 @@ KdBacktrace (int signum);
|
|||
/* kinfo.c */
|
||||
KdCardInfo *
|
||||
KdCardInfoAdd (KdCardFuncs *funcs,
|
||||
KdCardAttr *attr,
|
||||
void *closure);
|
||||
|
||||
KdCardInfo *
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue