Re: [uclinux-dist-devel] [PATCH 06/62] Blackfin: irq: Remove IRQF_DISABLED

[Bob Liu]

On Wed, Sep 7, 2011 at 4:10 PM, Yong Zhang <yong.zhang0@xxxxxxxxx> wrote:
> This flag is a NOOP and can be removed now.
>
> Signed-off-by: Yong Zhang <yong.zhang0@xxxxxxxxx>

Looks good, I'll apply it to arch tree of blackfin.

Acked-by: Bob Liu <lliubbo@xxxxxxxxxx>

Thanks
-Bob

> ---
> Âarch/blackfin/kernel/time-ts.c       Â|  Â4 ++--
> Âarch/blackfin/kernel/time.c         |  Â1 -
> Âarch/blackfin/mach-bf537/boards/cm_bf537e.c | Â Â2 +-
> Âarch/blackfin/mach-bf537/boards/cm_bf537u.c | Â Â2 +-
> Âarch/blackfin/mach-bf537/boards/stamp.c   |  Â2 +-
> Âarch/blackfin/mach-bf537/boards/tcm_bf537.c | Â Â2 +-
> Âarch/blackfin/mach-bf561/boards/cm_bf561.c Â| Â Â2 +-
> Âarch/blackfin/mach-bf561/smp.c       Â|  Â2 +-
> Â8 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/arch/blackfin/kernel/time-ts.c b/arch/blackfin/kernel/time-ts.c
> index 9e9b60d..73940b7 100644
> --- a/arch/blackfin/kernel/time-ts.c
> +++ b/arch/blackfin/kernel/time-ts.c
> @@ -188,7 +188,7 @@ irqreturn_t bfin_gptmr0_interrupt(int irq, void *dev_id)
>
> Âstatic struct irqaction gptmr0_irq = {
>    Â.name      = "Blackfin GPTimer0",
> -    .flags     Â= IRQF_DISABLED | IRQF_TIMER | \
> +    .flags     Â= IRQF_TIMER | \
> Â Â Â Â Â Â Â Â Â Â Â Â ÂIRQF_IRQPOLL | IRQF_PERCPU,
>    Â.handler    Â= bfin_gptmr0_interrupt,
> Â};
> @@ -297,7 +297,7 @@ irqreturn_t bfin_coretmr_interrupt(int irq, void *dev_id)
>
> Âstatic struct irqaction coretmr_irq = {
>    Â.name      = "Blackfin CoreTimer",
> -    .flags     Â= IRQF_DISABLED | IRQF_TIMER | \
> +    .flags     Â= IRQF_TIMER | \
> Â Â Â Â Â Â Â Â Â Â Â Â ÂIRQF_IRQPOLL | IRQF_PERCPU,
>    Â.handler    Â= bfin_coretmr_interrupt,
> Â};
> diff --git a/arch/blackfin/kernel/time.c b/arch/blackfin/kernel/time.c
> index ceb2bf6..2310b24 100644
> --- a/arch/blackfin/kernel/time.c
> +++ b/arch/blackfin/kernel/time.c
> @@ -25,7 +25,6 @@
>
> Âstatic struct irqaction bfin_timer_irq = {
> Â Â Â Â.name = "Blackfin Timer Tick",
> - Â Â Â .flags = IRQF_DISABLED
> Â};
>
> Â#if defined(CONFIG_IPIPE)
> diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
> index 44fd840..9fb20d6 100644
> --- a/arch/blackfin/mach-bf537/boards/cm_bf537e.c
> +++ b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
> @@ -605,7 +605,7 @@ static struct platform_device bfin_mac_device = {
>
> Âstatic struct pata_platform_info bfin_pata_platform_data = {
> Â Â Â Â.ioport_shift = 2,
> - Â Â Â .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,
> + Â Â Â .irq_type = IRQF_TRIGGER_HIGH,
> Â};
>
> Âstatic struct resource bfin_pata_resources[] = {
> diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
> index 1b4ac5c..5ba389f 100644
> --- a/arch/blackfin/mach-bf537/boards/cm_bf537u.c
> +++ b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
> @@ -570,7 +570,7 @@ static struct platform_device bfin_mac_device = {
>
> Âstatic struct pata_platform_info bfin_pata_platform_data = {
> Â Â Â Â.ioport_shift = 2,
> - Â Â Â .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,
> + Â Â Â .irq_type = IRQF_TRIGGER_HIGH,
> Â};
>
> Âstatic struct resource bfin_pata_resources[] = {
> diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
> index b52e672..b971e58 100644
> --- a/arch/blackfin/mach-bf537/boards/stamp.c
> +++ b/arch/blackfin/mach-bf537/boards/stamp.c
> @@ -2388,7 +2388,7 @@ static struct platform_device bfin_sport1_uart_device = {
> Â#define PATA_INT Â Â Â IRQ_PF5
> Âstatic struct pata_platform_info bfin_pata_platform_data = {
> Â Â Â Â.ioport_shift = 1,
> - Â Â Â .irq_flags = IRQF_TRIGGER_HIGH | IRQF_DISABLED,
> + Â Â Â .irq_flags = IRQF_TRIGGER_HIGH,
> Â};
>
> Âstatic struct resource bfin_pata_resources[] = {
> diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
> index 9b7287a..2da0316 100644
> --- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c
> +++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
> @@ -572,7 +572,7 @@ static struct platform_device bfin_mac_device = {
>
> Âstatic struct pata_platform_info bfin_pata_platform_data = {
> Â Â Â Â.ioport_shift = 2,
> - Â Â Â .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,
> + Â Â Â .irq_type = IRQF_TRIGGER_HIGH,
> Â};
>
> Âstatic struct resource bfin_pata_resources[] = {
> diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c
> index e4f397d..c1b72f2 100644
> --- a/arch/blackfin/mach-bf561/boards/cm_bf561.c
> +++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c
> @@ -348,7 +348,7 @@ static struct platform_device bfin_sir0_device = {
>
> Âstatic struct pata_platform_info bfin_pata_platform_data = {
> Â Â Â Â.ioport_shift = 2,
> - Â Â Â .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,
> + Â Â Â .irq_type = IRQF_TRIGGER_HIGH,
> Â};
>
> Âstatic struct resource bfin_pata_resources[] = {
> diff --git a/arch/blackfin/mach-bf561/smp.c b/arch/blackfin/mach-bf561/smp.c
> index 85abd8b..db22401 100644
> --- a/arch/blackfin/mach-bf561/smp.c
> +++ b/arch/blackfin/mach-bf561/smp.c
> @@ -114,7 +114,7 @@ void __init platform_request_ipi(int irq, void *handler)
> Â Â Â Âint ret;
> Â Â Â Âconst char *name = (irq == IRQ_SUPPLE_0) ? supple0 : supple1;
>
> - Â Â Â ret = request_irq(irq, handler, IRQF_DISABLED | IRQF_PERCPU, name, handler);
> + Â Â Â ret = request_irq(irq, handler, IRQF_PERCPU, name, handler);
> Â Â Â Âif (ret)
> Â Â Â Â Â Â Â Âpanic("Cannot request %s for IPI service", name);
> Â}
> --
> 1.7.4.1
>
> _______________________________________________
> Uclinux-dist-devel mailing list
> Uclinux-dist-devel@xxxxxxxxxxxxxxxxxxxx
> https://blackfin.uclinux.org/mailman/listinfo/uclinux-dist-devel
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/