d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused junk: next fields and list head. Likely not completely

Browse Source 
needed on software reaching EOL, but I'd have caught the hang bug sooner
had I done this earlier.
This commit is contained in:
Warner Losh 1999-12-06 01:35:37 +00:00
parent 769300a1f1
commit 4e3e1583d1
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/pccard/pccard.c
View File

@ -112,8 +112,6 @@ static struct apmhook r_hook[MAXSLOT]; /* APM resume */
#endif /* NAPM > 0 */
static struct slot *pccard_slots[MAXSLOT]; /* slot entries */
static struct slot *slot_list;
static struct slot_ctrl *cont_list;
/*
* The driver interface for read/write uses a block
@ -303,15 +301,11 @@ pccard_alloc_slot(struct slot_ctrl *ctrl)
slt->ctrl = ctrl;
slt->slotnum = slotno;
pccard_slots[slotno] = slt;
slt->next = slot_list;
slot_list = slt;
/*
* If this controller hasn't been seen before, then
* link it into the list of controllers.
*/
if (ctrl->slots++ == 0) {
ctrl->next = cont_list;
cont_list = ctrl;
if (ctrl->maxmem > NUM_MEM_WINDOWS)
ctrl->maxmem = NUM_MEM_WINDOWS;
if (ctrl->maxio > NUM_IO_WINDOWS)

15
sys/pccard/slot.h
View File

@ -95,7 +95,6 @@ struct pccard_devinfo {
struct slot *slt; /* Back pointer to slot */
struct resource_list resources;
struct pccard_devinfo *next; /* List of drivers */
};
/*
@ -106,8 +105,7 @@ struct slot {
int flags; /* Slot flags (see below) */
int rwmem; /* Read/write flags */
int irq; /* IRQ allocated (0 = none) */
int irqref; /* Reference count of driver IRQs */
struct pccard_devinfo *devices; /* List of drivers attached */
/*
* flags.
*/
@ -124,7 +122,6 @@ struct slot {
struct slot_ctrl *ctrl; /* Per-controller data */
void *cdata; /* Controller specific data */
int pwr_off_pending;/* Power status of slot */
struct slot *next; /* Master list */
};
enum card_event { card_removed, card_inserted };
@ -132,14 +129,4 @@ enum card_event { card_removed, card_inserted };
struct slot *pccard_alloc_slot(struct slot_ctrl *);
void pccard_event(struct slot *, enum card_event);
static __inline__ const char *
pccard_get_name(device_t dev)
{
struct pccard_devinfo *devi = (struct pccard_devinfo *)
device_get_ivars(dev);
if (!devi)
return ("anonymous");
return (devi->name);
}
#endif /* !_PCCARD_SLOT_H */