PNP: introduce pnp_irq_mask_t typedef

[linux-2.6-omap-h63xx.git] / drivers / pnp / manager.c

diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 165b624081ad3137089f10332fb4b974a15e0305..e758dd2255763e8a0b6ec9876bc0c223ff405d77 100644 (file)
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -128,20 +128,20 @@ static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
        res->start = -1;
        res->end = -1;
 
-       if (bitmap_empty(rule->map, PNP_IRQ_NR)) {
+       if (bitmap_empty(rule->map.bits, PNP_IRQ_NR)) {
                res->flags |= IORESOURCE_DISABLED;
                dev_dbg(&dev->dev, "  irq %d disabled\n", idx);
                goto __add;
        }
 
        /* TBD: need check for >16 IRQ */
-       res->start = find_next_bit(rule->map, PNP_IRQ_NR, 16);
+       res->start = find_next_bit(rule->map.bits, PNP_IRQ_NR, 16);
        if (res->start < PNP_IRQ_NR) {
                res->end = res->start;
                goto __add;
        }
        for (i = 0; i < 16; i++) {
-               if (test_bit(xtab[i], rule->map)) {
+               if (test_bit(xtab[i], rule->map.bits)) {
                        res->start = res->end = xtab[i];
                        if (pnp_check_irq(dev, res))
                                goto __add;