40 files changed, 104 insertions, 107 deletions
diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
index 5253b271b3fe..f6b3f995f58a 100644
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -167,7 +167,7 @@ static __devinit int ixp4xx_pata_probe(struct platform_device *pdev)
        irq = platform_get_irq(pdev, 0);
        if (irq)
-                set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
+                irq_set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
        /* Setup expansion bus chip selects */
        *data->cs0_cfg = data->cs0_bits;
diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c
index baeaf938d55b..1b9d10d9c5d9 100644
--- a/drivers/ata/pata_rb532_cf.c
+++ b/drivers/ata/pata_rb532_cf.c
@@ -60,10 +60,10 @@ static irqreturn_t rb532_pata_irq_handler(int irq, void *dev_instance)
        struct rb532_cf_info *info = ah->private_data;
        if (gpio_get_value(info->gpio_line)) {
-                set_irq_type(info->irq, IRQ_TYPE_LEVEL_LOW);
+                irq_set_irq_type(info->irq, IRQ_TYPE_LEVEL_LOW);
                ata_sff_interrupt(info->irq, dev_instance);
        } else {
-                set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH);
+                irq_set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH);
        }
        return IRQ_HANDLED;
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index d3743204a7e9..d3b295305542 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -416,7 +416,7 @@ config GPIO_JANZ_TTL
 config AB8500_GPIO
        bool "ST-Ericsson AB8500 Mixed Signal Circuit gpio functions"
-        depends on AB8500_CORE
+        depends on AB8500_CORE && BROKEN
        help
          Select this to enable the AB8500 IC GPIO driver
 endif
diff --git a/drivers/hwmon/gpio-fan.c b/drivers/hwmon/gpio-fan.c
index f141a1de519c..89aa9fb743af 100644
--- a/drivers/hwmon/gpio-fan.c
+++ b/drivers/hwmon/gpio-fan.c
@@ -116,7 +116,7 @@ static int fan_alarm_init(struct gpio_fan_data *fan_data,
                return 0;
        INIT_WORK(&fan_data->alarm_work, fan_alarm_notify);
-        set_irq_type(alarm_irq, IRQ_TYPE_EDGE_BOTH);
+        irq_set_irq_type(alarm_irq, IRQ_TYPE_EDGE_BOTH);
        err = request_irq(alarm_irq, fan_alarm_irq_handler, IRQF_SHARED,
                          "GPIO fan alarm", fan_data);
        if (err)
diff --git a/drivers/input/keyboard/lm8323.c b/drivers/input/keyboard/lm8323.c
index b732870ecc89..71f744a8e686 100644
--- a/drivers/input/keyboard/lm8323.c
+++ b/drivers/input/keyboard/lm8323.c
@@ -809,7 +809,7 @@ static int lm8323_suspend(struct device *dev)
        struct lm8323_chip *lm = i2c_get_clientdata(client);
        int i;
-        set_irq_wake(client->irq, 0);
+        irq_set_irq_wake(client->irq, 0);
        disable_irq(client->irq);
        mutex_lock(&lm->lock);
@@ -838,7 +838,7 @@ static int lm8323_resume(struct device *dev)
                        led_classdev_resume(&lm->pwm[i].cdev);
        enable_irq(client->irq);
-        set_irq_wake(client->irq, 1);
+        irq_set_irq_wake(client->irq, 1);
        return 0;
 }
diff --git a/drivers/input/serio/ams_delta_serio.c b/drivers/input/serio/ams_delta_serio.c
index ebe955325677..4b2a42f9f0bb 100644
--- a/drivers/input/serio/ams_delta_serio.c
+++ b/drivers/input/serio/ams_delta_serio.c
@@ -149,7 +149,7 @@ static int __init ams_delta_serio_init(void)
         * at FIQ level, switch back from edge to simple interrupt handler
         * to avoid bad interaction.
         */
-        set_irq_handler(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK),
+        irq_set_handler(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK),
                        handle_simple_irq);
        serio_register_port(ams_delta_serio);
diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c
index b6b8b1c7ecea..3242e7076258 100644
--- a/drivers/input/touchscreen/mainstone-wm97xx.c
+++ b/drivers/input/touchscreen/mainstone-wm97xx.c
@@ -219,7 +219,7 @@ static int wm97xx_acc_startup(struct wm97xx *wm)
                }
                wm->pen_irq = gpio_to_irq(irq);
-                set_irq_type(wm->pen_irq, IRQ_TYPE_EDGE_BOTH);
+                irq_set_irq_type(wm->pen_irq, IRQ_TYPE_EDGE_BOTH);
        } else /* pen irq not supported */
                pen_int = 0;
diff --git a/drivers/input/touchscreen/zylonite-wm97xx.c b/drivers/input/touchscreen/zylonite-wm97xx.c
index 048849867643..5b0f15ec874a 100644
--- a/drivers/input/touchscreen/zylonite-wm97xx.c
+++ b/drivers/input/touchscreen/zylonite-wm97xx.c
@@ -193,7 +193,7 @@ static int zylonite_wm97xx_probe(struct platform_device *pdev)
                gpio_touch_irq = mfp_to_gpio(MFP_PIN_GPIO26);
        wm->pen_irq = IRQ_GPIO(gpio_touch_irq);
-        set_irq_type(IRQ_GPIO(gpio_touch_irq), IRQ_TYPE_EDGE_BOTH);
+        irq_set_irq_type(IRQ_GPIO(gpio_touch_irq), IRQ_TYPE_EDGE_BOTH);
        wm97xx_config_gpio(wm, WM97XX_GPIO_13, WM97XX_GPIO_IN,
                           WM97XX_GPIO_POL_HIGH,
diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c
index 28852dfa310d..20e4e9395b61 100644
--- a/drivers/misc/sgi-gru/grufile.c
+++ b/drivers/misc/sgi-gru/grufile.c
@@ -373,7 +373,7 @@ static int gru_chiplet_setup_tlb_irq(int chiplet, char *irq_name,
        if (gru_irq_count[chiplet] == 0) {
                gru_chip[chiplet].name = irq_name;
-                ret = set_irq_chip(irq, &gru_chip[chiplet]);
+                ret = irq_set_chip(irq, &gru_chip[chiplet]);
                if (ret) {
                        printk(KERN_ERR "%s: set_irq_chip failed, errno=%d\n",
                               GRU_DRIVER_ID_STR, -ret);
diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c
index d70c54c7b70a..60a4c97d3d18 100644
--- a/drivers/mmc/host/sdhci-spear.c
+++ b/drivers/mmc/host/sdhci-spear.c
@@ -50,7 +50,7 @@ static irqreturn_t sdhci_gpio_irq(int irq, void *dev_id)
        /* val == 1 -> card removed, val == 0 -> card inserted */
        /* if card removed - set irq for low level, else vice versa */
        gpio_irq_type = val ? IRQF_TRIGGER_LOW : IRQF_TRIGGER_HIGH;
-        set_irq_type(irq, gpio_irq_type);
+        irq_set_irq_type(irq, gpio_irq_type);
        if (sdhci->data->card_power_gpio >= 0) {
                if (!sdhci->data->power_always_enb) {
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 317708113601..b7af5bab9937 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -621,9 +621,9 @@ static int dm9000_set_wol(struct net_device *dev, struct ethtool_wolinfo *w)
                /* change in wol state, update IRQ state */
                if (!dm->wake_state)
-                        set_irq_wake(dm->irq_wake, 1);
+                        irq_set_irq_wake(dm->irq_wake, 1);
                else if (dm->wake_state & !opts)
-                        set_irq_wake(dm->irq_wake, 0);
+                        irq_set_irq_wake(dm->irq_wake, 0);
        }
        dm->wake_state = opts;
@@ -1424,13 +1424,13 @@ dm9000_probe(struct platform_device *pdev)
                } else {
                        /* test to see if irq is really wakeup capable */
-                        ret = set_irq_wake(db->irq_wake, 1);
+                        ret = irq_set_irq_wake(db->irq_wake, 1);
                        if (ret) {
                                dev_err(db->dev, "irq %d cannot set wakeup (%d)\n",
                                        db->irq_wake, ret);
                                ret = 0;
                        } else {
-                                set_irq_wake(db->irq_wake, 0);
+                                irq_set_irq_wake(db->irq_wake, 0);
                                db->wake_supported = 1;
                        }
                }
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c
index 18d24b7b1e34..7ecc0bda57b3 100644
--- a/drivers/net/wireless/p54/p54spi.c
+++ b/drivers/net/wireless/p54/p54spi.c
@@ -649,8 +649,7 @@ static int __devinit p54spi_probe(struct spi_device *spi)
                goto err_free_common;
        }
-        set_irq_type(gpio_to_irq(p54spi_gpio_irq),
+        irq_set_irq_type(gpio_to_irq(p54spi_gpio_irq), IRQ_TYPE_EDGE_RISING);
-                     IRQ_TYPE_EDGE_RISING);
        disable_irq(gpio_to_irq(p54spi_gpio_irq));
diff --git a/drivers/net/wireless/wl1251/sdio.c b/drivers/net/wireless/wl1251/sdio.c
index d550b5e68d3c..f51a0241a440 100644
--- a/drivers/net/wireless/wl1251/sdio.c
+++ b/drivers/net/wireless/wl1251/sdio.c
@@ -265,7 +265,7 @@ static int wl1251_sdio_probe(struct sdio_func *func,
                        goto disable;
                }
-                set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
+                irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
                disable_irq(wl->irq);
                wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
diff --git a/drivers/net/wireless/wl1251/spi.c b/drivers/net/wireless/wl1251/spi.c
index ac872b38960f..af6448c4d3e2 100644
--- a/drivers/net/wireless/wl1251/spi.c
+++ b/drivers/net/wireless/wl1251/spi.c
@@ -286,7 +286,7 @@ static int __devinit wl1251_spi_probe(struct spi_device *spi)
                goto out_free;
        }
-        set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
+        irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
        disable_irq(wl->irq);
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c
index deeec32a5803..103095bbe8c0 100644
--- a/drivers/parisc/eisa.c
+++ b/drivers/parisc/eisa.c
@@ -340,7 +340,7 @@ static int __init eisa_probe(struct parisc_device *dev)
        /* Reserve IRQ2 */
        setup_irq(2, &irq2_action);
        for (i = 0; i < 16; i++) {
-                set_irq_chip_and_handler(i, &eisa_interrupt_type,
+                irq_set_chip_and_handler(i, &eisa_interrupt_type,
                                         handle_simple_irq);
        }
        
diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c
index ef31080cf591..1bab5a2cd359 100644
--- a/drivers/parisc/gsc.c
+++ b/drivers/parisc/gsc.c
@@ -152,8 +152,8 @@ int gsc_assign_irq(struct irq_chip *type, void *data)
        if (irq > GSC_IRQ_MAX)
                return NO_IRQ;
-        set_irq_chip_and_handler(irq, type, handle_simple_irq);
+        irq_set_chip_and_handler(irq, type, handle_simple_irq);
-        set_irq_chip_data(irq, data);
+        irq_set_chip_data(irq, data);
        return irq++;
 }
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index a4d8ff66a639..e3b76d409dee 100644
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -355,7 +355,8 @@ int superio_fixup_irq(struct pci_dev *pcidev)
 #endif
        for (i = 0; i < 16; i++) {
-                set_irq_chip_and_handler(i, &superio_interrupt_type, handle_simple_irq);
+                irq_set_chip_and_handler(i, &superio_interrupt_type,
+                                         handle_simple_irq);
        }
        /*
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index 09933eb9126b..12e02bf92c4a 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -1226,7 +1226,7 @@ const char *dmar_get_fault_reason(u8 fault_reason, int *fault_type)
 void dmar_msi_unmask(struct irq_data *data)
 {
-        struct intel_iommu *iommu = irq_data_get_irq_data(data);
+        struct intel_iommu *iommu = irq_data_get_irq_handler_data(data);
        unsigned long flag;
        /* unmask it */
@@ -1240,7 +1240,7 @@ void dmar_msi_unmask(struct irq_data *data)
 void dmar_msi_mask(struct irq_data *data)
 {
        unsigned long flag;
-        struct intel_iommu *iommu = irq_data_get_irq_data(data);
+        struct intel_iommu *iommu = irq_data_get_irq_handler_data(data);
        /* mask it */
        spin_lock_irqsave(&iommu->register_lock, flag);
@@ -1252,7 +1252,7 @@ void dmar_msi_mask(struct irq_data *data)
 void dmar_msi_write(int irq, struct msi_msg *msg)
 {
-        struct intel_iommu *iommu = get_irq_data(irq);
+        struct intel_iommu *iommu = irq_get_handler_data(irq);
        unsigned long flag;
        spin_lock_irqsave(&iommu->register_lock, flag);
@@ -1264,7 +1264,7 @@ void dmar_msi_write(int irq, struct msi_msg *msg)
 void dmar_msi_read(int irq, struct msi_msg *msg)
 {
-        struct intel_iommu *iommu = get_irq_data(irq);
+        struct intel_iommu *iommu = irq_get_handler_data(irq);
        unsigned long flag;
        spin_lock_irqsave(&iommu->register_lock, flag);
@@ -1382,12 +1382,12 @@ int dmar_set_interrupt(struct intel_iommu *iommu)
                return -EINVAL;
        }
-        set_irq_data(irq, iommu);
+        irq_set_handler_data(irq, iommu);
        iommu->irq = irq;
        ret = arch_setup_dmar_msi(irq);
        if (ret) {
-                set_irq_data(irq, NULL);
+                irq_set_handler_data(irq, NULL);
                iommu->irq = 0;
                destroy_irq(irq);
                return ret;
diff --git a/drivers/pci/htirq.c b/drivers/pci/htirq.c
index 834842aa5bbf..db057b6fe0c8 100644
--- a/drivers/pci/htirq.c
+++ b/drivers/pci/htirq.c
@@ -34,7 +34,7 @@ struct ht_irq_cfg {
 void write_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg)
 {
-        struct ht_irq_cfg *cfg = get_irq_data(irq);
+        struct ht_irq_cfg *cfg = irq_get_handler_data(irq);
        unsigned long flags;
        spin_lock_irqsave(&ht_irq_lock, flags);
        if (cfg->msg.address_lo != msg->address_lo) {
@@ -53,13 +53,13 @@ void write_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg)
 void fetch_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg)
 {
-        struct ht_irq_cfg *cfg = get_irq_data(irq);
+        struct ht_irq_cfg *cfg = irq_get_handler_data(irq);
        *msg = cfg->msg;
 }
 void mask_ht_irq(struct irq_data *data)
 {
-        struct ht_irq_cfg *cfg = irq_data_get_irq_data(data);
+        struct ht_irq_cfg *cfg = irq_data_get_irq_handler_data(data);
        struct ht_irq_msg msg = cfg->msg;
        msg.address_lo |= 1;
@@ -68,7 +68,7 @@ void mask_ht_irq(struct irq_data *data)
 void unmask_ht_irq(struct irq_data *data)
 {
-        struct ht_irq_cfg *cfg = irq_data_get_irq_data(data);
+        struct ht_irq_cfg *cfg = irq_data_get_irq_handler_data(data);
        struct ht_irq_msg msg = cfg->msg;
        msg.address_lo &= ~1;
@@ -126,7 +126,7 @@ int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update)
                kfree(cfg);
                return -EBUSY;
        }
-        set_irq_data(irq, cfg);
+        irq_set_handler_data(irq, cfg);
        if (arch_setup_ht_irq(irq, dev) < 0) {
                ht_destroy_irq(irq);
@@ -162,9 +162,9 @@ void ht_destroy_irq(unsigned int irq)
 {
        struct ht_irq_cfg *cfg;
-        cfg = get_irq_data(irq);
+        cfg = irq_get_handler_data(irq);
-        set_irq_chip(irq, NULL);
+        irq_set_chip(irq, NULL);
-        set_irq_data(irq, NULL);
+        irq_set_handler_data(irq, NULL);
        destroy_irq(irq);
        kfree(cfg);
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index a4115f1afe1f..7da3bef60d87 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -1206,7 +1206,7 @@ void free_dmar_iommu(struct intel_iommu *iommu)
                iommu_disable_translation(iommu);
        if (iommu->irq) {
-                set_irq_data(iommu->irq, NULL);
+                irq_set_handler_data(iommu->irq, NULL);
                /* This will mask the irq */
                free_irq(iommu->irq, iommu);
                destroy_irq(iommu->irq);
diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c
index ec87cd66f3eb..a22557b20283 100644
--- a/drivers/pci/intr_remapping.c
+++ b/drivers/pci/intr_remapping.c
@@ -50,7 +50,7 @@ static DEFINE_SPINLOCK(irq_2_ir_lock);
 static struct irq_2_iommu *irq_2_iommu(unsigned int irq)
 {
-        struct irq_cfg *cfg = get_irq_chip_data(irq);
+        struct irq_cfg *cfg = irq_get_chip_data(irq);
        return cfg ? &cfg->irq_2_iommu : NULL;
 }
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 44b0aeee83e5..2f10328bf661 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -236,7 +236,7 @@ void __read_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
 void read_msi_msg(unsigned int irq, struct msi_msg *msg)
 {
-        struct msi_desc *entry = get_irq_msi(irq);
+        struct msi_desc *entry = irq_get_msi_desc(irq);
        __read_msi_msg(entry, msg);
 }
@@ -253,7 +253,7 @@ void __get_cached_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
 void get_cached_msi_msg(unsigned int irq, struct msi_msg *msg)
 {
-        struct msi_desc *entry = get_irq_msi(irq);
+        struct msi_desc *entry = irq_get_msi_desc(irq);
        __get_cached_msi_msg(entry, msg);
 }
@@ -297,7 +297,7 @@ void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
 void write_msi_msg(unsigned int irq, struct msi_msg *msg)
 {
-        struct msi_desc *entry = get_irq_msi(irq);
+        struct msi_desc *entry = irq_get_msi_desc(irq);
        __write_msi_msg(entry, msg);
 }
@@ -354,7 +354,7 @@ static void __pci_restore_msi_state(struct pci_dev *dev)
        if (!dev->msi_enabled)
                return;
-        entry = get_irq_msi(dev->irq);
+        entry = irq_get_msi_desc(dev->irq);
        pos = entry->msi_attrib.pos;
        pci_intx_for_msi(dev, 0);
@@ -519,7 +519,7 @@ static void msix_program_entries(struct pci_dev *dev,
                                                PCI_MSIX_ENTRY_VECTOR_CTRL;
                entries[i].vector = entry->irq;
-                set_irq_msi(entry->irq, entry);
+                irq_set_msi_desc(entry->irq, entry);
                entry->masked = readl(entry->mask_base + offset);
                msix_mask_irq(entry, 1);
                i++;
diff --git a/drivers/pcmcia/bfin_cf_pcmcia.c b/drivers/pcmcia/bfin_cf_pcmcia.c
index eae9cbe37a3e..49221395101e 100644
--- a/drivers/pcmcia/bfin_cf_pcmcia.c
+++ b/drivers/pcmcia/bfin_cf_pcmcia.c
@@ -235,7 +235,7 @@ static int __devinit bfin_cf_probe(struct platform_device *pdev)
        cf->irq = irq;
        cf->socket.pci_irq = irq;
-        set_irq_type(irq, IRQF_TRIGGER_LOW);
+        irq_set_irq_type(irq, IRQF_TRIGGER_LOW);
        io_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        attr_mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c
index 27575e6378a1..01757f18a208 100644
--- a/drivers/pcmcia/db1xxx_ss.c
+++ b/drivers/pcmcia/db1xxx_ss.c
@@ -181,7 +181,7 @@ static int db1x_pcmcia_setup_irqs(struct db1x_pcmcia_sock *sock)
                /* all other (older) Db1x00 boards use a GPIO to show
                 * card detection status:  use both-edge triggers.
                 */
-                set_irq_type(sock->insert_irq, IRQ_TYPE_EDGE_BOTH);
+                irq_set_irq_type(sock->insert_irq, IRQ_TYPE_EDGE_BOTH);
                ret = request_irq(sock->insert_irq, db1000_pcmcia_cdirq,
                                  0, "pcmcia_carddetect", sock);
diff --git a/drivers/pcmcia/sa1100_nanoengine.c b/drivers/pcmcia/sa1100_nanoengine.c
index 3d2652e2f5ae..93b9c9ba57c3 100644
--- a/drivers/pcmcia/sa1100_nanoengine.c
+++ b/drivers/pcmcia/sa1100_nanoengine.c
@@ -86,7 +86,7 @@ static int nanoengine_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
        GPDR &= ~nano_skts[i].input_pins;
        GPDR |= nano_skts[i].output_pins;
        GPCR = nano_skts[i].clear_outputs;
-        set_irq_type(nano_skts[i].transition_pins, IRQ_TYPE_EDGE_BOTH);
+        irq_set_irq_type(nano_skts[i].transition_pins, IRQ_TYPE_EDGE_BOTH);
        skt->socket.pci_irq = nano_skts[i].pci_irq;
        return soc_pcmcia_request_irqs(skt,
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index 5a9a392eacdf..768f9572a8c8 100644
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -155,11 +155,11 @@ static int soc_common_pcmcia_config_skt(
                 */
                if (skt->irq_state != 1 && state->io_irq) {
                        skt->irq_state = 1;
-                        set_irq_type(skt->socket.pci_irq,
+                        irq_set_irq_type(skt->socket.pci_irq,
-                                IRQ_TYPE_EDGE_FALLING);
+                                         IRQ_TYPE_EDGE_FALLING);
                } else if (skt->irq_state == 1 && state->io_irq == 0) {
                        skt->irq_state = 0;
-                        set_irq_type(skt->socket.pci_irq, IRQ_TYPE_NONE);
+                        irq_set_irq_type(skt->socket.pci_irq, IRQ_TYPE_NONE);
                }
                skt->cs_state = *state;
@@ -537,7 +537,7 @@ int soc_pcmcia_request_irqs(struct soc_pcmcia_socket *skt,
                                  IRQF_DISABLED, irqs[i].str, skt);
                if (res)
                        break;
-                set_irq_type(irqs[i].irq, IRQ_TYPE_NONE);
+                irq_set_irq_type(irqs[i].irq, IRQ_TYPE_NONE);
        }
        if (res) {
@@ -570,7 +570,7 @@ void soc_pcmcia_disable_irqs(struct soc_pcmcia_socket *skt,
        for (i = 0; i < nr; i++)
                if (irqs[i].sock == skt->nr)
-                        set_irq_type(irqs[i].irq, IRQ_TYPE_NONE);
+                        irq_set_irq_type(irqs[i].irq, IRQ_TYPE_NONE);
 }
 EXPORT_SYMBOL(soc_pcmcia_disable_irqs);
@@ -581,8 +581,8 @@ void soc_pcmcia_enable_irqs(struct soc_pcmcia_socket *skt,
        for (i = 0; i < nr; i++)
                if (irqs[i].sock == skt->nr) {
-                        set_irq_type(irqs[i].irq, IRQ_TYPE_EDGE_RISING);
+                        irq_set_irq_type(irqs[i].irq, IRQ_TYPE_EDGE_RISING);
-                        set_irq_type(irqs[i].irq, IRQ_TYPE_EDGE_BOTH);
+                        irq_set_irq_type(irqs[i].irq, IRQ_TYPE_EDGE_BOTH);
                }
 }
 EXPORT_SYMBOL(soc_pcmcia_enable_irqs);
diff --git a/drivers/pcmcia/xxs1500_ss.c b/drivers/pcmcia/xxs1500_ss.c
index 3b67a1b6a197..379f4218857d 100644
--- a/drivers/pcmcia/xxs1500_ss.c
+++ b/drivers/pcmcia/xxs1500_ss.c
@@ -274,7 +274,7 @@ static int __devinit xxs1500_pcmcia_probe(struct platform_device *pdev)
         * edge detector.
         */
        irq = gpio_to_irq(GPIO_CDA);
-        set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);
+        irq_set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);
        ret = request_irq(irq, cdirq, 0, "pcmcia_carddetect", sock);
        if (ret) {
                dev_err(&pdev->dev, "cannot setup cd irq\n");
diff --git a/drivers/platform/x86/intel_pmic_gpio.c b/drivers/platform/x86/intel_pmic_gpio.c
index 61433d492862..d653104b59cb 100644
--- a/drivers/platform/x86/intel_pmic_gpio.c
+++ b/drivers/platform/x86/intel_pmic_gpio.c
@@ -257,9 +257,11 @@ static int __devinit platform_pmic_gpio_probe(struct platform_device *pdev)
        }
        for (i = 0; i < 8; i++) {
-                set_irq_chip_and_handler_name(i + pg->irq_base, &pmic_irqchip,
+                irq_set_chip_and_handler_name(i + pg->irq_base,
-                                        handle_simple_irq, "demux");
+                                              &pmic_irqchip,
-                set_irq_chip_data(i + pg->irq_base, pg);
+                                              handle_simple_irq,
+                                              "demux");
+                irq_set_chip_data(i + pg->irq_base, pg);
        }
        return 0;
 err:
diff --git a/drivers/power/z2_battery.c b/drivers/power/z2_battery.c
index 2a9ab89f83b8..e5ced3a4c1ed 100644
--- a/drivers/power/z2_battery.c
+++ b/drivers/power/z2_battery.c
@@ -215,8 +215,8 @@ static int __devinit z2_batt_probe(struct i2c_client *client,
                if (ret)
                        goto err2;
-                set_irq_type(gpio_to_irq(info->charge_gpio),
+                irq_set_irq_type(gpio_to_irq(info->charge_gpio),
-                                IRQ_TYPE_EDGE_BOTH);
+                                 IRQ_TYPE_EDGE_BOTH);
                ret = request_irq(gpio_to_irq(info->charge_gpio),
                                z2_charge_switch_irq, IRQF_DISABLED,
                                "AC Detect", charger);
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index e55dc1ac83ab..6ac55fd48413 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -782,11 +782,11 @@ static void sh_rtc_set_irq_wake(struct device *dev, int enabled)
        struct platform_device *pdev = to_platform_device(dev);
        struct sh_rtc *rtc = platform_get_drvdata(pdev);
-        set_irq_wake(rtc->periodic_irq, enabled);
+        irq_set_irq_wake(rtc->periodic_irq, enabled);
        if (rtc->carry_irq > 0) {
-                set_irq_wake(rtc->carry_irq, enabled);
+                irq_set_irq_wake(rtc->carry_irq, enabled);
-                set_irq_wake(rtc->alarm_irq, enabled);
+                irq_set_irq_wake(rtc->alarm_irq, enabled);
        }
 }
diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c
index 5833afbf08d7..c6ca115c71df 100644
--- a/drivers/sh/intc/core.c
+++ b/drivers/sh/intc/core.c
@@ -63,7 +63,7 @@ void intc_set_prio_level(unsigned int irq, unsigned int level)
 static void intc_redirect_irq(unsigned int irq, struct irq_desc *desc)
 {
-        generic_handle_irq((unsigned int)get_irq_data(irq));
+        generic_handle_irq((unsigned int)irq_get_handler_data(irq));
 }
 static void __init intc_register_irq(struct intc_desc *desc,
@@ -116,9 +116,9 @@ static void __init intc_register_irq(struct intc_desc *desc,
        irq_data = irq_get_irq_data(irq);
        disable_irq_nosync(irq);
-        set_irq_chip_and_handler_name(irq, &d->chip,
+        irq_set_chip_and_handler_name(irq, &d->chip, handle_level_irq,
-                                      handle_level_irq, "level");
+                                      "level");
-        set_irq_chip_data(irq, (void *)data[primary]);
+        irq_set_chip_data(irq, (void *)data[primary]);
        /*
         * set priority level
@@ -340,9 +340,9 @@ int __init register_intc_controller(struct intc_desc *desc)
                        vect2->enum_id = 0;
                        /* redirect this interrupts to the first one */
-                        set_irq_chip(irq2, &dummy_irq_chip);
+                        irq_set_chip(irq2, &dummy_irq_chip);
-                        set_irq_chained_handler(irq2, intc_redirect_irq);
+                        irq_set_chained_handler(irq2, intc_redirect_irq);
-                        set_irq_data(irq2, (void *)irq);
+                        irq_set_handler_data(irq2, (void *)irq);
                }
        }
@@ -387,19 +387,16 @@ static int intc_suspend(void)
                /* enable wakeup irqs belonging to this intc controller */
                for_each_active_irq(irq) {
                        struct irq_data *data;
-                        struct irq_desc *desc;
                        struct irq_chip *chip;
                        data = irq_get_irq_data(irq);
                        chip = irq_data_get_irq_chip(data);
                        if (chip != &d->chip)
                                continue;
-                        desc = irq_to_desc(irq);
+                        if (irqd_is_wakeup_set(data))
-                        if ((desc->status & IRQ_WAKEUP))
                                chip->irq_enable(data);
                }
        }
        return 0;
 }
@@ -412,7 +409,6 @@ static void intc_resume(void)
                for_each_active_irq(irq) {
                        struct irq_data *data;
-                        struct irq_desc *desc;
                        struct irq_chip *chip;
                        data = irq_get_irq_data(irq);
@@ -423,8 +419,7 @@ static void intc_resume(void)
                         */
                        if (chip != &d->chip)
                                continue;
-                        desc = irq_to_desc(irq);
+                        if (irqd_irq_disabled(data))
-                        if (desc->status & IRQ_DISABLED)
                                chip->irq_disable(data);
                        else
                                chip->irq_enable(data);
diff --git a/drivers/sh/intc/virq.c b/drivers/sh/intc/virq.c
index 4e0ff7181164..ce5f81d7cc6b 100644
--- a/drivers/sh/intc/virq.c
+++ b/drivers/sh/intc/virq.c
@@ -110,7 +110,7 @@ static void intc_virq_handler(unsigned int irq, struct irq_desc *desc)
 {
        struct irq_data *data = irq_get_irq_data(irq);
        struct irq_chip *chip = irq_data_get_irq_chip(data);
-        struct intc_virq_list *entry, *vlist = irq_data_get_irq_data(data);
+        struct intc_virq_list *entry, *vlist = irq_data_get_irq_handler_data(data);
        struct intc_desc_int *d = get_intc_desc(irq);
        chip->irq_mask_ack(data);
@@ -118,7 +118,7 @@ static void intc_virq_handler(unsigned int irq, struct irq_desc *desc)
        for_each_virq(entry, vlist) {
                unsigned long addr, handle;
-                handle = (unsigned long)get_irq_data(entry->irq);
+                handle = (unsigned long)irq_get_handler_data(entry->irq);
                addr = INTC_REG(d, _INTC_ADDR_E(handle), 0);
                if (intc_reg_fns[_INTC_FN(handle)](addr, handle, 0))
@@ -229,13 +229,13 @@ restart:
                intc_irq_xlate_set(irq, entry->enum_id, d);
-                set_irq_chip_and_handler_name(irq, get_irq_chip(entry->pirq),
+                irq_set_chip_and_handler_name(irq, irq_get_chip(entry->pirq),
                                              handle_simple_irq, "virq");
-                set_irq_chip_data(irq, get_irq_chip_data(entry->pirq));
+                irq_set_chip_data(irq, irq_get_chip_data(entry->pirq));
-                set_irq_data(irq, (void *)entry->handle);
+                irq_set_handler_data(irq, (void *)entry->handle);
-                set_irq_chained_handler(entry->pirq, intc_virq_handler);
+                irq_set_chained_handler(entry->pirq, intc_virq_handler);
                add_virq_to_pirq(entry->pirq, irq);
                radix_tree_tag_clear(&d->tree, entry->enum_id,
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
index e3556ff43bb9..ac5bbc8722e5 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
@@ -341,7 +341,7 @@ int bcmsdh_register_oob_intr(void *dhdp)
                if (error)
                        return -ENODEV;
-                set_irq_wake(sdhcinfo->oob_irq, 1);
+                irq_set_irq_wake(sdhcinfo->oob_irq, 1);
                sdhcinfo->oob_irq_registered = true;
        }
@@ -352,7 +352,7 @@ void bcmsdh_unregister_oob_intr(void)
 {
        SDLX_MSG(("%s: Enter\n", __func__));
-        set_irq_wake(sdhcinfo->oob_irq, 0);
+        irq_set_irq_wake(sdhcinfo->oob_irq, 0);
        disable_irq(sdhcinfo->oob_irq); /* just in case.. */
        free_irq(sdhcinfo->oob_irq, NULL);
        sdhcinfo->oob_irq_registered = false;
diff --git a/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c b/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c
index ea9b733c3926..21cdb0637beb 100644
--- a/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c
+++ b/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c
@@ -597,7 +597,7 @@ static int cy_as_hal_configure_interrupts(void *dev_p)
        int result;
        int irq_pin  = AST_INT;
-        set_irq_type(OMAP_GPIO_IRQ(irq_pin), IRQ_TYPE_LEVEL_LOW);
+        irq_set_irq_type(OMAP_GPIO_IRQ(irq_pin), IRQ_TYPE_LEVEL_LOW);
        /*
         * for shared IRQS must provide non NULL device ptr
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index c35f1a73bc8b..52fdf60bdbe2 100644
--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@ -178,7 +178,7 @@ static int __init xen_hvc_init(void)
        if (xencons_irq < 0)
                xencons_irq = 0; /* NO_IRQ */
        else
-                set_irq_noprobe(xencons_irq);
+                irq_set_noprobe(xencons_irq);
        hp = hvc_alloc(HVC_COOKIE, xencons_irq, ops, 256);
        if (IS_ERR(hp))
diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c
index 2e7fc9cee9cc..b906f11f7c1a 100644
--- a/drivers/tty/serial/msm_serial_hs.c
+++ b/drivers/tty/serial/msm_serial_hs.c
@@ -1644,7 +1644,7 @@ static int __devinit msm_hs_probe(struct platform_device *pdev)
        if (unlikely(uport->irq < 0))
                return -ENXIO;
-        if (unlikely(set_irq_wake(uport->irq, 1)))
+        if (unlikely(irq_set_irq_wake(uport->irq, 1)))
                return -ENXIO;
        if (pdata == NULL || pdata->rx_wakeup_irq < 0)
@@ -1658,7 +1658,7 @@ static int __devinit msm_hs_probe(struct platform_device *pdev)
                if (unlikely(msm_uport->rx_wakeup.irq < 0))
                        return -ENXIO;
-                if (unlikely(set_irq_wake(msm_uport->rx_wakeup.irq, 1)))
+                if (unlikely(irq_set_irq_wake(msm_uport->rx_wakeup.irq, 1)))
                        return -ENXIO;
        }
diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
index 38193f4e980e..44e4deb362e1 100644
--- a/drivers/usb/host/oxu210hp-hcd.c
+++ b/drivers/usb/host/oxu210hp-hcd.c
@@ -3832,7 +3832,7 @@ static int oxu_drv_probe(struct platform_device *pdev)
                return -EBUSY;
        }
-        ret = set_irq_type(irq, IRQF_TRIGGER_FALLING);
+        ret = irq_set_irq_type(irq, IRQF_TRIGGER_FALLING);
        if (ret) {
                dev_err(&pdev->dev, "error setting irq type\n");
                ret = -EFAULT;
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index 2ba3b070ed0b..c47aac4a1f98 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -943,7 +943,7 @@ static void tusb_musb_enable(struct musb *musb)
        musb_writel(tbase, TUSB_INT_CTRL_CONF,
                        TUSB_INT_CTRL_CONF_INT_RELCYC(0));
-        set_irq_type(musb->nIrq, IRQ_TYPE_LEVEL_LOW);
+        irq_set_irq_type(musb->nIrq, IRQ_TYPE_LEVEL_LOW);
        /* maybe force into the Default-A OTG state machine */
        if (!(musb_readl(tbase, TUSB_DEV_OTG_STAT)
diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c
index 95921b77cf86..2f4fa02744a5 100644
--- a/drivers/w1/masters/ds1wm.c
+++ b/drivers/w1/masters/ds1wm.c
@@ -368,9 +368,9 @@ static int ds1wm_probe(struct platform_device *pdev)
        ds1wm_data->active_high = plat->active_high;
        if (res->flags & IORESOURCE_IRQ_HIGHEDGE)
-                set_irq_type(ds1wm_data->irq, IRQ_TYPE_EDGE_RISING);
+                irq_set_irq_type(ds1wm_data->irq, IRQ_TYPE_EDGE_RISING);
        if (res->flags & IORESOURCE_IRQ_LOWEDGE)
-                set_irq_type(ds1wm_data->irq, IRQ_TYPE_EDGE_FALLING);
+                irq_set_irq_type(ds1wm_data->irq, IRQ_TYPE_EDGE_FALLING);
        ret = request_irq(ds1wm_data->irq, ds1wm_isr, IRQF_DISABLED,
                          "ds1wm", ds1wm_data);
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 02b5a9c05cfa..036343ba204e 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -122,7 +122,7 @@ static struct irq_chip xen_pirq_chip;
 /* Get info for IRQ */
 static struct irq_info *info_for_irq(unsigned irq)
 {
-        return get_irq_data(irq);
+        return irq_get_handler_data(irq);
 }
 /* Constructors for packed IRQ information. */
@@ -403,7 +403,7 @@ static void xen_irq_init(unsigned irq)
        info->type = IRQT_UNBOUND;
-        set_irq_data(irq, info);
+        irq_set_handler_data(irq, info);
        list_add_tail(&info->list, &xen_irq_list_head);
 }
@@ -458,11 +458,11 @@ static int __must_check xen_allocate_irq_gsi(unsigned gsi)
 static void xen_free_irq(unsigned irq)
 {
-        struct irq_info *info = get_irq_data(irq);
+        struct irq_info *info = irq_get_handler_data(irq);
        list_del(&info->list);
-        set_irq_data(irq, NULL);
+        irq_set_handler_data(irq, NULL);
        kfree(info);
@@ -585,7 +585,7 @@ static void ack_pirq(struct irq_data *data)
 {
        int evtchn = evtchn_from_irq(data->irq);
-        move_native_irq(data->irq);
+        irq_move_irq(data);
        if (VALID_EVTCHN(evtchn)) {
                mask_evtchn(evtchn);
@@ -639,8 +639,8 @@ int xen_bind_pirq_gsi_to_irq(unsigned gsi,
        if (irq < 0)
                goto out;
-        set_irq_chip_and_handler_name(irq, &xen_pirq_chip,
+        irq_set_chip_and_handler_name(irq, &xen_pirq_chip, handle_level_irq,
-                                      handle_level_irq, name);
+                                      name);
        irq_op.irq = irq;
        irq_op.vector = 0;
@@ -690,8 +690,8 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
        if (irq == -1)
                goto out;
-        set_irq_chip_and_handler_name(irq, &xen_pirq_chip,
+        irq_set_chip_and_handler_name(irq, &xen_pirq_chip, handle_level_irq,
-                                      handle_level_irq, name);
+                                      name);
        xen_irq_info_pirq_init(irq, 0, pirq, 0, vector, 0);
        ret = irq_set_msi_desc(irq, msidesc);
@@ -772,7 +772,7 @@ int bind_evtchn_to_irq(unsigned int evtchn)
                if (irq == -1)
                        goto out;
-                set_irq_chip_and_handler_name(irq, &xen_dynamic_chip,
+                irq_set_chip_and_handler_name(irq, &xen_dynamic_chip,
                                              handle_fasteoi_irq, "event");
                xen_irq_info_evtchn_init(irq, evtchn);
@@ -799,7 +799,7 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
                if (irq < 0)
                        goto out;
-                set_irq_chip_and_handler_name(irq, &xen_percpu_chip,
+                irq_set_chip_and_handler_name(irq, &xen_percpu_chip,
                                              handle_percpu_irq, "ipi");
                bind_ipi.vcpu = cpu;
@@ -848,7 +848,7 @@ int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
                if (irq == -1)
                        goto out;
-                set_irq_chip_and_handler_name(irq, &xen_percpu_chip,
+                irq_set_chip_and_handler_name(irq, &xen_percpu_chip,
                                              handle_percpu_irq, "virq");
                bind_virq.virq = virq;
@@ -1339,7 +1339,7 @@ static void ack_dynirq(struct irq_data *data)
 {
        int evtchn = evtchn_from_irq(data->irq);
-        move_masked_irq(data->irq);
+        irq_move_masked_irq(data);
        if (VALID_EVTCHN(evtchn))
                unmask_evtchn(evtchn);