target/linux/amazon/patches-2.6.30/200-fix_deprecated_interrupt_definations.patch

   1 --- a/arch/mips/amazon/dma-core.c
   2 +++ b/arch/mips/amazon/dma-core.c
   3 @@ -1387,7 +1387,7 @@ static int dma_init(void)
   4                 AMAZON_DMA_EMSG("cannot register device dma-core!\n");
   5                 return result;
   6         }
   7 -       result = request_irq(AMAZON_DMA_INT, dma_interrupt, SA_INTERRUPT, "dma-core", (void *) &dma_interrupt);
   8 +       result = request_irq(AMAZON_DMA_INT, dma_interrupt, IRQF_DISABLED, "dma-core", (void *) &dma_interrupt);
   9         if (result) {
  10                 AMAZON_DMA_EMSG("error, cannot get dma_irq!\n");
  11                 free_irq(AMAZON_DMA_INT, (void *) &dma_interrupt);
  12 --- a/arch/mips/amazon/interrupt.c
  13 +++ b/arch/mips/amazon/interrupt.c
  14 @@ -157,7 +157,7 @@ out:
  15
  16  static struct irqaction cascade = {
  17         .handler        = no_action,
  18 -       .flags          = SA_INTERRUPT,
  19 +       .flags          = IRQF_DISABLED,
  20         .name           = "cascade",
  21  };
  22
  23 --- a/arch/mips/amazon/setup.c
  24 +++ b/arch/mips/amazon/setup.c
  25 @@ -107,7 +107,7 @@ static void amazon_timer6_interrupt(int
  26
  27  static struct irqaction hrt_irqaction = {
  28         .handler = amazon_timer6_interrupt,
  29 -       .flags = SA_INTERRUPT,
  30 +       .flags = IRQF_DISABLED,
  31         .name = "hrt",
  32  };
  33
  34 --- a/drivers/atm/amazon_tpe.c
  35 +++ b/drivers/atm/amazon_tpe.c
  36 @@ -2404,13 +2404,13 @@ amazon_atm_dev_t * amazon_atm_create(voi
  37
  38
  39         // Register interrupts for insertion and extraction
  40 -       request_irq(AMAZON_SWIE_INT, amazon_atm_swie_isr, SA_INTERRUPT, "tpe_swie", NULL);
  41 -       request_irq(AMAZON_CBM_INT, amazon_atm_cbm_isr, SA_INTERRUPT, "tpe_cbm", NULL);
  42 +       request_irq(AMAZON_SWIE_INT, amazon_atm_swie_isr, IRQF_DISABLED, "tpe_swie", NULL);
  43 +       request_irq(AMAZON_CBM_INT, amazon_atm_cbm_isr, IRQF_DISABLED, "tpe_cbm", NULL);
  44  #ifdef AMAZON_ATM_DEBUG
  45 -       request_irq(AMAZON_HTU_INT , amazon_atm_htu_isr, SA_INTERRUPT, "tpe_htu", NULL);
  46 +       request_irq(AMAZON_HTU_INT , amazon_atm_htu_isr, IRQF_DISABLED, "tpe_htu", NULL);
  47  #endif
  48  #ifdef AMAZON_TPE_TEST_AAL5_INT
  49 -       request_irq(AMAZON_AAL5_INT, amazon_atm_aal5_isr, SA_INTERRUPT, "tpe_aal5", NULL);
  50 +       request_irq(AMAZON_AAL5_INT, amazon_atm_aal5_isr, IRQF_DISABLED, "tpe_aal5", NULL);
  51  #endif
  52         return &g_atm_dev;
  53  }