aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/manager.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-06-27 18:57:05 -0400
committerAndi Kleen <andi@basil.nowhere.org>2008-07-16 17:27:06 -0400
commit7aefff51854ccd33599c40b4e360d94cb2b7622f (patch)
tree10cc269be1f9b581028dd6540a6e15a1b9d02e9a /drivers/pnp/manager.c
parenta1802c42950403657d07e64558eff612d550ce16 (diff)
PNP: introduce pnp_irq_mask_t typedef
This adds a typedef for the IRQ bitmap, which should cause no functional change, but will make it easier to pass a pointer to a bitmap to pnp_register_irq_resource(). Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Andi Kleen <ak@linux.intel.com> Acked-by: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pnp/manager.c')
-rw-r--r--drivers/pnp/manager.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 165b624081ad..e758dd225576 100644
--- 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)
128 res->start = -1; 128 res->start = -1;
129 res->end = -1; 129 res->end = -1;
130 130
131 if (bitmap_empty(rule->map, PNP_IRQ_NR)) { 131 if (bitmap_empty(rule->map.bits, PNP_IRQ_NR)) {
132 res->flags |= IORESOURCE_DISABLED; 132 res->flags |= IORESOURCE_DISABLED;
133 dev_dbg(&dev->dev, " irq %d disabled\n", idx); 133 dev_dbg(&dev->dev, " irq %d disabled\n", idx);
134 goto __add; 134 goto __add;
135 } 135 }
136 136
137 /* TBD: need check for >16 IRQ */ 137 /* TBD: need check for >16 IRQ */
138 res->start = find_next_bit(rule->map, PNP_IRQ_NR, 16); 138 res->start = find_next_bit(rule->map.bits, PNP_IRQ_NR, 16);
139 if (res->start < PNP_IRQ_NR) { 139 if (res->start < PNP_IRQ_NR) {
140 res->end = res->start; 140 res->end = res->start;
141 goto __add; 141 goto __add;
142 } 142 }
143 for (i = 0; i < 16; i++) { 143 for (i = 0; i < 16; i++) {
144 if (test_bit(xtab[i], rule->map)) { 144 if (test_bit(xtab[i], rule->map.bits)) {
145 res->start = res->end = xtab[i]; 145 res->start = res->end = xtab[i];
146 if (pnp_check_irq(dev, res)) 146 if (pnp_check_irq(dev, res))
147 goto __add; 147 goto __add;