Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / bluetooth / brf6150.c

diff --git a/drivers/bluetooth/brf6150.c b/drivers/bluetooth/brf6150.c
index 3e0faa1262b9137a763b1eeda120f3e4a02a7d40..f47b22fd7d0aad6562b69a8d8e1fae525a71d302 100644 (file)
--- a/drivers/bluetooth/brf6150.c
+++ b/drivers/bluetooth/brf6150.c
@@ -19,7 +19,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 
 #include <linux/kernel.h>
@@ -30,14 +29,15 @@
 #include <linux/serial_reg.h>
 #include <linux/skbuff.h>
 #include <linux/firmware.h>
+#include <linux/irq.h>
 #include <linux/timer.h>
 #include <linux/clk.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/board.h>
-#include <asm/arch/irqs.h>
+#include <mach/hardware.h>
+#include <mach/gpio.h>
+#include <mach/board.h>
+#include <mach/irqs.h>
 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
@@ -569,7 +569,7 @@ static void brf6150_tx_tasklet(unsigned long data)
        spin_unlock_irqrestore(&info->lock, flags);
 }
 
-static irqreturn_t brf6150_interrupt(int irq, void *data, struct pt_regs *regs)
+static irqreturn_t brf6150_interrupt(int irq, void *data)
 {
        struct brf6150_info *info = (struct brf6150_info *)data;
        u8 iir, msr;
@@ -617,8 +617,7 @@ static irqreturn_t brf6150_interrupt(int irq, void *data, struct pt_regs *regs)
        return ret;
 }
 
-static irqreturn_t brf6150_wakeup_interrupt(int irq, void *dev_inst,
-                                           struct pt_regs *regs)
+static irqreturn_t brf6150_wakeup_interrupt(int irq, void *dev_inst)
 {
        struct brf6150_info *info = dev_inst;
        int should_wakeup;
@@ -743,7 +742,7 @@ static int brf6150_hci_open(struct hci_dev *hdev)
        info->garbage_bytes = 0;
        info->rx_skb = NULL;
        info->pm_enabled = 0;
-       set_irq_type(OMAP_GPIO_IRQ(info->btinfo->host_wakeup_gpio), IRQT_NOEDGE);
+       set_irq_type(OMAP_GPIO_IRQ(info->btinfo->host_wakeup_gpio), IRQ_TYPE_NONE);
        init_completion(&info->fw_completion);
 
        clk_enable(info->uart_ck);
@@ -772,7 +771,7 @@ static int brf6150_hci_open(struct hci_dev *hdev)
        if (err < 0)
                printk(KERN_ERR "brf6150: Sending firmware failed. Bluetooth won't work properly\n");
 
-       set_irq_type(OMAP_GPIO_IRQ(info->btinfo->host_wakeup_gpio), IRQT_BOTHEDGE);
+       set_irq_type(OMAP_GPIO_IRQ(info->btinfo->host_wakeup_gpio), IRQ_TYPE_EDGE_BOTH);
        info->pm_enabled = 1;
        set_bit(HCI_RUNNING, &hdev->flags);
        return 0;
@@ -788,7 +787,7 @@ static int brf6150_hci_close(struct hci_dev *hdev)
        clk_disable(info->uart_ck);
        del_timer_sync(&info->pm_timer);
        omap_set_gpio_dataout(info->btinfo->bt_wakeup_gpio, 0);
-       set_irq_type(OMAP_GPIO_IRQ(info->btinfo->host_wakeup_gpio), IRQT_NOEDGE);
+       set_irq_type(OMAP_GPIO_IRQ(info->btinfo->host_wakeup_gpio), IRQ_TYPE_NONE);
 
        return 0;
 }
@@ -947,7 +946,7 @@ static int __init brf6150_init(void)
        omap_set_gpio_direction(info->btinfo->reset_gpio, 0);
        omap_set_gpio_direction(info->btinfo->bt_wakeup_gpio, 0);
        omap_set_gpio_direction(info->btinfo->host_wakeup_gpio, 1);
-       set_irq_type(OMAP_GPIO_IRQ(info->btinfo->host_wakeup_gpio), IRQT_NOEDGE);
+       set_irq_type(OMAP_GPIO_IRQ(info->btinfo->host_wakeup_gpio), IRQ_TYPE_NONE);
 
        switch (info->btinfo->bt_uart) {
        case 1: