Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6] / drivers / pnp / manager.c

diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index be21dec539d96c583ef43b5b21038e9d7339e3eb..bea0914ff947a337dcf45d2a58bf7b6fc0f38644 100644 (file)
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -19,15 +19,17 @@ DEFINE_MUTEX(pnp_res_mutex);
 
 static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)
 {
+       struct pnp_resource *pnp_res;
        struct resource *res;
 
-       if (idx >= PNP_MAX_PORT) {
+       pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_IO, idx);
+       if (!pnp_res) {
                dev_err(&dev->dev, "too many I/O port resources\n");
                /* pretend we were successful so at least the manager won't try again */
                return 1;
        }
 
-       res = &dev->res.port_resource[idx];
+       res = &pnp_res->res;
 
        /* check if this resource has been manually set, if so skip */
        if (!(res->flags & IORESOURCE_AUTO)) {
@@ -38,6 +40,7 @@ static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)
        }
 
        /* set the initial values */
+       pnp_res->index = idx;
        res->flags |= rule->flags | IORESOURCE_IO;
        res->flags &= ~IORESOURCE_UNSET;
 
@@ -51,7 +54,7 @@ static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)
        res->end = res->start + rule->size - 1;
 
        /* run through until pnp_check_port is happy */
-       while (!pnp_check_port(dev, idx)) {
+       while (!pnp_check_port(dev, res)) {
                res->start += rule->align;
                res->end = res->start + rule->size - 1;
                if (res->start > rule->max || !rule->align) {
@@ -66,15 +69,17 @@ static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)
 
 static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
 {
+       struct pnp_resource *pnp_res;
        struct resource *res;
 
-       if (idx >= PNP_MAX_MEM) {
+       pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_MEM, idx);
+       if (!pnp_res) {
                dev_err(&dev->dev, "too many memory resources\n");
                /* pretend we were successful so at least the manager won't try again */
                return 1;
        }
 
-       res = &dev->res.mem_resource[idx];
+       res = &pnp_res->res;
 
        /* check if this resource has been manually set, if so skip */
        if (!(res->flags & IORESOURCE_AUTO)) {
@@ -85,6 +90,7 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
        }
 
        /* set the initial values */
+       pnp_res->index = idx;
        res->flags |= rule->flags | IORESOURCE_MEM;
        res->flags &= ~IORESOURCE_UNSET;
 
@@ -108,7 +114,7 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
        res->end = res->start + rule->size - 1;
 
        /* run through until pnp_check_mem is happy */
-       while (!pnp_check_mem(dev, idx)) {
+       while (!pnp_check_mem(dev, res)) {
                res->start += rule->align;
                res->end = res->start + rule->size - 1;
                if (res->start > rule->max || !rule->align) {
@@ -123,6 +129,7 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
 
 static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
 {
+       struct pnp_resource *pnp_res;
        struct resource *res;
        int i;
 
@@ -131,13 +138,14 @@ static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
                5, 10, 11, 12, 9, 14, 15, 7, 3, 4, 13, 0, 1, 6, 8, 2
        };
 
-       if (idx >= PNP_MAX_IRQ) {
+       pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_IRQ, idx);
+       if (!pnp_res) {
                dev_err(&dev->dev, "too many IRQ resources\n");
                /* pretend we were successful so at least the manager won't try again */
                return 1;
        }
 
-       res = &dev->res.irq_resource[idx];
+       res = &pnp_res->res;
 
        /* check if this resource has been manually set, if so skip */
        if (!(res->flags & IORESOURCE_AUTO)) {
@@ -147,6 +155,7 @@ static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
        }
 
        /* set the initial values */
+       pnp_res->index = idx;
        res->flags |= rule->flags | IORESOURCE_IRQ;
        res->flags &= ~IORESOURCE_UNSET;
 
@@ -167,7 +176,7 @@ static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
        for (i = 0; i < 16; i++) {
                if (test_bit(xtab[i], rule->map)) {
                        res->start = res->end = xtab[i];
-                       if (pnp_check_irq(dev, idx)) {
+                       if (pnp_check_irq(dev, res)) {
                                dev_dbg(&dev->dev, "  assign irq %d %d\n", idx,
                                        (int) res->start);
                                return 1;
@@ -180,6 +189,7 @@ static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
 
 static void pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
 {
+       struct pnp_resource *pnp_res;
        struct resource *res;
        int i;
 
@@ -188,12 +198,13 @@ static void pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
                1, 3, 5, 6, 7, 0, 2, 4
        };
 
-       if (idx >= PNP_MAX_DMA) {
+       pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_DMA, idx);
+       if (!pnp_res) {
                dev_err(&dev->dev, "too many DMA resources\n");
                return;
        }
 
-       res = &dev->res.dma_resource[idx];
+       res = &pnp_res->res;
 
        /* check if this resource has been manually set, if so skip */
        if (!(res->flags & IORESOURCE_AUTO)) {
@@ -203,13 +214,14 @@ static void pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
        }
 
        /* set the initial values */
+       pnp_res->index = idx;
        res->flags |= rule->flags | IORESOURCE_DMA;
        res->flags &= ~IORESOURCE_UNSET;
 
        for (i = 0; i < 8; i++) {
                if (rule->map & (1 << xtab[i])) {
                        res->start = res->end = xtab[i];
-                       if (pnp_check_dma(dev, idx)) {
+                       if (pnp_check_dma(dev, res)) {
                                dev_dbg(&dev->dev, "  assign dma %d %d\n", idx,
                                        (int) res->start);
                                return;
@@ -251,22 +263,22 @@ void pnp_init_resources(struct pnp_dev *dev)
        int idx;
 
        for (idx = 0; idx < PNP_MAX_IRQ; idx++) {
-               res = &dev->res.irq_resource[idx];
+               res = &dev->res->irq[idx].res;
                res->flags = IORESOURCE_IRQ;
                pnp_init_resource(res);
        }
        for (idx = 0; idx < PNP_MAX_DMA; idx++) {
-               res = &dev->res.dma_resource[idx];
+               res = &dev->res->dma[idx].res;
                res->flags = IORESOURCE_DMA;
                pnp_init_resource(res);
        }
        for (idx = 0; idx < PNP_MAX_PORT; idx++) {
-               res = &dev->res.port_resource[idx];
+               res = &dev->res->port[idx].res;
                res->flags = IORESOURCE_IO;
                pnp_init_resource(res);
        }
        for (idx = 0; idx < PNP_MAX_MEM; idx++) {
-               res = &dev->res.mem_resource[idx];
+               res = &dev->res->mem[idx].res;
                res->flags = IORESOURCE_MEM;
                pnp_init_resource(res);
        }
@@ -282,28 +294,28 @@ static void pnp_clean_resource_table(struct pnp_dev *dev)
        int idx;
 
        for (idx = 0; idx < PNP_MAX_IRQ; idx++) {
-               res = &dev->res.irq_resource[idx];
+               res = &dev->res->irq[idx].res;
                if (res->flags & IORESOURCE_AUTO) {
                        res->flags = IORESOURCE_IRQ;
                        pnp_init_resource(res);
                }
        }
        for (idx = 0; idx < PNP_MAX_DMA; idx++) {
-               res = &dev->res.dma_resource[idx];
+               res = &dev->res->dma[idx].res;
                if (res->flags & IORESOURCE_AUTO) {
                        res->flags = IORESOURCE_DMA;
                        pnp_init_resource(res);
                }
        }
        for (idx = 0; idx < PNP_MAX_PORT; idx++) {
-               res = &dev->res.port_resource[idx];
+               res = &dev->res->port[idx].res;
                if (res->flags & IORESOURCE_AUTO) {
                        res->flags = IORESOURCE_IO;
                        pnp_init_resource(res);
                }
        }
        for (idx = 0; idx < PNP_MAX_MEM; idx++) {
-               res = &dev->res.mem_resource[idx];
+               res = &dev->res->mem[idx].res;
                if (res->flags & IORESOURCE_AUTO) {
                        res->flags = IORESOURCE_MEM;
                        pnp_init_resource(res);