Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[uclinux-h8/linux.git] / arch / arm / mach-kirkwood / pcie.c

diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c
index f26d6cf..6e8b2ef 100644 (file)
--- a/arch/arm/mach-kirkwood/pcie.c
+++ b/arch/arm/mach-kirkwood/pcie.c
@@ -62,12 +62,6 @@ struct pcie_port {
 static int pcie_port_map[2];
 static int num_pcie_ports;
 
-static inline struct pcie_port *bus_to_port(struct pci_bus *bus)
-{
-       struct pci_sys_data *sys = bus->sysdata;
-       return sys->private_data;
-}
-
 static int pcie_valid_config(struct pcie_port *pp, int bus, int dev)
 {
        /*
@@ -97,7 +91,8 @@ static int pcie_valid_config(struct pcie_port *pp, int bus, int dev)
 static int pcie_rd_conf(struct pci_bus *bus, u32 devfn, int where,
                        int size, u32 *val)
 {
-       struct pcie_port *pp = bus_to_port(bus);
+       struct pci_sys_data *sys = bus->sysdata;
+       struct pcie_port *pp = sys->private_data;
        unsigned long flags;
        int ret;
 
@@ -116,7 +111,8 @@ static int pcie_rd_conf(struct pci_bus *bus, u32 devfn, int where,
 static int pcie_wr_conf(struct pci_bus *bus, u32 devfn,
                        int where, int size, u32 val)
 {
-       struct pcie_port *pp = bus_to_port(bus);
+       struct pci_sys_data *sys = bus->sysdata;
+       struct pcie_port *pp = sys->private_data;
        unsigned long flags;
        int ret;
 
@@ -265,13 +261,13 @@ kirkwood_pcie_scan_bus(int nr, struct pci_sys_data *sys)
 static int __init kirkwood_pcie_map_irq(const struct pci_dev *dev, u8 slot,
        u8 pin)
 {
-       struct pcie_port *pp = bus_to_port(dev->bus);
+       struct pci_sys_data *sys = dev->sysdata;
+       struct pcie_port *pp = sys->private_data;
 
        return pp->irq;
 }
 
 static struct hw_pci kirkwood_pci __initdata = {
-       .swizzle        = pci_std_swizzle,
        .setup          = kirkwood_pcie_setup,
        .scan           = kirkwood_pcie_scan_bus,
        .map_irq        = kirkwood_pcie_map_irq,