From e7f299e371f8ce413c60662ff53e19ce3993608d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 26 Jun 2011 13:22:05 -0400 Subject: [PATCH] --- yaml --- r: 257891 b: refs/heads/master c: 82ed5f73eddf72af797bfc2736f9ef4b64316ed4 h: refs/heads/master i: 257889: 67d4e9e9b9d81f56593f8f2afd67e760663aaca1 257887: 0b573ca618efd0d8377f64a28140d829c4678d0d v: v3 --- [refs] | 2 +- .../arch/blackfin/mach-common/ints-priority.c | 23 ++++--------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index c0404278daf3..0c512695c98f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b69c920cb11dde488239e6a4ea7f668983d628ac +refs/heads/master: 82ed5f73eddf72af797bfc2736f9ef4b64316ed4 diff --git a/trunk/arch/blackfin/mach-common/ints-priority.c b/trunk/arch/blackfin/mach-common/ints-priority.c index 132e701cfd5f..72ca67e48d81 100644 --- a/trunk/arch/blackfin/mach-common/ints-priority.c +++ b/trunk/arch/blackfin/mach-common/ints-priority.c @@ -647,24 +647,11 @@ void bfin_demux_gpio_irq(unsigned int inta_irq, static unsigned char irq2pint_lut[NR_PINTS]; static unsigned char pint2irq_lut[NR_PINT_SYS_IRQS * NR_PINT_BITS]; -struct pin_int_t { - unsigned int mask_set; - unsigned int mask_clear; - unsigned int request; - unsigned int assign; - unsigned int edge_set; - unsigned int edge_clear; - unsigned int invert_set; - unsigned int invert_clear; - unsigned int pinstate; - unsigned int latch; -}; - -static struct pin_int_t * const pint[NR_PINT_SYS_IRQS] = { - (struct pin_int_t *)PINT0_MASK_SET, - (struct pin_int_t *)PINT1_MASK_SET, - (struct pin_int_t *)PINT2_MASK_SET, - (struct pin_int_t *)PINT3_MASK_SET, +static struct bfin_pint_regs * const pint[NR_PINT_SYS_IRQS] = { + (struct bfin_pint_regs *)PINT0_MASK_SET, + (struct bfin_pint_regs *)PINT1_MASK_SET, + (struct bfin_pint_regs *)PINT2_MASK_SET, + (struct bfin_pint_regs *)PINT3_MASK_SET, }; inline unsigned int get_irq_base(u32 bank, u8 bmap)