fc3257a73c28b3fc96109e0ec95c4a37db932555
[15.05/openwrt.git] / target / linux / adm5120 / patches-3.3 / a10-pata-rb150-cf-3.3-fix.patch
1 --- a/drivers/ata/pata_rb153_cf.c
2 +++ b/drivers/ata/pata_rb153_cf.c
3 @@ -56,7 +56,7 @@ static inline void rb153_pata_finish_io(
4         ata_sff_dma_pause(ap);
5         ndelay(RB153_CF_IO_DELAY);
6  
7 -       set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH);
8 +       irq_set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH);
9  }
10  
11  static void rb153_pata_exec_command(struct ata_port *ap,
12 @@ -107,11 +107,11 @@ static irqreturn_t rb153_pata_irq_handle
13         struct rb153_cf_info *info = ah->private_data;
14  
15         if (gpio_get_value(info->gpio_line)) {
16 -               set_irq_type(info->irq, IRQ_TYPE_LEVEL_LOW);
17 +               irq_set_irq_type(info->irq, IRQ_TYPE_LEVEL_LOW);
18                 if (!info->frozen)
19                         ata_sff_interrupt(irq, dev_instance);
20         } else {
21 -               set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH);
22 +               irq_set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH);
23         }
24  
25         return IRQ_HANDLED;
26 @@ -138,7 +138,6 @@ static void rb153_pata_setup_port(struct
27  
28         ap->ops         = &rb153_pata_port_ops;
29         ap->pio_mask    = 0x1f; /* PIO4 */
30 -       ap->flags       = ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO;
31  
32         ap->ioaddr.cmd_addr     = info->iobase + RB153_CF_REG_CMD;
33         ap->ioaddr.ctl_addr     = info->iobase + RB153_CF_REG_CTRL;