usb: host: xhci: mvebu: make USB 3.0 PHY optional for Armada 3720

[linux-2.6-microblaze.git] / drivers / pcmcia / yenta_socket.c

diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index bf6529b..84bfc0e 100644 (file)
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -694,7 +694,7 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned type
        struct pci_bus_region region;
        unsigned mask;
 
-       res = dev->resource + PCI_BRIDGE_RESOURCES + nr;
+       res = &dev->resource[nr];
        /* Already allocated? */
        if (res->parent)
                return 0;
@@ -711,7 +711,7 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned type
        region.end = config_readl(socket, addr_end) | ~mask;
        if (region.start && region.end > region.start && !override_bios) {
                pcibios_bus_to_resource(dev->bus, res, &region);
-               if (pci_claim_resource(dev, PCI_BRIDGE_RESOURCES + nr) == 0)
+               if (pci_claim_resource(dev, nr) == 0)
                        return 0;
                dev_info(&dev->dev,
                         "Preassigned resource %d busy or not available, reconfiguring...\n",
@@ -745,19 +745,35 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned type
        return 0;
 }
 
+static void yenta_free_res(struct yenta_socket *socket, int nr)
+{
+       struct pci_dev *dev = socket->dev;
+       struct resource *res;
+
+       res = &dev->resource[nr];
+       if (res->start != 0 && res->end != 0)
+               release_resource(res);
+
+       res->start = res->end = res->flags = 0;
+}
+
 /*
  * Allocate the bridge mappings for the device..
  */
 static void yenta_allocate_resources(struct yenta_socket *socket)
 {
        int program = 0;
-       program += yenta_allocate_res(socket, 0, IORESOURCE_IO,
+       program += yenta_allocate_res(socket, PCI_CB_BRIDGE_IO_0_WINDOW,
+                          IORESOURCE_IO,
                           PCI_CB_IO_BASE_0, PCI_CB_IO_LIMIT_0);
-       program += yenta_allocate_res(socket, 1, IORESOURCE_IO,
+       program += yenta_allocate_res(socket, PCI_CB_BRIDGE_IO_1_WINDOW,
+                          IORESOURCE_IO,
                           PCI_CB_IO_BASE_1, PCI_CB_IO_LIMIT_1);
-       program += yenta_allocate_res(socket, 2, IORESOURCE_MEM|IORESOURCE_PREFETCH,
+       program += yenta_allocate_res(socket, PCI_CB_BRIDGE_MEM_0_WINDOW,
+                          IORESOURCE_MEM | IORESOURCE_PREFETCH,
                           PCI_CB_MEMORY_BASE_0, PCI_CB_MEMORY_LIMIT_0);
-       program += yenta_allocate_res(socket, 3, IORESOURCE_MEM,
+       program += yenta_allocate_res(socket, PCI_CB_BRIDGE_MEM_1_WINDOW,
+                          IORESOURCE_MEM,
                           PCI_CB_MEMORY_BASE_1, PCI_CB_MEMORY_LIMIT_1);
        if (program)
                pci_setup_cardbus(socket->dev->subordinate);
@@ -769,14 +785,10 @@ static void yenta_allocate_resources(struct yenta_socket *socket)
  */
 static void yenta_free_resources(struct yenta_socket *socket)
 {
-       int i;
-       for (i = 0; i < 4; i++) {
-               struct resource *res;
-               res = socket->dev->resource + PCI_BRIDGE_RESOURCES + i;
-               if (res->start != 0 && res->end != 0)
-                       release_resource(res);
-               res->start = res->end = res->flags = 0;
-       }
+       yenta_free_res(socket, PCI_CB_BRIDGE_IO_0_WINDOW);
+       yenta_free_res(socket, PCI_CB_BRIDGE_IO_1_WINDOW);
+       yenta_free_res(socket, PCI_CB_BRIDGE_MEM_0_WINDOW);
+       yenta_free_res(socket, PCI_CB_BRIDGE_MEM_1_WINDOW);
 }