Do not add children for new bus kludge version of pccard.
Fix some compile warnings.
This commit is contained in:
parent
4657054758
commit
89dd67bab3
@ -81,18 +81,11 @@ devclass_t pccard_devclass;
|
||||
#define PCCARD_NIRQ 1
|
||||
#define PCCARD_NDRQ 0
|
||||
|
||||
static int
|
||||
pccard_add_children(device_t dev, int busno)
|
||||
{
|
||||
device_add_child(dev, NULL, -1, NULL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
pccard_probe(device_t dev)
|
||||
{
|
||||
device_set_desc(dev, "PC Card bus -- kludge version");
|
||||
return pccard_add_children(dev, device_get_unit(dev));
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -782,7 +782,7 @@ pcic_activate_resource(device_t dev, device_t child, int type, int rid,
|
||||
{
|
||||
struct mem_desc *mp = &devi->slt->mem[rid];
|
||||
mp->flags |= IODF_ACTIVE;
|
||||
mp->start = rman_get_start(r);
|
||||
mp->start = (caddr_t) rman_get_start(r);
|
||||
mp->size = rman_get_end(r) - rman_get_start(r) + 1;
|
||||
err = pcic_memory(devi->slt, rid);
|
||||
if (err)
|
||||
@ -801,7 +801,6 @@ pcic_deactivate_resource(device_t dev, device_t child, int type, int rid,
|
||||
struct resource *r)
|
||||
{
|
||||
struct pccard_devinfo *devi = device_get_ivars(child);
|
||||
struct io_desc *ip = &devi->slt->io[rid];
|
||||
int err;
|
||||
|
||||
switch (type) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user