git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
alpha
/
kernel
/
pci.c
diff --git
a/arch/alpha/kernel/pci.c
b/arch/alpha/kernel/pci.c
index
b4c64d4
..
1f36bbd
100644
(file)
--- a/
arch/alpha/kernel/pci.c
+++ b/
arch/alpha/kernel/pci.c
@@
-227,7
+227,7
@@
pdev_save_srm_config(struct pci_dev *dev)
tmp->next = srm_saved_configs;
tmp->dev = dev;
tmp->next = srm_saved_configs;
tmp->dev = dev;
- pci_save_state(dev
, tmp->regs
);
+ pci_save_state(dev);
srm_saved_configs = tmp;
}
srm_saved_configs = tmp;
}
@@
-243,7
+243,7
@@
pci_restore_srm_config(void)
/* Restore SRM config. */
for (tmp = srm_saved_configs; tmp; tmp = tmp->next) {
/* Restore SRM config. */
for (tmp = srm_saved_configs; tmp; tmp = tmp->next) {
- pci_restore_state(tmp->dev
, tmp->regs
);
+ pci_restore_state(tmp->dev);
}
}
#endif
}
}
#endif
@@
-280,7
+280,6
@@
pcibios_fixup_bus(struct pci_bus *bus)
/* Propagate hose info into the subordinate devices. */
struct pci_controller *hose = bus->sysdata;
/* Propagate hose info into the subordinate devices. */
struct pci_controller *hose = bus->sysdata;
- struct list_head *ln;
struct pci_dev *dev = bus->self;
if (!dev) {
struct pci_dev *dev = bus->self;
if (!dev) {
@@
-304,9
+303,7
@@
pcibios_fixup_bus(struct pci_bus *bus)
pcibios_fixup_device_resources(dev, bus);
}
pcibios_fixup_device_resources(dev, bus);
}
- for (ln = bus->devices.next; ln != &bus->devices; ln = ln->next) {
- struct pci_dev *dev = pci_dev_b(ln);
-
+ list_for_each_entry(dev, &bus->devices, bus_list) {
pdev_save_srm_config(dev);
if ((dev->class >> 8) != PCI_CLASS_BRIDGE_PCI)
pcibios_fixup_device_resources(dev, bus);
pdev_save_srm_config(dev);
if ((dev->class >> 8) != PCI_CLASS_BRIDGE_PCI)
pcibios_fixup_device_resources(dev, bus);
@@
-403,11
+400,10
@@
pcibios_set_master(struct pci_dev *dev)
static void __init
pcibios_claim_one_bus(struct pci_bus *b)
{
static void __init
pcibios_claim_one_bus(struct pci_bus *b)
{
- struct
list_head *ld
;
+ struct
pci_dev *dev
;
struct pci_bus *child_bus;
struct pci_bus *child_bus;
- for (ld = b->devices.next; ld != &b->devices; ld = ld->next) {
- struct pci_dev *dev = pci_dev_b(ld);
+ list_for_each_entry(dev, &b->devices, bus_list) {
int i;
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
int i;
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
@@
-426,12
+422,10
@@
pcibios_claim_one_bus(struct pci_bus *b)
static void __init
pcibios_claim_console_setup(void)
{
static void __init
pcibios_claim_console_setup(void)
{
- struct
list_head *l
b;
+ struct
pci_bus *
b;
- for(lb = pci_root_buses.next; lb != &pci_root_buses; lb = lb->next) {
- struct pci_bus *b = pci_bus_b(lb);
+ list_for_each_entry(b, &pci_root_buses, node)
pcibios_claim_one_bus(b);
pcibios_claim_one_bus(b);
- }
}
void __init
}
void __init