18 files changed, 887 insertions, 84 deletions

diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index f76384221422..af10e97345ce 100644
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -64,6 +64,16 @@ endchoice
 
 comment "Dongle support"
 
+config SH_SIR
+        tristate "SuperH SIR on UART"
+        depends on IRDA && SUPERH && \
+                (CPU_SUBTYPE_SH7722 || CPU_SUBTYPE_SH7723 || \
+                 CPU_SUBTYPE_SH7724)
+        default n
+        help
+          Say Y here if your want to enable SIR function on SuperH UART
+          devices.
+
 config DONGLE
         bool "Serial dongle support"
         depends on IRTTY_SIR
diff --git a/drivers/net/irda/Makefile b/drivers/net/irda/Makefile
index d82e1e3bd8c8..e030d47e2793 100644
--- a/drivers/net/irda/Makefile
+++ b/drivers/net/irda/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_AU1000_FIR)	+= au1k_ir.o
 # SIR drivers
 obj-$(CONFIG_IRTTY_SIR)         += irtty-sir.o  sir-dev.o
 obj-$(CONFIG_BFIN_SIR)          += bfin_sir.o
+obj-$(CONFIG_SH_SIR)            += sh_sir.o
 # dongle drivers for SIR drivers
 obj-$(CONFIG_ESI_DONGLE)        += esi-sir.o
 obj-$(CONFIG_TEKRAM_DONGLE)     += tekram-sir.o
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index 12c7b006f767..28992c815cba 100644
--- a/drivers/net/irda/ali-ircc.c
+++ b/drivers/net/irda/ali-ircc.c
@@ -22,6 +22,7 @@
  ********************************************************************/
 
 #include <linux/module.h>
+#include <linux/gfp.h>
 
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -29,7 +30,6 @@
 #include <linux/netdevice.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
-#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/rtnetlink.h>
 #include <linux/serial_reg.h>
diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c
index eb424681202d..b5cbd39d0685 100644
--- a/drivers/net/irda/au1k_ir.c
+++ b/drivers/net/irda/au1k_ir.c
@@ -36,6 +36,7 @@
 #include <asm/pb1000.h>
 #elif defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100)
 #include <asm/db1x00.h>
+#include <asm/mach-db1x00/bcsr.h>
 #else 
 #error au1k_ir: unsupported board
 #endif
@@ -66,10 +67,6 @@ static char version[] __devinitdata =
 
 #define RUN_AT(x) (jiffies + (x))
 
-#if defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100)
-static BCSR * const bcsr = (BCSR *)0xAE000000;
-#endif
-
 static DEFINE_SPINLOCK(ir_lock);
 
 /*
@@ -282,9 +279,8 @@ static int au1k_irda_net_init(struct net_device *dev)
 
 #if defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100)
         /* power on */
-        bcsr->resets &= ~BCSR_RESETS_IRDA_MODE_MASK;
-        bcsr->resets |= BCSR_RESETS_IRDA_MODE_FULL;
-        au_sync();
+        bcsr_mod(BCSR_RESETS, BCSR_RESETS_IRDA_MODE_MASK,
+                              BCSR_RESETS_IRDA_MODE_FULL);
 #endif
 
         return 0;
@@ -353,13 +349,13 @@ static int au1k_irda_start(struct net_device *dev)
                 return retval;
         }
 
-        if ((retval = request_irq(AU1000_IRDA_TX_INT, &au1k_irda_interrupt, 
+        if ((retval = request_irq(AU1000_IRDA_TX_INT, au1k_irda_interrupt, 
                                         0, dev->name, dev))) {
                 printk(KERN_ERR "%s: unable to get IRQ %d\n", 
                                 dev->name, dev->irq);
                 return retval;
         }
-        if ((retval = request_irq(AU1000_IRDA_RX_INT, &au1k_irda_interrupt, 
+        if ((retval = request_irq(AU1000_IRDA_RX_INT, au1k_irda_interrupt, 
                                         0, dev->name, dev))) {
                 free_irq(AU1000_IRDA_TX_INT, dev);
                 printk(KERN_ERR "%s: unable to get IRQ %d\n", 
@@ -720,14 +716,14 @@ au1k_irda_set_speed(struct net_device *dev, int speed)
 
         if (speed == 4000000) {
 #if defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100)
-                bcsr->resets |= BCSR_RESETS_FIR_SEL;
+                bcsr_mod(BCSR_RESETS, 0, BCSR_RESETS_FIR_SEL);
 #else /* Pb1000 and Pb1100 */
                 writel(1<<13, CPLD_AUX1);
 #endif
         }
         else {
 #if defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100)
-                bcsr->resets &= ~BCSR_RESETS_FIR_SEL;
+                bcsr_mod(BCSR_RESETS, BCSR_RESETS_FIR_SEL, 0);
 #else /* Pb1000 and Pb1100 */
                 writel(readl(CPLD_AUX1) & ~(1<<13), CPLD_AUX1);
 #endif
diff --git a/drivers/net/irda/bfin_sir.h b/drivers/net/irda/bfin_sir.h
index dac71b1f4f9b..b54a6f08db45 100644
--- a/drivers/net/irda/bfin_sir.h
+++ b/drivers/net/irda/bfin_sir.h
@@ -16,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
+#include <linux/slab.h>
 
 #include <net/irda/irda.h>
 #include <net/irda/wrapper.h>
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index 2d7b5c1d5572..b7e6625ca75e 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -184,7 +184,7 @@
 #define CONFIG0H_DMA_ON_NORX CONFIG0H_DMA_OFF| OBOE_CONFIG0H_ENDMAC
 #define CONFIG0H_DMA_ON CONFIG0H_DMA_ON_NORX | OBOE_CONFIG0H_ENRX
 
-static struct pci_device_id toshoboe_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(toshoboe_pci_tbl) = {
         { PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_FIR701, PCI_ANY_ID, PCI_ANY_ID, },
         { PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_FIRD01, PCI_ANY_ID, PCI_ANY_ID, },
         { }                     /* Terminating entry */
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 215adf6377d0..2c9b3af16612 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -852,7 +852,7 @@ static void irda_usb_receive(struct urb *urb)
                  * hot unplug of the dongle...
                  * Lowest effective timer is 10ms...
                  * Jean II */
-                self->rx_defer_timer.function = &irda_usb_rx_defer_expired;
+                self->rx_defer_timer.function = irda_usb_rx_defer_expired;
                 self->rx_defer_timer.data = (unsigned long) urb;
                 mod_timer(&self->rx_defer_timer, jiffies + (10 * HZ / 1000));
                 return;
@@ -1124,11 +1124,11 @@ static int stir421x_patch_device(struct irda_usb_cb *self)
                  * The actual image starts after the "STMP" keyword
                  * so forward to the firmware header tag
                  */
-                for (i = 0; (fw->data[i] != STIR421X_PATCH_END_OF_HDR_TAG)
-                             && (i < fw->size); i++) ;
+                for (i = 0; (fw->data[i] != STIR421X_PATCH_END_OF_HDR_TAG) &&
+                             (i < fw->size); i++) ;
                 /* here we check for the out of buffer case */
-                if ((STIR421X_PATCH_END_OF_HDR_TAG == fw->data[i])
-                    && (i < STIR421X_PATCH_CODE_OFFSET)) {
+                if ((STIR421X_PATCH_END_OF_HDR_TAG == fw->data[i]) &&
+                    (i < STIR421X_PATCH_CODE_OFFSET)) {
                         if (!memcmp(fw->data + i + 1, STIR421X_PATCH_STMP_TAG,
                                     sizeof(STIR421X_PATCH_STMP_TAG) - 1)) {
 
@@ -1651,6 +1651,8 @@ static int irda_usb_probe(struct usb_interface *intf,
 
         self->rx_urb = kcalloc(self->max_rx_urb, sizeof(struct urb *),
                                 GFP_KERNEL);
+        if (!self->rx_urb)
+                goto err_free_net;
 
         for (i = 0; i < self->max_rx_urb; i++) {
                 self->rx_urb[i] = usb_alloc_urb(0, GFP_KERNEL);
@@ -1783,6 +1785,8 @@ err_out_2:
 err_out_1:
         for (i = 0; i < self->max_rx_urb; i++)
                 usb_free_urb(self->rx_urb[i]);
+        kfree(self->rx_urb);
+err_free_net:
         free_netdev(net);
 err_out:
         return ret;
diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c
index 20f9bc626688..ee1dde52e8fc 100644
--- a/drivers/net/irda/irtty-sir.c
+++ b/drivers/net/irda/irtty-sir.c
@@ -28,6 +28,7 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <linux/tty.h>
 #include <linux/init.h>
 #include <asm/uaccess.h>
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index 2413295ebd90..e30cdbb14745 100644
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -43,6 +43,7 @@
  ********************************************************************/
 
 #include <linux/module.h>
+#include <linux/gfp.h>
 
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -50,7 +51,6 @@
 #include <linux/netdevice.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
-#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/rtnetlink.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index 84db145d2b59..1a54f6bb68c5 100644
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@ -18,6 +18,7 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/gpio.h>
+#include <linux/slab.h>
 
 #include <net/irda/irda.h>
 #include <net/irda/irmod.h>
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index c412e8026173..1dcdce0631aa 100644
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
@@ -331,7 +331,7 @@ static int sa1100_irda_resume(struct platform_device *pdev)
                  * If we missed a speed change, initialise at the new speed
                  * directly.  It is debatable whether this is actually
                  * required, but in the interests of continuing from where
-                 * we left off it is desireable.  The converse argument is
+                 * we left off it is desirable.  The converse argument is
                  * that we should re-negotiate at 9600 baud again.
                  */
                 if (si->newspeed) {
diff --git a/drivers/net/irda/sh_sir.c b/drivers/net/irda/sh_sir.c
new file mode 100644
index 000000000000..0745581c4b5e
--- /dev/null
+++ b/drivers/net/irda/sh_sir.c
@@ -0,0 +1,824 @@
+/*
+ * SuperH IrDA Driver
+ *
+ * Copyright (C) 2009 Renesas Solutions Corp.
+ * Kuninori Morimoto <morimoto.kuninori@renesas.com>
+ *
+ * Based on bfin_sir.c
+ * Copyright 2006-2009 Analog Devices Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <net/irda/wrapper.h>
+#include <net/irda/irda_device.h>
+#include <asm/clock.h>
+
+#define DRIVER_NAME "sh_sir"
+
+#define RX_PHASE        (1 << 0)
+#define TX_PHASE        (1 << 1)
+#define TX_COMP_PHASE   (1 << 2) /* tx complete */
+#define NONE_PHASE      (1 << 31)
+
+#define IRIF_RINTCLR    0x0016 /* DMA rx interrupt source clear */
+#define IRIF_TINTCLR    0x0018 /* DMA tx interrupt source clear */
+#define IRIF_SIR0       0x0020 /* IrDA-SIR10 control */
+#define IRIF_SIR1       0x0022 /* IrDA-SIR10 baudrate error correction */
+#define IRIF_SIR2       0x0024 /* IrDA-SIR10 baudrate count */
+#define IRIF_SIR3       0x0026 /* IrDA-SIR10 status */
+#define IRIF_SIR_FRM    0x0028 /* Hardware frame processing set */
+#define IRIF_SIR_EOF    0x002A /* EOF value */
+#define IRIF_SIR_FLG    0x002C /* Flag clear */
+#define IRIF_UART_STS2  0x002E /* UART status 2 */
+#define IRIF_UART0      0x0030 /* UART control */
+#define IRIF_UART1      0x0032 /* UART status */
+#define IRIF_UART2      0x0034 /* UART mode */
+#define IRIF_UART3      0x0036 /* UART transmit data */
+#define IRIF_UART4      0x0038 /* UART receive data */
+#define IRIF_UART5      0x003A /* UART interrupt mask */
+#define IRIF_UART6      0x003C /* UART baud rate error correction */
+#define IRIF_UART7      0x003E /* UART baud rate count set */
+#define IRIF_CRC0       0x0040 /* CRC engine control */
+#define IRIF_CRC1       0x0042 /* CRC engine input data */
+#define IRIF_CRC2       0x0044 /* CRC engine calculation */
+#define IRIF_CRC3       0x0046 /* CRC engine output data 1 */
+#define IRIF_CRC4       0x0048 /* CRC engine output data 2 */
+
+/* IRIF_SIR0 */
+#define IRTPW           (1 << 1) /* transmit pulse width select */
+#define IRERRC          (1 << 0) /* Clear receive pulse width error */
+
+/* IRIF_SIR3 */
+#define IRERR           (1 << 0) /* received pulse width Error */
+
+/* IRIF_SIR_FRM */
+#define EOFD            (1 << 9) /* EOF detection flag */
+#define FRER            (1 << 8) /* Frame Error bit */
+#define FRP             (1 << 0) /* Frame processing set */
+
+/* IRIF_UART_STS2 */
+#define IRSME           (1 << 6) /* Receive Sum     Error flag */
+#define IROVE           (1 << 5) /* Receive Overrun Error flag */
+#define IRFRE           (1 << 4) /* Receive Framing Error flag */
+#define IRPRE           (1 << 3) /* Receive Parity  Error flag */
+
+/* IRIF_UART0_*/
+#define TBEC            (1 << 2) /* Transmit Data Clear */
+#define RIE             (1 << 1) /* Receive Enable */
+#define TIE             (1 << 0) /* Transmit Enable */
+
+/* IRIF_UART1 */
+#define URSME           (1 << 6) /* Receive Sum Error Flag */
+#define UROVE           (1 << 5) /* Receive Overrun Error Flag */
+#define URFRE           (1 << 4) /* Receive Framing Error Flag */
+#define URPRE           (1 << 3) /* Receive Parity Error Flag */
+#define RBF             (1 << 2) /* Receive Buffer Full Flag */
+#define TSBE            (1 << 1) /* Transmit Shift Buffer Empty Flag */
+#define TBE             (1 << 0) /* Transmit Buffer Empty flag */
+#define TBCOMP          (TSBE | TBE)
+
+/* IRIF_UART5 */
+#define RSEIM           (1 << 6) /* Receive Sum Error Flag IRQ Mask */
+#define RBFIM           (1 << 2) /* Receive Buffer Full Flag IRQ Mask */
+#define TSBEIM          (1 << 1) /* Transmit Shift Buffer Empty Flag IRQ Mask */
+#define TBEIM           (1 << 0) /* Transmit Buffer Empty Flag IRQ Mask */
+#define RX_MASK         (RSEIM  | RBFIM)
+
+/* IRIF_CRC0 */
+#define CRC_RST         (1 << 15) /* CRC Engine Reset */
+#define CRC_CT_MASK     0x0FFF
+
+/************************************************************************
+
+
+                        structure
+
+
+************************************************************************/
+struct sh_sir_self {
+        void __iomem            *membase;
+        unsigned int             irq;
+        struct clk              *clk;
+
+        struct net_device       *ndev;
+
+        struct irlap_cb         *irlap;
+        struct qos_info         qos;
+
+        iobuff_t                tx_buff;
+        iobuff_t                rx_buff;
+};
+
+/************************************************************************
+
+
+                        common function
+
+
+************************************************************************/
+static void sh_sir_write(struct sh_sir_self *self, u32 offset, u16 data)
+{
+        iowrite16(data, self->membase + offset);
+}
+
+static u16 sh_sir_read(struct sh_sir_self *self, u32 offset)
+{
+        return ioread16(self->membase + offset);
+}
+
+static void sh_sir_update_bits(struct sh_sir_self *self, u32 offset,
+                               u16 mask, u16 data)
+{
+        u16 old, new;
+
+        old = sh_sir_read(self, offset);
+        new = (old & ~mask) | data;
+        if (old != new)
+                sh_sir_write(self, offset, new);
+}
+
+/************************************************************************
+
+
+                        CRC function
+
+
+************************************************************************/
+static void sh_sir_crc_reset(struct sh_sir_self *self)
+{
+        sh_sir_write(self, IRIF_CRC0, CRC_RST);
+}
+
+static void sh_sir_crc_add(struct sh_sir_self *self, u8 data)
+{
+        sh_sir_write(self, IRIF_CRC1, (u16)data);
+}
+
+static u16 sh_sir_crc_cnt(struct sh_sir_self *self)
+{
+        return CRC_CT_MASK & sh_sir_read(self, IRIF_CRC0);
+}
+
+static u16 sh_sir_crc_out(struct sh_sir_self *self)
+{
+        return sh_sir_read(self, IRIF_CRC4);
+}
+
+static int sh_sir_crc_init(struct sh_sir_self *self)
+{
+        struct device *dev = &self->ndev->dev;
+        int ret = -EIO;
+        u16 val;
+
+        sh_sir_crc_reset(self);
+
+        sh_sir_crc_add(self, 0xCC);
+        sh_sir_crc_add(self, 0xF5);
+        sh_sir_crc_add(self, 0xF1);
+        sh_sir_crc_add(self, 0xA7);
+
+        val = sh_sir_crc_cnt(self);
+        if (4 != val) {
+                dev_err(dev, "CRC count error %x\n", val);
+                goto crc_init_out;
+        }
+
+        val = sh_sir_crc_out(self);
+        if (0x51DF != val) {
+                dev_err(dev, "CRC result error%x\n", val);
+                goto crc_init_out;
+        }
+
+        ret = 0;
+
+crc_init_out:
+
+        sh_sir_crc_reset(self);
+        return ret;
+}
+
+/************************************************************************
+
+
+                        baud rate functions
+
+
+************************************************************************/
+#define SCLK_BASE 1843200 /* 1.8432MHz */
+
+static u32 sh_sir_find_sclk(struct clk *irda_clk)
+{
+        struct cpufreq_frequency_table *freq_table = irda_clk->freq_table;
+        struct clk *pclk = clk_get(NULL, "peripheral_clk");
+        u32 limit, min = 0xffffffff, tmp;
+        int i, index = 0;
+
+        limit = clk_get_rate(pclk);
+        clk_put(pclk);
+
+        /* IrDA can not set over peripheral_clk */
+        for (i = 0;
+             freq_table[i].frequency != CPUFREQ_TABLE_END;
+             i++) {
+                u32 freq = freq_table[i].frequency;
+
+                if (freq == CPUFREQ_ENTRY_INVALID)
+                        continue;
+
+                /* IrDA should not over peripheral_clk */
+                if (freq > limit)
+                        continue;
+
+                tmp = freq % SCLK_BASE;
+                if (tmp < min) {
+                        min = tmp;
+                        index = i;
+                }
+        }
+
+        return freq_table[index].frequency;
+}
+
+#define ERR_ROUNDING(a) ((a + 5000) / 10000)
+static int sh_sir_set_baudrate(struct sh_sir_self *self, u32 baudrate)
+{
+        struct clk *clk;
+        struct device *dev = &self->ndev->dev;
+        u32 rate;
+        u16 uabca, uabc;
+        u16 irbca, irbc;
+        u32 min, rerr, tmp;
+        int i;
+
+        /* Baud Rate Error Correction x 10000 */
+        u32 rate_err_array[] = {
+                0000, 0625, 1250, 1875,
+                2500, 3125, 3750, 4375,
+                5000, 5625, 6250, 6875,
+                7500, 8125, 8750, 9375,
+        };
+
+        /*
+         * FIXME
+         *
+         * it support 9600 only now
+         */
+        switch (baudrate) {
+        case 9600:
+                break;
+        default:
+                dev_err(dev, "un-supported baudrate %d\n", baudrate);
+                return -EIO;
+        }
+
+        clk = clk_get(NULL, "irda_clk");
+        if (!clk) {
+                dev_err(dev, "can not get irda_clk\n");
+                return -EIO;
+        }
+
+        clk_set_rate(clk, sh_sir_find_sclk(clk));
+        rate = clk_get_rate(clk);
+        clk_put(clk);
+
+        dev_dbg(dev, "selected sclk = %d\n", rate);
+
+        /*
+         * CALCULATION
+         *
+         * 1843200 = system rate / (irbca + (irbc + 1))
+         */
+
+        irbc = rate / SCLK_BASE;
+
+        tmp = rate - (SCLK_BASE * irbc);
+        tmp *= 10000;
+
+        rerr = tmp / SCLK_BASE;
+
+        min = 0xffffffff;
+        irbca = 0;
+        for (i = 0; i < ARRAY_SIZE(rate_err_array); i++) {
+                tmp = abs(rate_err_array[i] - rerr);
+                if (min > tmp) {
+                        min = tmp;
+                        irbca = i;
+                }
+        }
+
+        tmp = rate / (irbc + ERR_ROUNDING(rate_err_array[irbca]));
+        if ((SCLK_BASE / 100) < abs(tmp - SCLK_BASE))
+                dev_warn(dev, "IrDA freq error margin over %d\n", tmp);
+
+        dev_dbg(dev, "target = %d, result = %d, infrared = %d.%d\n",
+               SCLK_BASE, tmp, irbc, rate_err_array[irbca]);
+
+        irbca = (irbca & 0xF) << 4;
+        irbc  = (irbc - 1) & 0xF;
+
+        if (!irbc) {
+                dev_err(dev, "sh_sir can not set 0 in IRIF_SIR2\n");
+                return -EIO;
+        }
+
+        sh_sir_write(self, IRIF_SIR0, IRTPW | IRERRC);
+        sh_sir_write(self, IRIF_SIR1, irbca);
+        sh_sir_write(self, IRIF_SIR2, irbc);
+
+        /*
+         * CALCULATION
+         *
+         * BaudRate[bps] = system rate / (uabca + (uabc + 1) x 16)
+         */
+
+        uabc = rate / baudrate;
+        uabc = (uabc / 16) - 1;
+        uabc = (uabc + 1) * 16;
+
+        tmp = rate - (uabc * baudrate);
+        tmp *= 10000;
+
+        rerr = tmp / baudrate;
+
+        min = 0xffffffff;
+        uabca = 0;
+        for (i = 0; i < ARRAY_SIZE(rate_err_array); i++) {
+                tmp = abs(rate_err_array[i] - rerr);
+                if (min > tmp) {
+                        min = tmp;
+                        uabca = i;
+                }
+        }
+
+        tmp = rate / (uabc + ERR_ROUNDING(rate_err_array[uabca]));
+        if ((baudrate / 100) < abs(tmp - baudrate))
+                dev_warn(dev, "UART freq error margin over %d\n", tmp);
+
+        dev_dbg(dev, "target = %d, result = %d, uart = %d.%d\n",
+               baudrate, tmp,
+               uabc, rate_err_array[uabca]);
+
+        uabca = (uabca & 0xF) << 4;
+        uabc  = (uabc / 16) - 1;
+
+        sh_sir_write(self, IRIF_UART6, uabca);
+        sh_sir_write(self, IRIF_UART7, uabc);
+
+        return 0;
+}
+
+/************************************************************************
+
+
+                        iobuf function
+
+
+************************************************************************/
+static int __sh_sir_init_iobuf(iobuff_t *io, int size)
+{
+        io->head = kmalloc(size, GFP_KERNEL);
+        if (!io->head)
+                return -ENOMEM;
+
+        io->truesize    = size;
+        io->in_frame    = FALSE;
+        io->state       = OUTSIDE_FRAME;
+        io->data        = io->head;
+
+        return 0;
+}
+
+static void sh_sir_remove_iobuf(struct sh_sir_self *self)
+{
+        kfree(self->rx_buff.head);
+        kfree(self->tx_buff.head);
+
+        self->rx_buff.head = NULL;
+        self->tx_buff.head = NULL;
+}
+
+static int sh_sir_init_iobuf(struct sh_sir_self *self, int rxsize, int txsize)
+{
+        int err = -ENOMEM;
+
+        if (self->rx_buff.head ||
+            self->tx_buff.head) {
+                dev_err(&self->ndev->dev, "iobuff has already existed.");
+                return err;
+        }
+
+        err = __sh_sir_init_iobuf(&self->rx_buff, rxsize);
+        if (err)
+                goto iobuf_err;
+
+        err = __sh_sir_init_iobuf(&self->tx_buff, txsize);
+
+iobuf_err:
+        if (err)
+                sh_sir_remove_iobuf(self);
+
+        return err;
+}
+
+/************************************************************************
+
+
+                        status function
+
+
+************************************************************************/
+static void sh_sir_clear_all_err(struct sh_sir_self *self)
+{
+        /* Clear error flag for receive pulse width */
+        sh_sir_update_bits(self, IRIF_SIR0, IRERRC, IRERRC);
+
+        /* Clear frame / EOF error flag */
+        sh_sir_write(self, IRIF_SIR_FLG, 0xffff);
+
+        /* Clear all status error */
+        sh_sir_write(self, IRIF_UART_STS2, 0);
+}
+
+static void sh_sir_set_phase(struct sh_sir_self *self, int phase)
+{
+        u16 uart5 = 0;
+        u16 uart0 = 0;
+
+        switch (phase) {
+        case TX_PHASE:
+                uart5 = TBEIM;
+                uart0 = TBEC | TIE;
+                break;
+        case TX_COMP_PHASE:
+                uart5 = TSBEIM;
+                uart0 = TIE;
+                break;
+        case RX_PHASE:
+                uart5 = RX_MASK;
+                uart0 = RIE;
+                break;
+        default:
+                break;
+        }
+
+        sh_sir_write(self, IRIF_UART5, uart5);
+        sh_sir_write(self, IRIF_UART0, uart0);
+}
+
+static int sh_sir_is_which_phase(struct sh_sir_self *self)
+{
+        u16 val = sh_sir_read(self, IRIF_UART5);
+
+        if (val & TBEIM)
+                return TX_PHASE;
+
+        if (val & TSBEIM)
+                return TX_COMP_PHASE;
+
+        if (val & RX_MASK)
+                return RX_PHASE;
+
+        return NONE_PHASE;
+}
+
+static void sh_sir_tx(struct sh_sir_self *self, int phase)
+{
+        switch (phase) {
+        case TX_PHASE:
+                if (0 >= self->tx_buff.len) {
+                        sh_sir_set_phase(self, TX_COMP_PHASE);
+                } else {
+                        sh_sir_write(self, IRIF_UART3, self->tx_buff.data[0]);
+                        self->tx_buff.len--;
+                        self->tx_buff.data++;
+                }
+                break;
+        case TX_COMP_PHASE:
+                sh_sir_set_phase(self, RX_PHASE);
+                netif_wake_queue(self->ndev);
+                break;
+        default:
+                dev_err(&self->ndev->dev, "should not happen\n");
+                break;
+        }
+}
+
+static int sh_sir_read_data(struct sh_sir_self *self)
+{
+        u16 val;
+        int timeout = 1024;
+
+        while (timeout--) {
+                val = sh_sir_read(self, IRIF_UART1);
+
+                /* data get */
+                if (val & RBF) {
+                        if (val & (URSME | UROVE | URFRE | URPRE))
+                                break;
+
+                        return (int)sh_sir_read(self, IRIF_UART4);
+                }
+
+                udelay(1);
+        }
+
+        dev_err(&self->ndev->dev, "UART1 %04x : STATUS %04x\n",
+                val, sh_sir_read(self, IRIF_UART_STS2));
+
+        /* read data register for clear error */
+        sh_sir_read(self, IRIF_UART4);
+
+        return -1;
+}
+
+static void sh_sir_rx(struct sh_sir_self *self)
+{
+        int timeout = 1024;
+        int data;
+
+        while (timeout--) {
+                data = sh_sir_read_data(self);
+                if (data < 0)
+                        break;
+
+                async_unwrap_char(self->ndev, &self->ndev->stats,
+                                  &self->rx_buff, (u8)data);
+                self->ndev->last_rx = jiffies;
+
+                if (EOFD & sh_sir_read(self, IRIF_SIR_FRM))
+                        continue;
+
+                break;
+        }
+}
+
+static irqreturn_t sh_sir_irq(int irq, void *dev_id)
+{
+        struct sh_sir_self *self = dev_id;
+        struct device *dev = &self->ndev->dev;
+        int phase = sh_sir_is_which_phase(self);
+
+        switch (phase) {
+        case TX_COMP_PHASE:
+        case TX_PHASE:
+                sh_sir_tx(self, phase);
+                break;
+        case RX_PHASE:
+                if (sh_sir_read(self, IRIF_SIR3))
+                        dev_err(dev, "rcv pulse width error occurred\n");
+
+                sh_sir_rx(self);
+                sh_sir_clear_all_err(self);
+                break;
+        default:
+                dev_err(dev, "unknown interrupt\n");
+        }
+
+         return IRQ_HANDLED;
+}
+
+/************************************************************************
+
+
+                        net_device_ops function
+
+
+************************************************************************/
+static int sh_sir_hard_xmit(struct sk_buff *skb, struct net_device *ndev)
+{
+        struct sh_sir_self *self = netdev_priv(ndev);
+        int speed = irda_get_next_speed(skb);
+
+        if ((0 < speed) &&
+            (9600 != speed)) {
+                dev_err(&ndev->dev, "support 9600 only (%d)\n", speed);
+                return -EIO;
+        }
+
+        netif_stop_queue(ndev);
+
+        self->tx_buff.data = self->tx_buff.head;
+        self->tx_buff.len = 0;
+        if (skb->len)
+                self->tx_buff.len = async_wrap_skb(skb, self->tx_buff.data,
+                                                   self->tx_buff.truesize);
+
+        sh_sir_set_phase(self, TX_PHASE);
+        dev_kfree_skb(skb);
+
+        return 0;
+}
+
+static int sh_sir_ioctl(struct net_device *ndev, struct ifreq *ifreq, int cmd)
+{
+        /*
+         * FIXME
+         *
+         * This function is needed for irda framework.
+         * But nothing to do now
+         */
+        return 0;
+}
+
+static struct net_device_stats *sh_sir_stats(struct net_device *ndev)
+{
+        struct sh_sir_self *self = netdev_priv(ndev);
+
+        return &self->ndev->stats;
+}
+
+static int sh_sir_open(struct net_device *ndev)
+{
+        struct sh_sir_self *self = netdev_priv(ndev);
+        int err;
+
+        clk_enable(self->clk);
+        err = sh_sir_crc_init(self);
+        if (err)
+                goto open_err;
+
+        sh_sir_set_baudrate(self, 9600);
+
+        self->irlap = irlap_open(ndev, &self->qos, DRIVER_NAME);
+        if (!self->irlap)
+                goto open_err;
+
+        /*
+         * Now enable the interrupt then start the queue
+         */
+        sh_sir_update_bits(self, IRIF_SIR_FRM, FRP, FRP);
+        sh_sir_read(self, IRIF_UART1); /* flag clear */
+        sh_sir_read(self, IRIF_UART4); /* flag clear */
+        sh_sir_set_phase(self, RX_PHASE);
+
+        netif_start_queue(ndev);
+
+        dev_info(&self->ndev->dev, "opened\n");
+
+        return 0;
+
+open_err:
+        clk_disable(self->clk);
+
+        return err;
+}
+
+static int sh_sir_stop(struct net_device *ndev)
+{
+        struct sh_sir_self *self = netdev_priv(ndev);
+
+        /* Stop IrLAP */
+        if (self->irlap) {
+                irlap_close(self->irlap);
+                self->irlap = NULL;
+        }
+
+        netif_stop_queue(ndev);
+
+        dev_info(&ndev->dev, "stoped\n");
+
+        return 0;
+}
+
+static const struct net_device_ops sh_sir_ndo = {
+        .ndo_open               = sh_sir_open,
+        .ndo_stop               = sh_sir_stop,
+        .ndo_start_xmit         = sh_sir_hard_xmit,
+        .ndo_do_ioctl           = sh_sir_ioctl,
+        .ndo_get_stats          = sh_sir_stats,
+};
+
+/************************************************************************
+
+
+                        platform_driver function
+
+
+************************************************************************/
+static int __devinit sh_sir_probe(struct platform_device *pdev)
+{
+        struct net_device *ndev;
+        struct sh_sir_self *self;
+        struct resource *res;
+        char clk_name[8];
+        void __iomem *base;
+        unsigned int irq;
+        int err = -ENOMEM;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        irq = platform_get_irq(pdev, 0);
+        if (!res || irq < 0) {
+                dev_err(&pdev->dev, "Not enough platform resources.\n");
+                goto exit;
+        }
+
+        ndev = alloc_irdadev(sizeof(*self));
+        if (!ndev)
+                goto exit;
+
+        base = ioremap_nocache(res->start, resource_size(res));
+        if (!base) {
+                err = -ENXIO;
+                dev_err(&pdev->dev, "Unable to ioremap.\n");
+                goto err_mem_1;
+        }
+
+        self = netdev_priv(ndev);
+        err = sh_sir_init_iobuf(self, IRDA_SKB_MAX_MTU, IRDA_SIR_MAX_FRAME);
+        if (err)
+                goto err_mem_2;
+
+        snprintf(clk_name, sizeof(clk_name), "irda%d", pdev->id);
+        self->clk = clk_get(&pdev->dev, clk_name);
+        if (IS_ERR(self->clk)) {
+                dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name);
+                goto err_mem_3;
+        }
+
+        irda_init_max_qos_capabilies(&self->qos);
+
+        ndev->netdev_ops        = &sh_sir_ndo;
+        ndev->irq               = irq;
+
+        self->membase                   = base;
+        self->ndev                      = ndev;
+        self->qos.baud_rate.bits        &= IR_9600; /* FIXME */
+        self->qos.min_turn_time.bits    = 1; /* 10 ms or more */
+
+        irda_qos_bits_to_value(&self->qos);
+
+        err = register_netdev(ndev);
+        if (err)
+                goto err_mem_4;
+
+        platform_set_drvdata(pdev, ndev);
+
+        if (request_irq(irq, sh_sir_irq, IRQF_DISABLED, "sh_sir", self)) {
+                dev_warn(&pdev->dev, "Unable to attach sh_sir interrupt\n");
+                goto err_mem_4;
+        }
+
+        dev_info(&pdev->dev, "SuperH IrDA probed\n");
+
+        goto exit;
+
+err_mem_4:
+        clk_put(self->clk);
+err_mem_3:
+        sh_sir_remove_iobuf(self);
+err_mem_2:
+        iounmap(self->membase);
+err_mem_1:
+        free_netdev(ndev);
+exit:
+        return err;
+}
+
+static int __devexit sh_sir_remove(struct platform_device *pdev)
+{
+        struct net_device *ndev = platform_get_drvdata(pdev);
+        struct sh_sir_self *self = netdev_priv(ndev);
+
+        if (!self)
+                return 0;
+
+        unregister_netdev(ndev);
+        clk_put(self->clk);
+        sh_sir_remove_iobuf(self);
+        iounmap(self->membase);
+        free_netdev(ndev);
+        platform_set_drvdata(pdev, NULL);
+
+        return 0;
+}
+
+static struct platform_driver sh_sir_driver = {
+        .probe   = sh_sir_probe,
+        .remove  = __devexit_p(sh_sir_remove),
+        .driver  = {
+                .name = DRIVER_NAME,
+        },
+};
+
+static int __init sh_sir_init(void)
+{
+        return platform_driver_register(&sh_sir_driver);
+}
+
+static void __exit sh_sir_exit(void)
+{
+        platform_driver_unregister(&sh_sir_driver);
+}
+
+module_init(sh_sir_init);
+module_exit(sh_sir_exit);
+
+MODULE_AUTHOR("Kuninori Morimoto <morimoto.kuninori@renesas.com>");
+MODULE_DESCRIPTION("SuperH IrDA driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/irda/sir_dev.c b/drivers/net/irda/sir_dev.c
index 4b2a1a9eac2a..de91cd14016b 100644
--- a/drivers/net/irda/sir_dev.c
+++ b/drivers/net/irda/sir_dev.c
@@ -13,6 +13,7 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index 1e8dd8c74a64..6af84d88cd03 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -48,13 +48,13 @@
 #include <linux/netdevice.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
-#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/rtnetlink.h>
 #include <linux/serial_reg.h>
 #include <linux/dma-mapping.h>
 #include <linux/pnp.h>
 #include <linux/platform_device.h>
+#include <linux/gfp.h>
 
 #include <asm/io.h>
 #include <asm/dma.h>
@@ -115,7 +115,7 @@ struct smsc_ircc_subsystem_configuration {
         unsigned short vendor; /* PCI vendor ID */
         unsigned short device; /* PCI vendor ID */
         unsigned short subvendor; /* PCI subsystem vendor ID */
-        unsigned short subdevice; /* PCI sybsystem device ID */
+        unsigned short subdevice; /* PCI subsystem device ID */
         unsigned short sir_io; /* I/O port for SIR */
         unsigned short fir_io; /* I/O port for FIR */
         unsigned char  fir_irq; /* FIR IRQ */
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index 528767dec9d7..e5698fa30a4f 100644
--- a/drivers/net/irda/stir4200.c
+++ b/drivers/net/irda/stir4200.c
@@ -612,16 +612,16 @@ static int fifo_txwait(struct stir_cb *stir, int space)
                 pr_debug("fifo status 0x%lx count %lu\n", status, count);
 
                 /* is fifo receiving already, or empty */
-                if (!(status & FIFOCTL_DIR)
-                    || (status & FIFOCTL_EMPTY))
+                if (!(status & FIFOCTL_DIR) ||
+                    (status & FIFOCTL_EMPTY))
                         return 0;
 
                 if (signal_pending(current))
                         return -EINTR;
 
                 /* shutting down? */
-                if (!netif_running(stir->netdev)
-                    || !netif_device_present(stir->netdev))
+                if (!netif_running(stir->netdev) ||
+                    !netif_device_present(stir->netdev))
                         return -ESHUTDOWN;
 
                 /* only waiting for some space */
@@ -776,8 +776,8 @@ static int stir_transmit_thread(void *arg)
                 }
 
                 /* nothing to send? start receiving */
-                if (!stir->receiving 
-                    && irda_device_txqueue_empty(dev)) {
+                if (!stir->receiving &&
+                    irda_device_txqueue_empty(dev)) {
                         /* Wait otherwise chip gets confused. */
                         if (fifo_txwait(stir, -1))
                                 break;
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index a5ca71cec028..b0a6cd815be1 100644
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -45,11 +45,11 @@ F02 Oct/28/02: Add SB device ID for 3147 and 3177.
 #include <linux/netdevice.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
-#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/rtnetlink.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
+#include <linux/gfp.h>
 
 #include <asm/io.h>
 #include <asm/dma.h>
@@ -121,7 +121,7 @@ static void iodelay(int udelay)
         }
 }
 
-static struct pci_device_id via_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(via_pci_tbl) = {
         { PCI_VENDOR_ID_VIA, 0x8231, PCI_ANY_ID, PCI_ANY_ID,0,0,0 },
         { PCI_VENDOR_ID_VIA, 0x3109, PCI_ANY_ID, PCI_ANY_ID,0,0,1 },
         { PCI_VENDOR_ID_VIA, 0x3074, PCI_ANY_ID, PCI_ANY_ID,0,0,2 },
@@ -1185,8 +1185,8 @@ F01_E */
                  * if frame size,data ptr,or skb ptr are wrong ,the get next
                  * entry.
                  */
-                if ((skb == NULL) || (skb->data == NULL)
-                    || (self->rx_buff.data == NULL) || (len < 6)) {
+                if ((skb == NULL) || (skb->data == NULL) ||
+                    (self->rx_buff.data == NULL) || (len < 6)) {
                         self->netdev->stats.rx_dropped++;
                         return TRUE;
                 }
@@ -1284,8 +1284,8 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase)
                 self->RetryCount++;
 
         if ((self->RetryCount >= 1) ||
-            ((st_fifo->pending_bytes + 2048) > self->rx_buff.truesize)
-            || (st_fifo->len >= (MAX_RX_WINDOW))) {
+            ((st_fifo->pending_bytes + 2048) > self->rx_buff.truesize) ||
+            (st_fifo->len >= (MAX_RX_WINDOW))) {
                 while (st_fifo->len > 0) {      //upload frame
                         // Put this entry back in fifo 
                         if (st_fifo->head > MAX_RX_WINDOW)
@@ -1300,8 +1300,8 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase)
                          * if frame size, data ptr, or skb ptr are wrong,
                          * then get next entry.
                          */
-                        if ((skb == NULL) || (skb->data == NULL)
-                            || (self->rx_buff.data == NULL) || (len < 6)) {
+                        if ((skb == NULL) || (skb->data == NULL) ||
+                            (self->rx_buff.data == NULL) || (len < 6)) {
                                 self->netdev->stats.rx_dropped++;
                                 continue;
                         }
@@ -1332,8 +1332,8 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase)
                  * if frame is receive complete at this routine ,then upload
                  * frame.
                  */
-                if ((GetRXStatus(iobase) & 0x10)
-                    && (RxCurCount(iobase, self) != self->RxLastCount)) {
+                if ((GetRXStatus(iobase) & 0x10) &&
+                    (RxCurCount(iobase, self) != self->RxLastCount)) {
                         upload_rxdata(self, iobase);
                         if (irda_device_txqueue_empty(self->netdev))
                                 via_ircc_dma_receive(self);
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index 7cfb8b6593c6..209d4bcfaced 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -59,7 +59,7 @@ MODULE_LICENSE("GPL");
 
 static /* const */ char drivername[] = DRIVER_NAME;
 
-static struct pci_device_id vlsi_irda_table [] = {
+static DEFINE_PCI_DEVICE_TABLE(vlsi_irda_table) = {
         {
                 .class =        PCI_CLASS_WIRELESS_IRDA << 8,
                 .class_mask =   PCI_CLASS_SUBCLASS_MASK << 8, 
@@ -431,8 +431,8 @@ static struct vlsi_ring *vlsi_alloc_ring(struct pci_dev *pdev, struct ring_descr
                 memset(rd, 0, sizeof(*rd));
                 rd->hw = hwmap + i;
                 rd->buf = kmalloc(len, GFP_KERNEL|GFP_DMA);
-                if (rd->buf == NULL
-                    ||  !(busaddr = pci_map_single(pdev, rd->buf, len, dir))) {
+                if (rd->buf == NULL ||
+                    !(busaddr = pci_map_single(pdev, rd->buf, len, dir))) {
                         if (rd->buf) {
                                 IRDA_ERROR("%s: failed to create PCI-MAP for %p",
                                            __func__, rd->buf);
@@ -955,8 +955,8 @@ static netdev_tx_t vlsi_hard_start_xmit(struct sk_buff *skb,
                 }
                 for(;;) {
                         do_gettimeofday(&now);
-                        if (now.tv_sec > ready.tv_sec
-                            ||  (now.tv_sec==ready.tv_sec && now.tv_usec>=ready.tv_usec))
+                        if (now.tv_sec > ready.tv_sec ||
+                            (now.tv_sec==ready.tv_sec && now.tv_usec>=ready.tv_usec))
                                 break;
                         udelay(100);
                         /* must not sleep here - called under netif_tx_lock! */
@@ -1594,8 +1594,8 @@ static int vlsi_irda_init(struct net_device *ndev)
          * see include file for details why we need these 2 masks, in this order!
          */
 
-        if (pci_set_dma_mask(pdev,DMA_MASK_USED_BY_HW)
-            || pci_set_dma_mask(pdev,DMA_MASK_MSTRPAGE)) {
+        if (pci_set_dma_mask(pdev,DMA_MASK_USED_BY_HW) ||
+            pci_set_dma_mask(pdev,DMA_MASK_MSTRPAGE)) {
                 IRDA_ERROR("%s: aborting due to PCI BM-DMA address limitations\n", __func__);
                 return -1;
         }
@@ -1641,8 +1641,8 @@ vlsi_irda_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         IRDA_MESSAGE("%s: IrDA PCI controller %s detected\n",
                      drivername, pci_name(pdev));
 
-        if ( !pci_resource_start(pdev,0)
-             || !(pci_resource_flags(pdev,0) & IORESOURCE_IO) ) {
+        if ( !pci_resource_start(pdev,0) ||
+             !(pci_resource_flags(pdev,0) & IORESOURCE_IO) ) {
                 IRDA_ERROR("%s: bar 0 invalid", __func__);
                 goto out_disable;
         }
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c
index 551810fd2976..cb0cb758be64 100644
--- a/drivers/net/irda/w83977af_ir.c
+++ b/drivers/net/irda/w83977af_ir.c
@@ -46,10 +46,10 @@
 #include <linux/netdevice.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
-#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/rtnetlink.h>
 #include <linux/dma-mapping.h>
+#include <linux/gfp.h>
 
 #include <asm/io.h>
 #include <asm/dma.h>
@@ -65,7 +65,6 @@
 #undef  CONFIG_NETWINDER_TX_DMA_PROBLEMS /* Not needed */
 #define CONFIG_NETWINDER_RX_DMA_PROBLEMS /* Must have this one! */
 #endif
-#undef  CONFIG_USE_INTERNAL_TIMER  /* Just cannot make that timer work */
 #define CONFIG_USE_W977_PNP        /* Currently needed */
 #define PIO_MAX_SPEED       115200 
 
@@ -533,25 +532,6 @@ static netdev_tx_t w83977af_hard_xmit(struct sk_buff *skb,
                 self->tx_buff.len = skb->len;
                 
                 mtt = irda_get_mtt(skb);
-#ifdef CONFIG_USE_INTERNAL_TIMER
-                if (mtt > 50) {
-                        /* Adjust for timer resolution */
-                        mtt /= 1000+1;
-
-                        /* Setup timer */
-                        switch_bank(iobase, SET4);
-                        outb(mtt & 0xff, iobase+TMRL);
-                        outb((mtt >> 8) & 0x0f, iobase+TMRH);
-                        
-                        /* Start timer */
-                        outb(IR_MSL_EN_TMR, iobase+IR_MSL);
-                        self->io.direction = IO_XMIT;
-                        
-                        /* Enable timer interrupt */
-                        switch_bank(iobase, SET0);
-                        outb(ICR_ETMRI, iobase+ICR);
-                } else {
-#endif
                         IRDA_DEBUG(4, "%s(%ld), mtt=%d\n", __func__ , jiffies, mtt);
                         if (mtt)
                                 udelay(mtt);
@@ -560,9 +540,6 @@ static netdev_tx_t w83977af_hard_xmit(struct sk_buff *skb,
                         switch_bank(iobase, SET0);
                         outb(ICR_EDMAI, iobase+ICR);
                         w83977af_dma_write(self, iobase);
-#ifdef CONFIG_USE_INTERNAL_TIMER
-                }
-#endif
         } else {
                 self->tx_buff.data = self->tx_buff.head;
                 self->tx_buff.len = async_wrap_skb(skb, self->tx_buff.data, 
@@ -876,20 +853,7 @@ static int w83977af_dma_receive_complete(struct w83977af_ir *self)
                         /* Check if we have transferred all data to memory */
                         switch_bank(iobase, SET0);
                         if (inb(iobase+USR) & USR_RDR) {
-#ifdef CONFIG_USE_INTERNAL_TIMER
-                                /* Put this entry back in fifo */
-                                st_fifo->head--;
-                                st_fifo->len++;
-                                st_fifo->entries[st_fifo->head].status = status;
-                                st_fifo->entries[st_fifo->head].len = len;
-                                
-                                /* Restore set register */
-                                outb(set, iobase+SSR);
-                        
-                                return FALSE;   /* I'll be back! */
-#else
                                 udelay(80); /* Should be enough!? */
-#endif
                         }
                                                 
                         skb = dev_alloc_skb(len+1);