lkml.org 
[lkml]   [2007]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/12] Blackfin arch: Add label to call new GPIO API
    Date
    From: Michael Hennerich <michael.hennerich@analog.com>

    Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Bryan Wu <bryan.wu@analog.com>
    ---
    arch/blackfin/mach-common/ints-priority-dc.c | 4 ++--
    arch/blackfin/mach-common/ints-priority-sc.c | 8 ++++----
    2 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/arch/blackfin/mach-common/ints-priority-dc.c b/arch/blackfin/mach-common/ints-priority-dc.c
    index 660f881..d5d9e57 100644
    --- a/arch/blackfin/mach-common/ints-priority-dc.c
    +++ b/arch/blackfin/mach-common/ints-priority-dc.c
    @@ -221,7 +221,7 @@ static unsigned int bf561_gpio_irq_startup(unsigned int irq)

    if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {

    - ret = gpio_request(gpionr, NULL);
    + ret = gpio_request(gpionr, "IRQ");
    if (ret)
    return ret;

    @@ -261,7 +261,7 @@ static int bf561_gpio_irq_type(unsigned int irq, unsigned int type)

    if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {

    - ret = gpio_request(gpionr, NULL);
    + ret = gpio_request(gpionr, "IRQ");
    if (ret)
    return ret;

    diff --git a/arch/blackfin/mach-common/ints-priority-sc.c b/arch/blackfin/mach-common/ints-priority-sc.c
    index 4708023..505b948 100644
    --- a/arch/blackfin/mach-common/ints-priority-sc.c
    +++ b/arch/blackfin/mach-common/ints-priority-sc.c
    @@ -343,7 +343,7 @@ 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);
    + ret = gpio_request(gpionr, "IRQ");
    if (ret)
    return ret;
    }
    @@ -377,7 +377,7 @@ static int bfin_gpio_irq_type(unsigned int irq, unsigned int type)
    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);
    + ret = gpio_request(gpionr, "IRQ");
    if (ret)
    return ret;
    }
    @@ -587,7 +587,7 @@ static unsigned int bfin_gpio_irq_startup(unsigned int irq)
    }

    if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {
    - ret = gpio_request(gpionr, NULL);
    + ret = gpio_request(gpionr, "IRQ");
    if (ret)
    return ret;
    }
    @@ -627,7 +627,7 @@ static int bfin_gpio_irq_type(unsigned int irq, unsigned int type)
    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);
    + ret = gpio_request(gpionr, "IRQ");
    if (ret)
    return ret;
    }
    --
    1.5.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-08-08 05:43    [W:0.022 / U:0.532 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site