Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 455 → Rev 456

/shark/trunk/drivers/newpci/pci-driver.c
521,7 → 521,7
.resume = pci_device_resume,
};
 
static int __init pci_driver_init(void)
int __init pci_driver_init(void)
{
return bus_register(&pci_bus_type);
}
/shark/trunk/drivers/newpci/legacy.c
35,7 → 35,7
}
}
 
static int __init pci_legacy_init(void)
int __init pci_legacy_init(void)
{
if (!raw_pci_ops) {
printk("PCI: System does not support PCI\n");
/shark/trunk/drivers/newpci/search.c
48,7 → 48,8
struct pci_bus *tmp_bus;
 
while ((bus = pci_find_next_bus(bus)) != NULL) {
if (pci_domain_nr(bus) != domain)
cprintf("Domain = %d\n",pci_domain_nr(bus));
if (pci_domain_nr(bus) != domain)
continue;
tmp_bus = pci_do_find_bus(bus, busnr);
if (tmp_bus)
/shark/trunk/drivers/newpci/probe.c
372,7 → 372,7
pci_write_config_byte(dev, PCI_SUBORDINATE_BUS, max);
}
 
sprintf(child->name, (is_cardbus ? "PCI CardBus #%02x" : "PCI Bus #%02x"), child->number);
sprintf26(child->name, (is_cardbus ? "PCI CardBus #%02x" : "PCI Bus #%02x"), child->number);
 
return max;
}
/shark/trunk/drivers/newpci/pool.c
48,7 → 48,7
next = buf;
size = PAGE_SIZE;
 
temp = snprintf (next, size, "poolinfo - 0.1\n");
temp = snprintf26(next, size, "poolinfo - 0.1\n");
size -= temp;
next += temp;
 
68,7 → 68,7
}
 
/* per-pool info, no real statistics yet */
temp = snprintf (next, size, "%-16s %4u %4Zu %4Zu %2u\n",
temp = snprintf26(next, size, "%-16s %4u %4Zu %4Zu %2u\n",
pool->name,
blocks, (unsigned int)(pages * pool->blocks_per_page),
(unsigned int)(pool->size), pages);
/shark/trunk/drivers/newpci/quirks.c
1,5 → 1,5
/*
* $Id: quirks.c,v 1.3 2004-01-30 18:30:25 giacomo Exp $
* $Id: quirks.c,v 1.4 2004-02-20 11:36:16 giacomo Exp $
*
* This file contains work-arounds for many known PCI hardware
* bugs. Devices present only on certain architectures (host
964,10 → 964,7
if (f->pass == pass &&
(f->vendor == dev->vendor || f->vendor == (u16) PCI_ANY_ID) &&
(f->device == dev->device || f->device == (u16) PCI_ANY_ID)) {
#ifdef DEBUG
printk(KERN_INFO "PCI: Calling quirk %p for %s\n", f->hook, pci_name(dev));
#endif
f->hook(dev);
f->hook(dev);
}
f++;
}
/shark/trunk/drivers/linuxc26/kobject.c
413,7 → 413,6
struct kobject * ret = kobj;
 
if (kobj) {
WARN_ON(!atomic_read(&kobj->refcount));
atomic_inc(&kobj->refcount);
} else
ret = NULL;
/shark/trunk/drivers/linuxc26/include/linux/pci.h
1,5 → 1,5
/*
* $Id: pci.h,v 1.2 2004-01-29 09:25:25 giacomo Exp $
* $Id: pci.h,v 1.3 2004-02-20 11:35:57 giacomo Exp $
*
* PCI defines and function prototypes
* Copyright 1994, Drew Eckhardt
799,7 → 799,7
static inline int pci_domain_nr(struct pci_bus *bus) { return 0; }
static inline int pci_name_bus(char *name, struct pci_bus *bus)
{
sprintf(name, "%02x", bus->number);
sprintf26(name, "%02x", bus->number);
return 0;
}
#endif
/shark/trunk/drivers/linuxc26/core.c
85,7 → 85,6
printk(KERN_ERR "Device '%s' does not have a release() function, "
"it is broken and must be fixed.\n",
dev->bus_id);
WARN_ON(1);
}
//if (c)
// complete(c);