lkml.org 
[lkml]   [2007]   [Apr]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/7] blackfin arch: fix coding style in ints-priority-sc C file
    Date
    Signed-off-by: Bryan Wu <bryan.wu@analog.com>
    ---
    arch/blackfin/mach-common/ints-priority-sc.c | 77 +++++++++++--------------
    1 files changed, 34 insertions(+), 43 deletions(-)

    diff --git a/arch/blackfin/mach-common/ints-priority-sc.c b/arch/blackfin/mach-common/ints-priority-sc.c
    index c30726b..34b6228 100644
    --- a/arch/blackfin/mach-common/ints-priority-sc.c
    +++ b/arch/blackfin/mach-common/ints-priority-sc.c
    @@ -329,11 +329,9 @@ static unsigned int bfin_gpio_irq_startup(unsigned int irq)
    u16 gpionr = irq - IRQ_PF0;

    if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {
    -
    ret = gpio_request(gpionr, NULL);
    - if(ret)
    + if (ret)
    return ret;
    -
    }

    gpio_enabled[gpio_bank(gpionr)] |= gpio_bit(gpionr);
    @@ -355,55 +353,49 @@ static int bfin_gpio_irq_type(unsigned int irq, unsigned int type)
    unsigned int ret;
    u16 gpionr = irq - IRQ_PF0;

    + if (type == IRQ_TYPE_PROBE) {
    + /* only probe unenabled GPIO interrupt lines */
    + if (gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))
    + return 0;
    + type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;
    + }

    - if (type == IRQ_TYPE_PROBE) {
    - /* only probe unenabled GPIO interrupt lines */
    - if (gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))
    - return 0;
    - type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;
    -
    - }
    -
    - if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING |
    - IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) {
    -
    + if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING |
    + IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW))
    + {
    if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {
    -
    ret = gpio_request(gpionr, NULL);
    - if(ret)
    + if (ret)
    return ret;
    -
    - }
    -
    - gpio_enabled[gpio_bank(gpionr)] |= gpio_bit(gpionr);
    - } else {
    - gpio_enabled[gpio_bank(gpionr)] &= ~gpio_bit(gpionr);
    - return 0;
    }

    + gpio_enabled[gpio_bank(gpionr)] |= gpio_bit(gpionr);
    + } else {
    + gpio_enabled[gpio_bank(gpionr)] &= ~gpio_bit(gpionr);
    + return 0;
    + }

    - set_gpio_dir(gpionr, 0);
    - set_gpio_inen(gpionr, 1);
    -
    + set_gpio_dir(gpionr, 0);
    + set_gpio_inen(gpionr, 1);

    - if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING)) {
    - gpio_edge_triggered[gpio_bank(gpionr)] |= gpio_bit(gpionr);
    - set_gpio_edge(gpionr, 1);
    - } else {
    - set_gpio_edge(gpionr, 0);
    - gpio_edge_triggered[gpio_bank(gpionr)] &= ~gpio_bit(gpionr);
    - }
    + if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING)) {
    + gpio_edge_triggered[gpio_bank(gpionr)] |= gpio_bit(gpionr);
    + set_gpio_edge(gpionr, 1);
    + } else {
    + set_gpio_edge(gpionr, 0);
    + gpio_edge_triggered[gpio_bank(gpionr)] &= ~gpio_bit(gpionr);
    + }

    - if ((type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING))
    - == (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING))
    - set_gpio_both(gpionr, 1);
    - else
    - set_gpio_both(gpionr, 0);
    + if ((type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING))
    + == (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING))
    + set_gpio_both(gpionr, 1);
    + else
    + set_gpio_both(gpionr, 0);

    - if ((type & (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_LEVEL_LOW)))
    - set_gpio_polar(gpionr, 1); /* low or falling edge denoted by one */
    - else
    - set_gpio_polar(gpionr, 0); /* high or rising edge denoted by zero */
    + if ((type & (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_LEVEL_LOW)))
    + set_gpio_polar(gpionr, 1); /* low or falling edge denoted by one */
    + else
    + set_gpio_polar(gpionr, 0); /* high or rising edge denoted by zero */

    SSYNC();

    @@ -416,7 +408,6 @@ static int bfin_gpio_irq_type(unsigned int irq, unsigned int type)
    }


    -
    static struct irq_chip bfin_gpio_irqchip = {
    .ack = bfin_gpio_ack_irq,
    .mask = bfin_gpio_mask_irq,
    --
    1.5.1.2
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-04-29 05:25    [W:0.027 / U:30.144 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site