PNP: remove redundant pnp_can_configure() check

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

diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 1ff3bb585ab2b0b5f0bb88f8477fe334c26c726a..48e60171b3ba5ae870966b068b84afc7f3ce013e 100644 (file)
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -66,15 +66,18 @@ static void quirk_cmi8330_resources(struct pnp_dev *dev)
                struct pnp_irq *irq;
                struct pnp_dma *dma;
 
-               for (irq = res->irq; irq; irq = irq->next) {    // Valid irqs are 5, 7, 10
+               for (irq = res->irq; irq; irq = irq->next) {
+                       /* Valid irqs are 5, 7, 10 */
                        tmp = 0x04A0;
-                       bitmap_copy(irq->map, &tmp, 16);        // 0000 0100 1010 0000
+                       bitmap_copy(irq->map.bits, &tmp, 16);
                }
 
-               for (dma = res->dma; dma; dma = dma->next)      // Valid 8bit dma channels are 1,3
+               for (dma = res->dma; dma; dma = dma->next) {
+                       /* Valid 8bit dma channels are 1,3 */
                        if ((dma->flags & IORESOURCE_DMA_TYPE_MASK) ==
                            IORESOURCE_DMA_8BIT)
                                dma->map = 0x000A;
+               }
        }
        dev_info(&dev->dev, "CMI8330 quirk - forced possible IRQs to 5, 7, 10 "
                "and DMA channels to 1, 3\n");
@@ -187,7 +190,7 @@ static void quirk_ad1815_mpu_resources(struct pnp_dev *dev)
                if (!copy)
                        break;
 
-               memcpy(copy->map, irq->map, sizeof copy->map);
+               bitmap_copy(copy->map.bits, irq->map.bits, PNP_IRQ_NR);
                copy->flags = irq->flags;
 
                copy->next = res->irq; /* Yes, this is NULL */
@@ -248,8 +251,7 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)
                        for (j = 0;
                             (res = pnp_get_resource(dev, IORESOURCE_MEM, j));
                             j++) {
-                               if (res->flags & IORESOURCE_UNSET ||
-                                   (res->start == 0 && res->end == 0))
+                               if (res->start == 0 && res->end == 0)
                                        continue;
 
                                pnp_start = res->start;