patch-2.4.22 linux-2.4.22/arch/mips/sgi-ip27/ip27-pci.c
Next file: linux-2.4.22/arch/mips/sgi-ip27/ip27-rtc.c
Previous file: linux-2.4.22/arch/mips/sgi-ip27/ip27-irq.c
Back to the patch index
Back to the overall index
- Lines: 205
- Date:
2003-08-25 04:44:40.000000000 -0700
- Orig file:
linux-2.4.21/arch/mips/sgi-ip27/ip27-pci.c
- Orig date:
2002-11-28 15:53:10.000000000 -0800
diff -urN linux-2.4.21/arch/mips/sgi-ip27/ip27-pci.c linux-2.4.22/arch/mips/sgi-ip27/ip27-pci.c
@@ -70,20 +70,20 @@
return PCIBIOS_SUCCESSFUL; \
} while (0)
-static int
-pci_conf0_read_config_byte(struct pci_dev *dev, int where, u8 *value)
+static int pci_conf0_read_config_byte(struct pci_dev *dev, int where,
+ u8 *value)
{
CF0_READ_PCI_CFG(dev,where,value,3,0xff);
}
-static int
-pci_conf0_read_config_word(struct pci_dev *dev, int where, u16 *value)
+static int pci_conf0_read_config_word(struct pci_dev *dev, int where,
+ u16 *value)
{
CF0_READ_PCI_CFG(dev,where,value,2,0xffff);
}
-static int
-pci_conf0_read_config_dword(struct pci_dev *dev, int where, u32 *value)
+static int pci_conf0_read_config_dword(struct pci_dev *dev, int where,
+ u32 *value)
{
CF0_READ_PCI_CFG(dev,where,value,0,0xffffffff);
}
@@ -115,20 +115,20 @@
return PCIBIOS_SUCCESSFUL; \
} while (0)
-static int
-pci_conf0_write_config_byte(struct pci_dev *dev, int where, u8 value)
+static int pci_conf0_write_config_byte(struct pci_dev *dev, int where,
+ u8 value)
{
CF0_WRITE_PCI_CFG(dev,where,value,3,0xff);
}
-static int
-pci_conf0_write_config_word(struct pci_dev *dev, int where, u16 value)
+static int pci_conf0_write_config_word(struct pci_dev *dev, int where,
+ u16 value)
{
CF0_WRITE_PCI_CFG(dev,where,value,2,0xffff);
}
-static int
-pci_conf0_write_config_dword(struct pci_dev *dev, int where, u32 value)
+static int pci_conf0_write_config_dword(struct pci_dev *dev, int where,
+ u32 value)
{
CF0_WRITE_PCI_CFG(dev,where,value,0,0xffffffff);
}
@@ -157,14 +157,12 @@
}
}
-static inline u8
-bridge_swizzle(u8 pin, u8 slot)
+static inline u8 bridge_swizzle(u8 pin, u8 slot)
{
return (((pin-1) + slot) % 4) + 1;
}
-static u8 __init
-pci_swizzle(struct pci_dev *dev, u8 *pinp)
+static u8 __devinit pci_swizzle(struct pci_dev *dev, u8 *pinp)
{
u8 pin = *pinp;
@@ -186,8 +184,7 @@
* A given PCI device, in general, should be able to intr any of the cpus
* on any one of the hubs connected to its xbow.
*/
-static int __init
-pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+static int __devinit pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
{
if ((dev->bus->number >= MAX_PCI_BUSSES)
|| (pin != 1)
@@ -208,35 +205,18 @@
return lastirq - 1;
}
-void __init
-pcibios_update_irq(struct pci_dev *dev, int irq)
+void __init pcibios_update_irq(struct pci_dev *dev, int irq)
{
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
}
-void __init
-pcibios_update_resource(struct pci_dev *dev, struct resource *root,
- struct resource *res, int resource)
-{
- unsigned long where, size;
- u32 reg;
-
- where = PCI_BASE_ADDRESS_0 + (resource * 4);
- size = res->end - res->start;
- pci_read_config_dword(dev, where, ®);
- reg = (reg & size) | (((u32)(res->start - root->start)) & ~size);
- pci_write_config_dword(dev, where, reg);
-}
-
-void __init
-pcibios_fixup_bus(struct pci_bus *b)
+void __devinit pcibios_fixup_bus(struct pci_bus *b)
{
pci_fixup_irqs(pci_swizzle, pci_map_irq);
}
-void __init
-pcibios_fixup_pbus_ranges(struct pci_bus * bus,
- struct pbus_set_ranges_data * ranges)
+void __init pcibios_fixup_pbus_ranges(struct pci_bus * bus,
+ struct pbus_set_ranges_data * ranges)
{
ranges->io_start -= bus->resource[0]->start;
ranges->io_end -= bus->resource[0]->start;
@@ -244,32 +224,11 @@
ranges->mem_end -= bus->resource[1]->start;
}
-int __init
-pcibios_enable_device(struct pci_dev *dev)
+unsigned int pcibios_assign_all_busses(void)
{
- /* Not needed, since we enable all devices at startup. */
return 0;
}
-void __init
-pcibios_align_resource(void *data, struct resource *res, unsigned long size,
- unsigned long align)
-{
-}
-
-unsigned __init int pcibios_assign_all_busses(void)
-{
- return 0;
-}
-
-char * __init
-pcibios_setup(char *str)
-{
- /* Nothing to do for now. */
-
- return str;
-}
-
/*
* Device might live on a subordinate PCI bus. XXX Walk up the chain of buses
* to find the slot number in sense of the bridge device register.
@@ -277,8 +236,7 @@
* settings.
*/
-static void __init
-pci_disable_swapping(struct pci_dev *dev)
+static void __init pci_disable_swapping(struct pci_dev *dev)
{
unsigned int bus_id = (unsigned) dev->bus->number;
bridge_t *bridge = (bridge_t *) NODE_SWIN_BASE(bus_to_nid[bus_id],
@@ -290,8 +248,7 @@
bridge->b_widget.w_tflush; /* Flush */
}
-static void __init
-pci_enable_swapping(struct pci_dev *dev)
+static void __init pci_enable_swapping(struct pci_dev *dev)
{
unsigned int bus_id = (unsigned) dev->bus->number;
bridge_t *bridge = (bridge_t *) NODE_SWIN_BASE(bus_to_nid[bus_id],
@@ -303,8 +260,7 @@
bridge->b_widget.w_tflush; /* Flush */
}
-static void __init
-pci_fixup_ioc3(struct pci_dev *d)
+static void __init pci_fixup_ioc3(struct pci_dev *d)
{
unsigned long bus_id = (unsigned) d->bus->number;
@@ -316,8 +272,7 @@
pci_disable_swapping(d);
}
-static void __init
-pci_fixup_isp1020(struct pci_dev *d)
+static void __init pci_fixup_isp1020(struct pci_dev *d)
{
unsigned short command;
@@ -341,8 +296,7 @@
pci_enable_swapping(d);
}
-static void __init
-pci_fixup_isp2x00(struct pci_dev *d)
+static void __init pci_fixup_isp2x00(struct pci_dev *d)
{
unsigned int bus_id = (unsigned) d->bus->number;
bridge_t *bridge = (bridge_t *) NODE_SWIN_BASE(bus_to_nid[bus_id],
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)