Merge branch 'upstream'

605 files changed, 34993 insertions, 12073 deletions

diff --git a/drivers/Kconfig b/drivers/Kconfig
index bddf431bbb..9f5c0da57c 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -70,4 +70,6 @@ source "drivers/sn/Kconfig"
 
 source "drivers/edac/Kconfig"
 
+source "drivers/rtc/Kconfig"
+
 endmenu
diff --git a/drivers/Makefile b/drivers/Makefile
index 5c69b86db6..424955274e 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -56,6 +56,7 @@ obj-$(CONFIG_USB_GADGET)	+= usb/gadget/
 obj-$(CONFIG_GAMEPORT)          += input/gameport/
 obj-$(CONFIG_INPUT)             += input/
 obj-$(CONFIG_I2O)               += message/
+obj-$(CONFIG_RTC_LIB)           += rtc/
 obj-$(CONFIG_I2C)               += i2c/
 obj-$(CONFIG_W1)                += w1/
 obj-$(CONFIG_HWMON)             += hwmon/
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 82710ae392..5cb96300eb 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -256,7 +256,8 @@ config ACPI_CUSTOM_DSDT_FILE
         depends on ACPI_CUSTOM_DSDT
         default ""
         help
-          Enter the full path name to the file wich includes the AmlCode declaration.
+          Enter the full path name to the file which includes the AmlCode
+          declaration.
 
 config ACPI_BLACKLIST_YEAR
         int "Disable ACPI for systems before Jan 1st this year" if X86_32
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index 9824f679a9..f9c972b26f 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -77,28 +77,13 @@ static struct acpi_blacklist_item acpi_blacklist[] __initdata = {
 
 static int __init blacklist_by_year(void)
 {
-        int year;
-        char *s = dmi_get_system_info(DMI_BIOS_DATE);
-
-        if (!s)
-                return 0;
-        if (!*s)
-                return 0;
-
-        s = strrchr(s, '/');
-        if (!s)
+        int year = dmi_get_year(DMI_BIOS_DATE);
+        /* Doesn't exist? Likely an old system */
+        if (year == -1) 
+                return 1;
+        /* 0? Likely a buggy new BIOS */
+        if (year == 0)
                 return 0;
-
-        s += 1;
-
-        year = simple_strtoul(s, NULL, 0);
-
-        if (year < 100) {       /* 2-digit year */
-                year += 1900;
-                if (year < 1996)        /* no dates < spec 1.0 */
-                        year += 100;
-        }
-
         if (year < CONFIG_ACPI_BLACKLIST_YEAR) {
                 printk(KERN_ERR PREFIX "BIOS age (%d) fails cutoff (%d), "
                        "acpi=force is required to enable ACPI\n",
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index ac5bbaedac..13b5fd5854 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -156,12 +156,10 @@ acpi_status acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr)
 {
         if (efi_enabled) {
                 addr->pointer_type = ACPI_PHYSICAL_POINTER;
-                if (efi.acpi20)
-                        addr->pointer.physical =
-                            (acpi_physical_address) virt_to_phys(efi.acpi20);
-                else if (efi.acpi)
-                        addr->pointer.physical =
-                            (acpi_physical_address) virt_to_phys(efi.acpi);
+                if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
+                        addr->pointer.physical = efi.acpi20;
+                else if (efi.acpi != EFI_INVALID_TABLE_ADDR)
+                        addr->pointer.physical = efi.acpi;
                 else {
                         printk(KERN_ERR PREFIX
                                "System description tables not found\n");
@@ -182,22 +180,14 @@ acpi_status
 acpi_os_map_memory(acpi_physical_address phys, acpi_size size,
                    void __iomem ** virt)
 {
-        if (efi_enabled) {
-                if (EFI_MEMORY_WB & efi_mem_attributes(phys)) {
-                        *virt = (void __iomem *)phys_to_virt(phys);
-                } else {
-                        *virt = ioremap(phys, size);
-                }
-        } else {
-                if (phys > ULONG_MAX) {
-                        printk(KERN_ERR PREFIX "Cannot map memory that high\n");
-                        return AE_BAD_PARAMETER;
-                }
-                /*
-                 * ioremap checks to ensure this is in reserved space
-                 */
-                *virt = ioremap((unsigned long)phys, size);
+        if (phys > ULONG_MAX) {
+                printk(KERN_ERR PREFIX "Cannot map memory that high\n");
+                return AE_BAD_PARAMETER;
         }
+        /*
+         * ioremap checks to ensure this is in reserved space
+         */
+        *virt = ioremap((unsigned long)phys, size);
 
         if (!*virt)
                 return AE_NO_MEMORY;
@@ -409,18 +399,8 @@ acpi_os_read_memory(acpi_physical_address phys_addr, u32 * value, u32 width)
 {
         u32 dummy;
         void __iomem *virt_addr;
-        int iomem = 0;
 
-        if (efi_enabled) {
-                if (EFI_MEMORY_WB & efi_mem_attributes(phys_addr)) {
-                        /* HACK ALERT! We can use readb/w/l on real memory too.. */
-                        virt_addr = (void __iomem *)phys_to_virt(phys_addr);
-                } else {
-                        iomem = 1;
-                        virt_addr = ioremap(phys_addr, width);
-                }
-        } else
-                virt_addr = (void __iomem *)phys_to_virt(phys_addr);
+        virt_addr = ioremap(phys_addr, width);
         if (!value)
                 value = &dummy;
 
@@ -438,10 +418,7 @@ acpi_os_read_memory(acpi_physical_address phys_addr, u32 * value, u32 width)
                 BUG();
         }
 
-        if (efi_enabled) {
-                if (iomem)
-                        iounmap(virt_addr);
-        }
+        iounmap(virt_addr);
 
         return AE_OK;
 }
@@ -450,18 +427,8 @@ acpi_status
 acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width)
 {
         void __iomem *virt_addr;
-        int iomem = 0;
 
-        if (efi_enabled) {
-                if (EFI_MEMORY_WB & efi_mem_attributes(phys_addr)) {
-                        /* HACK ALERT! We can use writeb/w/l on real memory too */
-                        virt_addr = (void __iomem *)phys_to_virt(phys_addr);
-                } else {
-                        iomem = 1;
-                        virt_addr = ioremap(phys_addr, width);
-                }
-        } else
-                virt_addr = (void __iomem *)phys_to_virt(phys_addr);
+        virt_addr = ioremap(phys_addr, width);
 
         switch (width) {
         case 8:
@@ -477,8 +444,7 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width)
                 BUG();
         }
 
-        if (iomem)
-                iounmap(virt_addr);
+        iounmap(virt_addr);
 
         return AE_OK;
 }
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 99a3a28594..713b763884 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -246,7 +246,7 @@ static int acpi_processor_errata(struct acpi_processor *pr)
 }
 
 /* --------------------------------------------------------------------------
-                              Common ACPI processor fucntions
+                              Common ACPI processor functions
    -------------------------------------------------------------------------- */
 
 /*
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index eb730a8095..80fa43471f 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -878,12 +878,9 @@ static int acpi_processor_power_verify(struct acpi_processor *pr)
         unsigned int working = 0;
 
 #ifdef ARCH_APICTIMER_STOPS_ON_C3
-        struct cpuinfo_x86 *c = cpu_data + pr->id;
+        int timer_broadcast = 0;
         cpumask_t mask = cpumask_of_cpu(pr->id);
-
-        if (c->x86_vendor == X86_VENDOR_INTEL) {
-                on_each_cpu(switch_ipi_to_APIC_timer, &mask, 1, 1);
-        }
+        on_each_cpu(switch_ipi_to_APIC_timer, &mask, 1, 1);
 #endif
 
         for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
@@ -896,15 +893,20 @@ static int acpi_processor_power_verify(struct acpi_processor *pr)
 
                 case ACPI_STATE_C2:
                         acpi_processor_power_verify_c2(cx);
+#ifdef ARCH_APICTIMER_STOPS_ON_C3
+                        /* Some AMD systems fake C3 as C2, but still
+                           have timer troubles */
+                        if (cx->valid && 
+                                boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
+                                timer_broadcast++;
+#endif
                         break;
 
                 case ACPI_STATE_C3:
                         acpi_processor_power_verify_c3(pr, cx);
 #ifdef ARCH_APICTIMER_STOPS_ON_C3
-                        if (cx->valid && c->x86_vendor == X86_VENDOR_INTEL) {
-                                on_each_cpu(switch_APIC_timer_to_ipi,
-                                                &mask, 1, 1);
-                        }
+                        if (cx->valid)
+                                timer_broadcast++;
 #endif
                         break;
                 }
@@ -913,6 +915,11 @@ static int acpi_processor_power_verify(struct acpi_processor *pr)
                         working++;
         }
 
+#ifdef ARCH_APICTIMER_STOPS_ON_C3
+        if (timer_broadcast)
+                on_each_cpu(switch_APIC_timer_to_ipi, &mask, 1, 1);
+#endif
+
         return (working);
 }
 
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 31d4f3ffc2..7f37c7cc5e 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -587,7 +587,8 @@ int __init acpi_table_init(void)
                 return -ENODEV;
         }
 
-        rsdp = (struct acpi_table_rsdp *)__va(rsdp_phys);
+        rsdp = (struct acpi_table_rsdp *)__acpi_map_table(rsdp_phys,
+                sizeof(struct acpi_table_rsdp));
         if (!rsdp) {
                 printk(KERN_WARNING PREFIX "Unable to map RSDP\n");
                 return -ENODEV;
diff --git a/drivers/atm/.gitignore b/drivers/atm/.gitignore
new file mode 100644
index 0000000000..a165b71677
--- /dev/null
+++ b/drivers/atm/.gitignore
@@ -0,0 +1,5 @@
+# Ignore generated files
+fore200e_mkfirm
+fore200e_pca_fw.c
+pca200e.bin
+
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index 69f4c7ce9a..cac09e353b 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -1972,7 +1972,7 @@ static int __devinit lanai_pci_start(struct lanai_dev *lanai)
                     "(itf %d): No suitable DMA available.\n", lanai->number);
                 return -EBUSY;
         }
-        if (pci_set_consistent_dma_mask(pci, 0xFFFFFFFF) != 0) {
+        if (pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) != 0) {
                 printk(KERN_WARNING DEV_LABEL
                     "(itf %d): No suitable DMA available.\n", lanai->number);
                 return -EBUSY;
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index 29f3d7504d..dd712b24ec 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -19,11 +19,6 @@ EXPORT_SYMBOL(cpu_sysdev_class);
 static struct sys_device *cpu_sys_devices[NR_CPUS];
 
 #ifdef CONFIG_HOTPLUG_CPU
-int __attribute__((weak)) smp_prepare_cpu (int cpu)
-{
-        return 0;
-}
-
 static ssize_t show_online(struct sys_device *dev, char *buf)
 {
         struct cpu *cpu = container_of(dev, struct cpu, sysdev);
@@ -44,9 +39,7 @@ static ssize_t store_online(struct sys_device *dev, const char *buf,
                         kobject_uevent(&dev->kobj, KOBJ_OFFLINE);
                 break;
         case '1':
-                ret = smp_prepare_cpu(cpu->sysdev.id);
-                if (!ret)
-                        ret = cpu_up(cpu->sysdev.id);
+                ret = cpu_up(cpu->sysdev.id);
                 if (!ret)
                         kobject_uevent(&dev->kobj, KOBJ_ONLINE);
                 break;
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 105a0d61eb..dd547af468 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -47,16 +47,16 @@ static struct kset_uevent_ops memory_uevent_ops = {
         .uevent         = memory_uevent,
 };
 
-static struct notifier_block *memory_chain;
+static BLOCKING_NOTIFIER_HEAD(memory_chain);
 
 int register_memory_notifier(struct notifier_block *nb)
 {
-        return notifier_chain_register(&memory_chain, nb);
+        return blocking_notifier_chain_register(&memory_chain, nb);
 }
 
 void unregister_memory_notifier(struct notifier_block *nb)
 {
-        notifier_chain_unregister(&memory_chain, nb);
+        blocking_notifier_chain_unregister(&memory_chain, nb);
 }
 
 /*
@@ -140,7 +140,7 @@ static ssize_t show_mem_state(struct sys_device *dev, char *buf)
 
 static inline int memory_notify(unsigned long val, void *v)
 {
-        return notifier_call_chain(&memory_chain, val, v);
+        return blocking_notifier_call_chain(&memory_chain, val, v);
 }
 
 /*
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 37b8cda3e8..45bcda5448 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -41,6 +41,7 @@
 #include <linux/timer.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
 #include <linux/random.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -228,8 +229,7 @@ static void *slice_dma_loaf(struct dma_loaf *loaf, size_t len,
         void *cpu_end = loaf->cpu_free + len;
         void *cpu_addr = loaf->cpu_free;
 
-        if (cpu_end > loaf->cpu_base + loaf->length)
-                BUG();
+        BUG_ON(cpu_end > loaf->cpu_base + loaf->length);
         *dma_handle = loaf->dma_free;
         loaf->cpu_free = cpu_end;
         loaf->dma_free += len;
@@ -312,11 +312,10 @@ static boolean DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller)
                 CommandsRemaining = CommandAllocationGroupSize;
           CommandGroupByteCount =
                 CommandsRemaining * CommandAllocationLength;
-          AllocationPointer = kmalloc(CommandGroupByteCount, GFP_ATOMIC);
+          AllocationPointer = kzalloc(CommandGroupByteCount, GFP_ATOMIC);
           if (AllocationPointer == NULL)
                 return DAC960_Failure(Controller,
                                         "AUXILIARY STRUCTURE CREATION");
-          memset(AllocationPointer, 0, CommandGroupByteCount);
          }
       Command = (DAC960_Command_T *) AllocationPointer;
       AllocationPointer += CommandAllocationLength;
@@ -2710,14 +2709,12 @@ DAC960_DetectController(struct pci_dev *PCI_Device,
   void __iomem *BaseAddress;
   int i;
 
-  Controller = (DAC960_Controller_T *)
-        kmalloc(sizeof(DAC960_Controller_T), GFP_ATOMIC);
+  Controller = kzalloc(sizeof(DAC960_Controller_T), GFP_ATOMIC);
   if (Controller == NULL) {
         DAC960_Error("Unable to allocate Controller structure for "
                        "Controller at\n", NULL);
         return NULL;
   }
-  memset(Controller, 0, sizeof(DAC960_Controller_T));
   Controller->ControllerNumber = DAC960_ControllerCount;
   DAC960_Controllers[DAC960_ControllerCount++] = Controller;
   Controller->Bus = PCI_Device->bus->number;
@@ -3658,8 +3655,8 @@ static void DAC960_V1_ProcessCompletedCommand(DAC960_Command_T *Command)
               (NewEnquiry->EventLogSequenceNumber !=
                OldEnquiry->EventLogSequenceNumber) ||
               Controller->MonitoringTimerCount == 0 ||
-              (jiffies - Controller->SecondaryMonitoringTime
-               >= DAC960_SecondaryMonitoringInterval))
+              time_after_eq(jiffies, Controller->SecondaryMonitoringTime
+               + DAC960_SecondaryMonitoringInterval))
             {
               Controller->V1.NeedLogicalDriveInformation = true;
               Controller->V1.NewEventLogSequenceNumber =
@@ -5644,8 +5641,8 @@ static void DAC960_MonitoringTimerFunction(unsigned long TimerData)
       unsigned int StatusChangeCounter =
         Controller->V2.HealthStatusBuffer->StatusChangeCounter;
       boolean ForceMonitoringCommand = false;
-      if (jiffies - Controller->SecondaryMonitoringTime
-          > DAC960_SecondaryMonitoringInterval)
+      if (time_after(jiffies, Controller->SecondaryMonitoringTime
+          + DAC960_SecondaryMonitoringInterval))
         {
           int LogicalDriveNumber;
           for (LogicalDriveNumber = 0;
@@ -5673,8 +5670,8 @@ static void DAC960_MonitoringTimerFunction(unsigned long TimerData)
            ControllerInfo->ConsistencyChecksActive +
            ControllerInfo->RebuildsActive +
            ControllerInfo->OnlineExpansionsActive == 0 ||
-           jiffies - Controller->PrimaryMonitoringTime
-           < DAC960_MonitoringTimerInterval) &&
+           time_before(jiffies, Controller->PrimaryMonitoringTime
+           + DAC960_MonitoringTimerInterval)) &&
           !ForceMonitoringCommand)
         {
           Controller->MonitoringTimer.expires =
@@ -5811,8 +5808,8 @@ static void DAC960_Message(DAC960_MessageLevel_T MessageLevel,
       Controller->ProgressBufferLength = Length;
       if (Controller->EphemeralProgressMessage)
         {
-          if (jiffies - Controller->LastProgressReportTime
-              >= DAC960_ProgressReportingInterval)
+          if (time_after_eq(jiffies, Controller->LastProgressReportTime
+              + DAC960_ProgressReportingInterval))
             {
               printk("%sDAC960#%d: %s", DAC960_MessageLevelMap[MessageLevel],
                      Controller->ControllerNumber, Buffer);
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 8b13316774..ae0949b339 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -383,8 +383,9 @@ config BLK_DEV_RAM
           thus say N here.
 
 config BLK_DEV_RAM_COUNT
-        int "Default number of RAM disks" if BLK_DEV_RAM
+        int "Default number of RAM disks"
         default "16"
+        depends on BLK_DEV_RAM
         help
           The default value is 16 RAM disks. Change this if you know what
           are doing. If you boot from a filesystem that needs to be extracted
@@ -400,14 +401,16 @@ config BLK_DEV_RAM_SIZE
           8192.
 
 config BLK_DEV_INITRD
-        bool "Initial RAM disk (initrd) support"
-        depends on BLK_DEV_RAM=y
+        bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
         help
-          The initial RAM disk is a RAM disk that is loaded by the boot loader
-          (loadlin or lilo) and that is mounted as root before the normal boot
-          procedure. It is typically used to load modules needed to mount the
-          "real" root file system, etc. See <file:Documentation/initrd.txt>
-          for details.
+          The initial RAM filesystem is a ramfs which is loaded by the
+          boot loader (loadlin or lilo) and that is mounted as root
+          before the normal boot procedure. It is typically used to
+          load modules needed to mount the "real" root file system,
+          etc. See <file:Documentation/initrd.txt> for details.
+
+          If RAM disk support (BLK_DEV_RAM) is also included, this
+          also enables initial RAM disk (initrd) support.
 
 
 config CDROM_PKTCDVD
diff --git a/drivers/block/acsi_slm.c b/drivers/block/acsi_slm.c
index a5c1c8e871..4cb9c13362 100644
--- a/drivers/block/acsi_slm.c
+++ b/drivers/block/acsi_slm.c
@@ -369,8 +369,6 @@ static ssize_t slm_read( struct file *file, char *buf, size_t count,
         int length;
         int end;
 
-        if (count < 0)
-                return( -EINVAL );
         if (!(page = __get_free_page( GFP_KERNEL )))
                 return( -ENOMEM );
         
diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
index 881c48d941..6eebcb7be9 100644
--- a/drivers/block/aoe/aoe.h
+++ b/drivers/block/aoe/aoe.h
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004 Coraid, Inc.  See COPYING for GPL terms. */
-#define VERSION "14"
+#define VERSION "22"
 #define AOE_MAJOR 152
 #define DEVICE_NAME "aoe"
 
@@ -75,8 +75,9 @@ enum {
         DEVFL_TKILL = (1<<1),   /* flag for timer to know when to kill self */
         DEVFL_EXT = (1<<2),     /* device accepts lba48 commands */
         DEVFL_CLOSEWAIT = (1<<3), /* device is waiting for all closes to revalidate */
-        DEVFL_WC_UPDATE = (1<<4), /* this device needs to update write cache status */
-        DEVFL_WORKON = (1<<4),
+        DEVFL_GDALLOC = (1<<4), /* need to alloc gendisk */
+        DEVFL_PAUSE = (1<<5),
+        DEVFL_NEWSIZE = (1<<6), /* need to update dev size in block layer */
 
         BUFFL_FAIL = 1,
 };
@@ -152,16 +153,17 @@ void aoechr_exit(void);
 void aoechr_error(char *);
 
 void aoecmd_work(struct aoedev *d);
-void aoecmd_cfg(ushort, unsigned char);
+void aoecmd_cfg(ushort aoemajor, unsigned char aoeminor);
 void aoecmd_ata_rsp(struct sk_buff *);
 void aoecmd_cfg_rsp(struct sk_buff *);
+void aoecmd_sleepwork(void *vp);
 
 int aoedev_init(void);
 void aoedev_exit(void);
 struct aoedev *aoedev_by_aoeaddr(int maj, int min);
+struct aoedev *aoedev_by_sysminor_m(ulong sysminor, ulong bufcnt);
 void aoedev_downdev(struct aoedev *d);
-struct aoedev *aoedev_set(ulong, unsigned char *, struct net_device *, ulong);
-int aoedev_busy(void);
+int aoedev_isbusy(struct aoedev *d);
 
 int aoenet_init(void);
 void aoenet_exit(void);
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index c05ee8bffd..393b86a3db 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -22,7 +22,9 @@ static ssize_t aoedisk_show_state(struct gendisk * disk, char *page)
         return snprintf(page, PAGE_SIZE,
                         "%s%s\n",
                         (d->flags & DEVFL_UP) ? "up" : "down",
-                        (d->flags & DEVFL_CLOSEWAIT) ? ",closewait" : "");
+                        (d->flags & DEVFL_PAUSE) ? ",paused" :
+                        (d->nopen && !(d->flags & DEVFL_UP)) ? ",closewait" : "");
+        /* I'd rather see nopen exported so we can ditch closewait */
 }
 static ssize_t aoedisk_show_mac(struct gendisk * disk, char *page)
 {
@@ -107,8 +109,7 @@ aoeblk_release(struct inode *inode, struct file *filp)
 
         spin_lock_irqsave(&d->lock, flags);
 
-        if (--d->nopen == 0 && (d->flags & DEVFL_CLOSEWAIT)) {
-                d->flags &= ~DEVFL_CLOSEWAIT;
+        if (--d->nopen == 0) {
                 spin_unlock_irqrestore(&d->lock, flags);
                 aoecmd_cfg(d->aoemajor, d->aoeminor);
                 return 0;
@@ -158,14 +159,14 @@ aoeblk_make_request(request_queue_t *q, struct bio *bio)
         }
 
         list_add_tail(&buf->bufs, &d->bufq);
-        aoecmd_work(d);
 
+        aoecmd_work(d);
         sl = d->sendq_hd;
         d->sendq_hd = d->sendq_tl = NULL;
 
         spin_unlock_irqrestore(&d->lock, flags);
-
         aoenet_xmit(sl);
+
         return 0;
 }
 
@@ -205,20 +206,18 @@ aoeblk_gdalloc(void *vp)
                 printk(KERN_ERR "aoe: aoeblk_gdalloc: cannot allocate disk "
                         "structure for %ld.%ld\n", d->aoemajor, d->aoeminor);
                 spin_lock_irqsave(&d->lock, flags);
-                d->flags &= ~DEVFL_WORKON;
+                d->flags &= ~DEVFL_GDALLOC;
                 spin_unlock_irqrestore(&d->lock, flags);
                 return;
         }
 
-        d->bufpool = mempool_create(MIN_BUFS,
-                                    mempool_alloc_slab, mempool_free_slab,
-                                    buf_pool_cache);
+        d->bufpool = mempool_create_slab_pool(MIN_BUFS, buf_pool_cache);
         if (d->bufpool == NULL) {
                 printk(KERN_ERR "aoe: aoeblk_gdalloc: cannot allocate bufpool "
                         "for %ld.%ld\n", d->aoemajor, d->aoeminor);
                 put_disk(gd);
                 spin_lock_irqsave(&d->lock, flags);
-                d->flags &= ~DEVFL_WORKON;
+                d->flags &= ~DEVFL_GDALLOC;
                 spin_unlock_irqrestore(&d->lock, flags);
                 return;
         }
@@ -235,18 +234,13 @@ aoeblk_gdalloc(void *vp)
 
         gd->queue = &d->blkq;
         d->gd = gd;
-        d->flags &= ~DEVFL_WORKON;
+        d->flags &= ~DEVFL_GDALLOC;
         d->flags |= DEVFL_UP;
 
         spin_unlock_irqrestore(&d->lock, flags);
 
         add_disk(gd);
         aoedisk_add_sysfs(d);
-        
-        printk(KERN_INFO "aoe: %012llx e%lu.%lu v%04x has %llu "
-                "sectors\n", (unsigned long long)mac_addr(d->addr),
-                d->aoemajor, d->aoeminor,
-                d->fw_ver, (long long)d->ssize);
 }
 
 void
diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
index 41ae0ede61..5327f553b4 100644
--- a/drivers/block/aoe/aoechr.c
+++ b/drivers/block/aoe/aoechr.c
@@ -13,6 +13,7 @@ enum {
         MINOR_ERR = 2,
         MINOR_DISCOVER,
         MINOR_INTERFACES,
+        MINOR_REVALIDATE,
         MSGSZ = 2048,
         NARGS = 10,
         NMSG = 100,             /* message backlog to retain */
@@ -41,6 +42,7 @@ static struct aoe_chardev chardevs[] = {
         { MINOR_ERR, "err" },
         { MINOR_DISCOVER, "discover" },
         { MINOR_INTERFACES, "interfaces" },
+        { MINOR_REVALIDATE, "revalidate" },
 };
 
 static int
@@ -62,6 +64,39 @@ interfaces(const char __user *str, size_t size)
         return 0;
 }
 
+static int
+revalidate(const char __user *str, size_t size)
+{
+        int major, minor, n;
+        ulong flags;
+        struct aoedev *d;
+        char buf[16];
+
+        if (size >= sizeof buf)
+                return -EINVAL;
+        buf[sizeof buf - 1] = '\0';
+        if (copy_from_user(buf, str, size))
+                return -EFAULT;
+
+        /* should be e%d.%d format */
+        n = sscanf(buf, "e%d.%d", &major, &minor);
+        if (n != 2) {
+                printk(KERN_ERR "aoe: %s: invalid device specification\n",
+                        __FUNCTION__);
+                return -EINVAL;
+        }
+        d = aoedev_by_aoeaddr(major, minor);
+        if (!d)
+                return -EINVAL;
+
+        spin_lock_irqsave(&d->lock, flags);
+        d->flags |= DEVFL_PAUSE;
+        spin_unlock_irqrestore(&d->lock, flags);
+        aoecmd_cfg(major, minor);
+
+        return 0;
+}
+
 void
 aoechr_error(char *msg)
 {
@@ -114,6 +149,8 @@ aoechr_write(struct file *filp, const char __user *buf, size_t cnt, loff_t *offp
         case MINOR_INTERFACES:
                 ret = interfaces(buf, cnt);
                 break;
+        case MINOR_REVALIDATE:
+                ret = revalidate(buf, cnt);
         }
         if (ret == 0)
                 ret = cnt;
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 326ca3876b..39da28d344 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -8,6 +8,7 @@
 #include <linux/blkdev.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
+#include <linux/genhd.h>
 #include <asm/unaligned.h>
 #include "aoe.h"
 
@@ -28,6 +29,7 @@ new_skb(struct net_device *if_dev, ulong len)
                 skb->protocol = __constant_htons(ETH_P_AOE);
                 skb->priority = 0;
                 skb_put(skb, len);
+                memset(skb->head, 0, len);
                 skb->next = skb->prev = NULL;
 
                 /* tell the network layer not to perform IP checksums
@@ -188,12 +190,67 @@ aoecmd_ata_rw(struct aoedev *d, struct frame *f)
         }
 }
 
+/* some callers cannot sleep, and they can call this function,
+ * transmitting the packets later, when interrupts are on
+ */
+static struct sk_buff *
+aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff **tail)
+{
+        struct aoe_hdr *h;
+        struct aoe_cfghdr *ch;
+        struct sk_buff *skb, *sl, *sl_tail;
+        struct net_device *ifp;
+
+        sl = sl_tail = NULL;
+
+        read_lock(&dev_base_lock);
+        for (ifp = dev_base; ifp; dev_put(ifp), ifp = ifp->next) {
+                dev_hold(ifp);
+                if (!is_aoe_netif(ifp))
+                        continue;
+
+                skb = new_skb(ifp, sizeof *h + sizeof *ch);
+                if (skb == NULL) {
+                        printk(KERN_INFO "aoe: aoecmd_cfg: skb alloc failure\n");
+                        continue;
+                }
+                if (sl_tail == NULL)
+                        sl_tail = skb;
+                h = (struct aoe_hdr *) skb->mac.raw;
+                memset(h, 0, sizeof *h + sizeof *ch);
+
+                memset(h->dst, 0xff, sizeof h->dst);
+                memcpy(h->src, ifp->dev_addr, sizeof h->src);
+                h->type = __constant_cpu_to_be16(ETH_P_AOE);
+                h->verfl = AOE_HVER;
+                h->major = cpu_to_be16(aoemajor);
+                h->minor = aoeminor;
+                h->cmd = AOECMD_CFG;
+
+                skb->next = sl;
+                sl = skb;
+        }
+        read_unlock(&dev_base_lock);
+
+        if (tail != NULL)
+                *tail = sl_tail;
+        return sl;
+}
+
 /* enters with d->lock held */
 void
 aoecmd_work(struct aoedev *d)
 {
         struct frame *f;
         struct buf *buf;
+
+        if (d->flags & DEVFL_PAUSE) {
+                if (!aoedev_isbusy(d))
+                        d->sendq_hd = aoecmd_cfg_pkts(d->aoemajor,
+                                                d->aoeminor, &d->sendq_tl);
+                return;
+        }
+
 loop:
         f = getframe(d, FREETAG);
         if (f == NULL)
@@ -229,6 +286,8 @@ rexmit(struct aoedev *d, struct frame *f)
         h = (struct aoe_hdr *) f->data;
         f->tag = n;
         h->tag = cpu_to_be32(n);
+        memcpy(h->dst, d->addr, sizeof h->dst);
+        memcpy(h->src, d->ifp->dev_addr, sizeof h->src);
 
         skb = skb_prepare(d, f);
         if (skb) {
@@ -272,7 +331,7 @@ rexmit_timer(ulong vp)
         spin_lock_irqsave(&d->lock, flags);
 
         if (d->flags & DEVFL_TKILL) {
-tdie:           spin_unlock_irqrestore(&d->lock, flags);
+                spin_unlock_irqrestore(&d->lock, flags);
                 return;
         }
         f = d->frames;
@@ -283,7 +342,7 @@ tdie:		spin_unlock_irqrestore(&d->lock, flags);
                         n /= HZ;
                         if (n > MAXWAIT) { /* waited too long.  device failure. */
                                 aoedev_downdev(d);
-                                goto tdie;
+                                break;
                         }
                         rexmit(d, f);
                 }
@@ -305,6 +364,37 @@ tdie:		spin_unlock_irqrestore(&d->lock, flags);
         aoenet_xmit(sl);
 }
 
+/* this function performs work that has been deferred until sleeping is OK
+ */
+void
+aoecmd_sleepwork(void *vp)
+{
+        struct aoedev *d = (struct aoedev *) vp;
+
+        if (d->flags & DEVFL_GDALLOC)
+                aoeblk_gdalloc(d);
+
+        if (d->flags & DEVFL_NEWSIZE) {
+                struct block_device *bd;
+                unsigned long flags;
+                u64 ssize;
+
+                ssize = d->gd->capacity;
+                bd = bdget_disk(d->gd, 0);
+
+                if (bd) {
+                        mutex_lock(&bd->bd_inode->i_mutex);
+                        i_size_write(bd->bd_inode, (loff_t)ssize<<9);
+                        mutex_unlock(&bd->bd_inode->i_mutex);
+                        bdput(bd);
+                }
+                spin_lock_irqsave(&d->lock, flags);
+                d->flags |= DEVFL_UP;
+                d->flags &= ~DEVFL_NEWSIZE;
+                spin_unlock_irqrestore(&d->lock, flags);
+        }
+}
+
 static void
 ataid_complete(struct aoedev *d, unsigned char *id)
 {
@@ -339,21 +429,29 @@ ataid_complete(struct aoedev *d, unsigned char *id)
                 d->geo.heads = le16_to_cpu(get_unaligned((__le16 *) &id[55<<1]));
                 d->geo.sectors = le16_to_cpu(get_unaligned((__le16 *) &id[56<<1]));
         }
+
+        if (d->ssize != ssize)
+                printk(KERN_INFO "aoe: %012llx e%lu.%lu v%04x has %llu "
+                        "sectors\n", (unsigned long long)mac_addr(d->addr),
+                        d->aoemajor, d->aoeminor,
+                        d->fw_ver, (long long)ssize);
         d->ssize = ssize;
         d->geo.start = 0;
         if (d->gd != NULL) {
                 d->gd->capacity = ssize;
-                d->flags |= DEVFL_UP;
-                return;
-        }
-        if (d->flags & DEVFL_WORKON) {
-                printk(KERN_INFO "aoe: ataid_complete: can't schedule work, it's already on!  "
-                        "(This really shouldn't happen).\n");
-                return;
+                d->flags |= DEVFL_NEWSIZE;
+        } else {
+                if (d->flags & DEVFL_GDALLOC) {
+                        printk(KERN_INFO "aoe: %s: %s e%lu.%lu, %s\n",
+                               __FUNCTION__,
+                               "can't schedule work for",
+                               d->aoemajor, d->aoeminor,
+                               "it's already on! (This really shouldn't happen).\n");
+                        return;
+                }
+                d->flags |= DEVFL_GDALLOC;
         }
-        INIT_WORK(&d->work, aoeblk_gdalloc, d);
         schedule_work(&d->work);
-        d->flags |= DEVFL_WORKON;
 }
 
 static void
@@ -419,6 +517,8 @@ aoecmd_ata_rsp(struct sk_buff *skb)
         ahout = (struct aoe_atahdr *) (f->data + sizeof(struct aoe_hdr));
         buf = f->buf;
 
+        if (ahout->cmdstat == WIN_IDENTIFY)
+                d->flags &= ~DEVFL_PAUSE;
         if (ahin->cmdstat & 0xa9) {     /* these bits cleared on success */
                 printk(KERN_CRIT "aoe: aoecmd_ata_rsp: ata error cmd=%2.2Xh "
                         "stat=%2.2Xh from e%ld.%ld\n", 
@@ -451,7 +551,6 @@ aoecmd_ata_rsp(struct sk_buff *skb)
                                 return;
                         }
                         ataid_complete(d, (char *) (ahin+1));
-                        /* d->flags |= DEVFL_WC_UPDATE; */
                         break;
                 default:
                         printk(KERN_INFO "aoe: aoecmd_ata_rsp: unrecognized "
@@ -484,51 +583,19 @@ aoecmd_ata_rsp(struct sk_buff *skb)
         f->tag = FREETAG;
 
         aoecmd_work(d);
-
         sl = d->sendq_hd;
         d->sendq_hd = d->sendq_tl = NULL;
 
         spin_unlock_irqrestore(&d->lock, flags);
-
         aoenet_xmit(sl);
 }
 
 void
 aoecmd_cfg(ushort aoemajor, unsigned char aoeminor)
 {
-        struct aoe_hdr *h;
-        struct aoe_cfghdr *ch;
-        struct sk_buff *skb, *sl;
-        struct net_device *ifp;
-
-        sl = NULL;
-
-        read_lock(&dev_base_lock);
-        for (ifp = dev_base; ifp; dev_put(ifp), ifp = ifp->next) {
-                dev_hold(ifp);
-                if (!is_aoe_netif(ifp))
-                        continue;
-
-                skb = new_skb(ifp, sizeof *h + sizeof *ch);
-                if (skb == NULL) {
-                        printk(KERN_INFO "aoe: aoecmd_cfg: skb alloc failure\n");
-                        continue;
-                }
-                h = (struct aoe_hdr *) skb->mac.raw;
-                memset(h, 0, sizeof *h + sizeof *ch);
-
-                memset(h->dst, 0xff, sizeof h->dst);
-                memcpy(h->src, ifp->dev_addr, sizeof h->src);
-                h->type = __constant_cpu_to_be16(ETH_P_AOE);
-                h->verfl = AOE_HVER;
-                h->major = cpu_to_be16(aoemajor);
-                h->minor = aoeminor;
-                h->cmd = AOECMD_CFG;
+        struct sk_buff *sl;
 
-                skb->next = sl;
-                sl = skb;
-        }
-        read_unlock(&dev_base_lock);
+        sl = aoecmd_cfg_pkts(aoemajor, aoeminor, NULL);
 
         aoenet_xmit(sl);
 }
@@ -561,9 +628,6 @@ aoecmd_ata_id(struct aoedev *d)
         f->waited = 0;
         f->writedatalen = 0;
 
-        /* this message initializes the device, so we reset the rttavg */
-        d->rttavg = MAXTIMER;
-
         /* set up ata header */
         ah->scnt = 1;
         ah->cmdstat = WIN_IDENTIFY;
@@ -571,12 +635,8 @@ aoecmd_ata_id(struct aoedev *d)
 
         skb = skb_prepare(d, f);
 
-        /* we now want to start the rexmit tracking */
-        d->flags &= ~DEVFL_TKILL;
-        d->timer.data = (ulong) d;
+        d->rttavg = MAXTIMER;
         d->timer.function = rexmit_timer;
-        d->timer.expires = jiffies + TIMERTICK;
-        add_timer(&d->timer);
 
         return skb;
 }
@@ -590,7 +650,7 @@ aoecmd_cfg_rsp(struct sk_buff *skb)
         ulong flags, sysminor, aoemajor;
         u16 bufcnt;
         struct sk_buff *sl;
-        enum { MAXFRAMES = 8 };
+        enum { MAXFRAMES = 16 };
 
         h = (struct aoe_hdr *) skb->mac.raw;
         ch = (struct aoe_cfghdr *) (h+1);
@@ -618,23 +678,28 @@ aoecmd_cfg_rsp(struct sk_buff *skb)
         if (bufcnt > MAXFRAMES) /* keep it reasonable */
                 bufcnt = MAXFRAMES;
 
-        d = aoedev_set(sysminor, h->src, skb->dev, bufcnt);
+        d = aoedev_by_sysminor_m(sysminor, bufcnt);
         if (d == NULL) {
-                printk(KERN_INFO "aoe: aoecmd_cfg_rsp: device set failure\n");
+                printk(KERN_INFO "aoe: aoecmd_cfg_rsp: device sysminor_m failure\n");
                 return;
         }
 
         spin_lock_irqsave(&d->lock, flags);
 
-        if (d->flags & (DEVFL_UP | DEVFL_CLOSEWAIT)) {
+        /* permit device to migrate mac and network interface */
+        d->ifp = skb->dev;
+        memcpy(d->addr, h->src, sizeof d->addr);
+
+        /* don't change users' perspective */
+        if (d->nopen && !(d->flags & DEVFL_PAUSE)) {
                 spin_unlock_irqrestore(&d->lock, flags);
                 return;
         }
-
+        d->flags |= DEVFL_PAUSE;        /* force pause */
         d->fw_ver = be16_to_cpu(ch->fwver);
 
-        /* we get here only if the device is new */
-        sl = aoecmd_ata_id(d);
+        /* check for already outstanding ataid */
+        sl = aoedev_isbusy(d) == 0 ? aoecmd_ata_id(d) : NULL;
 
         spin_unlock_irqrestore(&d->lock, flags);
 
diff --git a/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c
index ded33ba31a..ed4258a62d 100644
--- a/drivers/block/aoe/aoedev.c
+++ b/drivers/block/aoe/aoedev.c
@@ -12,6 +12,24 @@
 static struct aoedev *devlist;
 static spinlock_t devlist_lock;
 
+int
+aoedev_isbusy(struct aoedev *d)
+{
+        struct frame *f, *e;
+
+        f = d->frames;
+        e = f + d->nframes;
+        do {
+                if (f->tag != FREETAG) {
+                        printk(KERN_DEBUG "aoe: %ld.%ld isbusy\n",
+                                d->aoemajor, d->aoeminor);
+                        return 1;
+                }
+        } while (++f < e);
+
+        return 0;
+}
+
 struct aoedev *
 aoedev_by_aoeaddr(int maj, int min)
 {
@@ -28,6 +46,18 @@ aoedev_by_aoeaddr(int maj, int min)
         return d;
 }
 
+static void
+dummy_timer(ulong vp)
+{
+        struct aoedev *d;
+
+        d = (struct aoedev *)vp;
+        if (d->flags & DEVFL_TKILL)
+                return;
+        d->timer.expires = jiffies + HZ;
+        add_timer(&d->timer);
+}
+
 /* called with devlist lock held */
 static struct aoedev *
 aoedev_newdev(ulong nframes)
@@ -44,6 +74,8 @@ aoedev_newdev(ulong nframes)
                 return NULL;
         }
 
+        INIT_WORK(&d->work, aoecmd_sleepwork, d);
+
         d->nframes = nframes;
         d->frames = f;
         e = f + nframes;
@@ -52,6 +84,10 @@ aoedev_newdev(ulong nframes)
 
         spin_lock_init(&d->lock);
         init_timer(&d->timer);
+        d->timer.data = (ulong) d;
+        d->timer.function = dummy_timer;
+        d->timer.expires = jiffies + HZ;
+        add_timer(&d->timer);
         d->bufpool = NULL;      /* defer to aoeblk_gdalloc */
         INIT_LIST_HEAD(&d->bufq);
         d->next = devlist;
@@ -67,9 +103,6 @@ aoedev_downdev(struct aoedev *d)
         struct buf *buf;
         struct bio *bio;
 
-        d->flags |= DEVFL_TKILL;
-        del_timer(&d->timer);
-
         f = d->frames;
         e = f + d->nframes;
         for (; f<e; f->tag = FREETAG, f->buf = NULL, f++) {
@@ -92,16 +125,15 @@ aoedev_downdev(struct aoedev *d)
                 bio_endio(bio, bio->bi_size, -EIO);
         }
 
-        if (d->nopen)
-                d->flags |= DEVFL_CLOSEWAIT;
         if (d->gd)
                 d->gd->capacity = 0;
 
-        d->flags &= ~DEVFL_UP;
+        d->flags &= ~(DEVFL_UP | DEVFL_PAUSE);
 }
 
+/* find it or malloc it */
 struct aoedev *
-aoedev_set(ulong sysminor, unsigned char *addr, struct net_device *ifp, ulong bufcnt)
+aoedev_by_sysminor_m(ulong sysminor, ulong bufcnt)
 {
         struct aoedev *d;
         ulong flags;
@@ -112,25 +144,19 @@ aoedev_set(ulong sysminor, unsigned char *addr, struct net_device *ifp, ulong bu
                 if (d->sysminor == sysminor)
                         break;
 
-        if (d == NULL && (d = aoedev_newdev(bufcnt)) == NULL) {
-                spin_unlock_irqrestore(&devlist_lock, flags);
-                printk(KERN_INFO "aoe: aoedev_set: aoedev_newdev failure.\n");
-                return NULL;
-        } /* if newdev, (d->flags & DEVFL_UP) == 0 for below */
-
-        spin_unlock_irqrestore(&devlist_lock, flags);
-        spin_lock_irqsave(&d->lock, flags);
-
-        d->ifp = ifp;
-        memcpy(d->addr, addr, sizeof d->addr);
-        if ((d->flags & DEVFL_UP) == 0) {
-                aoedev_downdev(d); /* flushes outstanding frames */
+        if (d == NULL) {
+                d = aoedev_newdev(bufcnt);
+                if (d == NULL) {
+                        spin_unlock_irqrestore(&devlist_lock, flags);
+                        printk(KERN_INFO "aoe: aoedev_set: aoedev_newdev failure.\n");
+                        return NULL;
+                }
                 d->sysminor = sysminor;
                 d->aoemajor = AOEMAJOR(sysminor);
                 d->aoeminor = AOEMINOR(sysminor);
         }
 
-        spin_unlock_irqrestore(&d->lock, flags);
+        spin_unlock_irqrestore(&devlist_lock, flags);
         return d;
 }
 
@@ -161,6 +187,7 @@ aoedev_exit(void)
 
                 spin_lock_irqsave(&d->lock, flags);
                 aoedev_downdev(d);
+                d->flags |= DEVFL_TKILL;
                 spin_unlock_irqrestore(&d->lock, flags);
 
                 del_timer_sync(&d->timer);
diff --git a/drivers/block/aoe/aoemain.c b/drivers/block/aoe/aoemain.c
index 387588a3f4..de08491ebe 100644
--- a/drivers/block/aoe/aoemain.c
+++ b/drivers/block/aoe/aoemain.c
@@ -11,7 +11,7 @@
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Sam Hopkins <sah@coraid.com>");
-MODULE_DESCRIPTION("AoE block/char driver for 2.6.[0-9]+");
+MODULE_DESCRIPTION("AoE block/char driver for 2.6.2 and newer 2.6 kernels");
 MODULE_VERSION(VERSION);
 
 enum { TINIT, TRUN, TKILL };
@@ -89,7 +89,7 @@ aoe_init(void)
         }
 
         printk(KERN_INFO
-               "aoe: aoe_init: AoE v2.6-%s initialised.\n",
+               "aoe: aoe_init: AoE v%s initialised.\n",
                VERSION);
         discover_timer(TINIT);
         return 0;
diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c
index 4be976940f..fdff774b8a 100644
--- a/drivers/block/aoe/aoenet.c
+++ b/drivers/block/aoe/aoenet.c
@@ -92,18 +92,6 @@ mac_addr(char addr[6])
         return __be64_to_cpu(n);
 }
 
-static struct sk_buff *
-skb_check(struct sk_buff *skb)
-{
-        if (skb_is_nonlinear(skb))
-        if ((skb = skb_share_check(skb, GFP_ATOMIC)))
-        if (skb_linearize(skb, GFP_ATOMIC) < 0) {
-                dev_kfree_skb(skb);
-                return NULL;
-        }
-        return skb;
-}
-
 void
 aoenet_xmit(struct sk_buff *sl)
 {
@@ -125,14 +113,14 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt,
         struct aoe_hdr *h;
         u32 n;
 
-        skb = skb_check(skb);
-        if (!skb)
+        skb = skb_share_check(skb, GFP_ATOMIC);
+        if (skb == NULL)
                 return 0;
-
+        if (skb_is_nonlinear(skb))
+        if (skb_linearize(skb, GFP_ATOMIC) < 0)
+                goto exit;
         if (!is_aoe_netif(ifp))
                 goto exit;
-
-        //skb->len += ETH_HLEN; /* (1) */
         skb_push(skb, ETH_HLEN);        /* (1) */
 
         h = (struct aoe_hdr *) skb->mac.raw;
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index f8ce235ccf..c39650920b 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -271,7 +271,7 @@ unsigned char *DMABuffer;			  /* buffer for writes */
 static unsigned long PhysDMABuffer;   /* physical address */
 
 static int UseTrackbuffer = -1;           /* Do track buffering? */
-MODULE_PARM(UseTrackbuffer, "i");
+module_param(UseTrackbuffer, int, 0);
 
 unsigned char *TrackBuffer;                       /* buffer for reads */
 static unsigned long PhysTrackBuffer; /* physical address */
@@ -296,7 +296,7 @@ static int MotorOn = 0, MotorOffTrys;
 static int IsFormatting = 0, FormatError;
 
 static int UserSteprate[FD_MAX_UNITS] = { -1, -1 };
-MODULE_PARM(UserSteprate, "1-" __MODULE_STRING(FD_MAX_UNITS) "i");
+module_param_array(UserSteprate, int, NULL, 0);
 
 /* Synchronization of FDC access. */
 static volatile int fdc_busy = 0;
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 1f2890989b..1b0fd31c57 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -996,13 +996,11 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
                         status = -EINVAL;
                         goto cleanup1;
                 }
-                buff = (unsigned char **) kmalloc(MAXSGENTRIES * 
-                                sizeof(char *), GFP_KERNEL);
+                buff = kzalloc(MAXSGENTRIES * sizeof(char *), GFP_KERNEL);
                 if (!buff) {
                         status = -ENOMEM;
                         goto cleanup1;
                 }
-                memset(buff, 0, MAXSGENTRIES);
                 buff_size = (int *) kmalloc(MAXSGENTRIES * sizeof(int), 
                                         GFP_KERNEL);
                 if (!buff_size) {
@@ -2361,8 +2359,7 @@ queue:
         if (!creq)
                 goto startio;
 
-        if (creq->nr_phys_segments > MAXSGENTRIES)
-                BUG();
+        BUG_ON(creq->nr_phys_segments > MAXSGENTRIES);
 
         if (( c = cmd_alloc(h, 1)) == NULL)
                 goto full;
@@ -2730,9 +2727,9 @@ static void __devinit cciss_interrupt_mode(ctlr_info_t *c, struct pci_dev *pdev,
                         return;
                 }
         }
+default_int_mode:
 #endif /* CONFIG_PCI_MSI */
         /* if we get here we're going to use the default interrupt mode */
-default_int_mode:
         c->intr[SIMPLE_MODE_INT] = pdev->irq;
         return;
 }
@@ -2941,13 +2938,12 @@ static void cciss_getgeometry(int cntl_num)
         int block_size;
         int total_size; 
 
-        ld_buff = kmalloc(sizeof(ReportLunData_struct), GFP_KERNEL);
+        ld_buff = kzalloc(sizeof(ReportLunData_struct), GFP_KERNEL);
         if (ld_buff == NULL)
         {
                 printk(KERN_ERR "cciss: out of memory\n");
                 return;
         }
-        memset(ld_buff, 0, sizeof(ReportLunData_struct));
         size_buff = kmalloc(sizeof( ReadCapdata_struct), GFP_KERNEL);
         if (size_buff == NULL)
         {
@@ -3061,10 +3057,9 @@ static int alloc_cciss_hba(void)
         for(i=0; i< MAX_CTLR; i++) {
                 if (!hba[i]) {
                         ctlr_info_t *p;
-                        p = kmalloc(sizeof(ctlr_info_t), GFP_KERNEL);
+                        p = kzalloc(sizeof(ctlr_info_t), GFP_KERNEL);
                         if (!p)
                                 goto Enomem;
-                        memset(p, 0, sizeof(ctlr_info_t));
                         for (n = 0; n < NWD; n++)
                                 p->gendisk[n] = disk[n];
                         hba[i] = p;
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c
index 9e35de05d5..597c007fe8 100644
--- a/drivers/block/cciss_scsi.c
+++ b/drivers/block/cciss_scsi.c
@@ -1027,12 +1027,11 @@ cciss_update_non_disk_devices(int cntl_num, int hostno)
         int i;
 
         c = (ctlr_info_t *) hba[cntl_num];      
-        ld_buff = kmalloc(reportlunsize, GFP_KERNEL);
+        ld_buff = kzalloc(reportlunsize, GFP_KERNEL);
         if (ld_buff == NULL) {
                 printk(KERN_ERR "cciss: out of memory\n");
                 return;
         }
-        memset(ld_buff, 0, reportlunsize);
         inq_buff = kmalloc(OBDR_TAPE_INQ_SIZE, GFP_KERNEL);
         if (inq_buff == NULL) {
                 printk(KERN_ERR "cciss: out of memory\n");
@@ -1316,7 +1315,7 @@ cciss_scsi_queue_command (struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd
 
         cp->Request.Timeout = 0;
         memset(cp->Request.CDB, 0, sizeof(cp->Request.CDB));
-        if (cmd->cmd_len > sizeof(cp->Request.CDB)) BUG();
+        BUG_ON(cmd->cmd_len > sizeof(cp->Request.CDB));
         cp->Request.CDBLen = cmd->cmd_len;
         memcpy(cp->Request.CDB, cmd->cmnd, cmd->cmd_len);
         cp->Request.Type.Type = TYPE_CMD;
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 862b9abac0..b6ea2f0c72 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -906,8 +906,7 @@ queue_next:
         if (!creq)
                 goto startio;
 
-        if (creq->nr_phys_segments > SG_MAX)
-                BUG();
+        BUG_ON(creq->nr_phys_segments > SG_MAX);
 
         if ((c = cmd_alloc(h,1)) == NULL)
                 goto startio;
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index fb2d0be7cd..bedb689b05 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -170,6 +170,7 @@ static int print_unex = 1;
 #include <linux/mm.h>
 #include <linux/bio.h>
 #include <linux/string.h>
+#include <linux/jiffies.h>
 #include <linux/fcntl.h>
 #include <linux/delay.h>
 #include <linux/mc146818rtc.h>  /* CMOS defines */
@@ -250,6 +251,18 @@ static int irqdma_allocated;
 #include <linux/cdrom.h>        /* for the compatibility eject ioctl */
 #include <linux/completion.h>
 
+/*
+ * Interrupt freeing also means /proc VFS work - dont do it
+ * from interrupt context. We push this work into keventd:
+ */
+static void fd_free_irq_fn(void *data)
+{
+        fd_free_irq();
+}
+
+static DECLARE_WORK(fd_free_irq_work, fd_free_irq_fn, NULL);
+
+
 static struct request *current_req;
 static struct request_queue *floppy_queue;
 static void do_fd_request(request_queue_t * q);
@@ -735,7 +748,7 @@ static int disk_change(int drive)
 {
         int fdc = FDC(drive);
 #ifdef FLOPPY_SANITY_CHECK
-        if (jiffies - UDRS->select_date < UDP->select_delay)
+        if (time_before(jiffies, UDRS->select_date + UDP->select_delay))
                 DPRINT("WARNING disk change called early\n");
         if (!(FDCS->dor & (0x10 << UNIT(drive))) ||
             (FDCS->dor & 3) != UNIT(drive) || fdc != FDC(drive)) {
@@ -1063,7 +1076,7 @@ static int fd_wait_for_completion(unsigned long delay, timeout_fn function)
                 return 1;
         }
 
-        if ((signed)(jiffies - delay) < 0) {
+        if (time_before(jiffies, delay)) {
                 del_timer(&fd_timer);
                 fd_timer.function = function;
                 fd_timer.expires = delay;
@@ -1523,7 +1536,7 @@ static void setup_rw_floppy(void)
                  * again just before spinup completion. Beware that
                  * after scandrives, we must again wait for selection.
                  */
-                if ((signed)(ready_date - jiffies) > DP->select_delay) {
+                if (time_after(ready_date, jiffies + DP->select_delay)) {
                         ready_date -= DP->select_delay;
                         function = (timeout_fn) floppy_start;
                 } else
@@ -3811,7 +3824,7 @@ static int check_floppy_change(struct gendisk *disk)
         if (UTESTF(FD_DISK_CHANGED) || UTESTF(FD_VERIFY))
                 return 1;
 
-        if (UDP->checkfreq < (int)(jiffies - UDRS->last_checked)) {
+        if (time_after(jiffies, UDRS->last_checked + UDP->checkfreq)) {
                 if (floppy_grab_irq_and_dma()) {
                         return 1;
                 }
@@ -4433,6 +4446,13 @@ static int floppy_grab_irq_and_dma(void)
                 return 0;
         }
         spin_unlock_irqrestore(&floppy_usage_lock, flags);
+
+        /*
+         * We might have scheduled a free_irq(), wait it to
+         * drain first:
+         */
+        flush_scheduled_work();
+
         if (fd_request_irq()) {
                 DPRINT("Unable to grab IRQ%d for the floppy driver\n",
                        FLOPPY_IRQ);
@@ -4522,7 +4542,7 @@ static void floppy_release_irq_and_dma(void)
         if (irqdma_allocated) {
                 fd_disable_dma();
                 fd_free_dma();
-                fd_free_irq();
+                schedule_work(&fd_free_irq_work);
                 irqdma_allocated = 0;
         }
         set_dor(0, ~0, 8);
@@ -4594,7 +4614,7 @@ static void __init parse_floppy_cfg_string(char *cfg)
         }
 }
 
-int init_module(void)
+int __init init_module(void)
 {
         if (floppy)
                 parse_floppy_cfg_string(floppy);
@@ -4633,6 +4653,8 @@ void cleanup_module(void)
         /* eject disk, if any */
         fd_eject(0);
 
+        flush_scheduled_work();         /* fd_free_irq() might be pending */
+
         wait_for_completion(&device_release);
 }
 
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 74bf0255e9..9c3b94e8f0 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -839,7 +839,9 @@ static int loop_set_fd(struct loop_device *lo, struct file *lo_file,
 
         set_blocksize(bdev, lo_blocksize);
 
-        kernel_thread(loop_thread, lo, CLONE_KERNEL);
+        error = kernel_thread(loop_thread, lo, CLONE_KERNEL);
+        if (error < 0)
+                goto out_putf;
         wait_for_completion(&lo->lo_done);
         return 0;
 
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index a9bde30dad..8bca4905d7 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -639,10 +639,7 @@ static int __init nbd_init(void)
         int err = -ENOMEM;
         int i;
 
-        if (sizeof(struct nbd_request) != 28) {
-                printk(KERN_CRIT "nbd: sizeof nbd_request needs to be 28 in order to work!\n" );
-                return -EIO;
-        }
+        BUILD_BUG_ON(sizeof(struct nbd_request) != 28);
 
         if (nbds_max > MAX_NBD) {
                 printk(KERN_CRIT "nbd: cannot allocate more than %u nbds; %u requested.\n", MAX_NBD,
diff --git a/drivers/block/paride/bpck6.c b/drivers/block/paride/bpck6.c
index 08d858ad64..41a237c595 100644
--- a/drivers/block/paride/bpck6.c
+++ b/drivers/block/paride/bpck6.c
@@ -224,10 +224,9 @@ static void bpck6_log_adapter( PIA *pi, char * scratch, int verbose )
 
 static int bpck6_init_proto(PIA *pi)
 {
-        Interface *p = kmalloc(sizeof(Interface), GFP_KERNEL);
+        Interface *p = kzalloc(sizeof(Interface), GFP_KERNEL);
 
         if (p) {
-                memset(p, 0, sizeof(Interface));
                 pi->private = (unsigned long)p;
                 return 0;
         }
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 62d2464c12..2403721f9d 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -151,6 +151,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_GEO, D_SBY, D_DLY, D_SLV};
 #include <linux/cdrom.h>        /* for the eject ioctl */
 #include <linux/blkdev.h>
 #include <linux/blkpg.h>
+#include <linux/kernel.h>
 #include <asm/uaccess.h>
 #include <linux/sched.h>
 #include <linux/workqueue.h>
@@ -275,7 +276,7 @@ static void pd_print_error(struct pd_unit *disk, char *msg, int status)
         int i;
 
         printk("%s: %s: status = 0x%x =", disk->name, msg, status);
-        for (i = 0; i < 18; i++)
+        for (i = 0; i < ARRAY_SIZE(pd_errs); i++)
                 if (status & (1 << i))
                         printk(" %s", pd_errs[i]);
         printk("\n");
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 6f5df0fad7..79b8682540 100644
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -643,7 +643,8 @@ static ssize_t pg_read(struct file *filp, char __user *buf, size_t count, loff_t
 
 static int __init pg_init(void)
 {
-        int unit, err = 0;
+        int unit;
+        int err;
 
         if (disable){
                 err = -1;
@@ -657,16 +658,17 @@ static int __init pg_init(void)
                 goto out;
         }
 
-        if (register_chrdev(major, name, &pg_fops)) {
+        err = register_chrdev(major, name, &pg_fops);
+        if (err < 0) {
                 printk("pg_init: unable to get major number %d\n", major);
                 for (unit = 0; unit < PG_UNITS; unit++) {
                         struct pg *dev = &devices[unit];
                         if (dev->present)
                                 pi_release(dev->pi);
                 }
-                err = -1;
                 goto out;
         }
+        major = err;    /* In case the user specified `major=0' (dynamic) */
         pg_class = class_create(THIS_MODULE, "pg");
         if (IS_ERR(pg_class)) {
                 err = PTR_ERR(pg_class);
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index 715ae5dc88..d2013d3624 100644
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -943,7 +943,8 @@ static ssize_t pt_write(struct file *filp, const char __user *buf, size_t count,
 
 static int __init pt_init(void)
 {
-        int unit, err = 0;
+        int unit;
+        int err;
 
         if (disable) {
                 err = -1;
@@ -955,14 +956,15 @@ static int __init pt_init(void)
                 goto out;
         }
 
-        if (register_chrdev(major, name, &pt_fops)) {
+        err = register_chrdev(major, name, &pt_fops);
+        if (err < 0) {
                 printk("pt_init: unable to get major number %d\n", major);
                 for (unit = 0; unit < PT_UNITS; unit++)
                         if (pt[unit].present)
                                 pi_release(pt[unit].pi);
-                err = -1;
                 goto out;
         }
+        major = err;
         pt_class = class_create(THIS_MODULE, "pt");
         if (IS_ERR(pt_class)) {
                 err = PTR_ERR(pt_class);
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 1d261f985f..a04f60693c 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -230,16 +230,6 @@ static int pkt_grow_pktlist(struct pktcdvd_device *pd, int nr_packets)
         return 1;
 }
 
-static void *pkt_rb_alloc(gfp_t gfp_mask, void *data)
-{
-        return kmalloc(sizeof(struct pkt_rb_node), gfp_mask);
-}
-
-static void pkt_rb_free(void *ptr, void *data)
-{
-        kfree(ptr);
-}
-
 static inline struct pkt_rb_node *pkt_rbtree_next(struct pkt_rb_node *node)
 {
         struct rb_node *n = rb_next(&node->rb_node);
@@ -2073,16 +2063,6 @@ static int pkt_close(struct inode *inode, struct file *file)
 }
 
 
-static void *psd_pool_alloc(gfp_t gfp_mask, void *data)
-{
-        return kmalloc(sizeof(struct packet_stacked_data), gfp_mask);
-}
-
-static void psd_pool_free(void *ptr, void *data)
-{
-        kfree(ptr);
-}
-
 static int pkt_end_io_read_cloned(struct bio *bio, unsigned int bytes_done, int err)
 {
         struct packet_stacked_data *psd = bio->bi_private;
@@ -2475,7 +2455,8 @@ static int pkt_setup_dev(struct pkt_ctrl_command *ctrl_cmd)
         if (!pd)
                 return ret;
 
-        pd->rb_pool = mempool_create(PKT_RB_POOL_SIZE, pkt_rb_alloc, pkt_rb_free, NULL);
+        pd->rb_pool = mempool_create_kmalloc_pool(PKT_RB_POOL_SIZE,
+                                                  sizeof(struct pkt_rb_node));
         if (!pd->rb_pool)
                 goto out_mem;
 
@@ -2639,7 +2620,8 @@ static int __init pkt_init(void)
 {
         int ret;
 
-        psd_pool = mempool_create(PSD_POOL_SIZE, psd_pool_alloc, psd_pool_free, NULL);
+        psd_pool = mempool_create_kmalloc_pool(PSD_POOL_SIZE,
+                                        sizeof(struct packet_stacked_data));
         if (!psd_pool)
                 return -ENOMEM;
 
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index c16e66b9c7..f7d4c65a7b 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -50,6 +50,7 @@
 #include <linux/timer.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
+#include <linux/dma-mapping.h>
 
 #include <linux/fcntl.h>        /* O_ACCMODE */
 #include <linux/hdreg.h>  /* HDIO_GETGEO */
@@ -881,8 +882,8 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i
         printk(KERN_INFO "Micro Memory(tm) controller #%d found at %02x:%02x (PCI Mem Module (Battery Backup))\n",
                card->card_number, dev->bus->number, dev->devfn);
 
-        if (pci_set_dma_mask(dev, 0xffffffffffffffffLL) &&
-            pci_set_dma_mask(dev, 0xffffffffLL)) {
+        if (pci_set_dma_mask(dev, DMA_64BIT_MASK) &&
+            pci_set_dma_mask(dev, DMA_32BIT_MASK)) {
                 printk(KERN_WARNING "MM%d: NO suitable DMA found\n",num_cards);
                 return  -ENOMEM;
         }
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c
index fad27a87ce..f43a988dd4 100644
--- a/drivers/cdrom/cm206.c
+++ b/drivers/cdrom/cm206.c
@@ -218,12 +218,12 @@ static int cm206_base = CM206_BASE;
 static int cm206_irq = CM206_IRQ;
 #ifdef MODULE
 static int cm206[2] = { 0, 0 }; /* for compatible `insmod' parameter passing */
+module_param_array(cm206, int, NULL, 0);        /* base,irq or irq,base */
 #endif
 
-MODULE_PARM(cm206_base, "i");   /* base */
-MODULE_PARM(cm206_irq, "i");    /* irq */
-MODULE_PARM(cm206, "1-2i");     /* base,irq or irq,base */
-MODULE_PARM(auto_probe, "i");   /* auto probe base and irq */
+module_param(cm206_base, int, 0);       /* base */
+module_param(cm206_irq, int, 0);        /* irq */
+module_param(auto_probe, bool, 0);      /* auto probe base and irq */
 MODULE_LICENSE("GPL");
 
 #define POLLOOP 100             /* milliseconds */
diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c
index 4760f515f5..05c9e865ec 100644
--- a/drivers/cdrom/sbpcd.c
+++ b/drivers/cdrom/sbpcd.c
@@ -464,8 +464,13 @@ static int sbpcd[] =
 static  __cacheline_aligned DEFINE_SPINLOCK(sbpcd_lock);
 static struct request_queue *sbpcd_queue;
 
-MODULE_PARM(sbpcd, "2i");
-MODULE_PARM(max_drives, "i");
+/* You can only set the first pair, from old MODULE_PARM code.  */
+static int sbpcd_set(const char *val, struct kernel_param *kp)
+{
+        get_options((char *)val, 2, (int *)sbpcd);
+        return 0;
+}
+module_param_call(sbpcd, sbpcd_set, NULL, NULL, 0);
 
 #define NUM_PROBE  (sizeof(sbpcd) / sizeof(int))
 
@@ -553,6 +558,7 @@ static unsigned char msgnum;
 static char msgbuf[80];
 
 static int max_drives = MAX_DRIVES;
+module_param(max_drives, int, 0);
 #ifndef MODULE
 static unsigned char setup_done;
 static const char *str_sb_l = "soundblaster";
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 5980f3e886..889cad0777 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -187,6 +187,7 @@ config MOXA_SMARTIO
 config ISI
         tristate "Multi-Tech multiport card support (EXPERIMENTAL)"
         depends on SERIAL_NONSTANDARD
+        select FW_LOADER
         help
           This is a driver for the Multi-Tech cards which provide several
           serial ports.  The driver is experimental and can currently only be
@@ -560,14 +561,31 @@ config TIPAR
 
           If unsure, say N.
 
+config HVC_DRIVER
+        bool
+        help
+          Users of pSeries machines that want to utilize the hvc console front-end
+          module for their backend console driver should select this option.
+          It will automatically be selected if one of the back-end console drivers
+          is selected.
+
+
 config HVC_CONSOLE
         bool "pSeries Hypervisor Virtual Console support"
         depends on PPC_PSERIES
+        select HVC_DRIVER
         help
           pSeries machines when partitioned support a hypervisor virtual
           console. This driver allows each pSeries partition to have a console
           which is accessed via the HMC.
 
+config HVC_RTAS
+        bool "IBM RTAS Console support"
+        depends on PPC_RTAS
+        select HVC_DRIVER
+        help
+          IBM Console device driver which makes use of RTAS
+
 config HVCS
         tristate "IBM Hypervisor Virtual Console Server support"
         depends on PPC_PSERIES
@@ -695,7 +713,7 @@ config NVRAM
 
 config RTC
         tristate "Enhanced Real Time Clock Support"
-        depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV
+        depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM
         ---help---
           If you say Y here and create a character special file /dev/rtc with
           major number 10 and minor number 135 using mknod ("man mknod"), you
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 090d154098..a73cb49569 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -41,60 +41,63 @@ obj-$(CONFIG_N_HDLC)		+= n_hdlc.o
 obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
 obj-$(CONFIG_SX)                += sx.o generic_serial.o
 obj-$(CONFIG_RIO)               += rio/ generic_serial.o
-obj-$(CONFIG_HVC_CONSOLE)       += hvc_console.o hvc_vio.o hvsi.o
+obj-$(CONFIG_HVC_DRIVER)        += hvc_console.o
+obj-$(CONFIG_HVC_CONSOLE)       += hvc_vio.o hvsi.o
+obj-$(CONFIG_HVC_RTAS)          += hvc_rtas.o
 obj-$(CONFIG_RAW_DRIVER)        += raw.o
 obj-$(CONFIG_SGI_SNSC)          += snsc.o snsc_event.o
 obj-$(CONFIG_MMTIMER)           += mmtimer.o
-obj-$(CONFIG_VIOCONS) += viocons.o
+obj-$(CONFIG_VIOCONS)           += viocons.o
 obj-$(CONFIG_VIOTAPE)           += viotape.o
 obj-$(CONFIG_HVCS)              += hvcs.o
 obj-$(CONFIG_SGI_MBCS)          += mbcs.o
 
-obj-$(CONFIG_PRINTER) += lp.o
-obj-$(CONFIG_TIPAR) += tipar.o
-
-obj-$(CONFIG_DTLK) += dtlk.o
-obj-$(CONFIG_R3964) += n_r3964.o
-obj-$(CONFIG_APPLICOM) += applicom.o
-obj-$(CONFIG_SONYPI) += sonypi.o
-obj-$(CONFIG_RTC) += rtc.o
-obj-$(CONFIG_HPET) += hpet.o
-obj-$(CONFIG_GEN_RTC) += genrtc.o
-obj-$(CONFIG_EFI_RTC) += efirtc.o
-obj-$(CONFIG_SGI_DS1286) += ds1286.o
-obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o
-obj-$(CONFIG_DS1302) += ds1302.o
-obj-$(CONFIG_S3C2410_RTC) += s3c2410-rtc.o
-obj-$(CONFIG_RTC_VR41XX) += vr41xx_rtc.o
+obj-$(CONFIG_PRINTER)           += lp.o
+obj-$(CONFIG_TIPAR)             += tipar.o
+
+obj-$(CONFIG_DTLK)              += dtlk.o
+obj-$(CONFIG_R3964)             += n_r3964.o
+obj-$(CONFIG_APPLICOM)          += applicom.o
+obj-$(CONFIG_SONYPI)            += sonypi.o
+obj-$(CONFIG_RTC)               += rtc.o
+obj-$(CONFIG_HPET)              += hpet.o
+obj-$(CONFIG_GEN_RTC)           += genrtc.o
+obj-$(CONFIG_EFI_RTC)           += efirtc.o
+obj-$(CONFIG_SGI_DS1286)        += ds1286.o
+obj-$(CONFIG_SGI_IP27_RTC)      += ip27-rtc.o
+obj-$(CONFIG_DS1302)            += ds1302.o
+obj-$(CONFIG_S3C2410_RTC)       += s3c2410-rtc.o
+obj-$(CONFIG_RTC_VR41XX)        += vr41xx_rtc.o
 ifeq ($(CONFIG_GENERIC_NVRAM),y)
-  obj-$(CONFIG_NVRAM) += generic_nvram.o
+  obj-$(CONFIG_NVRAM)   += generic_nvram.o
 else
-  obj-$(CONFIG_NVRAM) += nvram.o
+  obj-$(CONFIG_NVRAM)   += nvram.o
 endif
-obj-$(CONFIG_TOSHIBA) += toshiba.o
-obj-$(CONFIG_I8K) += i8k.o
-obj-$(CONFIG_DS1620) += ds1620.o
-obj-$(CONFIG_HW_RANDOM) += hw_random.o
-obj-$(CONFIG_FTAPE) += ftape/
-obj-$(CONFIG_COBALT_LCD) += lcd.o
-obj-$(CONFIG_PPDEV) += ppdev.o
-obj-$(CONFIG_NWBUTTON) += nwbutton.o
-obj-$(CONFIG_NWFLASH) += nwflash.o
-obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o
-obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio.o
-obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.o
-obj-$(CONFIG_TANBAC_TB0219) += tb0219.o
-obj-$(CONFIG_TELCLOCK) += tlclk.o
-
-obj-$(CONFIG_WATCHDOG)  += watchdog/
-obj-$(CONFIG_MWAVE) += mwave/
-obj-$(CONFIG_AGP) += agp/
-obj-$(CONFIG_DRM) += drm/
-obj-$(CONFIG_PCMCIA) += pcmcia/
-obj-$(CONFIG_IPMI_HANDLER) += ipmi/
-
-obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o
-obj-$(CONFIG_TCG_TPM) += tpm/
+obj-$(CONFIG_TOSHIBA)           += toshiba.o
+obj-$(CONFIG_I8K)               += i8k.o
+obj-$(CONFIG_DS1620)            += ds1620.o
+obj-$(CONFIG_HW_RANDOM)         += hw_random.o
+obj-$(CONFIG_FTAPE)             += ftape/
+obj-$(CONFIG_COBALT_LCD)        += lcd.o
+obj-$(CONFIG_PPDEV)             += ppdev.o
+obj-$(CONFIG_NWBUTTON)          += nwbutton.o
+obj-$(CONFIG_NWFLASH)           += nwflash.o
+obj-$(CONFIG_SCx200_GPIO)       += scx200_gpio.o
+obj-$(CONFIG_CS5535_GPIO)       += cs5535_gpio.o
+obj-$(CONFIG_GPIO_VR41XX)       += vr41xx_giu.o
+obj-$(CONFIG_TANBAC_TB0219)     += tb0219.o
+obj-$(CONFIG_TELCLOCK)          += tlclk.o
+
+obj-$(CONFIG_WATCHDOG)          += watchdog/
+obj-$(CONFIG_MWAVE)             += mwave/
+obj-$(CONFIG_AGP)               += agp/
+obj-$(CONFIG_DRM)               += drm/
+obj-$(CONFIG_PCMCIA)            += pcmcia/
+obj-$(CONFIG_IPMI_HANDLER)      += ipmi/
+
+obj-$(CONFIG_HANGCHECK_TIMER)   += hangcheck-timer.o
+obj-$(CONFIG_TCG_TPM)           += tpm/
+
 # Files generated that shall be removed upon make clean
 clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c
 
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index a4d425d2dc..0b9cf9c59a 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -98,12 +98,12 @@ config AGP_SWORKS
         tristate "Serverworks LE/HE chipset support"
         depends on AGP && X86_32
         help
-          Say Y here to support the Serverworks AGP card.  See 
+          Say Y here to support the Serverworks AGP card.  See
           <http://www.serverworks.com/> for product descriptions and images.
 
 config AGP_VIA
         tristate "VIA chipset support"
-        depends on AGP && X86_32
+        depends on AGP
         help
           This option gives you AGP support for the GLX component of
           X on VIA MVP3/Apollo Pro chipsets.
diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h
index b4af87c6f9..3c623b67ea 100644
--- a/drivers/char/agp/agp.h
+++ b/drivers/char/agp/agp.h
@@ -19,9 +19,9 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * JEFF HARTMANN, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * JEFF HARTMANN, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
@@ -53,7 +53,7 @@ enum aper_size_type {
 struct gatt_mask {
         unsigned long mask;
         u32 type;
-        /* totally device specific, for integrated chipsets that 
+        /* totally device specific, for integrated chipsets that
          * might have different types of memory masks.  For other
          * devices this will probably be ignored */
 };
@@ -104,8 +104,7 @@ struct agp_bridge_driver {
         void (*agp_enable)(struct agp_bridge_data *, u32);
         void (*cleanup)(void);
         void (*tlb_flush)(struct agp_memory *);
-        unsigned long (*mask_memory)(struct agp_bridge_data *,
-                unsigned long, int);
+        unsigned long (*mask_memory)(struct agp_bridge_data *, unsigned long, int);
         void (*cache_flush)(void);
         int (*create_gatt_table)(struct agp_bridge_data *);
         int (*free_gatt_table)(struct agp_bridge_data *);
diff --git a/drivers/char/agp/ali-agp.c b/drivers/char/agp/ali-agp.c
index b02fc22671..5a31ec7c62 100644
--- a/drivers/char/agp/ali-agp.c
+++ b/drivers/char/agp/ali-agp.c
@@ -147,7 +147,7 @@ static void *m1541_alloc_page(struct agp_bridge_data *bridge)
 
         if (!addr)
                 return NULL;
-        
+
         pci_read_config_dword(agp_bridge->dev, ALI_CACHE_FLUSH_CTRL, &temp);
         pci_write_config_dword(agp_bridge->dev, ALI_CACHE_FLUSH_CTRL,
                         (((temp & ALI_CACHE_FLUSH_ADDR_MASK) |
diff --git a/drivers/char/agp/alpha-agp.c b/drivers/char/agp/alpha-agp.c
index a072d32005..2b5838e647 100644
--- a/drivers/char/agp/alpha-agp.c
+++ b/drivers/char/agp/alpha-agp.c
@@ -23,8 +23,9 @@ static struct page *alpha_core_agp_vm_nopage(struct vm_area_struct *vma,
         dma_addr = address - vma->vm_start + agp->aperture.bus_base;
         pa = agp->ops->translate(agp, dma_addr);
 
-        if (pa == (unsigned long)-EINVAL) return NULL;  /* no translation */
-        
+        if (pa == (unsigned long)-EINVAL)
+                return NULL;    /* no translation */
+
         /*
          * Get the page, inc the use count, and return it
          */
@@ -89,7 +90,7 @@ static void alpha_core_agp_enable(struct agp_bridge_data *bridge, u32 mode)
         agp_device_command(agp->mode.lw, 0);
 }
 
-static int alpha_core_agp_insert_memory(struct agp_memory *mem, off_t pg_start, 
+static int alpha_core_agp_insert_memory(struct agp_memory *mem, off_t pg_start,
                                         int type)
 {
         alpha_agp_info *agp = agp_bridge->dev_private_data;
@@ -98,7 +99,8 @@ static int alpha_core_agp_insert_memory(struct agp_memory *mem, off_t pg_start,
 
         temp = agp_bridge->current_size;
         num_entries = A_SIZE_FIX(temp)->num_entries;
-        if ((pg_start + mem->page_count) > num_entries) return -EINVAL;
+        if ((pg_start + mem->page_count) > num_entries)
+                return -EINVAL;
 
         status = agp->ops->bind(agp, pg_start, mem);
         mb();
@@ -107,7 +109,7 @@ static int alpha_core_agp_insert_memory(struct agp_memory *mem, off_t pg_start,
         return status;
 }
 
-static int alpha_core_agp_remove_memory(struct agp_memory *mem, off_t pg_start, 
+static int alpha_core_agp_remove_memory(struct agp_memory *mem, off_t pg_start,
                                         int type)
 {
         alpha_agp_info *agp = agp_bridge->dev_private_data;
@@ -125,7 +127,7 @@ struct agp_bridge_driver alpha_core_agp_driver = {
         .size_type              = FIXED_APER_SIZE,
         .cant_use_aperture      = 1,
         .masks                  = NULL,
-        
+
         .fetch_size             = alpha_core_agp_fetch_size,
         .configure              = alpha_core_agp_configure,
         .agp_enable             = alpha_core_agp_enable,
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index 1251b2515b..36517d4d1a 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -216,7 +216,7 @@ static struct aper_size_info_32 amd_8151_sizes[7] =
         {256,  65536,  6, 0x00000700 }, /* 1 1 1 0 0 0 */
         {128,  32768,  5, 0x00000720 }, /* 1 1 1 1 0 0 */
         {64,   16384,  4, 0x00000730 }, /* 1 1 1 1 1 0 */
-        {32,   8192,   3, 0x00000738 }  /* 1 1 1 1 1 1 */
+        {32,   8192,   3, 0x00000738 }  /* 1 1 1 1 1 1 */
 };
 
 static int amd_8151_configure(void)
@@ -725,7 +725,7 @@ static struct pci_device_id agp_amd64_pci_table[] = {
         .class          = (PCI_CLASS_BRIDGE_HOST << 8),
         .class_mask     = ~0,
         .vendor         = PCI_VENDOR_ID_AL,
-        .device         = 0x1689,
+        .device         = 0x1695,
         .subvendor      = PCI_ANY_ID,
         .subdevice      = PCI_ANY_ID,
         },
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index 5b74c36c11..06fd10ba0c 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -74,7 +74,7 @@ static int ati_create_page_map(ati_page_map *page_map)
         /*CACHE_FLUSH();*/
         global_cache_flush();
 
-        for(i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++) {
+        for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++) {
                 writel(agp_bridge->scratch_page, page_map->remapped+i);
                 readl(page_map->remapped+i);    /* PCI Posting. */
         }
@@ -99,7 +99,7 @@ static void ati_free_gatt_pages(void)
         ati_page_map *entry;
 
         tables = ati_generic_private.gatt_pages;
-        for(i = 0; i < ati_generic_private.num_tables; i++) {
+        for (i = 0; i < ati_generic_private.num_tables; i++) {
                 entry = tables[i];
                 if (entry != NULL) {
                         if (entry->real != NULL)
@@ -387,7 +387,7 @@ static int ati_create_gatt_table(struct agp_bridge_data *bridge)
         agp_bridge->gart_bus_addr = addr;
 
         /* Calculate the agp offset */
-        for(i = 0; i < value->num_entries / 1024; i++, addr += 0x00400000) {
+        for (i = 0; i < value->num_entries / 1024; i++, addr += 0x00400000) {
                 writel(virt_to_gart(ati_generic_private.gatt_pages[i]->real) | 1,
                         page_dir.remapped+GET_PAGE_DIR_OFF(addr));
                 readl(page_dir.remapped+GET_PAGE_DIR_OFF(addr));        /* PCI Posting. */
@@ -466,6 +466,10 @@ static struct agp_device_ids ati_agp_device_ids[] __devinitdata =
                 .device_id      = PCI_DEVICE_ID_ATI_RS300_200,
                 .chipset_name   = "IGP9100/M",
         },
+        {
+                .device_id      = PCI_DEVICE_ID_ATI_RS350_200,
+                .chipset_name   = "IGP9100/M",
+        },
         { }, /* dummy final entry, always present */
 };
 
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
index 80ee17a8fc..509adc4032 100644
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
@@ -228,7 +228,7 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge)
 struct agp_bridge_data *agp_alloc_bridge(void)
 {
         struct agp_bridge_data *bridge;
-        
+
         bridge = kzalloc(sizeof(*bridge), GFP_KERNEL);
         if (!bridge)
                 return NULL;
diff --git a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c
index e7aea77a60..fed0a87448 100644
--- a/drivers/char/agp/efficeon-agp.c
+++ b/drivers/char/agp/efficeon-agp.c
@@ -1,6 +1,6 @@
 /*
  * Transmeta's Efficeon AGPGART driver.
- * 
+ *
  * Based upon a diff by Linus around November '02.
  *
  * Ported to the 2.6 kernel by Carlos Puchol <cpglinux@puchol.com>
@@ -9,7 +9,7 @@
 
 /*
  * NOTE-cpg-040217:
- * 
+ *
  *   - when compiled as a module, after loading the module,
  *     it will refuse to unload, indicating it is in use,
  *     when it is not.
@@ -45,7 +45,7 @@
  *      8: Present
  *    7:6: reserved, write as zero
  *    5:0: GATT directory index: which 1st-level entry
- * 
+ *
  * The Efficeon AGP spec requires pages to be WB-cacheable
  * but to be explicitly CLFLUSH'd after any changes.
  */
@@ -125,7 +125,7 @@ static int efficeon_configure(void)
         struct aper_size_info_lvl2 *current_size;
 
         printk(KERN_DEBUG PFX "efficeon_configure()\n");
-        
+
         current_size = A_SIZE_LVL2(agp_bridge->current_size);
 
         /* aperture size */
@@ -190,7 +190,7 @@ static int efficeon_create_gatt_table(struct agp_bridge_data *bridge)
         const int present = EFFICEON_PRESENT;
         const int clflush_chunk = ((cpuid_ebx(1) >> 8) & 0xff) << 3;
         int num_entries, l1_pages;
-        
+
         num_entries = A_SIZE_LVL2(agp_bridge->current_size)->num_entries;
 
         printk(KERN_DEBUG PFX "efficeon_create_gatt_table(%d)\n", num_entries);
@@ -257,12 +257,12 @@ static int efficeon_insert_memory(struct agp_memory * mem, off_t pg_start, int t
 
                 if (!page)
                         continue;
-                
+
                 page += (index & 0x3ff);
                 *page = insert;
 
                 /* clflush is slow, so don't clflush until we have to */
-                if ( last_page && 
+                if ( last_page &&
                      ((unsigned long)page^(unsigned long)last_page) & clflush_mask )
                     asm volatile("clflush %0" : : "m" (*last_page));
 
@@ -373,7 +373,7 @@ static int __devinit agp_efficeon_probe(struct pci_dev *pdev,
         */
         r = &pdev->resource[0];
         if (!r->start && r->end) {
-                if(pci_assign_resource(pdev, 0)) {
+                if (pci_assign_resource(pdev, 0)) {
                         printk(KERN_ERR PFX "could not assign resource 0\n");
                         return -ENODEV;
                 }
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
index 97eeb2345b..ffcf15c30e 100644
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
@@ -781,7 +781,7 @@ static int agpioc_acquire_wrap(struct agp_file_private *priv)
         if (agp_fe.current_controller != NULL)
                 return -EBUSY;
 
-        if(!agp_bridge)
+        if (!agp_bridge)
                 return -ENODEV;
 
         if (atomic_read(&agp_bridge->agp_in_use))
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index 5567ce8d72..4e1891e2c0 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -299,7 +299,7 @@ EXPORT_SYMBOL_GPL(agp_num_entries);
 /**
  *      agp_copy_info  -  copy bridge state information
  *
- *      @info:          agp_kern_info pointer.  The caller should insure that this pointer is valid. 
+ *      @info:          agp_kern_info pointer.  The caller should insure that this pointer is valid.
  *
  *      This function copies information about the agp bridge device and the state of
  *      the agp backend into an agp_kern_info pointer.
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c
index de5d6d2126..8c4c6ef748 100644
--- a/drivers/char/agp/hp-agp.c
+++ b/drivers/char/agp/hp-agp.c
@@ -85,8 +85,8 @@ static int __init hp_zx1_ioc_shared(void)
         /*
          * IOC already configured by sba_iommu module; just use
          * its setup.  We assume:
-         *      - IOVA space is 1Gb in size
-         *      - first 512Mb is IOMMU, second 512Mb is GART
+         *      - IOVA space is 1Gb in size
+         *      - first 512Mb is IOMMU, second 512Mb is GART
          */
         hp->io_tlb_ps = readq(hp->ioc_regs+HP_ZX1_TCNFG);
         switch (hp->io_tlb_ps) {
@@ -115,7 +115,7 @@ static int __init hp_zx1_ioc_shared(void)
 
         if (hp->gatt[0] != HP_ZX1_SBA_IOMMU_COOKIE) {
                 /* Normal case when no AGP device in system */
-                hp->gatt = NULL;
+                hp->gatt = NULL;
                 hp->gatt_entries = 0;
                 printk(KERN_ERR PFX "No reserved IO PDIR entry found; "
                        "GART disabled\n");
diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c
index 8ee19a4a6b..91769443d8 100644
--- a/drivers/char/agp/i460-agp.c
+++ b/drivers/char/agp/i460-agp.c
@@ -400,10 +400,10 @@ static int i460_insert_memory_large_io_page (struct agp_memory *mem,
         num_entries = A_SIZE_8(temp)->num_entries;
 
         /* Figure out what pg_start means in terms of our large GART pages */
-        start           = &i460.lp_desc[pg_start / I460_KPAGES_PER_IOPAGE];
-        end             = &i460.lp_desc[(pg_start + mem->page_count - 1) / I460_KPAGES_PER_IOPAGE];
-        start_offset    = pg_start % I460_KPAGES_PER_IOPAGE;
-        end_offset      = (pg_start + mem->page_count - 1) % I460_KPAGES_PER_IOPAGE;
+        start = &i460.lp_desc[pg_start / I460_KPAGES_PER_IOPAGE];
+        end = &i460.lp_desc[(pg_start + mem->page_count - 1) / I460_KPAGES_PER_IOPAGE];
+        start_offset = pg_start % I460_KPAGES_PER_IOPAGE;
+        end_offset = (pg_start + mem->page_count - 1) % I460_KPAGES_PER_IOPAGE;
 
         if (end > i460.lp_desc + num_entries) {
                 printk(KERN_ERR PFX "Looks like we're out of AGP memory\n");
@@ -458,10 +458,10 @@ static int i460_remove_memory_large_io_page (struct agp_memory *mem,
         num_entries = A_SIZE_8(temp)->num_entries;
 
         /* Figure out what pg_start means in terms of our large GART pages */
-        start           = &i460.lp_desc[pg_start / I460_KPAGES_PER_IOPAGE];
-        end             = &i460.lp_desc[(pg_start + mem->page_count - 1) / I460_KPAGES_PER_IOPAGE];
-        start_offset    = pg_start % I460_KPAGES_PER_IOPAGE;
-        end_offset      = (pg_start + mem->page_count - 1) % I460_KPAGES_PER_IOPAGE;
+        start = &i460.lp_desc[pg_start / I460_KPAGES_PER_IOPAGE];
+        end = &i460.lp_desc[(pg_start + mem->page_count - 1) / I460_KPAGES_PER_IOPAGE];
+        start_offset = pg_start % I460_KPAGES_PER_IOPAGE;
+        end_offset = (pg_start + mem->page_count - 1) % I460_KPAGES_PER_IOPAGE;
 
         for (i = 0, lp = start; lp <= end; ++lp) {
                 for (idx = ((lp == start) ? start_offset : 0);
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 631531fd97..bddcae54b1 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -201,9 +201,9 @@ static int intel_i810_insert_entries(struct agp_memory *mem, off_t pg_start,
         temp = agp_bridge->current_size;
         num_entries = A_SIZE_FIX(temp)->num_entries;
 
-        if ((pg_start + mem->page_count) > num_entries) {
+        if ((pg_start + mem->page_count) > num_entries)
                 return -EINVAL;
-        }
+
         for (j = pg_start; j < (pg_start + mem->page_count); j++) {
                 if (!PGE_EMPTY(agp_bridge, readl(agp_bridge->gatt_table+j)))
                         return -EBUSY;
@@ -221,7 +221,7 @@ static int intel_i810_insert_entries(struct agp_memory *mem, off_t pg_start,
                         agp_bridge->driver->tlb_flush(mem);
                         return 0;
                 }
-                if((type == AGP_PHYS_MEMORY) && (mem->type == AGP_PHYS_MEMORY))
+                if ((type == AGP_PHYS_MEMORY) && (mem->type == AGP_PHYS_MEMORY))
                         goto insert;
                 return -EINVAL;
         }
@@ -328,7 +328,7 @@ static struct agp_memory *intel_i810_alloc_by_type(size_t pg_count, int type)
 static void intel_i810_free_by_type(struct agp_memory *curr)
 {
         agp_free_key(curr->key);
-        if(curr->type == AGP_PHYS_MEMORY) {
+        if (curr->type == AGP_PHYS_MEMORY) {
                 if (curr->page_count == 4)
                         i8xx_destroy_pages(gart_to_virt(curr->memory[0]));
                 else {
@@ -1603,11 +1603,10 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
                 name = "i820";
                 break;
         case PCI_DEVICE_ID_INTEL_82830_HB:
-                if (find_i830(PCI_DEVICE_ID_INTEL_82830_CGC)) {
+                if (find_i830(PCI_DEVICE_ID_INTEL_82830_CGC))
                         bridge->driver = &intel_830_driver;
-                } else {
+                else
                         bridge->driver = &intel_830mp_driver;
-                }
                 name = "830M";
                 break;
         case PCI_DEVICE_ID_INTEL_82840_HB:
@@ -1619,11 +1618,10 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
                 name = "i845";
                 break;
         case PCI_DEVICE_ID_INTEL_82845G_HB:
-                if (find_i830(PCI_DEVICE_ID_INTEL_82845G_IG)) {
+                if (find_i830(PCI_DEVICE_ID_INTEL_82845G_IG))
                         bridge->driver = &intel_830_driver;
-                } else {
+                else
                         bridge->driver = &intel_845_driver;
-                }
                 name = "845G";
                 break;
         case PCI_DEVICE_ID_INTEL_82850_HB:
@@ -1648,11 +1646,10 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
                 name = "i860";
                 break;
         case PCI_DEVICE_ID_INTEL_82865_HB:
-                if (find_i830(PCI_DEVICE_ID_INTEL_82865_IG)) {
+                if (find_i830(PCI_DEVICE_ID_INTEL_82865_IG))
                         bridge->driver = &intel_830_driver;
-                } else {
+                else
                         bridge->driver = &intel_845_driver;
-                }
                 name = "865";
                 break;
         case PCI_DEVICE_ID_INTEL_82875_HB:
@@ -1660,35 +1657,31 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
                 name = "i875";
                 break;
         case PCI_DEVICE_ID_INTEL_82915G_HB:
-                if (find_i830(PCI_DEVICE_ID_INTEL_82915G_IG)) {
+                if (find_i830(PCI_DEVICE_ID_INTEL_82915G_IG))
                         bridge->driver = &intel_915_driver;
-                } else {
+                else
                         bridge->driver = &intel_845_driver;
-                }
                 name = "915G";
                 break;
         case PCI_DEVICE_ID_INTEL_82915GM_HB:
-                if (find_i830(PCI_DEVICE_ID_INTEL_82915GM_IG)) {
+                if (find_i830(PCI_DEVICE_ID_INTEL_82915GM_IG))
                         bridge->driver = &intel_915_driver;
-                } else {
+                else
                         bridge->driver = &intel_845_driver;
-                }
                 name = "915GM";
                 break;
         case PCI_DEVICE_ID_INTEL_82945G_HB:
-                if (find_i830(PCI_DEVICE_ID_INTEL_82945G_IG)) {
+                if (find_i830(PCI_DEVICE_ID_INTEL_82945G_IG))
                         bridge->driver = &intel_915_driver;
-                } else {
+                else
                         bridge->driver = &intel_845_driver;
-                }
                 name = "945G";
                 break;
         case PCI_DEVICE_ID_INTEL_82945GM_HB:
-                if (find_i830(PCI_DEVICE_ID_INTEL_82945GM_IG)) {
+                if (find_i830(PCI_DEVICE_ID_INTEL_82945GM_IG))
                         bridge->driver = &intel_915_driver;
-                } else {
+                else
                         bridge->driver = &intel_845_driver;
-                }
                 name = "945GM";
                 break;
         case PCI_DEVICE_ID_INTEL_7505_0:
@@ -1724,7 +1717,7 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
         */
         r = &pdev->resource[0];
         if (!r->start && r->end) {
-                if(pci_assign_resource(pdev, 0)) {
+                if (pci_assign_resource(pdev, 0)) {
                         printk(KERN_ERR PFX "could not assign resource 0\n");
                         agp_put_bridge(bridge);
                         return -ENODEV;
diff --git a/drivers/char/agp/isoch.c b/drivers/char/agp/isoch.c
index 7c14a096b8..3f9ccde623 100644
--- a/drivers/char/agp/isoch.c
+++ b/drivers/char/agp/isoch.c
@@ -26,7 +26,7 @@ static void agp_3_5_dev_list_insert(struct list_head *head, struct list_head *ne
 
         list_for_each(pos, head) {
                 cur = list_entry(pos, struct agp_3_5_dev, list);
-                if(cur->maxbw > n->maxbw)
+                if (cur->maxbw > n->maxbw)
                         break;
         }
         list_add_tail(new, pos);
@@ -54,9 +54,9 @@ static void agp_3_5_dev_list_sort(struct agp_3_5_dev *list, unsigned int ndevs)
         }
 }
 
-/* 
- * Initialize all isochronous transfer parameters for an AGP 3.0 
- * node (i.e. a host bridge in combination with the adapters 
+/*
+ * Initialize all isochronous transfer parameters for an AGP 3.0
+ * node (i.e. a host bridge in combination with the adapters
  * lying behind it...)
  */
 
@@ -200,7 +200,7 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge,
          * this to the hungriest device (as per the spec) */
         rem  = target.n - tot_n;
 
-        /* 
+        /*
          * Calculate the minimum isochronous RQ depth needed by each master.
          * Along the way, distribute the extra ISOCH_N capability calculated
          * above.
@@ -214,7 +214,7 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge,
                  * many writes on the AGP bus).
                  */
                 master[cdev].rq = master[cdev].n;
-                if(master[cdev].y > 0x1)
+                if (master[cdev].y > 0x1)
                         master[cdev].rq *= (1 << (master[cdev].y - 1));
 
                 tot_rq += master[cdev].rq;
@@ -334,9 +334,9 @@ int agp_3_5_enable(struct agp_bridge_data *bridge)
 
         arqsz     = (tstatus >> 13) & 0x7;
 
-        /* 
+        /*
          * Allocate a head for our AGP 3.5 device list
-         * (multiple AGP v3 devices are allowed behind a single bridge). 
+         * (multiple AGP v3 devices are allowed behind a single bridge).
          */
         if ((dev_list = kmalloc(sizeof(*dev_list), GFP_KERNEL)) == NULL) {
                 ret = -ENOMEM;
@@ -366,7 +366,7 @@ int agp_3_5_enable(struct agp_bridge_data *bridge)
 
                         case 0x0300:    /* Display controller */
                         case 0x0400:    /* Multimedia controller */
-                                if((cur = kmalloc(sizeof(*cur), GFP_KERNEL)) == NULL) {
+                                if ((cur = kmalloc(sizeof(*cur), GFP_KERNEL)) == NULL) {
                                         ret = -ENOMEM;
                                         goto free_and_exit;
                                 }
@@ -391,7 +391,7 @@ int agp_3_5_enable(struct agp_bridge_data *bridge)
         list_for_each(pos, head) {
                 cur = list_entry(pos, struct agp_3_5_dev, list);
                 dev = cur->dev;
-                
+
                 pci_read_config_word(dev, PCI_STATUS, &mpstat);
                 if ((mpstat & PCI_STATUS_CAP_LIST) == 0)
                         continue;
diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c
index 80dafa3030..4c67135c12 100644
--- a/drivers/char/agp/nvidia-agp.c
+++ b/drivers/char/agp/nvidia-agp.c
@@ -11,6 +11,7 @@
 #include <linux/gfp.h>
 #include <linux/page-flags.h>
 #include <linux/mm.h>
+#include <linux/jiffies.h>
 #include "agp.h"
 
 /* NVIDIA registers */
@@ -72,7 +73,7 @@ static int nvidia_init_iorr(u32 base, u32 size)
         /* Find the iorr that is already used for the base */
         /* If not found, determine the uppermost available iorr */
         free_iorr_addr = AMD_K7_NUM_IORR;
-        for(iorr_addr = 0; iorr_addr < AMD_K7_NUM_IORR; iorr_addr++) {
+        for (iorr_addr = 0; iorr_addr < AMD_K7_NUM_IORR; iorr_addr++) {
                 rdmsr(IORR_BASE0 + 2 * iorr_addr, base_lo, base_hi);
                 rdmsr(IORR_MASK0 + 2 * iorr_addr, mask_lo, mask_hi);
 
@@ -82,7 +83,7 @@ static int nvidia_init_iorr(u32 base, u32 size)
                 if ((mask_lo & 0x00000800) == 0)
                         free_iorr_addr = iorr_addr;
         }
-        
+
         if (iorr_addr >= AMD_K7_NUM_IORR) {
                 iorr_addr = free_iorr_addr;
                 if (iorr_addr >= AMD_K7_NUM_IORR)
@@ -139,7 +140,7 @@ static int nvidia_configure(void)
         }
 
         /* attbase */
-        for(i = 0; i < 8; i++) {
+        for (i = 0; i < 8; i++) {
                 pci_write_config_dword(nvidia_private.dev_2, NVIDIA_2_ATTBASE(i),
                         (agp_bridge->gatt_bus_addr + (i % num_dirs) * 64 * 1024) | 1);
         }
@@ -197,15 +198,15 @@ extern int agp_memory_reserved;
 static int nvidia_insert_memory(struct agp_memory *mem, off_t pg_start, int type)
 {
         int i, j;
-        
+
         if ((type != 0) || (mem->type != 0))
                 return -EINVAL;
-        
+
         if ((pg_start + mem->page_count) >
                 (nvidia_private.num_active_entries - agp_memory_reserved/PAGE_SIZE))
                 return -EINVAL;
-        
-        for(j = pg_start; j < (pg_start + mem->page_count); j++) {
+
+        for (j = pg_start; j < (pg_start + mem->page_count); j++) {
                 if (!PGE_EMPTY(agp_bridge, readl(agp_bridge->gatt_table+nvidia_private.pg_offset+j)))
                         return -EBUSY;
         }
@@ -256,7 +257,7 @@ static void nvidia_tlbflush(struct agp_memory *mem)
                 do {
                         pci_read_config_dword(nvidia_private.dev_1,
                                         NVIDIA_1_WBC, &wbc_reg);
-                        if ((signed)(end - jiffies) <= 0) {
+                        if (time_before_eq(end, jiffies)) {
                                 printk(KERN_ERR PFX
                                     "TLB flush took more than 3 seconds.\n");
                         }
@@ -264,9 +265,9 @@ static void nvidia_tlbflush(struct agp_memory *mem)
         }
 
         /* flush TLB entries */
-        for(i = 0; i < 32 + 1; i++)
+        for (i = 0; i < 32 + 1; i++)
                 temp = readl(nvidia_private.aperture+(i * PAGE_SIZE / sizeof(u32)));
-        for(i = 0; i < 32 + 1; i++)
+        for (i = 0; i < 32 + 1; i++)
                 temp = readl(nvidia_private.aperture+(i * PAGE_SIZE / sizeof(u32)));
 }
 
@@ -323,7 +324,7 @@ static int __devinit agp_nvidia_probe(struct pci_dev *pdev,
                 pci_find_slot((unsigned int)pdev->bus->number, PCI_DEVFN(0, 2));
         nvidia_private.dev_3 =
                 pci_find_slot((unsigned int)pdev->bus->number, PCI_DEVFN(30, 0));
-        
+
         if (!nvidia_private.dev_1 || !nvidia_private.dev_2 || !nvidia_private.dev_3) {
                 printk(KERN_INFO PFX "Detected an NVIDIA nForce/nForce2 "
                         "chipset, but could not find the secondary devices.\n");
diff --git a/drivers/char/agp/sgi-agp.c b/drivers/char/agp/sgi-agp.c
index 4df7734b51..cfa7922cb4 100644
--- a/drivers/char/agp/sgi-agp.c
+++ b/drivers/char/agp/sgi-agp.c
@@ -329,7 +329,7 @@ static int __devinit agp_sgi_init(void)
 
 static void __devexit agp_sgi_cleanup(void)
 {
-        if(sgi_tioca_agp_bridges)
+        if (sgi_tioca_agp_bridges)
                 kfree(sgi_tioca_agp_bridges);
         sgi_tioca_agp_bridges=NULL;
 }
diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c
index ebc0555404..a00fd48a6f 100644
--- a/drivers/char/agp/sis-agp.c
+++ b/drivers/char/agp/sis-agp.c
@@ -121,7 +121,7 @@ static struct aper_size_info_8 sis_generic_sizes[7] =
 
 static struct agp_bridge_driver sis_driver = {
         .owner                  = THIS_MODULE,
-        .aperture_sizes         = sis_generic_sizes,
+        .aperture_sizes         = sis_generic_sizes,
         .size_type              = U8_APER_SIZE,
         .num_aperture_sizes     = 7,
         .configure              = sis_configure,
@@ -243,11 +243,11 @@ static void __devinit sis_get_driver(struct agp_bridge_data *bridge)
 {
         int i;
 
-        for(i=0; sis_broken_chipsets[i]!=0; ++i)
-                if(bridge->dev->device==sis_broken_chipsets[i])
+        for (i=0; sis_broken_chipsets[i]!=0; ++i)
+                if (bridge->dev->device==sis_broken_chipsets[i])
                         break;
 
-        if(sis_broken_chipsets[i] || agp_sis_force_delay)
+        if (sis_broken_chipsets[i] || agp_sis_force_delay)
                 sis_driver.agp_enable=sis_delayed_enable;
 
         // sis chipsets that indicate less than agp3.5
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index efef9999f1..4f2d7d9990 100644
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -64,7 +64,7 @@ static int serverworks_create_page_map(struct serverworks_page_map *page_map)
         }
         global_cache_flush();
 
-        for(i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++)
+        for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++)
                 writel(agp_bridge->scratch_page, page_map->remapped+i);
 
         return 0;
@@ -84,7 +84,7 @@ static void serverworks_free_gatt_pages(void)
         struct serverworks_page_map *entry;
 
         tables = serverworks_private.gatt_pages;
-        for(i = 0; i < serverworks_private.num_tables; i++) {
+        for (i = 0; i < serverworks_private.num_tables; i++) {
                 entry = tables[i];
                 if (entry != NULL) {
                         if (entry->real != NULL) {
@@ -103,7 +103,7 @@ static int serverworks_create_gatt_pages(int nr_tables)
         int retval = 0;
         int i;
 
-        tables = kzalloc((nr_tables + 1) * sizeof(struct serverworks_page_map *), 
+        tables = kzalloc((nr_tables + 1) * sizeof(struct serverworks_page_map *),
                          GFP_KERNEL);
         if (tables == NULL)
                 return -ENOMEM;
@@ -161,7 +161,7 @@ static int serverworks_create_gatt_table(struct agp_bridge_data *bridge)
                 return retval;
         }
         /* Create a fake scratch directory */
-        for(i = 0; i < 1024; i++) {
+        for (i = 0; i < 1024; i++) {
                 writel(agp_bridge->scratch_page, serverworks_private.scratch_dir.remapped+i);
                 writel(virt_to_gart(serverworks_private.scratch_dir.real) | 1, page_dir.remapped+i);
         }
@@ -185,9 +185,8 @@ static int serverworks_create_gatt_table(struct agp_bridge_data *bridge)
         pci_read_config_dword(agp_bridge->dev,serverworks_private.gart_addr_ofs,&temp);
         agp_bridge->gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);
 
-        /* Calculate the agp offset */  
-
-        for(i = 0; i < value->num_entries / 1024; i++)
+        /* Calculate the agp offset */
+        for (i = 0; i < value->num_entries / 1024; i++)
                 writel(virt_to_gart(serverworks_private.gatt_pages[i]->real)|1, page_dir.remapped+i);
 
         return 0;
@@ -196,7 +195,7 @@ static int serverworks_create_gatt_table(struct agp_bridge_data *bridge)
 static int serverworks_free_gatt_table(struct agp_bridge_data *bridge)
 {
         struct serverworks_page_map page_dir;
-   
+
         page_dir.real = (unsigned long *)agp_bridge->gatt_table_real;
         page_dir.remapped = (unsigned long __iomem *)agp_bridge->gatt_table;
 
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
index 50947e3850..9846defbdd 100644
--- a/drivers/char/agp/uninorth-agp.c
+++ b/drivers/char/agp/uninorth-agp.c
@@ -95,12 +95,12 @@ static void uninorth_cleanup(void)
 static int uninorth_configure(void)
 {
         struct aper_size_info_32 *current_size;
-        
+
         current_size = A_SIZE_32(agp_bridge->current_size);
 
         printk(KERN_INFO PFX "configuring for size idx: %d\n",
                current_size->size_value);
-        
+
         /* aperture size and gatt addr */
         pci_write_config_dword(agp_bridge->dev,
                 UNI_N_CFG_GART_BASE,
@@ -127,7 +127,7 @@ static int uninorth_configure(void)
                                        UNI_N_CFG_GART_DUMMY_PAGE,
                                        agp_bridge->scratch_page_real >> 12);
         }
-        
+
         return 0;
 }
 
@@ -162,7 +162,7 @@ static int uninorth_insert_memory(struct agp_memory *mem, off_t pg_start,
         }
         (void)in_le32((volatile u32*)&agp_bridge->gatt_table[pg_start]);
         mb();
-        flush_dcache_range((unsigned long)&agp_bridge->gatt_table[pg_start], 
+        flush_dcache_range((unsigned long)&agp_bridge->gatt_table[pg_start],
                 (unsigned long)&agp_bridge->gatt_table[pg_start + mem->page_count]);
 
         uninorth_tlbflush(mem);
@@ -235,7 +235,7 @@ static void uninorth_agp_enable(struct agp_bridge_data *bridge, u32 mode)
 
         command = agp_collect_device_status(bridge, mode, status);
         command |= PCI_AGP_COMMAND_AGP;
-        
+
         if (uninorth_rev == 0x21) {
                 /*
                  * Darwin disable AGP 4x on this revision, thus we
@@ -456,7 +456,7 @@ static struct aper_size_info_32 uninorth_sizes[7] =
         {256, 65536, 6, 64},
         {128, 32768, 5, 32},
         {64, 16384, 4, 16},
-#endif  
+#endif
         {32, 8192, 3, 8},
         {16, 4096, 2, 4},
         {8, 2048, 1, 2},
diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c
index 641f763387..b7f7951c45 100644
--- a/drivers/char/drm/drm_fops.c
+++ b/drivers/char/drm/drm_fops.c
@@ -175,7 +175,7 @@ int drm_stub_open(struct inode *inode, struct file *filp)
         drm_device_t *dev = NULL;
         int minor = iminor(inode);
         int err = -ENODEV;
-        struct file_operations *old_fops;
+        const struct file_operations *old_fops;
 
         DRM_DEBUG("\n");
 
diff --git a/drivers/char/drm/i810_dma.c b/drivers/char/drm/i810_dma.c
index ae0aa6d7e0..c658dde363 100644
--- a/drivers/char/drm/i810_dma.c
+++ b/drivers/char/drm/i810_dma.c
@@ -126,7 +126,7 @@ static int i810_map_buffer(drm_buf_t * buf, struct file *filp)
         drm_device_t *dev = priv->head->dev;
         drm_i810_buf_priv_t *buf_priv = buf->dev_private;
         drm_i810_private_t *dev_priv = dev->dev_private;
-        struct file_operations *old_fops;
+        const struct file_operations *old_fops;
         int retcode = 0;
 
         if (buf_priv->currently_mapped == I810_BUF_MAPPED)
diff --git a/drivers/char/drm/i830_dma.c b/drivers/char/drm/i830_dma.c
index 163f2cbfe6..b0f815d8ce 100644
--- a/drivers/char/drm/i830_dma.c
+++ b/drivers/char/drm/i830_dma.c
@@ -128,7 +128,7 @@ static int i830_map_buffer(drm_buf_t * buf, struct file *filp)
         drm_device_t *dev = priv->head->dev;
         drm_i830_buf_priv_t *buf_priv = buf->dev_private;
         drm_i830_private_t *dev_priv = dev->dev_private;
-        struct file_operations *old_fops;
+        const struct file_operations *old_fops;
         unsigned long virtual;
         int retcode = 0;
 
diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index 765c5c108b..9cad8501d6 100644
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -486,8 +486,7 @@ static void pc_close(struct tty_struct * tty, struct file * filp)
                 } /* End channel is open more than once */
 
                 /* Port open only once go ahead with shutdown & reset */
-                if (ch->count < 0)
-                        BUG();
+                BUG_ON(ch->count < 0);
 
                 /* ---------------------------------------------------------------
                         Let the rest of the driver know the channel is being closed.
diff --git a/drivers/char/ftape/lowlevel/fdc-io.c b/drivers/char/ftape/lowlevel/fdc-io.c
index b2e0928e84..093fdf98b1 100644
--- a/drivers/char/ftape/lowlevel/fdc-io.c
+++ b/drivers/char/ftape/lowlevel/fdc-io.c
@@ -607,7 +607,7 @@ void fdc_reset(void)
 
         fdc_mode = fdc_idle;
 
-        /*  maybe the cli()/sti() pair is not necessary, BUT:
+        /*  maybe the spin_lock_irq* pair is not necessary, BUT:
          *  the following line MUST be here. Otherwise fdc_interrupt_wait()
          *  won't wait. Note that fdc_reset() is called from 
          *  ftape_dumb_stop() when the fdc is busy transferring data. In this
diff --git a/drivers/char/generic_nvram.c b/drivers/char/generic_nvram.c
index 1b5e01e6e1..43ff598165 100644
--- a/drivers/char/generic_nvram.c
+++ b/drivers/char/generic_nvram.c
@@ -22,6 +22,9 @@
 #include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <asm/nvram.h>
+#ifdef CONFIG_PPC_PMAC
+#include <asm/machdep.h>
+#endif
 
 #define NVRAM_SIZE      8192
 
@@ -92,7 +95,7 @@ static int nvram_ioctl(struct inode *inode, struct file *file,
         case IOC_NVRAM_GET_OFFSET: {
                 int part, offset;
 
-                if (_machine != _MACH_Pmac)
+                if (!machine_is(powermac))
                         return -EINVAL;
                 if (copy_from_user(&part, (void __user*)arg, sizeof(part)) != 0)
                         return -EFAULT;
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index f65b2e14a4..2b6a56b2bf 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -39,8 +39,10 @@
 #include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/delay.h>
+
 #include <asm/uaccess.h>
-#include <asm/hvconsole.h>
+
+#include "hvc_console.h"
 
 #define HVC_MAJOR       229
 #define HVC_MINOR       0
@@ -54,17 +56,14 @@
 #define HVC_CLOSE_WAIT (HZ/100) /* 1/10 of a second */
 
 /*
- * The Linux TTY code does not support dynamic addition of tty derived devices
- * so we need to know how many tty devices we might need when space is allocated
- * for the tty device.  Since this driver supports hotplug of vty adapters we
- * need to make sure we have enough allocated.
+ * These sizes are most efficient for vio, because they are the
+ * native transfer size. We could make them selectable in the
+ * future to better deal with backends that want other buffer sizes.
  */
-#define HVC_ALLOC_TTY_ADAPTERS  8
-
 #define N_OUTBUF        16
 #define N_INBUF         16
 
-#define __ALIGNED__     __attribute__((__aligned__(8)))
+#define __ALIGNED__ __attribute__((__aligned__(sizeof(long))))
 
 static struct tty_driver *hvc_driver;
 static struct task_struct *hvc_task;
@@ -154,7 +153,7 @@ static uint32_t vtermnos[MAX_NR_HVC_CONSOLES] =
 
 void hvc_console_print(struct console *co, const char *b, unsigned count)
 {
-        char c[16] __ALIGNED__;
+        char c[N_OUTBUF] __ALIGNED__;
         unsigned i = 0, n = 0;
         int r, donecr = 0, index = co->index;
 
@@ -473,8 +472,10 @@ static void hvc_push(struct hvc_struct *hp)
 
         n = hp->ops->put_chars(hp->vtermno, hp->outbuf, hp->n_outbuf);
         if (n <= 0) {
-                if (n == 0)
+                if (n == 0) {
+                        hp->do_wakeup = 1;
                         return;
+                }
                 /* throw away output on error; this happens when
                    there is no session connected to the vterm. */
                 hp->n_outbuf = 0;
@@ -486,12 +487,19 @@ static void hvc_push(struct hvc_struct *hp)
                 hp->do_wakeup = 1;
 }
 
-static inline int __hvc_write_kernel(struct hvc_struct *hp,
-                                   const unsigned char *buf, int count)
+static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count)
 {
+        struct hvc_struct *hp = tty->driver_data;
         unsigned long flags;
         int rsize, written = 0;
 
+        /* This write was probably executed during a tty close. */
+        if (!hp)
+                return -EPIPE;
+
+        if (hp->count <= 0)
+                return -EIO;
+
         spin_lock_irqsave(&hp->lock, flags);
 
         /* Push pending writes */
@@ -510,26 +518,8 @@ static inline int __hvc_write_kernel(struct hvc_struct *hp,
         }
         spin_unlock_irqrestore(&hp->lock, flags);
 
-        return written;
-}
-static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count)
-{
-        struct hvc_struct *hp = tty->driver_data;
-        int written;
-
-        /* This write was probably executed during a tty close. */
-        if (!hp)
-                return -EPIPE;
-
-        if (hp->count <= 0)
-                return -EIO;
-
-        written = __hvc_write_kernel(hp, buf, count);
-
         /*
          * Racy, but harmless, kick thread if there is still pending data.
-         * There really is nothing wrong with kicking the thread, even if there
-         * is no buffered data.
          */
         if (hp->n_outbuf)
                 hvc_kick();
@@ -614,6 +604,13 @@ static int hvc_poll(struct hvc_struct *hp)
                                 spin_unlock_irqrestore(&hp->lock, flags);
                                 tty_hangup(tty);
                                 spin_lock_irqsave(&hp->lock, flags);
+                        } else if ( n == -EAGAIN ) {
+                                /*
+                                 * Some back-ends can only ensure a certain min
+                                 * num of bytes read, which may be > 'count'.
+                                 * Let the tty clear the flip buff to make room.
+                                 */
+                                poll_mask |= HVC_POLL_READ;
                         }
                         break;
                 }
@@ -635,16 +632,7 @@ static int hvc_poll(struct hvc_struct *hp)
                         tty_insert_flip_char(tty, buf[i], 0);
                 }
 
-                /*
-                 * Account for the total amount read in one loop, and if above
-                 * 64 bytes, we do a quick schedule loop to let the tty grok
-                 * the data and eventually throttle us.
-                 */
                 read_total += n;
-                if (read_total >= 64) {
-                        poll_mask |= HVC_POLL_QUICK;
-                        break;
-                }
         }
  throttled:
         /* Wakeup write queue if necessary */
@@ -767,7 +755,8 @@ struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int irq,
          * see if this vterm id matches one registered for console.
          */
         for (i=0; i < MAX_NR_HVC_CONSOLES; i++)
-                if (vtermnos[i] == hp->vtermno)
+                if (vtermnos[i] == hp->vtermno &&
+                    cons_ops[i] == hp->ops)
                         break;
 
         /* no matching slot, just use a counter */
@@ -823,34 +812,38 @@ EXPORT_SYMBOL(hvc_remove);
  * interfaces start to become available. */
 int __init hvc_init(void)
 {
+        struct tty_driver *drv;
+
         /* We need more than hvc_count adapters due to hotplug additions. */
-        hvc_driver = alloc_tty_driver(HVC_ALLOC_TTY_ADAPTERS);
-        if (!hvc_driver)
+        drv = alloc_tty_driver(HVC_ALLOC_TTY_ADAPTERS);
+        if (!drv)
                 return -ENOMEM;
 
-        hvc_driver->owner = THIS_MODULE;
-        hvc_driver->devfs_name = "hvc/";
-        hvc_driver->driver_name = "hvc";
-        hvc_driver->name = "hvc";
-        hvc_driver->major = HVC_MAJOR;
-        hvc_driver->minor_start = HVC_MINOR;
-        hvc_driver->type = TTY_DRIVER_TYPE_SYSTEM;
-        hvc_driver->init_termios = tty_std_termios;
-        hvc_driver->flags = TTY_DRIVER_REAL_RAW;
-        tty_set_operations(hvc_driver, &hvc_ops);
+        drv->owner = THIS_MODULE;
+        drv->devfs_name = "hvc/";
+        drv->driver_name = "hvc";
+        drv->name = "hvc";
+        drv->major = HVC_MAJOR;
+        drv->minor_start = HVC_MINOR;
+        drv->type = TTY_DRIVER_TYPE_SYSTEM;
+        drv->init_termios = tty_std_termios;
+        drv->flags = TTY_DRIVER_REAL_RAW;
+        tty_set_operations(drv, &hvc_ops);
 
         /* Always start the kthread because there can be hotplug vty adapters
          * added later. */
         hvc_task = kthread_run(khvcd, NULL, "khvcd");
         if (IS_ERR(hvc_task)) {
                 panic("Couldn't create kthread for console.\n");
-                put_tty_driver(hvc_driver);
+                put_tty_driver(drv);
                 return -EIO;
         }
 
-        if (tty_register_driver(hvc_driver))
+        if (tty_register_driver(drv))
                 panic("Couldn't register hvc console driver\n");
 
+        mb();
+        hvc_driver = drv;
         return 0;
 }
 module_init(hvc_init);
diff --git a/drivers/char/hvc_console.h b/drivers/char/hvc_console.h
new file mode 100644
index 0000000000..96b7401319
--- /dev/null
+++ b/drivers/char/hvc_console.h
@@ -0,0 +1,63 @@
+/*
+ * hvc_console.h
+ * Copyright (C) 2005 IBM Corporation
+ *
+ * Author(s):
+ *      Ryan S. Arnold <rsa@us.ibm.com>
+ *
+ * hvc_console header information:
+ *      moved here from include/asm-powerpc/hvconsole.h
+ *      and drivers/char/hvc_console.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+
+#ifndef HVC_CONSOLE_H
+#define HVC_CONSOLE_H
+
+/*
+ * This is the max number of console adapters that can/will be found as
+ * console devices on first stage console init.  Any number beyond this range
+ * can't be used as a console device but is still a valid tty device.
+ */
+#define MAX_NR_HVC_CONSOLES     16
+
+/*
+ * The Linux TTY code does not support dynamic addition of tty derived devices
+ * so we need to know how many tty devices we might need when space is allocated
+ * for the tty device.  Since this driver supports hotplug of vty adapters we
+ * need to make sure we have enough allocated.
+ */
+#define HVC_ALLOC_TTY_ADAPTERS  8
+
+
+/* implemented by a low level driver */
+struct hv_ops {
+        int (*get_chars)(uint32_t vtermno, char *buf, int count);
+        int (*put_chars)(uint32_t vtermno, const char *buf, int count);
+};
+
+struct hvc_struct;
+
+/* Register a vterm and a slot index for use as a console (console_init) */
+extern int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops);
+
+/* register a vterm for hvc tty operation (module_init or hotplug add) */
+extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int irq,
+                                                 struct hv_ops *ops);
+/* remove a vterm from hvc tty operation (modele_exit or hotplug remove) */
+extern int __devexit hvc_remove(struct hvc_struct *hp);
+
+#endif // HVC_CONSOLE_H
diff --git a/drivers/char/hvc_rtas.c b/drivers/char/hvc_rtas.c
new file mode 100644
index 0000000000..83364ea63c
--- /dev/null
+++ b/drivers/char/hvc_rtas.c
@@ -0,0 +1,138 @@
+/*
+ * IBM RTAS driver interface to hvc_console.c
+ *
+ * (C) Copyright IBM Corporation 2001-2005
+ * (C) Copyright Red Hat, Inc. 2005
+ *
+ * Author(s): Maximino Augilar <IBM STI Design Center>
+ *          : Ryan S. Arnold <rsa@us.ibm.com>
+ *          : Utz Bacher <utz.bacher@de.ibm.com>
+ *          : David Woodhouse <dwmw2@infradead.org>
+ *
+ *    inspired by drivers/char/hvc_console.c
+ *    written by Anton Blanchard and Paul Mackerras
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+
+#include <linux/console.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/moduleparam.h>
+#include <linux/types.h>
+
+#include <asm/irq.h>
+#include <asm/rtas.h>
+#include "hvc_console.h"
+
+#define hvc_rtas_cookie 0x67781e15
+struct hvc_struct *hvc_rtas_dev;
+
+#define RTASCONS_PUT_ATTEMPTS  16
+
+static int rtascons_put_char_token = RTAS_UNKNOWN_SERVICE;
+static int rtascons_get_char_token = RTAS_UNKNOWN_SERVICE;
+static int rtascons_put_delay = 100;
+module_param_named(put_delay, rtascons_put_delay, int, 0644);
+
+static inline int hvc_rtas_write_console(uint32_t vtermno, const char *buf, int count)
+{
+        int done;
+
+        /* if there is more than one character to be displayed, wait a bit */
+        for (done = 0; done < count; done++) {
+                int result;
+                result = rtas_call(rtascons_put_char_token, 1, 1, NULL, buf[done]);
+                if (result)
+                        break;
+        }
+        /* the calling routine expects to receive the number of bytes sent */
+        return done;
+}
+
+static int hvc_rtas_read_console(uint32_t vtermno, char *buf, int count)
+{
+        int i;
+
+        for (i = 0; i < count; i++) {
+                int c, err;
+
+                err = rtas_call(rtascons_get_char_token, 0, 2, &c);
+                if (err)
+                        break;
+
+                buf[i] = c;
+        }
+
+        return i;
+}
+
+static struct hv_ops hvc_rtas_get_put_ops = {
+        .get_chars = hvc_rtas_read_console,
+        .put_chars = hvc_rtas_write_console,
+};
+
+static int hvc_rtas_init(void)
+{
+        struct hvc_struct *hp;
+
+        if (rtascons_put_char_token == RTAS_UNKNOWN_SERVICE)
+                rtascons_put_char_token = rtas_token("put-term-char");
+        if (rtascons_put_char_token == RTAS_UNKNOWN_SERVICE)
+                return -EIO;
+
+        if (rtascons_get_char_token == RTAS_UNKNOWN_SERVICE)
+                rtascons_get_char_token = rtas_token("get-term-char");
+        if (rtascons_get_char_token == RTAS_UNKNOWN_SERVICE)
+                return -EIO;
+
+        BUG_ON(hvc_rtas_dev);
+
+        /* Allocate an hvc_struct for the console device we instantiated
+         * earlier.  Save off hp so that we can return it on exit */
+        hp = hvc_alloc(hvc_rtas_cookie, NO_IRQ, &hvc_rtas_get_put_ops);
+        if (IS_ERR(hp))
+                return PTR_ERR(hp);
+        hvc_rtas_dev = hp;
+        return 0;
+}
+module_init(hvc_rtas_init);
+
+/* This will tear down the tty portion of the driver */
+static void __exit hvc_rtas_exit(void)
+{
+        /* Really the fun isn't over until the worker thread breaks down and the
+         * tty cleans up */
+        if (hvc_rtas_dev)
+                hvc_remove(hvc_rtas_dev);
+}
+module_exit(hvc_rtas_exit);
+
+/* This will happen prior to module init.  There is no tty at this time? */
+static int hvc_rtas_console_init(void)
+{
+        rtascons_put_char_token = rtas_token("put-term-char");
+        if (rtascons_put_char_token == RTAS_UNKNOWN_SERVICE)
+                return -EIO;
+        rtascons_get_char_token = rtas_token("get-term-char");
+        if (rtascons_get_char_token == RTAS_UNKNOWN_SERVICE)
+                return -EIO;
+
+        hvc_instantiate(hvc_rtas_cookie, 0, &hvc_rtas_get_put_ops );
+        add_preferred_console("hvc", 0, NULL);
+        return 0;
+}
+console_initcall(hvc_rtas_console_init);
diff --git a/drivers/char/hvc_vio.c b/drivers/char/hvc_vio.c
index f5212eb2b4..9add81ceb4 100644
--- a/drivers/char/hvc_vio.c
+++ b/drivers/char/hvc_vio.c
@@ -31,10 +31,13 @@
 
 #include <linux/types.h>
 #include <linux/init.h>
+
 #include <asm/hvconsole.h>
 #include <asm/vio.h>
 #include <asm/prom.h>
 
+#include "hvc_console.h"
+
 char hvc_driver_name[] = "hvc_console";
 
 static struct vio_device_id hvc_driver_table[] __devinitdata = {
@@ -48,6 +51,14 @@ static int filtered_get_chars(uint32_t vtermno, char *buf, int count)
         unsigned long got;
         int i;
 
+        /*
+         * Vio firmware will read up to SIZE_VIO_GET_CHARS at its own discretion
+         * so we play safe and avoid the situation where got > count which could
+         * overload the flip buffer.
+         */
+        if (count < SIZE_VIO_GET_CHARS)
+                return -EAGAIN;
+
         got = hvc_get_chars(vtermno, buf, count);
 
         /*
diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c
index f7ac318565..327b00c3c4 100644
--- a/drivers/char/hvcs.c
+++ b/drivers/char/hvcs.c
@@ -439,7 +439,6 @@ static int hvcs_io(struct hvcs_struct *hvcsd)
         char buf[HVCS_BUFF_LEN] __ALIGNED__;
         unsigned long flags;
         int got = 0;
-        int i;
 
         spin_lock_irqsave(&hvcsd->lock, flags);
 
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index 7c0684deea..932feedda2 100644
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -90,7 +90,7 @@ static unsigned int ipmi_poll(struct file *file, poll_table *wait)
 
         spin_lock_irqsave(&priv->recv_msg_lock, flags);
 
-        if (! list_empty(&(priv->recv_msgs)))
+        if (!list_empty(&(priv->recv_msgs)))
                 mask |= (POLLIN | POLLRDNORM);
 
         spin_unlock_irqrestore(&priv->recv_msg_lock, flags);
@@ -789,21 +789,53 @@ MODULE_PARM_DESC(ipmi_major, "Sets the major number of the IPMI device.  By"
                  " interface.  Other values will set the major device number"
                  " to that value.");
 
+/* Keep track of the devices that are registered. */
+struct ipmi_reg_list {
+        dev_t            dev;
+        struct list_head link;
+};
+static LIST_HEAD(reg_list);
+static DEFINE_MUTEX(reg_list_mutex);
+
 static struct class *ipmi_class;
 
-static void ipmi_new_smi(int if_num)
+static void ipmi_new_smi(int if_num, struct device *device)
 {
         dev_t dev = MKDEV(ipmi_major, if_num);
+        struct ipmi_reg_list *entry;
 
         devfs_mk_cdev(dev, S_IFCHR | S_IRUSR | S_IWUSR,
                       "ipmidev/%d", if_num);
 
-        class_device_create(ipmi_class, NULL, dev, NULL, "ipmi%d", if_num);
+        entry = kmalloc(sizeof(*entry), GFP_KERNEL);
+        if (!entry) {
+                printk(KERN_ERR "ipmi_devintf: Unable to create the"
+                       " ipmi class device link\n");
+                return;
+        }
+        entry->dev = dev;
+
+        mutex_lock(&reg_list_mutex);
+        class_device_create(ipmi_class, NULL, dev, device, "ipmi%d", if_num);
+        list_add(&entry->link, &reg_list);
+        mutex_unlock(&reg_list_mutex);
 }
 
 static void ipmi_smi_gone(int if_num)
 {
-        class_device_destroy(ipmi_class, MKDEV(ipmi_major, if_num));
+        dev_t dev = MKDEV(ipmi_major, if_num);
+        struct ipmi_reg_list *entry;
+
+        mutex_lock(&reg_list_mutex);
+        list_for_each_entry(entry, &reg_list, link) {
+                if (entry->dev == dev) {
+                        list_del(&entry->link);
+                        kfree(entry);
+                        break;
+                }
+        }
+        class_device_destroy(ipmi_class, dev);
+        mutex_unlock(&reg_list_mutex);
         devfs_remove("ipmidev/%d", if_num);
 }
 
@@ -856,6 +888,14 @@ module_init(init_ipmi_devintf);
 
 static __exit void cleanup_ipmi(void)
 {
+        struct ipmi_reg_list *entry, *entry2;
+        mutex_lock(&reg_list_mutex);
+        list_for_each_entry_safe(entry, entry2, &reg_list, link) {
+                list_del(&entry->link);
+                class_device_destroy(ipmi_class, entry->dev);
+                kfree(entry);
+        }
+        mutex_unlock(&reg_list_mutex);
         class_destroy(ipmi_class);
         ipmi_smi_watcher_unregister(&smi_watcher);
         devfs_remove(DEVICE_NAME);
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index d745004281..40eb005b9d 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -48,7 +48,7 @@
 
 #define PFX "IPMI message handler: "
 
-#define IPMI_DRIVER_VERSION "38.0"
+#define IPMI_DRIVER_VERSION "39.0"
 
 static struct ipmi_recv_msg *ipmi_alloc_recv_msg(void);
 static int ipmi_init_msghandler(void);
@@ -162,6 +162,28 @@ struct ipmi_proc_entry
 };
 #endif
 
+struct bmc_device
+{
+        struct platform_device *dev;
+        struct ipmi_device_id  id;
+        unsigned char          guid[16];
+        int                    guid_set;
+
+        struct kref            refcount;
+
+        /* bmc device attributes */
+        struct device_attribute device_id_attr;
+        struct device_attribute provides_dev_sdrs_attr;
+        struct device_attribute revision_attr;
+        struct device_attribute firmware_rev_attr;
+        struct device_attribute version_attr;
+        struct device_attribute add_dev_support_attr;
+        struct device_attribute manufacturer_id_attr;
+        struct device_attribute product_id_attr;
+        struct device_attribute guid_attr;
+        struct device_attribute aux_firmware_rev_attr;
+};
+
 #define IPMI_IPMB_NUM_SEQ       64
 #define IPMI_MAX_CHANNELS       16
 struct ipmi_smi
@@ -178,9 +200,8 @@ struct ipmi_smi
         /* Used for wake ups at startup. */
         wait_queue_head_t waitq;
 
-        /* The IPMI version of the BMC on the other end. */
-        unsigned char       version_major;
-        unsigned char       version_minor;
+        struct bmc_device *bmc;
+        char *my_dev_name;
 
         /* This is the lower-layer's sender routine. */
         struct ipmi_smi_handlers *handlers;
@@ -194,6 +215,9 @@ struct ipmi_smi
         struct ipmi_proc_entry *proc_entries;
 #endif
 
+        /* Driver-model device for the system interface. */
+        struct device          *si_dev;
+
         /* A table of sequence numbers for this interface.  We use the
            sequence numbers for IPMB messages that go out of the
            interface to match them up with their responses.  A routine
@@ -312,6 +336,7 @@ struct ipmi_smi
         /* Events that were received with the proper format. */
         unsigned int events;
 };
+#define to_si_intf_from_dev(device) container_of(device, struct ipmi_smi, dev)
 
 /* Used to mark an interface entry that cannot be used but is not a
  * free entry, either, primarily used at creation and deletion time so
@@ -320,6 +345,15 @@ struct ipmi_smi
 #define IPMI_INVALID_INTERFACE(i) (((i) == NULL) \
                                    || (i == IPMI_INVALID_INTERFACE_ENTRY))
 
+/**
+ * The driver model view of the IPMI messaging driver.
+ */
+static struct device_driver ipmidriver = {
+        .name = "ipmi",
+        .bus = &platform_bus_type
+};
+static DEFINE_MUTEX(ipmidriver_mutex);
+
 #define MAX_IPMI_INTERFACES 4
 static ipmi_smi_t ipmi_interfaces[MAX_IPMI_INTERFACES];
 
@@ -393,7 +427,7 @@ int ipmi_smi_watcher_register(struct ipmi_smi_watcher *watcher)
                 if (IPMI_INVALID_INTERFACE(intf))
                         continue;
                 spin_unlock_irqrestore(&interfaces_lock, flags);
-                watcher->new_smi(i);
+                watcher->new_smi(i, intf->si_dev);
                 spin_lock_irqsave(&interfaces_lock, flags);
         }
         spin_unlock_irqrestore(&interfaces_lock, flags);
@@ -409,14 +443,14 @@ int ipmi_smi_watcher_unregister(struct ipmi_smi_watcher *watcher)
 }
 
 static void
-call_smi_watchers(int i)
+call_smi_watchers(int i, struct device *dev)
 {
         struct ipmi_smi_watcher *w;
 
         down_read(&smi_watchers_sem);
         list_for_each_entry(w, &smi_watchers, link) {
                 if (try_module_get(w->owner)) {
-                        w->new_smi(i);
+                        w->new_smi(i, dev);
                         module_put(w->owner);
                 }
         }
@@ -736,7 +770,8 @@ int ipmi_create_user(unsigned int          if_num,
         intf = ipmi_interfaces[if_num];
         if ((if_num >= MAX_IPMI_INTERFACES) || IPMI_INVALID_INTERFACE(intf)) {
                 spin_unlock_irqrestore(&interfaces_lock, flags);
-                return -EINVAL;
+                rv = -EINVAL;
+                goto out_kfree;
         }
 
         /* Note that each existing user holds a refcount to the interface. */
@@ -751,14 +786,14 @@ int ipmi_create_user(unsigned int          if_num,
 
         if (!try_module_get(intf->handlers->owner)) {
                 rv = -ENODEV;
-                goto out_err;
+                goto out_kref;
         }
 
         if (intf->handlers->inc_usecount) {
                 rv = intf->handlers->inc_usecount(intf->send_info);
                 if (rv) {
                         module_put(intf->handlers->owner);
-                        goto out_err;
+                        goto out_kref;
                 }
         }
 
@@ -769,9 +804,10 @@ int ipmi_create_user(unsigned int          if_num,
         *user = new_user;
         return 0;
 
- out_err:
-        kfree(new_user);
+out_kref:
         kref_put(&intf->refcount, intf_free);
+out_kfree:
+        kfree(new_user);
         return rv;
 }
 
@@ -842,8 +878,8 @@ void ipmi_get_version(ipmi_user_t   user,
                       unsigned char *major,
                       unsigned char *minor)
 {
-        *major = user->intf->version_major;
-        *minor = user->intf->version_minor;
+        *major = ipmi_version_major(&user->intf->bmc->id);
+        *minor = ipmi_version_minor(&user->intf->bmc->id);
 }
 
 int ipmi_set_my_address(ipmi_user_t   user,
@@ -1551,7 +1587,8 @@ static int version_file_read_proc(char *page, char **start, off_t off,
         ipmi_smi_t intf = data;
 
         return sprintf(out, "%d.%d\n",
-                       intf->version_major, intf->version_minor);
+                       ipmi_version_major(&intf->bmc->id),
+                       ipmi_version_minor(&intf->bmc->id));
 }
 
 static int stat_file_read_proc(char *page, char **start, off_t off,
@@ -1710,6 +1747,470 @@ static void remove_proc_entries(ipmi_smi_t smi)
 #endif /* CONFIG_PROC_FS */
 }
 
+static int __find_bmc_guid(struct device *dev, void *data)
+{
+        unsigned char *id = data;
+        struct bmc_device *bmc = dev_get_drvdata(dev);
+        return memcmp(bmc->guid, id, 16) == 0;
+}
+
+static struct bmc_device *ipmi_find_bmc_guid(struct device_driver *drv,
+                                             unsigned char *guid)
+{
+        struct device *dev;
+
+        dev = driver_find_device(drv, NULL, guid, __find_bmc_guid);
+        if (dev)
+                return dev_get_drvdata(dev);
+        else
+                return NULL;
+}
+
+struct prod_dev_id {
+        unsigned int  product_id;
+        unsigned char device_id;
+};
+
+static int __find_bmc_prod_dev_id(struct device *dev, void *data)
+{
+        struct prod_dev_id *id = data;
+        struct bmc_device *bmc = dev_get_drvdata(dev);
+
+        return (bmc->id.product_id == id->product_id
+                && bmc->id.product_id == id->product_id
+                && bmc->id.device_id == id->device_id);
+}
+
+static struct bmc_device *ipmi_find_bmc_prod_dev_id(
+        struct device_driver *drv,
+        unsigned char product_id, unsigned char device_id)
+{
+        struct prod_dev_id id = {
+                .product_id = product_id,
+                .device_id = device_id,
+        };
+        struct device *dev;
+
+        dev = driver_find_device(drv, NULL, &id, __find_bmc_prod_dev_id);
+        if (dev)
+                return dev_get_drvdata(dev);
+        else
+                return NULL;
+}
+
+static ssize_t device_id_show(struct device *dev,
+                              struct device_attribute *attr,
+                              char *buf)
+{
+        struct bmc_device *bmc = dev_get_drvdata(dev);
+
+        return snprintf(buf, 10, "%u\n", bmc->id.device_id);
+}
+
+static ssize_t provides_dev_sdrs_show(struct device *dev,
+                                      struct device_attribute *attr,
+                                      char *buf)
+{
+        struct bmc_device *bmc = dev_get_drvdata(dev);
+
+        return snprintf(buf, 10, "%u\n",
+                        bmc->id.device_revision && 0x80 >> 7);
+}
+
+static ssize_t revision_show(struct device *dev, struct device_attribute *attr,
+                             char *buf)
+{
+        struct bmc_device *bmc = dev_get_drvdata(dev);
+
+        return snprintf(buf, 20, "%u\n",
+                        bmc->id.device_revision && 0x0F);
+}
+
+static ssize_t firmware_rev_show(struct device *dev,
+                                 struct device_attribute *attr,
+                                 char *buf)
+{
+        struct bmc_device *bmc = dev_get_drvdata(dev);
+
+        return snprintf(buf, 20, "%u.%x\n", bmc->id.firmware_revision_1,
+                        bmc->id.firmware_revision_2);
+}
+
+static ssize_t ipmi_version_show(struct device *dev,
+                                 struct device_attribute *attr,
+                                 char *buf)
+{
+        struct bmc_device *bmc = dev_get_drvdata(dev);
+
+        return snprintf(buf, 20, "%u.%u\n",
+                        ipmi_version_major(&bmc->id),
+                        ipmi_version_minor(&bmc->id));
+}
+
+static ssize_t add_dev_support_show(struct device *dev,
+                                    struct device_attribute *attr,
+                                    char *buf)
+{
+        struct bmc_device *bmc = dev_get_drvdata(dev);
+
+        return snprintf(buf, 10, "0x%02x\n",
+                        bmc->id.additional_device_support);
+}
+
+static ssize_t manufacturer_id_show(struct device *dev,
+                                    struct device_attribute *attr,
+                                    char *buf)
+{
+        struct bmc_device *bmc = dev_get_drvdata(dev);
+
+        return snprintf(buf, 20, "0x%6.6x\n", bmc->id.manufacturer_id);
+}
+
+static ssize_t product_id_show(struct device *dev,
+                               struct device_attribute *attr,
+                               char *buf)
+{
+        struct bmc_device *bmc = dev_get_drvdata(dev);
+
+        return snprintf(buf, 10, "0x%4.4x\n", bmc->id.product_id);
+}
+
+static ssize_t aux_firmware_rev_show(struct device *dev,
+                                     struct device_attribute *attr,
+                                     char *buf)
+{
+        struct bmc_device *bmc = dev_get_drvdata(dev);
+
+        return snprintf(buf, 21, "0x%02x 0x%02x 0x%02x 0x%02x\n",
+                        bmc->id.aux_firmware_revision[3],
+                        bmc->id.aux_firmware_revision[2],
+                        bmc->id.aux_firmware_revision[1],
+                        bmc->id.aux_firmware_revision[0]);
+}
+
+static ssize_t guid_show(struct device *dev, struct device_attribute *attr,
+                         char *buf)
+{
+        struct bmc_device *bmc = dev_get_drvdata(dev);
+
+        return snprintf(buf, 100, "%Lx%Lx\n",
+                        (long long) bmc->guid[0],
+                        (long long) bmc->guid[8]);
+}
+
+static void
+cleanup_bmc_device(struct kref *ref)
+{
+        struct bmc_device *bmc;
+
+        bmc = container_of(ref, struct bmc_device, refcount);
+
+        device_remove_file(&bmc->dev->dev,
+                           &bmc->device_id_attr);
+        device_remove_file(&bmc->dev->dev,
+                           &bmc->provides_dev_sdrs_attr);
+        device_remove_file(&bmc->dev->dev,
+                           &bmc->revision_attr);
+        device_remove_file(&bmc->dev->dev,
+                           &bmc->firmware_rev_attr);
+        device_remove_file(&bmc->dev->dev,
+                           &bmc->version_attr);
+        device_remove_file(&bmc->dev->dev,
+                           &bmc->add_dev_support_attr);
+        device_remove_file(&bmc->dev->dev,
+                           &bmc->manufacturer_id_attr);
+        device_remove_file(&bmc->dev->dev,
+                           &bmc->product_id_attr);
+        if (bmc->id.aux_firmware_revision_set)
+                device_remove_file(&bmc->dev->dev,
+                                   &bmc->aux_firmware_rev_attr);
+        if (bmc->guid_set)
+                device_remove_file(&bmc->dev->dev,
+                                   &bmc->guid_attr);
+        platform_device_unregister(bmc->dev);
+        kfree(bmc);
+}
+
+static void ipmi_bmc_unregister(ipmi_smi_t intf)
+{
+        struct bmc_device *bmc = intf->bmc;
+
+        sysfs_remove_link(&intf->si_dev->kobj, "bmc");
+        if (intf->my_dev_name) {
+                sysfs_remove_link(&bmc->dev->dev.kobj, intf->my_dev_name);
+                kfree(intf->my_dev_name);
+                intf->my_dev_name = NULL;
+        }
+
+        mutex_lock(&ipmidriver_mutex);
+        kref_put(&bmc->refcount, cleanup_bmc_device);
+        mutex_unlock(&ipmidriver_mutex);
+}
+
+static int ipmi_bmc_register(ipmi_smi_t intf)
+{
+        int               rv;
+        struct bmc_device *bmc = intf->bmc;
+        struct bmc_device *old_bmc;
+        int               size;
+        char              dummy[1];
+
+        mutex_lock(&ipmidriver_mutex);
+
+        /*
+         * Try to find if there is an bmc_device struct
+         * representing the interfaced BMC already
+         */
+        if (bmc->guid_set)
+                old_bmc = ipmi_find_bmc_guid(&ipmidriver, bmc->guid);
+        else
+                old_bmc = ipmi_find_bmc_prod_dev_id(&ipmidriver,
+                                                    bmc->id.product_id,
+                                                    bmc->id.device_id);
+
+        /*
+         * If there is already an bmc_device, free the new one,
+         * otherwise register the new BMC device
+         */
+        if (old_bmc) {
+                kfree(bmc);
+                intf->bmc = old_bmc;
+                bmc = old_bmc;
+
+                kref_get(&bmc->refcount);
+                mutex_unlock(&ipmidriver_mutex);
+
+                printk(KERN_INFO
+                       "ipmi: interfacing existing BMC (man_id: 0x%6.6x,"
+                       " prod_id: 0x%4.4x, dev_id: 0x%2.2x)\n",
+                       bmc->id.manufacturer_id,
+                       bmc->id.product_id,
+                       bmc->id.device_id);
+        } else {
+                bmc->dev = platform_device_alloc("ipmi_bmc",
+                                                 bmc->id.device_id);
+                if (! bmc->dev) {
+                        printk(KERN_ERR
+                               "ipmi_msghandler:"
+                               " Unable to allocate platform device\n");
+                        return -ENOMEM;
+                }
+                bmc->dev->dev.driver = &ipmidriver;
+                dev_set_drvdata(&bmc->dev->dev, bmc);
+                kref_init(&bmc->refcount);
+
+                rv = platform_device_register(bmc->dev);
+                mutex_unlock(&ipmidriver_mutex);
+                if (rv) {
+                        printk(KERN_ERR
+                               "ipmi_msghandler:"
+                               " Unable to register bmc device: %d\n",
+                               rv);
+                        /* Don't go to out_err, you can only do that if
+                           the device is registered already. */
+                        return rv;
+                }
+
+                bmc->device_id_attr.attr.name = "device_id";
+                bmc->device_id_attr.attr.owner = THIS_MODULE;
+                bmc->device_id_attr.attr.mode = S_IRUGO;
+                bmc->device_id_attr.show = device_id_show;
+
+                bmc->provides_dev_sdrs_attr.attr.name = "provides_device_sdrs";
+                bmc->provides_dev_sdrs_attr.attr.owner = THIS_MODULE;
+                bmc->provides_dev_sdrs_attr.attr.mode = S_IRUGO;
+                bmc->provides_dev_sdrs_attr.show = provides_dev_sdrs_show;
+
+
+                bmc->revision_attr.attr.name = "revision";
+                bmc->revision_attr.attr.owner = THIS_MODULE;
+                bmc->revision_attr.attr.mode = S_IRUGO;
+                bmc->revision_attr.show = revision_show;
+
+                bmc->firmware_rev_attr.attr.name = "firmware_revision";
+                bmc->firmware_rev_attr.attr.owner = THIS_MODULE;
+                bmc->firmware_rev_attr.attr.mode = S_IRUGO;
+                bmc->firmware_rev_attr.show = firmware_rev_show;
+
+                bmc->version_attr.attr.name = "ipmi_version";
+                bmc->version_attr.attr.owner = THIS_MODULE;
+                bmc->version_attr.attr.mode = S_IRUGO;
+                bmc->version_attr.show = ipmi_version_show;
+
+                bmc->add_dev_support_attr.attr.name
+                        = "additional_device_support";
+                bmc->add_dev_support_attr.attr.owner = THIS_MODULE;
+                bmc->add_dev_support_attr.attr.mode = S_IRUGO;
+                bmc->add_dev_support_attr.show = add_dev_support_show;
+
+                bmc->manufacturer_id_attr.attr.name = "manufacturer_id";
+                bmc->manufacturer_id_attr.attr.owner = THIS_MODULE;
+                bmc->manufacturer_id_attr.attr.mode = S_IRUGO;
+                bmc->manufacturer_id_attr.show = manufacturer_id_show;
+
+                bmc->product_id_attr.attr.name = "product_id";
+                bmc->product_id_attr.attr.owner = THIS_MODULE;
+                bmc->product_id_attr.attr.mode = S_IRUGO;
+                bmc->product_id_attr.show = product_id_show;
+
+                bmc->guid_attr.attr.name = "guid";
+                bmc->guid_attr.attr.owner = THIS_MODULE;
+                bmc->guid_attr.attr.mode = S_IRUGO;
+                bmc->guid_attr.show = guid_show;
+
+                bmc->aux_firmware_rev_attr.attr.name = "aux_firmware_revision";
+                bmc->aux_firmware_rev_attr.attr.owner = THIS_MODULE;
+                bmc->aux_firmware_rev_attr.attr.mode = S_IRUGO;
+                bmc->aux_firmware_rev_attr.show = aux_firmware_rev_show;
+
+                device_create_file(&bmc->dev->dev,
+                                   &bmc->device_id_attr);
+                device_create_file(&bmc->dev->dev,
+                                   &bmc->provides_dev_sdrs_attr);
+                device_create_file(&bmc->dev->dev,
+                                   &bmc->revision_attr);
+                device_create_file(&bmc->dev->dev,
+                                   &bmc->firmware_rev_attr);
+                device_create_file(&bmc->dev->dev,
+                                   &bmc->version_attr);
+                device_create_file(&bmc->dev->dev,
+                                   &bmc->add_dev_support_attr);
+                device_create_file(&bmc->dev->dev,
+                                   &bmc->manufacturer_id_attr);
+                device_create_file(&bmc->dev->dev,
+                                   &bmc->product_id_attr);
+                if (bmc->id.aux_firmware_revision_set)
+                        device_create_file(&bmc->dev->dev,
+                                           &bmc->aux_firmware_rev_attr);
+                if (bmc->guid_set)
+                        device_create_file(&bmc->dev->dev,
+                                           &bmc->guid_attr);
+
+                printk(KERN_INFO
+                       "ipmi: Found new BMC (man_id: 0x%6.6x, "
+                       " prod_id: 0x%4.4x, dev_id: 0x%2.2x)\n",
+                       bmc->id.manufacturer_id,
+                       bmc->id.product_id,
+                       bmc->id.device_id);
+        }
+
+        /*
+         * create symlink from system interface device to bmc device
+         * and back.
+         */
+        rv = sysfs_create_link(&intf->si_dev->kobj,
+                               &bmc->dev->dev.kobj, "bmc");
+        if (rv) {
+                printk(KERN_ERR
+                       "ipmi_msghandler: Unable to create bmc symlink: %d\n",
+                       rv);
+                goto out_err;
+        }
+
+        size = snprintf(dummy, 0, "ipmi%d", intf->intf_num);
+        intf->my_dev_name = kmalloc(size+1, GFP_KERNEL);
+        if (!intf->my_dev_name) {
+                rv = -ENOMEM;
+                printk(KERN_ERR
+                       "ipmi_msghandler: allocate link from BMC: %d\n",
+                       rv);
+                goto out_err;
+        }
+        snprintf(intf->my_dev_name, size+1, "ipmi%d", intf->intf_num);
+
+        rv = sysfs_create_link(&bmc->dev->dev.kobj, &intf->si_dev->kobj,
+                               intf->my_dev_name);
+        if (rv) {
+                kfree(intf->my_dev_name);
+                intf->my_dev_name = NULL;
+                printk(KERN_ERR
+                       "ipmi_msghandler:"
+                       " Unable to create symlink to bmc: %d\n",
+                       rv);
+                goto out_err;
+        }
+
+        return 0;
+
+out_err:
+        ipmi_bmc_unregister(intf);
+        return rv;
+}
+
+static int
+send_guid_cmd(ipmi_smi_t intf, int chan)
+{
+        struct kernel_ipmi_msg            msg;
+        struct ipmi_system_interface_addr si;
+
+        si.addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
+        si.channel = IPMI_BMC_CHANNEL;
+        si.lun = 0;
+
+        msg.netfn = IPMI_NETFN_APP_REQUEST;
+        msg.cmd = IPMI_GET_DEVICE_GUID_CMD;
+        msg.data = NULL;
+        msg.data_len = 0;
+        return i_ipmi_request(NULL,
+                              intf,
+                              (struct ipmi_addr *) &si,
+                              0,
+                              &msg,
+                              intf,
+                              NULL,
+                              NULL,
+                              0,
+                              intf->channels[0].address,
+                              intf->channels[0].lun,
+                              -1, 0);
+}
+
+static void
+guid_handler(ipmi_smi_t intf, struct ipmi_recv_msg *msg)
+{
+        if ((msg->addr.addr_type != IPMI_SYSTEM_INTERFACE_ADDR_TYPE)
+            || (msg->msg.netfn != IPMI_NETFN_APP_RESPONSE)
+            || (msg->msg.cmd != IPMI_GET_DEVICE_GUID_CMD))
+                /* Not for me */
+                return;
+
+        if (msg->msg.data[0] != 0) {
+                /* Error from getting the GUID, the BMC doesn't have one. */
+                intf->bmc->guid_set = 0;
+                goto out;
+        }
+
+        if (msg->msg.data_len < 17) {
+                intf->bmc->guid_set = 0;
+                printk(KERN_WARNING PFX
+                       "guid_handler: The GUID response from the BMC was too"
+                       " short, it was %d but should have been 17.  Assuming"
+                       " GUID is not available.\n",
+                       msg->msg.data_len);
+                goto out;
+        }
+
+        memcpy(intf->bmc->guid, msg->msg.data, 16);
+        intf->bmc->guid_set = 1;
+ out:
+        wake_up(&intf->waitq);
+}
+
+static void
+get_guid(ipmi_smi_t intf)
+{
+        int rv;
+
+        intf->bmc->guid_set = 0x2;
+        intf->null_user_handler = guid_handler;
+        rv = send_guid_cmd(intf, 0);
+        if (rv)
+                /* Send failed, no GUID available. */
+                intf->bmc->guid_set = 0;
+        wait_event(intf->waitq, intf->bmc->guid_set != 2);
+        intf->null_user_handler = NULL;
+}
+
 static int
 send_channel_info_cmd(ipmi_smi_t intf, int chan)
 {
@@ -1802,8 +2303,8 @@ channel_handler(ipmi_smi_t intf, struct ipmi_recv_msg *msg)
 
 int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
                       void                     *send_info,
-                      unsigned char            version_major,
-                      unsigned char            version_minor,
+                      struct ipmi_device_id    *device_id,
+                      struct device            *si_dev,
                       unsigned char            slave_addr,
                       ipmi_smi_t               *new_intf)
 {
@@ -1811,7 +2312,11 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
         int              rv;
         ipmi_smi_t       intf;
         unsigned long    flags;
+        int              version_major;
+        int              version_minor;
 
+        version_major = ipmi_version_major(device_id);
+        version_minor = ipmi_version_minor(device_id);
 
         /* Make sure the driver is actually initialized, this handles
            problems with initialization order. */
@@ -1829,10 +2334,15 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
         if (!intf)
                 return -ENOMEM;
         memset(intf, 0, sizeof(*intf));
+        intf->bmc = kzalloc(sizeof(*intf->bmc), GFP_KERNEL);
+        if (!intf->bmc) {
+                kfree(intf);
+                return -ENOMEM;
+        }
         intf->intf_num = -1;
         kref_init(&intf->refcount);
-        intf->version_major = version_major;
-        intf->version_minor = version_minor;
+        intf->bmc->id = *device_id;
+        intf->si_dev = si_dev;
         for (j = 0; j < IPMI_MAX_CHANNELS; j++) {
                 intf->channels[j].address = IPMI_BMC_SLAVE_ADDR;
                 intf->channels[j].lun = 2;
@@ -1882,6 +2392,8 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
            caller before sending any messages with it. */
         *new_intf = intf;
 
+        get_guid(intf);
+
         if ((version_major > 1)
             || ((version_major == 1) && (version_minor >= 5)))
         {
@@ -1896,6 +2408,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
                 /* Wait for the channel info to be read. */
                 wait_event(intf->waitq,
                            intf->curr_channel >= IPMI_MAX_CHANNELS);
+                intf->null_user_handler = NULL;
         } else {
                 /* Assume a single IPMB channel at zero. */
                 intf->channels[0].medium = IPMI_CHANNEL_MEDIUM_IPMB;
@@ -1905,6 +2418,8 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
         if (rv == 0)
                 rv = add_proc_entries(intf, i);
 
+        rv = ipmi_bmc_register(intf);
+
  out:
         if (rv) {
                 if (intf->proc_dir)
@@ -1919,7 +2434,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
                 spin_lock_irqsave(&interfaces_lock, flags);
                 ipmi_interfaces[i] = intf;
                 spin_unlock_irqrestore(&interfaces_lock, flags);
-                call_smi_watchers(i);
+                call_smi_watchers(i, intf->si_dev);
         }
 
         return rv;
@@ -1931,6 +2446,8 @@ int ipmi_unregister_smi(ipmi_smi_t intf)
         struct ipmi_smi_watcher *w;
         unsigned long           flags;
 
+        ipmi_bmc_unregister(intf);
+
         spin_lock_irqsave(&interfaces_lock, flags);
         for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 if (ipmi_interfaces[i] == intf) {
@@ -3194,10 +3711,17 @@ static struct notifier_block panic_block = {
 static int ipmi_init_msghandler(void)
 {
         int i;
+        int rv;
 
         if (initialized)
                 return 0;
 
+        rv = driver_register(&ipmidriver);
+        if (rv) {
+                printk(KERN_ERR PFX "Could not register IPMI driver\n");
+                return rv;
+        }
+
         printk(KERN_INFO "ipmi message handler version "
                IPMI_DRIVER_VERSION "\n");
 
@@ -3220,7 +3744,7 @@ static int ipmi_init_msghandler(void)
         ipmi_timer.expires = jiffies + IPMI_TIMEOUT_JIFFIES;
         add_timer(&ipmi_timer);
 
-        notifier_chain_register(&panic_notifier_list, &panic_block);
+        atomic_notifier_chain_register(&panic_notifier_list, &panic_block);
 
         initialized = 1;
 
@@ -3240,7 +3764,7 @@ static __exit void cleanup_ipmi(void)
         if (!initialized)
                 return;
 
-        notifier_chain_unregister(&panic_notifier_list, &panic_block);
+        atomic_notifier_chain_unregister(&panic_notifier_list, &panic_block);
 
         /* This can't be called if any interfaces exist, so no worry about
            shutting down the interfaces. */
@@ -3254,6 +3778,8 @@ static __exit void cleanup_ipmi(void)
         remove_proc_entry(proc_ipmi_root->name, &proc_root);
 #endif /* CONFIG_PROC_FS */
 
+        driver_unregister(&ipmidriver);
+
         initialized = 0;
 
         /* Check for buffer leaks. */
diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c
index e8ed26b77d..786a2802ca 100644
--- a/drivers/char/ipmi/ipmi_poweroff.c
+++ b/drivers/char/ipmi/ipmi_poweroff.c
@@ -464,7 +464,7 @@ static void ipmi_poweroff_function (void)
 
 /* Wait for an IPMI interface to be installed, the first one installed
    will be grabbed by this code and used to perform the powerdown. */
-static void ipmi_po_new_smi(int if_num)
+static void ipmi_po_new_smi(int if_num, struct device *device)
 {
         struct ipmi_system_interface_addr smi_addr;
         struct kernel_ipmi_msg            send_msg;
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index e59b638766..35fbd4d8ed 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -52,6 +52,7 @@
 #include <linux/pci.h>
 #include <linux/ioport.h>
 #include <linux/notifier.h>
+#include <linux/mutex.h>
 #include <linux/kthread.h>
 #include <asm/irq.h>
 #ifdef CONFIG_HIGH_RES_TIMERS
@@ -109,21 +110,15 @@ enum si_intf_state {
 enum si_type {
     SI_KCS, SI_SMIC, SI_BT
 };
+static char *si_to_str[] = { "KCS", "SMIC", "BT" };
 
-struct ipmi_device_id {
-        unsigned char device_id;
-        unsigned char device_revision;
-        unsigned char firmware_revision_1;
-        unsigned char firmware_revision_2;
-        unsigned char ipmi_version;
-        unsigned char additional_device_support;
-        unsigned char manufacturer_id[3];
-        unsigned char product_id[2];
-        unsigned char aux_firmware_revision[4];
-} __attribute__((packed));
-
-#define ipmi_version_major(v) ((v)->ipmi_version & 0xf)
-#define ipmi_version_minor(v) ((v)->ipmi_version >> 4)
+#define DEVICE_NAME "ipmi_si"
+
+static struct device_driver ipmi_driver =
+{
+        .name = DEVICE_NAME,
+        .bus = &platform_bus_type
+};
 
 struct smi_info
 {
@@ -147,6 +142,9 @@ struct smi_info
         int (*irq_setup)(struct smi_info *info);
         void (*irq_cleanup)(struct smi_info *info);
         unsigned int io_size;
+        char *addr_source; /* ACPI, PCI, SMBIOS, hardcode, default. */
+        void (*addr_source_cleanup)(struct smi_info *info);
+        void *addr_source_data;
 
         /* Per-OEM handler, called from handle_flags().
            Returns 1 when handle_flags() needs to be re-run
@@ -203,8 +201,17 @@ struct smi_info
            interrupts. */
         int interrupt_disabled;
 
+        /* From the get device id response... */
         struct ipmi_device_id device_id;
 
+        /* Driver model stuff. */
+        struct device *dev;
+        struct platform_device *pdev;
+
+         /* True if we allocated the device, false if it came from
+          * someplace else (like PCI). */
+        int dev_registered;
+
         /* Slave address, could be reported from DMI. */
         unsigned char slave_addr;
 
@@ -224,12 +231,16 @@ struct smi_info
         unsigned long incoming_messages;
 
         struct task_struct *thread;
+
+        struct list_head link;
 };
 
-static struct notifier_block *xaction_notifier_list;
+static int try_smi_init(struct smi_info *smi);
+
+static ATOMIC_NOTIFIER_HEAD(xaction_notifier_list);
 static int register_xaction_notifier(struct notifier_block * nb)
 {
-        return notifier_chain_register(&xaction_notifier_list, nb);
+        return atomic_notifier_chain_register(&xaction_notifier_list, nb);
 }
 
 static void si_restart_short_timer(struct smi_info *smi_info);
@@ -271,13 +282,13 @@ static enum si_sm_result start_next_msg(struct smi_info *smi_info)
         spin_lock(&(smi_info->msg_lock));
 
         /* Pick the high priority queue first. */
-        if (! list_empty(&(smi_info->hp_xmit_msgs))) {
+        if (!list_empty(&(smi_info->hp_xmit_msgs))) {
                 entry = smi_info->hp_xmit_msgs.next;
-        } else if (! list_empty(&(smi_info->xmit_msgs))) {
+        } else if (!list_empty(&(smi_info->xmit_msgs))) {
                 entry = smi_info->xmit_msgs.next;
         }
 
-        if (! entry) {
+        if (!entry) {
                 smi_info->curr_msg = NULL;
                 rv = SI_SM_IDLE;
         } else {
@@ -291,7 +302,8 @@ static enum si_sm_result start_next_msg(struct smi_info *smi_info)
                 do_gettimeofday(&t);
                 printk("**Start2: %d.%9.9d\n", t.tv_sec, t.tv_usec);
 #endif
-                err = notifier_call_chain(&xaction_notifier_list, 0, smi_info);
+                err = atomic_notifier_call_chain(&xaction_notifier_list,
+                                0, smi_info);
                 if (err & NOTIFY_STOP_MASK) {
                         rv = SI_SM_CALL_WITHOUT_DELAY;
                         goto out;
@@ -344,7 +356,7 @@ static void start_clear_flags(struct smi_info *smi_info)
    memory, we will re-enable the interrupt. */
 static inline void disable_si_irq(struct smi_info *smi_info)
 {
-        if ((smi_info->irq) && (! smi_info->interrupt_disabled)) {
+        if ((smi_info->irq) && (!smi_info->interrupt_disabled)) {
                 disable_irq_nosync(smi_info->irq);
                 smi_info->interrupt_disabled = 1;
         }
@@ -375,7 +387,7 @@ static void handle_flags(struct smi_info *smi_info)
         } else if (smi_info->msg_flags & RECEIVE_MSG_AVAIL) {
                 /* Messages available. */
                 smi_info->curr_msg = ipmi_alloc_smi_msg();
-                if (! smi_info->curr_msg) {
+                if (!smi_info->curr_msg) {
                         disable_si_irq(smi_info);
                         smi_info->si_state = SI_NORMAL;
                         return;
@@ -394,7 +406,7 @@ static void handle_flags(struct smi_info *smi_info)
         } else if (smi_info->msg_flags & EVENT_MSG_BUFFER_FULL) {
                 /* Events available. */
                 smi_info->curr_msg = ipmi_alloc_smi_msg();
-                if (! smi_info->curr_msg) {
+                if (!smi_info->curr_msg) {
                         disable_si_irq(smi_info);
                         smi_info->si_state = SI_NORMAL;
                         return;
@@ -430,7 +442,7 @@ static void handle_transaction_done(struct smi_info *smi_info)
 #endif
         switch (smi_info->si_state) {
         case SI_NORMAL:
-                if (! smi_info->curr_msg)
+                if (!smi_info->curr_msg)
                         break;
 
                 smi_info->curr_msg->rsp_size
@@ -880,7 +892,7 @@ static void smi_timeout(unsigned long data)
 
         smi_info->last_timeout_jiffies = jiffies_now;
 
-        if ((smi_info->irq) && (! smi_info->interrupt_disabled)) {
+        if ((smi_info->irq) && (!smi_info->interrupt_disabled)) {
                 /* Running with interrupts, only do long timeouts. */
                 smi_info->si_timer.expires = jiffies + SI_TIMEOUT_JIFFIES;
                 spin_lock_irqsave(&smi_info->count_lock, flags);
@@ -974,15 +986,10 @@ static struct ipmi_smi_handlers handlers =
    a default IO port, and 1 ACPI/SPMI address.  That sets SI_MAX_DRIVERS */
 
 #define SI_MAX_PARMS 4
-#define SI_MAX_DRIVERS ((SI_MAX_PARMS * 2) + 2)
-static struct smi_info *smi_infos[SI_MAX_DRIVERS] =
-{ NULL, NULL, NULL, NULL };
+static LIST_HEAD(smi_infos);
+static DECLARE_MUTEX(smi_infos_lock);
+static int smi_num; /* Used to sequence the SMIs */
 
-#define DEVICE_NAME "ipmi_si"
-
-#define DEFAULT_KCS_IO_PORT     0xca2
-#define DEFAULT_SMIC_IO_PORT    0xca9
-#define DEFAULT_BT_IO_PORT      0xe4
 #define DEFAULT_REGSPACING      1
 
 static int           si_trydefaults = 1;
@@ -1053,38 +1060,23 @@ MODULE_PARM_DESC(slave_addrs, "Set the default IPMB slave address for"
                  " by interface number.");
 
 
+#define IPMI_IO_ADDR_SPACE  0
 #define IPMI_MEM_ADDR_SPACE 1
-#define IPMI_IO_ADDR_SPACE  2
+static char *addr_space_to_str[] = { "I/O", "memory" };
 
-#if defined(CONFIG_ACPI) || defined(CONFIG_DMI) || defined(CONFIG_PCI)
-static int is_new_interface(int intf, u8 addr_space, unsigned long base_addr)
+static void std_irq_cleanup(struct smi_info *info)
 {
-        int i;
-
-        for (i = 0; i < SI_MAX_PARMS; ++i) {
-                /* Don't check our address. */
-                if (i == intf)
-                        continue;
-                if (si_type[i] != NULL) {
-                        if ((addr_space == IPMI_MEM_ADDR_SPACE &&
-                             base_addr == addrs[i]) ||
-                            (addr_space == IPMI_IO_ADDR_SPACE &&
-                             base_addr == ports[i]))
-                                return 0;
-                }
-                else
-                        break;
-        }
-
-        return 1;
+        if (info->si_type == SI_BT)
+                /* Disable the interrupt in the BT interface. */
+                info->io.outputb(&info->io, IPMI_BT_INTMASK_REG, 0);
+        free_irq(info->irq, info);
 }
-#endif
 
 static int std_irq_setup(struct smi_info *info)
 {
         int rv;
 
-        if (! info->irq)
+        if (!info->irq)
                 return 0;
 
         if (info->si_type == SI_BT) {
@@ -1093,7 +1085,7 @@ static int std_irq_setup(struct smi_info *info)
                                  SA_INTERRUPT,
                                  DEVICE_NAME,
                                  info);
-                if (! rv)
+                if (!rv)
                         /* Enable the interrupt in the BT interface. */
                         info->io.outputb(&info->io, IPMI_BT_INTMASK_REG,
                                          IPMI_BT_INTMASK_ENABLE_IRQ_BIT);
@@ -1110,88 +1102,77 @@ static int std_irq_setup(struct smi_info *info)
                        DEVICE_NAME, info->irq);
                 info->irq = 0;
         } else {
+                info->irq_cleanup = std_irq_cleanup;
                 printk("  Using irq %d\n", info->irq);
         }
 
         return rv;
 }
 
-static void std_irq_cleanup(struct smi_info *info)
-{
-        if (! info->irq)
-                return;
-
-        if (info->si_type == SI_BT)
-                /* Disable the interrupt in the BT interface. */
-                info->io.outputb(&info->io, IPMI_BT_INTMASK_REG, 0);
-        free_irq(info->irq, info);
-}
-
 static unsigned char port_inb(struct si_sm_io *io, unsigned int offset)
 {
-        unsigned int *addr = io->info;
+        unsigned int addr = io->addr_data;
 
-        return inb((*addr)+(offset*io->regspacing));
+        return inb(addr + (offset * io->regspacing));
 }
 
 static void port_outb(struct si_sm_io *io, unsigned int offset,
                       unsigned char b)
 {
-        unsigned int *addr = io->info;
+        unsigned int addr = io->addr_data;
 
-        outb(b, (*addr)+(offset * io->regspacing));
+        outb(b, addr + (offset * io->regspacing));
 }
 
 static unsigned char port_inw(struct si_sm_io *io, unsigned int offset)
 {
-        unsigned int *addr = io->info;
+        unsigned int addr = io->addr_data;
 
-        return (inw((*addr)+(offset * io->regspacing)) >> io->regshift) & 0xff;
+        return (inw(addr + (offset * io->regspacing)) >> io->regshift) & 0xff;
 }
 
 static void port_outw(struct si_sm_io *io, unsigned int offset,
                       unsigned char b)
 {
-        unsigned int *addr = io->info;
+        unsigned int addr = io->addr_data;
 
-        outw(b << io->regshift, (*addr)+(offset * io->regspacing));
+        outw(b << io->regshift, addr + (offset * io->regspacing));
 }
 
 static unsigned char port_inl(struct si_sm_io *io, unsigned int offset)
 {
-        unsigned int *addr = io->info;
+        unsigned int addr = io->addr_data;
 
-        return (inl((*addr)+(offset * io->regspacing)) >> io->regshift) & 0xff;
+        return (inl(addr + (offset * io->regspacing)) >> io->regshift) & 0xff;
 }
 
 static void port_outl(struct si_sm_io *io, unsigned int offset,
                       unsigned char b)
 {
-        unsigned int *addr = io->info;
+        unsigned int addr = io->addr_data;
 
-        outl(b << io->regshift, (*addr)+(offset * io->regspacing));
+        outl(b << io->regshift, addr+(offset * io->regspacing));
 }
 
 static void port_cleanup(struct smi_info *info)
 {
-        unsigned int *addr = info->io.info;
-        int           mapsize;
+        unsigned int addr = info->io.addr_data;
+        int          mapsize;
 
-        if (addr && (*addr)) {
+        if (addr) {
                 mapsize = ((info->io_size * info->io.regspacing)
                            - (info->io.regspacing - info->io.regsize));
 
-                release_region (*addr, mapsize);
+                release_region (addr, mapsize);
         }
-        kfree(info);
 }
 
 static int port_setup(struct smi_info *info)
 {
-        unsigned int *addr = info->io.info;
-        int           mapsize;
+        unsigned int addr = info->io.addr_data;
+        int          mapsize;
 
-        if (! addr || (! *addr))
+        if (!addr)
                 return -ENODEV;
 
         info->io_cleanup = port_cleanup;
@@ -1225,51 +1206,11 @@ static int port_setup(struct smi_info *info)
         mapsize = ((info->io_size * info->io.regspacing)
                    - (info->io.regspacing - info->io.regsize));
 
-        if (request_region(*addr, mapsize, DEVICE_NAME) == NULL)
+        if (request_region(addr, mapsize, DEVICE_NAME) == NULL)
                 return -EIO;
         return 0;
 }
 
-static int try_init_port(int intf_num, struct smi_info **new_info)
-{
-        struct smi_info *info;
-
-        if (! ports[intf_num])
-                return -ENODEV;
-
-        if (! is_new_interface(intf_num, IPMI_IO_ADDR_SPACE,
-                              ports[intf_num]))
-                return -ENODEV;
-
-        info = kmalloc(sizeof(*info), GFP_KERNEL);
-        if (! info) {
-                printk(KERN_ERR "ipmi_si: Could not allocate SI data (1)\n");
-                return -ENOMEM;
-        }
-        memset(info, 0, sizeof(*info));
-
-        info->io_setup = port_setup;
-        info->io.info = &(ports[intf_num]);
-        info->io.addr = NULL;
-        info->io.regspacing = regspacings[intf_num];
-        if (! info->io.regspacing)
-                info->io.regspacing = DEFAULT_REGSPACING;
-        info->io.regsize = regsizes[intf_num];
-        if (! info->io.regsize)
-                info->io.regsize = DEFAULT_REGSPACING;
-        info->io.regshift = regshifts[intf_num];
-        info->irq = 0;
-        info->irq_setup = NULL;
-        *new_info = info;
-
-        if (si_type[intf_num] == NULL)
-                si_type[intf_num] = "kcs";
-
-        printk("ipmi_si: Trying \"%s\" at I/O port 0x%x\n",
-               si_type[intf_num], ports[intf_num]);
-        return 0;
-}
-
 static unsigned char intf_mem_inb(struct si_sm_io *io, unsigned int offset)
 {
         return readb((io->addr)+(offset * io->regspacing));
@@ -1321,7 +1262,7 @@ static void mem_outq(struct si_sm_io *io, unsigned int offset,
 
 static void mem_cleanup(struct smi_info *info)
 {
-        unsigned long *addr = info->io.info;
+        unsigned long addr = info->io.addr_data;
         int           mapsize;
 
         if (info->io.addr) {
@@ -1330,17 +1271,16 @@ static void mem_cleanup(struct smi_info *info)
                 mapsize = ((info->io_size * info->io.regspacing)
                            - (info->io.regspacing - info->io.regsize));
 
-                release_mem_region(*addr, mapsize);
+                release_mem_region(addr, mapsize);
         }
-        kfree(info);
 }
 
 static int mem_setup(struct smi_info *info)
 {
-        unsigned long *addr = info->io.info;
+        unsigned long addr = info->io.addr_data;
         int           mapsize;
 
-        if (! addr || (! *addr))
+        if (!addr)
                 return -ENODEV;
 
         info->io_cleanup = mem_cleanup;
@@ -1380,57 +1320,83 @@ static int mem_setup(struct smi_info *info)
         mapsize = ((info->io_size * info->io.regspacing)
                    - (info->io.regspacing - info->io.regsize));
 
-        if (request_mem_region(*addr, mapsize, DEVICE_NAME) == NULL)
+        if (request_mem_region(addr, mapsize, DEVICE_NAME) == NULL)
                 return -EIO;
 
-        info->io.addr = ioremap(*addr, mapsize);
+        info->io.addr = ioremap(addr, mapsize);
         if (info->io.addr == NULL) {
-                release_mem_region(*addr, mapsize);
+                release_mem_region(addr, mapsize);
                 return -EIO;
         }
         return 0;
 }
 
-static int try_init_mem(int intf_num, struct smi_info **new_info)
+
+static __devinit void hardcode_find_bmc(void)
 {
+        int             i;
         struct smi_info *info;
 
-        if (! addrs[intf_num])
-                return -ENODEV;
+        for (i = 0; i < SI_MAX_PARMS; i++) {
+                if (!ports[i] && !addrs[i])
+                        continue;
 
-        if (! is_new_interface(intf_num, IPMI_MEM_ADDR_SPACE,
-                              addrs[intf_num]))
-                return -ENODEV;
+                info = kzalloc(sizeof(*info), GFP_KERNEL);
+                if (!info)
+                        return;
 
-        info = kmalloc(sizeof(*info), GFP_KERNEL);
-        if (! info) {
-                printk(KERN_ERR "ipmi_si: Could not allocate SI data (2)\n");
-                return -ENOMEM;
-        }
-        memset(info, 0, sizeof(*info));
+                info->addr_source = "hardcoded";
 
-        info->io_setup = mem_setup;
-        info->io.info = &addrs[intf_num];
-        info->io.addr = NULL;
-        info->io.regspacing = regspacings[intf_num];
-        if (! info->io.regspacing)
-                info->io.regspacing = DEFAULT_REGSPACING;
-        info->io.regsize = regsizes[intf_num];
-        if (! info->io.regsize)
-                info->io.regsize = DEFAULT_REGSPACING;
-        info->io.regshift = regshifts[intf_num];
-        info->irq = 0;
-        info->irq_setup = NULL;
-        *new_info = info;
+                if (!si_type[i] || strcmp(si_type[i], "kcs") == 0) {
+                        info->si_type = SI_KCS;
+                } else if (strcmp(si_type[i], "smic") == 0) {
+                        info->si_type = SI_SMIC;
+                } else if (strcmp(si_type[i], "bt") == 0) {
+                        info->si_type = SI_BT;
+                } else {
+                        printk(KERN_WARNING
+                               "ipmi_si: Interface type specified "
+                               "for interface %d, was invalid: %s\n",
+                               i, si_type[i]);
+                        kfree(info);
+                        continue;
+                }
 
-        if (si_type[intf_num] == NULL)
-                si_type[intf_num] = "kcs";
+                if (ports[i]) {
+                        /* An I/O port */
+                        info->io_setup = port_setup;
+                        info->io.addr_data = ports[i];
+                        info->io.addr_type = IPMI_IO_ADDR_SPACE;
+                } else if (addrs[i]) {
+                        /* A memory port */
+                        info->io_setup = mem_setup;
+                        info->io.addr_data = addrs[i];
+                        info->io.addr_type = IPMI_MEM_ADDR_SPACE;
+                } else {
+                        printk(KERN_WARNING
+                               "ipmi_si: Interface type specified "
+                               "for interface %d, "
+                               "but port and address were not set or "
+                               "set to zero.\n", i);
+                        kfree(info);
+                        continue;
+                }
 
-        printk("ipmi_si: Trying \"%s\" at memory address 0x%lx\n",
-               si_type[intf_num], addrs[intf_num]);
-        return 0;
-}
+                info->io.addr = NULL;
+                info->io.regspacing = regspacings[i];
+                if (!info->io.regspacing)
+                        info->io.regspacing = DEFAULT_REGSPACING;
+                info->io.regsize = regsizes[i];
+                if (!info->io.regsize)
+                        info->io.regsize = DEFAULT_REGSPACING;
+                info->io.regshift = regshifts[i];
+                info->irq = irqs[i];
+                if (info->irq)
+                        info->irq_setup = std_irq_setup;
 
+                try_smi_init(info);
+        }
+}
 
 #ifdef CONFIG_ACPI
 
@@ -1470,11 +1436,19 @@ static u32 ipmi_acpi_gpe(void *context)
         return ACPI_INTERRUPT_HANDLED;
 }
 
+static void acpi_gpe_irq_cleanup(struct smi_info *info)
+{
+        if (!info->irq)
+                return;
+
+        acpi_remove_gpe_handler(NULL, info->irq, &ipmi_acpi_gpe);
+}
+
 static int acpi_gpe_irq_setup(struct smi_info *info)
 {
         acpi_status status;
 
-        if (! info->irq)
+        if (!info->irq)
                 return 0;
 
         /* FIXME - is level triggered right? */
@@ -1491,19 +1465,12 @@ static int acpi_gpe_irq_setup(struct smi_info *info)
                 info->irq = 0;
                 return -EINVAL;
         } else {
+                info->irq_cleanup = acpi_gpe_irq_cleanup;
                 printk("  Using ACPI GPE %d\n", info->irq);
                 return 0;
         }
 }
 
-static void acpi_gpe_irq_cleanup(struct smi_info *info)
-{
-        if (! info->irq)
-                return;
-
-        acpi_remove_gpe_handler(NULL, info->irq, &ipmi_acpi_gpe);
-}
-
 /*
  * Defined at
  * http://h21007.www2.hp.com/dspp/files/unprotected/devresource/Docs/TechPapers/IA64/hpspmi.pdf
@@ -1546,28 +1513,12 @@ struct SPMITable {
         s8      spmi_id[1]; /* A '\0' terminated array starts here. */
 };
 
-static int try_init_acpi(int intf_num, struct smi_info **new_info)
+static __devinit int try_init_acpi(struct SPMITable *spmi)
 {
         struct smi_info  *info;
-        acpi_status      status;
-        struct SPMITable *spmi;
         char             *io_type;
         u8               addr_space;
 
-        if (acpi_disabled)
-                return -ENODEV;
-
-        if (acpi_failure)
-                return -ENODEV;
-
-        status = acpi_get_firmware_table("SPMI", intf_num+1,
-                                         ACPI_LOGICAL_ADDRESSING,
-                                         (struct acpi_table_header **) &spmi);
-        if (status != AE_OK) {
-                acpi_failure = 1;
-                return -ENODEV;
-        }
-
         if (spmi->IPMIlegacy != 1) {
             printk(KERN_INFO "IPMI: Bad SPMI legacy %d\n", spmi->IPMIlegacy);
             return -ENODEV;
@@ -1577,47 +1528,42 @@ static int try_init_acpi(int intf_num, struct smi_info **new_info)
                 addr_space = IPMI_MEM_ADDR_SPACE;
         else
                 addr_space = IPMI_IO_ADDR_SPACE;
-        if (! is_new_interface(-1, addr_space, spmi->addr.address))
-                return -ENODEV;
+
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        if (!info) {
+                printk(KERN_ERR "ipmi_si: Could not allocate SI data (3)\n");
+                return -ENOMEM;
+        }
+
+        info->addr_source = "ACPI";
 
         /* Figure out the interface type. */
         switch (spmi->InterfaceType)
         {
         case 1: /* KCS */
-                si_type[intf_num] = "kcs";
+                info->si_type = SI_KCS;
                 break;
-
         case 2: /* SMIC */
-                si_type[intf_num] = "smic";
+                info->si_type = SI_SMIC;
                 break;
-
         case 3: /* BT */
-                si_type[intf_num] = "bt";
+                info->si_type = SI_BT;
                 break;
-
         default:
                 printk(KERN_INFO "ipmi_si: Unknown ACPI/SPMI SI type %d\n",
                         spmi->InterfaceType);
+                kfree(info);
                 return -EIO;
         }
 
-        info = kmalloc(sizeof(*info), GFP_KERNEL);
-        if (! info) {
-                printk(KERN_ERR "ipmi_si: Could not allocate SI data (3)\n");
-                return -ENOMEM;
-        }
-        memset(info, 0, sizeof(*info));
-
         if (spmi->InterruptType & 1) {
                 /* We've got a GPE interrupt. */
                 info->irq = spmi->GPE;
                 info->irq_setup = acpi_gpe_irq_setup;
-                info->irq_cleanup = acpi_gpe_irq_cleanup;
         } else if (spmi->InterruptType & 2) {
                 /* We've got an APIC/SAPIC interrupt. */
                 info->irq = spmi->GlobalSystemInterrupt;
                 info->irq_setup = std_irq_setup;
-                info->irq_cleanup = std_irq_cleanup;
         } else {
                 /* Use the default interrupt setting. */
                 info->irq = 0;
@@ -1626,43 +1572,60 @@ static int try_init_acpi(int intf_num, struct smi_info **new_info)
 
         if (spmi->addr.register_bit_width) {
                 /* A (hopefully) properly formed register bit width. */
-                regspacings[intf_num] = spmi->addr.register_bit_width / 8;
                 info->io.regspacing = spmi->addr.register_bit_width / 8;
         } else {
-                regspacings[intf_num] = DEFAULT_REGSPACING;
                 info->io.regspacing = DEFAULT_REGSPACING;
         }
-        regsizes[intf_num] = regspacings[intf_num];
-        info->io.regsize = regsizes[intf_num];
-        regshifts[intf_num] = spmi->addr.register_bit_offset;
-        info->io.regshift = regshifts[intf_num];
+        info->io.regsize = info->io.regspacing;
+        info->io.regshift = spmi->addr.register_bit_offset;
 
         if (spmi->addr.address_space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
                 io_type = "memory";
                 info->io_setup = mem_setup;
-                addrs[intf_num] = spmi->addr.address;
-                info->io.info = &(addrs[intf_num]);
+                info->io.addr_type = IPMI_IO_ADDR_SPACE;
         } else if (spmi->addr.address_space_id == ACPI_ADR_SPACE_SYSTEM_IO) {
                 io_type = "I/O";
                 info->io_setup = port_setup;
-                ports[intf_num] = spmi->addr.address;
-                info->io.info = &(ports[intf_num]);
+                info->io.addr_type = IPMI_MEM_ADDR_SPACE;
         } else {
                 kfree(info);
                 printk("ipmi_si: Unknown ACPI I/O Address type\n");
                 return -EIO;
         }
+        info->io.addr_data = spmi->addr.address;
 
-        *new_info = info;
+        try_smi_init(info);
 
-        printk("ipmi_si: ACPI/SPMI specifies \"%s\" %s SI @ 0x%lx\n",
-               si_type[intf_num], io_type, (unsigned long) spmi->addr.address);
         return 0;
 }
+
+static __devinit void acpi_find_bmc(void)
+{
+        acpi_status      status;
+        struct SPMITable *spmi;
+        int              i;
+
+        if (acpi_disabled)
+                return;
+
+        if (acpi_failure)
+                return;
+
+        for (i = 0; ; i++) {
+                status = acpi_get_firmware_table("SPMI", i+1,
+                                                 ACPI_LOGICAL_ADDRESSING,
+                                                 (struct acpi_table_header **)
+                                                 &spmi);
+                if (status != AE_OK)
+                        return;
+
+                try_init_acpi(spmi);
+        }
+}
 #endif
 
 #ifdef CONFIG_DMI
-typedef struct dmi_ipmi_data
+struct dmi_ipmi_data
 {
         u8              type;
         u8              addr_space;
@@ -1670,49 +1633,46 @@ typedef struct dmi_ipmi_data
         u8              irq;
         u8              offset;
         u8              slave_addr;
-} dmi_ipmi_data_t;
-
-static dmi_ipmi_data_t dmi_data[SI_MAX_DRIVERS];
-static int dmi_data_entries;
+};
 
-static int __init decode_dmi(struct dmi_header *dm, int intf_num)
+static int __devinit decode_dmi(struct dmi_header *dm,
+                                struct dmi_ipmi_data *dmi)
 {
         u8              *data = (u8 *)dm;
         unsigned long   base_addr;
         u8              reg_spacing;
         u8              len = dm->length;
-        dmi_ipmi_data_t *ipmi_data = dmi_data+intf_num;
 
-        ipmi_data->type = data[4];
+        dmi->type = data[4];
 
         memcpy(&base_addr, data+8, sizeof(unsigned long));
         if (len >= 0x11) {
                 if (base_addr & 1) {
                         /* I/O */
                         base_addr &= 0xFFFE;
-                        ipmi_data->addr_space = IPMI_IO_ADDR_SPACE;
+                        dmi->addr_space = IPMI_IO_ADDR_SPACE;
                 }
                 else {
                         /* Memory */
-                        ipmi_data->addr_space = IPMI_MEM_ADDR_SPACE;
+                        dmi->addr_space = IPMI_MEM_ADDR_SPACE;
                 }
                 /* If bit 4 of byte 0x10 is set, then the lsb for the address
                    is odd. */
-                ipmi_data->base_addr = base_addr | ((data[0x10] & 0x10) >> 4);
+                dmi->base_addr = base_addr | ((data[0x10] & 0x10) >> 4);
 
-                ipmi_data->irq = data[0x11];
+                dmi->irq = data[0x11];
 
                 /* The top two bits of byte 0x10 hold the register spacing. */
                 reg_spacing = (data[0x10] & 0xC0) >> 6;
                 switch(reg_spacing){
                 case 0x00: /* Byte boundaries */
-                    ipmi_data->offset = 1;
+                    dmi->offset = 1;
                     break;
                 case 0x01: /* 32-bit boundaries */
-                    ipmi_data->offset = 4;
+                    dmi->offset = 4;
                     break;
                 case 0x02: /* 16-byte boundaries */
-                    ipmi_data->offset = 16;
+                    dmi->offset = 16;
                     break;
                 default:
                     /* Some other interface, just ignore it. */
@@ -1726,217 +1686,227 @@ static int __init decode_dmi(struct dmi_header *dm, int intf_num)
                  * wrong (and all that I have seen are I/O) so we just
                  * ignore that bit and assume I/O.  Systems that use
                  * memory should use the newer spec, anyway. */
-                ipmi_data->base_addr = base_addr & 0xfffe;
-                ipmi_data->addr_space = IPMI_IO_ADDR_SPACE;
-                ipmi_data->offset = 1;
-        }
-
-        ipmi_data->slave_addr = data[6];
-
-        if (is_new_interface(-1, ipmi_data->addr_space,ipmi_data->base_addr)) {
-                dmi_data_entries++;
-                return 0;
+                dmi->base_addr = base_addr & 0xfffe;
+                dmi->addr_space = IPMI_IO_ADDR_SPACE;
+                dmi->offset = 1;
         }
 
-        memset(ipmi_data, 0, sizeof(dmi_ipmi_data_t));
+        dmi->slave_addr = data[6];
 
-        return -1;
+        return 0;
 }
 
-static void __init dmi_find_bmc(void)
+static __devinit void try_init_dmi(struct dmi_ipmi_data *ipmi_data)
 {
-        struct dmi_device *dev = NULL;
-        int               intf_num = 0;
-
-        while ((dev = dmi_find_device(DMI_DEV_TYPE_IPMI, NULL, dev))) {
-                if (intf_num >= SI_MAX_DRIVERS)
-                        break;
+        struct smi_info *info;
 
-                decode_dmi((struct dmi_header *) dev->device_data, intf_num++);
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        if (!info) {
+                printk(KERN_ERR
+                       "ipmi_si: Could not allocate SI data\n");
+                return;
         }
-}
-
-static int try_init_smbios(int intf_num, struct smi_info **new_info)
-{
-        struct smi_info *info;
-        dmi_ipmi_data_t *ipmi_data = dmi_data+intf_num;
-        char            *io_type;
 
-        if (intf_num >= dmi_data_entries)
-                return -ENODEV;
+        info->addr_source = "SMBIOS";
 
         switch (ipmi_data->type) {
-                case 0x01: /* KCS */
-                        si_type[intf_num] = "kcs";
-                        break;
-                case 0x02: /* SMIC */
-                        si_type[intf_num] = "smic";
-                        break;
-                case 0x03: /* BT */
-                        si_type[intf_num] = "bt";
-                        break;
-                default:
-                        return -EIO;
-        }
-
-        info = kmalloc(sizeof(*info), GFP_KERNEL);
-        if (! info) {
-                printk(KERN_ERR "ipmi_si: Could not allocate SI data (4)\n");
-                return -ENOMEM;
+        case 0x01: /* KCS */
+                info->si_type = SI_KCS;
+                break;
+        case 0x02: /* SMIC */
+                info->si_type = SI_SMIC;
+                break;
+        case 0x03: /* BT */
+                info->si_type = SI_BT;
+                break;
+        default:
+                return;
         }
-        memset(info, 0, sizeof(*info));
 
-        if (ipmi_data->addr_space == 1) {
-                io_type = "memory";
+        switch (ipmi_data->addr_space) {
+        case IPMI_MEM_ADDR_SPACE:
                 info->io_setup = mem_setup;
-                addrs[intf_num] = ipmi_data->base_addr;
-                info->io.info = &(addrs[intf_num]);
-        } else if (ipmi_data->addr_space == 2) {
-                io_type = "I/O";
+                info->io.addr_type = IPMI_MEM_ADDR_SPACE;
+                break;
+
+        case IPMI_IO_ADDR_SPACE:
                 info->io_setup = port_setup;
-                ports[intf_num] = ipmi_data->base_addr;
-                info->io.info = &(ports[intf_num]);
-        } else {
+                info->io.addr_type = IPMI_IO_ADDR_SPACE;
+                break;
+
+        default:
                 kfree(info);
-                printk("ipmi_si: Unknown SMBIOS I/O Address type.\n");
-                return -EIO;
+                printk(KERN_WARNING
+                       "ipmi_si: Unknown SMBIOS I/O Address type: %d.\n",
+                       ipmi_data->addr_space);
+                return;
         }
+        info->io.addr_data = ipmi_data->base_addr;
 
-        regspacings[intf_num] = ipmi_data->offset;
-        info->io.regspacing = regspacings[intf_num];
-        if (! info->io.regspacing)
+        info->io.regspacing = ipmi_data->offset;
+        if (!info->io.regspacing)
                 info->io.regspacing = DEFAULT_REGSPACING;
         info->io.regsize = DEFAULT_REGSPACING;
-        info->io.regshift = regshifts[intf_num];
+        info->io.regshift = 0;
 
         info->slave_addr = ipmi_data->slave_addr;
 
-        irqs[intf_num] = ipmi_data->irq;
+        info->irq = ipmi_data->irq;
+        if (info->irq)
+                info->irq_setup = std_irq_setup;
 
-        *new_info = info;
+        try_smi_init(info);
+}
 
-        printk("ipmi_si: Found SMBIOS-specified state machine at %s"
-               " address 0x%lx, slave address 0x%x\n",
-               io_type, (unsigned long)ipmi_data->base_addr,
-               ipmi_data->slave_addr);
-        return 0;
+static void __devinit dmi_find_bmc(void)
+{
+        struct dmi_device    *dev = NULL;
+        struct dmi_ipmi_data data;
+        int                  rv;
+
+        while ((dev = dmi_find_device(DMI_DEV_TYPE_IPMI, NULL, dev))) {
+                rv = decode_dmi((struct dmi_header *) dev->device_data, &data);
+                if (!rv)
+                        try_init_dmi(&data);
+        }
 }
 #endif /* CONFIG_DMI */
 
 #ifdef CONFIG_PCI
 
-#define PCI_ERMC_CLASSCODE  0x0C0700
+#define PCI_ERMC_CLASSCODE              0x0C0700
+#define PCI_ERMC_CLASSCODE_MASK         0xffffff00
+#define PCI_ERMC_CLASSCODE_TYPE_MASK    0xff
+#define PCI_ERMC_CLASSCODE_TYPE_SMIC    0x00
+#define PCI_ERMC_CLASSCODE_TYPE_KCS     0x01
+#define PCI_ERMC_CLASSCODE_TYPE_BT      0x02
+
 #define PCI_HP_VENDOR_ID    0x103C
 #define PCI_MMC_DEVICE_ID   0x121A
 #define PCI_MMC_ADDR_CW     0x10
 
-/* Avoid more than one attempt to probe pci smic. */
-static int pci_smic_checked = 0;
+static void ipmi_pci_cleanup(struct smi_info *info)
+{
+        struct pci_dev *pdev = info->addr_source_data;
+
+        pci_disable_device(pdev);
+}
 
-static int find_pci_smic(int intf_num, struct smi_info **new_info)
+static int __devinit ipmi_pci_probe(struct pci_dev *pdev,
+                                    const struct pci_device_id *ent)
 {
-        struct smi_info  *info;
-        int              error;
-        struct pci_dev   *pci_dev = NULL;
-        u16              base_addr;
-        int              fe_rmc = 0;
+        int rv;
+        int class_type = pdev->class & PCI_ERMC_CLASSCODE_TYPE_MASK;
+        struct smi_info *info;
+        int first_reg_offset = 0;
 
-        if (pci_smic_checked)
-                return -ENODEV;
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        if (!info)
+                return ENOMEM;
 
-        pci_smic_checked = 1;
+        info->addr_source = "PCI";
 
-        pci_dev = pci_get_device(PCI_HP_VENDOR_ID, PCI_MMC_DEVICE_ID, NULL);
-        if (! pci_dev) {
-                pci_dev = pci_get_class(PCI_ERMC_CLASSCODE, NULL);
-                if (pci_dev && (pci_dev->subsystem_vendor == PCI_HP_VENDOR_ID))
-                        fe_rmc = 1;
-                else
-                        return -ENODEV;
-        }
+        switch (class_type) {
+        case PCI_ERMC_CLASSCODE_TYPE_SMIC:
+                info->si_type = SI_SMIC;
+                break;
 
-        error = pci_read_config_word(pci_dev, PCI_MMC_ADDR_CW, &base_addr);
-        if (error)
-        {
-                pci_dev_put(pci_dev);
-                printk(KERN_ERR
-                       "ipmi_si: pci_read_config_word() failed (%d).\n",
-                       error);
-                return -ENODEV;
+        case PCI_ERMC_CLASSCODE_TYPE_KCS:
+                info->si_type = SI_KCS;
+                break;
+
+        case PCI_ERMC_CLASSCODE_TYPE_BT:
+                info->si_type = SI_BT;
+                break;
+
+        default:
+                kfree(info);
+                printk(KERN_INFO "ipmi_si: %s: Unknown IPMI type: %d\n",
+                       pci_name(pdev), class_type);
+                return ENOMEM;
         }
 
-        /* Bit 0: 1 specifies programmed I/O, 0 specifies memory mapped I/O */
-        if (! (base_addr & 0x0001))
-        {
-                pci_dev_put(pci_dev);
-                printk(KERN_ERR
-                       "ipmi_si: memory mapped I/O not supported for PCI"
-                       " smic.\n");
-                return -ENODEV;
+        rv = pci_enable_device(pdev);
+        if (rv) {
+                printk(KERN_ERR "ipmi_si: %s: couldn't enable PCI device\n",
+                       pci_name(pdev));
+                kfree(info);
+                return rv;
         }
 
-        base_addr &= 0xFFFE;
-        if (! fe_rmc)
-                /* Data register starts at base address + 1 in eRMC */
-                ++base_addr;
+        info->addr_source_cleanup = ipmi_pci_cleanup;
+        info->addr_source_data = pdev;
 
-        if (! is_new_interface(-1, IPMI_IO_ADDR_SPACE, base_addr)) {
-                pci_dev_put(pci_dev);
-                return -ENODEV;
-        }
+        if (pdev->subsystem_vendor == PCI_HP_VENDOR_ID)
+                first_reg_offset = 1;
 
-        info = kmalloc(sizeof(*info), GFP_KERNEL);
-        if (! info) {
-                pci_dev_put(pci_dev);
-                printk(KERN_ERR "ipmi_si: Could not allocate SI data (5)\n");
-                return -ENOMEM;
+        if (pci_resource_flags(pdev, 0) & IORESOURCE_IO) {
+                info->io_setup = port_setup;
+                info->io.addr_type = IPMI_IO_ADDR_SPACE;
+        } else {
+                info->io_setup = mem_setup;
+                info->io.addr_type = IPMI_MEM_ADDR_SPACE;
         }
-        memset(info, 0, sizeof(*info));
+        info->io.addr_data = pci_resource_start(pdev, 0);
 
-        info->io_setup = port_setup;
-        ports[intf_num] = base_addr;
-        info->io.info = &(ports[intf_num]);
-        info->io.regspacing = regspacings[intf_num];
-        if (! info->io.regspacing)
-                info->io.regspacing = DEFAULT_REGSPACING;
+        info->io.regspacing = DEFAULT_REGSPACING;
         info->io.regsize = DEFAULT_REGSPACING;
-        info->io.regshift = regshifts[intf_num];
+        info->io.regshift = 0;
 
-        *new_info = info;
+        info->irq = pdev->irq;
+        if (info->irq)
+                info->irq_setup = std_irq_setup;
 
-        irqs[intf_num] = pci_dev->irq;
-        si_type[intf_num] = "smic";
+        info->dev = &pdev->dev;
 
-        printk("ipmi_si: Found PCI SMIC at I/O address 0x%lx\n",
-                (long unsigned int) base_addr);
+        return try_smi_init(info);
+}
 
-        pci_dev_put(pci_dev);
+static void __devexit ipmi_pci_remove(struct pci_dev *pdev)
+{
+}
+
+#ifdef CONFIG_PM
+static int ipmi_pci_suspend(struct pci_dev *pdev, pm_message_t state)
+{
         return 0;
 }
-#endif /* CONFIG_PCI */
 
-static int try_init_plug_and_play(int intf_num, struct smi_info **new_info)
+static int ipmi_pci_resume(struct pci_dev *pdev)
 {
-#ifdef CONFIG_PCI
-        if (find_pci_smic(intf_num, new_info) == 0)
-                return 0;
+        return 0;
+}
 #endif
-        /* Include other methods here. */
 
-        return -ENODEV;
-}
+static struct pci_device_id ipmi_pci_devices[] = {
+        { PCI_DEVICE(PCI_HP_VENDOR_ID, PCI_MMC_DEVICE_ID) },
+        { PCI_DEVICE_CLASS(PCI_ERMC_CLASSCODE, PCI_ERMC_CLASSCODE) }
+};
+MODULE_DEVICE_TABLE(pci, ipmi_pci_devices);
+
+static struct pci_driver ipmi_pci_driver = {
+        .name =         DEVICE_NAME,
+        .id_table =     ipmi_pci_devices,
+        .probe =        ipmi_pci_probe,
+        .remove =       __devexit_p(ipmi_pci_remove),
+#ifdef CONFIG_PM
+        .suspend =      ipmi_pci_suspend,
+        .resume =       ipmi_pci_resume,
+#endif
+};
+#endif /* CONFIG_PCI */
 
 
 static int try_get_dev_id(struct smi_info *smi_info)
 {
-        unsigned char      msg[2];
-        unsigned char      *resp;
-        unsigned long      resp_len;
-        enum si_sm_result smi_result;
-        int               rv = 0;
+        unsigned char         msg[2];
+        unsigned char         *resp;
+        unsigned long         resp_len;
+        enum si_sm_result     smi_result;
+        int                   rv = 0;
 
         resp = kmalloc(IPMI_MAX_MSG_LENGTH, GFP_KERNEL);
-        if (! resp)
+        if (!resp)
                 return -ENOMEM;
 
         /* Do a Get Device ID command, since it comes back with some
@@ -1972,7 +1942,7 @@ static int try_get_dev_id(struct smi_info *smi_info)
         /* Otherwise, we got some data. */
         resp_len = smi_info->handlers->get_result(smi_info->si_sm,
                                                   resp, IPMI_MAX_MSG_LENGTH);
-        if (resp_len < 6) {
+        if (resp_len < 14) {
                 /* That's odd, it should be longer. */
                 rv = -EINVAL;
                 goto out;
@@ -1985,8 +1955,7 @@ static int try_get_dev_id(struct smi_info *smi_info)
         }
 
         /* Record info from the get device id, in case we need it. */
-        memcpy(&smi_info->device_id, &resp[3],
-               min_t(unsigned long, resp_len-3, sizeof(smi_info->device_id)));
+        ipmi_demangle_device_id(resp+3, resp_len-3, &smi_info->device_id);
 
  out:
         kfree(resp);
@@ -2018,7 +1987,7 @@ static int stat_file_read_proc(char *page, char **start, off_t off,
         struct smi_info *smi = data;
 
         out += sprintf(out, "interrupts_enabled:    %d\n",
-                       smi->irq && ! smi->interrupt_disabled);
+                       smi->irq && !smi->interrupt_disabled);
         out += sprintf(out, "short_timeouts:        %ld\n",
                        smi->short_timeouts);
         out += sprintf(out, "long_timeouts:         %ld\n",
@@ -2089,15 +2058,14 @@ static int oem_data_avail_to_receive_msg_avail(struct smi_info *smi_info)
 #define DELL_POWEREDGE_8G_BMC_DEVICE_ID  0x20
 #define DELL_POWEREDGE_8G_BMC_DEVICE_REV 0x80
 #define DELL_POWEREDGE_8G_BMC_IPMI_VERSION 0x51
-#define DELL_IANA_MFR_ID {0xA2, 0x02, 0x00}
+#define DELL_IANA_MFR_ID 0x0002a2
 static void setup_dell_poweredge_oem_data_handler(struct smi_info *smi_info)
 {
         struct ipmi_device_id *id = &smi_info->device_id;
-        const char mfr[3]=DELL_IANA_MFR_ID;
-        if (! memcmp(mfr, id->manufacturer_id, sizeof(mfr))) {
+        if (id->manufacturer_id == DELL_IANA_MFR_ID) {
                 if (id->device_id       == DELL_POWEREDGE_8G_BMC_DEVICE_ID  &&
                     id->device_revision == DELL_POWEREDGE_8G_BMC_DEVICE_REV &&
-                    id->ipmi_version    == DELL_POWEREDGE_8G_BMC_IPMI_VERSION) {
+                    id->ipmi_version   == DELL_POWEREDGE_8G_BMC_IPMI_VERSION) {
                         smi_info->oem_data_avail_handler =
                                 oem_data_avail_to_receive_msg_avail;
                 }
@@ -2169,8 +2137,7 @@ static void
 setup_dell_poweredge_bt_xaction_handler(struct smi_info *smi_info)
 {
         struct ipmi_device_id *id = &smi_info->device_id;
-        const char mfr[3]=DELL_IANA_MFR_ID;
-        if (! memcmp(mfr, id->manufacturer_id, sizeof(mfr)) &&
+        if (id->manufacturer_id == DELL_IANA_MFR_ID &&
             smi_info->si_type == SI_BT)
                 register_xaction_notifier(&dell_poweredge_bt_xaction_notifier);
 }
@@ -2200,62 +2167,110 @@ static inline void wait_for_timer_and_thread(struct smi_info *smi_info)
         del_timer_sync(&smi_info->si_timer);
 }
 
-/* Returns 0 if initialized, or negative on an error. */
-static int init_one_smi(int intf_num, struct smi_info **smi)
+static struct ipmi_default_vals
 {
-        int             rv;
-        struct smi_info *new_smi;
+        int type;
+        int port;
+} __devinit ipmi_defaults[] =
+{
+        { .type = SI_KCS, .port = 0xca2 },
+        { .type = SI_SMIC, .port = 0xca9 },
+        { .type = SI_BT, .port = 0xe4 },
+        { .port = 0 }
+};
 
+static __devinit void default_find_bmc(void)
+{
+        struct smi_info *info;
+        int             i;
 
-        rv = try_init_mem(intf_num, &new_smi);
-        if (rv)
-                rv = try_init_port(intf_num, &new_smi);
-#ifdef CONFIG_ACPI
-        if (rv && si_trydefaults)
-                rv = try_init_acpi(intf_num, &new_smi);
-#endif
-#ifdef CONFIG_DMI
-        if (rv && si_trydefaults)
-                rv = try_init_smbios(intf_num, &new_smi);
-#endif
-        if (rv && si_trydefaults)
-                rv = try_init_plug_and_play(intf_num, &new_smi);
+        for (i = 0; ; i++) {
+                if (!ipmi_defaults[i].port)
+                        break;
 
-        if (rv)
-                return rv;
+                info = kzalloc(sizeof(*info), GFP_KERNEL);
+                if (!info)
+                        return;
 
-        /* So we know not to free it unless we have allocated one. */
-        new_smi->intf = NULL;
-        new_smi->si_sm = NULL;
-        new_smi->handlers = NULL;
+                info->addr_source = NULL;
 
-        if (! new_smi->irq_setup) {
-                new_smi->irq = irqs[intf_num];
-                new_smi->irq_setup = std_irq_setup;
-                new_smi->irq_cleanup = std_irq_cleanup;
-        }
+                info->si_type = ipmi_defaults[i].type;
+                info->io_setup = port_setup;
+                info->io.addr_data = ipmi_defaults[i].port;
+                info->io.addr_type = IPMI_IO_ADDR_SPACE;
 
-        /* Default to KCS if no type is specified. */
-        if (si_type[intf_num] == NULL) {
-                if (si_trydefaults)
-                        si_type[intf_num] = "kcs";
-                else {
-                        rv = -EINVAL;
-                        goto out_err;
+                info->io.addr = NULL;
+                info->io.regspacing = DEFAULT_REGSPACING;
+                info->io.regsize = DEFAULT_REGSPACING;
+                info->io.regshift = 0;
+
+                if (try_smi_init(info) == 0) {
+                        /* Found one... */
+                        printk(KERN_INFO "ipmi_si: Found default %s state"
+                               " machine at %s address 0x%lx\n",
+                               si_to_str[info->si_type],
+                               addr_space_to_str[info->io.addr_type],
+                               info->io.addr_data);
+                        return;
                 }
         }
+}
+
+static int is_new_interface(struct smi_info *info)
+{
+        struct smi_info *e;
+
+        list_for_each_entry(e, &smi_infos, link) {
+                if (e->io.addr_type != info->io.addr_type)
+                        continue;
+                if (e->io.addr_data == info->io.addr_data)
+                        return 0;
+        }
+
+        return 1;
+}
+
+static int try_smi_init(struct smi_info *new_smi)
+{
+        int rv;
+
+        if (new_smi->addr_source) {
+                printk(KERN_INFO "ipmi_si: Trying %s-specified %s state"
+                       " machine at %s address 0x%lx, slave address 0x%x,"
+                       " irq %d\n",
+                       new_smi->addr_source,
+                       si_to_str[new_smi->si_type],
+                       addr_space_to_str[new_smi->io.addr_type],
+                       new_smi->io.addr_data,
+                       new_smi->slave_addr, new_smi->irq);
+        }
+
+        down(&smi_infos_lock);
+        if (!is_new_interface(new_smi)) {
+                printk(KERN_WARNING "ipmi_si: duplicate interface\n");
+                rv = -EBUSY;
+                goto out_err;
+        }
 
-        /* Set up the state machine to use. */
-        if (strcmp(si_type[intf_num], "kcs") == 0) {
+        /* So we know not to free it unless we have allocated one. */
+        new_smi->intf = NULL;
+        new_smi->si_sm = NULL;
+        new_smi->handlers = NULL;
+
+        switch (new_smi->si_type) {
+        case SI_KCS:
                 new_smi->handlers = &kcs_smi_handlers;
-                new_smi->si_type = SI_KCS;
-        } else if (strcmp(si_type[intf_num], "smic") == 0) {
+                break;
+
+        case SI_SMIC:
                 new_smi->handlers = &smic_smi_handlers;
-                new_smi->si_type = SI_SMIC;
-        } else if (strcmp(si_type[intf_num], "bt") == 0) {
+                break;
+
+        case SI_BT:
                 new_smi->handlers = &bt_smi_handlers;
-                new_smi->si_type = SI_BT;
-        } else {
+                break;
+
+        default:
                 /* No support for anything else yet. */
                 rv = -EIO;
                 goto out_err;
@@ -2263,7 +2278,7 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
 
         /* Allocate the state machine's data and initialize it. */
         new_smi->si_sm = kmalloc(new_smi->handlers->size(), GFP_KERNEL);
-        if (! new_smi->si_sm) {
+        if (!new_smi->si_sm) {
                 printk(" Could not allocate state machine memory\n");
                 rv = -ENOMEM;
                 goto out_err;
@@ -2284,21 +2299,29 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
 
         /* Do low-level detection first. */
         if (new_smi->handlers->detect(new_smi->si_sm)) {
+                if (new_smi->addr_source)
+                        printk(KERN_INFO "ipmi_si: Interface detection"
+                               " failed\n");
                 rv = -ENODEV;
                 goto out_err;
         }
 
         /* Attempt a get device id command.  If it fails, we probably
-           don't have a SMI here. */
+           don't have a BMC here. */
         rv = try_get_dev_id(new_smi);
-        if (rv)
+        if (rv) {
+                if (new_smi->addr_source)
+                        printk(KERN_INFO "ipmi_si: There appears to be no BMC"
+                               " at this location\n");
                 goto out_err;
+        }
 
         setup_oem_data_handler(new_smi);
         setup_xaction_handlers(new_smi);
 
         /* Try to claim any interrupts. */
-        new_smi->irq_setup(new_smi);
+        if (new_smi->irq_setup)
+                new_smi->irq_setup(new_smi);
 
         INIT_LIST_HEAD(&(new_smi->xmit_msgs));
         INIT_LIST_HEAD(&(new_smi->hp_xmit_msgs));
@@ -2308,7 +2331,8 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
 
         new_smi->interrupt_disabled = 0;
         atomic_set(&new_smi->stop_operation, 0);
-        new_smi->intf_num = intf_num;
+        new_smi->intf_num = smi_num;
+        smi_num++;
 
         /* Start clearing the flags before we enable interrupts or the
            timer to avoid racing with the timer. */
@@ -2332,10 +2356,36 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
                 new_smi->thread = kthread_run(ipmi_thread, new_smi,
                                               "kipmi%d", new_smi->intf_num);
 
+        if (!new_smi->dev) {
+                /* If we don't already have a device from something
+                 * else (like PCI), then register a new one. */
+                new_smi->pdev = platform_device_alloc("ipmi_si",
+                                                      new_smi->intf_num);
+                if (rv) {
+                        printk(KERN_ERR
+                               "ipmi_si_intf:"
+                               " Unable to allocate platform device\n");
+                        goto out_err_stop_timer;
+                }
+                new_smi->dev = &new_smi->pdev->dev;
+                new_smi->dev->driver = &ipmi_driver;
+
+                rv = platform_device_register(new_smi->pdev);
+                if (rv) {
+                        printk(KERN_ERR
+                               "ipmi_si_intf:"
+                               " Unable to register system interface device:"
+                               " %d\n",
+                               rv);
+                        goto out_err_stop_timer;
+                }
+                new_smi->dev_registered = 1;
+        }
+
         rv = ipmi_register_smi(&handlers,
                                new_smi,
-                               ipmi_version_major(&new_smi->device_id),
-                               ipmi_version_minor(&new_smi->device_id),
+                               &new_smi->device_id,
+                               new_smi->dev,
                                new_smi->slave_addr,
                                &(new_smi->intf));
         if (rv) {
@@ -2365,9 +2415,11 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
                 goto out_err_stop_timer;
         }
 
-        *smi = new_smi;
+        list_add_tail(&new_smi->link, &smi_infos);
+
+        up(&smi_infos_lock);
 
-        printk(" IPMI %s interface initialized\n", si_type[intf_num]);
+        printk(" IPMI %s interface initialized\n",si_to_str[new_smi->si_type]);
 
         return 0;
 
@@ -2379,7 +2431,8 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
         if (new_smi->intf)
                 ipmi_unregister_smi(new_smi->intf);
 
-        new_smi->irq_cleanup(new_smi);
+        if (new_smi->irq_cleanup)
+                new_smi->irq_cleanup(new_smi);
 
         /* Wait until we know that we are out of any interrupt
            handlers might have been running before we freed the
@@ -2391,23 +2444,41 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
                         new_smi->handlers->cleanup(new_smi->si_sm);
                 kfree(new_smi->si_sm);
         }
+        if (new_smi->addr_source_cleanup)
+                new_smi->addr_source_cleanup(new_smi);
         if (new_smi->io_cleanup)
                 new_smi->io_cleanup(new_smi);
 
+        if (new_smi->dev_registered)
+                platform_device_unregister(new_smi->pdev);
+
+        kfree(new_smi);
+
+        up(&smi_infos_lock);
+
         return rv;
 }
 
-static __init int init_ipmi_si(void)
+static __devinit int init_ipmi_si(void)
 {
-        int  rv = 0;
-        int  pos = 0;
         int  i;
         char *str;
+        int  rv;
 
         if (initialized)
                 return 0;
         initialized = 1;
 
+        /* Register the device drivers. */
+        rv = driver_register(&ipmi_driver);
+        if (rv) {
+                printk(KERN_ERR
+                       "init_ipmi_si: Unable to register driver: %d\n",
+                       rv);
+                return rv;
+        }
+
+
         /* Parse out the si_type string into its components. */
         str = si_type_str;
         if (*str != '\0') {
@@ -2425,63 +2496,66 @@ static __init int init_ipmi_si(void)
 
         printk(KERN_INFO "IPMI System Interface driver.\n");
 
+        hardcode_find_bmc();
+
 #ifdef CONFIG_DMI
         dmi_find_bmc();
 #endif
 
-        rv = init_one_smi(0, &(smi_infos[pos]));
-        if (rv && ! ports[0] && si_trydefaults) {
-                /* If we are trying defaults and the initial port is
-                   not set, then set it. */
-                si_type[0] = "kcs";
-                ports[0] = DEFAULT_KCS_IO_PORT;
-                rv = init_one_smi(0, &(smi_infos[pos]));
-                if (rv) {
-                        /* No KCS - try SMIC */
-                        si_type[0] = "smic";
-                        ports[0] = DEFAULT_SMIC_IO_PORT;
-                        rv = init_one_smi(0, &(smi_infos[pos]));
-                }
-                if (rv) {
-                        /* No SMIC - try BT */
-                        si_type[0] = "bt";
-                        ports[0] = DEFAULT_BT_IO_PORT;
-                        rv = init_one_smi(0, &(smi_infos[pos]));
-                }
-        }
-        if (rv == 0)
-                pos++;
+#ifdef CONFIG_ACPI
+        if (si_trydefaults)
+                acpi_find_bmc();
+#endif
 
-        for (i = 1; i < SI_MAX_PARMS; i++) {
-                rv = init_one_smi(i, &(smi_infos[pos]));
-                if (rv == 0)
-                        pos++;
+#ifdef CONFIG_PCI
+        pci_module_init(&ipmi_pci_driver);
+#endif
+
+        if (si_trydefaults) {
+                down(&smi_infos_lock);
+                if (list_empty(&smi_infos)) {
+                        /* No BMC was found, try defaults. */
+                        up(&smi_infos_lock);
+                        default_find_bmc();
+                } else {
+                        up(&smi_infos_lock);
+                }
         }
 
-        if (smi_infos[0] == NULL) {
+        down(&smi_infos_lock);
+        if (list_empty(&smi_infos)) {
+                up(&smi_infos_lock);
+#ifdef CONFIG_PCI
+                pci_unregister_driver(&ipmi_pci_driver);
+#endif
                 printk("ipmi_si: Unable to find any System Interface(s)\n");
                 return -ENODEV;
+        } else {
+                up(&smi_infos_lock);
+                return 0;
         }
-
-        return 0;
 }
 module_init(init_ipmi_si);
 
-static void __exit cleanup_one_si(struct smi_info *to_clean)
+static void __devexit cleanup_one_si(struct smi_info *to_clean)
 {
         int           rv;
         unsigned long flags;
 
-        if (! to_clean)
+        if (!to_clean)
                 return;
 
+        list_del(&to_clean->link);
+
         /* Tell the timer and interrupt handlers that we are shutting
            down. */
         spin_lock_irqsave(&(to_clean->si_lock), flags);
         spin_lock(&(to_clean->msg_lock));
 
         atomic_inc(&to_clean->stop_operation);
-        to_clean->irq_cleanup(to_clean);
+
+        if (to_clean->irq_cleanup)
+                to_clean->irq_cleanup(to_clean);
 
         spin_unlock(&(to_clean->msg_lock));
         spin_unlock_irqrestore(&(to_clean->si_lock), flags);
@@ -2511,20 +2585,34 @@ static void __exit cleanup_one_si(struct smi_info *to_clean)
 
         kfree(to_clean->si_sm);
 
+        if (to_clean->addr_source_cleanup)
+                to_clean->addr_source_cleanup(to_clean);
         if (to_clean->io_cleanup)
                 to_clean->io_cleanup(to_clean);
+
+        if (to_clean->dev_registered)
+                platform_device_unregister(to_clean->pdev);
+
+        kfree(to_clean);
 }
 
 static __exit void cleanup_ipmi_si(void)
 {
-        int i;
+        struct smi_info *e, *tmp_e;
 
-        if (! initialized)
+        if (!initialized)
                 return;
 
-        for (i = 0; i < SI_MAX_DRIVERS; i++) {
-                cleanup_one_si(smi_infos[i]);
-        }
+#ifdef CONFIG_PCI
+        pci_unregister_driver(&ipmi_pci_driver);
+#endif
+
+        down(&smi_infos_lock);
+        list_for_each_entry_safe(e, tmp_e, &smi_infos, link)
+                cleanup_one_si(e);
+        up(&smi_infos_lock);
+
+        driver_unregister(&ipmi_driver);
 }
 module_exit(cleanup_ipmi_si);
 
diff --git a/drivers/char/ipmi/ipmi_si_sm.h b/drivers/char/ipmi/ipmi_si_sm.h
index bf3d4962d6..4b731b24dc 100644
--- a/drivers/char/ipmi/ipmi_si_sm.h
+++ b/drivers/char/ipmi/ipmi_si_sm.h
@@ -50,11 +50,12 @@ struct si_sm_io
 
         /* Generic info used by the actual handling routines, the
            state machine shouldn't touch these. */
-        void *info;
         void __iomem *addr;
         int  regspacing;
         int  regsize;
         int  regshift;
+        int addr_type;
+        long addr_data;
 };
 
 /* Results of SMI events. */
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 1f3159eb1e..7ece9f3c8f 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -996,7 +996,7 @@ static struct notifier_block wdog_panic_notifier = {
 };
 
 
-static void ipmi_new_smi(int if_num)
+static void ipmi_new_smi(int if_num, struct device *device)
 {
         ipmi_register_watchdog(if_num);
 }
@@ -1158,7 +1158,8 @@ static int __init ipmi_wdog_init(void)
         }
 
         register_reboot_notifier(&wdog_reboot_notifier);
-        notifier_chain_register(&panic_notifier_list, &wdog_panic_notifier);
+        atomic_notifier_chain_register(&panic_notifier_list,
+                        &wdog_panic_notifier);
 
         printk(KERN_INFO PFX "driver initialized\n");
 
@@ -1176,7 +1177,8 @@ static __exit void ipmi_unregister_watchdog(void)
                 release_nmi(&ipmi_nmi_handler);
 #endif
 
-        notifier_chain_unregister(&panic_notifier_list, &wdog_panic_notifier);
+        atomic_notifier_chain_unregister(&panic_notifier_list,
+                        &wdog_panic_notifier);
         unregister_reboot_notifier(&wdog_reboot_notifier);
 
         if (! watchdog_user)
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index ede128356a..e5247f85a4 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -378,13 +378,13 @@ MODULE_DESCRIPTION("Stallion Intelligent Multiport Serial Driver");
 MODULE_LICENSE("GPL");
 
 
-MODULE_PARM(board0, "1-3s");
+module_param_array(board0, charp, NULL, 0);
 MODULE_PARM_DESC(board0, "Board 0 config -> name[,ioaddr[,memaddr]");
-MODULE_PARM(board1, "1-3s");
+module_param_array(board1, charp, NULL, 0);
 MODULE_PARM_DESC(board1, "Board 1 config -> name[,ioaddr[,memaddr]");
-MODULE_PARM(board2, "1-3s");
+module_param_array(board2, charp, NULL, 0);
 MODULE_PARM_DESC(board2, "Board 2 config -> name[,ioaddr[,memaddr]");
-MODULE_PARM(board3, "1-3s");
+module_param_array(board3, charp, NULL, 0);
 MODULE_PARM_DESC(board3, "Board 3 config -> name[,ioaddr[,memaddr]");
 
 #endif
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 29c41f4418..66719f9d29 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -88,21 +88,15 @@ static inline int uncached_access(struct file *file, unsigned long addr)
 }
 
 #ifndef ARCH_HAS_VALID_PHYS_ADDR_RANGE
-static inline int valid_phys_addr_range(unsigned long addr, size_t *count)
+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
 {
-        unsigned long end_mem;
-
-        end_mem = __pa(high_memory);
-        if (addr >= end_mem)
+        if (addr + count > __pa(high_memory))
                 return 0;
 
-        if (*count > end_mem - addr)
-                *count = end_mem - addr;
-
         return 1;
 }
 
-static inline int valid_mmap_phys_addr_range(unsigned long addr, size_t *size)
+static inline int valid_mmap_phys_addr_range(unsigned long addr, size_t size)
 {
         return 1;
 }
@@ -119,7 +113,7 @@ static ssize_t read_mem(struct file * file, char __user * buf,
         ssize_t read, sz;
         char *ptr;
 
-        if (!valid_phys_addr_range(p, &count))
+        if (!valid_phys_addr_range(p, count))
                 return -EFAULT;
         read = 0;
 #ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED
@@ -177,7 +171,7 @@ static ssize_t write_mem(struct file * file, const char __user * buf,
         unsigned long copied;
         void *ptr;
 
-        if (!valid_phys_addr_range(p, &count))
+        if (!valid_phys_addr_range(p, count))
                 return -EFAULT;
 
         written = 0;
@@ -216,11 +210,9 @@ static ssize_t write_mem(struct file * file, const char __user * buf,
 
                 copied = copy_from_user(ptr, buf, sz);
                 if (copied) {
-                        ssize_t ret;
-
-                        ret = written + (sz - copied);
-                        if (ret)
-                                return ret;
+                        written += sz - copied;
+                        if (written)
+                                break;
                         return -EFAULT;
                 }
                 buf += sz;
@@ -251,7 +243,7 @@ static int mmap_mem(struct file * file, struct vm_area_struct * vma)
 {
         size_t size = vma->vm_end - vma->vm_start;
 
-        if (!valid_mmap_phys_addr_range(vma->vm_pgoff << PAGE_SHIFT, &size))
+        if (!valid_mmap_phys_addr_range(vma->vm_pgoff << PAGE_SHIFT, size))
                 return -EINVAL;
 
         vma->vm_page_prot = phys_mem_access_prot(file, vma->vm_pgoff,
@@ -456,11 +448,9 @@ do_write_kmem(void *p, unsigned long realp, const char __user * buf,
 
                 copied = copy_from_user(ptr, buf, sz);
                 if (copied) {
-                        ssize_t ret;
-
-                        ret = written + (sz - copied);
-                        if (ret)
-                                return ret;
+                        written += sz - copied;
+                        if (written)
+                                break;
                         return -EFAULT;
                 }
                 buf += sz;
@@ -514,11 +504,10 @@ static ssize_t write_kmem(struct file * file, const char __user * buf,
                         if (len) {
                                 written = copy_from_user(kbuf, buf, len);
                                 if (written) {
-                                        ssize_t ret;
-
+                                        if (wrote + virtr)
+                                                break;
                                         free_page((unsigned long)kbuf);
-                                        ret = wrote + virtr + (len - written);
-                                        return ret ? ret : -EFAULT;
+                                        return -EFAULT;
                                 }
                         }
                         len = vwrite(kbuf, (char *)p, len);
@@ -563,8 +552,11 @@ static ssize_t write_port(struct file * file, const char __user * buf,
                 return -EFAULT;
         while (count-- > 0 && i < 65536) {
                 char c;
-                if (__get_user(c, tmp)) 
+                if (__get_user(c, tmp)) {
+                        if (tmp > buf)
+                                break;
                         return -EFAULT; 
+                }
                 outb(c,i);
                 i++;
                 tmp++;
@@ -907,7 +899,7 @@ static const struct {
         unsigned int            minor;
         char                    *name;
         umode_t                 mode;
-        struct file_operations  *fops;
+        const struct file_operations    *fops;
 } devlist[] = { /* list of minor devices */
         {1, "mem",     S_IRUSR | S_IWUSR | S_IRGRP, &mem_fops},
         {2, "kmem",    S_IRUSR | S_IWUSR | S_IRGRP, &kmem_fops},
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 3e4c0414a0..96eb2a709e 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -129,7 +129,7 @@ static int misc_open(struct inode * inode, struct file * file)
         int minor = iminor(inode);
         struct miscdevice *c;
         int err = -ENODEV;
-        struct file_operations *old_fops, *new_fops = NULL;
+        const struct file_operations *old_fops, *new_fops = NULL;
         
         down(&misc_sem);
         
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index ea725a9964..0fb2fb9fb0 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -243,10 +243,10 @@ static int verbose = 0;
 
 MODULE_AUTHOR("Casper Yang");
 MODULE_DESCRIPTION("MOXA Smartio/Industio Family Multiport Board Device Driver");
-MODULE_PARM(ioaddr, "1-4i");
-MODULE_PARM(ttymajor, "i");
-MODULE_PARM(calloutmajor, "i");
-MODULE_PARM(verbose, "i");
+module_param_array(ioaddr, int, NULL, 0);
+module_param(ttymajor, int, 0);
+module_param(calloutmajor, int, 0);
+module_param(verbose, bool, 0);
 MODULE_LICENSE("GPL");
 
 struct mxser_log {
diff --git a/drivers/char/mxser.h b/drivers/char/mxser.h
index e7fd0b08e0..7e188a4d60 100644
--- a/drivers/char/mxser.h
+++ b/drivers/char/mxser.h
@@ -118,7 +118,7 @@
 
 // enable CTS interrupt
 #define MOXA_MUST_IER_ECTSI             0x80
-// eanble RTS interrupt
+// enable RTS interrupt
 #define MOXA_MUST_IER_ERTSI             0x40
 // enable Xon/Xoff interrupt
 #define MOXA_MUST_IER_XINT              0x20
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index 306ee0f091..bee6c47b45 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -65,10 +65,11 @@
 #include <linux/parport.h>
 #include <linux/ctype.h>
 #include <linux/poll.h>
-#include <asm/uaccess.h>
+#include <linux/major.h>
 #include <linux/ppdev.h>
 #include <linux/smp_lock.h>
 #include <linux/device.h>
+#include <asm/uaccess.h>
 
 #define PP_VERSION "ppdev: user-space parallel port driver"
 #define CHRDEV "ppdev"
diff --git a/drivers/char/riscom8.c b/drivers/char/riscom8.c
index 119e629656..657c0d88f4 100644
--- a/drivers/char/riscom8.c
+++ b/drivers/char/riscom8.c
@@ -1743,10 +1743,10 @@ static int iobase;
 static int iobase1;
 static int iobase2;
 static int iobase3;
-MODULE_PARM(iobase, "i");
-MODULE_PARM(iobase1, "i");
-MODULE_PARM(iobase2, "i");
-MODULE_PARM(iobase3, "i");
+module_param(iobase, int, 0);
+module_param(iobase1, int, 0);
+module_param(iobase2, int, 0);
+module_param(iobase3, int, 0);
 
 MODULE_LICENSE("GPL");
 #endif /* MODULE */
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index d68be61f0a..fee2aca3f6 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -941,17 +941,6 @@ static void* mgsl_get_text_ptr(void)
         return mgsl_get_text_ptr;
 }
 
-/*
- * tmp_buf is used as a temporary buffer by mgsl_write.  We need to
- * lock it in case the COPY_FROM_USER blocks while swapping in a page,
- * and some other program tries to do a serial write at the same time.
- * Since the lock will only come under contention when the system is
- * swapping and available memory is low, it makes sense to share one
- * buffer across all the serial ioports, since it significantly saves
- * memory if large numbers of serial ports are open.
- */
-static unsigned char *tmp_buf;
-
 static inline int mgsl_paranoia_check(struct mgsl_struct *info,
                                         char *name, const char *routine)
 {
@@ -2150,7 +2139,7 @@ static int mgsl_write(struct tty_struct * tty,
         if (mgsl_paranoia_check(info, tty->name, "mgsl_write"))
                 goto cleanup;
 
-        if (!tty || !info->xmit_buf || !tmp_buf)
+        if (!tty || !info->xmit_buf)
                 goto cleanup;
 
         if ( info->params.mode == MGSL_MODE_HDLC ||
@@ -3438,7 +3427,6 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
 {
         struct mgsl_struct      *info;
         int                     retval, line;
-        unsigned long           page;
         unsigned long flags;
 
         /* verify range of specified line number */     
@@ -3472,18 +3460,6 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
                 goto cleanup;
         }
         
-        if (!tmp_buf) {
-                page = get_zeroed_page(GFP_KERNEL);
-                if (!page) {
-                        retval = -ENOMEM;
-                        goto cleanup;
-                }
-                if (tmp_buf)
-                        free_page(page);
-                else
-                        tmp_buf = (unsigned char *) page;
-        }
-        
         info->tty->low_latency = (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
 
         spin_lock_irqsave(&info->netlock, flags);
@@ -4502,11 +4478,6 @@ static void synclink_cleanup(void)
                 kfree(tmp);
         }
         
-        if (tmp_buf) {
-                free_page((unsigned long) tmp_buf);
-                tmp_buf = NULL;
-        }
-        
         if (pci_registered)
                 pci_unregister_driver(&synclink_pci_driver);
 }
@@ -6025,7 +5996,7 @@ static void usc_set_async_mode( struct mgsl_struct *info )
          * <15..8>      ?               RxFIFO IRQ Request Level
          *
          * Note: For async mode the receive FIFO level must be set
-         * to 0 to aviod the situation where the FIFO contains fewer bytes
+         * to 0 to avoid the situation where the FIFO contains fewer bytes
          * than the trigger level and no more data is expected.
          *
          * <7>          0               Exited Hunt IA (Interrupt Arm)
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index 738ec2f4e5..b4d1f4eea4 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -1,5 +1,5 @@
 /*
- * $Id: synclink_gt.c,v 4.22 2006/01/09 20:16:06 paulkf Exp $
+ * $Id: synclink_gt.c,v 4.25 2006/02/06 21:20:33 paulkf Exp $
  *
  * Device driver for Microgate SyncLink GT serial adapters.
  *
@@ -92,7 +92,7 @@
  * module identification
  */
 static char *driver_name     = "SyncLink GT";
-static char *driver_version  = "$Revision: 4.22 $";
+static char *driver_version  = "$Revision: 4.25 $";
 static char *tty_driver_name = "synclink_gt";
 static char *tty_dev_prefix  = "ttySLG";
 MODULE_LICENSE("GPL");
@@ -188,6 +188,20 @@ static void hdlcdev_exit(struct slgt_info *info);
 #define SLGT_REG_SIZE  256
 
 /*
+ * conditional wait facility
+ */
+struct cond_wait {
+        struct cond_wait *next;
+        wait_queue_head_t q;
+        wait_queue_t wait;
+        unsigned int data;
+};
+static void init_cond_wait(struct cond_wait *w, unsigned int data);
+static void add_cond_wait(struct cond_wait **head, struct cond_wait *w);
+static void remove_cond_wait(struct cond_wait **head, struct cond_wait *w);
+static void flush_cond_wait(struct cond_wait **head);
+
+/*
  * DMA buffer descriptor and access macros
  */
 struct slgt_desc
@@ -269,6 +283,9 @@ struct slgt_info {
         struct timer_list       tx_timer;
         struct timer_list       rx_timer;
 
+        unsigned int            gpio_present;
+        struct cond_wait        *gpio_wait_q;
+
         spinlock_t lock;        /* spinlock for synchronizing with ISR */
 
         struct work_struct task;
@@ -379,6 +396,11 @@ static MGSL_PARAMS default_params = {
 #define MASK_OVERRUN BIT4
 
 #define GSR   0x00 /* global status */
+#define JCR   0x04 /* JTAG control */
+#define IODR  0x08 /* GPIO direction */
+#define IOER  0x0c /* GPIO interrupt enable */
+#define IOVR  0x10 /* GPIO value */
+#define IOSR  0x14 /* GPIO interrupt status */
 #define TDR   0x80 /* tx data */
 #define RDR   0x80 /* rx data */
 #define TCR   0x82 /* tx control */
@@ -503,6 +525,9 @@ static int  tiocmset(struct tty_struct *tty, struct file *file,
 static void set_break(struct tty_struct *tty, int break_state);
 static int  get_interface(struct slgt_info *info, int __user *if_mode);
 static int  set_interface(struct slgt_info *info, int if_mode);
+static int  set_gpio(struct slgt_info *info, struct gpio_desc __user *gpio);
+static int  get_gpio(struct slgt_info *info, struct gpio_desc __user *gpio);
+static int  wait_gpio(struct slgt_info *info, struct gpio_desc __user *gpio);
 
 /*
  * driver functions
@@ -1112,6 +1137,12 @@ static int ioctl(struct tty_struct *tty, struct file *file,
                 return get_interface(info, argp);
         case MGSL_IOCSIF:
                 return set_interface(info,(int)arg);
+        case MGSL_IOCSGPIO:
+                return set_gpio(info, argp);
+        case MGSL_IOCGGPIO:
+                return get_gpio(info, argp);
+        case MGSL_IOCWAITGPIO:
+                return wait_gpio(info, argp);
         case TIOCGICOUNT:
                 spin_lock_irqsave(&info->lock,flags);
                 cnow = info->icount;
@@ -1762,10 +1793,6 @@ static void rx_async(struct slgt_info *info)
                 DBGDATA(info, p, count, "rx");
 
                 for(i=0 ; i < count; i+=2, p+=2) {
-                        if (tty && chars) {
-                                tty_flip_buffer_push(tty);
-                                chars = 0;
-                        }
                         ch = *p;
                         icount->rx++;
 
@@ -2158,6 +2185,24 @@ static void isr_txeom(struct slgt_info *info, unsigned short status)
         }
 }
 
+static void isr_gpio(struct slgt_info *info, unsigned int changed, unsigned int state)
+{
+        struct cond_wait *w, *prev;
+
+        /* wake processes waiting for specific transitions */
+        for (w = info->gpio_wait_q, prev = NULL ; w != NULL ; w = w->next) {
+                if (w->data & changed) {
+                        w->data = state;
+                        wake_up_interruptible(&w->q);
+                        if (prev != NULL)
+                                prev->next = w->next;
+                        else
+                                info->gpio_wait_q = w->next;
+                } else
+                        prev = w;
+        }
+}
+
 /* interrupt service routine
  *
  *      irq     interrupt number
@@ -2193,6 +2238,22 @@ static irqreturn_t slgt_interrupt(int irq, void *dev_id, struct pt_regs * regs)
                 }
         }
 
+        if (info->gpio_present) {
+                unsigned int state;
+                unsigned int changed;
+                while ((changed = rd_reg32(info, IOSR)) != 0) {
+                        DBGISR(("%s iosr=%08x\n", info->device_name, changed));
+                        /* read latched state of GPIO signals */
+                        state = rd_reg32(info, IOVR);
+                        /* clear pending GPIO interrupt bits */
+                        wr_reg32(info, IOSR, changed);
+                        for (i=0 ; i < info->port_count ; i++) {
+                                if (info->port_array[i] != NULL)
+                                        isr_gpio(info->port_array[i], changed, state);
+                        }
+                }
+        }
+
         for(i=0; i < info->port_count ; i++) {
                 struct slgt_info *port = info->port_array[i];
 
@@ -2276,6 +2337,8 @@ static void shutdown(struct slgt_info *info)
                 set_signals(info);
         }
 
+        flush_cond_wait(&info->gpio_wait_q);
+
         spin_unlock_irqrestore(&info->lock,flags);
 
         if (info->tty)
@@ -2650,6 +2713,175 @@ static int set_interface(struct slgt_info *info, int if_mode)
         return 0;
 }
 
+/*
+ * set general purpose IO pin state and direction
+ *
+ * user_gpio fields:
+ * state   each bit indicates a pin state
+ * smask   set bit indicates pin state to set
+ * dir     each bit indicates a pin direction (0=input, 1=output)
+ * dmask   set bit indicates pin direction to set
+ */
+static int set_gpio(struct slgt_info *info, struct gpio_desc __user *user_gpio)
+{
+        unsigned long flags;
+        struct gpio_desc gpio;
+        __u32 data;
+
+        if (!info->gpio_present)
+                return -EINVAL;
+        if (copy_from_user(&gpio, user_gpio, sizeof(gpio)))
+                return -EFAULT;
+        DBGINFO(("%s set_gpio state=%08x smask=%08x dir=%08x dmask=%08x\n",
+                 info->device_name, gpio.state, gpio.smask,
+                 gpio.dir, gpio.dmask));
+
+        spin_lock_irqsave(&info->lock,flags);
+        if (gpio.dmask) {
+                data = rd_reg32(info, IODR);
+                data |= gpio.dmask & gpio.dir;
+                data &= ~(gpio.dmask & ~gpio.dir);
+                wr_reg32(info, IODR, data);
+        }
+        if (gpio.smask) {
+                data = rd_reg32(info, IOVR);
+                data |= gpio.smask & gpio.state;
+                data &= ~(gpio.smask & ~gpio.state);
+                wr_reg32(info, IOVR, data);
+        }
+        spin_unlock_irqrestore(&info->lock,flags);
+
+        return 0;
+}
+
+/*
+ * get general purpose IO pin state and direction
+ */
+static int get_gpio(struct slgt_info *info, struct gpio_desc __user *user_gpio)
+{
+        struct gpio_desc gpio;
+        if (!info->gpio_present)
+                return -EINVAL;
+        gpio.state = rd_reg32(info, IOVR);
+        gpio.smask = 0xffffffff;
+        gpio.dir   = rd_reg32(info, IODR);
+        gpio.dmask = 0xffffffff;
+        if (copy_to_user(user_gpio, &gpio, sizeof(gpio)))
+                return -EFAULT;
+        DBGINFO(("%s get_gpio state=%08x dir=%08x\n",
+                 info->device_name, gpio.state, gpio.dir));
+        return 0;
+}
+
+/*
+ * conditional wait facility
+ */
+static void init_cond_wait(struct cond_wait *w, unsigned int data)
+{
+        init_waitqueue_head(&w->q);
+        init_waitqueue_entry(&w->wait, current);
+        w->data = data;
+}
+
+static void add_cond_wait(struct cond_wait **head, struct cond_wait *w)
+{
+        set_current_state(TASK_INTERRUPTIBLE);
+        add_wait_queue(&w->q, &w->wait);
+        w->next = *head;
+        *head = w;
+}
+
+static void remove_cond_wait(struct cond_wait **head, struct cond_wait *cw)
+{
+        struct cond_wait *w, *prev;
+        remove_wait_queue(&cw->q, &cw->wait);
+        set_current_state(TASK_RUNNING);
+        for (w = *head, prev = NULL ; w != NULL ; prev = w, w = w->next) {
+                if (w == cw) {
+                        if (prev != NULL)
+                                prev->next = w->next;
+                        else
+                                *head = w->next;
+                        break;
+                }
+        }
+}
+
+static void flush_cond_wait(struct cond_wait **head)
+{
+        while (*head != NULL) {
+                wake_up_interruptible(&(*head)->q);
+                *head = (*head)->next;
+        }
+}
+
+/*
+ * wait for general purpose I/O pin(s) to enter specified state
+ *
+ * user_gpio fields:
+ * state - bit indicates target pin state
+ * smask - set bit indicates watched pin
+ *
+ * The wait ends when at least one watched pin enters the specified
+ * state. When 0 (no error) is returned, user_gpio->state is set to the
+ * state of all GPIO pins when the wait ends.
+ *
+ * Note: Each pin may be a dedicated input, dedicated output, or
+ * configurable input/output. The number and configuration of pins
+ * varies with the specific adapter model. Only input pins (dedicated
+ * or configured) can be monitored with this function.
+ */
+static int wait_gpio(struct slgt_info *info, struct gpio_desc __user *user_gpio)
+{
+        unsigned long flags;
+        int rc = 0;
+        struct gpio_desc gpio;
+        struct cond_wait wait;
+        u32 state;
+
+        if (!info->gpio_present)
+                return -EINVAL;
+        if (copy_from_user(&gpio, user_gpio, sizeof(gpio)))
+                return -EFAULT;
+        DBGINFO(("%s wait_gpio() state=%08x smask=%08x\n",
+                 info->device_name, gpio.state, gpio.smask));
+        /* ignore output pins identified by set IODR bit */
+        if ((gpio.smask &= ~rd_reg32(info, IODR)) == 0)
+                return -EINVAL;
+        init_cond_wait(&wait, gpio.smask);
+
+        spin_lock_irqsave(&info->lock, flags);
+        /* enable interrupts for watched pins */
+        wr_reg32(info, IOER, rd_reg32(info, IOER) | gpio.smask);
+        /* get current pin states */
+        state = rd_reg32(info, IOVR);
+
+        if (gpio.smask & ~(state ^ gpio.state)) {
+                /* already in target state */
+                gpio.state = state;
+        } else {
+                /* wait for target state */
+                add_cond_wait(&info->gpio_wait_q, &wait);
+                spin_unlock_irqrestore(&info->lock, flags);
+                schedule();
+                if (signal_pending(current))
+                        rc = -ERESTARTSYS;
+                else
+                        gpio.state = wait.data;
+                spin_lock_irqsave(&info->lock, flags);
+                remove_cond_wait(&info->gpio_wait_q, &wait);
+        }
+
+        /* disable all GPIO interrupts if no waiting processes */
+        if (info->gpio_wait_q == NULL)
+                wr_reg32(info, IOER, 0);
+        spin_unlock_irqrestore(&info->lock,flags);
+
+        if ((rc == 0) && copy_to_user(user_gpio, &gpio, sizeof(gpio)))
+                rc = -EFAULT;
+        return rc;
+}
+
 static int modem_input_wait(struct slgt_info *info,int arg)
 {
         unsigned long flags;
@@ -3166,8 +3398,10 @@ static void device_init(int adapter_num, struct pci_dev *pdev)
                 } else {
                         port_array[0]->irq_requested = 1;
                         adapter_test(port_array[0]);
-                        for (i=1 ; i < port_count ; i++)
+                        for (i=1 ; i < port_count ; i++) {
                                 port_array[i]->init_error = port_array[0]->init_error;
+                                port_array[i]->gpio_present = port_array[0]->gpio_present;
+                        }
                 }
         }
 }
@@ -4301,7 +4535,7 @@ static int register_test(struct slgt_info *info)
                         break;
                 }
         }
-
+        info->gpio_present = (rd_reg32(info, JCR) & BIT5) ? 1 : 0;
         info->init_error = rc ? 0 : DiagStatus_AddressFailure;
         return rc;
 }
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index d58f823188..35082dc12e 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -42,16 +42,15 @@
 /* Whether we react on sysrq keys or just ignore them */
 int sysrq_enabled = 1;
 
-/* Loglevel sysrq handler */
 static void sysrq_handle_loglevel(int key, struct pt_regs *pt_regs,
-                                  struct tty_struct *tty) 
+                                  struct tty_struct *tty)
 {
         int i;
         i = key - '0';
         console_loglevel = 7;
         printk("Loglevel set to %d\n", i);
         console_loglevel = i;
-}       
+}
 static struct sysrq_key_op sysrq_loglevel_op = {
         .handler        = sysrq_handle_loglevel,
         .help_msg       = "loglevel0-8",
@@ -59,11 +58,9 @@ static struct sysrq_key_op sysrq_loglevel_op = {
         .enable_mask    = SYSRQ_ENABLE_LOG,
 };
 
-
-/* SAK sysrq handler */
 #ifdef CONFIG_VT
 static void sysrq_handle_SAK(int key, struct pt_regs *pt_regs,
-                             struct tty_struct *tty) 
+                             struct tty_struct *tty)
 {
         if (tty)
                 do_SAK(tty);
@@ -75,12 +72,13 @@ static struct sysrq_key_op sysrq_SAK_op = {
         .action_msg     = "SAK",
         .enable_mask    = SYSRQ_ENABLE_KEYBOARD,
 };
+#else
+#define sysrq_SAK_op (*(struct sysrq_key_op *)0)
 #endif
 
 #ifdef CONFIG_VT
-/* unraw sysrq handler */
 static void sysrq_handle_unraw(int key, struct pt_regs *pt_regs,
-                               struct tty_struct *tty) 
+                               struct tty_struct *tty)
 {
         struct kbd_struct *kbd = &kbd_table[fg_console];
 
@@ -93,10 +91,11 @@ static struct sysrq_key_op sysrq_unraw_op = {
         .action_msg     = "Keyboard mode set to XLATE",
         .enable_mask    = SYSRQ_ENABLE_KEYBOARD,
 };
+#else
+#define sysrq_unraw_op (*(struct sysrq_key_op *)0)
 #endif /* CONFIG_VT */
 
 #ifdef CONFIG_KEXEC
-/* crashdump sysrq handler */
 static void sysrq_handle_crashdump(int key, struct pt_regs *pt_regs,
                                 struct tty_struct *tty)
 {
@@ -108,16 +107,16 @@ static struct sysrq_key_op sysrq_crashdump_op = {
         .action_msg     = "Trigger a crashdump",
         .enable_mask    = SYSRQ_ENABLE_DUMP,
 };
+#else
+#define sysrq_crashdump_op (*(struct sysrq_key_op *)0)
 #endif
 
-/* reboot sysrq handler */
 static void sysrq_handle_reboot(int key, struct pt_regs *pt_regs,
-                                struct tty_struct *tty) 
+                                struct tty_struct *tty)
 {
         local_irq_enable();
         emergency_restart();
 }
-
 static struct sysrq_key_op sysrq_reboot_op = {
         .handler        = sysrq_handle_reboot,
         .help_msg       = "reBoot",
@@ -126,11 +125,10 @@ static struct sysrq_key_op sysrq_reboot_op = {
 };
 
 static void sysrq_handle_sync(int key, struct pt_regs *pt_regs,
-                              struct tty_struct *tty) 
+                              struct tty_struct *tty)
 {
         emergency_sync();
 }
-
 static struct sysrq_key_op sysrq_sync_op = {
         .handler        = sysrq_handle_sync,
         .help_msg       = "Sync",
@@ -139,11 +137,10 @@ static struct sysrq_key_op sysrq_sync_op = {
 };
 
 static void sysrq_handle_mountro(int key, struct pt_regs *pt_regs,
-                                 struct tty_struct *tty) 
+                                 struct tty_struct *tty)
 {
         emergency_remount();
 }
-
 static struct sysrq_key_op sysrq_mountro_op = {
         .handler        = sysrq_handle_mountro,
         .help_msg       = "Unmount",
@@ -151,28 +148,23 @@ static struct sysrq_key_op sysrq_mountro_op = {
         .enable_mask    = SYSRQ_ENABLE_REMOUNT,
 };
 
-/* END SYNC SYSRQ HANDLERS BLOCK */
-
 #ifdef CONFIG_DEBUG_MUTEXES
-
-static void
-sysrq_handle_showlocks(int key, struct pt_regs *pt_regs, struct tty_struct *tty)
+static void sysrq_handle_showlocks(int key, struct pt_regs *pt_regs,
+                                struct tty_struct *tty)
 {
         mutex_debug_show_all_locks();
 }
-
 static struct sysrq_key_op sysrq_showlocks_op = {
         .handler        = sysrq_handle_showlocks,
         .help_msg       = "show-all-locks(D)",
         .action_msg     = "Show Locks Held",
 };
-
+#else
+#define sysrq_showlocks_op (*(struct sysrq_key_op *)0)
 #endif
 
-/* SHOW SYSRQ HANDLERS BLOCK */
-
 static void sysrq_handle_showregs(int key, struct pt_regs *pt_regs,
-                                  struct tty_struct *tty) 
+                                  struct tty_struct *tty)
 {
         if (pt_regs)
                 show_regs(pt_regs);
@@ -184,9 +176,8 @@ static struct sysrq_key_op sysrq_showregs_op = {
         .enable_mask    = SYSRQ_ENABLE_DUMP,
 };
 
-
 static void sysrq_handle_showstate(int key, struct pt_regs *pt_regs,
-                                   struct tty_struct *tty) 
+                                   struct tty_struct *tty)
 {
         show_state();
 }
@@ -197,9 +188,8 @@ static struct sysrq_key_op sysrq_showstate_op = {
         .enable_mask    = SYSRQ_ENABLE_DUMP,
 };
 
-
 static void sysrq_handle_showmem(int key, struct pt_regs *pt_regs,
-                                 struct tty_struct *tty) 
+                                 struct tty_struct *tty)
 {
         show_mem();
 }
@@ -210,13 +200,9 @@ static struct sysrq_key_op sysrq_showmem_op = {
         .enable_mask    = SYSRQ_ENABLE_DUMP,
 };
 
-/* SHOW SYSRQ HANDLERS BLOCK */
-
-
-/* SIGNAL SYSRQ HANDLERS BLOCK */
-
-/* signal sysrq helper function
- * Sends a signal to all user processes */
+/*
+ * Signal sysrq helper function.  Sends a signal to all user processes.
+ */
 static void send_sig_all(int sig)
 {
         struct task_struct *p;
@@ -229,7 +215,7 @@ static void send_sig_all(int sig)
 }
 
 static void sysrq_handle_term(int key, struct pt_regs *pt_regs,
-                              struct tty_struct *tty) 
+                              struct tty_struct *tty)
 {
         send_sig_all(SIGTERM);
         console_loglevel = 8;
@@ -243,7 +229,8 @@ static struct sysrq_key_op sysrq_term_op = {
 
 static void moom_callback(void *ignored)
 {
-        out_of_memory(&NODE_DATA(0)->node_zonelists[ZONE_NORMAL], GFP_KERNEL, 0);
+        out_of_memory(&NODE_DATA(0)->node_zonelists[ZONE_NORMAL],
+                        GFP_KERNEL, 0);
 }
 
 static DECLARE_WORK(moom_work, moom_callback, NULL);
@@ -260,7 +247,7 @@ static struct sysrq_key_op sysrq_moom_op = {
 };
 
 static void sysrq_handle_kill(int key, struct pt_regs *pt_regs,
-                              struct tty_struct *tty) 
+                              struct tty_struct *tty)
 {
         send_sig_all(SIGKILL);
         console_loglevel = 8;
@@ -272,8 +259,6 @@ static struct sysrq_key_op sysrq_kill_op = {
         .enable_mask    = SYSRQ_ENABLE_SIGNAL,
 };
 
-/* END SIGNAL SYSRQ HANDLERS BLOCK */
-
 static void sysrq_handle_unrt(int key, struct pt_regs *pt_regs,
                                 struct tty_struct *tty)
 {
@@ -288,110 +273,99 @@ static struct sysrq_key_op sysrq_unrt_op = {
 
 /* Key Operations table and lock */
 static DEFINE_SPINLOCK(sysrq_key_table_lock);
-#define SYSRQ_KEY_TABLE_LENGTH 36
-static struct sysrq_key_op *sysrq_key_table[SYSRQ_KEY_TABLE_LENGTH] = {
-/* 0 */ &sysrq_loglevel_op,
-/* 1 */ &sysrq_loglevel_op,
-/* 2 */ &sysrq_loglevel_op,
-/* 3 */ &sysrq_loglevel_op,
-/* 4 */ &sysrq_loglevel_op,
-/* 5 */ &sysrq_loglevel_op,
-/* 6 */ &sysrq_loglevel_op,
-/* 7 */ &sysrq_loglevel_op,
-/* 8 */ &sysrq_loglevel_op,
-/* 9 */ &sysrq_loglevel_op,
-/* a */ NULL, /* Don't use for system provided sysrqs,
-                 it is handled specially on the sparc
-                 and will never arrive */
-/* b */ &sysrq_reboot_op,
-#ifdef CONFIG_KEXEC
-/* c */ &sysrq_crashdump_op,
-#else
-/* c */ NULL,
-#endif
-#ifdef CONFIG_DEBUG_MUTEXES
-/* d */ &sysrq_showlocks_op,
-#else
-/* d */ NULL,
-#endif
-/* e */ &sysrq_term_op,
-/* f */ &sysrq_moom_op,
-/* g */ NULL,
-/* h */ NULL,
-/* i */ &sysrq_kill_op,
-/* j */ NULL,
-#ifdef CONFIG_VT
-/* k */ &sysrq_SAK_op,
-#else
-/* k */ NULL,
-#endif
-/* l */ NULL,
-/* m */ &sysrq_showmem_op,
-/* n */ &sysrq_unrt_op,
-/* o */ NULL, /* This will often be registered
-                 as 'Off' at init time */
-/* p */ &sysrq_showregs_op,
-/* q */ NULL,
-#ifdef CONFIG_VT
-/* r */ &sysrq_unraw_op,
-#else
-/* r */ NULL,
-#endif
-/* s */ &sysrq_sync_op,
-/* t */ &sysrq_showstate_op,
-/* u */ &sysrq_mountro_op,
-/* v */ NULL, /* May be assigned at init time by SMP VOYAGER */
-/* w */ NULL,
-/* x */ NULL,
-/* y */ NULL,
-/* z */ NULL
+
+static struct sysrq_key_op *sysrq_key_table[36] = {
+        &sysrq_loglevel_op,             /* 0 */
+        &sysrq_loglevel_op,             /* 1 */
+        &sysrq_loglevel_op,             /* 2 */
+        &sysrq_loglevel_op,             /* 3 */
+        &sysrq_loglevel_op,             /* 4 */
+        &sysrq_loglevel_op,             /* 5 */
+        &sysrq_loglevel_op,             /* 6 */
+        &sysrq_loglevel_op,             /* 7 */
+        &sysrq_loglevel_op,             /* 8 */
+        &sysrq_loglevel_op,             /* 9 */
+
+        /*
+         * Don't use for system provided sysrqs, it is handled specially on
+         * sparc and will never arrive
+         */
+        NULL,                           /* a */
+        &sysrq_reboot_op,               /* b */
+        &sysrq_crashdump_op,            /* c */
+        &sysrq_showlocks_op,            /* d */
+        &sysrq_term_op,                 /* e */
+        &sysrq_moom_op,                 /* f */
+        NULL,                           /* g */
+        NULL,                           /* h */
+        &sysrq_kill_op,                 /* i */
+        NULL,                           /* j */
+        &sysrq_SAK_op,                  /* k */
+        NULL,                           /* l */
+        &sysrq_showmem_op,              /* m */
+        &sysrq_unrt_op,                 /* n */
+        /* This will often be registered as 'Off' at init time */
+        NULL,                           /* o */
+        &sysrq_showregs_op,             /* p */
+        NULL,                           /* q */
+        &sysrq_unraw_op,                        /* r */
+        &sysrq_sync_op,                 /* s */
+        &sysrq_showstate_op,            /* t */
+        &sysrq_mountro_op,              /* u */
+        /* May be assigned at init time by SMP VOYAGER */
+        NULL,                           /* v */
+        NULL,                           /* w */
+        NULL,                           /* x */
+        NULL,                           /* y */
+        NULL                            /* z */
 };
 
 /* key2index calculation, -1 on invalid index */
-static int sysrq_key_table_key2index(int key) {
+static int sysrq_key_table_key2index(int key)
+{
         int retval;
-        if ((key >= '0') && (key <= '9')) {
+
+        if ((key >= '0') && (key <= '9'))
                 retval = key - '0';
-        } else if ((key >= 'a') && (key <= 'z')) {
+        else if ((key >= 'a') && (key <= 'z'))
                 retval = key + 10 - 'a';
-        } else {
+        else
                 retval = -1;
-        }
         return retval;
 }
 
 /*
  * get and put functions for the table, exposed to modules.
  */
-
-struct sysrq_key_op *__sysrq_get_key_op (int key) {
-        struct sysrq_key_op *op_p;
+struct sysrq_key_op *__sysrq_get_key_op(int key)
+{
+        struct sysrq_key_op *op_p = NULL;
         int i;
-        
+
         i = sysrq_key_table_key2index(key);
-        op_p = (i == -1) ? NULL : sysrq_key_table[i];
+        if (i != -1)
+                op_p = sysrq_key_table[i];
         return op_p;
 }
 
-static void __sysrq_put_key_op (int key, struct sysrq_key_op *op_p) {
-        int i;
+static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p)
+{
+        int i = sysrq_key_table_key2index(key);
 
-        i = sysrq_key_table_key2index(key);
         if (i != -1)
                 sysrq_key_table[i] = op_p;
 }
 
 /*
- * This is the non-locking version of handle_sysrq
- * It must/can only be called by sysrq key handlers,
- * as they are inside of the lock
+ * This is the non-locking version of handle_sysrq.  It must/can only be called
+ * by sysrq key handlers, as they are inside of the lock
  */
-
-void __handle_sysrq(int key, struct pt_regs *pt_regs, struct tty_struct *tty, int check_mask)
+void __handle_sysrq(int key, struct pt_regs *pt_regs, struct tty_struct *tty,
+                        int check_mask)
 {
         struct sysrq_key_op *op_p;
         int orig_log_level;
-        int i, j;
+        int i;
         unsigned long flags;
 
         spin_lock_irqsave(&sysrq_key_table_lock, flags);
@@ -401,26 +375,34 @@ void __handle_sysrq(int key, struct pt_regs *pt_regs, struct tty_struct *tty, in
 
         op_p = __sysrq_get_key_op(key);
         if (op_p) {
-                /* Should we check for enabled operations (/proc/sysrq-trigger should not)
-                 * and is the invoked operation enabled? */
+                /*
+                 * Should we check for enabled operations (/proc/sysrq-trigger
+                 * should not) and is the invoked operation enabled?
+                 */
                 if (!check_mask || sysrq_enabled == 1 ||
                     (sysrq_enabled & op_p->enable_mask)) {
-                        printk ("%s\n", op_p->action_msg);
+                        printk("%s\n", op_p->action_msg);
                         console_loglevel = orig_log_level;
                         op_p->handler(key, pt_regs, tty);
-                }
-                else
+                } else {
                         printk("This sysrq operation is disabled.\n");
+                }
         } else {
                 printk("HELP : ");
                 /* Only print the help msg once per handler */
-                for (i=0; i<SYSRQ_KEY_TABLE_LENGTH; i++) 
-                if (sysrq_key_table[i]) {
-                        for (j=0; sysrq_key_table[i] != sysrq_key_table[j]; j++);
-                        if (j == i)
-                                printk ("%s ", sysrq_key_table[i]->help_msg);
+                for (i = 0; i < ARRAY_SIZE(sysrq_key_table); i++) {
+                        if (sysrq_key_table[i]) {
+                                int j;
+
+                                for (j = 0; sysrq_key_table[i] !=
+                                                sysrq_key_table[j]; j++)
+                                        ;
+                                if (j != i)
+                                        continue;
+                                printk("%s ", sysrq_key_table[i]->help_msg);
+                        }
                 }
-                printk ("\n");
+                printk("\n");
                 console_loglevel = orig_log_level;
         }
         spin_unlock_irqrestore(&sysrq_key_table_lock, flags);
@@ -430,16 +412,17 @@ void __handle_sysrq(int key, struct pt_regs *pt_regs, struct tty_struct *tty, in
  * This function is called by the keyboard handler when SysRq is pressed
  * and any other keycode arrives.
  */
-
 void handle_sysrq(int key, struct pt_regs *pt_regs, struct tty_struct *tty)
 {
         if (!sysrq_enabled)
                 return;
         __handle_sysrq(key, pt_regs, tty, 1);
 }
+EXPORT_SYMBOL(handle_sysrq);
 
 static int __sysrq_swap_key_ops(int key, struct sysrq_key_op *insert_op_p,
-                                struct sysrq_key_op *remove_op_p) {
+                                struct sysrq_key_op *remove_op_p)
+{
 
         int retval;
         unsigned long flags;
@@ -452,7 +435,6 @@ static int __sysrq_swap_key_ops(int key, struct sysrq_key_op *insert_op_p,
                 retval = -1;
         }
         spin_unlock_irqrestore(&sysrq_key_table_lock, flags);
-
         return retval;
 }
 
@@ -460,12 +442,10 @@ int register_sysrq_key(int key, struct sysrq_key_op *op_p)
 {
         return __sysrq_swap_key_ops(key, op_p, NULL);
 }
+EXPORT_SYMBOL(register_sysrq_key);
 
 int unregister_sysrq_key(int key, struct sysrq_key_op *op_p)
 {
         return __sysrq_swap_key_ops(key, NULL, op_p);
 }
-
-EXPORT_SYMBOL(handle_sysrq);
-EXPORT_SYMBOL(register_sysrq_key);
 EXPORT_SYMBOL(unregister_sysrq_key);
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c
index 4c272189cd..2546637a55 100644
--- a/drivers/char/tlclk.c
+++ b/drivers/char/tlclk.c
@@ -767,6 +767,7 @@ static int __init tlclk_init(void)
                 printk(KERN_ERR "tlclk: can't get major %d.\n", tlclk_major);
                 return ret;
         }
+        tlclk_major = ret;
         alarm_events = kzalloc( sizeof(struct tlclk_alarms), GFP_KERNEL);
         if (!alarm_events)
                 goto out1;
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index fd3a4beaa5..dec0224b44 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -24,6 +24,7 @@
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/platform_device.h>
+#include <linux/io.h>
 
 enum tpm_timeout {
         TPM_TIMEOUT = 5,        /* msecs */
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 76592ee1fb..0bfd1b6366 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -354,7 +354,7 @@ int tty_buffer_request_room(struct tty_struct *tty, size_t size)
 
 EXPORT_SYMBOL_GPL(tty_buffer_request_room);
 
-int tty_insert_flip_string(struct tty_struct *tty, unsigned char *chars, size_t size)
+int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *chars, size_t size)
 {
         int copied = 0;
         do {
@@ -378,7 +378,7 @@ int tty_insert_flip_string(struct tty_struct *tty, unsigned char *chars, size_t
 
 EXPORT_SYMBOL_GPL(tty_insert_flip_string);
 
-int tty_insert_flip_string_flags(struct tty_struct *tty, unsigned char *chars, char *flags, size_t size)
+int tty_insert_flip_string_flags(struct tty_struct *tty, const unsigned char *chars, const char *flags, size_t size)
 {
         int copied = 0;
         do {
@@ -543,14 +543,12 @@ void tty_ldisc_put(int disc)
         struct tty_ldisc *ld;
         unsigned long flags;
         
-        if (disc < N_TTY || disc >= NR_LDISCS)
-                BUG();
+        BUG_ON(disc < N_TTY || disc >= NR_LDISCS);
                 
         spin_lock_irqsave(&tty_ldisc_lock, flags);
         ld = &tty_ldiscs[disc];
-        if(ld->refcount == 0)
-                BUG();
-        ld->refcount --;
+        BUG_ON(ld->refcount == 0);
+        ld->refcount--;
         module_put(ld->owner);
         spin_unlock_irqrestore(&tty_ldisc_lock, flags);
 }
@@ -645,8 +643,7 @@ void tty_ldisc_deref(struct tty_ldisc *ld)
 {
         unsigned long flags;
 
-        if(ld == NULL)
-                BUG();
+        BUG_ON(ld == NULL);
                 
         spin_lock_irqsave(&tty_ldisc_lock, flags);
         if(ld->refcount == 0)
@@ -1097,8 +1094,8 @@ static void do_tty_hangup(void *data)
                                 p->signal->tty = NULL;
                         if (!p->signal->leader)
                                 continue;
-                        send_group_sig_info(SIGHUP, SEND_SIG_PRIV, p);
-                        send_group_sig_info(SIGCONT, SEND_SIG_PRIV, p);
+                        group_send_sig_info(SIGHUP, SEND_SIG_PRIV, p);
+                        group_send_sig_info(SIGCONT, SEND_SIG_PRIV, p);
                         if (tty->pgrp > 0)
                                 p->signal->tty_old_pgrp = tty->pgrp;
                 } while_each_task_pid(tty->session, PIDTYPE_SID, p);
@@ -2675,7 +2672,7 @@ static void __do_SAK(void *arg)
         tty_hangup(tty);
 #else
         struct tty_struct *tty = arg;
-        struct task_struct *p;
+        struct task_struct *g, *p;
         int session;
         int             i;
         struct file     *filp;
@@ -2696,8 +2693,18 @@ static void __do_SAK(void *arg)
                 tty->driver->flush_buffer(tty);
         
         read_lock(&tasklist_lock);
+        /* Kill the entire session */
         do_each_task_pid(session, PIDTYPE_SID, p) {
-                if (p->signal->tty == tty || session > 0) {
+                printk(KERN_NOTICE "SAK: killed process %d"
+                        " (%s): p->signal->session==tty->session\n",
+                        p->pid, p->comm);
+                send_sig(SIGKILL, p, 1);
+        } while_each_task_pid(session, PIDTYPE_SID, p);
+        /* Now kill any processes that happen to have the
+         * tty open.
+         */
+        do_each_thread(g, p) {
+                if (p->signal->tty == tty) {
                         printk(KERN_NOTICE "SAK: killed process %d"
                             " (%s): p->signal->session==tty->session\n",
                             p->pid, p->comm);
@@ -2724,7 +2731,7 @@ static void __do_SAK(void *arg)
                         rcu_read_unlock();
                 }
                 task_unlock(p);
-        } while_each_task_pid(session, PIDTYPE_SID, p);
+        } while_each_thread(g, p);
         read_unlock(&tasklist_lock);
 #endif
 }
diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index c0dfcf273f..16e99db2e1 100644
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -148,6 +148,16 @@ config MPCORE_WATCHDOG
           To compile this driver as a module, choose M here: the
           module will be called mpcore_wdt.
 
+config EP93XX_WATCHDOG
+        tristate "EP93xx Watchdog"
+        depends on WATCHDOG && ARCH_EP93XX
+        help
+          Say Y here if to include support for the watchdog timer
+          embedded in the Cirrus Logic EP93xx family of devices.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ep93xx_wdt.
+
 # X86 (i386 + ia64 + x86_64) Architecture
 
 config ACQUIRE_WDT
diff --git a/drivers/char/watchdog/Makefile b/drivers/char/watchdog/Makefile
index 36c0b282b8..d6f27fde99 100644
--- a/drivers/char/watchdog/Makefile
+++ b/drivers/char/watchdog/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
 obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o
 obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
 obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o
+obj-$(CONFIG_EP93XX_WATCHDOG) += ep93xx_wdt.o
 
 # X86 (i386 + ia64 + x86_64) Architecture
 obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
diff --git a/drivers/char/watchdog/ep93xx_wdt.c b/drivers/char/watchdog/ep93xx_wdt.c
new file mode 100644
index 0000000000..9021dbb782
--- /dev/null
+++ b/drivers/char/watchdog/ep93xx_wdt.c
@@ -0,0 +1,257 @@
+/*
+ * Watchdog driver for Cirrus Logic EP93xx family of devices.
+ *
+ * Copyright (c) 2004 Ray Lehtiniemi
+ * Copyright (c) 2006 Tower Technologies
+ * Based on ep93xx driver, bits from alim7101_wdt.c
+ *
+ * Authors: Ray Lehtiniemi <rayl@mail.com>,
+ *      Alessandro Zummo <a.zummo@towertech.it>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ *
+ * This watchdog fires after 250msec, which is a too short interval
+ * for us to rely on the user space daemon alone. So we ping the
+ * wdt each ~200msec and eventually stop doing it if the user space
+ * daemon dies.
+ *
+ * TODO:
+ *
+ *      - Test last reset from watchdog status
+ *      - Add a few missing ioctls
+ */
+
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/miscdevice.h>
+#include <linux/watchdog.h>
+#include <linux/timer.h>
+
+#include <asm/hardware.h>
+#include <asm/uaccess.h>
+
+#define WDT_VERSION     "0.3"
+#define PFX             "ep93xx_wdt: "
+
+/* default timeout (secs) */
+#define WDT_TIMEOUT 30
+
+static int nowayout = WATCHDOG_NOWAYOUT;
+static int timeout = WDT_TIMEOUT;
+
+static struct timer_list timer;
+static unsigned long next_heartbeat;
+static unsigned long wdt_status;
+static unsigned long boot_status;
+
+#define WDT_IN_USE              0
+#define WDT_OK_TO_CLOSE         1
+
+#define EP93XX_WDT_REG(x)       (EP93XX_WATCHDOG_BASE + (x))
+#define EP93XX_WDT_WATCHDOG     EP93XX_WDT_REG(0x00)
+#define EP93XX_WDT_WDSTATUS     EP93XX_WDT_REG(0x04)
+
+/* reset the wdt every ~200ms */
+#define WDT_INTERVAL (HZ/5)
+
+static void wdt_enable(void)
+{
+        __raw_writew(0xaaaa, EP93XX_WDT_WATCHDOG);
+}
+
+static void wdt_disable(void)
+{
+        __raw_writew(0xaa55, EP93XX_WDT_WATCHDOG);
+}
+
+static inline void wdt_ping(void)
+{
+        __raw_writew(0x5555, EP93XX_WDT_WATCHDOG);
+}
+
+static void wdt_startup(void)
+{
+        next_heartbeat = jiffies + (timeout * HZ);
+
+        wdt_enable();
+        mod_timer(&timer, jiffies + WDT_INTERVAL);
+}
+
+static void wdt_shutdown(void)
+{
+        del_timer_sync(&timer);
+        wdt_disable();
+}
+
+static void wdt_keepalive(void)
+{
+        /* user land ping */
+        next_heartbeat = jiffies + (timeout * HZ);
+}
+
+static int ep93xx_wdt_open(struct inode *inode, struct file *file)
+{
+        if (test_and_set_bit(WDT_IN_USE, &wdt_status))
+                return -EBUSY;
+
+        clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
+
+        wdt_startup();
+
+        return nonseekable_open(inode, file);
+}
+
+static ssize_t
+ep93xx_wdt_write(struct file *file, const char __user *data, size_t len,
+                 loff_t *ppos)
+{
+        /* Can't seek (pwrite) on this device */
+        if (*ppos != file->f_pos)
+                return -ESPIPE;
+
+        if (len) {
+                if (!nowayout) {
+                        size_t i;
+
+                        clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
+
+                        for (i = 0; i != len; i++) {
+                                char c;
+
+                                if (get_user(c, data + i))
+                                        return -EFAULT;
+
+                                if (c == 'V')
+                                        set_bit(WDT_OK_TO_CLOSE, &wdt_status);
+                                else
+                                        clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
+                        }
+                }
+                wdt_keepalive();
+        }
+
+        return len;
+}
+
+static struct watchdog_info ident = {
+        .options = WDIOF_CARDRESET | WDIOF_MAGICCLOSE,
+        .identity = "EP93xx Watchdog",
+};
+
+static int
+ep93xx_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
+                 unsigned long arg)
+{
+        int ret = -ENOIOCTLCMD;
+
+        switch (cmd) {
+        case WDIOC_GETSUPPORT:
+                ret = copy_to_user((struct watchdog_info __user *)arg, &ident,
+                                sizeof(ident)) ? -EFAULT : 0;
+                break;
+
+        case WDIOC_GETSTATUS:
+                ret = put_user(0, (int __user *)arg);
+                break;
+
+        case WDIOC_GETBOOTSTATUS:
+                ret = put_user(boot_status, (int __user *)arg);
+                break;
+
+        case WDIOC_GETTIMEOUT:
+                /* actually, it is 0.250 seconds.... */
+                ret = put_user(1, (int __user *)arg);
+                break;
+
+        case WDIOC_KEEPALIVE:
+                wdt_keepalive();
+                ret = 0;
+                break;
+        }
+        return ret;
+}
+
+static int ep93xx_wdt_release(struct inode *inode, struct file *file)
+{
+        if (test_bit(WDT_OK_TO_CLOSE, &wdt_status))
+                wdt_shutdown();
+        else
+                printk(KERN_CRIT PFX "Device closed unexpectedly - "
+                        "timer will not stop\n");
+
+        clear_bit(WDT_IN_USE, &wdt_status);
+        clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
+
+        return 0;
+}
+
+static struct file_operations ep93xx_wdt_fops = {
+        .owner          = THIS_MODULE,
+        .write          = ep93xx_wdt_write,
+        .ioctl          = ep93xx_wdt_ioctl,
+        .open           = ep93xx_wdt_open,
+        .release        = ep93xx_wdt_release,
+};
+
+static struct miscdevice ep93xx_wdt_miscdev = {
+        .minor          = WATCHDOG_MINOR,
+        .name           = "watchdog",
+        .fops           = &ep93xx_wdt_fops,
+};
+
+static void ep93xx_timer_ping(unsigned long data)
+{
+        if (time_before(jiffies, next_heartbeat))
+                wdt_ping();
+
+        /* Re-set the timer interval */
+        mod_timer(&timer, jiffies + WDT_INTERVAL);
+}
+
+static int __init ep93xx_wdt_init(void)
+{
+        int err;
+
+        err = misc_register(&ep93xx_wdt_miscdev);
+
+        boot_status = __raw_readl(EP93XX_WDT_WATCHDOG) & 0x01 ? 1 : 0;
+
+        printk(KERN_INFO PFX "EP93XX watchdog, driver version "
+                WDT_VERSION "%s\n",
+                (__raw_readl(EP93XX_WDT_WATCHDOG) & 0x08)
+                ? " (nCS1 disable detected)" : "");
+
+        if (timeout < 1 || timeout > 3600) {
+                timeout = WDT_TIMEOUT;
+                printk(KERN_INFO PFX
+                        "timeout value must be 1<=x<=3600, using %d\n",
+                        timeout);
+        }
+
+        setup_timer(&timer, ep93xx_timer_ping, 1);
+        return err;
+}
+
+static void __exit ep93xx_wdt_exit(void)
+{
+        wdt_shutdown();
+        misc_deregister(&ep93xx_wdt_miscdev);
+}
+
+module_init(ep93xx_wdt_init);
+module_exit(ep93xx_wdt_exit);
+
+module_param(nowayout, int, 0);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
+
+module_param(timeout, int, 0);
+MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=3600, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
+
+MODULE_AUTHOR("Ray Lehtiniemi <rayl@mail.com>,"
+                "Alessandro Zummo <a.zummo@towertech.it>");
+MODULE_DESCRIPTION("EP93xx Watchdog");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(WDT_VERSION);
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 9582de1c9c..9b6ae7dc8b 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -5,7 +5,9 @@
  *            (C) 2002 - 2003 Dominik Brodowski <linux@brodo.de>
  *
  *  Oct 2005 - Ashok Raj <ashok.raj@intel.com>
- *                      Added handling for CPU hotplug
+ *      Added handling for CPU hotplug
+ *  Feb 2006 - Jacob Shin <jacob.shin@amd.com>
+ *      Fix handling for CPU hotplug -- affected CPUs
  *
  * 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
@@ -44,15 +46,14 @@ static int __cpufreq_governor(struct cpufreq_policy *policy, unsigned int event)
 static void handle_update(void *data);
 
 /**
- * Two notifier lists: the "policy" list is involved in the 
- * validation process for a new CPU frequency policy; the 
+ * Two notifier lists: the "policy" list is involved in the
+ * validation process for a new CPU frequency policy; the
  * "transition" list for kernel code that needs to handle
  * changes to devices when the CPU clock speed changes.
  * The mutex locks both lists.
  */
-static struct notifier_block *cpufreq_policy_notifier_list;
-static struct notifier_block *cpufreq_transition_notifier_list;
-static DECLARE_RWSEM (cpufreq_notifier_rwsem);
+static BLOCKING_NOTIFIER_HEAD(cpufreq_policy_notifier_list);
+static BLOCKING_NOTIFIER_HEAD(cpufreq_transition_notifier_list);
 
 
 static LIST_HEAD(cpufreq_governor_list);
@@ -151,7 +152,7 @@ void cpufreq_debug_printk(unsigned int type, const char *prefix, const char *fmt
         va_list args;
         unsigned int len;
         unsigned long flags;
-        
+
         WARN_ON(!prefix);
         if (type & debug) {
                 spin_lock_irqsave(&disable_ratelimit_lock, flags);
@@ -198,7 +199,7 @@ static inline void cpufreq_debug_disable_ratelimit(void) { return; }
  *
  * This function alters the system "loops_per_jiffy" for the clock
  * speed change. Note that loops_per_jiffy cannot be updated on SMP
- * systems as each CPU might be scaled differently. So, use the arch 
+ * systems as each CPU might be scaled differently. So, use the arch
  * per-CPU loops_per_jiffy value wherever possible.
  */
 #ifndef CONFIG_SMP
@@ -233,7 +234,7 @@ static inline void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci) {
  *
  * This function calls the transition notifiers and the "adjust_jiffies"
  * function. It is called twice on all CPU frequency changes that have
- * external effects. 
+ * external effects.
  */
 void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state)
 {
@@ -245,13 +246,11 @@ void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state)
         dprintk("notification %u of frequency transition to %u kHz\n",
                 state, freqs->new);
 
-        down_read(&cpufreq_notifier_rwsem);
-
         policy = cpufreq_cpu_data[freqs->cpu];
         switch (state) {
 
         case CPUFREQ_PRECHANGE:
-                /* detect if the driver reported a value as "old frequency" 
+                /* detect if the driver reported a value as "old frequency"
                  * which is not equal to what the cpufreq core thinks is
                  * "old frequency".
                  */
@@ -264,20 +263,19 @@ void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state)
                                 freqs->old = policy->cur;
                         }
                 }
-                notifier_call_chain(&cpufreq_transition_notifier_list,
-                                        CPUFREQ_PRECHANGE, freqs);
+                blocking_notifier_call_chain(&cpufreq_transition_notifier_list,
+                                CPUFREQ_PRECHANGE, freqs);
                 adjust_jiffies(CPUFREQ_PRECHANGE, freqs);
                 break;
 
         case CPUFREQ_POSTCHANGE:
                 adjust_jiffies(CPUFREQ_POSTCHANGE, freqs);
-                notifier_call_chain(&cpufreq_transition_notifier_list,
-                                        CPUFREQ_POSTCHANGE, freqs);
+                blocking_notifier_call_chain(&cpufreq_transition_notifier_list,
+                                CPUFREQ_POSTCHANGE, freqs);
                 if (likely(policy) && likely(policy->cpu == freqs->cpu))
                         policy->cur = freqs->new;
                 break;
         }
-        up_read(&cpufreq_notifier_rwsem);
 }
 EXPORT_SYMBOL_GPL(cpufreq_notify_transition);
 
@@ -335,11 +333,11 @@ extern struct sysdev_class cpu_sysdev_class;
  * "unsigned int".
  */
 
-#define show_one(file_name, object)                                     \
-static ssize_t show_##file_name                                         \
-(struct cpufreq_policy * policy, char *buf)                             \
-{                                                                       \
-        return sprintf (buf, "%u\n", policy->object);                   \
+#define show_one(file_name, object)                     \
+static ssize_t show_##file_name                         \
+(struct cpufreq_policy * policy, char *buf)             \
+{                                                       \
+        return sprintf (buf, "%u\n", policy->object);   \
 }
 
 show_one(cpuinfo_min_freq, cpuinfo.min_freq);
@@ -404,8 +402,8 @@ static ssize_t show_scaling_governor (struct cpufreq_policy * policy, char *buf)
 /**
  * store_scaling_governor - store policy for the specified CPU
  */
-static ssize_t store_scaling_governor (struct cpufreq_policy * policy, 
-                                       const char *buf, size_t count) 
+static ssize_t store_scaling_governor (struct cpufreq_policy * policy,
+                                       const char *buf, size_t count)
 {
         unsigned int ret = -EINVAL;
         char    str_governor[16];
@@ -528,7 +526,7 @@ static ssize_t show(struct kobject * kobj, struct attribute * attr ,char * buf)
         return ret;
 }
 
-static ssize_t store(struct kobject * kobj, struct attribute * attr, 
+static ssize_t store(struct kobject * kobj, struct attribute * attr,
                      const char * buf, size_t count)
 {
         struct cpufreq_policy * policy = to_policy(kobj);
@@ -564,7 +562,7 @@ static struct kobj_type ktype_cpufreq = {
 /**
  * cpufreq_add_dev - add a CPU device
  *
- * Adds the cpufreq interface for a CPU device. 
+ * Adds the cpufreq interface for a CPU device.
  */
 static int cpufreq_add_dev (struct sys_device * sys_dev)
 {
@@ -573,8 +571,12 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
         struct cpufreq_policy new_policy;
         struct cpufreq_policy *policy;
         struct freq_attr **drv_attr;
+        struct sys_device *cpu_sys_dev;
         unsigned long flags;
         unsigned int j;
+#ifdef CONFIG_SMP
+        struct cpufreq_policy *managed_policy;
+#endif
 
         if (cpu_is_offline(cpu))
                 return 0;
@@ -587,8 +589,7 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
          * CPU because it is in the same boat. */
         policy = cpufreq_cpu_get(cpu);
         if (unlikely(policy)) {
-                dprintk("CPU already managed, adding link\n");
-                sysfs_create_link(&sys_dev->kobj, &policy->kobj, "cpufreq");
+                cpufreq_cpu_put(policy);
                 cpufreq_debug_enable_ratelimit();
                 return 0;
         }
@@ -623,6 +624,32 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
                 goto err_out;
         }
 
+#ifdef CONFIG_SMP
+        for_each_cpu_mask(j, policy->cpus) {
+                if (cpu == j)
+                        continue;
+
+                /* check for existing affected CPUs.  They may not be aware
+                 * of it due to CPU Hotplug.
+                 */
+                managed_policy = cpufreq_cpu_get(j);
+                if (unlikely(managed_policy)) {
+                        spin_lock_irqsave(&cpufreq_driver_lock, flags);
+                        managed_policy->cpus = policy->cpus;
+                        cpufreq_cpu_data[cpu] = managed_policy;
+                        spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
+
+                        dprintk("CPU already managed, adding link\n");
+                        sysfs_create_link(&sys_dev->kobj,
+                                          &managed_policy->kobj, "cpufreq");
+
+                        cpufreq_debug_enable_ratelimit();
+                        mutex_unlock(&policy->lock);
+                        ret = 0;
+                        goto err_out_driver_exit; /* call driver->exit() */
+                }
+        }
+#endif
         memcpy(&new_policy, policy, sizeof(struct cpufreq_policy));
 
         /* prepare interface data */
@@ -650,6 +677,21 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
         for_each_cpu_mask(j, policy->cpus)
                 cpufreq_cpu_data[j] = policy;
         spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
+
+        /* symlink affected CPUs */
+        for_each_cpu_mask(j, policy->cpus) {
+                if (j == cpu)
+                        continue;
+                if (!cpu_online(j))
+                        continue;
+
+                dprintk("CPU already managed, adding link\n");
+                cpufreq_cpu_get(cpu);
+                cpu_sys_dev = get_cpu_sysdev(j);
+                sysfs_create_link(&cpu_sys_dev->kobj, &policy->kobj,
+                                  "cpufreq");
+        }
+
         policy->governor = NULL; /* to assure that the starting sequence is
                                   * run in cpufreq_set_policy */
         mutex_unlock(&policy->lock);
@@ -724,10 +766,11 @@ static int cpufreq_remove_dev (struct sys_device * sys_dev)
 
 #ifdef CONFIG_SMP
         /* if this isn't the CPU which is the parent of the kobj, we
-         * only need to unlink, put and exit 
+         * only need to unlink, put and exit
          */
         if (unlikely(cpu != data->cpu)) {
                 dprintk("removing link\n");
+                cpu_clear(cpu, data->cpus);
                 spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
                 sysfs_remove_link(&sys_dev->kobj, "cpufreq");
                 cpufreq_cpu_put(data);
@@ -740,7 +783,7 @@ static int cpufreq_remove_dev (struct sys_device * sys_dev)
         if (!kobject_get(&data->kobj)) {
                 spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
                 cpufreq_debug_enable_ratelimit();
-                return -EFAULT;
+                return -EFAULT;
         }
 
 #ifdef CONFIG_SMP
@@ -783,7 +826,7 @@ static int cpufreq_remove_dev (struct sys_device * sys_dev)
         kobject_put(&data->kobj);
 
         /* we need to make sure that the underlying kobj is actually
-         * not referenced anymore by anybody before we proceed with 
+         * not referenced anymore by anybody before we proceed with
          * unloading.
          */
         dprintk("waiting for dropping of refcount\n");
@@ -831,7 +874,7 @@ static void cpufreq_out_of_sync(unsigned int cpu, unsigned int old_freq, unsigne
 }
 
 
-/** 
+/**
  * cpufreq_quick_get - get the CPU frequency (in kHz) frpm policy->cur
  * @cpu: CPU number
  *
@@ -855,7 +898,7 @@ unsigned int cpufreq_quick_get(unsigned int cpu)
 EXPORT_SYMBOL(cpufreq_quick_get);
 
 
-/** 
+/**
  * cpufreq_get - get the current CPU frequency (in kHz)
  * @cpu: CPU number
  *
@@ -960,7 +1003,7 @@ static int cpufreq_suspend(struct sys_device * sysdev, pm_message_t pmsg)
                 freqs.old = cpu_policy->cur;
                 freqs.new = cur_freq;
 
-                notifier_call_chain(&cpufreq_transition_notifier_list,
+                blocking_notifier_call_chain(&cpufreq_transition_notifier_list,
                                     CPUFREQ_SUSPENDCHANGE, &freqs);
                 adjust_jiffies(CPUFREQ_SUSPENDCHANGE, &freqs);
 
@@ -1041,7 +1084,8 @@ static int cpufreq_resume(struct sys_device * sysdev)
                         freqs.old = cpu_policy->cur;
                         freqs.new = cur_freq;
 
-                        notifier_call_chain(&cpufreq_transition_notifier_list,
+                        blocking_notifier_call_chain(
+                                        &cpufreq_transition_notifier_list,
                                         CPUFREQ_RESUMECHANGE, &freqs);
                         adjust_jiffies(CPUFREQ_RESUMECHANGE, &freqs);
 
@@ -1072,30 +1116,30 @@ static struct sysdev_driver cpufreq_sysdev_driver = {
  *      @nb: notifier function to register
  *      @list: CPUFREQ_TRANSITION_NOTIFIER or CPUFREQ_POLICY_NOTIFIER
  *
- *      Add a driver to one of two lists: either a list of drivers that 
+ *      Add a driver to one of two lists: either a list of drivers that
  *      are notified about clock rate changes (once before and once after
  *      the transition), or a list of drivers that are notified about
  *      changes in cpufreq policy.
  *
  *      This function may sleep, and has the same return conditions as
- *      notifier_chain_register.
+ *      blocking_notifier_chain_register.
  */
 int cpufreq_register_notifier(struct notifier_block *nb, unsigned int list)
 {
         int ret;
 
-        down_write(&cpufreq_notifier_rwsem);
         switch (list) {
         case CPUFREQ_TRANSITION_NOTIFIER:
-                ret = notifier_chain_register(&cpufreq_transition_notifier_list, nb);
+                ret = blocking_notifier_chain_register(
+                                &cpufreq_transition_notifier_list, nb);
                 break;
         case CPUFREQ_POLICY_NOTIFIER:
-                ret = notifier_chain_register(&cpufreq_policy_notifier_list, nb);
+                ret = blocking_notifier_chain_register(
+                                &cpufreq_policy_notifier_list, nb);
                 break;
         default:
                 ret = -EINVAL;
         }
-        up_write(&cpufreq_notifier_rwsem);
 
         return ret;
 }
@@ -1110,24 +1154,24 @@ EXPORT_SYMBOL(cpufreq_register_notifier);
  *      Remove a driver from the CPU frequency notifier list.
  *
  *      This function may sleep, and has the same return conditions as
- *      notifier_chain_unregister.
+ *      blocking_notifier_chain_unregister.
  */
 int cpufreq_unregister_notifier(struct notifier_block *nb, unsigned int list)
 {
         int ret;
 
-        down_write(&cpufreq_notifier_rwsem);
         switch (list) {
         case CPUFREQ_TRANSITION_NOTIFIER:
-                ret = notifier_chain_unregister(&cpufreq_transition_notifier_list, nb);
+                ret = blocking_notifier_chain_unregister(
+                                &cpufreq_transition_notifier_list, nb);
                 break;
         case CPUFREQ_POLICY_NOTIFIER:
-                ret = notifier_chain_unregister(&cpufreq_policy_notifier_list, nb);
+                ret = blocking_notifier_chain_unregister(
+                                &cpufreq_policy_notifier_list, nb);
                 break;
         default:
                 ret = -EINVAL;
         }
-        up_write(&cpufreq_notifier_rwsem);
 
         return ret;
 }
@@ -1225,7 +1269,7 @@ int cpufreq_register_governor(struct cpufreq_governor *governor)
                 return -EINVAL;
 
         mutex_lock(&cpufreq_governor_mutex);
-        
+
         list_for_each_entry(t, &cpufreq_governor_list, governor_list) {
                 if (!strnicmp(governor->name,t->name,CPUFREQ_NAME_LEN)) {
                         mutex_unlock(&cpufreq_governor_mutex);
@@ -1234,7 +1278,7 @@ int cpufreq_register_governor(struct cpufreq_governor *governor)
         }
         list_add(&governor->governor_list, &cpufreq_governor_list);
 
-        mutex_unlock(&cpufreq_governor_mutex);
+        mutex_unlock(&cpufreq_governor_mutex);
         return 0;
 }
 EXPORT_SYMBOL_GPL(cpufreq_register_governor);
@@ -1299,29 +1343,23 @@ static int __cpufreq_set_policy(struct cpufreq_policy *data, struct cpufreq_poli
         if (ret)
                 goto error_out;
 
-        down_read(&cpufreq_notifier_rwsem);
-
         /* adjust if necessary - all reasons */
-        notifier_call_chain(&cpufreq_policy_notifier_list, CPUFREQ_ADJUST,
-                            policy);
+        blocking_notifier_call_chain(&cpufreq_policy_notifier_list,
+                        CPUFREQ_ADJUST, policy);
 
         /* adjust if necessary - hardware incompatibility*/
-        notifier_call_chain(&cpufreq_policy_notifier_list, CPUFREQ_INCOMPATIBLE,
-                            policy);
+        blocking_notifier_call_chain(&cpufreq_policy_notifier_list,
+                        CPUFREQ_INCOMPATIBLE, policy);
 
         /* verify the cpu speed can be set within this limit,
            which might be different to the first one */
         ret = cpufreq_driver->verify(policy);
-        if (ret) {
-                up_read(&cpufreq_notifier_rwsem);
+        if (ret)
                 goto error_out;
-        }
 
         /* notification of the new policy */
-        notifier_call_chain(&cpufreq_policy_notifier_list, CPUFREQ_NOTIFY,
-                            policy);
-
-        up_read(&cpufreq_notifier_rwsem);
+        blocking_notifier_call_chain(&cpufreq_policy_notifier_list,
+                        CPUFREQ_NOTIFY, policy);
 
         data->min = policy->min;
         data->max = policy->max;
@@ -1497,9 +1535,9 @@ static struct notifier_block cpufreq_cpu_notifier =
  * @driver_data: A struct cpufreq_driver containing the values#
  * submitted by the CPU Frequency driver.
  *
- *   Registers a CPU Frequency driver to this core code. This code 
+ *   Registers a CPU Frequency driver to this core code. This code
  * returns zero on success, -EBUSY when another driver got here first
- * (and isn't unregistered in the meantime). 
+ * (and isn't unregistered in the meantime).
  *
  */
 int cpufreq_register_driver(struct cpufreq_driver *driver_data)
@@ -1560,7 +1598,7 @@ EXPORT_SYMBOL_GPL(cpufreq_register_driver);
 /**
  * cpufreq_unregister_driver - unregister the current CPUFreq driver
  *
- *    Unregister the current CPUFreq driver. Only call this if you have 
+ *    Unregister the current CPUFreq driver. Only call this if you have
  * the right to do so, i.e. if you have succeeded in initialising before!
  * Returns zero if successful, and -EINVAL if the cpufreq_driver is
  * currently not initialised.
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index ac38766b25..037f6bf454 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -35,12 +35,7 @@
  */
 
 #define DEF_FREQUENCY_UP_THRESHOLD              (80)
-#define MIN_FREQUENCY_UP_THRESHOLD              (0)
-#define MAX_FREQUENCY_UP_THRESHOLD              (100)
-
 #define DEF_FREQUENCY_DOWN_THRESHOLD            (20)
-#define MIN_FREQUENCY_DOWN_THRESHOLD            (0)
-#define MAX_FREQUENCY_DOWN_THRESHOLD            (100)
 
 /* 
  * The polling frequency of this governor depends on the capability of 
@@ -53,10 +48,14 @@
  * All times here are in uS.
  */
 static unsigned int                             def_sampling_rate;
-#define MIN_SAMPLING_RATE                       (def_sampling_rate / 2)
+#define MIN_SAMPLING_RATE_RATIO                 (2)
+/* for correct statistics, we need at least 10 ticks between each measure */
+#define MIN_STAT_SAMPLING_RATE                  (MIN_SAMPLING_RATE_RATIO * jiffies_to_usecs(10))
+#define MIN_SAMPLING_RATE                       (def_sampling_rate / MIN_SAMPLING_RATE_RATIO)
 #define MAX_SAMPLING_RATE                       (500 * def_sampling_rate)
-#define DEF_SAMPLING_RATE_LATENCY_MULTIPLIER    (100000)
-#define DEF_SAMPLING_DOWN_FACTOR                (5)
+#define DEF_SAMPLING_RATE_LATENCY_MULTIPLIER    (1000)
+#define DEF_SAMPLING_DOWN_FACTOR                (1)
+#define MAX_SAMPLING_DOWN_FACTOR                (10)
 #define TRANSITION_LATENCY_LIMIT                (10 * 1000)
 
 static void do_dbs_timer(void *data);
@@ -66,6 +65,8 @@ struct cpu_dbs_info_s {
         unsigned int            prev_cpu_idle_up;
         unsigned int            prev_cpu_idle_down;
         unsigned int            enable;
+        unsigned int            down_skip;
+        unsigned int            requested_freq;
 };
 static DEFINE_PER_CPU(struct cpu_dbs_info_s, cpu_dbs_info);
 
@@ -87,6 +88,8 @@ static struct dbs_tuners dbs_tuners_ins = {
         .up_threshold           = DEF_FREQUENCY_UP_THRESHOLD,
         .down_threshold         = DEF_FREQUENCY_DOWN_THRESHOLD,
         .sampling_down_factor   = DEF_SAMPLING_DOWN_FACTOR,
+        .ignore_nice            = 0,
+        .freq_step              = 5,
 };
 
 static inline unsigned int get_cpu_idle_time(unsigned int cpu)
@@ -136,7 +139,7 @@ static ssize_t store_sampling_down_factor(struct cpufreq_policy *unused,
         unsigned int input;
         int ret;
         ret = sscanf (buf, "%u", &input);
-        if (ret != 1 )
+        if (ret != 1 || input > MAX_SAMPLING_DOWN_FACTOR || input < 1)
                 return -EINVAL;
 
         mutex_lock(&dbs_mutex);
@@ -173,8 +176,7 @@ static ssize_t store_up_threshold(struct cpufreq_policy *unused,
         ret = sscanf (buf, "%u", &input);
 
         mutex_lock(&dbs_mutex);
-        if (ret != 1 || input > MAX_FREQUENCY_UP_THRESHOLD || 
-                        input < MIN_FREQUENCY_UP_THRESHOLD ||
+        if (ret != 1 || input > 100 || input < 0 ||
                         input <= dbs_tuners_ins.down_threshold) {
                 mutex_unlock(&dbs_mutex);
                 return -EINVAL;
@@ -194,8 +196,7 @@ static ssize_t store_down_threshold(struct cpufreq_policy *unused,
         ret = sscanf (buf, "%u", &input);
 
         mutex_lock(&dbs_mutex);
-        if (ret != 1 || input > MAX_FREQUENCY_DOWN_THRESHOLD || 
-                        input < MIN_FREQUENCY_DOWN_THRESHOLD ||
+        if (ret != 1 || input > 100 || input < 0 ||
                         input >= dbs_tuners_ins.up_threshold) {
                 mutex_unlock(&dbs_mutex);
                 return -EINVAL;
@@ -297,31 +298,17 @@ static struct attribute_group dbs_attr_group = {
 static void dbs_check_cpu(int cpu)
 {
         unsigned int idle_ticks, up_idle_ticks, down_idle_ticks;
+        unsigned int tmp_idle_ticks, total_idle_ticks;
         unsigned int freq_step;
         unsigned int freq_down_sampling_rate;
-        static int down_skip[NR_CPUS];
-        static int requested_freq[NR_CPUS];
-        static unsigned short init_flag = 0;
-        struct cpu_dbs_info_s *this_dbs_info;
-        struct cpu_dbs_info_s *dbs_info;
-
+        struct cpu_dbs_info_s *this_dbs_info = &per_cpu(cpu_dbs_info, cpu);
         struct cpufreq_policy *policy;
-        unsigned int j;
 
-        this_dbs_info = &per_cpu(cpu_dbs_info, cpu);
         if (!this_dbs_info->enable)
                 return;
 
         policy = this_dbs_info->cur_policy;
 
-        if ( init_flag == 0 ) {
-                for_each_online_cpu(j) {
-                        dbs_info = &per_cpu(cpu_dbs_info, j);
-                        requested_freq[j] = dbs_info->cur_policy->cur;
-                }
-                init_flag = 1;
-        }
-        
         /* 
          * The default safe range is 20% to 80% 
          * Every sampling_rate, we check
@@ -337,39 +324,29 @@ static void dbs_check_cpu(int cpu)
          */
 
         /* Check for frequency increase */
-
         idle_ticks = UINT_MAX;
-        for_each_cpu_mask(j, policy->cpus) {
-                unsigned int tmp_idle_ticks, total_idle_ticks;
-                struct cpu_dbs_info_s *j_dbs_info;
 
-                j_dbs_info = &per_cpu(cpu_dbs_info, j);
-                /* Check for frequency increase */
-                total_idle_ticks = get_cpu_idle_time(j);
-                tmp_idle_ticks = total_idle_ticks -
-                        j_dbs_info->prev_cpu_idle_up;
-                j_dbs_info->prev_cpu_idle_up = total_idle_ticks;
-
-                if (tmp_idle_ticks < idle_ticks)
-                        idle_ticks = tmp_idle_ticks;
-        }
+        /* Check for frequency increase */
+        total_idle_ticks = get_cpu_idle_time(cpu);
+        tmp_idle_ticks = total_idle_ticks -
+                this_dbs_info->prev_cpu_idle_up;
+        this_dbs_info->prev_cpu_idle_up = total_idle_ticks;
+
+        if (tmp_idle_ticks < idle_ticks)
+                idle_ticks = tmp_idle_ticks;
 
         /* Scale idle ticks by 100 and compare with up and down ticks */
         idle_ticks *= 100;
         up_idle_ticks = (100 - dbs_tuners_ins.up_threshold) *
-                usecs_to_jiffies(dbs_tuners_ins.sampling_rate);
+                        usecs_to_jiffies(dbs_tuners_ins.sampling_rate);
 
         if (idle_ticks < up_idle_ticks) {
-                down_skip[cpu] = 0;
-                for_each_cpu_mask(j, policy->cpus) {
-                        struct cpu_dbs_info_s *j_dbs_info;
+                this_dbs_info->down_skip = 0;
+                this_dbs_info->prev_cpu_idle_down =
+                        this_dbs_info->prev_cpu_idle_up;
 
-                        j_dbs_info = &per_cpu(cpu_dbs_info, j);
-                        j_dbs_info->prev_cpu_idle_down = 
-                                        j_dbs_info->prev_cpu_idle_up;
-                }
                 /* if we are already at full speed then break out early */
-                if (requested_freq[cpu] == policy->max)
+                if (this_dbs_info->requested_freq == policy->max)
                         return;
                 
                 freq_step = (dbs_tuners_ins.freq_step * policy->max) / 100;
@@ -378,49 +355,45 @@ static void dbs_check_cpu(int cpu)
                 if (unlikely(freq_step == 0))
                         freq_step = 5;
                 
-                requested_freq[cpu] += freq_step;
-                if (requested_freq[cpu] > policy->max)
-                        requested_freq[cpu] = policy->max;
+                this_dbs_info->requested_freq += freq_step;
+                if (this_dbs_info->requested_freq > policy->max)
+                        this_dbs_info->requested_freq = policy->max;
 
-                __cpufreq_driver_target(policy, requested_freq[cpu], 
+                __cpufreq_driver_target(policy, this_dbs_info->requested_freq,
                         CPUFREQ_RELATION_H);
                 return;
         }
 
         /* Check for frequency decrease */
-        down_skip[cpu]++;
-        if (down_skip[cpu] < dbs_tuners_ins.sampling_down_factor)
+        this_dbs_info->down_skip++;
+        if (this_dbs_info->down_skip < dbs_tuners_ins.sampling_down_factor)
                 return;
 
-        idle_ticks = UINT_MAX;
-        for_each_cpu_mask(j, policy->cpus) {
-                unsigned int tmp_idle_ticks, total_idle_ticks;
-                struct cpu_dbs_info_s *j_dbs_info;
+        /* Check for frequency decrease */
+        total_idle_ticks = this_dbs_info->prev_cpu_idle_up;
+        tmp_idle_ticks = total_idle_ticks -
+                this_dbs_info->prev_cpu_idle_down;
+        this_dbs_info->prev_cpu_idle_down = total_idle_ticks;
 
-                j_dbs_info = &per_cpu(cpu_dbs_info, j);
-                total_idle_ticks = j_dbs_info->prev_cpu_idle_up;
-                tmp_idle_ticks = total_idle_ticks -
-                        j_dbs_info->prev_cpu_idle_down;
-                j_dbs_info->prev_cpu_idle_down = total_idle_ticks;
-
-                if (tmp_idle_ticks < idle_ticks)
-                        idle_ticks = tmp_idle_ticks;
-        }
+        if (tmp_idle_ticks < idle_ticks)
+                idle_ticks = tmp_idle_ticks;
 
         /* Scale idle ticks by 100 and compare with up and down ticks */
         idle_ticks *= 100;
-        down_skip[cpu] = 0;
+        this_dbs_info->down_skip = 0;
 
         freq_down_sampling_rate = dbs_tuners_ins.sampling_rate *
                 dbs_tuners_ins.sampling_down_factor;
         down_idle_ticks = (100 - dbs_tuners_ins.down_threshold) *
-                        usecs_to_jiffies(freq_down_sampling_rate);
+                usecs_to_jiffies(freq_down_sampling_rate);
 
         if (idle_ticks > down_idle_ticks) {
-                /* if we are already at the lowest speed then break out early
+                /*
+                 * if we are already at the lowest speed then break out early
                  * or if we 'cannot' reduce the speed as the user might want
-                 * freq_step to be zero */
-                if (requested_freq[cpu] == policy->min
+                 * freq_step to be zero
+                 */
+                if (this_dbs_info->requested_freq == policy->min
                                 || dbs_tuners_ins.freq_step == 0)
                         return;
 
@@ -430,13 +403,12 @@ static void dbs_check_cpu(int cpu)
                 if (unlikely(freq_step == 0))
                         freq_step = 5;
 
-                requested_freq[cpu] -= freq_step;
-                if (requested_freq[cpu] < policy->min)
-                        requested_freq[cpu] = policy->min;
+                this_dbs_info->requested_freq -= freq_step;
+                if (this_dbs_info->requested_freq < policy->min)
+                        this_dbs_info->requested_freq = policy->min;
 
-                __cpufreq_driver_target(policy,
-                        requested_freq[cpu],
-                        CPUFREQ_RELATION_H);
+                __cpufreq_driver_target(policy, this_dbs_info->requested_freq,
+                                CPUFREQ_RELATION_H);
                 return;
         }
 }
@@ -493,11 +465,13 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                         j_dbs_info = &per_cpu(cpu_dbs_info, j);
                         j_dbs_info->cur_policy = policy;
                 
-                        j_dbs_info->prev_cpu_idle_up = get_cpu_idle_time(j);
+                        j_dbs_info->prev_cpu_idle_up = get_cpu_idle_time(cpu);
                         j_dbs_info->prev_cpu_idle_down
                                 = j_dbs_info->prev_cpu_idle_up;
                 }
                 this_dbs_info->enable = 1;
+                this_dbs_info->down_skip = 0;
+                this_dbs_info->requested_freq = policy->cur;
                 sysfs_create_group(&policy->kobj, &dbs_attr_group);
                 dbs_enable++;
                 /*
@@ -507,16 +481,17 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                 if (dbs_enable == 1) {
                         unsigned int latency;
                         /* policy latency is in nS. Convert it to uS first */
+                        latency = policy->cpuinfo.transition_latency / 1000;
+                        if (latency == 0)
+                                latency = 1;
 
-                        latency = policy->cpuinfo.transition_latency;
-                        if (latency < 1000)
-                                latency = 1000;
-
-                        def_sampling_rate = (latency / 1000) *
+                        def_sampling_rate = 10 * latency *
                                         DEF_SAMPLING_RATE_LATENCY_MULTIPLIER;
+
+                        if (def_sampling_rate < MIN_STAT_SAMPLING_RATE)
+                                def_sampling_rate = MIN_STAT_SAMPLING_RATE;
+
                         dbs_tuners_ins.sampling_rate = def_sampling_rate;
-                        dbs_tuners_ins.ignore_nice = 0;
-                        dbs_tuners_ins.freq_step = 5;
 
                         dbs_timer_init();
                 }
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index 9ee9411f18..956d121cb1 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -38,17 +38,17 @@
 #define MIN_FREQUENCY_UP_THRESHOLD              (11)
 #define MAX_FREQUENCY_UP_THRESHOLD              (100)
 
-/* 
- * The polling frequency of this governor depends on the capability of 
+/*
+ * The polling frequency of this governor depends on the capability of
  * the processor. Default polling frequency is 1000 times the transition
- * latency of the processor. The governor will work on any processor with 
- * transition latency <= 10mS, using appropriate sampling 
+ * latency of the processor. The governor will work on any processor with
+ * transition latency <= 10mS, using appropriate sampling
  * rate.
  * For CPUs with transition latency > 10mS (mostly drivers with CPUFREQ_ETERNAL)
  * this governor will not work.
  * All times here are in uS.
  */
-static unsigned int                             def_sampling_rate;
+static unsigned int def_sampling_rate;
 #define MIN_SAMPLING_RATE_RATIO                 (2)
 /* for correct statistics, we need at least 10 ticks between each measure */
 #define MIN_STAT_SAMPLING_RATE                  (MIN_SAMPLING_RATE_RATIO * jiffies_to_usecs(10))
@@ -62,28 +62,29 @@ static unsigned int 				def_sampling_rate;
 static void do_dbs_timer(void *data);
 
 struct cpu_dbs_info_s {
-        struct cpufreq_policy   *cur_policy;
-        unsigned int            prev_cpu_idle_up;
-        unsigned int            prev_cpu_idle_down;
-        unsigned int            enable;
+        struct cpufreq_policy *cur_policy;
+        unsigned int prev_cpu_idle_up;
+        unsigned int prev_cpu_idle_down;
+        unsigned int enable;
 };
 static DEFINE_PER_CPU(struct cpu_dbs_info_s, cpu_dbs_info);
 
 static unsigned int dbs_enable; /* number of CPUs using this policy */
 
-static DEFINE_MUTEX     (dbs_mutex);
+static DEFINE_MUTEX (dbs_mutex);
 static DECLARE_WORK     (dbs_work, do_dbs_timer, NULL);
 
 struct dbs_tuners {
-        unsigned int            sampling_rate;
-        unsigned int            sampling_down_factor;
-        unsigned int            up_threshold;
-        unsigned int            ignore_nice;
+        unsigned int sampling_rate;
+        unsigned int sampling_down_factor;
+        unsigned int up_threshold;
+        unsigned int ignore_nice;
 };
 
 static struct dbs_tuners dbs_tuners_ins = {
-        .up_threshold           = DEF_FREQUENCY_UP_THRESHOLD,
-        .sampling_down_factor   = DEF_SAMPLING_DOWN_FACTOR,
+        .up_threshold = DEF_FREQUENCY_UP_THRESHOLD,
+        .sampling_down_factor = DEF_SAMPLING_DOWN_FACTOR,
+        .ignore_nice = 0,
 };
 
 static inline unsigned int get_cpu_idle_time(unsigned int cpu)
@@ -106,8 +107,8 @@ static ssize_t show_sampling_rate_min(struct cpufreq_policy *policy, char *buf)
         return sprintf (buf, "%u\n", MIN_SAMPLING_RATE);
 }
 
-#define define_one_ro(_name)                                    \
-static struct freq_attr _name =                                 \
+#define define_one_ro(_name)            \
+static struct freq_attr _name =         \
 __ATTR(_name, 0444, show_##_name, NULL)
 
 define_one_ro(sampling_rate_max);
@@ -125,7 +126,7 @@ show_one(sampling_down_factor, sampling_down_factor);
 show_one(up_threshold, up_threshold);
 show_one(ignore_nice_load, ignore_nice);
 
-static ssize_t store_sampling_down_factor(struct cpufreq_policy *unused, 
+static ssize_t store_sampling_down_factor(struct cpufreq_policy *unused,
                 const char *buf, size_t count)
 {
         unsigned int input;
@@ -144,7 +145,7 @@ static ssize_t store_sampling_down_factor(struct cpufreq_policy *unused,
         return count;
 }
 
-static ssize_t store_sampling_rate(struct cpufreq_policy *unused, 
+static ssize_t store_sampling_rate(struct cpufreq_policy *unused,
                 const char *buf, size_t count)
 {
         unsigned int input;
@@ -163,7 +164,7 @@ static ssize_t store_sampling_rate(struct cpufreq_policy *unused,
         return count;
 }
 
-static ssize_t store_up_threshold(struct cpufreq_policy *unused, 
+static ssize_t store_up_threshold(struct cpufreq_policy *unused,
                 const char *buf, size_t count)
 {
         unsigned int input;
@@ -171,7 +172,7 @@ static ssize_t store_up_threshold(struct cpufreq_policy *unused,
         ret = sscanf (buf, "%u", &input);
 
         mutex_lock(&dbs_mutex);
-        if (ret != 1 || input > MAX_FREQUENCY_UP_THRESHOLD || 
+        if (ret != 1 || input > MAX_FREQUENCY_UP_THRESHOLD ||
                         input < MIN_FREQUENCY_UP_THRESHOLD) {
                 mutex_unlock(&dbs_mutex);
                 return -EINVAL;
@@ -190,14 +191,14 @@ static ssize_t store_ignore_nice_load(struct cpufreq_policy *policy,
         int ret;
 
         unsigned int j;
-        
+
         ret = sscanf (buf, "%u", &input);
         if ( ret != 1 )
                 return -EINVAL;
 
         if ( input > 1 )
                 input = 1;
-        
+
         mutex_lock(&dbs_mutex);
         if ( input == dbs_tuners_ins.ignore_nice ) { /* nothing to do */
                 mutex_unlock(&dbs_mutex);
@@ -259,16 +260,16 @@ static void dbs_check_cpu(int cpu)
                 return;
 
         policy = this_dbs_info->cur_policy;
-        /* 
+        /*
          * Every sampling_rate, we check, if current idle time is less
          * than 20% (default), then we try to increase frequency
          * Every sampling_rate*sampling_down_factor, we look for a the lowest
          * frequency which can sustain the load while keeping idle time over
          * 30%. If such a frequency exist, we try to decrease to this frequency.
          *
-         * Any frequency increase takes it to the maximum frequency. 
-         * Frequency reduction happens at minimum steps of 
-         * 5% (default) of current frequency 
+         * Any frequency increase takes it to the maximum frequency.
+         * Frequency reduction happens at minimum steps of
+         * 5% (default) of current frequency
          */
 
         /* Check for frequency increase */
@@ -298,14 +299,14 @@ static void dbs_check_cpu(int cpu)
                         struct cpu_dbs_info_s *j_dbs_info;
 
                         j_dbs_info = &per_cpu(cpu_dbs_info, j);
-                        j_dbs_info->prev_cpu_idle_down = 
+                        j_dbs_info->prev_cpu_idle_down =
                                         j_dbs_info->prev_cpu_idle_up;
                 }
                 /* if we are already at full speed then break out early */
                 if (policy->cur == policy->max)
                         return;
-                
-                __cpufreq_driver_target(policy, policy->max, 
+
+                __cpufreq_driver_target(policy, policy->max,
                         CPUFREQ_RELATION_H);
                 return;
         }
@@ -347,23 +348,26 @@ static void dbs_check_cpu(int cpu)
          * policy. To be safe, we focus 10 points under the threshold.
          */
         freq_next = ((total_ticks - idle_ticks) * 100) / total_ticks;
-        freq_next = (freq_next * policy->cur) / 
+        freq_next = (freq_next * policy->cur) /
                         (dbs_tuners_ins.up_threshold - 10);
 
+        if (freq_next < policy->min)
+                freq_next = policy->min;
+
         if (freq_next <= ((policy->cur * 95) / 100))
                 __cpufreq_driver_target(policy, freq_next, CPUFREQ_RELATION_L);
 }
 
 static void do_dbs_timer(void *data)
-{ 
+{
         int i;
         mutex_lock(&dbs_mutex);
         for_each_online_cpu(i)
                 dbs_check_cpu(i);
-        schedule_delayed_work(&dbs_work, 
+        schedule_delayed_work(&dbs_work,
                         usecs_to_jiffies(dbs_tuners_ins.sampling_rate));
         mutex_unlock(&dbs_mutex);
-} 
+}
 
 static inline void dbs_timer_init(void)
 {
@@ -390,22 +394,25 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
 
         switch (event) {
         case CPUFREQ_GOV_START:
-                if ((!cpu_online(cpu)) || 
+                if ((!cpu_online(cpu)) ||
                     (!policy->cur))
                         return -EINVAL;
 
                 if (policy->cpuinfo.transition_latency >
-                                (TRANSITION_LATENCY_LIMIT * 1000))
+                                (TRANSITION_LATENCY_LIMIT * 1000)) {
+                        printk(KERN_WARNING "ondemand governor failed to load "
+                               "due to too long transition latency\n");
                         return -EINVAL;
+                }
                 if (this_dbs_info->enable) /* Already enabled */
                         break;
-                 
+
                 mutex_lock(&dbs_mutex);
                 for_each_cpu_mask(j, policy->cpus) {
                         struct cpu_dbs_info_s *j_dbs_info;
                         j_dbs_info = &per_cpu(cpu_dbs_info, j);
                         j_dbs_info->cur_policy = policy;
-                
+
                         j_dbs_info->prev_cpu_idle_up = get_cpu_idle_time(j);
                         j_dbs_info->prev_cpu_idle_down
                                 = j_dbs_info->prev_cpu_idle_up;
@@ -431,11 +438,9 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                                 def_sampling_rate = MIN_STAT_SAMPLING_RATE;
 
                         dbs_tuners_ins.sampling_rate = def_sampling_rate;
-                        dbs_tuners_ins.ignore_nice = 0;
-
                         dbs_timer_init();
                 }
-                
+
                 mutex_unlock(&dbs_mutex);
                 break;
 
@@ -448,9 +453,9 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                  * Stop the timerschedule work, when this governor
                  * is used for first time
                  */
-                if (dbs_enable == 0) 
+                if (dbs_enable == 0)
                         dbs_timer_exit();
-                
+
                 mutex_unlock(&dbs_mutex);
 
                 break;
@@ -460,11 +465,11 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                 if (policy->max < this_dbs_info->cur_policy->cur)
                         __cpufreq_driver_target(
                                         this_dbs_info->cur_policy,
-                                        policy->max, CPUFREQ_RELATION_H);
+                                        policy->max, CPUFREQ_RELATION_H);
                 else if (policy->min > this_dbs_info->cur_policy->cur)
                         __cpufreq_driver_target(
                                         this_dbs_info->cur_policy,
-                                        policy->min, CPUFREQ_RELATION_L);
+                                        policy->min, CPUFREQ_RELATION_L);
                 mutex_unlock(&dbs_mutex);
                 break;
         }
diff --git a/drivers/cpufreq/cpufreq_performance.c b/drivers/cpufreq/cpufreq_performance.c
index 8d536b40de..de91e3371e 100644
--- a/drivers/cpufreq/cpufreq_performance.c
+++ b/drivers/cpufreq/cpufreq_performance.c
@@ -32,7 +32,7 @@ static int cpufreq_governor_performance(struct cpufreq_policy *policy,
         }
         return 0;
 }
-                                                            
+
 struct cpufreq_governor cpufreq_gov_performance = {
         .name           = "performance",
         .governor       = cpufreq_governor_performance,
diff --git a/drivers/cpufreq/cpufreq_powersave.c b/drivers/cpufreq/cpufreq_powersave.c
index c85edda7fe..0a2596044e 100644
--- a/drivers/cpufreq/cpufreq_powersave.c
+++ b/drivers/cpufreq/cpufreq_powersave.c
@@ -31,7 +31,7 @@ static int cpufreq_governor_powersave(struct cpufreq_policy *policy,
         }
         return 0;
 }
-                                                            
+
 static struct cpufreq_governor cpufreq_gov_powersave = {
         .name           = "powersave",
         .governor       = cpufreq_governor_powersave,
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index 0bddb8e694..9694b6ed32 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -2,7 +2,7 @@
  *  drivers/cpufreq/cpufreq_stats.c
  *
  *  Copyright (C) 2003-2004 Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>.
- *            (C) 2004 Zou Nan hai <nanhai.zou@intel.com>.
+ *            (C) 2004 Zou Nan hai <nanhai.zou@intel.com>.
  *
  * 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
@@ -90,7 +90,7 @@ show_time_in_state(struct cpufreq_policy *policy, char *buf)
                 return 0;
         cpufreq_stats_update(stat->cpu);
         for (i = 0; i < stat->state_num; i++) {
-                len += sprintf(buf + len, "%u %llu\n", stat->freq_table[i], 
+                len += sprintf(buf + len, "%u %llu\n", stat->freq_table[i],
                         (unsigned long long)cputime64_to_clock_t(stat->time_in_state[i]));
         }
         return len;
@@ -171,7 +171,7 @@ cpufreq_stats_free_table (unsigned int cpu)
 {
         struct cpufreq_stats *stat = cpufreq_stats_table[cpu];
         struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
-        if (policy && policy->cpu == cpu)       
+        if (policy && policy->cpu == cpu)
                 sysfs_remove_group(&policy->kobj, &stats_attr_group);
         if (stat) {
                 kfree(stat->time_in_state);
@@ -303,7 +303,7 @@ cpufreq_stat_notifier_trans (struct notifier_block *nb, unsigned long val,
         return 0;
 }
 
-static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,
+static int cpufreq_stat_cpu_callback(struct notifier_block *nfb,
                                         unsigned long action, void *hcpu)
 {
         unsigned int cpu = (unsigned long)hcpu;
diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c
index 92a0be22a2..071ee4f1bb 100644
--- a/drivers/cpufreq/cpufreq_userspace.c
+++ b/drivers/cpufreq/cpufreq_userspace.c
@@ -41,7 +41,7 @@ static DEFINE_MUTEX	(userspace_mutex);
 #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_GOVERNOR, "userspace", msg)
 
 /* keep track of frequency transitions */
-static int 
+static int
 userspace_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
                        void *data)
 {
@@ -58,7 +58,7 @@ static struct notifier_block userspace_cpufreq_notifier_block = {
 };
 
 
-/** 
+/**
  * cpufreq_set - set the CPU frequency
  * @freq: target frequency in kHz
  * @cpu: CPU for which the frequency is to be set
@@ -103,8 +103,8 @@ static ssize_t show_speed (struct cpufreq_policy *policy, char *buf)
         return sprintf (buf, "%u\n", cpu_cur_freq[policy->cpu]);
 }
 
-static ssize_t 
-store_speed (struct cpufreq_policy *policy, const char *buf, size_t count) 
+static ssize_t
+store_speed (struct cpufreq_policy *policy, const char *buf, size_t count)
 {
         unsigned int freq = 0;
         unsigned int ret;
@@ -118,7 +118,7 @@ store_speed (struct cpufreq_policy *policy, const char *buf, size_t count)
         return count;
 }
 
-static struct freq_attr freq_attr_scaling_setspeed = 
+static struct freq_attr freq_attr_scaling_setspeed =
 {
         .attr = { .name = "scaling_setspeed", .mode = 0644, .owner = THIS_MODULE },
         .show = show_speed,
@@ -135,7 +135,7 @@ static int cpufreq_governor_userspace(struct cpufreq_policy *policy,
                         return -EINVAL;
                 BUG_ON(!policy->cur);
                 mutex_lock(&userspace_mutex);
-                cpu_is_managed[cpu] = 1;                
+                cpu_is_managed[cpu] = 1;
                 cpu_min_freq[cpu] = policy->min;
                 cpu_max_freq[cpu] = policy->max;
                 cpu_cur_freq[cpu] = policy->cur;
diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c
index ba460bdea6..a4818ce889 100644
--- a/drivers/cpufreq/freq_table.c
+++ b/drivers/cpufreq/freq_table.c
@@ -59,9 +59,8 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy *policy,
         if (!cpu_online(policy->cpu))
                 return -EINVAL;
 
-        cpufreq_verify_within_limits(policy, 
-                                     policy->cpuinfo.min_freq, 
-                                     policy->cpuinfo.max_freq);
+        cpufreq_verify_within_limits(policy,
+                                     policy->cpuinfo.min_freq, policy->cpuinfo.max_freq);
 
         for (i=0; (table[i].frequency != CPUFREQ_TABLE_END); i++) {
                 unsigned int freq = table[i].frequency;
@@ -76,9 +75,8 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy *policy,
         if (!count)
                 policy->max = next_larger;
 
-        cpufreq_verify_within_limits(policy, 
-                                     policy->cpuinfo.min_freq, 
-                                     policy->cpuinfo.max_freq);
+        cpufreq_verify_within_limits(policy,
+                                     policy->cpuinfo.min_freq, policy->cpuinfo.max_freq);
 
         dprintk("verification lead to (%u - %u kHz) for cpu %u\n", policy->min, policy->max, policy->cpu);
 
@@ -199,7 +197,7 @@ EXPORT_SYMBOL_GPL(cpufreq_freq_attr_scaling_available_freqs);
  * if you use these, you must assure that the frequency table is valid
  * all the time between get_attr and put_attr!
  */
-void cpufreq_frequency_table_get_attr(struct cpufreq_frequency_table *table, 
+void cpufreq_frequency_table_get_attr(struct cpufreq_frequency_table *table,
                                       unsigned int cpu)
 {
         dprintk("setting show_table for cpu %u to %p\n", cpu, table);
diff --git a/drivers/dio/dio-driver.c b/drivers/dio/dio-driver.c
index ca8e69d2f6..e4c48e3293 100644
--- a/drivers/dio/dio-driver.c
+++ b/drivers/dio/dio-driver.c
@@ -71,22 +71,17 @@ static int dio_device_probe(struct device *dev)
          *  @drv: the driver structure to register
          *
          *  Adds the driver structure to the list of registered drivers
-         *  Returns the number of DIO devices which were claimed by the driver
-         *  during registration.  The driver remains registered even if the
-         *  return value is zero.
+         *  Returns zero or a negative error value.
          */
 
 int dio_register_driver(struct dio_driver *drv)
 {
-        int count = 0;
-
         /* initialize common driver fields */
         drv->driver.name = drv->name;
         drv->driver.bus = &dio_bus_type;
 
         /* register with core */
-        count = driver_register(&drv->driver);
-        return count ? count : 1;
+        return driver_register(&drv->driver);
 }
 
 
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index 52f3eb45d2..b582d0cdc2 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -64,35 +64,35 @@ config EDAC_AMD76X
 
 config EDAC_E7XXX
         tristate "Intel e7xxx (e7205, e7500, e7501, e7505)"
-        depends on EDAC_MM_EDAC && PCI
+        depends on EDAC_MM_EDAC && PCI && X86_32
         help
           Support for error detection and correction on the Intel
           E7205, E7500, E7501 and E7505 server chipsets.
 
 config EDAC_E752X
         tristate "Intel e752x (e7520, e7525, e7320)"
-        depends on EDAC_MM_EDAC && PCI
+        depends on EDAC_MM_EDAC && PCI && X86
         help
           Support for error detection and correction on the Intel
           E7520, E7525, E7320 server chipsets.
 
 config EDAC_I82875P
         tristate "Intel 82875p (D82875P, E7210)"
-        depends on EDAC_MM_EDAC && PCI
+        depends on EDAC_MM_EDAC && PCI && X86_32
         help
           Support for error detection and correction on the Intel
           DP82785P and E7210 server chipsets.
 
 config EDAC_I82860
         tristate "Intel 82860"
-        depends on EDAC_MM_EDAC && PCI
+        depends on EDAC_MM_EDAC && PCI && X86_32
         help
           Support for error detection and correction on the Intel
           82860 chipset.
 
 config EDAC_R82600
         tristate "Radisys 82600 embedded chipset"
-        depends on EDAC_MM_EDAC
+        depends on EDAC_MM_EDAC && PCI && X86_32
         help
           Support for error detection and correction on the Radisys
           82600 embedded chipset.
diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c
index 2fcc8120b5..53423ad6d4 100644
--- a/drivers/edac/amd76x_edac.c
+++ b/drivers/edac/amd76x_edac.c
@@ -12,25 +12,26 @@
  *
  */
 
-
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
-
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
-
 #include <linux/slab.h>
-
 #include "edac_mc.h"
 
+#define amd76x_printk(level, fmt, arg...) \
+        edac_printk(level, "amd76x", fmt, ##arg)
+
+#define amd76x_mc_printk(mci, level, fmt, arg...) \
+        edac_mc_chipset_printk(mci, level, "amd76x", fmt, ##arg)
 
 #define AMD76X_NR_CSROWS 8
 #define AMD76X_NR_CHANS  1
 #define AMD76X_NR_DIMMS  4
 
-
 /* AMD 76x register addresses - device 0 function 0 - PCI bridge */
+
 #define AMD76X_ECC_MODE_STATUS  0x48    /* Mode and status of ECC (32b)
                                          *
                                          * 31:16 reserved
@@ -42,6 +43,7 @@
                                          *  7:4  UE cs row
                                          *  3:0  CE cs row
                                          */
+
 #define AMD76X_DRAM_MODE_STATUS 0x58    /* DRAM Mode and status (32b)
                                          *
                                          * 31:26 clock disable 5 - 0
@@ -56,6 +58,7 @@
                                          * 15:8  reserved
                                          *  7:0  x4 mode enable 7 - 0
                                          */
+
 #define AMD76X_MEM_BASE_ADDR    0xC0    /* Memory base address (8 x 32b)
                                          *
                                          * 31:23 chip-select base
@@ -66,29 +69,28 @@
                                          *  0    chip-select enable
                                          */
 
-
 struct amd76x_error_info {
         u32 ecc_mode_status;
 };
 
-
 enum amd76x_chips {
         AMD761 = 0,
         AMD762
 };
 
-
 struct amd76x_dev_info {
         const char *ctl_name;
 };
 
-
 static const struct amd76x_dev_info amd76x_devs[] = {
-        [AMD761] = {.ctl_name = "AMD761"},
-        [AMD762] = {.ctl_name = "AMD762"},
+        [AMD761] = {
+                .ctl_name = "AMD761"
+        },
+        [AMD762] = {
+                .ctl_name = "AMD762"
+        },
 };
 
-
 /**
  *      amd76x_get_error_info   -       fetch error information
  *      @mci: Memory controller
@@ -97,23 +99,21 @@ static const struct amd76x_dev_info amd76x_devs[] = {
  *      Fetch and store the AMD76x ECC status. Clear pending status
  *      on the chip so that further errors will be reported
  */
-
-static void amd76x_get_error_info (struct mem_ctl_info *mci,
-                                   struct amd76x_error_info *info)
+static void amd76x_get_error_info(struct mem_ctl_info *mci,
+                struct amd76x_error_info *info)
 {
         pci_read_config_dword(mci->pdev, AMD76X_ECC_MODE_STATUS,
                                 &info->ecc_mode_status);
 
         if (info->ecc_mode_status & BIT(8))
                 pci_write_bits32(mci->pdev, AMD76X_ECC_MODE_STATUS,
-                                   (u32) BIT(8), (u32) BIT(8));
+                                (u32) BIT(8), (u32) BIT(8));
 
         if (info->ecc_mode_status & BIT(9))
                 pci_write_bits32(mci->pdev, AMD76X_ECC_MODE_STATUS,
-                                   (u32) BIT(9), (u32) BIT(9));
+                                (u32) BIT(9), (u32) BIT(9));
 }
 
-
 /**
  *      amd76x_process_error_info       -       Error check
  *      @mci: Memory controller
@@ -124,8 +124,7 @@ static void amd76x_get_error_info (struct mem_ctl_info *mci,
  *      A return of 1 indicates an error. Also if handle_errors is true
  *      then attempt to handle and clean up after the error
  */
-
-static int amd76x_process_error_info (struct mem_ctl_info *mci,
+static int amd76x_process_error_info(struct mem_ctl_info *mci,
                 struct amd76x_error_info *info, int handle_errors)
 {
         int error_found;
@@ -141,9 +140,8 @@ static int amd76x_process_error_info (struct mem_ctl_info *mci,
 
                 if (handle_errors) {
                         row = (info->ecc_mode_status >> 4) & 0xf;
-                        edac_mc_handle_ue(mci,
-                            mci->csrows[row].first_page, 0, row,
-                            mci->ctl_name);
+                        edac_mc_handle_ue(mci, mci->csrows[row].first_page, 0,
+                                row, mci->ctl_name);
                 }
         }
 
@@ -155,11 +153,11 @@ static int amd76x_process_error_info (struct mem_ctl_info *mci,
 
                 if (handle_errors) {
                         row = info->ecc_mode_status & 0xf;
-                        edac_mc_handle_ce(mci,
-                            mci->csrows[row].first_page, 0, 0, row, 0,
-                            mci->ctl_name);
+                        edac_mc_handle_ce(mci, mci->csrows[row].first_page, 0,
+                                0, row, 0, mci->ctl_name);
                 }
         }
+
         return error_found;
 }
 
@@ -170,16 +168,14 @@ static int amd76x_process_error_info (struct mem_ctl_info *mci,
  *      Called by the poll handlers this function reads the status
  *      from the controller and checks for errors.
  */
-
 static void amd76x_check(struct mem_ctl_info *mci)
 {
         struct amd76x_error_info info;
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
+        debugf3("%s()\n", __func__);
         amd76x_get_error_info(mci, &info);
         amd76x_process_error_info(mci, &info, 1);
 }
 
-
 /**
  *      amd76x_probe1   -       Perform set up for detected device
  *      @pdev; PCI device detected
@@ -189,7 +185,6 @@ static void amd76x_check(struct mem_ctl_info *mci)
  *      controller status reporting. We configure and set up the
  *      memory controller reporting and claim the device.
  */
-
 static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
 {
         int rc = -ENODEV;
@@ -203,12 +198,11 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
         };
         u32 ems;
         u32 ems_mode;
+        struct amd76x_error_info discard;
 
-        debugf0("MC: " __FILE__ ": %s()\n", __func__);
-
+        debugf0("%s()\n", __func__);
         pci_read_config_dword(pdev, AMD76X_ECC_MODE_STATUS, &ems);
         ems_mode = (ems >> 10) & 0x3;
-
         mci = edac_mc_alloc(0, AMD76X_NR_CSROWS, AMD76X_NR_CHANS);
 
         if (mci == NULL) {
@@ -216,16 +210,13 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
                 goto fail;
         }
 
-        debugf0("MC: " __FILE__ ": %s(): mci = %p\n", __func__, mci);
-
-        mci->pdev = pci_dev_get(pdev);
+        debugf0("%s(): mci = %p\n", __func__, mci);
+        mci->pdev = pdev;
         mci->mtype_cap = MEM_FLAG_RDDR;
-
         mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
         mci->edac_cap = ems_mode ?
-            (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;
-
-        mci->mod_name = BS_MOD_STR;
+                        (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;
+        mci->mod_name = EDAC_MOD_STR;
         mci->mod_ver = "$Revision: 1.4.2.5 $";
         mci->ctl_name = amd76x_devs[dev_idx].ctl_name;
         mci->edac_check = amd76x_check;
@@ -240,18 +231,15 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
 
                 /* find the DRAM Chip Select Base address and mask */
                 pci_read_config_dword(mci->pdev,
-                                      AMD76X_MEM_BASE_ADDR + (index * 4),
-                                      &mba);
+                                AMD76X_MEM_BASE_ADDR + (index * 4), &mba);
 
                 if (!(mba & BIT(0)))
                         continue;
 
                 mba_base = mba & 0xff800000UL;
                 mba_mask = ((mba & 0xff80) << 16) | 0x7fffffUL;
-
                 pci_read_config_dword(mci->pdev, AMD76X_DRAM_MODE_STATUS,
-                                      &dms);
-
+                                &dms);
                 csrow->first_page = mba_base >> PAGE_SHIFT;
                 csrow->nr_pages = (mba_mask + 1) >> PAGE_SHIFT;
                 csrow->last_page = csrow->first_page + csrow->nr_pages - 1;
@@ -262,40 +250,33 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
                 csrow->edac_mode = ems_modes[ems_mode];
         }
 
-        /* clear counters */
-        pci_write_bits32(mci->pdev, AMD76X_ECC_MODE_STATUS, (u32) (0x3 << 8),
-                         (u32) (0x3 << 8));
+        amd76x_get_error_info(mci, &discard);  /* clear counters */
 
         if (edac_mc_add_mc(mci)) {
-                debugf3("MC: " __FILE__
-                        ": %s(): failed edac_mc_add_mc()\n", __func__);
+                debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
                 goto fail;
         }
 
         /* get this far and it's successful */
-        debugf3("MC: " __FILE__ ": %s(): success\n", __func__);
+        debugf3("%s(): success\n", __func__);
         return 0;
 
 fail:
-        if (mci) {
-                if(mci->pdev)
-                        pci_dev_put(mci->pdev);
+        if (mci != NULL)
                 edac_mc_free(mci);
-        }
         return rc;
 }
 
 /* returns count (>= 0), or negative on error */
 static int __devinit amd76x_init_one(struct pci_dev *pdev,
-                                     const struct pci_device_id *ent)
+                const struct pci_device_id *ent)
 {
-        debugf0("MC: " __FILE__ ": %s()\n", __func__);
+        debugf0("%s()\n", __func__);
 
         /* don't need to call pci_device_enable() */
         return amd76x_probe1(pdev, ent->driver_data);
 }
 
-
 /**
  *      amd76x_remove_one       -       driver shutdown
  *      @pdev: PCI device being handed back
@@ -304,35 +285,36 @@ static int __devinit amd76x_init_one(struct pci_dev *pdev,
  *      structure for the device then delete the mci and free the
  *      resources.
  */
-
 static void __devexit amd76x_remove_one(struct pci_dev *pdev)
 {
         struct mem_ctl_info *mci;
 
-        debugf0(__FILE__ ": %s()\n", __func__);
+        debugf0("%s()\n", __func__);
 
-        if ((mci = edac_mc_find_mci_by_pdev(pdev)) == NULL)
+        if ((mci = edac_mc_del_mc(pdev)) == NULL)
                 return;
-        if (edac_mc_del_mc(mci))
-                return;
-        pci_dev_put(mci->pdev);
+
         edac_mc_free(mci);
 }
 
-
 static const struct pci_device_id amd76x_pci_tbl[] __devinitdata = {
-        {PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-         AMD762},
-        {PCI_VEND_DEV(AMD, FE_GATE_700E), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-         AMD761},
-        {0,}                    /* 0 terminated list. */
+        {
+                PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                AMD762
+        },
+        {
+                PCI_VEND_DEV(AMD, FE_GATE_700E), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                AMD761
+        },
+        {
+                0,
+        }       /* 0 terminated list. */
 };
 
 MODULE_DEVICE_TABLE(pci, amd76x_pci_tbl);
 
-
 static struct pci_driver amd76x_driver = {
-        .name = BS_MOD_STR,
+        .name = EDAC_MOD_STR,
         .probe = amd76x_init_one,
         .remove = __devexit_p(amd76x_remove_one),
         .id_table = amd76x_pci_tbl,
diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c
index c454ded2b0..66572c5323 100644
--- a/drivers/edac/e752x_edac.c
+++ b/drivers/edac/e752x_edac.c
@@ -17,18 +17,19 @@
  *
  */
 
-
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
-
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
-
 #include <linux/slab.h>
-
 #include "edac_mc.h"
 
+#define e752x_printk(level, fmt, arg...) \
+        edac_printk(level, "e752x", fmt, ##arg)
+
+#define e752x_mc_printk(mci, level, fmt, arg...) \
+        edac_mc_chipset_printk(mci, level, "e752x", fmt, ##arg)
 
 #ifndef PCI_DEVICE_ID_INTEL_7520_0
 #define PCI_DEVICE_ID_INTEL_7520_0      0x3590
@@ -56,7 +57,6 @@
 
 #define E752X_NR_CSROWS         8       /* number of csrows */
 
-
 /* E752X register addresses - device 0 function 0 */
 #define E752X_DRB               0x60    /* DRAM row boundary register (8b) */
 #define E752X_DRA               0x70    /* DRAM row attribute register (8b) */
@@ -156,7 +156,6 @@ enum e752x_chips {
         E7320 = 2
 };
 
-
 struct e752x_pvt {
         struct pci_dev *bridge_ck;
         struct pci_dev *dev_d0f0;
@@ -170,9 +169,9 @@ struct e752x_pvt {
         const struct e752x_dev_info *dev_info;
 };
 
-
 struct e752x_dev_info {
         u16 err_dev;
+        u16 ctl_dev;
         const char *ctl_name;
 };
 
@@ -198,38 +197,47 @@ struct e752x_error_info {
 
 static const struct e752x_dev_info e752x_devs[] = {
         [E7520] = {
-                   .err_dev = PCI_DEVICE_ID_INTEL_7520_1_ERR,
-                   .ctl_name = "E7520"},
+                .err_dev = PCI_DEVICE_ID_INTEL_7520_1_ERR,
+                .ctl_dev = PCI_DEVICE_ID_INTEL_7520_0,
+                .ctl_name = "E7520"
+        },
         [E7525] = {
-                   .err_dev = PCI_DEVICE_ID_INTEL_7525_1_ERR,
-                   .ctl_name = "E7525"},
+                .err_dev = PCI_DEVICE_ID_INTEL_7525_1_ERR,
+                .ctl_dev = PCI_DEVICE_ID_INTEL_7525_0,
+                .ctl_name = "E7525"
+        },
         [E7320] = {
-                   .err_dev = PCI_DEVICE_ID_INTEL_7320_1_ERR,
-                   .ctl_name = "E7320"},
+                .err_dev = PCI_DEVICE_ID_INTEL_7320_1_ERR,
+                .ctl_dev = PCI_DEVICE_ID_INTEL_7320_0,
+                .ctl_name = "E7320"
+        },
 };
 
-
 static unsigned long ctl_page_to_phys(struct mem_ctl_info *mci,
-                                      unsigned long page)
+                unsigned long page)
 {
         u32 remap;
         struct e752x_pvt *pvt = (struct e752x_pvt *) mci->pvt_info;
 
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
+        debugf3("%s()\n", __func__);
 
         if (page < pvt->tolm)
                 return page;
+
         if ((page >= 0x100000) && (page < pvt->remapbase))
                 return page;
+
         remap = (page - pvt->tolm) + pvt->remapbase;
+
         if (remap < pvt->remaplimit)
                 return remap;
-        printk(KERN_ERR "Invalid page %lx - out of range\n", page);
+
+        e752x_printk(KERN_ERR, "Invalid page %lx - out of range\n", page);
         return pvt->tolm - 1;
 }
 
 static void do_process_ce(struct mem_ctl_info *mci, u16 error_one,
-                       u32 sec1_add, u16 sec1_syndrome)
+                u32 sec1_add, u16 sec1_syndrome)
 {
         u32 page;
         int row;
@@ -237,7 +245,7 @@ static void do_process_ce(struct mem_ctl_info *mci, u16 error_one,
         int i;
         struct e752x_pvt *pvt = (struct e752x_pvt *) mci->pvt_info;
 
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
+        debugf3("%s()\n", __func__);
 
         /* convert the addr to 4k page */
         page = sec1_add >> (PAGE_SHIFT - 4);
@@ -246,36 +254,37 @@ static void do_process_ce(struct mem_ctl_info *mci, u16 error_one,
         if (pvt->mc_symmetric) {
                 /* chip select are bits 14 & 13 */
                 row = ((page >> 1) & 3);
-                printk(KERN_WARNING
-                       "Test row %d Table %d %d %d %d %d %d %d %d\n",
-                       row, pvt->map[0], pvt->map[1], pvt->map[2],
-                       pvt->map[3], pvt->map[4], pvt->map[5],
-                       pvt->map[6], pvt->map[7]);
+                e752x_printk(KERN_WARNING,
+                        "Test row %d Table %d %d %d %d %d %d %d %d\n", row,
+                        pvt->map[0], pvt->map[1], pvt->map[2], pvt->map[3],
+                        pvt->map[4], pvt->map[5], pvt->map[6], pvt->map[7]);
 
                 /* test for channel remapping */
                 for (i = 0; i < 8; i++) {
                         if (pvt->map[i] == row)
                                 break;
                 }
-                printk(KERN_WARNING "Test computed row %d\n", i);
+
+                e752x_printk(KERN_WARNING, "Test computed row %d\n", i);
+
                 if (i < 8)
                         row = i;
                 else
-                        printk(KERN_WARNING
-                               "MC%d: row %d not found in remap table\n",
-                               mci->mc_idx, row);
+                        e752x_mc_printk(mci, KERN_WARNING,
+                                "row %d not found in remap table\n", row);
         } else
                 row = edac_mc_find_csrow_by_page(mci, page);
+
         /* 0 = channel A, 1 = channel B */
         channel = !(error_one & 1);
 
         if (!pvt->map_type)
                 row = 7 - row;
+
         edac_mc_handle_ce(mci, page, 0, sec1_syndrome, row, channel,
-            "e752x CE");
+                "e752x CE");
 }
 
-
 static inline void process_ce(struct mem_ctl_info *mci, u16 error_one,
                 u32 sec1_add, u16 sec1_syndrome, int *error_found,
                 int handle_error)
@@ -286,36 +295,42 @@ static inline void process_ce(struct mem_ctl_info *mci, u16 error_one,
                 do_process_ce(mci, error_one, sec1_add, sec1_syndrome);
 }
 
-static void do_process_ue(struct mem_ctl_info *mci, u16 error_one, u32 ded_add,
-                u32 scrb_add)
+static void do_process_ue(struct mem_ctl_info *mci, u16 error_one,
+                u32 ded_add, u32 scrb_add)
 {
         u32 error_2b, block_page;
         int row;
         struct e752x_pvt *pvt = (struct e752x_pvt *) mci->pvt_info;
 
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
+        debugf3("%s()\n", __func__);
 
         if (error_one & 0x0202) {
                 error_2b = ded_add;
+
                 /* convert to 4k address */
                 block_page = error_2b >> (PAGE_SHIFT - 4);
+
                 row = pvt->mc_symmetric ?
-                    /* chip select are bits 14 & 13 */
-                    ((block_page >> 1) & 3) :
-                    edac_mc_find_csrow_by_page(mci, block_page);
+                        /* chip select are bits 14 & 13 */
+                        ((block_page >> 1) & 3) :
+                        edac_mc_find_csrow_by_page(mci, block_page);
+
                 edac_mc_handle_ue(mci, block_page, 0, row,
-                                       "e752x UE from Read");
+                        "e752x UE from Read");
         }
         if (error_one & 0x0404) {
                 error_2b = scrb_add;
+
                 /* convert to 4k address */
                 block_page = error_2b >> (PAGE_SHIFT - 4);
+
                 row = pvt->mc_symmetric ?
-                    /* chip select are bits 14 & 13 */
-                    ((block_page >> 1) & 3) :
-                    edac_mc_find_csrow_by_page(mci, block_page);
+                        /* chip select are bits 14 & 13 */
+                        ((block_page >> 1) & 3) :
+                        edac_mc_find_csrow_by_page(mci, block_page);
+
                 edac_mc_handle_ue(mci, block_page, 0, row,
-                                       "e752x UE from Scruber");
+                                "e752x UE from Scruber");
         }
 }
 
@@ -336,7 +351,7 @@ static inline void process_ue_no_info_wr(struct mem_ctl_info *mci,
         if (!handle_error)
                 return;
 
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
+        debugf3("%s()\n", __func__);
         edac_mc_handle_ue_no_info(mci, "e752x UE log memory write");
 }
 
@@ -348,13 +363,13 @@ static void do_process_ded_retry(struct mem_ctl_info *mci, u16 error,
         struct e752x_pvt *pvt = (struct e752x_pvt *) mci->pvt_info;
 
         error_1b = retry_add;
-        page = error_1b >> (PAGE_SHIFT - 4);    /* convert the addr to 4k page */
+        page = error_1b >> (PAGE_SHIFT - 4); /* convert the addr to 4k page */
         row = pvt->mc_symmetric ?
-            ((page >> 1) & 3) : /* chip select are bits 14 & 13 */
-            edac_mc_find_csrow_by_page(mci, page);
-        printk(KERN_WARNING
-               "MC%d: CE page 0x%lx, row %d : Memory read retry\n",
-               mci->mc_idx, (long unsigned int) page, row);
+                ((page >> 1) & 3) : /* chip select are bits 14 & 13 */
+                edac_mc_find_csrow_by_page(mci, page);
+        e752x_mc_printk(mci, KERN_WARNING,
+                "CE page 0x%lx, row %d : Memory read retry\n",
+                (long unsigned int) page, row);
 }
 
 static inline void process_ded_retry(struct mem_ctl_info *mci, u16 error,
@@ -372,8 +387,7 @@ static inline void process_threshold_ce(struct mem_ctl_info *mci, u16 error,
         *error_found = 1;
 
         if (handle_error)
-                printk(KERN_WARNING "MC%d: Memory threshold CE\n",
-                       mci->mc_idx);
+                e752x_mc_printk(mci, KERN_WARNING, "Memory threshold CE\n");
 }
 
 static char *global_message[11] = {
@@ -391,8 +405,8 @@ static void do_global_error(int fatal, u32 errors)
 
         for (i = 0; i < 11; i++) {
                 if (errors & (1 << i))
-                        printk(KERN_WARNING "%sError %s\n",
-                               fatal_message[fatal], global_message[i]);
+                        e752x_printk(KERN_WARNING, "%sError %s\n",
+                                fatal_message[fatal], global_message[i]);
         }
 }
 
@@ -418,8 +432,8 @@ static void do_hub_error(int fatal, u8 errors)
 
         for (i = 0; i < 7; i++) {
                 if (errors & (1 << i))
-                        printk(KERN_WARNING "%sError %s\n",
-                               fatal_message[fatal], hub_message[i]);
+                        e752x_printk(KERN_WARNING, "%sError %s\n",
+                                fatal_message[fatal], hub_message[i]);
         }
 }
 
@@ -445,8 +459,8 @@ static void do_membuf_error(u8 errors)
 
         for (i = 0; i < 4; i++) {
                 if (errors & (1 << i))
-                        printk(KERN_WARNING "Non-Fatal Error %s\n",
-                               membuf_message[i]);
+                        e752x_printk(KERN_WARNING, "Non-Fatal Error %s\n",
+                                membuf_message[i]);
         }
 }
 
@@ -458,8 +472,7 @@ static inline void membuf_error(u8 errors, int *error_found, int handle_error)
                 do_membuf_error(errors);
 }
 
-#if 0
-char *sysbus_message[10] = {
+static char *sysbus_message[10] = {
         "Addr or Request Parity",
         "Data Strobe Glitch",
         "Addr Strobe Glitch",
@@ -470,7 +483,6 @@ char *sysbus_message[10] = {
         "Memory Parity",
         "IO Subsystem Parity"
 };
-#endif  /*  0  */
 
 static void do_sysbus_error(int fatal, u32 errors)
 {
@@ -478,8 +490,8 @@ static void do_sysbus_error(int fatal, u32 errors)
 
         for (i = 0; i < 10; i++) {
                 if (errors & (1 << i))
-                        printk(KERN_WARNING "%sError System Bus %s\n",
-                               fatal_message[fatal], global_message[i]);
+                        e752x_printk(KERN_WARNING, "%sError System Bus %s\n",
+                                fatal_message[fatal], sysbus_message[i]);
         }
 }
 
@@ -492,33 +504,42 @@ static inline void sysbus_error(int fatal, u32 errors, int *error_found,
                 do_sysbus_error(fatal, errors);
 }
 
-static void e752x_check_hub_interface (struct e752x_error_info *info,
+static void e752x_check_hub_interface(struct e752x_error_info *info,
                 int *error_found, int handle_error)
 {
         u8 stat8;
 
         //pci_read_config_byte(dev,E752X_HI_FERR,&stat8);
+
         stat8 = info->hi_ferr;
+
         if(stat8 & 0x7f) { /* Error, so process */
                 stat8 &= 0x7f;
+
                 if(stat8 & 0x2b)
                         hub_error(1, stat8 & 0x2b, error_found, handle_error);
+
                 if(stat8 & 0x54)
                         hub_error(0, stat8 & 0x54, error_found, handle_error);
         }
+
         //pci_read_config_byte(dev,E752X_HI_NERR,&stat8);
+
         stat8 = info->hi_nerr;
+
         if(stat8 & 0x7f) { /* Error, so process */
                 stat8 &= 0x7f;
+
                 if (stat8 & 0x2b)
                         hub_error(1, stat8 & 0x2b, error_found, handle_error);
+
                 if(stat8 & 0x54)
                         hub_error(0, stat8 & 0x54, error_found, handle_error);
         }
 }
 
-static void e752x_check_sysbus (struct e752x_error_info *info, int *error_found,
-                int handle_error)
+static void e752x_check_sysbus(struct e752x_error_info *info,
+                int *error_found, int handle_error)
 {
         u32 stat32, error32;
 
@@ -530,27 +551,34 @@ static void e752x_check_sysbus (struct e752x_error_info *info, int *error_found,
 
         error32 = (stat32 >> 16) & 0x3ff;
         stat32 = stat32 & 0x3ff;
+
         if(stat32 & 0x083)
                 sysbus_error(1, stat32 & 0x083, error_found, handle_error);
+
         if(stat32 & 0x37c)
                 sysbus_error(0, stat32 & 0x37c, error_found, handle_error);
+
         if(error32 & 0x083)
                 sysbus_error(1, error32 & 0x083, error_found, handle_error);
+
         if(error32 & 0x37c)
                 sysbus_error(0, error32 & 0x37c, error_found, handle_error);
 }
 
-static void e752x_check_membuf (struct e752x_error_info *info, int *error_found,
-                int handle_error)
+static void e752x_check_membuf (struct e752x_error_info *info,
+                int *error_found, int handle_error)
 {
         u8 stat8;
 
         stat8 = info->buf_ferr;
+
         if (stat8 & 0x0f) { /* Error, so process */
                 stat8 &= 0x0f;
                 membuf_error(stat8, error_found, handle_error);
         }
+
         stat8 = info->buf_nerr;
+
         if (stat8 & 0x0f) { /* Error, so process */
                 stat8 &= 0x0f;
                 membuf_error(stat8, error_found, handle_error);
@@ -558,7 +586,8 @@ static void e752x_check_membuf (struct e752x_error_info *info, int *error_found,
 }
 
 static void e752x_check_dram (struct mem_ctl_info *mci,
-                struct e752x_error_info *info, int *error_found, int handle_error)
+                struct e752x_error_info *info, int *error_found,
+                int handle_error)
 {
         u16 error_one, error_next;
 
@@ -608,7 +637,7 @@ static void e752x_check_dram (struct mem_ctl_info *mci,
 }
 
 static void e752x_get_error_info (struct mem_ctl_info *mci,
-                                  struct e752x_error_info *info)
+                struct e752x_error_info *info)
 {
         struct pci_dev *dev;
         struct e752x_pvt *pvt;
@@ -616,7 +645,6 @@ static void e752x_get_error_info (struct mem_ctl_info *mci,
         memset(info, 0, sizeof(*info));
         pvt = (struct e752x_pvt *) mci->pvt_info;
         dev = pvt->dev_d0f1;
-
         pci_read_config_dword(dev, E752X_FERR_GLOBAL, &info->ferr_global);
 
         if (info->ferr_global) {
@@ -727,7 +755,8 @@ static int e752x_process_error_info (struct mem_ctl_info *mci,
 static void e752x_check(struct mem_ctl_info *mci)
 {
         struct e752x_error_info info;
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
+
+        debugf3("%s()\n", __func__);
         e752x_get_error_info(mci, &info);
         e752x_process_error_info(mci, &info, 1);
 }
@@ -736,23 +765,21 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
 {
         int rc = -ENODEV;
         int index;
-        u16 pci_data, stat;
-        u32 stat32;
-        u16 stat16;
+        u16 pci_data;
         u8 stat8;
         struct mem_ctl_info *mci = NULL;
         struct e752x_pvt *pvt = NULL;
         u16 ddrcsr;
         u32 drc;
-        int drc_chan;           /* Number of channels 0=1chan,1=2chan */
-        int drc_drbg;           /* DRB granularity 0=64mb,1=128mb */
-        int drc_ddim;           /* DRAM Data Integrity Mode 0=none,2=edac */
+        int drc_chan;   /* Number of channels 0=1chan,1=2chan */
+        int drc_drbg;   /* DRB granularity 0=64mb, 1=128mb */
+        int drc_ddim;   /* DRAM Data Integrity Mode 0=none,2=edac */
         u32 dra;
         unsigned long last_cumul_size;
-        struct pci_dev *pres_dev;
         struct pci_dev *dev = NULL;
+        struct e752x_error_info discard;
 
-        debugf0("MC: " __FILE__ ": %s(): mci\n", __func__);
+        debugf0("%s(): mci\n", __func__);
         debugf0("Starting Probe1\n");
 
         /* enable device 0 function 1 */
@@ -776,34 +803,35 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
                 goto fail;
         }
 
-        debugf3("MC: " __FILE__ ": %s(): init mci\n", __func__);
-
+        debugf3("%s(): init mci\n", __func__);
         mci->mtype_cap = MEM_FLAG_RDDR;
         mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED |
             EDAC_FLAG_S4ECD4ED;
         /* FIXME - what if different memory types are in different csrows? */
-        mci->mod_name = BS_MOD_STR;
+        mci->mod_name = EDAC_MOD_STR;
         mci->mod_ver = "$Revision: 1.5.2.11 $";
         mci->pdev = pdev;
 
-        debugf3("MC: " __FILE__ ": %s(): init pvt\n", __func__);
+        debugf3("%s(): init pvt\n", __func__);
         pvt = (struct e752x_pvt *) mci->pvt_info;
         pvt->dev_info = &e752x_devs[dev_idx];
         pvt->bridge_ck = pci_get_device(PCI_VENDOR_ID_INTEL,
-                                         pvt->dev_info->err_dev,
-                                         pvt->bridge_ck);
+                                        pvt->dev_info->err_dev,
+                                        pvt->bridge_ck);
+
         if (pvt->bridge_ck == NULL)
                 pvt->bridge_ck = pci_scan_single_device(pdev->bus,
-                                                        PCI_DEVFN(0, 1));
+                                        PCI_DEVFN(0, 1));
+
         if (pvt->bridge_ck == NULL) {
-                printk(KERN_ERR "MC: error reporting device not found:"
-                       "vendor %x device 0x%x (broken BIOS?)\n",
-                       PCI_VENDOR_ID_INTEL, e752x_devs[dev_idx].err_dev);
+                e752x_printk(KERN_ERR, "error reporting device not found:"
+                        "vendor %x device 0x%x (broken BIOS?)\n",
+                        PCI_VENDOR_ID_INTEL, e752x_devs[dev_idx].err_dev);
                 goto fail;
         }
-        pvt->mc_symmetric = ((ddrcsr & 0x10) != 0);
 
-        debugf3("MC: " __FILE__ ": %s(): more mci init\n", __func__);
+        pvt->mc_symmetric = ((ddrcsr & 0x10) != 0);
+        debugf3("%s(): more mci init\n", __func__);
         mci->ctl_name = pvt->dev_info->ctl_name;
         mci->edac_check = e752x_check;
         mci->ctl_page_to_phys = ctl_page_to_phys;
@@ -820,6 +848,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
         for (last_cumul_size = index = 0; index < mci->nr_csrows; index++) {
                 u8 value;
                 u32 cumul_size;
+
                 /* mem_dev 0=x8, 1=x4 */
                 int mem_dev = (dra >> (index * 4 + 2)) & 0x3;
                 struct csrow_info *csrow = &mci->csrows[index];
@@ -828,17 +857,18 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
                 pci_read_config_byte(mci->pdev, E752X_DRB + index, &value);
                 /* convert a 128 or 64 MiB DRB to a page size. */
                 cumul_size = value << (25 + drc_drbg - PAGE_SHIFT);
-                debugf3("MC: " __FILE__ ": %s(): (%d) cumul_size 0x%x\n",
-                        __func__, index, cumul_size);
+                debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index,
+                        cumul_size);
+
                 if (cumul_size == last_cumul_size)
-                        continue;       /* not populated */
+                        continue; /* not populated */
 
                 csrow->first_page = last_cumul_size;
                 csrow->last_page = cumul_size - 1;
                 csrow->nr_pages = cumul_size - last_cumul_size;
                 last_cumul_size = cumul_size;
-                csrow->grain = 1 << 12; /* 4KiB - resolution of CELOG */
-                csrow->mtype = MEM_RDDR;        /* only one type supported */
+                csrow->grain = 1 << 12;  /* 4KiB - resolution of CELOG */
+                csrow->mtype = MEM_RDDR;  /* only one type supported */
                 csrow->dtype = mem_dev ? DEV_X4 : DEV_X8;
 
                 /*
@@ -862,29 +892,32 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
                 u8 value;
                 u8 last = 0;
                 u8 row = 0;
-                for (index = 0; index < 8; index += 2) {
 
+                for (index = 0; index < 8; index += 2) {
                         pci_read_config_byte(mci->pdev, E752X_DRB + index,
-                                             &value);
+                                        &value);
+
                         /* test if there is a dimm in this slot */
                         if (value == last) {
                                 /* no dimm in the slot, so flag it as empty */
                                 pvt->map[index] = 0xff;
                                 pvt->map[index + 1] = 0xff;
-                        } else {        /* there is a dimm in the slot */
+                        } else { /* there is a dimm in the slot */
                                 pvt->map[index] = row;
                                 row++;
                                 last = value;
                                 /* test the next value to see if the dimm is
                                    double sided */
                                 pci_read_config_byte(mci->pdev,
-                                                     E752X_DRB + index + 1,
-                                                     &value);
+                                                E752X_DRB + index + 1,
+                                                &value);
                                 pvt->map[index + 1] = (value == last) ?
-                                    0xff :      /* the dimm is single sided,
-                                                   so flag as empty */
-                                    row;        /* this is a double sided dimm
-                                                   to save the next row # */
+                                        0xff :  /* the dimm is single sided,
+                                                 * so flag as empty
+                                                 */
+                                        row;    /* this is a double sided dimm
+                                                 * to save the next row #
+                                                 */
                                 row++;
                                 last = value;
                         }
@@ -896,9 +929,8 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
         pvt->map_type = ((stat8 & 0x0f) > ((stat8 >> 4) & 0x0f));
 
         mci->edac_cap |= EDAC_FLAG_NONE;
+        debugf3("%s(): tolm, remapbase, remaplimit\n", __func__);
 
-        debugf3("MC: " __FILE__ ": %s(): tolm, remapbase, remaplimit\n",
-                __func__);
         /* load the top of low memory, remap base, and remap limit vars */
         pci_read_config_word(mci->pdev, E752X_TOLM, &pci_data);
         pvt->tolm = ((u32) pci_data) << 4;
@@ -906,43 +938,18 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
         pvt->remapbase = ((u32) pci_data) << 14;
         pci_read_config_word(mci->pdev, E752X_REMAPLIMIT, &pci_data);
         pvt->remaplimit = ((u32) pci_data) << 14;
-        printk("tolm = %x, remapbase = %x, remaplimit = %x\n", pvt->tolm,
-               pvt->remapbase, pvt->remaplimit);
+        e752x_printk(KERN_INFO,
+                "tolm = %x, remapbase = %x, remaplimit = %x\n", pvt->tolm,
+                pvt->remapbase, pvt->remaplimit);
 
         if (edac_mc_add_mc(mci)) {
-                debugf3("MC: " __FILE__
-                        ": %s(): failed edac_mc_add_mc()\n",
-                        __func__);
+                debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
                 goto fail;
         }
 
-        /* Walk through the PCI table and clear errors */
-        switch (dev_idx) {
-        case E7520:
-                dev = pci_get_device(PCI_VENDOR_ID_INTEL,
-                                      PCI_DEVICE_ID_INTEL_7520_0, NULL);
-                break;
-        case E7525:
-                dev = pci_get_device(PCI_VENDOR_ID_INTEL,
-                                      PCI_DEVICE_ID_INTEL_7525_0, NULL);
-                break;
-        case E7320:
-                dev = pci_get_device(PCI_VENDOR_ID_INTEL,
-                                      PCI_DEVICE_ID_INTEL_7320_0, NULL);
-                break;
-        }
-
-
+        dev = pci_get_device(PCI_VENDOR_ID_INTEL, e752x_devs[dev_idx].ctl_dev,
+                        NULL);
         pvt->dev_d0f0 = dev;
-        for (pres_dev = dev;
-             ((struct pci_dev *) pres_dev->global_list.next != dev);
-             pres_dev = (struct pci_dev *) pres_dev->global_list.next) {
-                pci_read_config_dword(pres_dev, PCI_COMMAND, &stat32);
-                stat = (u16) (stat32 >> 16);
-                /* clear any error bits */
-                if (stat32 & ((1 << 6) + (1 << 8)))
-                        pci_write_config_word(pres_dev, PCI_STATUS, stat);
-        }
         /* find the error reporting device and clear errors */
         dev = pvt->dev_d0f1 = pci_dev_get(pvt->bridge_ck);
         /* Turn off error disable & SMI in case the BIOS turned it on */
@@ -954,67 +961,51 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
         pci_write_config_byte(dev, E752X_BUF_SMICMD, 0x00);
         pci_write_config_byte(dev, E752X_DRAM_ERRMASK, 0x00);
         pci_write_config_byte(dev, E752X_DRAM_SMICMD, 0x00);
-        /* clear other MCH errors */
-        pci_read_config_dword(dev, E752X_FERR_GLOBAL, &stat32);
-        pci_write_config_dword(dev, E752X_FERR_GLOBAL, stat32);
-        pci_read_config_dword(dev, E752X_NERR_GLOBAL, &stat32);
-        pci_write_config_dword(dev, E752X_NERR_GLOBAL, stat32);
-        pci_read_config_byte(dev, E752X_HI_FERR, &stat8);
-        pci_write_config_byte(dev, E752X_HI_FERR, stat8);
-        pci_read_config_byte(dev, E752X_HI_NERR, &stat8);
-        pci_write_config_byte(dev, E752X_HI_NERR, stat8);
-        pci_read_config_dword(dev, E752X_SYSBUS_FERR, &stat32);
-        pci_write_config_dword(dev, E752X_SYSBUS_FERR, stat32);
-        pci_read_config_byte(dev, E752X_BUF_FERR, &stat8);
-        pci_write_config_byte(dev, E752X_BUF_FERR, stat8);
-        pci_read_config_byte(dev, E752X_BUF_NERR, &stat8);
-        pci_write_config_byte(dev, E752X_BUF_NERR, stat8);
-        pci_read_config_word(dev, E752X_DRAM_FERR, &stat16);
-        pci_write_config_word(dev, E752X_DRAM_FERR, stat16);
-        pci_read_config_word(dev, E752X_DRAM_NERR, &stat16);
-        pci_write_config_word(dev, E752X_DRAM_NERR, stat16);
+
+        e752x_get_error_info(mci, &discard); /* clear other MCH errors */
 
         /* get this far and it's successful */
-        debugf3("MC: " __FILE__ ": %s(): success\n", __func__);
+        debugf3("%s(): success\n", __func__);
         return 0;
 
 fail:
         if (mci) {
                 if (pvt->dev_d0f0)
                         pci_dev_put(pvt->dev_d0f0);
+
                 if (pvt->dev_d0f1)
                         pci_dev_put(pvt->dev_d0f1);
+
                 if (pvt->bridge_ck)
                         pci_dev_put(pvt->bridge_ck);
+
                 edac_mc_free(mci);
         }
+
         return rc;
 }
 
 /* returns count (>= 0), or negative on error */
 static int __devinit e752x_init_one(struct pci_dev *pdev,
-                                    const struct pci_device_id *ent)
+                const struct pci_device_id *ent)
 {
-        debugf0("MC: " __FILE__ ": %s()\n", __func__);
+        debugf0("%s()\n", __func__);
 
         /* wake up and enable device */
         if(pci_enable_device(pdev) < 0)
                 return -EIO;
+
         return e752x_probe1(pdev, ent->driver_data);
 }
 
-
 static void __devexit e752x_remove_one(struct pci_dev *pdev)
 {
         struct mem_ctl_info *mci;
         struct e752x_pvt *pvt;
 
-        debugf0(__FILE__ ": %s()\n", __func__);
-
-        if ((mci = edac_mc_find_mci_by_pdev(pdev)) == NULL)
-                return;
+        debugf0("%s()\n", __func__);
 
-        if (edac_mc_del_mc(mci))
+        if ((mci = edac_mc_del_mc(pdev)) == NULL)
                 return;
 
         pvt = (struct e752x_pvt *) mci->pvt_info;
@@ -1024,45 +1015,48 @@ static void __devexit e752x_remove_one(struct pci_dev *pdev)
         edac_mc_free(mci);
 }
 
-
 static const struct pci_device_id e752x_pci_tbl[] __devinitdata = {
-        {PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-         E7520},
-        {PCI_VEND_DEV(INTEL, 7525_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-         E7525},
-        {PCI_VEND_DEV(INTEL, 7320_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-         E7320},
-        {0,}                    /* 0 terminated list. */
+        {
+                PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                E7520
+        },
+        {
+                PCI_VEND_DEV(INTEL, 7525_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                E7525
+        },
+        {
+                PCI_VEND_DEV(INTEL, 7320_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                E7320
+        },
+        {
+                0,
+        }       /* 0 terminated list. */
 };
 
 MODULE_DEVICE_TABLE(pci, e752x_pci_tbl);
 
-
 static struct pci_driver e752x_driver = {
-        .name = BS_MOD_STR,
+        .name = EDAC_MOD_STR,
         .probe = e752x_init_one,
         .remove = __devexit_p(e752x_remove_one),
         .id_table = e752x_pci_tbl,
 };
 
-
 static int __init e752x_init(void)
 {
         int pci_rc;
 
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
+        debugf3("%s()\n", __func__);
         pci_rc = pci_register_driver(&e752x_driver);
         return (pci_rc < 0) ? pci_rc : 0;
 }
 
-
 static void __exit e752x_exit(void)
 {
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
+        debugf3("%s()\n", __func__);
         pci_unregister_driver(&e752x_driver);
 }
 
-
 module_init(e752x_init);
 module_exit(e752x_exit);
 
diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c
index d5e320dfc6..a9518d3e4b 100644
--- a/drivers/edac/e7xxx_edac.c
+++ b/drivers/edac/e7xxx_edac.c
@@ -11,9 +11,9 @@
  *      http://www.anime.net/~goemon/linux-ecc/
  *
  * Contributors:
- *      Eric Biederman (Linux Networx)
- *      Tom Zimmerman (Linux Networx)
- *      Jim Garlick (Lawrence Livermore National Labs)
+ *      Eric Biederman (Linux Networx)
+ *      Tom Zimmerman (Linux Networx)
+ *      Jim Garlick (Lawrence Livermore National Labs)
  *      Dave Peterson (Lawrence Livermore National Labs)
  *      That One Guy (Some other place)
  *      Wang Zhenyu (intel.com)
@@ -22,7 +22,6 @@
  *
  */
 
-
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -31,6 +30,11 @@
 #include <linux/slab.h>
 #include "edac_mc.h"
 
+#define e7xxx_printk(level, fmt, arg...) \
+        edac_printk(level, "e7xxx", fmt, ##arg)
+
+#define e7xxx_mc_printk(mci, level, fmt, arg...) \
+        edac_mc_chipset_printk(mci, level, "e7xxx", fmt, ##arg)
 
 #ifndef PCI_DEVICE_ID_INTEL_7205_0
 #define PCI_DEVICE_ID_INTEL_7205_0      0x255d
@@ -64,11 +68,9 @@
 #define PCI_DEVICE_ID_INTEL_7505_1_ERR  0x2551
 #endif                          /* PCI_DEVICE_ID_INTEL_7505_1_ERR */
 
-
 #define E7XXX_NR_CSROWS         8       /* number of csrows */
 #define E7XXX_NR_DIMMS          8       /* FIXME - is this correct? */
 
-
 /* E7XXX register addresses - device 0 function 0 */
 #define E7XXX_DRB               0x60    /* DRAM row boundary register (8b) */
 #define E7XXX_DRA               0x70    /* DRAM row attribute register (8b) */
@@ -118,7 +120,6 @@ enum e7xxx_chips {
         E7205,
 };
 
-
 struct e7xxx_pvt {
         struct pci_dev *bridge_ck;
         u32 tolm;
@@ -127,13 +128,11 @@ struct e7xxx_pvt {
         const struct e7xxx_dev_info *dev_info;
 };
 
-
 struct e7xxx_dev_info {
         u16 err_dev;
         const char *ctl_name;
 };
 
-
 struct e7xxx_error_info {
         u8 dram_ferr;
         u8 dram_nerr;
@@ -144,108 +143,110 @@ struct e7xxx_error_info {
 
 static const struct e7xxx_dev_info e7xxx_devs[] = {
         [E7500] = {
-                   .err_dev = PCI_DEVICE_ID_INTEL_7500_1_ERR,
-                   .ctl_name = "E7500"},
+                .err_dev = PCI_DEVICE_ID_INTEL_7500_1_ERR,
+                .ctl_name = "E7500"
+        },
         [E7501] = {
-                   .err_dev = PCI_DEVICE_ID_INTEL_7501_1_ERR,
-                   .ctl_name = "E7501"},
+                .err_dev = PCI_DEVICE_ID_INTEL_7501_1_ERR,
+                .ctl_name = "E7501"
+        },
         [E7505] = {
-                   .err_dev = PCI_DEVICE_ID_INTEL_7505_1_ERR,
-                   .ctl_name = "E7505"},
+                .err_dev = PCI_DEVICE_ID_INTEL_7505_1_ERR,
+                .ctl_name = "E7505"
+        },
         [E7205] = {
-                   .err_dev = PCI_DEVICE_ID_INTEL_7205_1_ERR,
-                   .ctl_name = "E7205"},
+                .err_dev = PCI_DEVICE_ID_INTEL_7205_1_ERR,
+                .ctl_name = "E7205"
+        },
 };
 
-
 /* FIXME - is this valid for both SECDED and S4ECD4ED? */
 static inline int e7xxx_find_channel(u16 syndrome)
 {
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
+        debugf3("%s()\n", __func__);
 
         if ((syndrome & 0xff00) == 0)
                 return 0;
+
         if ((syndrome & 0x00ff) == 0)
                 return 1;
+
         if ((syndrome & 0xf000) == 0 || (syndrome & 0x0f00) == 0)
                 return 0;
+
         return 1;
 }
 
-
-static unsigned long
-ctl_page_to_phys(struct mem_ctl_info *mci, unsigned long page)
+static unsigned long ctl_page_to_phys(struct mem_ctl_info *mci,
+                unsigned long page)
 {
         u32 remap;
         struct e7xxx_pvt *pvt = (struct e7xxx_pvt *) mci->pvt_info;
 
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
+        debugf3("%s()\n", __func__);
 
         if ((page < pvt->tolm) ||
-            ((page >= 0x100000) && (page < pvt->remapbase)))
+                        ((page >= 0x100000) && (page < pvt->remapbase)))
                 return page;
+
         remap = (page - pvt->tolm) + pvt->remapbase;
+
         if (remap < pvt->remaplimit)
                 return remap;
-        printk(KERN_ERR "Invalid page %lx - out of range\n", page);
+
+        e7xxx_printk(KERN_ERR, "Invalid page %lx - out of range\n", page);
         return pvt->tolm - 1;
 }
 
-
-static void process_ce(struct mem_ctl_info *mci, struct e7xxx_error_info *info)
+static void process_ce(struct mem_ctl_info *mci,
+                struct e7xxx_error_info *info)
 {
         u32 error_1b, page;
         u16 syndrome;
         int row;
         int channel;
 
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
-
+        debugf3("%s()\n", __func__);
         /* read the error address */
         error_1b = info->dram_celog_add;
         /* FIXME - should use PAGE_SHIFT */
-        page = error_1b >> 6;   /* convert the address to 4k page */
+        page = error_1b >> 6;  /* convert the address to 4k page */
         /* read the syndrome */
         syndrome = info->dram_celog_syndrome;
         /* FIXME - check for -1 */
         row = edac_mc_find_csrow_by_page(mci, page);
         /* convert syndrome to channel */
         channel = e7xxx_find_channel(syndrome);
-        edac_mc_handle_ce(mci, page, 0, syndrome, row, channel,
-                               "e7xxx CE");
+        edac_mc_handle_ce(mci, page, 0, syndrome, row, channel, "e7xxx CE");
 }
 
-
 static void process_ce_no_info(struct mem_ctl_info *mci)
 {
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
+        debugf3("%s()\n", __func__);
         edac_mc_handle_ce_no_info(mci, "e7xxx CE log register overflow");
 }
 
-
-static void process_ue(struct mem_ctl_info *mci, struct e7xxx_error_info *info)
+static void process_ue(struct mem_ctl_info *mci,
+                struct e7xxx_error_info *info)
 {
         u32 error_2b, block_page;
         int row;
 
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
-
+        debugf3("%s()\n", __func__);
         /* read the error address */
         error_2b = info->dram_uelog_add;
         /* FIXME - should use PAGE_SHIFT */
-        block_page = error_2b >> 6;     /* convert to 4k address */
+        block_page = error_2b >> 6;  /* convert to 4k address */
         row = edac_mc_find_csrow_by_page(mci, block_page);
         edac_mc_handle_ue(mci, block_page, 0, row, "e7xxx UE");
 }
 
-
 static void process_ue_no_info(struct mem_ctl_info *mci)
 {
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
+        debugf3("%s()\n", __func__);
         edac_mc_handle_ue_no_info(mci, "e7xxx UE log register overflow");
 }
 
-
 static void e7xxx_get_error_info (struct mem_ctl_info *mci,
                 struct e7xxx_error_info *info)
 {
@@ -253,31 +254,29 @@ static void e7xxx_get_error_info (struct mem_ctl_info *mci,
 
         pvt = (struct e7xxx_pvt *) mci->pvt_info;
         pci_read_config_byte(pvt->bridge_ck, E7XXX_DRAM_FERR,
-            &info->dram_ferr);
+                        &info->dram_ferr);
         pci_read_config_byte(pvt->bridge_ck, E7XXX_DRAM_NERR,
-            &info->dram_nerr);
+                        &info->dram_nerr);
 
         if ((info->dram_ferr & 1) || (info->dram_nerr & 1)) {
                 pci_read_config_dword(pvt->bridge_ck, E7XXX_DRAM_CELOG_ADD,
-                    &info->dram_celog_add);
+                                &info->dram_celog_add);
                 pci_read_config_word(pvt->bridge_ck,
-                    E7XXX_DRAM_CELOG_SYNDROME, &info->dram_celog_syndrome);
+                                E7XXX_DRAM_CELOG_SYNDROME,
+                                &info->dram_celog_syndrome);
         }
 
         if ((info->dram_ferr & 2) || (info->dram_nerr & 2))
                 pci_read_config_dword(pvt->bridge_ck, E7XXX_DRAM_UELOG_ADD,
-                    &info->dram_uelog_add);
+                                &info->dram_uelog_add);
 
         if (info->dram_ferr & 3)
-                pci_write_bits8(pvt->bridge_ck, E7XXX_DRAM_FERR, 0x03,
-                    0x03);
+                pci_write_bits8(pvt->bridge_ck, E7XXX_DRAM_FERR, 0x03, 0x03);
 
         if (info->dram_nerr & 3)
-                pci_write_bits8(pvt->bridge_ck, E7XXX_DRAM_NERR, 0x03,
-                    0x03);
+                pci_write_bits8(pvt->bridge_ck, E7XXX_DRAM_NERR, 0x03, 0x03);
 }
 
-
 static int e7xxx_process_error_info (struct mem_ctl_info *mci,
                 struct e7xxx_error_info *info, int handle_errors)
 {
@@ -325,17 +324,15 @@ static int e7xxx_process_error_info (struct mem_ctl_info *mci,
         return error_found;
 }
 
-
 static void e7xxx_check(struct mem_ctl_info *mci)
 {
         struct e7xxx_error_info info;
 
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
+        debugf3("%s()\n", __func__);
         e7xxx_get_error_info(mci, &info);
         e7xxx_process_error_info(mci, &info, 1);
 }
 
-
 static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
 {
         int rc = -ENODEV;
@@ -349,19 +346,20 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
         int drc_ddim;           /* DRAM Data Integrity Mode 0=none,2=edac */
         u32 dra;
         unsigned long last_cumul_size;
+        struct e7xxx_error_info discard;
 
-
-        debugf0("MC: " __FILE__ ": %s(): mci\n", __func__);
+        debugf0("%s(): mci\n", __func__);
 
         /* need to find out the number of channels */
         pci_read_config_dword(pdev, E7XXX_DRC, &drc);
+
         /* only e7501 can be single channel */
         if (dev_idx == E7501) {
                 drc_chan = ((drc >> 22) & 0x1);
                 drc_drbg = (drc >> 18) & 0x3;
         }
-        drc_ddim = (drc >> 20) & 0x3;
 
+        drc_ddim = (drc >> 20) & 0x3;
         mci = edac_mc_alloc(sizeof(*pvt), E7XXX_NR_CSROWS, drc_chan + 1);
 
         if (mci == NULL) {
@@ -369,33 +367,31 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
                 goto fail;
         }
 
-        debugf3("MC: " __FILE__ ": %s(): init mci\n", __func__);
-
+        debugf3("%s(): init mci\n", __func__);
         mci->mtype_cap = MEM_FLAG_RDDR;
-        mci->edac_ctl_cap =
-            EDAC_FLAG_NONE | EDAC_FLAG_SECDED | EDAC_FLAG_S4ECD4ED;
+        mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED |
+                        EDAC_FLAG_S4ECD4ED;
         /* FIXME - what if different memory types are in different csrows? */
-        mci->mod_name = BS_MOD_STR;
+        mci->mod_name = EDAC_MOD_STR;
         mci->mod_ver = "$Revision: 1.5.2.9 $";
         mci->pdev = pdev;
 
-        debugf3("MC: " __FILE__ ": %s(): init pvt\n", __func__);
+        debugf3("%s(): init pvt\n", __func__);
         pvt = (struct e7xxx_pvt *) mci->pvt_info;
         pvt->dev_info = &e7xxx_devs[dev_idx];
         pvt->bridge_ck = pci_get_device(PCI_VENDOR_ID_INTEL,
-                                         pvt->dev_info->err_dev,
-                                         pvt->bridge_ck);
+                                        pvt->dev_info->err_dev,
+                                        pvt->bridge_ck);
+
         if (!pvt->bridge_ck) {
-                printk(KERN_ERR
-                       "MC: error reporting device not found:"
-                       "vendor %x device 0x%x (broken BIOS?)\n",
-                       PCI_VENDOR_ID_INTEL, e7xxx_devs[dev_idx].err_dev);
+                e7xxx_printk(KERN_ERR, "error reporting device not found:"
+                        "vendor %x device 0x%x (broken BIOS?)\n",
+                        PCI_VENDOR_ID_INTEL, e7xxx_devs[dev_idx].err_dev);
                 goto fail;
         }
 
-        debugf3("MC: " __FILE__ ": %s(): more mci init\n", __func__);
+        debugf3("%s(): more mci init\n", __func__);
         mci->ctl_name = pvt->dev_info->ctl_name;
-
         mci->edac_check = e7xxx_check;
         mci->ctl_page_to_phys = ctl_page_to_phys;
 
@@ -418,17 +414,18 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
                 pci_read_config_byte(mci->pdev, E7XXX_DRB + index, &value);
                 /* convert a 64 or 32 MiB DRB to a page size. */
                 cumul_size = value << (25 + drc_drbg - PAGE_SHIFT);
-                debugf3("MC: " __FILE__ ": %s(): (%d) cumul_size 0x%x\n",
-                        __func__, index, cumul_size);
+                debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index,
+                        cumul_size);
+
                 if (cumul_size == last_cumul_size)
-                        continue;       /* not populated */
+                        continue;  /* not populated */
 
                 csrow->first_page = last_cumul_size;
                 csrow->last_page = cumul_size - 1;
                 csrow->nr_pages = cumul_size - last_cumul_size;
                 last_cumul_size = cumul_size;
-                csrow->grain = 1 << 12; /* 4KiB - resolution of CELOG */
-                csrow->mtype = MEM_RDDR;        /* only one type supported */
+                csrow->grain = 1 << 12;  /* 4KiB - resolution of CELOG */
+                csrow->mtype = MEM_RDDR;  /* only one type supported */
                 csrow->dtype = mem_dev ? DEV_X4 : DEV_X8;
 
                 /*
@@ -449,8 +446,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
 
         mci->edac_cap |= EDAC_FLAG_NONE;
 
-        debugf3("MC: " __FILE__ ": %s(): tolm, remapbase, remaplimit\n",
-                __func__);
+        debugf3("%s(): tolm, remapbase, remaplimit\n", __func__);
         /* load the top of low memory, remap base, and remap limit vars */
         pci_read_config_word(mci->pdev, E7XXX_TOLM, &pci_data);
         pvt->tolm = ((u32) pci_data) << 4;
@@ -458,22 +454,20 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
         pvt->remapbase = ((u32) pci_data) << 14;
         pci_read_config_word(mci->pdev, E7XXX_REMAPLIMIT, &pci_data);
         pvt->remaplimit = ((u32) pci_data) << 14;
-        printk("tolm = %x, remapbase = %x, remaplimit = %x\n", pvt->tolm,
-               pvt->remapbase, pvt->remaplimit);
+        e7xxx_printk(KERN_INFO,
+                "tolm = %x, remapbase = %x, remaplimit = %x\n", pvt->tolm,
+                pvt->remapbase, pvt->remaplimit);
 
         /* clear any pending errors, or initial state bits */
-        pci_write_bits8(pvt->bridge_ck, E7XXX_DRAM_FERR, 0x03, 0x03);
-        pci_write_bits8(pvt->bridge_ck, E7XXX_DRAM_NERR, 0x03, 0x03);
+        e7xxx_get_error_info(mci, &discard);
 
         if (edac_mc_add_mc(mci) != 0) {
-                debugf3("MC: " __FILE__
-                        ": %s(): failed edac_mc_add_mc()\n",
-                        __func__);
+                debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
                 goto fail;
         }
 
         /* get this far and it's successful */
-        debugf3("MC: " __FILE__ ": %s(): success\n", __func__);
+        debugf3("%s(): success\n", __func__);
         return 0;
 
 fail:
@@ -487,62 +481,67 @@ fail:
 }
 
 /* returns count (>= 0), or negative on error */
-static int __devinit
-e7xxx_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
+static int __devinit e7xxx_init_one(struct pci_dev *pdev,
+                const struct pci_device_id *ent)
 {
-        debugf0("MC: " __FILE__ ": %s()\n", __func__);
+        debugf0("%s()\n", __func__);
 
         /* wake up and enable device */
         return pci_enable_device(pdev) ?
-            -EIO : e7xxx_probe1(pdev, ent->driver_data);
+                -EIO : e7xxx_probe1(pdev, ent->driver_data);
 }
 
-
 static void __devexit e7xxx_remove_one(struct pci_dev *pdev)
 {
         struct mem_ctl_info *mci;
         struct e7xxx_pvt *pvt;
 
-        debugf0(__FILE__ ": %s()\n", __func__);
+        debugf0("%s()\n", __func__);
 
-        if (((mci = edac_mc_find_mci_by_pdev(pdev)) != 0) &&
-            edac_mc_del_mc(mci)) {
-                pvt = (struct e7xxx_pvt *) mci->pvt_info;
-                pci_dev_put(pvt->bridge_ck);
-                edac_mc_free(mci);
-        }
-}
+        if ((mci = edac_mc_del_mc(pdev)) == NULL)
+                return;
 
+        pvt = (struct e7xxx_pvt *) mci->pvt_info;
+        pci_dev_put(pvt->bridge_ck);
+        edac_mc_free(mci);
+}
 
 static const struct pci_device_id e7xxx_pci_tbl[] __devinitdata = {
-        {PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-         E7205},
-        {PCI_VEND_DEV(INTEL, 7500_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-         E7500},
-        {PCI_VEND_DEV(INTEL, 7501_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-         E7501},
-        {PCI_VEND_DEV(INTEL, 7505_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-         E7505},
-        {0,}                    /* 0 terminated list. */
+        {
+                PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                E7205
+        },
+        {
+                PCI_VEND_DEV(INTEL, 7500_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                E7500
+        },
+        {
+                PCI_VEND_DEV(INTEL, 7501_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                E7501
+        },
+        {
+                PCI_VEND_DEV(INTEL, 7505_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                E7505
+        },
+        {
+                0,
+        }       /* 0 terminated list. */
 };
 
 MODULE_DEVICE_TABLE(pci, e7xxx_pci_tbl);
 
-
 static struct pci_driver e7xxx_driver = {
-        .name = BS_MOD_STR,
+        .name = EDAC_MOD_STR,
         .probe = e7xxx_init_one,
         .remove = __devexit_p(e7xxx_remove_one),
         .id_table = e7xxx_pci_tbl,
 };
 
-
 static int __init e7xxx_init(void)
 {
         return pci_register_driver(&e7xxx_driver);
 }
 
-
 static void __exit e7xxx_exit(void)
 {
         pci_unregister_driver(&e7xxx_driver);
@@ -551,8 +550,7 @@ static void __exit e7xxx_exit(void)
 module_init(e7xxx_init);
 module_exit(e7xxx_exit);
 
-
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Linux Networx (http://lnxi.com) Thayne Harbaugh et al\n"
-              "Based on.work by Dan Hollis et al");
+        "Based on.work by Dan Hollis et al");
 MODULE_DESCRIPTION("MC support for Intel e7xxx memory controllers");
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 9c205274c1..ea06e3a4dc 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -12,7 +12,6 @@
  *
  */
 
-
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>
@@ -29,14 +28,13 @@
 #include <linux/list.h>
 #include <linux/sysdev.h>
 #include <linux/ctype.h>
-
+#include <linux/kthread.h>
 #include <asm/uaccess.h>
 #include <asm/page.h>
 #include <asm/edac.h>
-
 #include "edac_mc.h"
 
-#define EDAC_MC_VERSION "edac_mc  Ver: 2.0.0 " __DATE__
+#define EDAC_MC_VERSION "Ver: 2.0.0 " __DATE__
 
 /* For now, disable the EDAC sysfs code.  The sysfs interface that EDAC
  * presents to user space needs more thought, and is likely to change
@@ -47,7 +45,7 @@
 #ifdef CONFIG_EDAC_DEBUG
 /* Values of 0 to 4 will generate output */
 int edac_debug_level = 1;
-EXPORT_SYMBOL(edac_debug_level);
+EXPORT_SYMBOL_GPL(edac_debug_level);
 #endif
 
 /* EDAC Controls, setable by module parameter, and sysfs */
@@ -64,13 +62,14 @@ static atomic_t pci_parity_count = ATOMIC_INIT(0);
 static DECLARE_MUTEX(mem_ctls_mutex);
 static struct list_head mc_devices = LIST_HEAD_INIT(mc_devices);
 
+static struct task_struct *edac_thread;
+
 /* Structure of the whitelist and blacklist arrays */
 struct edac_pci_device_list {
         unsigned int  vendor;           /* Vendor ID */
         unsigned int  device;           /* Deviice ID */
 };
 
-
 #define MAX_LISTED_PCI_DEVICES          32
 
 /* List of PCI devices (vendor-id:device-id) that should be skipped */
@@ -123,7 +122,6 @@ static const char *edac_caps[] = {
         [EDAC_S16ECD16ED] = "S16ECD16ED"
 };
 
-
 /* sysfs object: /sys/devices/system/edac */
 static struct sysdev_class edac_class = {
         set_kset_name("edac"),
@@ -136,9 +134,15 @@ static struct sysdev_class edac_class = {
 static struct kobject edac_memctrl_kobj;
 static struct kobject edac_pci_kobj;
 
+/* We use these to wait for the reference counts on edac_memctrl_kobj and
+ * edac_pci_kobj to reach 0.
+ */
+static struct completion edac_memctrl_kobj_complete;
+static struct completion edac_pci_kobj_complete;
+
 /*
  * /sys/devices/system/edac/mc;
- *      data structures and methods
+ *      data structures and methods
  */
 #if 0
 static ssize_t memctrl_string_show(void *ptr, char *buffer)
@@ -165,33 +169,34 @@ static ssize_t memctrl_int_store(void *ptr, const char *buffer, size_t count)
 }
 
 struct memctrl_dev_attribute {
-        struct attribute        attr;
-        void    *value;
+        struct attribute attr;
+        void *value;
         ssize_t (*show)(void *,char *);
         ssize_t (*store)(void *, const char *, size_t);
 };
 
 /* Set of show/store abstract level functions for memory control object */
-static ssize_t
-memctrl_dev_show(struct kobject *kobj, struct attribute *attr, char *buffer)
+static ssize_t memctrl_dev_show(struct kobject *kobj,
+                struct attribute *attr, char *buffer)
 {
         struct memctrl_dev_attribute *memctrl_dev;
         memctrl_dev = (struct memctrl_dev_attribute*)attr;
 
         if (memctrl_dev->show)
                 return memctrl_dev->show(memctrl_dev->value, buffer);
+
         return -EIO;
 }
 
-static ssize_t
-memctrl_dev_store(struct kobject *kobj, struct attribute *attr,
-                        const char *buffer, size_t count)
+static ssize_t memctrl_dev_store(struct kobject *kobj, struct attribute *attr,
+                const char *buffer, size_t count)
 {
         struct memctrl_dev_attribute *memctrl_dev;
         memctrl_dev = (struct memctrl_dev_attribute*)attr;
 
         if (memctrl_dev->store)
                 return memctrl_dev->store(memctrl_dev->value, buffer, count);
+
         return -EIO;
 }
 
@@ -227,7 +232,6 @@ MEMCTRL_ATTR(log_ue,S_IRUGO|S_IWUSR,memctrl_int_show,memctrl_int_store);
 MEMCTRL_ATTR(log_ce,S_IRUGO|S_IWUSR,memctrl_int_show,memctrl_int_store);
 MEMCTRL_ATTR(poll_msec,S_IRUGO|S_IWUSR,memctrl_int_show,memctrl_int_store);
 
-
 /* Base Attributes of the memory ECC object */
 static struct memctrl_dev_attribute *memctrl_attr[] = {
         &attr_panic_on_ue,
@@ -240,13 +244,14 @@ static struct memctrl_dev_attribute *memctrl_attr[] = {
 /* Main MC kobject release() function */
 static void edac_memctrl_master_release(struct kobject *kobj)
 {
-        debugf1("EDAC MC: " __FILE__ ": %s()\n", __func__);
+        debugf1("%s()\n", __func__);
+        complete(&edac_memctrl_kobj_complete);
 }
 
 static struct kobj_type ktype_memctrl = {
-        .release        = edac_memctrl_master_release,
-        .sysfs_ops      = &memctrlfs_ops,
-        .default_attrs  = (struct attribute **) memctrl_attr,
+        .release = edac_memctrl_master_release,
+        .sysfs_ops = &memctrlfs_ops,
+        .default_attrs = (struct attribute **) memctrl_attr,
 };
 
 #endif  /* DISABLE_EDAC_SYSFS */
@@ -268,32 +273,31 @@ static int edac_sysfs_memctrl_setup(void)
 {
         int err=0;
 
-        debugf1("MC: " __FILE__ ": %s()\n", __func__);
+        debugf1("%s()\n", __func__);
 
         /* create the /sys/devices/system/edac directory */
         err = sysdev_class_register(&edac_class);
+
         if (!err) {
                 /* Init the MC's kobject */
                 memset(&edac_memctrl_kobj, 0, sizeof (edac_memctrl_kobj));
-                kobject_init(&edac_memctrl_kobj);
-
                 edac_memctrl_kobj.parent = &edac_class.kset.kobj;
                 edac_memctrl_kobj.ktype = &ktype_memctrl;
 
                 /* generate sysfs "..../edac/mc"   */
                 err = kobject_set_name(&edac_memctrl_kobj,"mc");
+
                 if (!err) {
                         /* FIXME: maybe new sysdev_create_subdir() */
                         err = kobject_register(&edac_memctrl_kobj);
-                        if (err) {
+
+                        if (err)
                                 debugf1("Failed to register '.../edac/mc'\n");
-                        } else {
+                        else
                                 debugf1("Registered '.../edac/mc' kobject\n");
-                        }
                 }
-        } else {
-                debugf1(KERN_WARNING "__FILE__ %s() error=%d\n", __func__,err);
-        }
+        } else
+                debugf1("%s() error=%d\n", __func__, err);
 
         return err;
 }
@@ -308,11 +312,12 @@ static void edac_sysfs_memctrl_teardown(void)
 #ifndef DISABLE_EDAC_SYSFS
         debugf0("MC: " __FILE__ ": %s()\n", __func__);
 
-        /* Unregister the MC's kobject */
+        /* Unregister the MC's kobject and wait for reference count to reach
+         * 0.
+         */
+        init_completion(&edac_memctrl_kobj_complete);
         kobject_unregister(&edac_memctrl_kobj);
-
-        /* release the master edac mc kobject */
-        kobject_put(&edac_memctrl_kobj);
+        wait_for_completion(&edac_memctrl_kobj_complete);
 
         /* Unregister the 'edac' object */
         sysdev_class_unregister(&edac_class);
@@ -331,7 +336,6 @@ struct list_control {
         int *count;
 };
 
-
 #if 0
 /* Output the list as:  vendor_id:device:id<,vendor_id:device_id> */
 static ssize_t edac_pci_list_string_show(void *ptr, char *buffer)
@@ -356,7 +360,6 @@ static ssize_t edac_pci_list_string_show(void *ptr, char *buffer)
         }
 
         len += snprintf(p + len,(PAGE_SIZE-len), "\n");
-
         return (ssize_t) len;
 }
 
@@ -378,7 +381,7 @@ static int parse_one_device(const char **s,const char **e,
 
         /* if null byte, we are done */
         if (!**s) {
-                (*s)++; /* keep *s moving */
+                (*s)++;  /* keep *s moving */
                 return 0;
         }
 
@@ -395,6 +398,7 @@ static int parse_one_device(const char **s,const char **e,
 
         /* parse vendor_id */
         runner = *s;
+
         while (runner < *e) {
                 /* scan for vendor:device delimiter */
                 if (*runner == ':') {
@@ -402,6 +406,7 @@ static int parse_one_device(const char **s,const char **e,
                         runner = p + 1;
                         break;
                 }
+
                 runner++;
         }
 
@@ -417,12 +422,11 @@ static int parse_one_device(const char **s,const char **e,
         }
 
         *s = runner;
-
         return 1;
 }
 
 static ssize_t edac_pci_list_string_store(void *ptr, const char *buffer,
-                                        size_t count)
+                size_t count)
 {
         struct list_control *listctl;
         struct edac_pci_device_list *list;
@@ -432,14 +436,12 @@ static ssize_t edac_pci_list_string_store(void *ptr, const char *buffer,
 
         s = (char*)buffer;
         e = s + count;
-
         listctl = ptr;
         list = listctl->list;
         index = listctl->count;
-
         *index = 0;
-        while (*index < MAX_LISTED_PCI_DEVICES) {
 
+        while (*index < MAX_LISTED_PCI_DEVICES) {
                 if (parse_one_device(&s,&e,&vendor_id,&device_id)) {
                         list[ *index ].vendor = vendor_id;
                         list[ *index ].device = device_id;
@@ -472,15 +474,15 @@ static ssize_t edac_pci_int_store(void *ptr, const char *buffer, size_t count)
 }
 
 struct edac_pci_dev_attribute {
-        struct attribute        attr;
-        void    *value;
+        struct attribute attr;
+        void *value;
         ssize_t (*show)(void *,char *);
         ssize_t (*store)(void *, const char *,size_t);
 };
 
 /* Set of show/store abstract level functions for PCI Parity object */
 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
-                                char *buffer)
+                char *buffer)
 {
         struct edac_pci_dev_attribute *edac_pci_dev;
         edac_pci_dev= (struct edac_pci_dev_attribute*)attr;
@@ -490,8 +492,8 @@ static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
         return -EIO;
 }
 
-static ssize_t edac_pci_dev_store(struct kobject *kobj, struct attribute *attr,
-                                const char *buffer, size_t count)
+static ssize_t edac_pci_dev_store(struct kobject *kobj,
+                struct attribute *attr, const char *buffer, size_t count)
 {
         struct edac_pci_dev_attribute *edac_pci_dev;
         edac_pci_dev= (struct edac_pci_dev_attribute*)attr;
@@ -506,7 +508,6 @@ static struct sysfs_ops edac_pci_sysfs_ops = {
         .store  = edac_pci_dev_store
 };
 
-
 #define EDAC_PCI_ATTR(_name,_mode,_show,_store)                 \
 struct edac_pci_dev_attribute edac_pci_attr_##_name = {         \
         .attr = {.name = __stringify(_name), .mode = _mode },   \
@@ -549,9 +550,11 @@ EDAC_PCI_STRING_ATTR(pci_parity_blacklist,
 #endif
 
 /* PCI Parity control files */
-EDAC_PCI_ATTR(check_pci_parity,S_IRUGO|S_IWUSR,edac_pci_int_show,edac_pci_int_store);
-EDAC_PCI_ATTR(panic_on_pci_parity,S_IRUGO|S_IWUSR,edac_pci_int_show,edac_pci_int_store);
-EDAC_PCI_ATTR(pci_parity_count,S_IRUGO,edac_pci_int_show,NULL);
+EDAC_PCI_ATTR(check_pci_parity, S_IRUGO|S_IWUSR, edac_pci_int_show,
+        edac_pci_int_store);
+EDAC_PCI_ATTR(panic_on_pci_parity, S_IRUGO|S_IWUSR, edac_pci_int_show,
+        edac_pci_int_store);
+EDAC_PCI_ATTR(pci_parity_count, S_IRUGO, edac_pci_int_show, NULL);
 
 /* Base Attributes of the memory ECC object */
 static struct edac_pci_dev_attribute *edac_pci_attr[] = {
@@ -564,13 +567,14 @@ static struct edac_pci_dev_attribute *edac_pci_attr[] = {
 /* No memory to release */
 static void edac_pci_release(struct kobject *kobj)
 {
-        debugf1("EDAC PCI: " __FILE__ ": %s()\n", __func__);
+        debugf1("%s()\n", __func__);
+        complete(&edac_pci_kobj_complete);
 }
 
 static struct kobj_type ktype_edac_pci = {
-        .release        = edac_pci_release,
-        .sysfs_ops      = &edac_pci_sysfs_ops,
-        .default_attrs  = (struct attribute **) edac_pci_attr,
+        .release = edac_pci_release,
+        .sysfs_ops = &edac_pci_sysfs_ops,
+        .default_attrs = (struct attribute **) edac_pci_attr,
 };
 
 #endif  /* DISABLE_EDAC_SYSFS */
@@ -588,24 +592,24 @@ static int edac_sysfs_pci_setup(void)
 {
         int err;
 
-        debugf1("MC: " __FILE__ ": %s()\n", __func__);
+        debugf1("%s()\n", __func__);
 
         memset(&edac_pci_kobj, 0, sizeof(edac_pci_kobj));
-
-        kobject_init(&edac_pci_kobj);
         edac_pci_kobj.parent = &edac_class.kset.kobj;
         edac_pci_kobj.ktype = &ktype_edac_pci;
-
         err = kobject_set_name(&edac_pci_kobj, "pci");
+
         if (!err) {
                 /* Instanstiate the csrow object */
                 /* FIXME: maybe new sysdev_create_subdir() */
                 err = kobject_register(&edac_pci_kobj);
+
                 if (err)
                         debugf1("Failed to register '.../edac/pci'\n");
                 else
                         debugf1("Registered '.../edac/pci' kobject\n");
         }
+
         return err;
 }
 #endif  /* DISABLE_EDAC_SYSFS */
@@ -613,10 +617,10 @@ static int edac_sysfs_pci_setup(void)
 static void edac_sysfs_pci_teardown(void)
 {
 #ifndef DISABLE_EDAC_SYSFS
-        debugf0("MC: " __FILE__ ": %s()\n", __func__);
-
+        debugf0("%s()\n", __func__);
+        init_completion(&edac_pci_kobj_complete);
         kobject_unregister(&edac_pci_kobj);
-        kobject_put(&edac_pci_kobj);
+        wait_for_completion(&edac_pci_kobj_complete);
 #endif
 }
 
@@ -633,6 +637,7 @@ static ssize_t csrow_ch0_dimm_label_show(struct csrow_info *csrow, char *data)
                 size = snprintf(data, EDAC_MC_LABEL_LEN,"%s\n",
                         csrow->channels[0].label);
         }
+
         return size;
 }
 
@@ -644,11 +649,12 @@ static ssize_t csrow_ch1_dimm_label_show(struct csrow_info *csrow, char *data)
                 size = snprintf(data, EDAC_MC_LABEL_LEN, "%s\n",
                         csrow->channels[1].label);
         }
+
         return size;
 }
 
 static ssize_t csrow_ch0_dimm_label_store(struct csrow_info *csrow,
-                        const char *data, size_t size)
+                const char *data, size_t size)
 {
         ssize_t max_size = 0;
 
@@ -657,11 +663,12 @@ static ssize_t csrow_ch0_dimm_label_store(struct csrow_info *csrow,
                 strncpy(csrow->channels[0].label, data, max_size);
                 csrow->channels[0].label[max_size] = '\0';
         }
+
         return size;
 }
 
 static ssize_t csrow_ch1_dimm_label_store(struct csrow_info *csrow,
-                        const char *data, size_t size)
+                const char *data, size_t size)
 {
         ssize_t max_size = 0;
 
@@ -670,6 +677,7 @@ static ssize_t csrow_ch1_dimm_label_store(struct csrow_info *csrow,
                 strncpy(csrow->channels[1].label, data, max_size);
                 csrow->channels[1].label[max_size] = '\0';
         }
+
         return max_size;
 }
 
@@ -690,6 +698,7 @@ static ssize_t csrow_ch0_ce_count_show(struct csrow_info *csrow, char *data)
         if (csrow->nr_channels > 0) {
                 size = sprintf(data,"%u\n", csrow->channels[0].ce_count);
         }
+
         return size;
 }
 
@@ -700,6 +709,7 @@ static ssize_t csrow_ch1_ce_count_show(struct csrow_info *csrow, char *data)
         if (csrow->nr_channels > 1) {
                 size = sprintf(data,"%u\n", csrow->channels[1].ce_count);
         }
+
         return size;
 }
 
@@ -724,7 +734,7 @@ static ssize_t csrow_edac_mode_show(struct csrow_info *csrow, char *data)
 }
 
 struct csrowdev_attribute {
-        struct attribute        attr;
+        struct attribute attr;
         ssize_t (*show)(struct csrow_info *,char *);
         ssize_t (*store)(struct csrow_info *, const char *,size_t);
 };
@@ -734,24 +744,26 @@ struct csrowdev_attribute {
 
 /* Set of show/store higher level functions for csrow objects */
 static ssize_t csrowdev_show(struct kobject *kobj, struct attribute *attr,
-                                char *buffer)
+                char *buffer)
 {
         struct csrow_info *csrow = to_csrow(kobj);
         struct csrowdev_attribute *csrowdev_attr = to_csrowdev_attr(attr);
 
         if (csrowdev_attr->show)
                 return csrowdev_attr->show(csrow, buffer);
+
         return -EIO;
 }
 
 static ssize_t csrowdev_store(struct kobject *kobj, struct attribute *attr,
-                                const char *buffer, size_t count)
+                const char *buffer, size_t count)
 {
         struct csrow_info *csrow = to_csrow(kobj);
         struct csrowdev_attribute * csrowdev_attr = to_csrowdev_attr(attr);
 
         if (csrowdev_attr->store)
                 return csrowdev_attr->store(csrow, buffer, count);
+
         return -EIO;
 }
 
@@ -785,7 +797,6 @@ CSROWDEV_ATTR(ch1_dimm_label,S_IRUGO|S_IWUSR,
                 csrow_ch1_dimm_label_show,
                 csrow_ch1_dimm_label_store);
 
-
 /* Attributes of the CSROW<id> object */
 static struct csrowdev_attribute *csrow_attr[] = {
         &attr_dev_type,
@@ -801,40 +812,43 @@ static struct csrowdev_attribute *csrow_attr[] = {
         NULL,
 };
 
-
 /* No memory to release */
 static void edac_csrow_instance_release(struct kobject *kobj)
 {
-        debugf1("EDAC MC: " __FILE__ ": %s()\n", __func__);
+        struct csrow_info *cs;
+
+        debugf1("%s()\n", __func__);
+        cs = container_of(kobj, struct csrow_info, kobj);
+        complete(&cs->kobj_complete);
 }
 
 static struct kobj_type ktype_csrow = {
-        .release        = edac_csrow_instance_release,
-        .sysfs_ops      = &csrowfs_ops,
-        .default_attrs  = (struct attribute **) csrow_attr,
+        .release = edac_csrow_instance_release,
+        .sysfs_ops = &csrowfs_ops,
+        .default_attrs = (struct attribute **) csrow_attr,
 };
 
 /* Create a CSROW object under specifed edac_mc_device */
 static int edac_create_csrow_object(struct kobject *edac_mci_kobj,
-                                struct csrow_info *csrow, int index )
+                struct csrow_info *csrow, int index)
 {
         int err = 0;
 
-        debugf0("MC: " __FILE__ ": %s()\n", __func__);
-
+        debugf0("%s()\n", __func__);
         memset(&csrow->kobj, 0, sizeof(csrow->kobj));
 
         /* generate ..../edac/mc/mc<id>/csrow<index>   */
 
-        kobject_init(&csrow->kobj);
         csrow->kobj.parent = edac_mci_kobj;
         csrow->kobj.ktype = &ktype_csrow;
 
         /* name this instance of csrow<id> */
         err = kobject_set_name(&csrow->kobj,"csrow%d",index);
+
         if (!err) {
                 /* Instanstiate the csrow object */
                 err = kobject_register(&csrow->kobj);
+
                 if (err)
                         debugf0("Failed to register CSROW%d\n",index);
                 else
@@ -846,8 +860,8 @@ static int edac_create_csrow_object(struct kobject *edac_mci_kobj,
 
 /* sysfs data structures and methods for the MCI kobjects */
 
-static ssize_t mci_reset_counters_store(struct mem_ctl_info  *mci,
-                                        const char *data, size_t count )
+static ssize_t mci_reset_counters_store(struct mem_ctl_info *mci,
+                const char *data, size_t count)
 {
         int row, chan;
 
@@ -855,16 +869,18 @@ static ssize_t mci_reset_counters_store(struct mem_ctl_info  *mci,
         mci->ce_noinfo_count = 0;
         mci->ue_count = 0;
         mci->ce_count = 0;
+
         for (row = 0; row < mci->nr_csrows; row++) {
                 struct csrow_info *ri = &mci->csrows[row];
 
                 ri->ue_count = 0;
                 ri->ce_count = 0;
+
                 for (chan = 0; chan < ri->nr_channels; chan++)
                         ri->channels[chan].ce_count = 0;
         }
-        mci->start_time = jiffies;
 
+        mci->start_time = jiffies;
         return count;
 }
 
@@ -922,18 +938,16 @@ static ssize_t mci_edac_capability_show(struct mem_ctl_info *mci, char *data)
 
         p += mci_output_edac_cap(p,mci->edac_ctl_cap);
         p += sprintf(p, "\n");
-
         return p - data;
 }
 
 static ssize_t mci_edac_current_capability_show(struct mem_ctl_info *mci,
-                                                char *data)
+                char *data)
 {
         char *p = data;
 
         p += mci_output_edac_cap(p,mci->edac_cap);
         p += sprintf(p, "\n");
-
         return p - data;
 }
 
@@ -950,13 +964,13 @@ static int mci_output_mtype_cap(char *buf, unsigned long mtype_cap)
         return p - buf;
 }
 
-static ssize_t mci_supported_mem_type_show(struct mem_ctl_info *mci, char *data)
+static ssize_t mci_supported_mem_type_show(struct mem_ctl_info *mci,
+                char *data)
 {
         char *p = data;
 
         p += mci_output_mtype_cap(p,mci->mtype_cap);
         p += sprintf(p, "\n");
-
         return p - data;
 }
 
@@ -970,6 +984,7 @@ static ssize_t mci_size_mb_show(struct mem_ctl_info *mci, char *data)
 
                 if (!csrow->nr_pages)
                         continue;
+
                 total_pages += csrow->nr_pages;
         }
 
@@ -977,7 +992,7 @@ static ssize_t mci_size_mb_show(struct mem_ctl_info *mci, char *data)
 }
 
 struct mcidev_attribute {
-        struct attribute        attr;
+        struct attribute attr;
         ssize_t (*show)(struct mem_ctl_info *,char *);
         ssize_t (*store)(struct mem_ctl_info *, const char *,size_t);
 };
@@ -986,30 +1001,32 @@ struct mcidev_attribute {
 #define to_mcidev_attr(a) container_of(a, struct mcidev_attribute, attr)
 
 static ssize_t mcidev_show(struct kobject *kobj, struct attribute *attr,
-                        char *buffer)
+                char *buffer)
 {
         struct mem_ctl_info *mem_ctl_info = to_mci(kobj);
         struct mcidev_attribute * mcidev_attr = to_mcidev_attr(attr);
 
         if (mcidev_attr->show)
                 return mcidev_attr->show(mem_ctl_info, buffer);
+
         return -EIO;
 }
 
 static ssize_t mcidev_store(struct kobject *kobj, struct attribute *attr,
-                                const char *buffer, size_t count)
+                const char *buffer, size_t count)
 {
         struct mem_ctl_info *mem_ctl_info = to_mci(kobj);
         struct mcidev_attribute * mcidev_attr = to_mcidev_attr(attr);
 
         if (mcidev_attr->store)
                 return mcidev_attr->store(mem_ctl_info, buffer, count);
+
         return -EIO;
 }
 
 static struct sysfs_ops mci_ops = {
-        .show   = mcidev_show,
-        .store  = mcidev_store
+        .show = mcidev_show,
+        .store = mcidev_store
 };
 
 #define MCIDEV_ATTR(_name,_mode,_show,_store)                   \
@@ -1037,7 +1054,6 @@ MCIDEV_ATTR(edac_current_capability,S_IRUGO,
 MCIDEV_ATTR(supported_mem_type,S_IRUGO,
         mci_supported_mem_type_show,NULL);
 
-
 static struct mcidev_attribute *mci_attr[] = {
         &mci_attr_reset_counters,
         &mci_attr_module_name,
@@ -1054,25 +1070,22 @@ static struct mcidev_attribute *mci_attr[] = {
         NULL
 };
 
-
 /*
  * Release of a MC controlling instance
  */
 static void edac_mci_instance_release(struct kobject *kobj)
 {
         struct mem_ctl_info *mci;
-        mci = container_of(kobj,struct mem_ctl_info,edac_mci_kobj);
 
-        debugf0("MC: " __FILE__ ": %s() idx=%d calling kfree\n",
-                __func__, mci->mc_idx);
-
-        kfree(mci);
+        mci = to_mci(kobj);
+        debugf0("%s() idx=%d\n", __func__, mci->mc_idx);
+        complete(&mci->kobj_complete);
 }
 
 static struct kobj_type ktype_mci = {
-        .release        = edac_mci_instance_release,
-        .sysfs_ops      = &mci_ops,
-        .default_attrs  = (struct attribute **) mci_attr,
+        .release = edac_mci_instance_release,
+        .sysfs_ops = &mci_ops,
+        .default_attrs = (struct attribute **) mci_attr,
 };
 
 #endif  /* DISABLE_EDAC_SYSFS */
@@ -1099,13 +1112,12 @@ static int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
         struct csrow_info *csrow;
         struct kobject *edac_mci_kobj=&mci->edac_mci_kobj;
 
-        debugf0("MC: " __FILE__ ": %s() idx=%d\n", __func__, mci->mc_idx);
-
+        debugf0("%s() idx=%d\n", __func__, mci->mc_idx);
         memset(edac_mci_kobj, 0, sizeof(*edac_mci_kobj));
-        kobject_init(edac_mci_kobj);
 
         /* set the name of the mc<id> object */
         err = kobject_set_name(edac_mci_kobj,"mc%d",mci->mc_idx);
+
         if (err)
                 return err;
 
@@ -1115,50 +1127,48 @@ static int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
 
         /* register the mc<id> kobject */
         err = kobject_register(edac_mci_kobj);
+
         if (err)
                 return err;
 
         /* create a symlink for the device */
         err = sysfs_create_link(edac_mci_kobj, &mci->pdev->dev.kobj,
                                 EDAC_DEVICE_SYMLINK);
-        if (err) {
-                kobject_unregister(edac_mci_kobj);
-                return err;
-        }
+
+        if (err)
+                goto fail0;
 
         /* Make directories for each CSROW object
          * under the mc<id> kobject
          */
         for (i = 0; i < mci->nr_csrows; i++) {
-
                 csrow = &mci->csrows[i];
 
                 /* Only expose populated CSROWs */
                 if (csrow->nr_pages > 0) {
                         err = edac_create_csrow_object(edac_mci_kobj,csrow,i);
+
                         if (err)
-                                goto fail;
+                                goto fail1;
                 }
         }
 
-        /* Mark this MCI instance as having sysfs entries */
-        mci->sysfs_active = MCI_SYSFS_ACTIVE;
-
         return 0;
 
-
         /* CSROW error: backout what has already been registered,  */
-fail:
+fail1:
         for ( i--; i >= 0; i--) {
                 if (csrow->nr_pages > 0) {
+                        init_completion(&csrow->kobj_complete);
                         kobject_unregister(&mci->csrows[i].kobj);
-                        kobject_put(&mci->csrows[i].kobj);
+                        wait_for_completion(&csrow->kobj_complete);
                 }
         }
 
+fail0:
+        init_completion(&mci->kobj_complete);
         kobject_unregister(edac_mci_kobj);
-        kobject_put(edac_mci_kobj);
-
+        wait_for_completion(&mci->kobj_complete);
         return err;
 }
 #endif  /* DISABLE_EDAC_SYSFS */
@@ -1171,20 +1181,21 @@ static void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)
 #ifndef DISABLE_EDAC_SYSFS
         int i;
 
-        debugf0("MC: " __FILE__ ": %s()\n", __func__);
+        debugf0("%s()\n", __func__);
 
         /* remove all csrow kobjects */
         for (i = 0; i < mci->nr_csrows; i++) {
-                if (mci->csrows[i].nr_pages > 0)  {
+                if (mci->csrows[i].nr_pages > 0) {
+                        init_completion(&mci->csrows[i].kobj_complete);
                         kobject_unregister(&mci->csrows[i].kobj);
-                        kobject_put(&mci->csrows[i].kobj);
+                        wait_for_completion(&mci->csrows[i].kobj_complete);
                 }
         }
 
         sysfs_remove_link(&mci->edac_mci_kobj, EDAC_DEVICE_SYMLINK);
-
+        init_completion(&mci->kobj_complete);
         kobject_unregister(&mci->edac_mci_kobj);
-        kobject_put(&mci->edac_mci_kobj);
+        wait_for_completion(&mci->kobj_complete);
 #endif  /* DISABLE_EDAC_SYSFS */
 }
 
@@ -1192,8 +1203,6 @@ static void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)
 
 #ifdef CONFIG_EDAC_DEBUG
 
-EXPORT_SYMBOL(edac_mc_dump_channel);
-
 void edac_mc_dump_channel(struct channel_info *chan)
 {
         debugf4("\tchannel = %p\n", chan);
@@ -1202,9 +1211,7 @@ void edac_mc_dump_channel(struct channel_info *chan)
         debugf4("\tchannel->label = '%s'\n", chan->label);
         debugf4("\tchannel->csrow = %p\n\n", chan->csrow);
 }
-
-
-EXPORT_SYMBOL(edac_mc_dump_csrow);
+EXPORT_SYMBOL_GPL(edac_mc_dump_channel);
 
 void edac_mc_dump_csrow(struct csrow_info *csrow)
 {
@@ -1220,9 +1227,7 @@ void edac_mc_dump_csrow(struct csrow_info *csrow)
         debugf4("\tcsrow->channels = %p\n", csrow->channels);
         debugf4("\tcsrow->mci = %p\n\n", csrow->mci);
 }
-
-
-EXPORT_SYMBOL(edac_mc_dump_mci);
+EXPORT_SYMBOL_GPL(edac_mc_dump_csrow);
 
 void edac_mc_dump_mci(struct mem_ctl_info *mci)
 {
@@ -1238,9 +1243,9 @@ void edac_mc_dump_mci(struct mem_ctl_info *mci)
                 mci->mod_name, mci->ctl_name);
         debugf3("\tpvt_info = %p\n\n", mci->pvt_info);
 }
+EXPORT_SYMBOL_GPL(edac_mc_dump_mci);
 
-
-#endif                          /* CONFIG_EDAC_DEBUG */
+#endif  /* CONFIG_EDAC_DEBUG */
 
 /* 'ptr' points to a possibly unaligned item X such that sizeof(X) is 'size'.
  * Adjust 'ptr' so that its alignment is at least as stringent as what the
@@ -1249,7 +1254,7 @@ void edac_mc_dump_mci(struct mem_ctl_info *mci)
  * If 'size' is a constant, the compiler will optimize this whole function
  * down to either a no-op or the addition of a constant to the value of 'ptr'.
  */
-static inline char * align_ptr (void *ptr, unsigned size)
+static inline char * align_ptr(void *ptr, unsigned size)
 {
         unsigned align, r;
 
@@ -1276,9 +1281,6 @@ static inline char * align_ptr (void *ptr, unsigned size)
         return (char *) (((unsigned long) ptr) + align - r);
 }
 
-
-EXPORT_SYMBOL(edac_mc_alloc);
-
 /**
  * edac_mc_alloc: Allocate a struct mem_ctl_info structure
  * @size_pvt:   size of private storage needed
@@ -1296,7 +1298,7 @@ EXPORT_SYMBOL(edac_mc_alloc);
  *      struct mem_ctl_info pointer
  */
 struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,
-                                        unsigned nr_chans)
+                unsigned nr_chans)
 {
         struct mem_ctl_info *mci;
         struct csrow_info *csi, *csrow;
@@ -1327,8 +1329,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,
         chi = (struct channel_info *) (((char *) mci) + ((unsigned long) chi));
         pvt = sz_pvt ? (((char *) mci) + ((unsigned long) pvt)) : NULL;
 
-        memset(mci, 0, size);   /* clear all fields */
-
+        memset(mci, 0, size);  /* clear all fields */
         mci->csrows = csi;
         mci->pvt_info = pvt;
         mci->nr_csrows = nr_csrows;
@@ -1350,50 +1351,24 @@ struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,
 
         return mci;
 }
-
-
-EXPORT_SYMBOL(edac_mc_free);
+EXPORT_SYMBOL_GPL(edac_mc_alloc);
 
 /**
  * edac_mc_free:  Free a previously allocated 'mci' structure
  * @mci: pointer to a struct mem_ctl_info structure
- *
- * Free up a previously allocated mci structure
- * A MCI structure can be in 2 states after being allocated
- * by edac_mc_alloc().
- *      1) Allocated in a MC driver's probe, but not yet committed
- *      2) Allocated and committed, by a call to  edac_mc_add_mc()
- * edac_mc_add_mc() is the function that adds the sysfs entries
- * thus, this free function must determine which state the 'mci'
- * structure is in, then either free it directly or
- * perform kobject cleanup by calling edac_remove_sysfs_mci_device().
- *
- * VOID Return
  */
 void edac_mc_free(struct mem_ctl_info *mci)
 {
-        /* only if sysfs entries for this mci instance exist
-         * do we remove them and defer the actual kfree via
-         * the kobject 'release()' callback.
-         *
-         * Otherwise, do a straight kfree now.
-         */
-        if (mci->sysfs_active == MCI_SYSFS_ACTIVE)
-                edac_remove_sysfs_mci_device(mci);
-        else
-                kfree(mci);
+        kfree(mci);
 }
+EXPORT_SYMBOL_GPL(edac_mc_free);
 
-
-
-EXPORT_SYMBOL(edac_mc_find_mci_by_pdev);
-
-struct mem_ctl_info *edac_mc_find_mci_by_pdev(struct pci_dev *pdev)
+static struct mem_ctl_info *find_mci_by_pdev(struct pci_dev *pdev)
 {
         struct mem_ctl_info *mci;
         struct list_head *item;
 
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
+        debugf3("%s()\n", __func__);
 
         list_for_each(item, &mc_devices) {
                 mci = list_entry(item, struct mem_ctl_info, link);
@@ -1405,7 +1380,7 @@ struct mem_ctl_info *edac_mc_find_mci_by_pdev(struct pci_dev *pdev)
         return NULL;
 }
 
-static int add_mc_to_global_list (struct mem_ctl_info *mci)
+static int add_mc_to_global_list(struct mem_ctl_info *mci)
 {
         struct list_head *item, *insert_before;
         struct mem_ctl_info *p;
@@ -1415,11 +1390,12 @@ static int add_mc_to_global_list (struct mem_ctl_info *mci)
                 mci->mc_idx = 0;
                 insert_before = &mc_devices;
         } else {
-                if (edac_mc_find_mci_by_pdev(mci->pdev)) {
-                        printk(KERN_WARNING
-                                "EDAC MC: %s (%s) %s %s already assigned %d\n",
-                                mci->pdev->dev.bus_id, pci_name(mci->pdev),
-                                mci->mod_name, mci->ctl_name, mci->mc_idx);
+                if (find_mci_by_pdev(mci->pdev)) {
+                        edac_printk(KERN_WARNING, EDAC_MC,
+                                "%s (%s) %s %s already assigned %d\n",
+                                mci->pdev->dev.bus_id,
+                                pci_name(mci->pdev), mci->mod_name,
+                                mci->ctl_name, mci->mc_idx);
                         return 1;
                 }
 
@@ -1447,12 +1423,26 @@ static int add_mc_to_global_list (struct mem_ctl_info *mci)
         return 0;
 }
 
+static void complete_mc_list_del(struct rcu_head *head)
+{
+        struct mem_ctl_info *mci;
 
+        mci = container_of(head, struct mem_ctl_info, rcu);
+        INIT_LIST_HEAD(&mci->link);
+        complete(&mci->complete);
+}
 
-EXPORT_SYMBOL(edac_mc_add_mc);
+static void del_mc_from_global_list(struct mem_ctl_info *mci)
+{
+        list_del_rcu(&mci->link);
+        init_completion(&mci->complete);
+        call_rcu(&mci->rcu, complete_mc_list_del);
+        wait_for_completion(&mci->complete);
+}
 
 /**
- * edac_mc_add_mc: Insert the 'mci' structure into the mci global list
+ * edac_mc_add_mc: Insert the 'mci' structure into the mci global list and
+ *                 create sysfs entries associated with mci structure
  * @mci: pointer to the mci structure to be added to the list
  *
  * Return:
@@ -1463,111 +1453,90 @@ EXPORT_SYMBOL(edac_mc_add_mc);
 /* FIXME - should a warning be printed if no error detection? correction? */
 int edac_mc_add_mc(struct mem_ctl_info *mci)
 {
-        int rc = 1;
-
-        debugf0("MC: " __FILE__ ": %s()\n", __func__);
+        debugf0("%s()\n", __func__);
 #ifdef CONFIG_EDAC_DEBUG
         if (edac_debug_level >= 3)
                 edac_mc_dump_mci(mci);
+
         if (edac_debug_level >= 4) {
                 int i;
 
                 for (i = 0; i < mci->nr_csrows; i++) {
                         int j;
+
                         edac_mc_dump_csrow(&mci->csrows[i]);
                         for (j = 0; j < mci->csrows[i].nr_channels; j++)
-                                edac_mc_dump_channel(&mci->csrows[i].
-                                                          channels[j]);
+                                edac_mc_dump_channel(
+                                        &mci->csrows[i].channels[j]);
                 }
         }
 #endif
         down(&mem_ctls_mutex);
 
         if (add_mc_to_global_list(mci))
-                goto finish;
+                goto fail0;
 
         /* set load time so that error rate can be tracked */
         mci->start_time = jiffies;
 
         if (edac_create_sysfs_mci_device(mci)) {
-                printk(KERN_WARNING
-                       "EDAC MC%d: failed to create sysfs device\n",
-                       mci->mc_idx);
-                /* FIXME - should there be an error code and unwind? */
-                goto finish;
+                edac_mc_printk(mci, KERN_WARNING,
+                        "failed to create sysfs device\n");
+                goto fail1;
         }
 
         /* Report action taken */
-        printk(KERN_INFO
-               "EDAC MC%d: Giving out device to %s %s: PCI %s\n",
-               mci->mc_idx, mci->mod_name, mci->ctl_name,
-               pci_name(mci->pdev));
+        edac_mc_printk(mci, KERN_INFO, "Giving out device to %s %s: PCI %s\n",
+                mci->mod_name, mci->ctl_name, pci_name(mci->pdev));
 
-
-        rc = 0;
-
-finish:
         up(&mem_ctls_mutex);
-        return rc;
-}
-
-
-
-static void complete_mc_list_del (struct rcu_head *head)
-{
-        struct mem_ctl_info *mci;
+        return 0;
 
-        mci = container_of(head, struct mem_ctl_info, rcu);
-        INIT_LIST_HEAD(&mci->link);
-        complete(&mci->complete);
-}
+fail1:
+        del_mc_from_global_list(mci);
 
-static void del_mc_from_global_list (struct mem_ctl_info *mci)
-{
-        list_del_rcu(&mci->link);
-        init_completion(&mci->complete);
-        call_rcu(&mci->rcu, complete_mc_list_del);
-        wait_for_completion(&mci->complete);
+fail0:
+        up(&mem_ctls_mutex);
+        return 1;
 }
-
-EXPORT_SYMBOL(edac_mc_del_mc);
+EXPORT_SYMBOL_GPL(edac_mc_add_mc);
 
 /**
- * edac_mc_del_mc:  Remove the specified mci structure from global list
- * @mci:        Pointer to struct mem_ctl_info structure
+ * edac_mc_del_mc: Remove sysfs entries for specified mci structure and
+ *                 remove mci structure from global list
+ * @pdev: Pointer to 'struct pci_dev' representing mci structure to remove.
  *
- * Returns:
- *      0       Success
- *      1       Failure
+ * Return pointer to removed mci structure, or NULL if device not found.
  */
-int edac_mc_del_mc(struct mem_ctl_info *mci)
+struct mem_ctl_info * edac_mc_del_mc(struct pci_dev *pdev)
 {
-        int rc = 1;
+        struct mem_ctl_info *mci;
 
-        debugf0("MC%d: " __FILE__ ": %s()\n", mci->mc_idx, __func__);
+        debugf0("MC: %s()\n", __func__);
         down(&mem_ctls_mutex);
+
+        if ((mci = find_mci_by_pdev(pdev)) == NULL) {
+                up(&mem_ctls_mutex);
+                return NULL;
+        }
+
+        edac_remove_sysfs_mci_device(mci);
         del_mc_from_global_list(mci);
-        printk(KERN_INFO
-               "EDAC MC%d: Removed device %d for %s %s: PCI %s\n",
-               mci->mc_idx, mci->mc_idx, mci->mod_name, mci->ctl_name,
-               pci_name(mci->pdev));
-        rc = 0;
         up(&mem_ctls_mutex);
-
-        return rc;
+        edac_printk(KERN_INFO, EDAC_MC,
+                "Removed device %d for %s %s: PCI %s\n", mci->mc_idx,
+                mci->mod_name, mci->ctl_name, pci_name(mci->pdev));
+        return mci;
 }
+EXPORT_SYMBOL_GPL(edac_mc_del_mc);
 
-
-EXPORT_SYMBOL(edac_mc_scrub_block);
-
-void edac_mc_scrub_block(unsigned long page, unsigned long offset,
-                              u32 size)
+void edac_mc_scrub_block(unsigned long page, unsigned long offset, u32 size)
 {
         struct page *pg;
         void *virt_addr;
         unsigned long flags = 0;
 
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
+        debugf3("%s()\n", __func__);
 
         /* ECC error page was not in our memory. Ignore it. */
         if(!pfn_valid(page))
@@ -1590,19 +1559,15 @@ void edac_mc_scrub_block(unsigned long page, unsigned long offset,
         if (PageHighMem(pg))
                 local_irq_restore(flags);
 }
-
+EXPORT_SYMBOL_GPL(edac_mc_scrub_block);
 
 /* FIXME - should return -1 */
-EXPORT_SYMBOL(edac_mc_find_csrow_by_page);
-
-int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
-                                    unsigned long page)
+int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, unsigned long page)
 {
         struct csrow_info *csrows = mci->csrows;
         int row, i;
 
-        debugf1("MC%d: " __FILE__ ": %s(): 0x%lx\n", mci->mc_idx, __func__,
-                page);
+        debugf1("MC%d: %s(): 0x%lx\n", mci->mc_idx, __func__, page);
         row = -1;
 
         for (i = 0; i < mci->nr_csrows; i++) {
@@ -1611,11 +1576,10 @@ int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
                 if (csrow->nr_pages == 0)
                         continue;
 
-                debugf3("MC%d: " __FILE__
-                        ": %s(): first(0x%lx) page(0x%lx)"
-                        " last(0x%lx) mask(0x%lx)\n", mci->mc_idx,
-                        __func__, csrow->first_page, page,
-                        csrow->last_page, csrow->page_mask);
+                debugf3("MC%d: %s(): first(0x%lx) page(0x%lx) last(0x%lx) "
+                        "mask(0x%lx)\n", mci->mc_idx, __func__,
+                        csrow->first_page, page, csrow->last_page,
+                        csrow->page_mask);
 
                 if ((page >= csrow->first_page) &&
                     (page <= csrow->last_page) &&
@@ -1627,56 +1591,52 @@ int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
         }
 
         if (row == -1)
-                printk(KERN_ERR
-                       "EDAC MC%d: could not look up page error address %lx\n",
-                       mci->mc_idx, (unsigned long) page);
+                edac_mc_printk(mci, KERN_ERR,
+                        "could not look up page error address %lx\n",
+                        (unsigned long) page);
 
         return row;
 }
-
-
-EXPORT_SYMBOL(edac_mc_handle_ce);
+EXPORT_SYMBOL_GPL(edac_mc_find_csrow_by_page);
 
 /* FIXME - setable log (warning/emerg) levels */
 /* FIXME - integrate with evlog: http://evlog.sourceforge.net/ */
 void edac_mc_handle_ce(struct mem_ctl_info *mci,
-                            unsigned long page_frame_number,
-                            unsigned long offset_in_page,
-                            unsigned long syndrome, int row, int channel,
-                            const char *msg)
+                unsigned long page_frame_number, unsigned long offset_in_page,
+                unsigned long syndrome, int row, int channel, const char *msg)
 {
         unsigned long remapped_page;
 
-        debugf3("MC%d: " __FILE__ ": %s()\n", mci->mc_idx, __func__);
+        debugf3("MC%d: %s()\n", mci->mc_idx, __func__);
 
         /* FIXME - maybe make panic on INTERNAL ERROR an option */
         if (row >= mci->nr_csrows || row < 0) {
                 /* something is wrong */
-                printk(KERN_ERR
-                       "EDAC MC%d: INTERNAL ERROR: row out of range (%d >= %d)\n",
-                       mci->mc_idx, row, mci->nr_csrows);
+                edac_mc_printk(mci, KERN_ERR,
+                        "INTERNAL ERROR: row out of range "
+                        "(%d >= %d)\n", row, mci->nr_csrows);
                 edac_mc_handle_ce_no_info(mci, "INTERNAL ERROR");
                 return;
         }
+
         if (channel >= mci->csrows[row].nr_channels || channel < 0) {
                 /* something is wrong */
-                printk(KERN_ERR
-                       "EDAC MC%d: INTERNAL ERROR: channel out of range "
-                       "(%d >= %d)\n",
-                       mci->mc_idx, channel, mci->csrows[row].nr_channels);
+                edac_mc_printk(mci, KERN_ERR,
+                        "INTERNAL ERROR: channel out of range "
+                        "(%d >= %d)\n", channel,
+                        mci->csrows[row].nr_channels);
                 edac_mc_handle_ce_no_info(mci, "INTERNAL ERROR");
                 return;
         }
 
         if (log_ce)
                 /* FIXME - put in DIMM location */
-                printk(KERN_WARNING
-                       "EDAC MC%d: CE page 0x%lx, offset 0x%lx,"
-                       " grain %d, syndrome 0x%lx, row %d, channel %d,"
-                       " label \"%s\": %s\n", mci->mc_idx,
-                       page_frame_number, offset_in_page,
-                       mci->csrows[row].grain, syndrome, row, channel,
-                       mci->csrows[row].channels[channel].label, msg);
+                edac_mc_printk(mci, KERN_WARNING,
+                        "CE page 0x%lx, offset 0x%lx, grain %d, syndrome "
+                        "0x%lx, row %d, channel %d, label \"%s\": %s\n",
+                        page_frame_number, offset_in_page,
+                        mci->csrows[row].grain, syndrome, row, channel,
+                        mci->csrows[row].channels[channel].label, msg);
 
         mci->ce_count++;
         mci->csrows[row].ce_count++;
@@ -1697,31 +1657,25 @@ void edac_mc_handle_ce(struct mem_ctl_info *mci,
                     page_frame_number;
 
                 edac_mc_scrub_block(remapped_page, offset_in_page,
-                                         mci->csrows[row].grain);
+                                        mci->csrows[row].grain);
         }
 }
+EXPORT_SYMBOL_GPL(edac_mc_handle_ce);
 
-
-EXPORT_SYMBOL(edac_mc_handle_ce_no_info);
-
-void edac_mc_handle_ce_no_info(struct mem_ctl_info *mci,
-                                    const char *msg)
+void edac_mc_handle_ce_no_info(struct mem_ctl_info *mci, const char *msg)
 {
         if (log_ce)
-                printk(KERN_WARNING
-                       "EDAC MC%d: CE - no information available: %s\n",
-                       mci->mc_idx, msg);
+                edac_mc_printk(mci, KERN_WARNING,
+                        "CE - no information available: %s\n", msg);
+
         mci->ce_noinfo_count++;
         mci->ce_count++;
 }
-
-
-EXPORT_SYMBOL(edac_mc_handle_ue);
+EXPORT_SYMBOL_GPL(edac_mc_handle_ce_no_info);
 
 void edac_mc_handle_ue(struct mem_ctl_info *mci,
-                            unsigned long page_frame_number,
-                            unsigned long offset_in_page, int row,
-                            const char *msg)
+                unsigned long page_frame_number, unsigned long offset_in_page,
+                int row, const char *msg)
 {
         int len = EDAC_MC_LABEL_LEN * 4;
         char labels[len + 1];
@@ -1729,65 +1683,61 @@ void edac_mc_handle_ue(struct mem_ctl_info *mci,
         int chan;
         int chars;
 
-        debugf3("MC%d: " __FILE__ ": %s()\n", mci->mc_idx, __func__);
+        debugf3("MC%d: %s()\n", mci->mc_idx, __func__);
 
         /* FIXME - maybe make panic on INTERNAL ERROR an option */
         if (row >= mci->nr_csrows || row < 0) {
                 /* something is wrong */
-                printk(KERN_ERR
-                       "EDAC MC%d: INTERNAL ERROR: row out of range (%d >= %d)\n",
-                       mci->mc_idx, row, mci->nr_csrows);
+                edac_mc_printk(mci, KERN_ERR,
+                        "INTERNAL ERROR: row out of range "
+                        "(%d >= %d)\n", row, mci->nr_csrows);
                 edac_mc_handle_ue_no_info(mci, "INTERNAL ERROR");
                 return;
         }
 
         chars = snprintf(pos, len + 1, "%s",
-                         mci->csrows[row].channels[0].label);
+                        mci->csrows[row].channels[0].label);
         len -= chars;
         pos += chars;
+
         for (chan = 1; (chan < mci->csrows[row].nr_channels) && (len > 0);
              chan++) {
                 chars = snprintf(pos, len + 1, ":%s",
-                                 mci->csrows[row].channels[chan].label);
+                                mci->csrows[row].channels[chan].label);
                 len -= chars;
                 pos += chars;
         }
 
         if (log_ue)
-                printk(KERN_EMERG
-                       "EDAC MC%d: UE page 0x%lx, offset 0x%lx, grain %d, row %d,"
-                       " labels \"%s\": %s\n", mci->mc_idx,
-                       page_frame_number, offset_in_page,
-                       mci->csrows[row].grain, row, labels, msg);
+                edac_mc_printk(mci, KERN_EMERG,
+                        "UE page 0x%lx, offset 0x%lx, grain %d, row %d, "
+                        "labels \"%s\": %s\n", page_frame_number,
+                        offset_in_page, mci->csrows[row].grain, row, labels,
+                        msg);
 
         if (panic_on_ue)
-                panic
-                    ("EDAC MC%d: UE page 0x%lx, offset 0x%lx, grain %d, row %d,"
-                     " labels \"%s\": %s\n", mci->mc_idx,
-                     page_frame_number, offset_in_page,
-                     mci->csrows[row].grain, row, labels, msg);
+                panic("EDAC MC%d: UE page 0x%lx, offset 0x%lx, grain %d, "
+                        "row %d, labels \"%s\": %s\n", mci->mc_idx,
+                        page_frame_number, offset_in_page,
+                        mci->csrows[row].grain, row, labels, msg);
 
         mci->ue_count++;
         mci->csrows[row].ue_count++;
 }
+EXPORT_SYMBOL_GPL(edac_mc_handle_ue);
 
-
-EXPORT_SYMBOL(edac_mc_handle_ue_no_info);
-
-void edac_mc_handle_ue_no_info(struct mem_ctl_info *mci,
-                                    const char *msg)
+void edac_mc_handle_ue_no_info(struct mem_ctl_info *mci, const char *msg)
 {
         if (panic_on_ue)
                 panic("EDAC MC%d: Uncorrected Error", mci->mc_idx);
 
         if (log_ue)
-                printk(KERN_WARNING
-                       "EDAC MC%d: UE - no information available: %s\n",
-                       mci->mc_idx, msg);
+                edac_mc_printk(mci, KERN_WARNING,
+                        "UE - no information available: %s\n", msg);
         mci->ue_noinfo_count++;
         mci->ue_count++;
 }
-
+EXPORT_SYMBOL_GPL(edac_mc_handle_ue_no_info);
 
 #ifdef CONFIG_PCI
 
@@ -1799,18 +1749,22 @@ static u16 get_pci_parity_status(struct pci_dev *dev, int secondary)
         where = secondary ? PCI_SEC_STATUS : PCI_STATUS;
         pci_read_config_word(dev, where, &status);
 
-        /* If we get back 0xFFFF then we must suspect that the card has been pulled but
-           the Linux PCI layer has not yet finished cleaning up. We don't want to report
-           on such devices */
+        /* If we get back 0xFFFF then we must suspect that the card has been
+         * pulled but the Linux PCI layer has not yet finished cleaning up.
+         * We don't want to report on such devices
+         */
 
         if (status == 0xFFFF) {
                 u32 sanity;
+
                 pci_read_config_dword(dev, 0, &sanity);
+
                 if (sanity == 0xFFFFFFFF)
                         return 0;
         }
+
         status &= PCI_STATUS_DETECTED_PARITY | PCI_STATUS_SIG_SYSTEM_ERROR |
-                  PCI_STATUS_PARITY;
+                PCI_STATUS_PARITY;
 
         if (status)
                 /* reset only the bits we are interested in */
@@ -1822,7 +1776,7 @@ static u16 get_pci_parity_status(struct pci_dev *dev, int secondary)
 typedef void (*pci_parity_check_fn_t) (struct pci_dev *dev);
 
 /* Clear any PCI parity errors logged by this device. */
-static void edac_pci_dev_parity_clear( struct pci_dev *dev )
+static void edac_pci_dev_parity_clear(struct pci_dev *dev)
 {
         u8 header_type;
 
@@ -1853,25 +1807,22 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
         /* check the status reg for errors */
         if (status) {
                 if (status & (PCI_STATUS_SIG_SYSTEM_ERROR))
-                        printk(KERN_CRIT
-                                "EDAC PCI- "
+                        edac_printk(KERN_CRIT, EDAC_PCI,
                                 "Signaled System Error on %s\n",
-                                pci_name (dev));
+                                pci_name(dev));
 
                 if (status & (PCI_STATUS_PARITY)) {
-                        printk(KERN_CRIT
-                                "EDAC PCI- "
+                        edac_printk(KERN_CRIT, EDAC_PCI,
                                 "Master Data Parity Error on %s\n",
-                                pci_name (dev));
+                                pci_name(dev));
 
                         atomic_inc(&pci_parity_count);
                 }
 
                 if (status & (PCI_STATUS_DETECTED_PARITY)) {
-                        printk(KERN_CRIT
-                                "EDAC PCI- "
+                        edac_printk(KERN_CRIT, EDAC_PCI,
                                 "Detected Parity Error on %s\n",
-                                pci_name (dev));
+                                pci_name(dev));
 
                         atomic_inc(&pci_parity_count);
                 }
@@ -1892,25 +1843,22 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
                 /* check the secondary status reg for errors */
                 if (status) {
                         if (status & (PCI_STATUS_SIG_SYSTEM_ERROR))
-                                printk(KERN_CRIT
-                                        "EDAC PCI-Bridge- "
+                                edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
                                         "Signaled System Error on %s\n",
-                                        pci_name (dev));
+                                        pci_name(dev));
 
                         if (status & (PCI_STATUS_PARITY)) {
-                                printk(KERN_CRIT
-                                        "EDAC PCI-Bridge- "
-                                        "Master Data Parity Error on %s\n",
-                                        pci_name (dev));
+                                edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
+                                        "Master Data Parity Error on "
+                                        "%s\n", pci_name(dev));
 
                                 atomic_inc(&pci_parity_count);
                         }
 
                         if (status & (PCI_STATUS_DETECTED_PARITY)) {
-                                printk(KERN_CRIT
-                                        "EDAC PCI-Bridge- "
+                                edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
                                         "Detected Parity Error on %s\n",
-                                        pci_name (dev));
+                                        pci_name(dev));
 
                                 atomic_inc(&pci_parity_count);
                         }
@@ -1929,58 +1877,55 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
  * Returns:     0 not found
  *              1 found on list
  */
-static int check_dev_on_list(struct edac_pci_device_list *list, int free_index,
-                                struct pci_dev *dev)
-{
-        int i;
-        int rc = 0;     /* Assume not found */
-        unsigned short vendor=dev->vendor;
-        unsigned short device=dev->device;
-
-        /* Scan the list, looking for a vendor/device match
-         */
-        for (i = 0; i < free_index; i++, list++ ) {
-                if (    (list->vendor == vendor ) &&
-                        (list->device == device )) {
-                        rc = 1;
-                        break;
-                }
-        }
+static int check_dev_on_list(struct edac_pci_device_list *list,
+                int free_index, struct pci_dev *dev)
+{
+        int i;
+        int rc = 0;     /* Assume not found */
+        unsigned short vendor=dev->vendor;
+        unsigned short device=dev->device;
+
+        /* Scan the list, looking for a vendor/device match */
+        for (i = 0; i < free_index; i++, list++ ) {
+                if ((list->vendor == vendor ) && (list->device == device )) {
+                        rc = 1;
+                        break;
+                }
+        }
 
-        return rc;
+        return rc;
 }
 
 /*
  * pci_dev parity list iterator
- *      Scan the PCI device list for one iteration, looking for SERRORs
+ *      Scan the PCI device list for one iteration, looking for SERRORs
  *      Master Parity ERRORS or Parity ERRORs on primary or secondary devices
  */
 static inline void edac_pci_dev_parity_iterator(pci_parity_check_fn_t fn)
 {
-        struct pci_dev *dev=NULL;
+        struct pci_dev *dev = NULL;
 
         /* request for kernel access to the next PCI device, if any,
          * and while we are looking at it have its reference count
          * bumped until we are done with it
          */
         while((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
-
-                /* if whitelist exists then it has priority, so only scan those
-                 * devices on the whitelist
-                 */
-                if (pci_whitelist_count > 0 ) {
-                        if (check_dev_on_list(pci_whitelist,
+                /* if whitelist exists then it has priority, so only scan
+                 * those devices on the whitelist
+                 */
+                if (pci_whitelist_count > 0 ) {
+                        if (check_dev_on_list(pci_whitelist,
                                         pci_whitelist_count, dev))
                                 fn(dev);
-                } else {
+                } else {
                         /*
                          * if no whitelist, then check if this devices is
                          * blacklisted
                          */
-                        if (!check_dev_on_list(pci_blacklist,
+                        if (!check_dev_on_list(pci_blacklist,
                                         pci_blacklist_count, dev))
                                 fn(dev);
-                }
+                }
         }
 }
 
@@ -1989,7 +1934,7 @@ static void do_pci_parity_check(void)
         unsigned long flags;
         int before_count;
 
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
+        debugf3("%s()\n", __func__);
 
         if (!check_pci_parity)
                 return;
@@ -2011,7 +1956,6 @@ static void do_pci_parity_check(void)
         }
 }
 
-
 static inline void clear_pci_parity_errors(void)
 {
         /* Clear any PCI bus parity errors that devices initially have logged
@@ -2020,37 +1964,30 @@ static inline void clear_pci_parity_errors(void)
         edac_pci_dev_parity_iterator(edac_pci_dev_parity_clear);
 }
 
-
 #else  /* CONFIG_PCI */
 
-
 static inline void do_pci_parity_check(void)
 {
         /* no-op */
 }
 
-
 static inline void clear_pci_parity_errors(void)
 {
         /* no-op */
 }
 
-
 #endif  /* CONFIG_PCI */
 
 /*
  * Iterate over all MC instances and check for ECC, et al, errors
  */
-static inline void check_mc_devices (void)
+static inline void check_mc_devices(void)
 {
-        unsigned long flags;
         struct list_head *item;
         struct mem_ctl_info *mci;
 
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
-
-        /* during poll, have interrupts off */
-        local_irq_save(flags);
+        debugf3("%s()\n", __func__);
+        down(&mem_ctls_mutex);
 
         list_for_each(item, &mc_devices) {
                 mci = list_entry(item, struct mem_ctl_info, link);
@@ -2059,10 +1996,9 @@ static inline void check_mc_devices (void)
                         mci->edac_check(mci);
         }
 
-        local_irq_restore(flags);
+        up(&mem_ctls_mutex);
 }
 
-
 /*
  * Check MC status every poll_msec.
  * Check PCI status every poll_msec as well.
@@ -2073,70 +2009,21 @@ static inline void check_mc_devices (void)
  */
 static void do_edac_check(void)
 {
-
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
-
+        debugf3("%s()\n", __func__);
         check_mc_devices();
-
         do_pci_parity_check();
 }
 
-
-/*
- * EDAC thread state information
- */
-struct bs_thread_info
-{
-        struct task_struct *task;
-        struct completion *event;
-        char *name;
-        void (*run)(void);
-};
-
-static struct bs_thread_info bs_thread;
-
-/*
- *  edac_kernel_thread
- *      This the kernel thread that processes edac operations
- *      in a normal thread environment
- */
 static int edac_kernel_thread(void *arg)
 {
-        struct bs_thread_info *thread = (struct bs_thread_info *) arg;
-
-        /* detach thread */
-        daemonize(thread->name);
-
-        current->exit_signal = SIGCHLD;
-        allow_signal(SIGKILL);
-        thread->task = current;
-
-        /* indicate to starting task we have started */
-        complete(thread->event);
-
-        /* loop forever, until we are told to stop */
-        while(thread->run != NULL) {
-                void (*run)(void);
-
-                /* call the function to check the memory controllers */
-                run = thread->run;
-                if (run)
-                        run();
-
-                if (signal_pending(current))
-                        flush_signals(current);
-
-                /* ensure we are interruptable */
-                set_current_state(TASK_INTERRUPTIBLE);
+        while (!kthread_should_stop()) {
+                do_edac_check();
 
                 /* goto sleep for the interval */
-                schedule_timeout((HZ * poll_msec) / 1000);
+                schedule_timeout_interruptible((HZ * poll_msec) / 1000);
                 try_to_freeze();
         }
 
-        /* notify waiter that we are exiting */
-        complete(thread->event);
-
         return 0;
 }
 
@@ -2146,10 +2033,7 @@ static int edac_kernel_thread(void *arg)
  */
 static int __init edac_mc_init(void)
 {
-        int ret;
-        struct completion event;
-
-        printk(KERN_INFO "MC: " __FILE__ " version " EDAC_MC_VERSION "\n");
+        edac_printk(KERN_INFO, EDAC_MC, EDAC_MC_VERSION "\n");
 
         /*
          * Harvest and clear any boot/initialization PCI parity errors
@@ -2160,80 +2044,54 @@ static int __init edac_mc_init(void)
          */
         clear_pci_parity_errors();
 
-        /* perform check for first time to harvest boot leftovers */
-        do_edac_check();
-
-        /* Create the MC sysfs entires */
+        /* Create the MC sysfs entries */
         if (edac_sysfs_memctrl_setup()) {
-                printk(KERN_ERR "EDAC MC: Error initializing sysfs code\n");
+                edac_printk(KERN_ERR, EDAC_MC,
+                        "Error initializing sysfs code\n");
                 return -ENODEV;
         }
 
         /* Create the PCI parity sysfs entries */
         if (edac_sysfs_pci_setup()) {
                 edac_sysfs_memctrl_teardown();
-                printk(KERN_ERR "EDAC PCI: Error initializing sysfs code\n");
+                edac_printk(KERN_ERR, EDAC_MC,
+                        "EDAC PCI: Error initializing sysfs code\n");
                 return -ENODEV;
         }
 
-        /* Create our kernel thread */
-        init_completion(&event);
-        bs_thread.event = &event;
-        bs_thread.name = "kedac";
-        bs_thread.run = do_edac_check;
-
         /* create our kernel thread */
-        ret = kernel_thread(edac_kernel_thread, &bs_thread, CLONE_KERNEL);
-        if (ret < 0) {
+        edac_thread = kthread_run(edac_kernel_thread, NULL, "kedac");
+
+        if (IS_ERR(edac_thread)) {
                 /* remove the sysfs entries */
                 edac_sysfs_memctrl_teardown();
                 edac_sysfs_pci_teardown();
-                return -ENOMEM;
+                return PTR_ERR(edac_thread);
         }
 
-        /* wait for our kernel theard ack that it is up and running */
-        wait_for_completion(&event);
-
         return 0;
 }
 
-
 /*
  * edac_mc_exit()
  *      module exit/termination functioni
  */
 static void __exit edac_mc_exit(void)
 {
-        struct completion event;
-
-        debugf0("MC: " __FILE__ ": %s()\n", __func__);
-
-        init_completion(&event);
-        bs_thread.event = &event;
-
-        /* As soon as ->run is set to NULL, the task could disappear,
-         * so we need to hold tasklist_lock until we have sent the signal
-         */
-        read_lock(&tasklist_lock);
-        bs_thread.run = NULL;
-        send_sig(SIGKILL, bs_thread.task, 1);
-        read_unlock(&tasklist_lock);
-        wait_for_completion(&event);
+        debugf0("%s()\n", __func__);
+        kthread_stop(edac_thread);
 
         /* tear down the sysfs device */
         edac_sysfs_memctrl_teardown();
         edac_sysfs_pci_teardown();
 }
 
-
-
-
 module_init(edac_mc_init);
 module_exit(edac_mc_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Linux Networx (http://lnxi.com) Thayne Harbaugh et al\n"
-              "Based on.work by Dan Hollis et al");
+        "Based on work by Dan Hollis et al");
 MODULE_DESCRIPTION("Core library routines for MC reporting");
 
 module_param(panic_on_ue, int, 0644);
diff --git a/drivers/edac/edac_mc.h b/drivers/edac/edac_mc.h
index 75ecf484a4..8d9e83909b 100644
--- a/drivers/edac/edac_mc.h
+++ b/drivers/edac/edac_mc.h
@@ -15,11 +15,9 @@
  *
  */
 
-
 #ifndef _EDAC_MC_H_
 #define _EDAC_MC_H_
 
-
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -33,7 +31,6 @@
 #include <linux/completion.h>
 #include <linux/kobject.h>
 
-
 #define EDAC_MC_LABEL_LEN       31
 #define MC_PROC_NAME_MAX_LEN 7
 
@@ -43,31 +40,53 @@
 #define PAGES_TO_MiB( pages )   ( ( pages ) << ( PAGE_SHIFT - 20 ) )
 #endif
 
+#define edac_printk(level, prefix, fmt, arg...) \
+        printk(level "EDAC " prefix ": " fmt, ##arg)
+
+#define edac_mc_printk(mci, level, fmt, arg...) \
+        printk(level "EDAC MC%d: " fmt, mci->mc_idx, ##arg)
+
+#define edac_mc_chipset_printk(mci, level, prefix, fmt, arg...) \
+        printk(level "EDAC " prefix " MC%d: " fmt, mci->mc_idx, ##arg)
+
+/* prefixes for edac_printk() and edac_mc_printk() */
+#define EDAC_MC "MC"
+#define EDAC_PCI "PCI"
+#define EDAC_DEBUG "DEBUG"
+
 #ifdef CONFIG_EDAC_DEBUG
 extern int edac_debug_level;
-#define edac_debug_printk(level, fmt, args...) \
-do { if (level <= edac_debug_level) printk(KERN_DEBUG fmt, ##args); } while(0)
+
+#define edac_debug_printk(level, fmt, arg...)                            \
+        do {                                                             \
+                if (level <= edac_debug_level)                           \
+                        edac_printk(KERN_DEBUG, EDAC_DEBUG, fmt, ##arg); \
+        } while(0)
+
 #define debugf0( ... ) edac_debug_printk(0, __VA_ARGS__ )
 #define debugf1( ... ) edac_debug_printk(1, __VA_ARGS__ )
 #define debugf2( ... ) edac_debug_printk(2, __VA_ARGS__ )
 #define debugf3( ... ) edac_debug_printk(3, __VA_ARGS__ )
 #define debugf4( ... ) edac_debug_printk(4, __VA_ARGS__ )
-#else                           /* !CONFIG_EDAC_DEBUG */
+
+#else  /* !CONFIG_EDAC_DEBUG */
+
 #define debugf0( ... )
 #define debugf1( ... )
 #define debugf2( ... )
 #define debugf3( ... )
 #define debugf4( ... )
-#endif                          /* !CONFIG_EDAC_DEBUG */
 
+#endif  /* !CONFIG_EDAC_DEBUG */
 
-#define bs_xstr(s) bs_str(s)
-#define bs_str(s) #s
-#define BS_MOD_STR bs_xstr(KBUILD_BASENAME)
+#define edac_xstr(s) edac_str(s)
+#define edac_str(s) #s
+#define EDAC_MOD_STR edac_xstr(KBUILD_BASENAME)
 
 #define BIT(x) (1 << (x))
 
-#define PCI_VEND_DEV(vend, dev) PCI_VENDOR_ID_ ## vend, PCI_DEVICE_ID_ ## vend ## _ ## dev
+#define PCI_VEND_DEV(vend, dev) PCI_VENDOR_ID_ ## vend, \
+        PCI_DEVICE_ID_ ## vend ## _ ## dev
 
 /* memory devices */
 enum dev_type {
@@ -117,7 +136,6 @@ enum mem_type {
 #define MEM_FLAG_RDDR           BIT(MEM_RDDR)
 #define MEM_FLAG_RMBS           BIT(MEM_RMBS)
 
-
 /* chipset Error Detection and Correction capabilities and mode */
 enum edac_type {
         EDAC_UNKNOWN = 0,       /* Unknown if ECC is available */
@@ -142,7 +160,6 @@ enum edac_type {
 #define EDAC_FLAG_S8ECD8ED      BIT(EDAC_S8ECD8ED)
 #define EDAC_FLAG_S16ECD16ED    BIT(EDAC_S16ECD16ED)
 
-
 /* scrubbing capabilities */
 enum scrub_type {
         SCRUB_UNKNOWN = 0,      /* Unknown if scrubber is available */
@@ -166,11 +183,6 @@ enum scrub_type {
 #define SCRUB_FLAG_HW_PROG_SRC  BIT(SCRUB_HW_PROG_SRC_CORR)
 #define SCRUB_FLAG_HW_TUN       BIT(SCRUB_HW_TUNABLE)
 
-enum mci_sysfs_status {
-        MCI_SYSFS_INACTIVE = 0, /* sysfs entries NOT registered */
-        MCI_SYSFS_ACTIVE        /* sysfs entries ARE registered */
-};
-
 /* FIXME - should have notify capabilities: NMI, LOG, PROC, etc */
 
 /*
@@ -255,20 +267,19 @@ enum mci_sysfs_status {
  * PS - I enjoyed writing all that about as much as you enjoyed reading it.
  */
 
-
 struct channel_info {
         int chan_idx;           /* channel index */
         u32 ce_count;           /* Correctable Errors for this CHANNEL */
-        char label[EDAC_MC_LABEL_LEN + 1];      /* DIMM label on motherboard */
+        char label[EDAC_MC_LABEL_LEN + 1];  /* DIMM label on motherboard */
         struct csrow_info *csrow;       /* the parent */
 };
 
-
 struct csrow_info {
         unsigned long first_page;       /* first page number in dimm */
         unsigned long last_page;        /* last page number in dimm */
         unsigned long page_mask;        /* used for interleaving -
-                                           0UL for non intlv */
+                                         * 0UL for non intlv
+                                         */
         u32 nr_pages;           /* number of pages in csrow */
         u32 grain;              /* granularity of reported error in bytes */
         int csrow_idx;          /* the chip-select row */
@@ -280,29 +291,28 @@ struct csrow_info {
         struct mem_ctl_info *mci;       /* the parent */
 
         struct kobject kobj;    /* sysfs kobject for this csrow */
+        struct completion kobj_complete;
 
         /* FIXME the number of CHANNELs might need to become dynamic */
         u32 nr_channels;
         struct channel_info *channels;
 };
 
-
 struct mem_ctl_info {
         struct list_head link;  /* for global list of mem_ctl_info structs */
         unsigned long mtype_cap;        /* memory types supported by mc */
         unsigned long edac_ctl_cap;     /* Mem controller EDAC capabilities */
         unsigned long edac_cap; /* configuration capabilities - this is
-                                   closely related to edac_ctl_cap.  The
-                                   difference is that the controller
-                                   may be capable of s4ecd4ed which would
-                                   be listed in edac_ctl_cap, but if
-                                   channels aren't capable of s4ecd4ed then the
-                                   edac_cap would not have that capability. */
+                                 * closely related to edac_ctl_cap.  The
+                                 * difference is that the controller may be
+                                 * capable of s4ecd4ed which would be listed
+                                 * in edac_ctl_cap, but if channels aren't
+                                 * capable of s4ecd4ed then the edac_cap would
+                                 * not have that capability.
+                                 */
         unsigned long scrub_cap;        /* chipset scrub capabilities */
         enum scrub_type scrub_mode;     /* current scrub mode */
 
-        enum mci_sysfs_status sysfs_active;     /* status of sysfs */
-
         /* pointer to edac checking routine */
         void (*edac_check) (struct mem_ctl_info * mci);
         /*
@@ -311,7 +321,7 @@ struct mem_ctl_info {
          */
         /* FIXME - why not send the phys page to begin with? */
         unsigned long (*ctl_page_to_phys) (struct mem_ctl_info * mci,
-                                           unsigned long page);
+                                        unsigned long page);
         int mc_idx;
         int nr_csrows;
         struct csrow_info *csrows;
@@ -340,72 +350,69 @@ struct mem_ctl_info {
 
         /* edac sysfs device control */
         struct kobject edac_mci_kobj;
+        struct completion kobj_complete;
 };
 
-
-
 /* write all or some bits in a byte-register*/
-static inline void pci_write_bits8(struct pci_dev *pdev, int offset,
-                                   u8 value, u8 mask)
+static inline void pci_write_bits8(struct pci_dev *pdev, int offset, u8 value,
+                u8 mask)
 {
         if (mask != 0xff) {
                 u8 buf;
+
                 pci_read_config_byte(pdev, offset, &buf);
                 value &= mask;
                 buf &= ~mask;
                 value |= buf;
         }
+
         pci_write_config_byte(pdev, offset, value);
 }
 
-
 /* write all or some bits in a word-register*/
 static inline void pci_write_bits16(struct pci_dev *pdev, int offset,
-                                    u16 value, u16 mask)
+                u16 value, u16 mask)
 {
         if (mask != 0xffff) {
                 u16 buf;
+
                 pci_read_config_word(pdev, offset, &buf);
                 value &= mask;
                 buf &= ~mask;
                 value |= buf;
         }
+
         pci_write_config_word(pdev, offset, value);
 }
 
-
 /* write all or some bits in a dword-register*/
 static inline void pci_write_bits32(struct pci_dev *pdev, int offset,
-                                    u32 value, u32 mask)
+                u32 value, u32 mask)
 {
         if (mask != 0xffff) {
                 u32 buf;
+
                 pci_read_config_dword(pdev, offset, &buf);
                 value &= mask;
                 buf &= ~mask;
                 value |= buf;
         }
+
         pci_write_config_dword(pdev, offset, value);
 }
 
-
 #ifdef CONFIG_EDAC_DEBUG
 void edac_mc_dump_channel(struct channel_info *chan);
 void edac_mc_dump_mci(struct mem_ctl_info *mci);
 void edac_mc_dump_csrow(struct csrow_info *csrow);
-#endif                          /* CONFIG_EDAC_DEBUG */
+#endif  /* CONFIG_EDAC_DEBUG */
 
 extern int edac_mc_add_mc(struct mem_ctl_info *mci);
-extern int edac_mc_del_mc(struct mem_ctl_info *mci);
-
+extern struct mem_ctl_info * edac_mc_del_mc(struct pci_dev *pdev);
 extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
-                                           unsigned long page);
-
-extern struct mem_ctl_info *edac_mc_find_mci_by_pdev(struct pci_dev
-                                                          *pdev);
-
-extern void edac_mc_scrub_block(unsigned long page,
-                                     unsigned long offset, u32 size);
+                                        unsigned long page);
+extern void edac_mc_scrub_block(unsigned long page, unsigned long offset,
+                u32 size);
 
 /*
  * The no info errors are used when error overflows are reported.
@@ -418,31 +425,25 @@ extern void edac_mc_scrub_block(unsigned long page,
  * statement clutter and extra function arguments.
  */
 extern void edac_mc_handle_ce(struct mem_ctl_info *mci,
-                                   unsigned long page_frame_number,
-                                   unsigned long offset_in_page,
-                                   unsigned long syndrome,
-                                   int row, int channel, const char *msg);
-
+                unsigned long page_frame_number, unsigned long offset_in_page,
+                unsigned long syndrome, int row, int channel,
+                const char *msg);
 extern void edac_mc_handle_ce_no_info(struct mem_ctl_info *mci,
-                                           const char *msg);
-
+                const char *msg);
 extern void edac_mc_handle_ue(struct mem_ctl_info *mci,
-                                   unsigned long page_frame_number,
-                                   unsigned long offset_in_page,
-                                   int row, const char *msg);
-
+                unsigned long page_frame_number, unsigned long offset_in_page,
+                int row, const char *msg);
 extern void edac_mc_handle_ue_no_info(struct mem_ctl_info *mci,
-                                           const char *msg);
+                const char *msg);
 
 /*
  * This kmalloc's and initializes all the structures.
  * Can't be used if all structures don't have the same lifetime.
  */
-extern struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt,
-                unsigned nr_csrows, unsigned nr_chans);
+extern struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,
+                unsigned nr_chans);
 
 /* Free an mc previously allocated by edac_mc_alloc() */
 extern void edac_mc_free(struct mem_ctl_info *mci);
 
-
 #endif                          /* _EDAC_MC_H_ */
diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c
index 52596e75f9..fd342163cf 100644
--- a/drivers/edac/i82860_edac.c
+++ b/drivers/edac/i82860_edac.c
@@ -9,7 +9,6 @@
  * by Thayne Harbaugh of Linux Networx. (http://lnxi.com)
  */
 
-
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -18,6 +17,11 @@
 #include <linux/slab.h>
 #include "edac_mc.h"
 
+#define i82860_printk(level, fmt, arg...) \
+        edac_printk(level, "i82860", fmt, ##arg)
+
+#define i82860_mc_printk(mci, level, fmt, arg...) \
+        edac_mc_chipset_printk(mci, level, "i82860", fmt, ##arg)
 
 #ifndef PCI_DEVICE_ID_INTEL_82860_0
 #define PCI_DEVICE_ID_INTEL_82860_0     0x2531
@@ -48,15 +52,15 @@ struct i82860_error_info {
 
 static const struct i82860_dev_info i82860_devs[] = {
         [I82860] = {
-                    .ctl_name = "i82860"},
+                .ctl_name = "i82860"
+        },
 };
 
 static struct pci_dev *mci_pdev = NULL; /* init dev: in case that AGP code
-                                           has already registered driver */
+                                         * has already registered driver
+                                         */
 
-static int i82860_registered = 1;
-
-static void i82860_get_error_info (struct mem_ctl_info *mci,
+static void i82860_get_error_info(struct mem_ctl_info *mci,
                 struct i82860_error_info *info)
 {
         /*
@@ -78,14 +82,15 @@ static void i82860_get_error_info (struct mem_ctl_info *mci,
          */
         if (!(info->errsts2 & 0x0003))
                 return;
+
         if ((info->errsts ^ info->errsts2) & 0x0003) {
                 pci_read_config_dword(mci->pdev, I82860_EAP, &info->eap);
                 pci_read_config_word(mci->pdev, I82860_DERRCTL_STS,
-                    &info->derrsyn);
+                                &info->derrsyn);
         }
 }
 
-static int i82860_process_error_info (struct mem_ctl_info *mci,
+static int i82860_process_error_info(struct mem_ctl_info *mci,
                 struct i82860_error_info *info, int handle_errors)
 {
         int row;
@@ -107,8 +112,8 @@ static int i82860_process_error_info (struct mem_ctl_info *mci,
         if (info->errsts & 0x0002)
                 edac_mc_handle_ue(mci, info->eap, 0, row, "i82860 UE");
         else
-                edac_mc_handle_ce(mci, info->eap, 0, info->derrsyn, row,
-                                       0, "i82860 UE");
+                edac_mc_handle_ce(mci, info->eap, 0, info->derrsyn, row, 0,
+                                "i82860 UE");
 
         return 1;
 }
@@ -117,7 +122,7 @@ static void i82860_check(struct mem_ctl_info *mci)
 {
         struct i82860_error_info info;
 
-        debugf1("MC%d: " __FILE__ ": %s()\n", mci->mc_idx, __func__);
+        debugf1("MC%d: %s()\n", mci->mc_idx, __func__);
         i82860_get_error_info(mci, &info);
         i82860_process_error_info(mci, &info, 1);
 }
@@ -128,6 +133,7 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx)
         int index;
         struct mem_ctl_info *mci = NULL;
         unsigned long last_cumul_size;
+        struct i82860_error_info discard;
 
         u16 mchcfg_ddim;        /* DRAM Data Integrity Mode 0=none,2=edac */
 
@@ -140,21 +146,20 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx)
            going to make 1 channel for group.
          */
         mci = edac_mc_alloc(0, 16, 1);
+
         if (!mci)
                 return -ENOMEM;
 
-        debugf3("MC: " __FILE__ ": %s(): init mci\n", __func__);
-
+        debugf3("%s(): init mci\n", __func__);
         mci->pdev = pdev;
         mci->mtype_cap = MEM_FLAG_DDR;
 
-
         mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;
         /* I"m not sure about this but I think that all RDRAM is SECDED */
         mci->edac_cap = EDAC_FLAG_SECDED;
         /* adjust FLAGS */
 
-        mci->mod_name = BS_MOD_STR;
+        mci->mod_name = EDAC_MOD_STR;
         mci->mod_ver = "$Revision: 1.1.2.6 $";
         mci->ctl_name = i82860_devs[dev_idx].ctl_name;
         mci->edac_check = i82860_check;
@@ -175,12 +180,13 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx)
                 struct csrow_info *csrow = &mci->csrows[index];
 
                 pci_read_config_word(mci->pdev, I82860_GBA + index * 2,
-                                     &value);
+                                &value);
 
                 cumul_size = (value & I82860_GBA_MASK) <<
                     (I82860_GBA_SHIFT - PAGE_SHIFT);
-                debugf3("MC: " __FILE__ ": %s(): (%d) cumul_size 0x%x\n",
-                        __func__, index, cumul_size);
+                debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index,
+                        cumul_size);
+
                 if (cumul_size == last_cumul_size)
                         continue;       /* not populated */
 
@@ -188,42 +194,43 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx)
                 csrow->last_page = cumul_size - 1;
                 csrow->nr_pages = cumul_size - last_cumul_size;
                 last_cumul_size = cumul_size;
-                csrow->grain = 1 << 12; /* I82860_EAP has 4KiB reolution */
+                csrow->grain = 1 << 12;  /* I82860_EAP has 4KiB reolution */
                 csrow->mtype = MEM_RMBS;
                 csrow->dtype = DEV_UNKNOWN;
                 csrow->edac_mode = mchcfg_ddim ? EDAC_SECDED : EDAC_NONE;
         }
 
-        /* clear counters */
-        pci_write_bits16(mci->pdev, I82860_ERRSTS, 0x0003, 0x0003);
+        i82860_get_error_info(mci, &discard);  /* clear counters */
 
         if (edac_mc_add_mc(mci)) {
-                debugf3("MC: " __FILE__
-                        ": %s(): failed edac_mc_add_mc()\n",
-                        __func__);
+                debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
                 edac_mc_free(mci);
         } else {
                 /* get this far and it's successful */
-                debugf3("MC: " __FILE__ ": %s(): success\n", __func__);
+                debugf3("%s(): success\n", __func__);
                 rc = 0;
         }
+
         return rc;
 }
 
 /* returns count (>= 0), or negative on error */
 static int __devinit i82860_init_one(struct pci_dev *pdev,
-                                     const struct pci_device_id *ent)
+                const struct pci_device_id *ent)
 {
         int rc;
 
-        debugf0("MC: " __FILE__ ": %s()\n", __func__);
+        debugf0("%s()\n", __func__);
+        i82860_printk(KERN_INFO, "i82860 init one\n");
 
-        printk(KERN_INFO "i82860 init one\n");
-        if(pci_enable_device(pdev) < 0)
+        if (pci_enable_device(pdev) < 0)
                 return -EIO;
+
         rc = i82860_probe1(pdev, ent->driver_data);
-        if(rc == 0)
+
+        if (rc == 0)
                 mci_pdev = pci_dev_get(pdev);
+
         return rc;
 }
 
@@ -231,23 +238,28 @@ static void __devexit i82860_remove_one(struct pci_dev *pdev)
 {
         struct mem_ctl_info *mci;
 
-        debugf0(__FILE__ ": %s()\n", __func__);
+        debugf0("%s()\n", __func__);
 
-        mci = edac_mc_find_mci_by_pdev(pdev);
-        if ((mci != NULL) && (edac_mc_del_mc(mci) == 0))
-                edac_mc_free(mci);
+        if ((mci = edac_mc_del_mc(pdev)) == NULL)
+                return;
+
+        edac_mc_free(mci);
 }
 
 static const struct pci_device_id i82860_pci_tbl[] __devinitdata = {
-        {PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-         I82860},
-        {0,}                    /* 0 terminated list. */
+        {
+                PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                I82860
+        },
+        {
+                0,
+        }       /* 0 terminated list. */
 };
 
 MODULE_DEVICE_TABLE(pci, i82860_pci_tbl);
 
 static struct pci_driver i82860_driver = {
-        .name = BS_MOD_STR,
+        .name = EDAC_MOD_STR,
         .probe = i82860_init_one,
         .remove = __devexit_p(i82860_remove_one),
         .id_table = i82860_pci_tbl,
@@ -257,43 +269,56 @@ static int __init i82860_init(void)
 {
         int pci_rc;
 
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
+        debugf3("%s()\n", __func__);
+
         if ((pci_rc = pci_register_driver(&i82860_driver)) < 0)
-                return pci_rc;
+                goto fail0;
 
         if (!mci_pdev) {
-                i82860_registered = 0;
                 mci_pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
-                                          PCI_DEVICE_ID_INTEL_82860_0, NULL);
+                                        PCI_DEVICE_ID_INTEL_82860_0, NULL);
+
                 if (mci_pdev == NULL) {
                         debugf0("860 pci_get_device fail\n");
-                        return -ENODEV;
+                        pci_rc = -ENODEV;
+                        goto fail1;
                 }
+
                 pci_rc = i82860_init_one(mci_pdev, i82860_pci_tbl);
+
                 if (pci_rc < 0) {
                         debugf0("860 init fail\n");
-                        pci_dev_put(mci_pdev);
-                        return -ENODEV;
+                        pci_rc = -ENODEV;
+                        goto fail1;
                 }
         }
+
         return 0;
+
+fail1:
+        pci_unregister_driver(&i82860_driver);
+
+fail0:
+        if (mci_pdev != NULL)
+                pci_dev_put(mci_pdev);
+
+        return pci_rc;
 }
 
 static void __exit i82860_exit(void)
 {
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
+        debugf3("%s()\n", __func__);
 
         pci_unregister_driver(&i82860_driver);
-        if (!i82860_registered) {
-                i82860_remove_one(mci_pdev);
+
+        if (mci_pdev != NULL)
                 pci_dev_put(mci_pdev);
-        }
 }
 
 module_init(i82860_init);
 module_exit(i82860_exit);
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR
-    ("Red Hat Inc. (http://www.redhat.com.com) Ben Woodard <woodard@redhat.com>");
+MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com) "
+        "Ben Woodard <woodard@redhat.com>");
 MODULE_DESCRIPTION("ECC support for Intel 82860 memory hub controllers");
diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
index 1991f94af7..0aec92698f 100644
--- a/drivers/edac/i82875p_edac.c
+++ b/drivers/edac/i82875p_edac.c
@@ -13,18 +13,19 @@
  * Note: E7210 appears same as D82875P - zhenyu.z.wang at intel.com
  */
 
-
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
-
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
-
 #include <linux/slab.h>
-
 #include "edac_mc.h"
 
+#define i82875p_printk(level, fmt, arg...) \
+        edac_printk(level, "i82875p", fmt, ##arg)
+
+#define i82875p_mc_printk(mci, level, fmt, arg...) \
+        edac_mc_chipset_printk(mci, level, "i82875p", fmt, ##arg)
 
 #ifndef PCI_DEVICE_ID_INTEL_82875_0
 #define PCI_DEVICE_ID_INTEL_82875_0     0x2578
@@ -34,11 +35,9 @@
 #define PCI_DEVICE_ID_INTEL_82875_6     0x257e
 #endif                          /* PCI_DEVICE_ID_INTEL_82875_6 */
 
-
 /* four csrows in dual channel, eight in single channel */
 #define I82875P_NR_CSROWS(nr_chans) (8/(nr_chans))
 
-
 /* Intel 82875p register addresses - device 0 function 0 - DRAM Controller */
 #define I82875P_EAP             0x58    /* Error Address Pointer (32b)
                                          *
@@ -87,7 +86,6 @@
                                          *  0    reserved
                                          */
 
-
 /* Intel 82875p register addresses - device 6 function 0 - DRAM Controller */
 #define I82875P_PCICMD6         0x04    /* PCI Command Register (16b)
                                          *
@@ -151,23 +149,19 @@
                                          *  1:0  DRAM type 01=DDR
                                          */
 
-
 enum i82875p_chips {
         I82875P = 0,
 };
 
-
 struct i82875p_pvt {
         struct pci_dev *ovrfl_pdev;
         void __iomem *ovrfl_window;
 };
 
-
 struct i82875p_dev_info {
         const char *ctl_name;
 };
 
-
 struct i82875p_error_info {
         u16 errsts;
         u32 eap;
@@ -176,17 +170,19 @@ struct i82875p_error_info {
         u16 errsts2;
 };
 
-
 static const struct i82875p_dev_info i82875p_devs[] = {
         [I82875P] = {
-                     .ctl_name = "i82875p"},
+                .ctl_name = "i82875p"
+        },
 };
 
-static struct pci_dev *mci_pdev = NULL; /* init dev: in case that AGP code
-                                           has already registered driver */
+static struct pci_dev *mci_pdev = NULL; /* init dev: in case that AGP code has
+                                         * already registered driver
+                                         */
+
 static int i82875p_registered = 1;
 
-static void i82875p_get_error_info (struct mem_ctl_info *mci,
+static void i82875p_get_error_info(struct mem_ctl_info *mci,
                 struct i82875p_error_info *info)
 {
         /*
@@ -210,15 +206,16 @@ static void i82875p_get_error_info (struct mem_ctl_info *mci,
          */
         if (!(info->errsts2 & 0x0081))
                 return;
+
         if ((info->errsts ^ info->errsts2) & 0x0081) {
                 pci_read_config_dword(mci->pdev, I82875P_EAP, &info->eap);
                 pci_read_config_byte(mci->pdev, I82875P_DES, &info->des);
                 pci_read_config_byte(mci->pdev, I82875P_DERRSYN,
-                    &info->derrsyn);
+                                &info->derrsyn);
         }
 }
 
-static int i82875p_process_error_info (struct mem_ctl_info *mci,
+static int i82875p_process_error_info(struct mem_ctl_info *mci,
                 struct i82875p_error_info *info, int handle_errors)
 {
         int row, multi_chan;
@@ -243,23 +240,21 @@ static int i82875p_process_error_info (struct mem_ctl_info *mci,
                 edac_mc_handle_ue(mci, info->eap, 0, row, "i82875p UE");
         else
                 edac_mc_handle_ce(mci, info->eap, 0, info->derrsyn, row,
-                                       multi_chan ? (info->des & 0x1) : 0,
-                                       "i82875p CE");
+                                multi_chan ? (info->des & 0x1) : 0,
+                                "i82875p CE");
 
         return 1;
 }
 
-
 static void i82875p_check(struct mem_ctl_info *mci)
 {
         struct i82875p_error_info info;
 
-        debugf1("MC%d: " __FILE__ ": %s()\n", mci->mc_idx, __func__);
+        debugf1("MC%d: %s()\n", mci->mc_idx, __func__);
         i82875p_get_error_info(mci, &info);
         i82875p_process_error_info(mci, &info, 1);
 }
 
-
 #ifdef CONFIG_PROC_FS
 extern int pci_proc_attach_device(struct pci_dev *);
 #endif
@@ -273,15 +268,14 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
         unsigned long last_cumul_size;
         struct pci_dev *ovrfl_pdev;
         void __iomem *ovrfl_window = NULL;
-
         u32 drc;
         u32 drc_chan;           /* Number of channels 0=1chan,1=2chan */
         u32 nr_chans;
         u32 drc_ddim;           /* DRAM Data Integrity Mode 0=none,2=edac */
+        struct i82875p_error_info discard;
 
-        debugf0("MC: " __FILE__ ": %s()\n", __func__);
-
-        ovrfl_pdev = pci_find_device(PCI_VEND_DEV(INTEL, 82875_6), NULL);
+        debugf0("%s()\n", __func__);
+        ovrfl_pdev = pci_get_device(PCI_VEND_DEV(INTEL, 82875_6), NULL);
 
         if (!ovrfl_pdev) {
                 /*
@@ -292,71 +286,69 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
                  */
                 pci_write_bits8(pdev, 0xf4, 0x2, 0x2);
                 ovrfl_pdev =
-                    pci_scan_single_device(pdev->bus, PCI_DEVFN(6, 0));
+                        pci_scan_single_device(pdev->bus, PCI_DEVFN(6, 0));
+
                 if (!ovrfl_pdev)
-                        goto fail;
+                        return -ENODEV;
         }
+
 #ifdef CONFIG_PROC_FS
         if (!ovrfl_pdev->procent && pci_proc_attach_device(ovrfl_pdev)) {
-                printk(KERN_ERR "MC: " __FILE__
-                       ": %s(): Failed to attach overflow device\n",
-                       __func__);
-                goto fail;
+                i82875p_printk(KERN_ERR,
+                        "%s(): Failed to attach overflow device\n", __func__);
+                return -ENODEV;
         }
-#endif                          /* CONFIG_PROC_FS */
+#endif
+                                /* CONFIG_PROC_FS */
         if (pci_enable_device(ovrfl_pdev)) {
-                printk(KERN_ERR "MC: " __FILE__
-                       ": %s(): Failed to enable overflow device\n",
-                       __func__);
-                goto fail;
+                i82875p_printk(KERN_ERR,
+                        "%s(): Failed to enable overflow device\n", __func__);
+                return -ENODEV;
         }
 
         if (pci_request_regions(ovrfl_pdev, pci_name(ovrfl_pdev))) {
 #ifdef CORRECT_BIOS
-                goto fail;
+                goto fail0;
 #endif
         }
+
         /* cache is irrelevant for PCI bus reads/writes */
         ovrfl_window = ioremap_nocache(pci_resource_start(ovrfl_pdev, 0),
-                                       pci_resource_len(ovrfl_pdev, 0));
+                                pci_resource_len(ovrfl_pdev, 0));
 
         if (!ovrfl_window) {
-                printk(KERN_ERR "MC: " __FILE__
-                       ": %s(): Failed to ioremap bar6\n", __func__);
-                goto fail;
+                i82875p_printk(KERN_ERR, "%s(): Failed to ioremap bar6\n",
+                        __func__);
+                goto fail1;
         }
 
         /* need to find out the number of channels */
         drc = readl(ovrfl_window + I82875P_DRC);
         drc_chan = ((drc >> 21) & 0x1);
         nr_chans = drc_chan + 1;
-        drc_ddim = (drc >> 18) & 0x1;
 
+        drc_ddim = (drc >> 18) & 0x1;
         mci = edac_mc_alloc(sizeof(*pvt), I82875P_NR_CSROWS(nr_chans),
-                                 nr_chans);
+                                nr_chans);
 
         if (!mci) {
                 rc = -ENOMEM;
-                goto fail;
+                goto fail2;
         }
 
-        debugf3("MC: " __FILE__ ": %s(): init mci\n", __func__);
-
+        debugf3("%s(): init mci\n", __func__);
         mci->pdev = pdev;
         mci->mtype_cap = MEM_FLAG_DDR;
-
         mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;
         mci->edac_cap = EDAC_FLAG_UNKNOWN;
         /* adjust FLAGS */
 
-        mci->mod_name = BS_MOD_STR;
+        mci->mod_name = EDAC_MOD_STR;
         mci->mod_ver = "$Revision: 1.5.2.11 $";
         mci->ctl_name = i82875p_devs[dev_idx].ctl_name;
         mci->edac_check = i82875p_check;
         mci->ctl_page_to_phys = NULL;
-
-        debugf3("MC: " __FILE__ ": %s(): init pvt\n", __func__);
-
+        debugf3("%s(): init pvt\n", __func__);
         pvt = (struct i82875p_pvt *) mci->pvt_info;
         pvt->ovrfl_pdev = ovrfl_pdev;
         pvt->ovrfl_window = ovrfl_window;
@@ -374,8 +366,9 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
 
                 value = readb(ovrfl_window + I82875P_DRB + index);
                 cumul_size = value << (I82875P_DRB_SHIFT - PAGE_SHIFT);
-                debugf3("MC: " __FILE__ ": %s(): (%d) cumul_size 0x%x\n",
-                        __func__, index, cumul_size);
+                debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index,
+                        cumul_size);
+
                 if (cumul_size == last_cumul_size)
                         continue;       /* not populated */
 
@@ -383,71 +376,72 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
                 csrow->last_page = cumul_size - 1;
                 csrow->nr_pages = cumul_size - last_cumul_size;
                 last_cumul_size = cumul_size;
-                csrow->grain = 1 << 12; /* I82875P_EAP has 4KiB reolution */
+                csrow->grain = 1 << 12;  /* I82875P_EAP has 4KiB reolution */
                 csrow->mtype = MEM_DDR;
                 csrow->dtype = DEV_UNKNOWN;
                 csrow->edac_mode = drc_ddim ? EDAC_SECDED : EDAC_NONE;
         }
 
-        /* clear counters */
-        pci_write_bits16(mci->pdev, I82875P_ERRSTS, 0x0081, 0x0081);
+        i82875p_get_error_info(mci, &discard);  /* clear counters */
 
         if (edac_mc_add_mc(mci)) {
-                debugf3("MC: " __FILE__
-                        ": %s(): failed edac_mc_add_mc()\n", __func__);
-                goto fail;
+                debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
+                goto fail3;
         }
 
         /* get this far and it's successful */
-        debugf3("MC: " __FILE__ ": %s(): success\n", __func__);
+        debugf3("%s(): success\n", __func__);
         return 0;
 
-      fail:
-        if (mci)
-                edac_mc_free(mci);
+fail3:
+        edac_mc_free(mci);
 
-        if (ovrfl_window)
-                iounmap(ovrfl_window);
+fail2:
+        iounmap(ovrfl_window);
 
-        if (ovrfl_pdev) {
-                pci_release_regions(ovrfl_pdev);
-                pci_disable_device(ovrfl_pdev);
-        }
+fail1:
+        pci_release_regions(ovrfl_pdev);
 
+#ifdef CORRECT_BIOS
+fail0:
+#endif
+        pci_disable_device(ovrfl_pdev);
         /* NOTE: the ovrfl proc entry and pci_dev are intentionally left */
         return rc;
 }
 
-
 /* returns count (>= 0), or negative on error */
 static int __devinit i82875p_init_one(struct pci_dev *pdev,
-                                      const struct pci_device_id *ent)
+                const struct pci_device_id *ent)
 {
         int rc;
 
-        debugf0("MC: " __FILE__ ": %s()\n", __func__);
+        debugf0("%s()\n", __func__);
+        i82875p_printk(KERN_INFO, "i82875p init one\n");
 
-        printk(KERN_INFO "i82875p init one\n");
-        if(pci_enable_device(pdev) < 0)
+        if (pci_enable_device(pdev) < 0)
                 return -EIO;
+
         rc = i82875p_probe1(pdev, ent->driver_data);
+
         if (mci_pdev == NULL)
                 mci_pdev = pci_dev_get(pdev);
+
         return rc;
 }
 
-
 static void __devexit i82875p_remove_one(struct pci_dev *pdev)
 {
         struct mem_ctl_info *mci;
         struct i82875p_pvt *pvt = NULL;
 
-        debugf0(__FILE__ ": %s()\n", __func__);
+        debugf0("%s()\n", __func__);
 
-        if ((mci = edac_mc_find_mci_by_pdev(pdev)) == NULL)
+        if ((mci = edac_mc_del_mc(pdev)) == NULL)
                 return;
 
         pvt = (struct i82875p_pvt *) mci->pvt_info;
+
         if (pvt->ovrfl_window)
                 iounmap(pvt->ovrfl_window);
 
@@ -459,74 +453,84 @@ static void __devexit i82875p_remove_one(struct pci_dev *pdev)
                 pci_dev_put(pvt->ovrfl_pdev);
         }
 
-        if (edac_mc_del_mc(mci))
-                return;
-
         edac_mc_free(mci);
 }
 
-
 static const struct pci_device_id i82875p_pci_tbl[] __devinitdata = {
-        {PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-         I82875P},
-        {0,}                    /* 0 terminated list. */
+        {
+                PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                I82875P
+        },
+        {
+                0,
+        }       /* 0 terminated list. */
 };
 
 MODULE_DEVICE_TABLE(pci, i82875p_pci_tbl);
 
-
 static struct pci_driver i82875p_driver = {
-        .name = BS_MOD_STR,
+        .name = EDAC_MOD_STR,
         .probe = i82875p_init_one,
         .remove = __devexit_p(i82875p_remove_one),
         .id_table = i82875p_pci_tbl,
 };
 
-
 static int __init i82875p_init(void)
 {
         int pci_rc;
 
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
+        debugf3("%s()\n", __func__);
         pci_rc = pci_register_driver(&i82875p_driver);
+
         if (pci_rc < 0)
-                return pci_rc;
+                goto fail0;
+
         if (mci_pdev == NULL) {
-                i82875p_registered = 0;
-                mci_pdev =
-                    pci_get_device(PCI_VENDOR_ID_INTEL,
-                                   PCI_DEVICE_ID_INTEL_82875_0, NULL);
+                mci_pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
+                                PCI_DEVICE_ID_INTEL_82875_0, NULL);
+
                 if (!mci_pdev) {
                         debugf0("875p pci_get_device fail\n");
-                        return -ENODEV;
+                        pci_rc = -ENODEV;
+                        goto fail1;
                 }
+
                 pci_rc = i82875p_init_one(mci_pdev, i82875p_pci_tbl);
+
                 if (pci_rc < 0) {
                         debugf0("875p init fail\n");
-                        pci_dev_put(mci_pdev);
-                        return -ENODEV;
+                        pci_rc = -ENODEV;
+                        goto fail1;
                 }
         }
+
         return 0;
-}
 
+fail1:
+        pci_unregister_driver(&i82875p_driver);
+
+fail0:
+        if (mci_pdev != NULL)
+                pci_dev_put(mci_pdev);
+
+        return pci_rc;
+}
 
 static void __exit i82875p_exit(void)
 {
-        debugf3("MC: " __FILE__ ": %s()\n", __func__);
+        debugf3("%s()\n", __func__);
 
         pci_unregister_driver(&i82875p_driver);
+
         if (!i82875p_registered) {
                 i82875p_remove_one(mci_pdev);
                 pci_dev_put(mci_pdev);
         }
 }
 
-
 module_init(i82875p_init);
 module_exit(i82875p_exit);
 
-
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Linux Networx (http://lnxi.com) Thayne Harbaugh");
 MODULE_DESCRIPTION("MC support for Intel 82875 memory hub controllers");
diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c
index e90892831b..2c29fafe67 100644
--- a/drivers/edac/r82600_edac.c
+++ b/drivers/edac/r82600_edac.c
@@ -18,14 +18,17 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
-
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
-
 #include <linux/slab.h>
-
 #include "edac_mc.h"
 
+#define r82600_printk(level, fmt, arg...) \
+        edac_printk(level, "r82600", fmt, ##arg)
+
+#define r82600_mc_printk(mci, level, fmt, arg...) \
+        edac_mc_chipset_printk(mci, level, "r82600", fmt, ##arg)
+
 /* Radisys say "The 82600 integrates a main memory SDRAM controller that
  * supports up to four banks of memory. The four banks can support a mix of
  * sizes of 64 bit wide (72 bits with ECC) Synchronous DRAM (SDRAM) DIMMs,
@@ -126,10 +129,8 @@ struct r82600_error_info {
         u32 eapr;
 };
 
-
 static unsigned int disable_hardware_scrub = 0;
 
-
 static void r82600_get_error_info (struct mem_ctl_info *mci,
                 struct r82600_error_info *info)
 {
@@ -138,17 +139,16 @@ static void r82600_get_error_info (struct mem_ctl_info *mci,
         if (info->eapr & BIT(0))
                 /* Clear error to allow next error to be reported [p.62] */
                 pci_write_bits32(mci->pdev, R82600_EAP,
-                                   ((u32) BIT(0) & (u32) BIT(1)),
-                                   ((u32) BIT(0) & (u32) BIT(1)));
+                                ((u32) BIT(0) & (u32) BIT(1)),
+                                ((u32) BIT(0) & (u32) BIT(1)));
 
         if (info->eapr & BIT(1))
                 /* Clear error to allow next error to be reported [p.62] */
                 pci_write_bits32(mci->pdev, R82600_EAP,
-                                   ((u32) BIT(0) & (u32) BIT(1)),
-                                   ((u32) BIT(0) & (u32) BIT(1)));
+                                ((u32) BIT(0) & (u32) BIT(1)),
+                                ((u32) BIT(0) & (u32) BIT(1)));
 }
 
-
 static int r82600_process_error_info (struct mem_ctl_info *mci,
                 struct r82600_error_info *info, int handle_errors)
 {
@@ -167,26 +167,25 @@ static int r82600_process_error_info (struct mem_ctl_info *mci,
          * granularity (upper 19 bits only)     */
         page = eapaddr >> PAGE_SHIFT;
 
-        if (info->eapr & BIT(0)) {      /* CE? */
+        if (info->eapr & BIT(0)) {  /* CE? */
                 error_found = 1;
 
                 if (handle_errors)
-                        edac_mc_handle_ce(
-                            mci, page, 0,       /* not avail */
-                            syndrome,
-                            edac_mc_find_csrow_by_page(mci, page),
-                            0,  /* channel */
-                            mci->ctl_name);
+                        edac_mc_handle_ce(mci, page, 0,  /* not avail */
+                                        syndrome,
+                                        edac_mc_find_csrow_by_page(mci, page),
+                                        0,  /* channel */
+                                        mci->ctl_name);
         }
 
-        if (info->eapr & BIT(1)) {      /* UE? */
+        if (info->eapr & BIT(1)) {  /* UE? */
                 error_found = 1;
 
                 if (handle_errors)
                         /* 82600 doesn't give enough info */
                         edac_mc_handle_ue(mci, page, 0,
-                            edac_mc_find_csrow_by_page(mci, page),
-                            mci->ctl_name);
+                                edac_mc_find_csrow_by_page(mci, page),
+                                mci->ctl_name);
         }
 
         return error_found;
@@ -196,7 +195,7 @@ static void r82600_check(struct mem_ctl_info *mci)
 {
         struct r82600_error_info info;
 
-        debugf1("MC%d: " __FILE__ ": %s()\n", mci->mc_idx, __func__);
+        debugf1("MC%d: %s()\n", mci->mc_idx, __func__);
         r82600_get_error_info(mci, &info);
         r82600_process_error_info(mci, &info, 1);
 }
@@ -213,25 +212,18 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
         u32 scrub_disabled;
         u32 sdram_refresh_rate;
         u32 row_high_limit_last = 0;
-        u32 eap_init_bits;
-
-        debugf0("MC: " __FILE__ ": %s()\n", __func__);
-
+        struct r82600_error_info discard;
 
+        debugf0("%s()\n", __func__);
         pci_read_config_byte(pdev, R82600_DRAMC, &dramcr);
         pci_read_config_dword(pdev, R82600_EAP, &eapr);
-
         ecc_on = dramcr & BIT(5);
         reg_sdram = dramcr & BIT(4);
         scrub_disabled = eapr & BIT(31);
         sdram_refresh_rate = dramcr & (BIT(0) | BIT(1));
-
-        debugf2("MC: " __FILE__ ": %s(): sdram refresh rate = %#0x\n",
-                __func__, sdram_refresh_rate);
-
-        debugf2("MC: " __FILE__ ": %s(): DRAMC register = %#0x\n", __func__,
-                dramcr);
-
+        debugf2("%s(): sdram refresh rate = %#0x\n", __func__,
+                sdram_refresh_rate);
+        debugf2("%s(): DRAMC register = %#0x\n", __func__, dramcr);
         mci = edac_mc_alloc(0, R82600_NR_CSROWS, R82600_NR_CHANS);
 
         if (mci == NULL) {
@@ -239,29 +231,28 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
                 goto fail;
         }
 
-        debugf0("MC: " __FILE__ ": %s(): mci = %p\n", __func__, mci);
-
+        debugf0("%s(): mci = %p\n", __func__, mci);
         mci->pdev = pdev;
         mci->mtype_cap = MEM_FLAG_RDDR | MEM_FLAG_DDR;
-
         mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
-        /* FIXME try to work out if the chip leads have been                 *
-         * used for COM2 instead on this board? [MA6?]       MAYBE:          */
+        /* FIXME try to work out if the chip leads have been used for COM2
+         * instead on this board? [MA6?] MAYBE:
+         */
 
         /* On the R82600, the pins for memory bits 72:65 - i.e. the   *
          * EC bits are shared with the pins for COM2 (!), so if COM2  *
          * is enabled, we assume COM2 is wired up, and thus no EDAC   *
          * is possible.                                               */
         mci->edac_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
+
         if (ecc_on) {
                 if (scrub_disabled)
-                        debugf3("MC: " __FILE__ ": %s(): mci = %p - "
-                                "Scrubbing disabled! EAP: %#0x\n", __func__,
-                                mci, eapr);
+                        debugf3("%s(): mci = %p - Scrubbing disabled! EAP: "
+                                "%#0x\n", __func__, mci, eapr);
         } else
                 mci->edac_cap = EDAC_FLAG_NONE;
 
-        mci->mod_name = BS_MOD_STR;
+        mci->mod_name = EDAC_MOD_STR;
         mci->mod_ver = "$Revision: 1.1.2.6 $";
         mci->ctl_name = "R82600";
         mci->edac_check = r82600_check;
@@ -276,23 +267,21 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
                 /* find the DRAM Chip Select Base address and mask */
                 pci_read_config_byte(mci->pdev, R82600_DRBA + index, &drbar);
 
-                debugf1("MC%d: " __FILE__ ": %s() Row=%d DRBA = %#0x\n",
-                        mci->mc_idx, __func__, index, drbar);
+                debugf1("MC%d: %s() Row=%d DRBA = %#0x\n", mci->mc_idx,
+                        __func__, index, drbar);
 
                 row_high_limit = ((u32) drbar << 24);
 /*              row_high_limit = ((u32)drbar << 24) | 0xffffffUL; */
 
-                debugf1("MC%d: " __FILE__ ": %s() Row=%d, "
-                        "Boundry Address=%#0x, Last = %#0x \n",
-                        mci->mc_idx, __func__, index, row_high_limit,
-                        row_high_limit_last);
+                debugf1("MC%d: %s() Row=%d, Boundry Address=%#0x, Last = "
+                        "%#0x \n", mci->mc_idx, __func__, index,
+                        row_high_limit, row_high_limit_last);
 
                 /* Empty row [p.57] */
                 if (row_high_limit == row_high_limit_last)
                         continue;
 
                 row_base = row_high_limit_last;
-
                 csrow->first_page = row_base >> PAGE_SHIFT;
                 csrow->last_page = (row_high_limit >> PAGE_SHIFT) - 1;
                 csrow->nr_pages = csrow->last_page - csrow->first_page + 1;
@@ -308,31 +297,22 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
                 row_high_limit_last = row_high_limit;
         }
 
-        /* clear counters */
-        /* FIXME should we? */
+        r82600_get_error_info(mci, &discard);  /* clear counters */
 
         if (edac_mc_add_mc(mci)) {
-                debugf3("MC: " __FILE__
-                        ": %s(): failed edac_mc_add_mc()\n", __func__);
+                debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
                 goto fail;
         }
 
         /* get this far and it's successful */
 
-        /* Clear error flags to allow next error to be reported [p.62] */
-        /* Test systems seem to always have the UE flag raised on boot */
-
-        eap_init_bits = BIT(0) & BIT(1);
         if (disable_hardware_scrub) {
-                eap_init_bits |= BIT(31);
-                debugf3("MC: " __FILE__ ": %s(): Disabling Hardware Scrub "
-                        "(scrub on error)\n", __func__);
+                debugf3("%s(): Disabling Hardware Scrub (scrub on error)\n",
+                        __func__);
+                pci_write_bits32(mci->pdev, R82600_EAP, BIT(31), BIT(31));
         }
 
-        pci_write_bits32(mci->pdev, R82600_EAP, eap_init_bits,
-                         eap_init_bits);
-
-        debugf3("MC: " __FILE__ ": %s(): success\n", __func__);
+        debugf3("%s(): success\n", __func__);
         return 0;
 
 fail:
@@ -344,62 +324,60 @@ fail:
 
 /* returns count (>= 0), or negative on error */
 static int __devinit r82600_init_one(struct pci_dev *pdev,
-                                     const struct pci_device_id *ent)
+                const struct pci_device_id *ent)
 {
-        debugf0("MC: " __FILE__ ": %s()\n", __func__);
+        debugf0("%s()\n", __func__);
 
         /* don't need to call pci_device_enable() */
         return r82600_probe1(pdev, ent->driver_data);
 }
 
-
 static void __devexit r82600_remove_one(struct pci_dev *pdev)
 {
         struct mem_ctl_info *mci;
 
-        debugf0(__FILE__ ": %s()\n", __func__);
+        debugf0("%s()\n", __func__);
 
-        if (((mci = edac_mc_find_mci_by_pdev(pdev)) != NULL) &&
-            !edac_mc_del_mc(mci))
-                edac_mc_free(mci);
-}
+        if ((mci = edac_mc_del_mc(pdev)) == NULL)
+                return;
 
+        edac_mc_free(mci);
+}
 
 static const struct pci_device_id r82600_pci_tbl[] __devinitdata = {
-        {PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID)},
-        {0,}                    /* 0 terminated list. */
+        {
+                PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID)
+        },
+        {
+                0,
+        }       /* 0 terminated list. */
 };
 
 MODULE_DEVICE_TABLE(pci, r82600_pci_tbl);
 
-
 static struct pci_driver r82600_driver = {
-        .name = BS_MOD_STR,
+        .name = EDAC_MOD_STR,
         .probe = r82600_init_one,
         .remove = __devexit_p(r82600_remove_one),
         .id_table = r82600_pci_tbl,
 };
 
-
 static int __init r82600_init(void)
 {
         return pci_register_driver(&r82600_driver);
 }
 
-
 static void __exit r82600_exit(void)
 {
         pci_unregister_driver(&r82600_driver);
 }
 
-
 module_init(r82600_init);
 module_exit(r82600_exit);
 
-
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Tim Small <tim@buttersideup.com> - WPAD Ltd. "
-              "on behalf of EADS Astrium");
+        "on behalf of EADS Astrium");
 MODULE_DESCRIPTION("MC support for Radisys 82600 memory controllers");
 
 module_param(disable_hardware_scrub, bool, 0644);
diff --git a/drivers/eisa/.gitignore b/drivers/eisa/.gitignore
new file mode 100644
index 0000000000..4b335c0aed
--- /dev/null
+++ b/drivers/eisa/.gitignore
@@ -0,0 +1 @@
+devlist.h
diff --git a/drivers/eisa/eisa-bus.c b/drivers/eisa/eisa-bus.c
index 4196137e66..6078e2f588 100644
--- a/drivers/eisa/eisa-bus.c
+++ b/drivers/eisa/eisa-bus.c
@@ -135,13 +135,8 @@ struct bus_type eisa_bus_type = {
 
 int eisa_driver_register (struct eisa_driver *edrv)
 {
-        int r;
-        
         edrv->driver.bus = &eisa_bus_type;
-        if ((r = driver_register (&edrv->driver)) < 0)
-                return r;
-
-        return 0;
+        return driver_register (&edrv->driver);
 }
 
 void eisa_driver_unregister (struct eisa_driver *edrv)
diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c
index d6543fc4a9..339f405ff7 100644
--- a/drivers/firmware/dcdbas.c
+++ b/drivers/firmware/dcdbas.c
@@ -484,26 +484,15 @@ static void dcdbas_host_control(void)
 static int dcdbas_reboot_notify(struct notifier_block *nb, unsigned long code,
                                 void *unused)
 {
-        static unsigned int notify_cnt = 0;
-
         switch (code) {
         case SYS_DOWN:
         case SYS_HALT:
         case SYS_POWER_OFF:
                 if (host_control_on_shutdown) {
                         /* firmware is going to perform host control action */
-                        if (++notify_cnt == 2) {
-                                printk(KERN_WARNING
-                                       "Please wait for shutdown "
-                                       "action to complete...\n");
-                                dcdbas_host_control();
-                        }
-                        /*
-                         * register again and initiate the host control
-                         * action on the second notification to allow
-                         * everyone that registered to be notified
-                         */
-                        register_reboot_notifier(nb);
+                        printk(KERN_WARNING "Please wait for shutdown "
+                               "action to complete...\n");
+                        dcdbas_host_control();
                 }
                 break;
         }
@@ -514,7 +503,7 @@ static int dcdbas_reboot_notify(struct notifier_block *nb, unsigned long code,
 static struct notifier_block dcdbas_reboot_nb = {
         .notifier_call = dcdbas_reboot_notify,
         .next = NULL,
-        .priority = 0
+        .priority = INT_MIN
 };
 
 static DCDBAS_BIN_ATTR_RW(smi_data);
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index 343379f23a..9b7e4d52ff 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -568,20 +568,20 @@ systab_read(struct subsystem *entry, char *buf)
         if (!entry || !buf)
                 return -EINVAL;
 
-        if (efi.mps)
-                str += sprintf(str, "MPS=0x%lx\n", __pa(efi.mps));
-        if (efi.acpi20)
-                str += sprintf(str, "ACPI20=0x%lx\n", __pa(efi.acpi20));
-        if (efi.acpi)
-                str += sprintf(str, "ACPI=0x%lx\n", __pa(efi.acpi));
-        if (efi.smbios)
-                str += sprintf(str, "SMBIOS=0x%lx\n", __pa(efi.smbios));
-        if (efi.hcdp)
-                str += sprintf(str, "HCDP=0x%lx\n", __pa(efi.hcdp));
-        if (efi.boot_info)
-                str += sprintf(str, "BOOTINFO=0x%lx\n", __pa(efi.boot_info));
-        if (efi.uga)
-                str += sprintf(str, "UGA=0x%lx\n", __pa(efi.uga));
+        if (efi.mps != EFI_INVALID_TABLE_ADDR)
+                str += sprintf(str, "MPS=0x%lx\n", efi.mps);
+        if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
+                str += sprintf(str, "ACPI20=0x%lx\n", efi.acpi20);
+        if (efi.acpi != EFI_INVALID_TABLE_ADDR)
+                str += sprintf(str, "ACPI=0x%lx\n", efi.acpi);
+        if (efi.smbios != EFI_INVALID_TABLE_ADDR)
+                str += sprintf(str, "SMBIOS=0x%lx\n", efi.smbios);
+        if (efi.hcdp != EFI_INVALID_TABLE_ADDR)
+                str += sprintf(str, "HCDP=0x%lx\n", efi.hcdp);
+        if (efi.boot_info != EFI_INVALID_TABLE_ADDR)
+                str += sprintf(str, "BOOTINFO=0x%lx\n", efi.boot_info);
+        if (efi.uga != EFI_INVALID_TABLE_ADDR)
+                str += sprintf(str, "UGA=0x%lx\n", efi.uga);
 
         return str - buf;
 }
diff --git a/drivers/firmware/pcdp.c b/drivers/firmware/pcdp.c
index ae1fb45dbb..c37baf9448 100644
--- a/drivers/firmware/pcdp.c
+++ b/drivers/firmware/pcdp.c
@@ -89,19 +89,20 @@ efi_setup_pcdp_console(char *cmdline)
         struct pcdp_uart *uart;
         struct pcdp_device *dev, *end;
         int i, serial = 0;
+        int rc = -ENODEV;
 
-        pcdp = efi.hcdp;
-        if (!pcdp)
+        if (efi.hcdp == EFI_INVALID_TABLE_ADDR)
                 return -ENODEV;
 
-        printk(KERN_INFO "PCDP: v%d at 0x%lx\n", pcdp->rev, __pa(pcdp));
+        pcdp = ioremap(efi.hcdp, 4096);
+        printk(KERN_INFO "PCDP: v%d at 0x%lx\n", pcdp->rev, efi.hcdp);
 
         if (strstr(cmdline, "console=hcdp")) {
                 if (pcdp->rev < 3)
                         serial = 1;
         } else if (strstr(cmdline, "console=")) {
                 printk(KERN_INFO "Explicit \"console=\"; ignoring PCDP\n");
-                return -ENODEV;
+                goto out;
         }
 
         if (pcdp->rev < 3 && efi_uart_console_only())
@@ -110,7 +111,8 @@ efi_setup_pcdp_console(char *cmdline)
         for (i = 0, uart = pcdp->uart; i < pcdp->num_uarts; i++, uart++) {
                 if (uart->flags & PCDP_UART_PRIMARY_CONSOLE || serial) {
                         if (uart->type == PCDP_CONSOLE_UART) {
-                                return setup_serial_console(uart);
+                                rc = setup_serial_console(uart);
+                                goto out;
                         }
                 }
         }
@@ -121,10 +123,13 @@ efi_setup_pcdp_console(char *cmdline)
              dev = (struct pcdp_device *) ((u8 *) dev + dev->length)) {
                 if (dev->flags & PCDP_PRIMARY_CONSOLE) {
                         if (dev->type == PCDP_CONSOLE_VGA) {
-                                return setup_vga_console(dev);
+                                rc = setup_vga_console(dev);
+                                goto out;
                         }
                 }
         }
 
-        return -ENODEV;
+out:
+        iounmap(pcdp);
+        return rc;
 }
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index f9fae28f56..7aa5c38f08 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -65,15 +65,6 @@ config SENSORS_PCF8591
           This driver can also be built as a module.  If so, the module
           will be called pcf8591.
 
-config SENSORS_RTC8564
-        tristate "Epson 8564 RTC chip"
-        depends on I2C && EXPERIMENTAL
-        help
-          If you say yes here you get support for the Epson 8564 RTC chip.
-
-          This driver can also be built as a module.  If so, the module
-          will be called i2c-rtc8564.
-
 config ISP1301_OMAP
         tristate "Philips ISP1301 with OMAP OTG"
         depends on I2C && ARCH_OMAP_OTG
@@ -126,13 +117,4 @@ config SENSORS_MAX6875
           This driver can also be built as a module.  If so, the module
           will be called max6875.
 
-config RTC_X1205_I2C
-        tristate "Xicor X1205 RTC chip"
-        depends on I2C && EXPERIMENTAL
-        help
-          If you say yes here you get support for the Xicor X1205 RTC chip.
-
-          This driver can also be built as a module. If so, the module
-          will be called x1205.
-
 endmenu
diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index 46178b57b1..779868ef2e 100644
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -10,10 +10,8 @@ obj-$(CONFIG_SENSORS_M41T00)	+= m41t00.o
 obj-$(CONFIG_SENSORS_PCA9539)   += pca9539.o
 obj-$(CONFIG_SENSORS_PCF8574)   += pcf8574.o
 obj-$(CONFIG_SENSORS_PCF8591)   += pcf8591.o
-obj-$(CONFIG_SENSORS_RTC8564)   += rtc8564.o
 obj-$(CONFIG_ISP1301_OMAP)      += isp1301_omap.o
 obj-$(CONFIG_TPS65010)          += tps65010.o
-obj-$(CONFIG_RTC_X1205_I2C)     += x1205.o
 
 ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
 EXTRA_CFLAGS += -DDEBUG
diff --git a/drivers/i2c/chips/rtc8564.c b/drivers/i2c/chips/rtc8564.c
deleted file mode 100644
index 0d8699b3f4..0000000000
--- a/drivers/i2c/chips/rtc8564.c
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- *  linux/drivers/i2c/chips/rtc8564.c
- *
- *  Copyright (C) 2002-2004 Stefan Eletzhofer
- *
- *      based on linux/drivers/acron/char/pcf8583.c
- *  Copyright (C) 2000 Russell King
- *
- * 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.
- *
- * Driver for system3's EPSON RTC 8564 chip
- */
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/bcd.h>
-#include <linux/i2c.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/rtc.h>          /* get the user-level API */
-#include <linux/init.h>
-
-#include "rtc8564.h"
-
-#ifdef DEBUG
-# define _DBG(x, fmt, args...) do{ if (debug>=x) printk(KERN_DEBUG"%s: " fmt "\n", __FUNCTION__, ##args); } while(0);
-#else
-# define _DBG(x, fmt, args...) do { } while(0);
-#endif
-
-#define _DBGRTCTM(x, rtctm) if (debug>=x) printk("%s: secs=%d, mins=%d, hours=%d, mday=%d, " \
-                        "mon=%d, year=%d, wday=%d VL=%d\n", __FUNCTION__, \
-                        (rtctm).secs, (rtctm).mins, (rtctm).hours, (rtctm).mday, \
-                        (rtctm).mon, (rtctm).year, (rtctm).wday, (rtctm).vl);
-
-struct rtc8564_data {
-        struct i2c_client client;
-        u16 ctrl;
-};
-
-static inline u8 _rtc8564_ctrl1(struct i2c_client *client)
-{
-        struct rtc8564_data *data = i2c_get_clientdata(client);
-        return data->ctrl & 0xff;
-}
-static inline u8 _rtc8564_ctrl2(struct i2c_client *client)
-{
-        struct rtc8564_data *data = i2c_get_clientdata(client);
-        return (data->ctrl & 0xff00) >> 8;
-}
-
-#define CTRL1(c) _rtc8564_ctrl1(c)
-#define CTRL2(c) _rtc8564_ctrl2(c)
-
-static int debug;
-module_param(debug, int, S_IRUGO | S_IWUSR);
-
-static struct i2c_driver rtc8564_driver;
-
-static unsigned short ignore[] = { I2C_CLIENT_END };
-static unsigned short normal_addr[] = { 0x51, I2C_CLIENT_END };
-
-static struct i2c_client_address_data addr_data = {
-        .normal_i2c             = normal_addr,
-        .probe                  = ignore,
-        .ignore                 = ignore,
-};
-
-static int rtc8564_read_mem(struct i2c_client *client, struct mem *mem);
-static int rtc8564_write_mem(struct i2c_client *client, struct mem *mem);
-
-static int rtc8564_read(struct i2c_client *client, unsigned char adr,
-                        unsigned char *buf, unsigned char len)
-{
-        int ret = -EIO;
-        unsigned char addr[1] = { adr };
-        struct i2c_msg msgs[2] = {
-                {client->addr, 0, 1, addr},
-                {client->addr, I2C_M_RD, len, buf}
-        };
-
-        _DBG(1, "client=%p, adr=%d, buf=%p, len=%d", client, adr, buf, len);
-
-        if (!buf) {
-                ret = -EINVAL;
-                goto done;
-        }
-
-        ret = i2c_transfer(client->adapter, msgs, 2);
-        if (ret == 2) {
-                ret = 0;
-        }
-
-done:
-        return ret;
-}
-
-static int rtc8564_write(struct i2c_client *client, unsigned char adr,
-                         unsigned char *data, unsigned char len)
-{
-        int ret = 0;
-        unsigned char _data[16];
-        struct i2c_msg wr;
-        int i;
-
-        if (!data || len > 15) {
-                ret = -EINVAL;
-                goto done;
-        }
-
-        _DBG(1, "client=%p, adr=%d, buf=%p, len=%d", client, adr, data, len);
-
-        _data[0] = adr;
-        for (i = 0; i < len; i++) {
-                _data[i + 1] = data[i];
-                _DBG(5, "data[%d] = 0x%02x (%d)", i, data[i], data[i]);
-        }
-
-        wr.addr = client->addr;
-        wr.flags = 0;
-        wr.len = len + 1;
-        wr.buf = _data;
-
-        ret = i2c_transfer(client->adapter, &wr, 1);
-        if (ret == 1) {
-                ret = 0;
-        }
-
-done:
-        return ret;
-}
-
-static int rtc8564_attach(struct i2c_adapter *adap, int addr, int kind)
-{
-        int ret;
-        struct i2c_client *new_client;
-        struct rtc8564_data *d;
-        unsigned char data[10];
-        unsigned char ad[1] = { 0 };
-        struct i2c_msg ctrl_wr[1] = {
-                {addr, 0, 2, data}
-        };
-        struct i2c_msg ctrl_rd[2] = {
-                {addr, 0, 1, ad},
-                {addr, I2C_M_RD, 2, data}
-        };
-
-        d = kzalloc(sizeof(struct rtc8564_data), GFP_KERNEL);
-        if (!d) {
-                ret = -ENOMEM;
-                goto done;
-        }
-        new_client = &d->client;
-
-        strlcpy(new_client->name, "RTC8564", I2C_NAME_SIZE);
-        i2c_set_clientdata(new_client, d);
-        new_client->addr = addr;
-        new_client->adapter = adap;
-        new_client->driver = &rtc8564_driver;
-
-        _DBG(1, "client=%p", new_client);
-
-        /* init ctrl1 reg */
-        data[0] = 0;
-        data[1] = 0;
-        ret = i2c_transfer(new_client->adapter, ctrl_wr, 1);
-        if (ret != 1) {
-                printk(KERN_INFO "rtc8564: cant init ctrl1\n");
-                ret = -ENODEV;
-                goto done;
-        }
-
-        /* read back ctrl1 and ctrl2 */
-        ret = i2c_transfer(new_client->adapter, ctrl_rd, 2);
-        if (ret != 2) {
-                printk(KERN_INFO "rtc8564: cant read ctrl\n");
-                ret = -ENODEV;
-                goto done;
-        }
-
-        d->ctrl = data[0] | (data[1] << 8);
-
-        _DBG(1, "RTC8564_REG_CTRL1=%02x, RTC8564_REG_CTRL2=%02x",
-             data[0], data[1]);
-
-        ret = i2c_attach_client(new_client);
-done:
-        if (ret) {
-                kfree(d);
-        }
-        return ret;
-}
-
-static int rtc8564_probe(struct i2c_adapter *adap)
-{
-        return i2c_probe(adap, &addr_data, rtc8564_attach);
-}
-
-static int rtc8564_detach(struct i2c_client *client)
-{
-        i2c_detach_client(client);
-        kfree(i2c_get_clientdata(client));
-        return 0;
-}
-
-static int rtc8564_get_datetime(struct i2c_client *client, struct rtc_tm *dt)
-{
-        int ret = -EIO;
-        unsigned char buf[15];
-
-        _DBG(1, "client=%p, dt=%p", client, dt);
-
-        if (!dt)
-                return -EINVAL;
-
-        memset(buf, 0, sizeof(buf));
-
-        ret = rtc8564_read(client, 0, buf, 15);
-        if (ret)
-                return ret;
-
-        /* century stored in minute alarm reg */
-        dt->year = BCD2BIN(buf[RTC8564_REG_YEAR]);
-        dt->year += 100 * BCD2BIN(buf[RTC8564_REG_AL_MIN] & 0x3f);
-        dt->mday = BCD2BIN(buf[RTC8564_REG_DAY] & 0x3f);
-        dt->wday = BCD2BIN(buf[RTC8564_REG_WDAY] & 7);
-        dt->mon = BCD2BIN(buf[RTC8564_REG_MON_CENT] & 0x1f);
-
-        dt->secs = BCD2BIN(buf[RTC8564_REG_SEC] & 0x7f);
-        dt->vl = (buf[RTC8564_REG_SEC] & 0x80) == 0x80;
-        dt->mins = BCD2BIN(buf[RTC8564_REG_MIN] & 0x7f);
-        dt->hours = BCD2BIN(buf[RTC8564_REG_HR] & 0x3f);
-
-        _DBGRTCTM(2, *dt);
-
-        return 0;
-}
-
-static int
-rtc8564_set_datetime(struct i2c_client *client, struct rtc_tm *dt, int datetoo)
-{
-        int ret, len = 5;
-        unsigned char buf[15];
-
-        _DBG(1, "client=%p, dt=%p", client, dt);
-
-        if (!dt)
-                return -EINVAL;
-
-        _DBGRTCTM(2, *dt);
-
-        buf[RTC8564_REG_CTRL1] = CTRL1(client) | RTC8564_CTRL1_STOP;
-        buf[RTC8564_REG_CTRL2] = CTRL2(client);
-        buf[RTC8564_REG_SEC] = BIN2BCD(dt->secs);
-        buf[RTC8564_REG_MIN] = BIN2BCD(dt->mins);
-        buf[RTC8564_REG_HR] = BIN2BCD(dt->hours);
-
-        if (datetoo) {
-                len += 5;
-                buf[RTC8564_REG_DAY] = BIN2BCD(dt->mday);
-                buf[RTC8564_REG_WDAY] = BIN2BCD(dt->wday);
-                buf[RTC8564_REG_MON_CENT] = BIN2BCD(dt->mon) & 0x1f;
-                /* century stored in minute alarm reg */
-                buf[RTC8564_REG_YEAR] = BIN2BCD(dt->year % 100);
-                buf[RTC8564_REG_AL_MIN] = BIN2BCD(dt->year / 100);
-        }
-
-        ret = rtc8564_write(client, 0, buf, len);
-        if (ret) {
-                _DBG(1, "error writing data! %d", ret);
-        }
-
-        buf[RTC8564_REG_CTRL1] = CTRL1(client);
-        ret = rtc8564_write(client, 0, buf, 1);
-        if (ret) {
-                _DBG(1, "error writing data! %d", ret);
-        }
-
-        return ret;
-}
-
-static int rtc8564_get_ctrl(struct i2c_client *client, unsigned int *ctrl)
-{
-        struct rtc8564_data *data = i2c_get_clientdata(client);
-
-        if (!ctrl)
-                return -1;
-
-        *ctrl = data->ctrl;
-        return 0;
-}
-
-static int rtc8564_set_ctrl(struct i2c_client *client, unsigned int *ctrl)
-{
-        struct rtc8564_data *data = i2c_get_clientdata(client);
-        unsigned char buf[2];
-
-        if (!ctrl)
-                return -1;
-
-        buf[0] = *ctrl & 0xff;
-        buf[1] = (*ctrl & 0xff00) >> 8;
-        data->ctrl = *ctrl;
-
-        return rtc8564_write(client, 0, buf, 2);
-}
-
-static int rtc8564_read_mem(struct i2c_client *client, struct mem *mem)
-{
-
-        if (!mem)
-                return -EINVAL;
-
-        return rtc8564_read(client, mem->loc, mem->data, mem->nr);
-}
-
-static int rtc8564_write_mem(struct i2c_client *client, struct mem *mem)
-{
-
-        if (!mem)
-                return -EINVAL;
-
-        return rtc8564_write(client, mem->loc, mem->data, mem->nr);
-}
-
-static int
-rtc8564_command(struct i2c_client *client, unsigned int cmd, void *arg)
-{
-
-        _DBG(1, "cmd=%d", cmd);
-
-        switch (cmd) {
-        case RTC_GETDATETIME:
-                return rtc8564_get_datetime(client, arg);
-
-        case RTC_SETTIME:
-                return rtc8564_set_datetime(client, arg, 0);
-
-        case RTC_SETDATETIME:
-                return rtc8564_set_datetime(client, arg, 1);
-
-        case RTC_GETCTRL:
-                return rtc8564_get_ctrl(client, arg);
-
-        case RTC_SETCTRL:
-                return rtc8564_set_ctrl(client, arg);
-
-        case MEM_READ:
-                return rtc8564_read_mem(client, arg);
-
-        case MEM_WRITE:
-                return rtc8564_write_mem(client, arg);
-
-        default:
-                return -EINVAL;
-        }
-}
-
-static struct i2c_driver rtc8564_driver = {
-        .driver = {
-                .name   = "RTC8564",
-        },
-        .id             = I2C_DRIVERID_RTC8564,
-        .attach_adapter = rtc8564_probe,
-        .detach_client  = rtc8564_detach,
-        .command        = rtc8564_command
-};
-
-static __init int rtc8564_init(void)
-{
-        return i2c_add_driver(&rtc8564_driver);
-}
-
-static __exit void rtc8564_exit(void)
-{
-        i2c_del_driver(&rtc8564_driver);
-}
-
-MODULE_AUTHOR("Stefan Eletzhofer <Stefan.Eletzhofer@eletztrick.de>");
-MODULE_DESCRIPTION("EPSON RTC8564 Driver");
-MODULE_LICENSE("GPL");
-
-module_init(rtc8564_init);
-module_exit(rtc8564_exit);
diff --git a/drivers/i2c/chips/rtc8564.h b/drivers/i2c/chips/rtc8564.h
deleted file mode 100644
index e5342d10b8..0000000000
--- a/drivers/i2c/chips/rtc8564.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  linux/drivers/i2c/chips/rtc8564.h
- *
- *  Copyright (C) 2002-2004 Stefan Eletzhofer
- *
- *      based on linux/drivers/acron/char/pcf8583.h
- *  Copyright (C) 2000 Russell King
- *
- * 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.
- */
-struct rtc_tm {
-        unsigned char   secs;
-        unsigned char   mins;
-        unsigned char   hours;
-        unsigned char   mday;
-        unsigned char   mon;
-        unsigned short  year; /* xxxx 4 digits :) */
-        unsigned char   wday;
-        unsigned char   vl;
-};
-
-struct mem {
-        unsigned int    loc;
-        unsigned int    nr;
-        unsigned char   *data;
-};
-
-#define RTC_GETDATETIME 0
-#define RTC_SETTIME     1
-#define RTC_SETDATETIME 2
-#define RTC_GETCTRL     3
-#define RTC_SETCTRL     4
-#define MEM_READ        5
-#define MEM_WRITE       6
-
-#define RTC8564_REG_CTRL1               0x0 /* T  0 S 0 | T 0 0 0 */
-#define RTC8564_REG_CTRL2               0x1 /* 0  0 0 TI/TP | AF TF AIE TIE */
-#define RTC8564_REG_SEC                 0x2 /* VL 4 2 1 | 8 4 2 1 */
-#define RTC8564_REG_MIN                 0x3 /* x  4 2 1 | 8 4 2 1 */
-#define RTC8564_REG_HR                  0x4 /* x  x 2 1 | 8 4 2 1 */
-#define RTC8564_REG_DAY                 0x5 /* x  x 2 1 | 8 4 2 1 */
-#define RTC8564_REG_WDAY                0x6 /* x  x x x | x 4 2 1 */
-#define RTC8564_REG_MON_CENT    0x7 /* C  x x 1 | 8 4 2 1 */
-#define RTC8564_REG_YEAR                0x8 /* 8  4 2 1 | 8 4 2 1 */
-#define RTC8564_REG_AL_MIN              0x9 /* AE 4 2 1 | 8 4 2 1 */
-#define RTC8564_REG_AL_HR               0xa /* AE 4 2 1 | 8 4 2 1 */
-#define RTC8564_REG_AL_DAY              0xb /* AE x 2 1 | 8 4 2 1 */
-#define RTC8564_REG_AL_WDAY             0xc /* AE x x x | x 4 2 1 */
-#define RTC8564_REG_CLKOUT              0xd /* FE x x x | x x FD1 FD0 */
-#define RTC8564_REG_TCTL                0xe /* TE x x x | x x FD1 FD0 */
-#define RTC8564_REG_TIMER               0xf /* 8 bit binary */
-
-/* Control reg */
-#define RTC8564_CTRL1_TEST1             (1<<3)
-#define RTC8564_CTRL1_STOP              (1<<5)
-#define RTC8564_CTRL1_TEST2             (1<<7)
-
-#define RTC8564_CTRL2_TIE               (1<<0)
-#define RTC8564_CTRL2_AIE               (1<<1)
-#define RTC8564_CTRL2_TF                (1<<2)
-#define RTC8564_CTRL2_AF                (1<<3)
-#define RTC8564_CTRL2_TI_TP             (1<<4)
-
-/* CLKOUT frequencies */
-#define RTC8564_FD_32768HZ              (0x0)
-#define RTC8564_FD_1024HZ               (0x1)
-#define RTC8564_FD_32                   (0x2)
-#define RTC8564_FD_1HZ                  (0x3)
-
-/* Timer CTRL */
-#define RTC8564_TD_4096HZ               (0x0)
-#define RTC8564_TD_64HZ                 (0x1)
-#define RTC8564_TD_1HZ                  (0x2)
-#define RTC8564_TD_1_60HZ               (0x3)
-
-#define I2C_DRIVERID_RTC8564 0xf000
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index c7671e1880..b4a41d6d07 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -2143,6 +2143,7 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,
         req.cmd[0] = GPCMD_READ_CDVD_CAPACITY;
         req.data = (char *)&capbuf;
         req.data_len = sizeof(capbuf);
+        req.flags |= REQ_QUIET;
 
         stat = cdrom_queue_packet_command(drive, &req);
         if (stat == 0) {
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index ebc59064b4..f04791a58d 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -433,6 +433,7 @@
 #include <linux/timer.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
+#include <linux/jiffies.h>
 #include <linux/major.h>
 #include <linux/devfs_fs_kernel.h>
 #include <linux/errno.h>
@@ -2336,7 +2337,7 @@ static ide_startstop_t idetape_rw_callback (ide_drive_t *drive)
         }
         if (time_after(jiffies, tape->insert_time))
                 tape->insert_speed = tape->insert_size / 1024 * HZ / (jiffies - tape->insert_time);
-        if (jiffies - tape->avg_time >= HZ) {
+        if (time_after_eq(jiffies, tape->avg_time + HZ)) {
                 tape->avg_speed = tape->avg_size * HZ / (jiffies - tape->avg_time) / 1024;
                 tape->avg_size = 0;
                 tape->avg_time = jiffies;
@@ -2497,7 +2498,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
                         } else {
                                 return ide_do_reset(drive);
                         }
-                } else if (jiffies - tape->dsc_polling_start > IDETAPE_DSC_MA_THRESHOLD)
+                } else if (time_after(jiffies, tape->dsc_polling_start + IDETAPE_DSC_MA_THRESHOLD))
                         tape->dsc_polling_frequency = IDETAPE_DSC_MA_SLOW;
                 idetape_postpone_request(drive);
                 return ide_stopped;
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index b2cc43702f..3fdab563fe 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -2058,7 +2058,7 @@ static void __init parse_options (char *line)
         }
 }
 
-int init_module (void)
+int __init init_module (void)
 {
         parse_options(options);
         return ide_init();
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 21965e5ef2..b22ee54623 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -347,10 +347,8 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev, const ch
                         break;
 
                 case AMD_UDMA_66:
-                        pci_read_config_dword(dev, AMD_UDMA_TIMING, &u);
-                        for (i = 24; i >= 0; i -= 8)
-                                if ((u >> i) & 4)
-                                        amd_80w |= (1 << (1 - (i >> 4)));
+                        /* no host side cable detection */
+                        amd_80w = 0x03;
                         break;
         }
 
@@ -386,8 +384,6 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev, const ch
         if (amd_clock < 20000 || amd_clock > 50000) {
                 printk(KERN_WARNING "%s: User given PCI clock speed impossible (%d), using 33 MHz instead.\n",
                         amd_chipset->name, amd_clock);
-                printk(KERN_WARNING "%s: Use ide0=ata66 if you want to assume 80-wire cable\n",
-                        amd_chipset->name);
                 amd_clock = 33333;
         }
 
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index 6e3ab0c38c..f82e821097 100644
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -41,14 +41,15 @@
 
 static int ide_generic_all;             /* Set to claim all devices */
 
+#ifndef MODULE
 static int __init ide_generic_all_on(char *unused)
 {
         ide_generic_all = 1;
         printk(KERN_INFO "IDE generic will claim all unknown PCI IDE storage controllers.\n");
         return 1;
 }
-
 __setup("all-generic-ide", ide_generic_all_on);
+#endif
 
 static void __devinit init_hwif_generic (ide_hwif_t *hwif)
 {
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index 75a2253a3e..8e9d87701c 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -112,6 +112,7 @@ static const struct {
 
         { "SiS5596",    PCI_DEVICE_ID_SI_5596,  ATA_16   },
         { "SiS5571",    PCI_DEVICE_ID_SI_5571,  ATA_16   },
+        { "SiS5517",    PCI_DEVICE_ID_SI_5517,  ATA_16   },
         { "SiS551x",    PCI_DEVICE_ID_SI_5511,  ATA_16   },
 };
 
@@ -524,6 +525,7 @@ static void config_art_rwp_pio (ide_drive_t *drive, u8 pio)
                         case 3:         test1 = 0x30|0x03; break;
                         case 2:         test1 = 0x40|0x04; break;
                         case 1:         test1 = 0x60|0x07; break;
+                        case 0:         test1 = 0x00; break;
                         default:        break;
                 }
                 pci_write_config_byte(dev, drive_pci, test1);
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index c85b87cb59..3e677c4f8c 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -440,7 +440,7 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
 
 
 #if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32)
-        if(_machine == _MACH_chrp && _chrp_type == _CHRP_Pegasos) {
+        if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
                 hwif->irq = hwif->channel ? 15 : 14;
         }
 #endif
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 5013b1285e..78e30f8036 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1677,7 +1677,7 @@ MODULE_DEVICE_TABLE(pci, pmac_ide_pci_match);
 void __init
 pmac_ide_probe(void)
 {
-        if (_machine != _MACH_Pmac)
+        if (!machine_is(powermac))
                 return;
 
 #ifdef CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index efeaa944bd..85c2d4ca0d 100644
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -73,7 +73,7 @@
   - fix all XXX showstoppers
   - disable IR/IT DMA interrupts on shutdown
   - flush pci writes to the card by issuing a read
-  - devfs and character device dispatching (* needs testing with Linux 2.2.x)
+  - character device dispatching
   - switch over to the new kernel DMA API (pci_map_*()) (* needs testing on platforms with IOMMU!)
   - keep all video_cards in a list (for open() via chardev), set file->private_data = video
   - dv1394_poll should indicate POLLIN when receiving buffers are available
@@ -1096,7 +1096,6 @@ static int do_dv1394_init_default(struct video_card *video)
 
         init.api_version = DV1394_API_VERSION;
         init.n_frames = DV1394_MAX_FRAMES / 4;
-        /* the following are now set via devfs */
         init.channel = video->channel;
         init.format = video->pal_or_ntsc;
         init.cip_n = video->cip_n;
@@ -1791,8 +1790,6 @@ static int dv1394_open(struct inode *inode, struct file *file)
 {
         struct video_card *video = NULL;
 
-        /* if the device was opened through devfs, then file->private_data
-           has already been set to video by devfs */
         if (file->private_data) {
                 video = (struct video_card*) file->private_data;
 
@@ -2211,7 +2208,7 @@ static int dv1394_init(struct ti_ohci *ohci, enum pal_or_ntsc format, enum modes
         video = kzalloc(sizeof(*video), GFP_KERNEL);
         if (!video) {
                 printk(KERN_ERR "dv1394: cannot allocate video_card\n");
-                goto err;
+                return -1;
         }
 
         video->ohci = ohci;
@@ -2266,37 +2263,14 @@ static int dv1394_init(struct ti_ohci *ohci, enum pal_or_ntsc format, enum modes
         list_add_tail(&video->list, &dv1394_cards);
         spin_unlock_irqrestore(&dv1394_cards_lock, flags);
 
-        if (devfs_mk_cdev(MKDEV(IEEE1394_MAJOR,
-                                IEEE1394_MINOR_BLOCK_DV1394*16 + video->id),
-                        S_IFCHR|S_IRUGO|S_IWUGO,
-                         "ieee1394/dv/host%d/%s/%s",
-                         (video->id>>2),
-                         (video->pal_or_ntsc == DV1394_NTSC ? "NTSC" : "PAL"),
-                         (video->mode == MODE_RECEIVE ? "in" : "out")) < 0)
-                        goto err_free;
-
         debug_printk("dv1394: dv1394_init() OK on ID %d\n", video->id);
-
         return 0;
-
- err_free:
-        kfree(video);
- err:
-        return -1;
 }
 
 static void dv1394_un_init(struct video_card *video)
 {
-        char buf[32];
-
         /* obviously nobody has the driver open at this point */
         do_dv1394_shutdown(video, 1);
-        snprintf(buf, sizeof(buf), "dv/host%d/%s/%s", (video->id >> 2),
-                (video->pal_or_ntsc == DV1394_NTSC ? "NTSC" : "PAL"),
-                (video->mode == MODE_RECEIVE ? "in" : "out")
-                );
-
-        devfs_remove("ieee1394/%s", buf);
         kfree(video);
 }
 
@@ -2333,9 +2307,6 @@ static void dv1394_remove_host (struct hpsb_host *host)
 
         class_device_destroy(hpsb_protocol_class,
                 MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)));
-        devfs_remove("ieee1394/dv/host%d/NTSC", id);
-        devfs_remove("ieee1394/dv/host%d/PAL", id);
-        devfs_remove("ieee1394/dv/host%d", id);
 }
 
 static void dv1394_add_host (struct hpsb_host *host)
@@ -2352,9 +2323,6 @@ static void dv1394_add_host (struct hpsb_host *host)
         class_device_create(hpsb_protocol_class, NULL, MKDEV(
                 IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)), 
                 NULL, "dv1394-%d", id);
-        devfs_mk_dir("ieee1394/dv/host%d", id);
-        devfs_mk_dir("ieee1394/dv/host%d/NTSC", id);
-        devfs_mk_dir("ieee1394/dv/host%d/PAL", id);
 
         dv1394_init(ohci, DV1394_NTSC, MODE_RECEIVE);
         dv1394_init(ohci, DV1394_NTSC, MODE_TRANSMIT);
@@ -2611,10 +2579,8 @@ MODULE_LICENSE("GPL");
 static void __exit dv1394_exit_module(void)
 {
         hpsb_unregister_protocol(&dv1394_driver);
-
         hpsb_unregister_highlevel(&dv1394_highlevel);
         cdev_del(&dv1394_cdev);
-        devfs_remove("ieee1394/dv");
 }
 
 static int __init dv1394_init_module(void)
@@ -2630,15 +2596,12 @@ static int __init dv1394_init_module(void)
                 return ret;
         }
 
-        devfs_mk_dir("ieee1394/dv");
-
         hpsb_register_highlevel(&dv1394_highlevel);
 
         ret = hpsb_register_protocol(&dv1394_driver);
         if (ret) {
                 printk(KERN_ERR "dv1394: failed to register protocol\n");
                 hpsb_unregister_highlevel(&dv1394_highlevel);
-                devfs_remove("ieee1394/dv");
                 cdev_del(&dv1394_cdev);
                 return ret;
         }
diff --git a/drivers/ieee1394/highlevel.c b/drivers/ieee1394/highlevel.c
index 734b121a05..491e6032bd 100644
--- a/drivers/ieee1394/highlevel.c
+++ b/drivers/ieee1394/highlevel.c
@@ -306,8 +306,7 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl,
         u64 align_mask = ~(alignment - 1);
 
         if ((alignment & 3) || (alignment > 0x800000000000ULL) ||
-            ((hweight32(alignment >> 32) +
-              hweight32(alignment & 0xffffffff) != 1))) {
+            (hweight64(alignment) != 1)) {
                 HPSB_ERR("%s called with invalid alignment: 0x%048llx",
                          __FUNCTION__, (unsigned long long)alignment);
                 return retval;
diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c
index 25ef5a86f5..be6854e25a 100644
--- a/drivers/ieee1394/ieee1394_core.c
+++ b/drivers/ieee1394/ieee1394_core.c
@@ -58,7 +58,7 @@ MODULE_PARM_DESC(disable_nodemgr, "Disable nodemgr functionality.");
 
 /* Disable Isochronous Resource Manager functionality */
 int hpsb_disable_irm = 0;
-module_param_named(disable_irm, hpsb_disable_irm, bool, 0);
+module_param_named(disable_irm, hpsb_disable_irm, bool, 0444);
 MODULE_PARM_DESC(disable_irm,
                  "Disable Isochronous Resource Manager functionality.");
 
@@ -1078,17 +1078,10 @@ static int __init ieee1394_init(void)
                 goto exit_release_kernel_thread;
         }
 
-        /* actually this is a non-fatal error */
-        ret = devfs_mk_dir("ieee1394");
-        if (ret < 0) {
-                HPSB_ERR("unable to make devfs dir for device major %d!\n", IEEE1394_MAJOR);
-                goto release_chrdev;
-        }
-
         ret = bus_register(&ieee1394_bus_type);
         if (ret < 0) {
                 HPSB_INFO("bus register failed");
-                goto release_devfs;
+                goto release_chrdev;
         }
 
         for (i = 0; fw_bus_attrs[i]; i++) {
@@ -1099,7 +1092,7 @@ static int __init ieee1394_init(void)
                                                 fw_bus_attrs[i--]);
                         }
                         bus_unregister(&ieee1394_bus_type);
-                        goto release_devfs;
+                        goto release_chrdev;
                 }
         }
 
@@ -1152,8 +1145,6 @@ release_all_bus:
         for (i = 0; fw_bus_attrs[i]; i++)
                 bus_remove_file(&ieee1394_bus_type, fw_bus_attrs[i]);
         bus_unregister(&ieee1394_bus_type);
-release_devfs:
-        devfs_remove("ieee1394");
 release_chrdev:
         unregister_chrdev_region(IEEE1394_CORE_DEV, 256);
 exit_release_kernel_thread:
@@ -1191,7 +1182,6 @@ static void __exit ieee1394_cleanup(void)
         hpsb_cleanup_config_roms();
 
         unregister_chrdev_region(IEEE1394_CORE_DEV, 256);
-        devfs_remove("ieee1394");
 }
 
 module_init(ieee1394_init);
diff --git a/drivers/ieee1394/ieee1394_core.h b/drivers/ieee1394/ieee1394_core.h
index b35466023f..e7b55e895f 100644
--- a/drivers/ieee1394/ieee1394_core.h
+++ b/drivers/ieee1394/ieee1394_core.h
@@ -3,7 +3,6 @@
 #define _IEEE1394_CORE_H
 
 #include <linux/slab.h>
-#include <linux/devfs_fs_kernel.h>
 #include <asm/atomic.h>
 #include <asm/semaphore.h>
 #include "hosts.h"
@@ -202,14 +201,12 @@ void hpsb_packet_received(struct hpsb_host *host, quadlet_t *data, size_t size,
 #define IEEE1394_MINOR_BLOCK_RAW1394       0
 #define IEEE1394_MINOR_BLOCK_VIDEO1394     1
 #define IEEE1394_MINOR_BLOCK_DV1394        2
-#define IEEE1394_MINOR_BLOCK_AMDTP         3
 #define IEEE1394_MINOR_BLOCK_EXPERIMENTAL 15
 
 #define IEEE1394_CORE_DEV         MKDEV(IEEE1394_MAJOR, 0)
 #define IEEE1394_RAW1394_DEV      MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16)
 #define IEEE1394_VIDEO1394_DEV    MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_VIDEO1394 * 16)
 #define IEEE1394_DV1394_DEV       MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16)
-#define IEEE1394_AMDTP_DEV        MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_AMDTP * 16)
 #define IEEE1394_EXPERIMENTAL_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_EXPERIMENTAL * 16)
 
 /* return the index (within a minor number block) of a file */
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index b6b96fa04d..19222878aa 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -544,12 +544,19 @@ static void ohci_initialize(struct ti_ohci *ohci)
         /* Initialize IR Legacy DMA channel mask */
         ohci->ir_legacy_channels = 0;
 
-        /*
-         * Accept AT requests from all nodes. This probably
-         * will have to be controlled from the subsystem
-         * on a per node basis.
-         */
-        reg_write(ohci,OHCI1394_AsReqFilterHiSet, 0x80000000);
+        /* Accept AR requests from all nodes */
+        reg_write(ohci, OHCI1394_AsReqFilterHiSet, 0x80000000);
+
+        /* Set the address range of the physical response unit.
+         * Most controllers do not implement it as a writable register though.
+         * They will keep a hardwired offset of 0x00010000 and show 0x0 as
+         * register content.
+         * To actually enable physical responses is the job of our interrupt
+         * handler which programs the physical request filter. */
+        reg_write(ohci, OHCI1394_PhyUpperBound, 0xffff0000);
+
+        DBGMSG("physUpperBoundOffset=%08x",
+               reg_read(ohci, OHCI1394_PhyUpperBound));
 
         /* Specify AT retries */
         reg_write(ohci, OHCI1394_ATRetries,
@@ -572,6 +579,7 @@ static void ohci_initialize(struct ti_ohci *ohci)
                   OHCI1394_reqTxComplete |
                   OHCI1394_isochRx |
                   OHCI1394_isochTx |
+                  OHCI1394_postedWriteErr |
                   OHCI1394_cycleInconsistent);
 
         /* Enable link */
@@ -2374,7 +2382,10 @@ static irqreturn_t ohci_irq_handler(int irq, void *dev_id,
 
                 event &= ~OHCI1394_unrecoverableError;
         }
-
+        if (event & OHCI1394_postedWriteErr) {
+                PRINT(KERN_ERR, "physical posted write error");
+                /* no recovery strategy yet, had to involve protocol drivers */
+        }
         if (event & OHCI1394_cycleInconsistent) {
                 /* We subscribe to the cycleInconsistent event only to
                  * clear the corresponding event bit... otherwise,
@@ -2382,7 +2393,6 @@ static irqreturn_t ohci_irq_handler(int irq, void *dev_id,
                 DBGMSG("OHCI1394_cycleInconsistent");
                 event &= ~OHCI1394_cycleInconsistent;
         }
-
         if (event & OHCI1394_busReset) {
                 /* The busReset event bit can't be cleared during the
                  * selfID phase, so we disable busReset interrupts, to
@@ -2426,7 +2436,6 @@ static irqreturn_t ohci_irq_handler(int irq, void *dev_id,
                 }
                 event &= ~OHCI1394_busReset;
         }
-
         if (event & OHCI1394_reqTxComplete) {
                 struct dma_trm_ctx *d = &ohci->at_req_context;
                 DBGMSG("Got reqTxComplete interrupt "
@@ -2514,26 +2523,20 @@ static irqreturn_t ohci_irq_handler(int irq, void *dev_id,
                         reg_write(ohci, OHCI1394_IntMaskSet, OHCI1394_busReset);
                         spin_unlock_irqrestore(&ohci->event_lock, flags);
 
-                        /* Accept Physical requests from all nodes. */
-                        reg_write(ohci,OHCI1394_AsReqFilterHiSet, 0xffffffff);
-                        reg_write(ohci,OHCI1394_AsReqFilterLoSet, 0xffffffff);
-
                         /* Turn on phys dma reception.
                          *
                          * TODO: Enable some sort of filtering management.
                          */
                         if (phys_dma) {
-                                reg_write(ohci,OHCI1394_PhyReqFilterHiSet, 0xffffffff);
-                                reg_write(ohci,OHCI1394_PhyReqFilterLoSet, 0xffffffff);
-                                reg_write(ohci,OHCI1394_PhyUpperBound, 0xffff0000);
-                        } else {
-                                reg_write(ohci,OHCI1394_PhyReqFilterHiSet, 0x00000000);
-                                reg_write(ohci,OHCI1394_PhyReqFilterLoSet, 0x00000000);
+                                reg_write(ohci, OHCI1394_PhyReqFilterHiSet,
+                                          0xffffffff);
+                                reg_write(ohci, OHCI1394_PhyReqFilterLoSet,
+                                          0xffffffff);
                         }
 
                         DBGMSG("PhyReqFilter=%08x%08x",
-                               reg_read(ohci,OHCI1394_PhyReqFilterHiSet),
-                               reg_read(ohci,OHCI1394_PhyReqFilterLoSet));
+                               reg_read(ohci, OHCI1394_PhyReqFilterHiSet),
+                               reg_read(ohci, OHCI1394_PhyReqFilterLoSet));
 
                         hpsb_selfid_complete(host, phyid, isroot);
                 } else
@@ -3259,8 +3262,8 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
          * fail to report the right length.  Anyway, the ohci spec
          * clearly says it's 2kb, so this shouldn't be a problem. */
         ohci_base = pci_resource_start(dev, 0);
-        if (pci_resource_len(dev, 0) != OHCI1394_REGISTER_SIZE)
-                PRINT(KERN_WARNING, "Unexpected PCI resource length of %lx!",
+        if (pci_resource_len(dev, 0) < OHCI1394_REGISTER_SIZE)
+                PRINT(KERN_WARNING, "PCI resource length of %lx too small!",
                       pci_resource_len(dev, 0));
 
         /* Seems PCMCIA handles this internally. Not sure why. Seems
@@ -3526,7 +3529,7 @@ static void ohci1394_pci_remove(struct pci_dev *pdev)
 static int ohci1394_pci_resume (struct pci_dev *pdev)
 {
 #ifdef CONFIG_PPC_PMAC
-        if (_machine == _MACH_Pmac) {
+        if (machine_is(powermac)) {
                 struct device_node *of_node;
 
                 /* Re-enable 1394 */
@@ -3545,7 +3548,7 @@ static int ohci1394_pci_resume (struct pci_dev *pdev)
 static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state)
 {
 #ifdef CONFIG_PPC_PMAC
-        if (_machine == _MACH_Pmac) {
+        if (machine_is(powermac)) {
                 struct device_node *of_node;
 
                 /* Disable 1394 */
diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index b052356399..f7de546f2e 100644
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -41,7 +41,7 @@
 #include <linux/cdev.h>
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
-#include <linux/devfs_fs_kernel.h>
+#include <linux/compat.h>
 
 #include "csr1212.h"
 #include "ieee1394.h"
@@ -406,6 +406,65 @@ static void fcp_request(struct hpsb_host *host, int nodeid, int direction,
             queue_complete_req(req);
 }
 
+#ifdef CONFIG_COMPAT
+struct compat_raw1394_req {
+        __u32 type;
+        __s32 error;
+        __u32 misc;
+
+        __u32 generation;
+        __u32 length;
+
+        __u64 address;
+
+        __u64 tag;
+
+        __u64 sendb;
+        __u64 recvb;
+}  __attribute__((packed));
+
+static const char __user *raw1394_compat_write(const char __user *buf)
+{
+        struct compat_raw1394_req __user *cr = (typeof(cr)) buf; 
+        struct raw1394_request __user *r;
+        r = compat_alloc_user_space(sizeof(struct raw1394_request));
+
+#define C(x) __copy_in_user(&r->x, &cr->x, sizeof(r->x))
+
+        if (copy_in_user(r, cr, sizeof(struct compat_raw1394_req)) ||
+                C(address) ||
+                C(tag) ||
+                C(sendb) ||
+                C(recvb))
+                return ERR_PTR(-EFAULT);
+        return (const char __user *)r;
+}
+#undef C
+
+#define P(x) __put_user(r->x, &cr->x)
+
+static int 
+raw1394_compat_read(const char __user *buf, struct raw1394_request *r)
+{
+        struct compat_raw1394_req __user *cr = (typeof(cr)) r; 
+        if (!access_ok(VERIFY_WRITE,cr,sizeof(struct compat_raw1394_req)) ||
+            P(type) ||
+            P(error) ||
+            P(misc) ||
+            P(generation) ||
+            P(length) ||
+            P(address) ||
+            P(tag) ||
+            P(sendb) ||
+            P(recvb))
+                return -EFAULT;
+        return sizeof(struct compat_raw1394_req);
+}
+#undef P
+
+#endif
+
+
 static ssize_t raw1394_read(struct file *file, char __user * buffer,
                             size_t count, loff_t * offset_is_ignored)
 {
@@ -415,6 +474,11 @@ static ssize_t raw1394_read(struct file *file, char __user * buffer,
         struct pending_request *req;
         ssize_t ret;
 
+#ifdef CONFIG_COMPAT
+        if (count == sizeof(struct compat_raw1394_req)) {
+                /* ok */
+        } else
+#endif
         if (count != sizeof(struct raw1394_request)) {
                 return -EINVAL;
         }
@@ -446,12 +510,22 @@ static ssize_t raw1394_read(struct file *file, char __user * buffer,
                         req->req.error = RAW1394_ERROR_MEMFAULT;
                 }
         }
-        if (copy_to_user(buffer, &req->req, sizeof(req->req))) {
-                ret = -EFAULT;
-                goto out;
-        }
 
-        ret = (ssize_t) sizeof(struct raw1394_request);
+#ifdef CONFIG_COMPAT
+        if (count == sizeof(struct compat_raw1394_req) && 
+                sizeof(struct compat_raw1394_req) != 
+                        sizeof(struct raw1394_request)) { 
+                ret = raw1394_compat_read(buffer, &req->req);
+
+        } else  
+#endif
+        {
+                if (copy_to_user(buffer, &req->req, sizeof(req->req))) {
+                        ret = -EFAULT;
+                        goto out;
+                }               
+                ret = (ssize_t) sizeof(struct raw1394_request);
+        }
       out:
         free_pending_request(req);
         return ret;
@@ -2274,6 +2348,7 @@ static int state_connected(struct file_info *fi, struct pending_request *req)
         return handle_async_request(fi, req, node);
 }
 
+
 static ssize_t raw1394_write(struct file *file, const char __user * buffer,
                              size_t count, loff_t * offset_is_ignored)
 {
@@ -2281,6 +2356,15 @@ static ssize_t raw1394_write(struct file *file, const char __user * buffer,
         struct pending_request *req;
         ssize_t retval = 0;
 
+#ifdef CONFIG_COMPAT
+        if (count == sizeof(struct compat_raw1394_req) && 
+                sizeof(struct compat_raw1394_req) != 
+                        sizeof(struct raw1394_request)) { 
+                buffer = raw1394_compat_write(buffer);
+                if (IS_ERR(buffer))
+                        return PTR_ERR(buffer);
+        } else
+#endif
         if (count != sizeof(struct raw1394_request)) {
                 return -EINVAL;
         }
@@ -2893,6 +2977,7 @@ static struct file_operations raw1394_fops = {
         .write = raw1394_write,
         .mmap = raw1394_mmap,
         .ioctl = raw1394_ioctl,
+        // .compat_ioctl = ... someone needs to do this
         .poll = raw1394_poll,
         .open = raw1394_open,
         .release = raw1394_release,
@@ -2913,9 +2998,6 @@ static int __init init_raw1394(void)
                 goto out_unreg;
         }
 
-        devfs_mk_cdev(MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16),
-                      S_IFCHR | S_IRUSR | S_IWUSR, RAW1394_DEVICE_NAME);
-
         cdev_init(&raw1394_cdev, &raw1394_fops);
         raw1394_cdev.owner = THIS_MODULE;
         kobject_set_name(&raw1394_cdev.kobj, RAW1394_DEVICE_NAME);
@@ -2937,7 +3019,6 @@ static int __init init_raw1394(void)
         goto out;
 
       out_dev:
-        devfs_remove(RAW1394_DEVICE_NAME);
         class_device_destroy(hpsb_protocol_class,
                              MKDEV(IEEE1394_MAJOR,
                                    IEEE1394_MINOR_BLOCK_RAW1394 * 16));
@@ -2953,7 +3034,6 @@ static void __exit cleanup_raw1394(void)
                              MKDEV(IEEE1394_MAJOR,
                                    IEEE1394_MINOR_BLOCK_RAW1394 * 16));
         cdev_del(&raw1394_cdev);
-        devfs_remove(RAW1394_DEVICE_NAME);
         hpsb_unregister_highlevel(&raw1394_highlevel);
         hpsb_unregister_protocol(&raw1394_driver);
 }
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index eca92eb475..2c765ca5aa 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -214,6 +214,7 @@ static u32 global_outstanding_dmas = 0;
 #endif
 
 #define SBP2_ERR(fmt, args...)          HPSB_ERR("sbp2: "fmt, ## args)
+#define SBP2_DEBUG_ENTER()              SBP2_DEBUG("%s", __FUNCTION__)
 
 /*
  * Globals
@@ -535,7 +536,7 @@ static struct sbp2_command_info *sbp2util_allocate_command_orb(
                 command->Current_SCpnt = Current_SCpnt;
                 list_add_tail(&command->list, &scsi_id->sbp2_command_orb_inuse);
         } else {
-                SBP2_ERR("sbp2util_allocate_command_orb - No orbs available!");
+                SBP2_ERR("%s: no orbs available", __FUNCTION__);
         }
         spin_unlock_irqrestore(&scsi_id->sbp2_command_orb_lock, flags);
         return command;
@@ -549,7 +550,7 @@ static void sbp2util_free_command_dma(struct sbp2_command_info *command)
         struct hpsb_host *host;
 
         if (!scsi_id) {
-                printk(KERN_ERR "%s: scsi_id == NULL\n", __FUNCTION__);
+                SBP2_ERR("%s: scsi_id == NULL", __FUNCTION__);
                 return;
         }
 
@@ -610,7 +611,7 @@ static int sbp2_probe(struct device *dev)
         struct unit_directory *ud;
         struct scsi_id_instance_data *scsi_id;
 
-        SBP2_DEBUG("sbp2_probe");
+        SBP2_DEBUG_ENTER();
 
         ud = container_of(dev, struct unit_directory, device);
 
@@ -635,7 +636,7 @@ static int sbp2_remove(struct device *dev)
         struct scsi_id_instance_data *scsi_id;
         struct scsi_device *sdev;
 
-        SBP2_DEBUG("sbp2_remove");
+        SBP2_DEBUG_ENTER();
 
         ud = container_of(dev, struct unit_directory, device);
         scsi_id = ud->device.driver_data;
@@ -667,7 +668,7 @@ static int sbp2_update(struct unit_directory *ud)
 {
         struct scsi_id_instance_data *scsi_id = ud->device.driver_data;
 
-        SBP2_DEBUG("sbp2_update");
+        SBP2_DEBUG_ENTER();
 
         if (sbp2_reconnect_device(scsi_id)) {
 
@@ -715,7 +716,7 @@ static struct scsi_id_instance_data *sbp2_alloc_device(struct unit_directory *ud
         struct Scsi_Host *scsi_host = NULL;
         struct scsi_id_instance_data *scsi_id = NULL;
 
-        SBP2_DEBUG("sbp2_alloc_device");
+        SBP2_DEBUG_ENTER();
 
         scsi_id = kzalloc(sizeof(*scsi_id), GFP_KERNEL);
         if (!scsi_id) {
@@ -749,12 +750,22 @@ static struct scsi_id_instance_data *sbp2_alloc_device(struct unit_directory *ud
 
 #ifdef CONFIG_IEEE1394_SBP2_PHYS_DMA
                 /* Handle data movement if physical dma is not
-                 * enabled/supportedon host controller */
-                hpsb_register_addrspace(&sbp2_highlevel, ud->ne->host, &sbp2_physdma_ops,
-                                        0x0ULL, 0xfffffffcULL);
+                 * enabled or not supported on host controller */
+                if (!hpsb_register_addrspace(&sbp2_highlevel, ud->ne->host,
+                                             &sbp2_physdma_ops,
+                                             0x0ULL, 0xfffffffcULL)) {
+                        SBP2_ERR("failed to register lower 4GB address range");
+                        goto failed_alloc;
+                }
 #endif
         }
 
+        /* Prevent unloading of the 1394 host */
+        if (!try_module_get(hi->host->driver->owner)) {
+                SBP2_ERR("failed to get a reference on 1394 host driver");
+                goto failed_alloc;
+        }
+
         scsi_id->hi = hi;
 
         list_add_tail(&scsi_id->scsi_list, &hi->scsi_ids);
@@ -816,7 +827,7 @@ static int sbp2_start_device(struct scsi_id_instance_data *scsi_id)
         struct sbp2scsi_host_info *hi = scsi_id->hi;
         int error;
 
-        SBP2_DEBUG("sbp2_start_device");
+        SBP2_DEBUG_ENTER();
 
         /* Login FIFO DMA */
         scsi_id->login_response =
@@ -891,7 +902,6 @@ static int sbp2_start_device(struct scsi_id_instance_data *scsi_id)
          * allows someone else to login instead. One second makes sense. */
         msleep_interruptible(1000);
         if (signal_pending(current)) {
-                SBP2_WARN("aborting sbp2_start_device due to event");
                 sbp2_remove_device(scsi_id);
                 return -EINTR;
         }
@@ -944,7 +954,7 @@ static void sbp2_remove_device(struct scsi_id_instance_data *scsi_id)
 {
         struct sbp2scsi_host_info *hi;
 
-        SBP2_DEBUG("sbp2_remove_device");
+        SBP2_DEBUG_ENTER();
 
         if (!scsi_id)
                 return;
@@ -1015,6 +1025,9 @@ static void sbp2_remove_device(struct scsi_id_instance_data *scsi_id)
 
         scsi_id->ud->device.driver_data = NULL;
 
+        if (hi)
+                module_put(hi->host->driver->owner);
+
         SBP2_DEBUG("SBP-2 device removed, SCSI ID = %d", scsi_id->ud->id);
 
         kfree(scsi_id);
@@ -1073,23 +1086,20 @@ static int sbp2_query_logins(struct scsi_id_instance_data *scsi_id)
         int max_logins;
         int active_logins;
 
-        SBP2_DEBUG("sbp2_query_logins");
+        SBP2_DEBUG_ENTER();
 
         scsi_id->query_logins_orb->reserved1 = 0x0;
         scsi_id->query_logins_orb->reserved2 = 0x0;
 
         scsi_id->query_logins_orb->query_response_lo = scsi_id->query_logins_response_dma;
         scsi_id->query_logins_orb->query_response_hi = ORB_SET_NODE_ID(hi->host->node_id);
-        SBP2_DEBUG("sbp2_query_logins: query_response_hi/lo initialized");
 
         scsi_id->query_logins_orb->lun_misc = ORB_SET_FUNCTION(SBP2_QUERY_LOGINS_REQUEST);
         scsi_id->query_logins_orb->lun_misc |= ORB_SET_NOTIFY(1);
         scsi_id->query_logins_orb->lun_misc |= ORB_SET_LUN(scsi_id->sbp2_lun);
-        SBP2_DEBUG("sbp2_query_logins: lun_misc initialized");
 
         scsi_id->query_logins_orb->reserved_resp_length =
                 ORB_SET_QUERY_LOGINS_RESP_LENGTH(sizeof(struct sbp2_query_logins_response));
-        SBP2_DEBUG("sbp2_query_logins: reserved_resp_length initialized");
 
         scsi_id->query_logins_orb->status_fifo_hi =
                 ORB_SET_STATUS_FIFO_HI(scsi_id->status_fifo_addr, hi->host->node_id);
@@ -1098,25 +1108,19 @@ static int sbp2_query_logins(struct scsi_id_instance_data *scsi_id)
 
         sbp2util_cpu_to_be32_buffer(scsi_id->query_logins_orb, sizeof(struct sbp2_query_logins_orb));
 
-        SBP2_DEBUG("sbp2_query_logins: orb byte-swapped");
-
         sbp2util_packet_dump(scsi_id->query_logins_orb, sizeof(struct sbp2_query_logins_orb),
                              "sbp2 query logins orb", scsi_id->query_logins_orb_dma);
 
         memset(scsi_id->query_logins_response, 0, sizeof(struct sbp2_query_logins_response));
         memset(&scsi_id->status_block, 0, sizeof(struct sbp2_status_block));
 
-        SBP2_DEBUG("sbp2_query_logins: query_logins_response/status FIFO memset");
-
         data[0] = ORB_SET_NODE_ID(hi->host->node_id);
         data[1] = scsi_id->query_logins_orb_dma;
         sbp2util_cpu_to_be32_buffer(data, 8);
 
         atomic_set(&scsi_id->sbp2_login_complete, 0);
 
-        SBP2_DEBUG("sbp2_query_logins: prepared to write");
         hpsb_node_write(scsi_id->ne, scsi_id->sbp2_management_agent_addr, data, 8);
-        SBP2_DEBUG("sbp2_query_logins: written");
 
         if (sbp2util_down_timeout(&scsi_id->sbp2_login_complete, 2*HZ)) {
                 SBP2_INFO("Error querying logins to SBP-2 device - timed out");
@@ -1165,10 +1169,10 @@ static int sbp2_login_device(struct scsi_id_instance_data *scsi_id)
         struct sbp2scsi_host_info *hi = scsi_id->hi;
         quadlet_t data[2];
 
-        SBP2_DEBUG("sbp2_login_device");
+        SBP2_DEBUG_ENTER();
 
         if (!scsi_id->login_orb) {
-                SBP2_DEBUG("sbp2_login_device: login_orb not alloc'd!");
+                SBP2_DEBUG("%s: login_orb not alloc'd!", __FUNCTION__);
                 return -EIO;
         }
 
@@ -1182,59 +1186,39 @@ static int sbp2_login_device(struct scsi_id_instance_data *scsi_id)
         /* Set-up login ORB, assume no password */
         scsi_id->login_orb->password_hi = 0;
         scsi_id->login_orb->password_lo = 0;
-        SBP2_DEBUG("sbp2_login_device: password_hi/lo initialized");
 
         scsi_id->login_orb->login_response_lo = scsi_id->login_response_dma;
         scsi_id->login_orb->login_response_hi = ORB_SET_NODE_ID(hi->host->node_id);
-        SBP2_DEBUG("sbp2_login_device: login_response_hi/lo initialized");
 
         scsi_id->login_orb->lun_misc = ORB_SET_FUNCTION(SBP2_LOGIN_REQUEST);
         scsi_id->login_orb->lun_misc |= ORB_SET_RECONNECT(0);   /* One second reconnect time */
         scsi_id->login_orb->lun_misc |= ORB_SET_EXCLUSIVE(exclusive_login);     /* Exclusive access to device */
         scsi_id->login_orb->lun_misc |= ORB_SET_NOTIFY(1);      /* Notify us of login complete */
         scsi_id->login_orb->lun_misc |= ORB_SET_LUN(scsi_id->sbp2_lun);
-        SBP2_DEBUG("sbp2_login_device: lun_misc initialized");
 
         scsi_id->login_orb->passwd_resp_lengths =
                 ORB_SET_LOGIN_RESP_LENGTH(sizeof(struct sbp2_login_response));
-        SBP2_DEBUG("sbp2_login_device: passwd_resp_lengths initialized");
 
         scsi_id->login_orb->status_fifo_hi =
                 ORB_SET_STATUS_FIFO_HI(scsi_id->status_fifo_addr, hi->host->node_id);
         scsi_id->login_orb->status_fifo_lo =
                 ORB_SET_STATUS_FIFO_LO(scsi_id->status_fifo_addr);
 
-        /*
-         * Byte swap ORB if necessary
-         */
         sbp2util_cpu_to_be32_buffer(scsi_id->login_orb, sizeof(struct sbp2_login_orb));
 
-        SBP2_DEBUG("sbp2_login_device: orb byte-swapped");
-
         sbp2util_packet_dump(scsi_id->login_orb, sizeof(struct sbp2_login_orb),
                              "sbp2 login orb", scsi_id->login_orb_dma);
 
-        /*
-         * Initialize login response and status fifo
-         */
         memset(scsi_id->login_response, 0, sizeof(struct sbp2_login_response));
         memset(&scsi_id->status_block, 0, sizeof(struct sbp2_status_block));
 
-        SBP2_DEBUG("sbp2_login_device: login_response/status FIFO memset");
-
-        /*
-         * Ok, let's write to the target's management agent register
-         */
         data[0] = ORB_SET_NODE_ID(hi->host->node_id);
         data[1] = scsi_id->login_orb_dma;
         sbp2util_cpu_to_be32_buffer(data, 8);
 
         atomic_set(&scsi_id->sbp2_login_complete, 0);
 
-        SBP2_DEBUG("sbp2_login_device: prepared to write to %08x",
-                   (unsigned int)scsi_id->sbp2_management_agent_addr);
         hpsb_node_write(scsi_id->ne, scsi_id->sbp2_management_agent_addr, data, 8);
-        SBP2_DEBUG("sbp2_login_device: written");
 
         /*
          * Wait for login status (up to 20 seconds)...
@@ -1298,7 +1282,7 @@ static int sbp2_logout_device(struct scsi_id_instance_data *scsi_id)
         quadlet_t data[2];
         int error;
 
-        SBP2_DEBUG("sbp2_logout_device");
+        SBP2_DEBUG_ENTER();
 
         /*
          * Set-up logout ORB
@@ -1362,7 +1346,7 @@ static int sbp2_reconnect_device(struct scsi_id_instance_data *scsi_id)
         quadlet_t data[2];
         int error;
 
-        SBP2_DEBUG("sbp2_reconnect_device");
+        SBP2_DEBUG_ENTER();
 
         /*
          * Set-up reconnect ORB
@@ -1453,17 +1437,11 @@ static int sbp2_set_busy_timeout(struct scsi_id_instance_data *scsi_id)
 {
         quadlet_t data;
 
-        SBP2_DEBUG("sbp2_set_busy_timeout");
+        SBP2_DEBUG_ENTER();
 
-        /*
-         * Ok, let's write to the target's busy timeout register
-         */
         data = cpu_to_be32(SBP2_BUSY_TIMEOUT_VALUE);
-
-        if (hpsb_node_write(scsi_id->ne, SBP2_BUSY_TIMEOUT_ADDRESS, &data, 4)) {
-                SBP2_ERR("sbp2_set_busy_timeout error");
-        }
-
+        if (hpsb_node_write(scsi_id->ne, SBP2_BUSY_TIMEOUT_ADDRESS, &data, 4))
+                SBP2_ERR("%s error", __FUNCTION__);
         return 0;
 }
 
@@ -1482,7 +1460,7 @@ static void sbp2_parse_unit_directory(struct scsi_id_instance_data *scsi_id,
             firmware_revision, workarounds;
         int i;
 
-        SBP2_DEBUG("sbp2_parse_unit_directory");
+        SBP2_DEBUG_ENTER();
 
         management_agent_addr = 0x0;
         command_set_spec_id = 0x0;
@@ -1615,7 +1593,7 @@ static int sbp2_max_speed_and_size(struct scsi_id_instance_data *scsi_id)
 {
         struct sbp2scsi_host_info *hi = scsi_id->hi;
 
-        SBP2_DEBUG("sbp2_max_speed_and_size");
+        SBP2_DEBUG_ENTER();
 
         /* Initial setting comes from the hosts speed map */
         scsi_id->speed_code =
@@ -1652,11 +1630,8 @@ static int sbp2_agent_reset(struct scsi_id_instance_data *scsi_id, int wait)
         u64 addr;
         int retval;
 
-        SBP2_DEBUG("sbp2_agent_reset");
+        SBP2_DEBUG_ENTER();
 
-        /*
-         * Ok, let's write to the target's management agent register
-         */
         data = ntohl(SBP2_AGENT_RESET_DATA);
         addr = scsi_id->sbp2_command_block_agent_addr + SBP2_AGENT_RESET_OFFSET;
 
@@ -2004,11 +1979,7 @@ static int sbp2_send_command(struct scsi_id_instance_data *scsi_id,
         unsigned int request_bufflen = SCpnt->request_bufflen;
         struct sbp2_command_info *command;
 
-        SBP2_DEBUG("sbp2_send_command");
-#if (CONFIG_IEEE1394_SBP2_DEBUG >= 2) || defined(CONFIG_IEEE1394_SBP2_PACKET_DUMP)
-        printk("[scsi command]\n   ");
-        scsi_print_command(SCpnt);
-#endif
+        SBP2_DEBUG_ENTER();
         SBP2_DEBUG("SCSI transfer size = %x", request_bufflen);
         SBP2_DEBUG("SCSI s/g elements = %x", (unsigned int)SCpnt->use_sg);
 
@@ -2048,7 +2019,7 @@ static int sbp2_send_command(struct scsi_id_instance_data *scsi_id,
  */
 static unsigned int sbp2_status_to_sense_data(unchar *sbp2_status, unchar *sense_data)
 {
-        SBP2_DEBUG("sbp2_status_to_sense_data");
+        SBP2_DEBUG_ENTER();
 
         /*
          * Ok, it's pretty ugly...   ;-)
@@ -2082,7 +2053,7 @@ static void sbp2_check_sbp2_response(struct scsi_id_instance_data *scsi_id,
 {
         u8 *scsi_buf = SCpnt->request_buffer;
 
-        SBP2_DEBUG("sbp2_check_sbp2_response");
+        SBP2_DEBUG_ENTER();
 
         if (SCpnt->cmnd[0] == INQUIRY && (SCpnt->cmnd[1] & 3) == 0) {
                 /*
@@ -2113,7 +2084,7 @@ static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid, int dest
         struct sbp2_command_info *command;
         unsigned long flags;
 
-        SBP2_DEBUG("sbp2_handle_status_write");
+        SBP2_DEBUG_ENTER();
 
         sbp2util_packet_dump(data, length, "sbp2 status write by device", (u32)addr);
 
@@ -2260,7 +2231,10 @@ static int sbp2scsi_queuecommand(struct scsi_cmnd *SCpnt,
         struct sbp2scsi_host_info *hi;
         int result = DID_NO_CONNECT << 16;
 
-        SBP2_DEBUG("sbp2scsi_queuecommand");
+        SBP2_DEBUG_ENTER();
+#if (CONFIG_IEEE1394_SBP2_DEBUG >= 2) || defined(CONFIG_IEEE1394_SBP2_PACKET_DUMP)
+        scsi_print_command(SCpnt);
+#endif
 
         if (!sbp2util_node_is_available(scsi_id))
                 goto done;
@@ -2338,7 +2312,7 @@ static void sbp2scsi_complete_all_commands(struct scsi_id_instance_data *scsi_id
         struct sbp2_command_info *command;
         unsigned long flags;
 
-        SBP2_DEBUG("sbp2scsi_complete_all_commands");
+        SBP2_DEBUG_ENTER();
 
         spin_lock_irqsave(&scsi_id->sbp2_command_orb_lock, flags);
         while (!list_empty(&scsi_id->sbp2_command_orb_inuse)) {
@@ -2371,7 +2345,7 @@ static void sbp2scsi_complete_command(struct scsi_id_instance_data *scsi_id,
                                       u32 scsi_status, struct scsi_cmnd *SCpnt,
                                       void (*done)(struct scsi_cmnd *))
 {
-        SBP2_DEBUG("sbp2scsi_complete_command");
+        SBP2_DEBUG_ENTER();
 
         /*
          * Sanity
@@ -2397,7 +2371,7 @@ static void sbp2scsi_complete_command(struct scsi_id_instance_data *scsi_id,
          */
         switch (scsi_status) {
         case SBP2_SCSI_STATUS_GOOD:
-                SCpnt->result = DID_OK;
+                SCpnt->result = DID_OK << 16;
                 break;
 
         case SBP2_SCSI_STATUS_BUSY:
@@ -2407,16 +2381,11 @@ static void sbp2scsi_complete_command(struct scsi_id_instance_data *scsi_id,
 
         case SBP2_SCSI_STATUS_CHECK_CONDITION:
                 SBP2_DEBUG("SBP2_SCSI_STATUS_CHECK_CONDITION");
-                SCpnt->result = CHECK_CONDITION << 1;
-
-                /*
-                 * Debug stuff
-                 */
+                SCpnt->result = CHECK_CONDITION << 1 | DID_OK << 16;
 #if CONFIG_IEEE1394_SBP2_DEBUG >= 1
                 scsi_print_command(SCpnt);
-                scsi_print_sense("bh", SCpnt);
+                scsi_print_sense(SBP2_DEVICE_NAME, SCpnt);
 #endif
-
                 break;
 
         case SBP2_SCSI_STATUS_SELECTION_TIMEOUT:
@@ -2441,7 +2410,7 @@ static void sbp2scsi_complete_command(struct scsi_id_instance_data *scsi_id,
         /*
          * Take care of any sbp2 response data mucking here (RBC stuff, etc.)
          */
-        if (SCpnt->result == DID_OK) {
+        if (SCpnt->result == DID_OK << 16) {
                 sbp2_check_sbp2_response(scsi_id, SCpnt);
         }
 
@@ -2459,6 +2428,8 @@ static void sbp2scsi_complete_command(struct scsi_id_instance_data *scsi_id,
          * If a unit attention occurs, return busy status so it gets
          * retried... it could have happened because of a 1394 bus reset
          * or hot-plug...
+         * XXX  DID_BUS_BUSY is actually a bad idea because it will defy
+         * the scsi layer's retry logic.
          */
 #if 0
         if ((scsi_status == SBP2_SCSI_STATUS_CHECK_CONDITION) &&
@@ -2624,7 +2595,7 @@ static int sbp2_module_init(void)
 {
         int ret;
 
-        SBP2_DEBUG("sbp2_module_init");
+        SBP2_DEBUG_ENTER();
 
         /* Module load debug option to force one command at a time (serializing I/O) */
         if (serialize_io) {
@@ -2652,7 +2623,7 @@ static int sbp2_module_init(void)
 
 static void __exit sbp2_module_exit(void)
 {
-        SBP2_DEBUG("sbp2_module_exit");
+        SBP2_DEBUG_ENTER();
 
         hpsb_unregister_protocol(&sbp2_driver);
 
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c
index 216dbbf1dc..4e3bd62c45 100644
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
@@ -42,7 +42,6 @@
 #include <linux/poll.h>
 #include <linux/smp_lock.h>
 #include <linux/delay.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/vmalloc.h>
@@ -1322,9 +1321,6 @@ static void video1394_add_host (struct hpsb_host *host)
         class_device_create(hpsb_protocol_class, NULL, MKDEV(
                 IEEE1394_MAJOR, minor), 
                 NULL, "%s-%d", VIDEO1394_DRIVER_NAME, ohci->host->id);
-        devfs_mk_cdev(MKDEV(IEEE1394_MAJOR, minor),
-                       S_IFCHR | S_IRUSR | S_IWUSR,
-                       "%s/%d", VIDEO1394_DRIVER_NAME, ohci->host->id);
 }
 
 
@@ -1332,12 +1328,9 @@ static void video1394_remove_host (struct hpsb_host *host)
 {
         struct ti_ohci *ohci = hpsb_get_hostinfo(&video1394_highlevel, host);
 
-        if (ohci) {
+        if (ohci)
                 class_device_destroy(hpsb_protocol_class, MKDEV(IEEE1394_MAJOR,
                         IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + ohci->host->id));
-                devfs_remove("%s/%d", VIDEO1394_DRIVER_NAME, ohci->host->id);
-        }
-        
         return;
 }
 
@@ -1478,12 +1471,8 @@ static long video1394_compat_ioctl(struct file *f, unsigned cmd, unsigned long a
 static void __exit video1394_exit_module (void)
 {
         hpsb_unregister_protocol(&video1394_driver);
-
         hpsb_unregister_highlevel(&video1394_highlevel);
-
-        devfs_remove(VIDEO1394_DRIVER_NAME);
         cdev_del(&video1394_cdev);
-
         PRINT_G(KERN_INFO, "Removed " VIDEO1394_DRIVER_NAME " module");
 }
 
@@ -1500,15 +1489,12 @@ static int __init video1394_init_module (void)
                 return ret;
         }
 
-        devfs_mk_dir(VIDEO1394_DRIVER_NAME);
-
         hpsb_register_highlevel(&video1394_highlevel);
 
         ret = hpsb_register_protocol(&video1394_driver);
         if (ret) {
                 PRINT_G(KERN_ERR, "video1394: failed to register protocol");
                 hpsb_unregister_highlevel(&video1394_highlevel);
-                devfs_remove(VIDEO1394_DRIVER_NAME);
                 cdev_del(&video1394_cdev);
                 return ret;
         }
diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c
index f673c461e3..1bc2678c2f 100644
--- a/drivers/infiniband/hw/mthca/mthca_qp.c
+++ b/drivers/infiniband/hw/mthca/mthca_qp.c
@@ -483,13 +483,20 @@ out:
         return err;
 }
 
-static void mthca_path_set(struct ib_ah_attr *ah, struct mthca_qp_path *path)
+static int mthca_path_set(struct mthca_dev *dev, struct ib_ah_attr *ah,
+                          struct mthca_qp_path *path)
 {
         path->g_mylmc     = ah->src_path_bits & 0x7f;
         path->rlid        = cpu_to_be16(ah->dlid);
         path->static_rate = !!ah->static_rate;
 
         if (ah->ah_flags & IB_AH_GRH) {
+                if (ah->grh.sgid_index >= dev->limits.gid_table_len) {
+                        mthca_dbg(dev, "sgid_index (%u) too large. max is %d\n",
+                                  ah->grh.sgid_index, dev->limits.gid_table_len-1);
+                        return -1;
+                }
+
                 path->g_mylmc   |= 1 << 7;
                 path->mgid_index = ah->grh.sgid_index;
                 path->hop_limit  = ah->grh.hop_limit;
@@ -500,6 +507,8 @@ static void mthca_path_set(struct ib_ah_attr *ah, struct mthca_qp_path *path)
                 memcpy(path->rgid, ah->grh.dgid.raw, 16);
         } else
                 path->sl_tclass_flowlabel = cpu_to_be32(ah->sl << 28);
+
+        return 0;
 }
 
 int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
@@ -592,8 +601,14 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
 
         if (qp->transport == MLX || qp->transport == UD)
                 qp_context->mtu_msgmax = (IB_MTU_2048 << 5) | 11;
-        else if (attr_mask & IB_QP_PATH_MTU)
+        else if (attr_mask & IB_QP_PATH_MTU) {
+                if (attr->path_mtu < IB_MTU_256 || attr->path_mtu > IB_MTU_2048) {
+                        mthca_dbg(dev, "path MTU (%u) is invalid\n",
+                                  attr->path_mtu);
+                        return -EINVAL;
+                }
                 qp_context->mtu_msgmax = (attr->path_mtu << 5) | 31;
+        }
 
         if (mthca_is_memfree(dev)) {
                 if (qp->rq.max)
@@ -642,7 +657,9 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
         }
 
         if (attr_mask & IB_QP_AV) {
-                mthca_path_set(&attr->ah_attr, &qp_context->pri_path);
+                if (mthca_path_set(dev, &attr->ah_attr, &qp_context->pri_path))
+                        return -EINVAL;
+
                 qp_param->opt_param_mask |= cpu_to_be32(MTHCA_QP_OPTPAR_PRIMARY_ADDR_PATH);
         }
 
@@ -664,7 +681,9 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
                         return -EINVAL;
                 }
 
-                mthca_path_set(&attr->alt_ah_attr, &qp_context->alt_path);
+                if (mthca_path_set(dev, &attr->alt_ah_attr, &qp_context->alt_path))
+                        return -EINVAL;
+
                 qp_context->alt_path.port_pkey |= cpu_to_be32(attr->alt_pkey_index |
                                                               attr->alt_port_num << 24);
                 qp_context->alt_path.ackto = attr->alt_timeout << 3;
@@ -758,21 +777,20 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
 
         err = mthca_MODIFY_QP(dev, cur_state, new_state, qp->qpn, 0,
                               mailbox, sqd_event, &status);
+        if (err)
+                goto out;
         if (status) {
                 mthca_warn(dev, "modify QP %d->%d returned status %02x.\n",
                            cur_state, new_state, status);
                 err = -EINVAL;
+                goto out;
         }
 
-        if (!err) {
-                qp->state = new_state;
-                if (attr_mask & IB_QP_ACCESS_FLAGS)
-                        qp->atomic_rd_en = attr->qp_access_flags;
-                if (attr_mask & IB_QP_MAX_DEST_RD_ATOMIC)
-                        qp->resp_depth = attr->max_dest_rd_atomic;
-        }
-
-        mthca_free_mailbox(dev, mailbox);
+        qp->state = new_state;
+        if (attr_mask & IB_QP_ACCESS_FLAGS)
+                qp->atomic_rd_en = attr->qp_access_flags;
+        if (attr_mask & IB_QP_MAX_DEST_RD_ATOMIC)
+                qp->resp_depth = attr->max_dest_rd_atomic;
 
         if (is_sqp(dev, qp))
                 store_attrs(to_msqp(qp), attr, attr_mask);
@@ -797,7 +815,7 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
          * If we moved a kernel QP to RESET, clean up all old CQ
          * entries and reinitialize the QP.
          */
-        if (!err && new_state == IB_QPS_RESET && !qp->ibqp.uobject) {
+        if (new_state == IB_QPS_RESET && !qp->ibqp.uobject) {
                 mthca_cq_clean(dev, to_mcq(qp->ibqp.send_cq)->cqn, qp->qpn,
                                qp->ibqp.srq ? to_msrq(qp->ibqp.srq) : NULL);
                 if (qp->ibqp.send_cq != qp->ibqp.recv_cq)
@@ -816,6 +834,8 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
                 }
         }
 
+out:
+        mthca_free_mailbox(dev, mailbox);
         return err;
 }
 
@@ -1177,10 +1197,6 @@ int mthca_alloc_qp(struct mthca_dev *dev,
 {
         int err;
 
-        err = mthca_set_qp_size(dev, cap, pd, qp);
-        if (err)
-                return err;
-
         switch (type) {
         case IB_QPT_RC: qp->transport = RC; break;
         case IB_QPT_UC: qp->transport = UC; break;
@@ -1188,6 +1204,10 @@ int mthca_alloc_qp(struct mthca_dev *dev,
         default: return -EINVAL;
         }
 
+        err = mthca_set_qp_size(dev, cap, pd, qp);
+        if (err)
+                return err;
+
         qp->qpn = mthca_alloc(&dev->qp_table.alloc);
         if (qp->qpn == -1)
                 return -ENOMEM;
@@ -1220,6 +1240,7 @@ int mthca_alloc_sqp(struct mthca_dev *dev,
         u32 mqpn = qpn * 2 + dev->qp_table.sqp_start + port - 1;
         int err;
 
+        sqp->qp.transport = MLX;
         err = mthca_set_qp_size(dev, cap, pd, &sqp->qp);
         if (err)
                 return err;
@@ -1980,8 +2001,8 @@ int mthca_arbel_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
                 wmb();
                 ((struct mthca_next_seg *) prev_wqe)->ee_nds =
                         cpu_to_be32(MTHCA_NEXT_DBD | size |
-                                    ((wr->send_flags & IB_SEND_FENCE) ?
-                                    MTHCA_NEXT_FENCE : 0));
+                                    ((wr->send_flags & IB_SEND_FENCE) ?
+                                     MTHCA_NEXT_FENCE : 0));
 
                 if (!size0) {
                         size0 = size;
diff --git a/drivers/infiniband/hw/mthca/mthca_srq.c b/drivers/infiniband/hw/mthca/mthca_srq.c
index 47a6a754a5..0cfd158022 100644
--- a/drivers/infiniband/hw/mthca/mthca_srq.c
+++ b/drivers/infiniband/hw/mthca/mthca_srq.c
@@ -205,6 +205,10 @@ int mthca_alloc_srq(struct mthca_dev *dev, struct mthca_pd *pd,
         ds = max(64UL,
                  roundup_pow_of_two(sizeof (struct mthca_next_seg) +
                                     srq->max_gs * sizeof (struct mthca_data_seg)));
+
+        if (ds > dev->limits.max_desc_sz)
+                return -EINVAL;
+
         srq->wqe_shift = long_log2(ds);
 
         srq->srqn = mthca_alloc(&dev->srq_table.alloc);
@@ -354,6 +358,8 @@ int mthca_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,
                 return -EINVAL;
 
         if (attr_mask & IB_SRQ_LIMIT) {
+                if (attr->srq_limit > srq->max)
+                        return -EINVAL;
                 ret = mthca_ARM_SRQ(dev, srq->srqn, attr->srq_limit, &status);
                 if (ret)
                         return ret;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index 1251f86ec8..b640107fb7 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -72,13 +72,14 @@ enum {
         IPOIB_MAX_MCAST_QUEUE     = 3,
 
         IPOIB_FLAG_OPER_UP        = 0,
-        IPOIB_FLAG_ADMIN_UP       = 1,
-        IPOIB_PKEY_ASSIGNED       = 2,
-        IPOIB_PKEY_STOP           = 3,
-        IPOIB_FLAG_SUBINTERFACE   = 4,
-        IPOIB_MCAST_RUN           = 5,
-        IPOIB_STOP_REAPER         = 6,
-        IPOIB_MCAST_STARTED       = 7,
+        IPOIB_FLAG_INITIALIZED    = 1,
+        IPOIB_FLAG_ADMIN_UP       = 2,
+        IPOIB_PKEY_ASSIGNED       = 3,
+        IPOIB_PKEY_STOP           = 4,
+        IPOIB_FLAG_SUBINTERFACE   = 5,
+        IPOIB_MCAST_RUN           = 6,
+        IPOIB_STOP_REAPER         = 7,
+        IPOIB_MCAST_STARTED       = 8,
 
         IPOIB_MAX_BACKOFF_SECONDS = 16,
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index a1f5a05f2f..ed65202878 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -423,13 +423,33 @@ int ipoib_ib_dev_open(struct net_device *dev)
         clear_bit(IPOIB_STOP_REAPER, &priv->flags);
         queue_delayed_work(ipoib_workqueue, &priv->ah_reap_task, HZ);
 
+        set_bit(IPOIB_FLAG_INITIALIZED, &priv->flags);
+
         return 0;
 }
 
+static void ipoib_pkey_dev_check_presence(struct net_device *dev)
+{
+        struct ipoib_dev_priv *priv = netdev_priv(dev);
+        u16 pkey_index = 0;
+
+        if (ib_find_cached_pkey(priv->ca, priv->port, priv->pkey, &pkey_index))
+                clear_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
+        else
+                set_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
+}
+
 int ipoib_ib_dev_up(struct net_device *dev)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
 
+        ipoib_pkey_dev_check_presence(dev);
+
+        if (!test_bit(IPOIB_PKEY_ASSIGNED, &priv->flags)) {
+                ipoib_dbg(priv, "PKEY is not assigned.\n");
+                return 0;
+        }
+
         set_bit(IPOIB_FLAG_OPER_UP, &priv->flags);
 
         return ipoib_mcast_start_thread(dev);
@@ -483,6 +503,8 @@ int ipoib_ib_dev_stop(struct net_device *dev)
         struct ipoib_tx_buf *tx_req;
         int i;
 
+        clear_bit(IPOIB_FLAG_INITIALIZED, &priv->flags);
+
         /*
          * Move our QP to the error state and then reinitialize in
          * when all work requests have completed or have been flushed.
@@ -587,8 +609,15 @@ void ipoib_ib_dev_flush(void *_dev)
         struct net_device *dev = (struct net_device *)_dev;
         struct ipoib_dev_priv *priv = netdev_priv(dev), *cpriv;
 
-        if (!test_bit(IPOIB_FLAG_ADMIN_UP, &priv->flags))
+        if (!test_bit(IPOIB_FLAG_INITIALIZED, &priv->flags) ) {
+                ipoib_dbg(priv, "Not flushing - IPOIB_FLAG_INITIALIZED not set.\n");
+                return;
+        }
+
+        if (!test_bit(IPOIB_FLAG_ADMIN_UP, &priv->flags)) {
+                ipoib_dbg(priv, "Not flushing - IPOIB_FLAG_ADMIN_UP not set.\n");
                 return;
+        }
 
         ipoib_dbg(priv, "flushing\n");
 
@@ -605,7 +634,7 @@ void ipoib_ib_dev_flush(void *_dev)
 
         /* Flush any child interfaces too */
         list_for_each_entry(cpriv, &priv->child_intfs, list)
-                ipoib_ib_dev_flush(&cpriv->dev);
+                ipoib_ib_dev_flush(cpriv->dev);
 
         mutex_unlock(&priv->vlan_mutex);
 }
@@ -632,17 +661,6 @@ void ipoib_ib_dev_cleanup(struct net_device *dev)
  * change async notification is available.
  */
 
-static void ipoib_pkey_dev_check_presence(struct net_device *dev)
-{
-        struct ipoib_dev_priv *priv = netdev_priv(dev);
-        u16 pkey_index = 0;
-
-        if (ib_find_cached_pkey(priv->ca, priv->port, priv->pkey, &pkey_index))
-                clear_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
-        else
-                set_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
-}
-
 void ipoib_pkey_poll(void *dev_ptr)
 {
         struct net_device *dev = dev_ptr;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 37da8d3dc3..53a32f6578 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -736,6 +736,11 @@ static void ipoib_set_mcast_list(struct net_device *dev)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
 
+        if (!test_bit(IPOIB_FLAG_OPER_UP, &priv->flags)) {
+                ipoib_dbg(priv, "IPOIB_FLAG_OPER_UP not set");
+                return;
+        }
+
         queue_work(ipoib_workqueue, &priv->restart_task);
 }
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
index 18d2f53ec3..5f0388027b 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
@@ -251,10 +251,12 @@ void ipoib_event(struct ib_event_handler *handler,
         struct ipoib_dev_priv *priv =
                 container_of(handler, struct ipoib_dev_priv, event_handler);
 
-        if (record->event == IB_EVENT_PORT_ACTIVE ||
+        if (record->event == IB_EVENT_PORT_ERR    ||
+            record->event == IB_EVENT_PKEY_CHANGE ||
+            record->event == IB_EVENT_PORT_ACTIVE ||
             record->event == IB_EVENT_LID_CHANGE  ||
             record->event == IB_EVENT_SM_CHANGE) {
-                ipoib_dbg(priv, "Port active event\n");
+                ipoib_dbg(priv, "Port state change event\n");
                 queue_work(ipoib_workqueue, &priv->flush_task);
         }
 }
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index a13dcdf90a..61924cc30e 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -503,8 +503,10 @@ err:
 static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_target_port *target,
                         struct srp_request *req)
 {
+        struct scatterlist *scat;
         struct srp_cmd *cmd = req->cmd->buf;
-        int len;
+        int len, nents, count;
+        int i;
         u8 fmt;
 
         if (!scmnd->request_buffer || scmnd->sc_data_direction == DMA_NONE)
@@ -517,82 +519,66 @@ static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_target_port *target,
                 return -EINVAL;
         }
 
-        if (scmnd->use_sg) {
-                struct scatterlist *scat = scmnd->request_buffer;
-                int n;
-                int i;
-
-                n = dma_map_sg(target->srp_host->dev->dma_device,
-                               scat, scmnd->use_sg, scmnd->sc_data_direction);
+        /*
+         * This handling of non-SG commands can be killed when the
+         * SCSI midlayer no longer generates non-SG commands.
+         */
+        if (likely(scmnd->use_sg)) {
+                nents = scmnd->use_sg;
+                scat  = scmnd->request_buffer;
+        } else {
+                nents = 1;
+                scat  = &req->fake_sg;
+                sg_init_one(scat, scmnd->request_buffer, scmnd->request_bufflen);
+        }
 
-                if (n == 1) {
-                        struct srp_direct_buf *buf = (void *) cmd->add_data;
+        count = dma_map_sg(target->srp_host->dev->dma_device, scat, nents,
+                           scmnd->sc_data_direction);
 
-                        fmt = SRP_DATA_DESC_DIRECT;
+        if (count == 1) {
+                struct srp_direct_buf *buf = (void *) cmd->add_data;
 
-                        buf->va  = cpu_to_be64(sg_dma_address(scat));
-                        buf->key = cpu_to_be32(target->srp_host->mr->rkey);
-                        buf->len = cpu_to_be32(sg_dma_len(scat));
+                fmt = SRP_DATA_DESC_DIRECT;
 
-                        len = sizeof (struct srp_cmd) +
-                                sizeof (struct srp_direct_buf);
-                } else {
-                        struct srp_indirect_buf *buf = (void *) cmd->add_data;
-                        u32 datalen = 0;
+                buf->va  = cpu_to_be64(sg_dma_address(scat));
+                buf->key = cpu_to_be32(target->srp_host->mr->rkey);
+                buf->len = cpu_to_be32(sg_dma_len(scat));
 
-                        fmt = SRP_DATA_DESC_INDIRECT;
+                len = sizeof (struct srp_cmd) +
+                        sizeof (struct srp_direct_buf);
+        } else {
+                struct srp_indirect_buf *buf = (void *) cmd->add_data;
+                u32 datalen = 0;
 
-                        if (scmnd->sc_data_direction == DMA_TO_DEVICE)
-                                cmd->data_out_desc_cnt = n;
-                        else
-                                cmd->data_in_desc_cnt = n;
+                fmt = SRP_DATA_DESC_INDIRECT;
 
-                        buf->table_desc.va  = cpu_to_be64(req->cmd->dma +
-                                                          sizeof *cmd +
-                                                          sizeof *buf);
-                        buf->table_desc.key =
+                if (scmnd->sc_data_direction == DMA_TO_DEVICE)
+                        cmd->data_out_desc_cnt = count;
+                else
+                        cmd->data_in_desc_cnt = count;
+
+                buf->table_desc.va  = cpu_to_be64(req->cmd->dma +
+                                                  sizeof *cmd +
+                                                  sizeof *buf);
+                buf->table_desc.key =
+                        cpu_to_be32(target->srp_host->mr->rkey);
+                buf->table_desc.len =
+                        cpu_to_be32(count * sizeof (struct srp_direct_buf));
+
+                for (i = 0; i < count; ++i) {
+                        buf->desc_list[i].va  = cpu_to_be64(sg_dma_address(&scat[i]));
+                        buf->desc_list[i].key =
                                 cpu_to_be32(target->srp_host->mr->rkey);
-                        buf->table_desc.len =
-                                cpu_to_be32(n * sizeof (struct srp_direct_buf));
-
-                        for (i = 0; i < n; ++i) {
-                                buf->desc_list[i].va  = cpu_to_be64(sg_dma_address(&scat[i]));
-                                buf->desc_list[i].key =
-                                        cpu_to_be32(target->srp_host->mr->rkey);
-                                buf->desc_list[i].len = cpu_to_be32(sg_dma_len(&scat[i]));
-
-                                datalen += sg_dma_len(&scat[i]);
-                        }
+                        buf->desc_list[i].len = cpu_to_be32(sg_dma_len(&scat[i]));
 
-                        buf->len = cpu_to_be32(datalen);
-
-                        len = sizeof (struct srp_cmd) +
-                                sizeof (struct srp_indirect_buf) +
-                                n * sizeof (struct srp_direct_buf);
-                }
-        } else {
-                struct srp_direct_buf *buf = (void *) cmd->add_data;
-                dma_addr_t dma;
-
-                dma = dma_map_single(target->srp_host->dev->dma_device,
-                                     scmnd->request_buffer, scmnd->request_bufflen,
-                                     scmnd->sc_data_direction);
-                if (dma_mapping_error(dma)) {
-                        printk(KERN_WARNING PFX "unable to map %p/%d (dir %d)\n",
-                               scmnd->request_buffer, (int) scmnd->request_bufflen,
-                               scmnd->sc_data_direction);
-                        return -EINVAL;
+                        datalen += sg_dma_len(&scat[i]);
                 }
 
-                pci_unmap_addr_set(req, direct_mapping, dma);
+                buf->len = cpu_to_be32(datalen);
 
-                buf->va  = cpu_to_be64(dma);
-                buf->key = cpu_to_be32(target->srp_host->mr->rkey);
-                buf->len = cpu_to_be32(scmnd->request_bufflen);
-
-                fmt = SRP_DATA_DESC_DIRECT;
-
-                len = sizeof (struct srp_cmd) + sizeof (struct srp_direct_buf);
+                len = sizeof (struct srp_cmd) +
+                        sizeof (struct srp_indirect_buf) +
+                        count * sizeof (struct srp_direct_buf);
         }
 
         if (scmnd->sc_data_direction == DMA_TO_DEVICE)
@@ -600,7 +586,6 @@ static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_target_port *target,
         else
                 cmd->buf_fmt = fmt;
 
-
         return len;
 }
 
@@ -608,20 +593,28 @@ static void srp_unmap_data(struct scsi_cmnd *scmnd,
                            struct srp_target_port *target,
                            struct srp_request *req)
 {
+        struct scatterlist *scat;
+        int nents;
+
         if (!scmnd->request_buffer ||
             (scmnd->sc_data_direction != DMA_TO_DEVICE &&
              scmnd->sc_data_direction != DMA_FROM_DEVICE))
-            return;
+                return;
 
-        if (scmnd->use_sg)
-                dma_unmap_sg(target->srp_host->dev->dma_device,
-                             (struct scatterlist *) scmnd->request_buffer,
-                             scmnd->use_sg, scmnd->sc_data_direction);
-        else
-                dma_unmap_single(target->srp_host->dev->dma_device,
-                                 pci_unmap_addr(req, direct_mapping),
-                                 scmnd->request_bufflen,
-                                 scmnd->sc_data_direction);
+        /*
+         * This handling of non-SG commands can be killed when the
+         * SCSI midlayer no longer generates non-SG commands.
+         */
+        if (likely(scmnd->use_sg)) {
+                nents = scmnd->use_sg;
+                scat  = (struct scatterlist *) scmnd->request_buffer;
+        } else {
+                nents = 1;
+                scat  = (struct scatterlist *) scmnd->request_buffer;
+        }
+
+        dma_unmap_sg(target->srp_host->dev->dma_device, scat, nents,
+                     scmnd->sc_data_direction);
 }
 
 static void srp_process_rsp(struct srp_target_port *target, struct srp_rsp *rsp)
diff --git a/drivers/infiniband/ulp/srp/ib_srp.h b/drivers/infiniband/ulp/srp/ib_srp.h
index 4e7727df32..bd7f7c3115 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.h
+++ b/drivers/infiniband/ulp/srp/ib_srp.h
@@ -38,6 +38,7 @@
 #include <linux/types.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
+#include <linux/scatterlist.h>
 
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_cmnd.h>
@@ -94,7 +95,11 @@ struct srp_request {
         struct scsi_cmnd       *scmnd;
         struct srp_iu          *cmd;
         struct srp_iu          *tsk_mgmt;
-        DECLARE_PCI_UNMAP_ADDR(direct_mapping)
+        /*
+         * Fake scatterlist used when scmnd->use_sg==0.  Can be killed
+         * when the SCSI midlayer no longer generates non-SG commands.
+         */
+        struct scatterlist      fake_sg;
         struct completion       done;
         short                   next;
         u8                      cmd_done;
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 4fe3da3c66..f8af094596 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -923,7 +923,7 @@ void input_unregister_handler(struct input_handler *handler)
 static int input_open_file(struct inode *inode, struct file *file)
 {
         struct input_handler *handler = input_table[iminor(inode) >> 5];
-        struct file_operations *old_fops, *new_fops = NULL;
+        const struct file_operations *old_fops, *new_fops = NULL;
         int err;
 
         /* No load-on-demand here? */
diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c
index 5704204964..ea499783fb 100644
--- a/drivers/input/serio/hil_mlc.c
+++ b/drivers/input/serio/hil_mlc.c
@@ -556,7 +556,7 @@ static inline void hilse_setup_input(hil_mlc *mlc, struct hilse_node *node) {
         do_gettimeofday(&(mlc->instart));
         mlc->icount = 15;
         memset(mlc->ipacket, 0, 16 * sizeof(hil_packet));
-        if (down_trylock(&(mlc->isem))) BUG();
+        BUG_ON(down_trylock(&(mlc->isem)));
 
         return;
 }
diff --git a/drivers/input/serio/hp_sdc_mlc.c b/drivers/input/serio/hp_sdc_mlc.c
index 1c9426fd52..aa4a8a4ccf 100644
--- a/drivers/input/serio/hp_sdc_mlc.c
+++ b/drivers/input/serio/hp_sdc_mlc.c
@@ -270,9 +270,10 @@ static void hp_sdc_mlc_out (hil_mlc *mlc) {
 
  do_control:
         priv->emtestmode = mlc->opacket & HIL_CTRL_TEST;
-        if ((mlc->opacket & (HIL_CTRL_APE | HIL_CTRL_IPF)) == HIL_CTRL_APE) {
-                BUG(); /* we cannot emulate this, it should not be used. */
-        }
+        
+        /* we cannot emulate this, it should not be used. */
+        BUG_ON((mlc->opacket & (HIL_CTRL_APE | HIL_CTRL_IPF)) == HIL_CTRL_APE);
+        
         if ((mlc->opacket & HIL_CTRL_ONLY) == HIL_CTRL_ONLY) goto control_only;
         if (mlc->opacket & HIL_CTRL_APE) { 
                 BUG(); /* Should not send command/data after engaging APE */
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 8c12a974b4..46d1fec2cf 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -23,6 +23,7 @@
 #include <linux/slab.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
+#include <asm/irq.h>
 
 #ifdef  CONFIG_ARM
 #include <asm/mach-types.h>
diff --git a/drivers/isdn/Makefile b/drivers/isdn/Makefile
index 03d8ccd519..988142c30a 100644
--- a/drivers/isdn/Makefile
+++ b/drivers/isdn/Makefile
@@ -13,3 +13,4 @@ obj-$(CONFIG_ISDN_DRV_SC)		+= sc/
 obj-$(CONFIG_ISDN_DRV_LOOP)             += isdnloop/
 obj-$(CONFIG_ISDN_DRV_ACT2000)          += act2000/
 obj-$(CONFIG_HYSDN)                     += hysdn/
+obj-$(CONFIG_ISDN_DRV_GIGASET)          += gigaset/
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 623adbb0d1..9b493f0bec 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -1485,6 +1485,7 @@ static int __init capi_init(void)
 {
         char *p;
         char *compileinfo;
+        int major_ret;
 
         if ((p = strchr(revision, ':')) != 0 && p[1]) {
                 strlcpy(rev, p + 2, sizeof(rev));
@@ -1493,11 +1494,12 @@ static int __init capi_init(void)
         } else
                 strcpy(rev, "1.0");
 
-        if (register_chrdev(capi_major, "capi20", &capi_fops)) {
+        major_ret = register_chrdev(capi_major, "capi20", &capi_fops);
+        if (major_ret < 0) {
                 printk(KERN_ERR "capi20: unable to get major %d\n", capi_major);
-                return -EIO;
+                return major_ret;
         }
-
+        capi_major = major_ret;
         capi_class = class_create(THIS_MODULE, "capi");
         if (IS_ERR(capi_class)) {
                 unregister_chrdev(capi_major, "capi20");
diff --git a/drivers/isdn/capi/kcapi_proc.c b/drivers/isdn/capi/kcapi_proc.c
index 2cc8b27e4c..ca9dc00a45 100644
--- a/drivers/isdn/capi/kcapi_proc.c
+++ b/drivers/isdn/capi/kcapi_proc.c
@@ -233,7 +233,7 @@ static struct file_operations proc_applstats_ops = {
 };
 
 static void
-create_seq_entry(char *name, mode_t mode, struct file_operations *f)
+create_seq_entry(char *name, mode_t mode, const struct file_operations *f)
 {
         struct proc_dir_entry *entry;
         entry = create_proc_entry(name, mode, NULL);
diff --git a/drivers/isdn/gigaset/Kconfig b/drivers/isdn/gigaset/Kconfig
new file mode 100644
index 0000000000..53c4fb62ed
--- /dev/null
+++ b/drivers/isdn/gigaset/Kconfig
@@ -0,0 +1,42 @@
+menu "Siemens Gigaset"
+        depends on ISDN_I4L
+
+config ISDN_DRV_GIGASET
+        tristate "Siemens Gigaset support (isdn)"
+        depends on ISDN_I4L && m
+#       depends on ISDN_I4L && MODULES
+        help
+          Say m here if you have a Gigaset or Sinus isdn device.
+
+if ISDN_DRV_GIGASET!=n
+
+config GIGASET_BASE
+        tristate "Gigaset base station support"
+        depends on ISDN_DRV_GIGASET && USB
+        help
+          Say m here if you need to communicate with the base
+          directly via USB.
+
+config GIGASET_M105
+        tristate "Gigaset M105 support"
+        depends on ISDN_DRV_GIGASET && USB
+        help
+          Say m here if you need the driver for the Gigaset M105 device.
+
+config GIGASET_DEBUG
+        bool "Gigaset debugging"
+        help
+          This enables debugging code in the Gigaset drivers.
+          If in doubt, say yes.
+
+config GIGASET_UNDOCREQ
+        bool "Support for undocumented USB requests"
+        help
+          This enables support for USB requests we only know from
+          reverse engineering (currently M105 only). If you need
+          features like configuration mode of M105, say yes. If you
+          care about your device, say no.
+
+endif
+
+endmenu
diff --git a/drivers/isdn/gigaset/Makefile b/drivers/isdn/gigaset/Makefile
new file mode 100644
index 0000000000..9b9acf1a21
--- /dev/null
+++ b/drivers/isdn/gigaset/Makefile
@@ -0,0 +1,6 @@
+gigaset-y := common.o interface.o proc.o ev-layer.o i4l.o
+usb_gigaset-y := usb-gigaset.o asyncdata.o
+bas_gigaset-y := bas-gigaset.o isocdata.o
+
+obj-$(CONFIG_GIGASET_M105) += usb_gigaset.o gigaset.o
+obj-$(CONFIG_GIGASET_BASE) += bas_gigaset.o gigaset.o
diff --git a/drivers/isdn/gigaset/asyncdata.c b/drivers/isdn/gigaset/asyncdata.c
new file mode 100644
index 0000000000..171f8b703d
--- /dev/null
+++ b/drivers/isdn/gigaset/asyncdata.c
@@ -0,0 +1,597 @@
+/*
+ * Common data handling layer for ser_gigaset and usb_gigaset
+ *
+ * Copyright (c) 2005 by Tilman Schmidt <tilman@imap.cc>,
+ *                       Hansjoerg Lipp <hjlipp@web.de>,
+ *                       Stefan Eilers <Eilers.Stefan@epost.de>.
+ *
+ * =====================================================================
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License as
+ *      published by the Free Software Foundation; either version 2 of
+ *      the License, or (at your option) any later version.
+ * =====================================================================
+ * ToDo: ...
+ * =====================================================================
+ * Version: $Id: asyncdata.c,v 1.2.2.7 2005/11/13 23:05:18 hjlipp Exp $
+ * =====================================================================
+ */
+
+#include "gigaset.h"
+#include <linux/crc-ccitt.h>
+
+//#define GIG_M10x_STUFF_VOICE_DATA
+
+/* check if byte must be stuffed/escaped
+ * I'm not sure which data should be encoded.
+ * Therefore I will go the hard way and decode every value
+ * less than 0x20, the flag sequence and the control escape char.
+ */
+static inline int muststuff(unsigned char c)
+{
+        if (c < PPP_TRANS) return 1;
+        if (c == PPP_FLAG) return 1;
+        if (c == PPP_ESCAPE) return 1;
+        /* other possible candidates: */
+        /* 0x91: XON with parity set */
+        /* 0x93: XOFF with parity set */
+        return 0;
+}
+
+/* == data input =========================================================== */
+
+/* process a block of received bytes in command mode (modem response)
+ * Return value:
+ *      number of processed bytes
+ */
+static inline int cmd_loop(unsigned char c, unsigned char *src, int numbytes,
+                           struct inbuf_t *inbuf)
+{
+        struct cardstate *cs = inbuf->cs;
+        unsigned cbytes      = cs->cbytes;
+        int inputstate = inbuf->inputstate;
+        int startbytes = numbytes;
+
+        for (;;) {
+                cs->respdata[cbytes] = c;
+                if (c == 10 || c == 13) {
+                        dbg(DEBUG_TRANSCMD, "%s: End of Command (%d Bytes)",
+                            __func__, cbytes);
+                        cs->cbytes = cbytes;
+                        gigaset_handle_modem_response(cs); /* can change cs->dle */
+                        cbytes = 0;
+
+                        if (cs->dle &&
+                            !(inputstate & INS_DLE_command)) {
+                                inputstate &= ~INS_command;
+                                break;
+                        }
+                } else {
+                        /* advance in line buffer, checking for overflow */
+                        if (cbytes < MAX_RESP_SIZE - 1)
+                                cbytes++;
+                        else
+                                warn("response too large");
+                }
+
+                if (!numbytes)
+                        break;
+                c = *src++;
+                --numbytes;
+                if (c == DLE_FLAG &&
+                    (cs->dle || inputstate & INS_DLE_command)) {
+                        inputstate |= INS_DLE_char;
+                        break;
+                }
+        }
+
+        cs->cbytes = cbytes;
+        inbuf->inputstate = inputstate;
+
+        return startbytes - numbytes;
+}
+
+/* process a block of received bytes in lock mode (tty i/f)
+ * Return value:
+ *      number of processed bytes
+ */
+static inline int lock_loop(unsigned char *src, int numbytes,
+                            struct inbuf_t *inbuf)
+{
+        struct cardstate *cs = inbuf->cs;
+
+        gigaset_dbg_buffer(DEBUG_LOCKCMD, "received response", numbytes, src, 0);
+        gigaset_if_receive(cs, src, numbytes);
+
+        return numbytes;
+}
+
+/* process a block of received bytes in HDLC data mode
+ * Collect HDLC frames, undoing byte stuffing and watching for DLE escapes.
+ * When a frame is complete, check the FCS and pass valid frames to the LL.
+ * If DLE is encountered, return immediately to let the caller handle it.
+ * Return value:
+ *      number of processed bytes
+ *      numbytes (all bytes processed) on error --FIXME
+ */
+static inline int hdlc_loop(unsigned char c, unsigned char *src, int numbytes,
+                            struct inbuf_t *inbuf)
+{
+        struct cardstate *cs = inbuf->cs;
+        struct bc_state *bcs = inbuf->bcs;
+        int inputstate;
+        __u16 fcs;
+        struct sk_buff *skb;
+        unsigned char error;
+        struct sk_buff *compskb;
+        int startbytes = numbytes;
+        int l;
+
+        IFNULLRETVAL(bcs, numbytes);
+        inputstate = bcs->inputstate;
+        fcs = bcs->fcs;
+        skb = bcs->skb;
+        IFNULLRETVAL(skb, numbytes);
+
+        if (unlikely(inputstate & INS_byte_stuff)) {
+                inputstate &= ~INS_byte_stuff;
+                goto byte_stuff;
+        }
+        for (;;) {
+                if (unlikely(c == PPP_ESCAPE)) {
+                        if (unlikely(!numbytes)) {
+                                inputstate |= INS_byte_stuff;
+                                break;
+                        }
+                        c = *src++;
+                        --numbytes;
+                        if (unlikely(c == DLE_FLAG &&
+                                     (cs->dle ||
+                                      inbuf->inputstate & INS_DLE_command))) {
+                                inbuf->inputstate |= INS_DLE_char;
+                                inputstate |= INS_byte_stuff;
+                                break;
+                        }
+byte_stuff:
+                        c ^= PPP_TRANS;
+#ifdef CONFIG_GIGASET_DEBUG
+                        if (unlikely(!muststuff(c)))
+                                dbg(DEBUG_HDLC,
+                                    "byte stuffed: 0x%02x", c);
+#endif
+                } else if (unlikely(c == PPP_FLAG)) {
+                        if (unlikely(inputstate & INS_skip_frame)) {
+                                if (!(inputstate & INS_have_data)) { /* 7E 7E */
+                                        //dbg(DEBUG_HDLC, "(7e)7e------------------------");
+#ifdef CONFIG_GIGASET_DEBUG
+                                        ++bcs->emptycount;
+#endif
+                                } else
+                                        dbg(DEBUG_HDLC,
+                                            "7e----------------------------");
+
+                                /* end of frame */
+                                error = 1;
+                                gigaset_rcv_error(NULL, cs, bcs);
+                        } else if (!(inputstate & INS_have_data)) { /* 7E 7E */
+                                //dbg(DEBUG_HDLC, "(7e)7e------------------------");
+#ifdef CONFIG_GIGASET_DEBUG
+                                ++bcs->emptycount;
+#endif
+                                break;
+                        } else {
+                                dbg(DEBUG_HDLC,
+                                    "7e----------------------------");
+
+                                /* end of frame */
+                                error = 0;
+
+                                if (unlikely(fcs != PPP_GOODFCS)) {
+                                        err("Packet checksum at %lu failed, "
+                                            "packet is corrupted (%u bytes)!",
+                                            bcs->rcvbytes, skb->len);
+                                        compskb = NULL;
+                                        gigaset_rcv_error(compskb, cs, bcs);
+                                        error = 1;
+                                } else {
+                                        if (likely((l = skb->len) > 2)) {
+                                                skb->tail -= 2;
+                                                skb->len -= 2;
+                                        } else {
+                                                dev_kfree_skb(skb);
+                                                skb = NULL;
+                                                inputstate |= INS_skip_frame;
+                                                if (l == 1) {
+                                                        err("invalid packet size (1)!");
+                                                        error = 1;
+                                                        gigaset_rcv_error(NULL, cs, bcs);
+                                                }
+                                        }
+                                        if (likely(!(error ||
+                                                     (inputstate &
+                                                      INS_skip_frame)))) {
+                                                gigaset_rcv_skb(skb, cs, bcs);
+                                        }
+                                }
+                        }
+
+                        if (unlikely(error))
+                                if (skb)
+                                        dev_kfree_skb(skb);
+
+                        fcs = PPP_INITFCS;
+                        inputstate &= ~(INS_have_data | INS_skip_frame);
+                        if (unlikely(bcs->ignore)) {
+                                inputstate |= INS_skip_frame;
+                                skb = NULL;
+                        } else if (likely((skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN)) != NULL)) {
+                                skb_reserve(skb, HW_HDR_LEN);
+                        } else {
+                                warn("could not allocate new skb");
+                                inputstate |= INS_skip_frame;
+                        }
+
+                        break;
+#ifdef CONFIG_GIGASET_DEBUG
+                } else if (unlikely(muststuff(c))) {
+                        /* Should not happen. Possible after ZDLE=1<CR><LF>. */
+                        dbg(DEBUG_HDLC, "not byte stuffed: 0x%02x", c);
+#endif
+                }
+
+                /* add character */
+
+#ifdef CONFIG_GIGASET_DEBUG
+                if (unlikely(!(inputstate & INS_have_data))) {
+                        dbg(DEBUG_HDLC,
+                            "7e (%d x) ================", bcs->emptycount);
+                        bcs->emptycount = 0;
+                }
+#endif
+
+                inputstate |= INS_have_data;
+
+                if (likely(!(inputstate & INS_skip_frame))) {
+                        if (unlikely(skb->len == SBUFSIZE)) {
+                                warn("received packet too long");
+                                dev_kfree_skb_any(skb);
+                                skb = NULL;
+                                inputstate |= INS_skip_frame;
+                                break;
+                        }
+                        *gigaset_skb_put_quick(skb, 1) = c;
+                        /* *__skb_put (skb, 1) = c; */
+                        fcs = crc_ccitt_byte(fcs, c);
+                }
+
+                if (unlikely(!numbytes))
+                        break;
+                c = *src++;
+                --numbytes;
+                if (unlikely(c == DLE_FLAG &&
+                             (cs->dle ||
+                              inbuf->inputstate & INS_DLE_command))) {
+                        inbuf->inputstate |= INS_DLE_char;
+                        break;
+                }
+        }
+        bcs->inputstate = inputstate;
+        bcs->fcs = fcs;
+        bcs->skb = skb;
+        return startbytes - numbytes;
+}
+
+/* process a block of received bytes in transparent data mode
+ * Invert bytes, undoing byte stuffing and watching for DLE escapes.
+ * If DLE is encountered, return immediately to let the caller handle it.
+ * Return value:
+ *      number of processed bytes
+ *      numbytes (all bytes processed) on error --FIXME
+ */
+static inline int iraw_loop(unsigned char c, unsigned char *src, int numbytes,
+                            struct inbuf_t *inbuf)
+{
+        struct cardstate *cs = inbuf->cs;
+        struct bc_state *bcs = inbuf->bcs;
+        int inputstate;
+        struct sk_buff *skb;
+        int startbytes = numbytes;
+
+        IFNULLRETVAL(bcs, numbytes);
+        inputstate = bcs->inputstate;
+        skb = bcs->skb;
+        IFNULLRETVAL(skb, numbytes);
+
+        for (;;) {
+                /* add character */
+                inputstate |= INS_have_data;
+
+                if (likely(!(inputstate & INS_skip_frame))) {
+                        if (unlikely(skb->len == SBUFSIZE)) {
+                                //FIXME just pass skb up and allocate a new one
+                                warn("received packet too long");
+                                dev_kfree_skb_any(skb);
+                                skb = NULL;
+                                inputstate |= INS_skip_frame;
+                                break;
+                        }
+                        *gigaset_skb_put_quick(skb, 1) = gigaset_invtab[c];
+                }
+
+                if (unlikely(!numbytes))
+                        break;
+                c = *src++;
+                --numbytes;
+                if (unlikely(c == DLE_FLAG &&
+                             (cs->dle ||
+                              inbuf->inputstate & INS_DLE_command))) {
+                        inbuf->inputstate |= INS_DLE_char;
+                        break;
+                }
+        }
+
+        /* pass data up */
+        if (likely(inputstate & INS_have_data)) {
+                if (likely(!(inputstate & INS_skip_frame))) {
+                        gigaset_rcv_skb(skb, cs, bcs);
+                }
+                inputstate &= ~(INS_have_data | INS_skip_frame);
+                if (unlikely(bcs->ignore)) {
+                        inputstate |= INS_skip_frame;
+                        skb = NULL;
+                } else if (likely((skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN))
+                                  != NULL)) {
+                        skb_reserve(skb, HW_HDR_LEN);
+                } else {
+                        warn("could not allocate new skb");
+                        inputstate |= INS_skip_frame;
+                }
+        }
+
+        bcs->inputstate = inputstate;
+        bcs->skb = skb;
+        return startbytes - numbytes;
+}
+
+/* process a block of data received from the device
+ */
+void gigaset_m10x_input(struct inbuf_t *inbuf)
+{
+        struct cardstate *cs;
+        unsigned tail, head, numbytes;
+        unsigned char *src, c;
+        int procbytes;
+
+        head = atomic_read(&inbuf->head);
+        tail = atomic_read(&inbuf->tail);
+        dbg(DEBUG_INTR, "buffer state: %u -> %u", head, tail);
+
+        if (head != tail) {
+                cs = inbuf->cs;
+                src = inbuf->data + head;
+                numbytes = (head > tail ? RBUFSIZE : tail) - head;
+                dbg(DEBUG_INTR, "processing %u bytes", numbytes);
+
+                while (numbytes) {
+                        if (atomic_read(&cs->mstate) == MS_LOCKED) {
+                                procbytes = lock_loop(src, numbytes, inbuf);
+                                src += procbytes;
+                                numbytes -= procbytes;
+                        } else {
+                                c = *src++;
+                                --numbytes;
+                                if (c == DLE_FLAG && (cs->dle ||
+                                    inbuf->inputstate & INS_DLE_command)) {
+                                        if (!(inbuf->inputstate & INS_DLE_char)) {
+                                                inbuf->inputstate |= INS_DLE_char;
+                                                goto nextbyte;
+                                        }
+                                        /* <DLE> <DLE> => <DLE> in data stream */
+                                        inbuf->inputstate &= ~INS_DLE_char;
+                                }
+
+                                if (!(inbuf->inputstate & INS_DLE_char)) {
+
+                                        /* FIXME Einfach je nach Modus Funktionszeiger in cs setzen [hier+hdlc_loop]?  */
+                                        /* FIXME Spart folgendes "if" und ermoeglicht andere Protokolle */
+                                        if (inbuf->inputstate & INS_command)
+                                                procbytes = cmd_loop(c, src, numbytes, inbuf);
+                                        else if (inbuf->bcs->proto2 == ISDN_PROTO_L2_HDLC)
+                                                procbytes = hdlc_loop(c, src, numbytes, inbuf);
+                                        else
+                                                procbytes = iraw_loop(c, src, numbytes, inbuf);
+
+                                        src += procbytes;
+                                        numbytes -= procbytes;
+                                } else {  /* DLE-char */
+                                        inbuf->inputstate &= ~INS_DLE_char;
+                                        switch (c) {
+                                        case 'X': /*begin of command*/
+#ifdef CONFIG_GIGASET_DEBUG
+                                                if (inbuf->inputstate & INS_command)
+                                                        err("received <DLE> 'X' in command mode");
+#endif
+                                                inbuf->inputstate |=
+                                                        INS_command | INS_DLE_command;
+                                                break;
+                                        case '.': /*end of command*/
+#ifdef CONFIG_GIGASET_DEBUG
+                                                if (!(inbuf->inputstate & INS_command))
+                                                        err("received <DLE> '.' in hdlc mode");
+#endif
+                                                inbuf->inputstate &= cs->dle ?
+                                                        ~(INS_DLE_command|INS_command)
+                                                        : ~INS_DLE_command;
+                                                break;
+                                        //case DLE_FLAG: /*DLE_FLAG in data stream*/ /* schon oben behandelt! */
+                                        default:
+                                                err("received 0x10 0x%02x!", (int) c);
+                                                /* FIXME: reset driver?? */
+                                        }
+                                }
+                        }
+nextbyte:
+                        if (!numbytes) {
+                                /* end of buffer, check for wrap */
+                                if (head > tail) {
+                                        head = 0;
+                                        src = inbuf->data;
+                                        numbytes = tail;
+                                } else {
+                                        head = tail;
+                                        break;
+                                }
+                        }
+                }
+
+                dbg(DEBUG_INTR, "setting head to %u", head);
+                atomic_set(&inbuf->head, head);
+        }
+}
+
+
+/* == data output ========================================================== */
+
+/* Encoding of a PPP packet into an octet stuffed HDLC frame
+ * with FCS, opening and closing flags.
+ * parameters:
+ *      skb     skb containing original packet (freed upon return)
+ *      head    number of headroom bytes to allocate in result skb
+ *      tail    number of tailroom bytes to allocate in result skb
+ * Return value:
+ *      pointer to newly allocated skb containing the result frame
+ */
+static struct sk_buff *HDLC_Encode(struct sk_buff *skb, int head, int tail)
+{
+        struct sk_buff *hdlc_skb;
+        __u16 fcs;
+        unsigned char c;
+        unsigned char *cp;
+        int len;
+        unsigned int stuf_cnt;
+
+        stuf_cnt = 0;
+        fcs = PPP_INITFCS;
+        cp = skb->data;
+        len = skb->len;
+        while (len--) {
+                if (muststuff(*cp))
+                        stuf_cnt++;
+                fcs = crc_ccitt_byte(fcs, *cp++);
+        }
+        fcs ^= 0xffff;                 /* complement */
+
+        /* size of new buffer: original size + number of stuffing bytes
+         * + 2 bytes FCS + 2 stuffing bytes for FCS (if needed) + 2 flag bytes
+         */
+        hdlc_skb = dev_alloc_skb(skb->len + stuf_cnt + 6 + tail + head);
+        if (!hdlc_skb) {
+                err("unable to allocate memory for HDLC encoding!");
+                dev_kfree_skb(skb);
+                return NULL;
+        }
+        skb_reserve(hdlc_skb, head);
+
+        /* Copy acknowledge request into new skb */
+        memcpy(hdlc_skb->head, skb->head, 2);
+
+        /* Add flag sequence in front of everything.. */
+        *(skb_put(hdlc_skb, 1)) = PPP_FLAG;
+
+        /* Perform byte stuffing while copying data. */
+        while (skb->len--) {
+                if (muststuff(*skb->data)) {
+                        *(skb_put(hdlc_skb, 1)) = PPP_ESCAPE;
+                        *(skb_put(hdlc_skb, 1)) = (*skb->data++) ^ PPP_TRANS;
+                } else
+                        *(skb_put(hdlc_skb, 1)) = *skb->data++;
+        }
+
+        /* Finally add FCS (byte stuffed) and flag sequence */
+        c = (fcs & 0x00ff);      /* least significant byte first */
+        if (muststuff(c)) {
+                *(skb_put(hdlc_skb, 1)) = PPP_ESCAPE;
+                c ^= PPP_TRANS;
+        }
+        *(skb_put(hdlc_skb, 1)) = c;
+
+        c = ((fcs >> 8) & 0x00ff);
+        if (muststuff(c)) {
+                *(skb_put(hdlc_skb, 1)) = PPP_ESCAPE;
+                c ^= PPP_TRANS;
+        }
+        *(skb_put(hdlc_skb, 1)) = c;
+
+        *(skb_put(hdlc_skb, 1)) = PPP_FLAG;
+
+        dev_kfree_skb(skb);
+        return hdlc_skb;
+}
+
+/* Encoding of a raw packet into an octet stuffed bit inverted frame
+ * parameters:
+ *      skb     skb containing original packet (freed upon return)
+ *      head    number of headroom bytes to allocate in result skb
+ *      tail    number of tailroom bytes to allocate in result skb
+ * Return value:
+ *      pointer to newly allocated skb containing the result frame
+ */
+static struct sk_buff *iraw_encode(struct sk_buff *skb, int head, int tail)
+{
+        struct sk_buff *iraw_skb;
+        unsigned char c;
+        unsigned char *cp;
+        int len;
+
+        /* worst case: every byte must be stuffed */
+        iraw_skb = dev_alloc_skb(2*skb->len + tail + head);
+        if (!iraw_skb) {
+                err("unable to allocate memory for HDLC encoding!");
+                dev_kfree_skb(skb);
+                return NULL;
+        }
+        skb_reserve(iraw_skb, head);
+
+        cp = skb->data;
+        len = skb->len;
+        while (len--) {
+                c = gigaset_invtab[*cp++];
+                if (c == DLE_FLAG)
+                        *(skb_put(iraw_skb, 1)) = c;
+                *(skb_put(iraw_skb, 1)) = c;
+        }
+        dev_kfree_skb(skb);
+        return iraw_skb;
+}
+
+/* gigaset_send_skb
+ * called by common.c to queue an skb for sending
+ * and start transmission if necessary
+ * parameters:
+ *      B Channel control structure
+ *      skb
+ * Return value:
+ *      number of bytes accepted for sending
+ *      (skb->len if ok, 0 if out of buffer space)
+ *      or error code (< 0, eg. -EINVAL)
+ */
+int gigaset_m10x_send_skb(struct bc_state *bcs, struct sk_buff *skb)
+{
+        unsigned len;
+
+        IFNULLRETVAL(bcs, -EFAULT);
+        IFNULLRETVAL(skb, -EFAULT);
+        len = skb->len;
+
+        if (bcs->proto2 == ISDN_PROTO_L2_HDLC)
+                skb = HDLC_Encode(skb, HW_HDR_LEN, 0);
+        else
+                skb = iraw_encode(skb, HW_HDR_LEN, 0);
+        if (!skb)
+                return -ENOMEM;
+
+        skb_queue_tail(&bcs->squeue, skb);
+        tasklet_schedule(&bcs->cs->write_tasklet);
+
+        return len;     /* ok so far */
+}
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
new file mode 100644
index 0000000000..31f0f07832
--- /dev/null
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -0,0 +1,2365 @@
+/*
+ * USB driver for Gigaset 307x base via direct USB connection.
+ *
+ * Copyright (c) 2001 by Hansjoerg Lipp <hjlipp@web.de>,
+ *                       Tilman Schmidt <tilman@imap.cc>,
+ *                       Stefan Eilers <Eilers.Stefan@epost.de>.
+ *
+ * Based on usb-gigaset.c.
+ *
+ * =====================================================================
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License as
+ *      published by the Free Software Foundation; either version 2 of
+ *      the License, or (at your option) any later version.
+ * =====================================================================
+ * ToDo: ...
+ * =====================================================================
+ * Version: $Id: bas-gigaset.c,v 1.52.4.19 2006/02/04 18:28:16 hjlipp Exp $
+ * =====================================================================
+ */
+
+#include "gigaset.h"
+
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/timer.h>
+#include <linux/usb.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+
+/* Version Information */
+#define DRIVER_AUTHOR "Tilman Schmidt <tilman@imap.cc>, Hansjoerg Lipp <hjlipp@web.de>, Stefan Eilers <Eilers.Stefan@epost.de>"
+#define DRIVER_DESC "USB Driver for Gigaset 307x"
+
+
+/* Module parameters */
+
+static int startmode = SM_ISDN;
+static int cidmode = 1;
+
+module_param(startmode, int, S_IRUGO);
+module_param(cidmode, int, S_IRUGO);
+MODULE_PARM_DESC(startmode, "start in isdn4linux mode");
+MODULE_PARM_DESC(cidmode, "Call-ID mode");
+
+#define GIGASET_MINORS     1
+#define GIGASET_MINOR      16
+#define GIGASET_MODULENAME "bas_gigaset"
+#define GIGASET_DEVFSNAME  "gig/bas/"
+#define GIGASET_DEVNAME    "ttyGB"
+
+#define IF_WRITEBUF 256 //FIXME
+
+/* Values for the Gigaset 307x */
+#define USB_GIGA_VENDOR_ID      0x0681
+#define USB_GIGA_PRODUCT_ID     0x0001
+#define USB_4175_PRODUCT_ID     0x0002
+#define USB_SX303_PRODUCT_ID    0x0021
+#define USB_SX353_PRODUCT_ID    0x0022
+
+/* table of devices that work with this driver */
+static struct usb_device_id gigaset_table [] = {
+        { USB_DEVICE(USB_GIGA_VENDOR_ID, USB_GIGA_PRODUCT_ID) },
+        { USB_DEVICE(USB_GIGA_VENDOR_ID, USB_4175_PRODUCT_ID) },
+        { USB_DEVICE(USB_GIGA_VENDOR_ID, USB_SX303_PRODUCT_ID) },
+        { USB_DEVICE(USB_GIGA_VENDOR_ID, USB_SX353_PRODUCT_ID) },
+        { } /* Terminating entry */
+};
+
+MODULE_DEVICE_TABLE(usb, gigaset_table);
+
+/* Get a minor range for your devices from the usb maintainer */
+#define USB_SKEL_MINOR_BASE     200
+
+/*======================= local function prototypes =============================*/
+
+/* This function is called if a new device is connected to the USB port. It
+ * checks whether this new device belongs to this driver.
+ */
+static int gigaset_probe(struct usb_interface *interface,
+                         const struct usb_device_id *id);
+
+/* Function will be called if the device is unplugged */
+static void gigaset_disconnect(struct usb_interface *interface);
+
+
+/*==============================================================================*/
+
+struct bas_cardstate {
+        struct usb_device       *udev;          /* USB device pointer */
+        struct usb_interface    *interface;     /* interface for this device */
+        unsigned char           minor;          /* starting minor number */
+
+        struct urb              *urb_ctrl;      /* control pipe default URB */
+        struct usb_ctrlrequest  dr_ctrl;
+        struct timer_list       timer_ctrl;     /* control request timeout */
+
+        struct timer_list       timer_atrdy;    /* AT command ready timeout */
+        struct urb              *urb_cmd_out;   /* for sending AT commands */
+        struct usb_ctrlrequest  dr_cmd_out;
+        int                     retry_cmd_out;
+
+        struct urb              *urb_cmd_in;    /* for receiving AT replies */
+        struct usb_ctrlrequest  dr_cmd_in;
+        struct timer_list       timer_cmd_in;   /* receive request timeout */
+        unsigned char           *rcvbuf;        /* AT reply receive buffer */
+
+        struct urb              *urb_int_in;    /* URB for interrupt pipe */
+        unsigned char           int_in_buf[3];
+
+        spinlock_t              lock;           /* locks all following */
+        atomic_t                basstate;       /* bitmap (BS_*) */
+        int                     pending;        /* uncompleted base request */
+        int                     rcvbuf_size;    /* size of AT receive buffer */
+                                                /* 0: no receive in progress */
+        int                     retry_cmd_in;   /* receive req retry count */
+};
+
+/* status of direct USB connection to 307x base (bits in basstate) */
+#define BS_ATOPEN       0x001
+#define BS_B1OPEN       0x002
+#define BS_B2OPEN       0x004
+#define BS_ATREADY      0x008
+#define BS_INIT         0x010
+#define BS_ATTIMER      0x020
+
+
+static struct gigaset_driver *driver = NULL;
+static struct cardstate *cardstate = NULL;
+
+/* usb specific object needed to register this driver with the usb subsystem */
+static struct usb_driver gigaset_usb_driver = {
+        .name =         GIGASET_MODULENAME,
+        .probe =        gigaset_probe,
+        .disconnect =   gigaset_disconnect,
+        .id_table =     gigaset_table,
+};
+
+/* get message text for USB status code
+ */
+static char *get_usb_statmsg(int status)
+{
+        static char unkmsg[28];
+
+        switch (status) {
+        case 0:
+                return "success";
+        case -ENOENT:
+                return "canceled";
+        case -ECONNRESET:
+                return "canceled (async)";
+        case -EINPROGRESS:
+                return "pending";
+        case -EPROTO:
+                return "bit stuffing or unknown USB error";
+        case -EILSEQ:
+                return "Illegal byte sequence (CRC mismatch)";
+        case -EPIPE:
+                return "babble detect or endpoint stalled";
+        case -ENOSR:
+                return "buffer error";
+        case -ETIMEDOUT:
+                return "timed out";
+        case -ENODEV:
+                return "device not present";
+        case -EREMOTEIO:
+                return "short packet detected";
+        case -EXDEV:
+                return "partial isochronous transfer";
+        case -EINVAL:
+                return "invalid argument";
+        case -ENXIO:
+                return "URB already queued";
+        case -EAGAIN:
+                return "isochronous start frame too early or too much scheduled";
+        case -EFBIG:
+                return "too many isochronous frames requested";
+        case -EMSGSIZE:
+                return "endpoint message size zero";
+        case -ESHUTDOWN:
+                return "endpoint shutdown";
+        case -EBUSY:
+                return "another request pending";
+        default:
+                snprintf(unkmsg, sizeof(unkmsg), "unknown error %d", status);
+                return unkmsg;
+        }
+}
+
+/* usb_pipetype_str
+ * retrieve string representation of USB pipe type
+ */
+static inline char *usb_pipetype_str(int pipe)
+{
+        if (usb_pipeisoc(pipe))
+                return "Isoc";
+        if (usb_pipeint(pipe))
+                return "Int";
+        if (usb_pipecontrol(pipe))
+                return "Ctrl";
+        if (usb_pipebulk(pipe))
+                return "Bulk";
+        return "?";
+}
+
+/* dump_urb
+ * write content of URB to syslog for debugging
+ */
+static inline void dump_urb(enum debuglevel level, const char *tag,
+                            struct urb *urb)
+{
+#ifdef CONFIG_GIGASET_DEBUG
+        int i;
+        IFNULLRET(tag);
+        dbg(level, "%s urb(0x%08lx)->{", tag, (unsigned long) urb);
+        if (urb) {
+                dbg(level,
+                    "  dev=0x%08lx, pipe=%s:EP%d/DV%d:%s, "
+                    "status=%d, hcpriv=0x%08lx, transfer_flags=0x%x,",
+                    (unsigned long) urb->dev,
+                    usb_pipetype_str(urb->pipe),
+                    usb_pipeendpoint(urb->pipe), usb_pipedevice(urb->pipe),
+                    usb_pipein(urb->pipe) ? "in" : "out",
+                    urb->status, (unsigned long) urb->hcpriv,
+                    urb->transfer_flags);
+                dbg(level,
+                    "  transfer_buffer=0x%08lx[%d], actual_length=%d, "
+                    "bandwidth=%d, setup_packet=0x%08lx,",
+                    (unsigned long) urb->transfer_buffer,
+                    urb->transfer_buffer_length, urb->actual_length,
+                    urb->bandwidth, (unsigned long) urb->setup_packet);
+                dbg(level,
+                    "  start_frame=%d, number_of_packets=%d, interval=%d, "
+                    "error_count=%d,",
+                    urb->start_frame, urb->number_of_packets, urb->interval,
+                    urb->error_count);
+                dbg(level,
+                    "  context=0x%08lx, complete=0x%08lx, iso_frame_desc[]={",
+                    (unsigned long) urb->context,
+                    (unsigned long) urb->complete);
+                for (i = 0; i < urb->number_of_packets; i++) {
+                        struct usb_iso_packet_descriptor *pifd = &urb->iso_frame_desc[i];
+                        dbg(level,
+                            "    {offset=%u, length=%u, actual_length=%u, "
+                            "status=%u}",
+                            pifd->offset, pifd->length, pifd->actual_length,
+                            pifd->status);
+                }
+        }
+        dbg(level, "}}");
+#endif
+}
+
+/* read/set modem control bits etc. (m10x only) */
+static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state,
+                                  unsigned new_state)
+{
+        return -EINVAL;
+}
+
+static int gigaset_baud_rate(struct cardstate *cs, unsigned cflag)
+{
+        return -EINVAL;
+}
+
+static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
+{
+        return -EINVAL;
+}
+
+/* error_hangup
+ * hang up any existing connection because of an unrecoverable error
+ * This function may be called from any context and takes care of scheduling
+ * the necessary actions for execution outside of interrupt context.
+ * argument:
+ *      B channel control structure
+ */
+static inline void error_hangup(struct bc_state *bcs)
+{
+        struct cardstate *cs = bcs->cs;
+
+        dbg(DEBUG_ANY,
+            "%s: scheduling HUP for channel %d", __func__, bcs->channel);
+
+        if (!gigaset_add_event(cs, &bcs->at_state, EV_HUP, NULL, 0, NULL)) {
+                //FIXME what should we do?
+                return;
+        }
+
+        gigaset_schedule_event(cs);
+}
+
+/* error_reset
+ * reset Gigaset device because of an unrecoverable error
+ * This function may be called from any context and takes care of scheduling
+ * the necessary actions for execution outside of interrupt context.
+ * argument:
+ *      controller state structure
+ */
+static inline void error_reset(struct cardstate *cs)
+{
+        //FIXME try to recover without bothering the user
+        err("unrecoverable error - please disconnect the Gigaset base to reset");
+}
+
+/* check_pending
+ * check for completion of pending control request
+ * parameter:
+ *      urb     USB request block of completed request
+ *              urb->context = hardware specific controller state structure
+ */
+static void check_pending(struct bas_cardstate *ucs)
+{
+        unsigned long flags;
+
+        IFNULLRET(ucs);
+        IFNULLRET(cardstate);
+
+        spin_lock_irqsave(&ucs->lock, flags);
+        switch (ucs->pending) {
+        case 0:
+                break;
+        case HD_OPEN_ATCHANNEL:
+                if (atomic_read(&ucs->basstate) & BS_ATOPEN)
+                        ucs->pending = 0;
+                break;
+        case HD_OPEN_B1CHANNEL:
+                if (atomic_read(&ucs->basstate) & BS_B1OPEN)
+                        ucs->pending = 0;
+                break;
+        case HD_OPEN_B2CHANNEL:
+                if (atomic_read(&ucs->basstate) & BS_B2OPEN)
+                        ucs->pending = 0;
+                break;
+        case HD_CLOSE_ATCHANNEL:
+                if (!(atomic_read(&ucs->basstate) & BS_ATOPEN))
+                        ucs->pending = 0;
+                //wake_up_interruptible(cs->initwait);
+                //FIXME need own wait queue?
+                break;
+        case HD_CLOSE_B1CHANNEL:
+                if (!(atomic_read(&ucs->basstate) & BS_B1OPEN))
+                        ucs->pending = 0;
+                break;
+        case HD_CLOSE_B2CHANNEL:
+                if (!(atomic_read(&ucs->basstate) & BS_B2OPEN))
+                        ucs->pending = 0;
+                break;
+        case HD_DEVICE_INIT_ACK:                /* no reply expected */
+                ucs->pending = 0;
+                break;
+        /* HD_READ_ATMESSAGE, HD_WRITE_ATMESSAGE, HD_RESET_INTERRUPTPIPE
+         * are handled separately and should never end up here
+         */
+        default:
+                warn("unknown pending request 0x%02x cleared", ucs->pending);
+                ucs->pending = 0;
+        }
+
+        if (!ucs->pending)
+                del_timer(&ucs->timer_ctrl);
+
+        spin_unlock_irqrestore(&ucs->lock, flags);
+}
+
+/* cmd_in_timeout
+ * timeout routine for command input request
+ * argument:
+ *      controller state structure
+ */
+static void cmd_in_timeout(unsigned long data)
+{
+        struct cardstate *cs = (struct cardstate *) data;
+        struct bas_cardstate *ucs;
+        unsigned long flags;
+
+        IFNULLRET(cs);
+        ucs = cs->hw.bas;
+        IFNULLRET(ucs);
+
+        spin_lock_irqsave(&cs->lock, flags);
+        if (!atomic_read(&cs->connected)) {
+                dbg(DEBUG_USBREQ, "%s: disconnected", __func__);
+                spin_unlock_irqrestore(&cs->lock, flags);
+                return;
+        }
+        if (!ucs->rcvbuf_size) {
+                dbg(DEBUG_USBREQ, "%s: no receive in progress", __func__);
+                spin_unlock_irqrestore(&cs->lock, flags);
+                return;
+        }
+        spin_unlock_irqrestore(&cs->lock, flags);
+
+        err("timeout reading AT response");
+        error_reset(cs);        //FIXME retry?
+}
+
+
+static void read_ctrl_callback(struct urb *urb, struct pt_regs *regs);
+
+/* atread_submit
+ * submit an HD_READ_ATMESSAGE command URB
+ * parameters:
+ *      cs      controller state structure
+ *      timeout timeout in 1/10 sec., 0: none
+ * return value:
+ *      0 on success
+ *      -EINVAL if a NULL pointer is encountered somewhere
+ *      -EBUSY if another request is pending
+ *      any URB submission error code
+ */
+static int atread_submit(struct cardstate *cs, int timeout)
+{
+        struct bas_cardstate *ucs;
+        int ret;
+
+        IFNULLRETVAL(cs, -EINVAL);
+        ucs = cs->hw.bas;
+        IFNULLRETVAL(ucs, -EINVAL);
+        IFNULLRETVAL(ucs->urb_cmd_in, -EINVAL);
+
+        dbg(DEBUG_USBREQ, "-------> HD_READ_ATMESSAGE (%d)", ucs->rcvbuf_size);
+
+        if (ucs->urb_cmd_in->status == -EINPROGRESS) {
+                err("could not submit HD_READ_ATMESSAGE: URB busy");
+                return -EBUSY;
+        }
+
+        ucs->dr_cmd_in.bRequestType = IN_VENDOR_REQ;
+        ucs->dr_cmd_in.bRequest = HD_READ_ATMESSAGE;
+        ucs->dr_cmd_in.wValue = 0;
+        ucs->dr_cmd_in.wIndex = 0;
+        ucs->dr_cmd_in.wLength = cpu_to_le16(ucs->rcvbuf_size);
+        usb_fill_control_urb(ucs->urb_cmd_in, ucs->udev,
+                             usb_rcvctrlpipe(ucs->udev, 0),
+                             (unsigned char*) & ucs->dr_cmd_in,
+                             ucs->rcvbuf, ucs->rcvbuf_size,
+                             read_ctrl_callback, cs->inbuf);
+
+        if ((ret = usb_submit_urb(ucs->urb_cmd_in, SLAB_ATOMIC)) != 0) {
+                err("could not submit HD_READ_ATMESSAGE: %s",
+                    get_usb_statmsg(ret));
+                return ret;
+        }
+
+        if (timeout > 0) {
+                dbg(DEBUG_USBREQ, "setting timeout of %d/10 secs", timeout);
+                ucs->timer_cmd_in.expires = jiffies + timeout * HZ / 10;
+                ucs->timer_cmd_in.data = (unsigned long) cs;
+                ucs->timer_cmd_in.function = cmd_in_timeout;
+                add_timer(&ucs->timer_cmd_in);
+        }
+        return 0;
+}
+
+static void stopurbs(struct bas_bc_state *);
+static int start_cbsend(struct cardstate *);
+
+/* set/clear bits in base connection state
+ */
+inline static void update_basstate(struct bas_cardstate *ucs,
+                                   int set, int clear)
+{
+        unsigned long flags;
+        int state;
+
+        spin_lock_irqsave(&ucs->lock, flags);
+        state = atomic_read(&ucs->basstate);
+        state &= ~clear;
+        state |= set;
+        atomic_set(&ucs->basstate, state);
+        spin_unlock_irqrestore(&ucs->lock, flags);
+}
+
+
+/* read_int_callback
+ * USB completion handler for interrupt pipe input
+ * called by the USB subsystem in interrupt context
+ * parameter:
+ *      urb     USB request block
+ *              urb->context = controller state structure
+ */
+static void read_int_callback(struct urb *urb, struct pt_regs *regs)
+{
+        struct cardstate *cs;
+        struct bas_cardstate *ucs;
+        struct bc_state *bcs;
+        unsigned long flags;
+        int status;
+        unsigned l;
+        int channel;
+
+        IFNULLRET(urb);
+        cs = (struct cardstate *) urb->context;
+        IFNULLRET(cs);
+        ucs = cs->hw.bas;
+        IFNULLRET(ucs);
+
+        if (unlikely(!atomic_read(&cs->connected))) {
+                warn("%s: disconnected", __func__);
+                return;
+        }
+
+        switch (urb->status) {
+        case 0:                 /* success */
+                break;
+        case -ENOENT:                   /* canceled */
+        case -ECONNRESET:               /* canceled (async) */
+        case -EINPROGRESS:              /* pending */
+                /* ignore silently */
+                dbg(DEBUG_USBREQ,
+                    "%s: %s", __func__, get_usb_statmsg(urb->status));
+                return;
+        default:                /* severe trouble */
+                warn("interrupt read: %s", get_usb_statmsg(urb->status));
+                //FIXME corrective action? resubmission always ok?
+                goto resubmit;
+        }
+
+        l = (unsigned) ucs->int_in_buf[1] +
+            (((unsigned) ucs->int_in_buf[2]) << 8);
+
+        dbg(DEBUG_USBREQ,
+            "<-------%d: 0x%02x (%u [0x%02x 0x%02x])", urb->actual_length,
+            (int)ucs->int_in_buf[0], l,
+            (int)ucs->int_in_buf[1], (int)ucs->int_in_buf[2]);
+
+        channel = 0;
+
+        switch (ucs->int_in_buf[0]) {
+        case HD_DEVICE_INIT_OK:
+                update_basstate(ucs, BS_INIT, 0);
+                break;
+
+        case HD_READY_SEND_ATDATA:
+                del_timer(&ucs->timer_atrdy);
+                update_basstate(ucs, BS_ATREADY, BS_ATTIMER);
+                start_cbsend(cs);
+                break;
+
+        case HD_OPEN_B2CHANNEL_ACK:
+                ++channel;
+        case HD_OPEN_B1CHANNEL_ACK:
+                bcs = cs->bcs + channel;
+                update_basstate(ucs, BS_B1OPEN << channel, 0);
+                gigaset_bchannel_up(bcs);
+                break;
+
+        case HD_OPEN_ATCHANNEL_ACK:
+                update_basstate(ucs, BS_ATOPEN, 0);
+                start_cbsend(cs);
+                break;
+
+        case HD_CLOSE_B2CHANNEL_ACK:
+                ++channel;
+        case HD_CLOSE_B1CHANNEL_ACK:
+                bcs = cs->bcs + channel;
+                update_basstate(ucs, 0, BS_B1OPEN << channel);
+                stopurbs(bcs->hw.bas);
+                gigaset_bchannel_down(bcs);
+                break;
+
+        case HD_CLOSE_ATCHANNEL_ACK:
+                update_basstate(ucs, 0, BS_ATOPEN);
+                break;
+
+        case HD_B2_FLOW_CONTROL:
+                ++channel;
+        case HD_B1_FLOW_CONTROL:
+                bcs = cs->bcs + channel;
+                atomic_add((l - BAS_NORMFRAME) * BAS_CORRFRAMES,
+                           &bcs->hw.bas->corrbytes);
+                dbg(DEBUG_ISO,
+                    "Flow control (channel %d, sub %d): 0x%02x => %d",
+                    channel, bcs->hw.bas->numsub, l,
+                    atomic_read(&bcs->hw.bas->corrbytes));
+                break;
+
+        case HD_RECEIVEATDATA_ACK:      /* AT response ready to be received */
+                if (!l) {
+                        warn("HD_RECEIVEATDATA_ACK with length 0 ignored");
+                        break;
+                }
+                spin_lock_irqsave(&cs->lock, flags);
+                if (ucs->rcvbuf_size) {
+                        spin_unlock_irqrestore(&cs->lock, flags);
+                        err("receive AT data overrun, %d bytes lost", l);
+                        error_reset(cs);        //FIXME reschedule
+                        break;
+                }
+                if ((ucs->rcvbuf = kmalloc(l, GFP_ATOMIC)) == NULL) {
+                        spin_unlock_irqrestore(&cs->lock, flags);
+                        err("%s: out of memory, %d bytes lost", __func__, l);
+                        error_reset(cs);        //FIXME reschedule
+                        break;
+                }
+                ucs->rcvbuf_size = l;
+                ucs->retry_cmd_in = 0;
+                if ((status = atread_submit(cs, BAS_TIMEOUT)) < 0) {
+                        kfree(ucs->rcvbuf);
+                        ucs->rcvbuf = NULL;
+                        ucs->rcvbuf_size = 0;
+                        error_reset(cs);        //FIXME reschedule
+                }
+                spin_unlock_irqrestore(&cs->lock, flags);
+                break;
+
+        case HD_RESET_INTERRUPT_PIPE_ACK:
+                dbg(DEBUG_USBREQ, "HD_RESET_INTERRUPT_PIPE_ACK");
+                break;
+
+        case HD_SUSPEND_END:
+                dbg(DEBUG_USBREQ, "HD_SUSPEND_END");
+                break;
+
+        default:
+                warn("unknown Gigaset signal 0x%02x (%u) ignored",
+                     (int) ucs->int_in_buf[0], l);
+        }
+
+        check_pending(ucs);
+
+resubmit:
+        status = usb_submit_urb(urb, SLAB_ATOMIC);
+        if (unlikely(status)) {
+                err("could not resubmit interrupt URB: %s",
+                    get_usb_statmsg(status));
+                error_reset(cs);
+        }
+}
+
+/* read_ctrl_callback
+ * USB completion handler for control pipe input
+ * called by the USB subsystem in interrupt context
+ * parameter:
+ *      urb     USB request block
+ *              urb->context = inbuf structure for controller state
+ */
+static void read_ctrl_callback(struct urb *urb, struct pt_regs *regs)
+{
+        struct cardstate *cs;
+        struct bas_cardstate *ucs;
+        unsigned numbytes;
+        unsigned long flags;
+        struct inbuf_t *inbuf;
+        int have_data = 0;
+
+        IFNULLRET(urb);
+        inbuf = (struct inbuf_t *) urb->context;
+        IFNULLRET(inbuf);
+        cs = inbuf->cs;
+        IFNULLRET(cs);
+        ucs = cs->hw.bas;
+        IFNULLRET(ucs);
+
+        spin_lock_irqsave(&cs->lock, flags);
+        if (!atomic_read(&cs->connected)) {
+                warn("%s: disconnected", __func__);
+                spin_unlock_irqrestore(&cs->lock, flags);
+                return;
+        }
+
+        if (!ucs->rcvbuf_size) {
+                warn("%s: no receive in progress", __func__);
+                spin_unlock_irqrestore(&cs->lock, flags);
+                return;
+        }
+
+        del_timer(&ucs->timer_cmd_in);
+
+        switch (urb->status) {
+        case 0:                         /* normal completion */
+                numbytes = urb->actual_length;
+                if (unlikely(numbytes == 0)) {
+                        warn("control read: empty block received");
+                        goto retry;
+                }
+                if (unlikely(numbytes != ucs->rcvbuf_size)) {
+                        warn("control read: received %d chars, expected %d",
+                             numbytes, ucs->rcvbuf_size);
+                        if (numbytes > ucs->rcvbuf_size)
+                                numbytes = ucs->rcvbuf_size;
+                }
+
+                /* copy received bytes to inbuf */
+                have_data = gigaset_fill_inbuf(inbuf, ucs->rcvbuf, numbytes);
+
+                if (unlikely(numbytes < ucs->rcvbuf_size)) {
+                        /* incomplete - resubmit for remaining bytes */
+                        ucs->rcvbuf_size -= numbytes;
+                        ucs->retry_cmd_in = 0;
+                        goto retry;
+                }
+                break;
+
+        case -ENOENT:                   /* canceled */
+        case -ECONNRESET:               /* canceled (async) */
+        case -EINPROGRESS:              /* pending */
+                /* no action necessary */
+                dbg(DEBUG_USBREQ,
+                    "%s: %s", __func__, get_usb_statmsg(urb->status));
+                break;
+
+        default:                        /* severe trouble */
+                warn("control read: %s", get_usb_statmsg(urb->status));
+        retry:
+                if (ucs->retry_cmd_in++ < BAS_RETRY) {
+                        notice("control read: retry %d", ucs->retry_cmd_in);
+                        if (atread_submit(cs, BAS_TIMEOUT) >= 0) {
+                                /* resubmitted - bypass regular exit block */
+                                spin_unlock_irqrestore(&cs->lock, flags);
+                                return;
+                        }
+                } else {
+                        err("control read: giving up after %d tries",
+                            ucs->retry_cmd_in);
+                }
+                error_reset(cs);
+        }
+
+        kfree(ucs->rcvbuf);
+        ucs->rcvbuf = NULL;
+        ucs->rcvbuf_size = 0;
+        spin_unlock_irqrestore(&cs->lock, flags);
+        if (have_data) {
+                dbg(DEBUG_INTR, "%s-->BH", __func__);
+                gigaset_schedule_event(cs);
+        }
+}
+
+/* read_iso_callback
+ * USB completion handler for B channel isochronous input
+ * called by the USB subsystem in interrupt context
+ * parameter:
+ *      urb     USB request block of completed request
+ *              urb->context = bc_state structure
+ */
+static void read_iso_callback(struct urb *urb, struct pt_regs *regs)
+{
+        struct bc_state *bcs;
+        struct bas_bc_state *ubc;
+        unsigned long flags;
+        int i, rc;
+
+        IFNULLRET(urb);
+        IFNULLRET(urb->context);
+        IFNULLRET(cardstate);
+
+        /* status codes not worth bothering the tasklet with */
+        if (unlikely(urb->status == -ENOENT || urb->status == -ECONNRESET ||
+                     urb->status == -EINPROGRESS)) {
+                dbg(DEBUG_ISO,
+                    "%s: %s", __func__, get_usb_statmsg(urb->status));
+                return;
+        }
+
+        bcs = (struct bc_state *) urb->context;
+        ubc = bcs->hw.bas;
+        IFNULLRET(ubc);
+
+        spin_lock_irqsave(&ubc->isoinlock, flags);
+        if (likely(ubc->isoindone == NULL)) {
+                /* pass URB to tasklet */
+                ubc->isoindone = urb;
+                tasklet_schedule(&ubc->rcvd_tasklet);
+        } else {
+                /* tasklet still busy, drop data and resubmit URB */
+                ubc->loststatus = urb->status;
+                for (i = 0; i < BAS_NUMFRAMES; i++) {
+                        ubc->isoinlost += urb->iso_frame_desc[i].actual_length;
+                        if (unlikely(urb->iso_frame_desc[i].status != 0 &&
+                                     urb->iso_frame_desc[i].status != -EINPROGRESS)) {
+                                ubc->loststatus = urb->iso_frame_desc[i].status;
+                        }
+                        urb->iso_frame_desc[i].status = 0;
+                        urb->iso_frame_desc[i].actual_length = 0;
+                }
+                if (likely(atomic_read(&ubc->running))) {
+                        urb->dev = bcs->cs->hw.bas->udev;       /* clobbered by USB subsystem */
+                        urb->transfer_flags = URB_ISO_ASAP;
+                        urb->number_of_packets = BAS_NUMFRAMES;
+                        dbg(DEBUG_ISO, "%s: isoc read overrun/resubmit", __func__);
+                        rc = usb_submit_urb(urb, SLAB_ATOMIC);
+                        if (unlikely(rc != 0)) {
+                                err("could not resubmit isochronous read URB: %s",
+                                    get_usb_statmsg(rc));
+                                dump_urb(DEBUG_ISO, "isoc read", urb);
+                                error_hangup(bcs);
+                        }
+                }
+        }
+        spin_unlock_irqrestore(&ubc->isoinlock, flags);
+}
+
+/* write_iso_callback
+ * USB completion handler for B channel isochronous output
+ * called by the USB subsystem in interrupt context
+ * parameter:
+ *      urb     USB request block of completed request
+ *              urb->context = isow_urbctx_t structure
+ */
+static void write_iso_callback(struct urb *urb, struct pt_regs *regs)
+{
+        struct isow_urbctx_t *ucx;
+        struct bas_bc_state *ubc;
+        unsigned long flags;
+
+        IFNULLRET(urb);
+        IFNULLRET(urb->context);
+        IFNULLRET(cardstate);
+
+        /* status codes not worth bothering the tasklet with */
+        if (unlikely(urb->status == -ENOENT || urb->status == -ECONNRESET ||
+                     urb->status == -EINPROGRESS)) {
+                dbg(DEBUG_ISO,
+                    "%s: %s", __func__, get_usb_statmsg(urb->status));
+                return;
+        }
+
+        /* pass URB context to tasklet */
+        ucx = (struct isow_urbctx_t *) urb->context;
+        IFNULLRET(ucx->bcs);
+        ubc = ucx->bcs->hw.bas;
+        IFNULLRET(ubc);
+
+        spin_lock_irqsave(&ubc->isooutlock, flags);
+        ubc->isooutovfl = ubc->isooutdone;
+        ubc->isooutdone = ucx;
+        spin_unlock_irqrestore(&ubc->isooutlock, flags);
+        tasklet_schedule(&ubc->sent_tasklet);
+}
+
+/* starturbs
+ * prepare and submit USB request blocks for isochronous input and output
+ * argument:
+ *      B channel control structure
+ * return value:
+ *      0 on success
+ *      < 0 on error (no URBs submitted)
+ */
+static int starturbs(struct bc_state *bcs)
+{
+        struct urb *urb;
+        struct bas_bc_state *ubc;
+        int j, k;
+        int rc;
+
+        IFNULLRETVAL(bcs, -EFAULT);
+        ubc = bcs->hw.bas;
+        IFNULLRETVAL(ubc, -EFAULT);
+
+        /* initialize L2 reception */
+        if (bcs->proto2 == ISDN_PROTO_L2_HDLC)
+                bcs->inputstate |= INS_flag_hunt;
+
+        /* submit all isochronous input URBs */
+        atomic_set(&ubc->running, 1);
+        for (k = 0; k < BAS_INURBS; k++) {
+                urb = ubc->isoinurbs[k];
+                if (!urb) {
+                        err("isoinurbs[%d]==NULL", k);
+                        rc = -EFAULT;
+                        goto error;
+                }
+
+                urb->dev = bcs->cs->hw.bas->udev;
+                urb->pipe = usb_rcvisocpipe(urb->dev, 3 + 2 * bcs->channel);
+                urb->transfer_flags = URB_ISO_ASAP;
+                urb->transfer_buffer = ubc->isoinbuf + k * BAS_INBUFSIZE;
+                urb->transfer_buffer_length = BAS_INBUFSIZE;
+                urb->number_of_packets = BAS_NUMFRAMES;
+                urb->interval = BAS_FRAMETIME;
+                urb->complete = read_iso_callback;
+                urb->context = bcs;
+                for (j = 0; j < BAS_NUMFRAMES; j++) {
+                        urb->iso_frame_desc[j].offset = j * BAS_MAXFRAME;
+                        urb->iso_frame_desc[j].length = BAS_MAXFRAME;
+                        urb->iso_frame_desc[j].status = 0;
+                        urb->iso_frame_desc[j].actual_length = 0;
+                }
+
+                dump_urb(DEBUG_ISO, "Initial isoc read", urb);
+                if ((rc = usb_submit_urb(urb, SLAB_ATOMIC)) != 0) {
+                        err("could not submit isochronous read URB %d: %s",
+                            k, get_usb_statmsg(rc));
+                        goto error;
+                }
+        }
+
+        /* initialize L2 transmission */
+        gigaset_isowbuf_init(ubc->isooutbuf, PPP_FLAG);
+
+        /* set up isochronous output URBs for flag idling */
+        for (k = 0; k < BAS_OUTURBS; ++k) {
+                urb = ubc->isoouturbs[k].urb;
+                if (!urb) {
+                        err("isoouturbs[%d].urb==NULL", k);
+                        rc = -EFAULT;
+                        goto error;
+                }
+                urb->dev = bcs->cs->hw.bas->udev;
+                urb->pipe = usb_sndisocpipe(urb->dev, 4 + 2 * bcs->channel);
+                urb->transfer_flags = URB_ISO_ASAP;
+                urb->transfer_buffer = ubc->isooutbuf->data;
+                urb->transfer_buffer_length = sizeof(ubc->isooutbuf->data);
+                urb->number_of_packets = BAS_NUMFRAMES;
+                urb->interval = BAS_FRAMETIME;
+                urb->complete = write_iso_callback;
+                urb->context = &ubc->isoouturbs[k];
+                for (j = 0; j < BAS_NUMFRAMES; ++j) {
+                        urb->iso_frame_desc[j].offset = BAS_OUTBUFSIZE;
+                        urb->iso_frame_desc[j].length = BAS_NORMFRAME;
+                        urb->iso_frame_desc[j].status = 0;
+                        urb->iso_frame_desc[j].actual_length = 0;
+                }
+                ubc->isoouturbs[k].limit = -1;
+        }
+
+        /* submit two URBs, keep third one */
+        for (k = 0; k < 2; ++k) {
+                dump_urb(DEBUG_ISO, "Initial isoc write", urb);
+                rc = usb_submit_urb(ubc->isoouturbs[k].urb, SLAB_ATOMIC);
+                if (rc != 0) {
+                        err("could not submit isochronous write URB %d: %s",
+                            k, get_usb_statmsg(rc));
+                        goto error;
+                }
+        }
+        dump_urb(DEBUG_ISO, "Initial isoc write (free)", urb);
+        ubc->isooutfree = &ubc->isoouturbs[2];
+        ubc->isooutdone = ubc->isooutovfl = NULL;
+        return 0;
+ error:
+        stopurbs(ubc);
+        return rc;
+}
+
+/* stopurbs
+ * cancel the USB request blocks for isochronous input and output
+ * errors are silently ignored
+ * argument:
+ *      B channel control structure
+ */
+static void stopurbs(struct bas_bc_state *ubc)
+{
+        int k, rc;
+
+        IFNULLRET(ubc);
+
+        atomic_set(&ubc->running, 0);
+
+        for (k = 0; k < BAS_INURBS; ++k) {
+                rc = usb_unlink_urb(ubc->isoinurbs[k]);
+                dbg(DEBUG_ISO, "%s: isoc input URB %d unlinked, result = %d",
+                    __func__, k, rc);
+        }
+
+        for (k = 0; k < BAS_OUTURBS; ++k) {
+                rc = usb_unlink_urb(ubc->isoouturbs[k].urb);
+                dbg(DEBUG_ISO, "%s: isoc output URB %d unlinked, result = %d",
+                    __func__, k, rc);
+        }
+}
+
+/* Isochronous Write - Bottom Half */
+/* =============================== */
+
+/* submit_iso_write_urb
+ * fill and submit the next isochronous write URB
+ * parameters:
+ *      bcs     B channel state structure
+ * return value:
+ *      number of frames submitted in URB
+ *      0 if URB not submitted because no data available (isooutbuf busy)
+ *      error code < 0 on error
+ */
+static int submit_iso_write_urb(struct isow_urbctx_t *ucx)
+{
+        struct urb *urb;
+        struct bas_bc_state *ubc;
+        struct usb_iso_packet_descriptor *ifd;
+        int corrbytes, nframe, rc;
+
+        IFNULLRETVAL(ucx, -EFAULT);
+        urb = ucx->urb;
+        IFNULLRETVAL(urb, -EFAULT);
+        IFNULLRETVAL(ucx->bcs, -EFAULT);
+        ubc = ucx->bcs->hw.bas;
+        IFNULLRETVAL(ubc, -EFAULT);
+
+        urb->dev = ucx->bcs->cs->hw.bas->udev;  /* clobbered by USB subsystem */
+        urb->transfer_flags = URB_ISO_ASAP;
+        urb->transfer_buffer = ubc->isooutbuf->data;
+        urb->transfer_buffer_length = sizeof(ubc->isooutbuf->data);
+
+        for (nframe = 0; nframe < BAS_NUMFRAMES; nframe++) {
+                ifd = &urb->iso_frame_desc[nframe];
+
+                /* compute frame length according to flow control */
+                ifd->length = BAS_NORMFRAME;
+                if ((corrbytes = atomic_read(&ubc->corrbytes)) != 0) {
+                        dbg(DEBUG_ISO, "%s: corrbytes=%d", __func__, corrbytes);
+                        if (corrbytes > BAS_HIGHFRAME - BAS_NORMFRAME)
+                                corrbytes = BAS_HIGHFRAME - BAS_NORMFRAME;
+                        else if (corrbytes < BAS_LOWFRAME - BAS_NORMFRAME)
+                                corrbytes = BAS_LOWFRAME - BAS_NORMFRAME;
+                        ifd->length += corrbytes;
+                        atomic_add(-corrbytes, &ubc->corrbytes);
+                }
+                //dbg(DEBUG_ISO, "%s: frame %d length=%d", __func__, nframe, ifd->length);
+
+                /* retrieve block of data to send */
+                ifd->offset = gigaset_isowbuf_getbytes(ubc->isooutbuf, ifd->length);
+                if (ifd->offset < 0) {
+                        if (ifd->offset == -EBUSY) {
+                                dbg(DEBUG_ISO, "%s: buffer busy at frame %d",
+                                    __func__, nframe);
+                                /* tasklet will be restarted from gigaset_send_skb() */
+                        } else {
+                                err("%s: buffer error %d at frame %d",
+                                    __func__, ifd->offset, nframe);
+                                return ifd->offset;
+                        }
+                        break;
+                }
+                ucx->limit = atomic_read(&ubc->isooutbuf->nextread);
+                ifd->status = 0;
+                ifd->actual_length = 0;
+        }
+        if ((urb->number_of_packets = nframe) > 0) {
+                if ((rc = usb_submit_urb(urb, SLAB_ATOMIC)) != 0) {
+                        err("could not submit isochronous write URB: %s",
+                            get_usb_statmsg(rc));
+                        dump_urb(DEBUG_ISO, "isoc write", urb);
+                        return rc;
+                }
+                ++ubc->numsub;
+        }
+        return nframe;
+}
+
+/* write_iso_tasklet
+ * tasklet scheduled when an isochronous output URB from the Gigaset device
+ * has completed
+ * parameter:
+ *      data    B channel state structure
+ */
+static void write_iso_tasklet(unsigned long data)
+{
+        struct bc_state *bcs;
+        struct bas_bc_state *ubc;
+        struct cardstate *cs;
+        struct isow_urbctx_t *done, *next, *ovfl;
+        struct urb *urb;
+        struct usb_iso_packet_descriptor *ifd;
+        int offset;
+        unsigned long flags;
+        int i;
+        struct sk_buff *skb;
+        int len;
+
+        bcs = (struct bc_state *) data;
+        IFNULLRET(bcs);
+        ubc = bcs->hw.bas;
+        IFNULLRET(ubc);
+        cs = bcs->cs;
+        IFNULLRET(cs);
+
+        /* loop while completed URBs arrive in time */
+        for (;;) {
+                if (unlikely(!atomic_read(&cs->connected))) {
+                        warn("%s: disconnected", __func__);
+                        return;
+                }
+
+                if (unlikely(!(atomic_read(&ubc->running)))) {
+                        dbg(DEBUG_ISO, "%s: not running", __func__);
+                        return;
+                }
+
+                /* retrieve completed URBs */
+                spin_lock_irqsave(&ubc->isooutlock, flags);
+                done = ubc->isooutdone;
+                ubc->isooutdone = NULL;
+                ovfl = ubc->isooutovfl;
+                ubc->isooutovfl = NULL;
+                spin_unlock_irqrestore(&ubc->isooutlock, flags);
+                if (ovfl) {
+                        err("isochronous write buffer underrun - buy a faster machine :-)");
+                        error_hangup(bcs);
+                        break;
+                }
+                if (!done)
+                        break;
+
+                /* submit free URB if available */
+                spin_lock_irqsave(&ubc->isooutlock, flags);
+                next = ubc->isooutfree;
+                ubc->isooutfree = NULL;
+                spin_unlock_irqrestore(&ubc->isooutlock, flags);
+                if (next) {
+                        if (submit_iso_write_urb(next) <= 0) {
+                                /* could not submit URB, put it back */
+                                spin_lock_irqsave(&ubc->isooutlock, flags);
+                                if (ubc->isooutfree == NULL) {
+                                        ubc->isooutfree = next;
+                                        next = NULL;
+                                }
+                                spin_unlock_irqrestore(&ubc->isooutlock, flags);
+                                if (next) {
+                                        /* couldn't put it back */
+                                        err("losing isochronous write URB");
+                                        error_hangup(bcs);
+                                }
+                        }
+                }
+
+                /* process completed URB */
+                urb = done->urb;
+                switch (urb->status) {
+                case 0:                         /* normal completion */
+                        break;
+                case -EXDEV:                    /* inspect individual frames */
+                        /* assumptions (for lack of documentation):
+                         * - actual_length bytes of the frame in error are successfully sent
+                         * - all following frames are not sent at all
+                         */
+                        dbg(DEBUG_ISO, "%s: URB partially completed", __func__);
+                        offset = done->limit;   /* just in case */
+                        for (i = 0; i < BAS_NUMFRAMES; i++) {
+                                ifd = &urb->iso_frame_desc[i];
+                                if (ifd->status ||
+                                    ifd->actual_length != ifd->length) {
+                                        warn("isochronous write: frame %d: %s, "
+                                             "only %d of %d bytes sent",
+                                             i, get_usb_statmsg(ifd->status),
+                                             ifd->actual_length, ifd->length);
+                                        offset = (ifd->offset +
+                                                  ifd->actual_length)
+                                                 % BAS_OUTBUFSIZE;
+                                        break;
+                                }
+                        }
+#ifdef CONFIG_GIGASET_DEBUG
+                        /* check assumption on remaining frames */
+                        for (; i < BAS_NUMFRAMES; i++) {
+                                ifd = &urb->iso_frame_desc[i];
+                                if (ifd->status != -EINPROGRESS
+                                    || ifd->actual_length != 0) {
+                                        warn("isochronous write: frame %d: %s, "
+                                             "%d of %d bytes sent",
+                                             i, get_usb_statmsg(ifd->status),
+                                             ifd->actual_length, ifd->length);
+                                        offset = (ifd->offset +
+                                                  ifd->actual_length)
+                                                 % BAS_OUTBUFSIZE;
+                                        break;
+                                }
+                        }
+#endif
+                        break;
+                case -EPIPE:                    //FIXME is this the code for "underrun"?
+                        err("isochronous write stalled");
+                        error_hangup(bcs);
+                        break;
+                default:                        /* severe trouble */
+                        warn("isochronous write: %s",
+                             get_usb_statmsg(urb->status));
+                }
+
+                /* mark the write buffer area covered by this URB as free */
+                if (done->limit >= 0)
+                        atomic_set(&ubc->isooutbuf->read, done->limit);
+
+                /* mark URB as free */
+                spin_lock_irqsave(&ubc->isooutlock, flags);
+                next = ubc->isooutfree;
+                ubc->isooutfree = done;
+                spin_unlock_irqrestore(&ubc->isooutlock, flags);
+                if (next) {
+                        /* only one URB still active - resubmit one */
+                        if (submit_iso_write_urb(next) <= 0) {
+                                /* couldn't submit */
+                                error_hangup(bcs);
+                        }
+                }
+        }
+
+        /* process queued SKBs */
+        while ((skb = skb_dequeue(&bcs->squeue))) {
+                /* copy to output buffer, doing L2 encapsulation */
+                len = skb->len;
+                if (gigaset_isoc_buildframe(bcs, skb->data, len) == -EAGAIN) {
+                        /* insufficient buffer space, push back onto queue */
+                        skb_queue_head(&bcs->squeue, skb);
+                        dbg(DEBUG_ISO, "%s: skb requeued, qlen=%d",
+                            __func__, skb_queue_len(&bcs->squeue));
+                        break;
+                }
+                skb_pull(skb, len);
+                gigaset_skb_sent(bcs, skb);
+                dev_kfree_skb_any(skb);
+        }
+}
+
+/* Isochronous Read - Bottom Half */
+/* ============================== */
+
+/* read_iso_tasklet
+ * tasklet scheduled when an isochronous input URB from the Gigaset device
+ * has completed
+ * parameter:
+ *      data    B channel state structure
+ */
+static void read_iso_tasklet(unsigned long data)
+{
+        struct bc_state *bcs;
+        struct bas_bc_state *ubc;
+        struct cardstate *cs;
+        struct urb *urb;
+        char *rcvbuf;
+        unsigned long flags;
+        int totleft, numbytes, offset, frame, rc;
+
+        bcs = (struct bc_state *) data;
+        IFNULLRET(bcs);
+        ubc = bcs->hw.bas;
+        IFNULLRET(ubc);
+        cs = bcs->cs;
+        IFNULLRET(cs);
+
+        /* loop while more completed URBs arrive in the meantime */
+        for (;;) {
+                if (!atomic_read(&cs->connected)) {
+                        warn("%s: disconnected", __func__);
+                        return;
+                }
+
+                /* retrieve URB */
+                spin_lock_irqsave(&ubc->isoinlock, flags);
+                if (!(urb = ubc->isoindone)) {
+                        spin_unlock_irqrestore(&ubc->isoinlock, flags);
+                        return;
+                }
+                ubc->isoindone = NULL;
+                if (unlikely(ubc->loststatus != -EINPROGRESS)) {
+                        warn("isochronous read overrun, dropped URB with status: %s, %d bytes lost",
+                             get_usb_statmsg(ubc->loststatus), ubc->isoinlost);
+                        ubc->loststatus = -EINPROGRESS;
+                }
+                spin_unlock_irqrestore(&ubc->isoinlock, flags);
+
+                if (unlikely(!(atomic_read(&ubc->running)))) {
+                        dbg(DEBUG_ISO, "%s: channel not running, dropped URB with status: %s",
+                            __func__, get_usb_statmsg(urb->status));
+                        return;
+                }
+
+                switch (urb->status) {
+                case 0:                         /* normal completion */
+                        break;
+                case -EXDEV:                    /* inspect individual frames (we do that anyway) */
+                        dbg(DEBUG_ISO, "%s: URB partially completed", __func__);
+                        break;
+                case -ENOENT:
+                case -ECONNRESET:
+                        dbg(DEBUG_ISO, "%s: URB canceled", __func__);
+                        continue;               /* -> skip */
+                case -EINPROGRESS:              /* huh? */
+                        dbg(DEBUG_ISO, "%s: URB still pending", __func__);
+                        continue;               /* -> skip */
+                case -EPIPE:
+                        err("isochronous read stalled");
+                        error_hangup(bcs);
+                        continue;               /* -> skip */
+                default:                        /* severe trouble */
+                        warn("isochronous read: %s",
+                             get_usb_statmsg(urb->status));
+                        goto error;
+                }
+
+                rcvbuf = urb->transfer_buffer;
+                totleft = urb->actual_length;
+                for (frame = 0; totleft > 0 && frame < BAS_NUMFRAMES; frame++) {
+                        if (unlikely(urb->iso_frame_desc[frame].status)) {
+                                warn("isochronous read: frame %d: %s",
+                                     frame, get_usb_statmsg(urb->iso_frame_desc[frame].status));
+                                break;
+                        }
+                        numbytes = urb->iso_frame_desc[frame].actual_length;
+                        if (unlikely(numbytes > BAS_MAXFRAME)) {
+                                warn("isochronous read: frame %d: numbytes (%d) > BAS_MAXFRAME",
+                                     frame, numbytes);
+                                break;
+                        }
+                        if (unlikely(numbytes > totleft)) {
+                                warn("isochronous read: frame %d: numbytes (%d) > totleft (%d)",
+                                     frame, numbytes, totleft);
+                                break;
+                        }
+                        offset = urb->iso_frame_desc[frame].offset;
+                        if (unlikely(offset + numbytes > BAS_INBUFSIZE)) {
+                                warn("isochronous read: frame %d: offset (%d) + numbytes (%d) > BAS_INBUFSIZE",
+                                     frame, offset, numbytes);
+                                break;
+                        }
+                        gigaset_isoc_receive(rcvbuf + offset, numbytes, bcs);
+                        totleft -= numbytes;
+                }
+                if (unlikely(totleft > 0))
+                        warn("isochronous read: %d data bytes missing",
+                             totleft);
+
+        error:
+                /* URB processed, resubmit */
+                for (frame = 0; frame < BAS_NUMFRAMES; frame++) {
+                        urb->iso_frame_desc[frame].status = 0;
+                        urb->iso_frame_desc[frame].actual_length = 0;
+                }
+                urb->dev = bcs->cs->hw.bas->udev;       /* clobbered by USB subsystem */
+                urb->transfer_flags = URB_ISO_ASAP;
+                urb->number_of_packets = BAS_NUMFRAMES;
+                if ((rc = usb_submit_urb(urb, SLAB_ATOMIC)) != 0) {
+                        err("could not resubmit isochronous read URB: %s",
+                            get_usb_statmsg(rc));
+                        dump_urb(DEBUG_ISO, "resubmit iso read", urb);
+                        error_hangup(bcs);
+                }
+        }
+}
+
+/* Channel Operations */
+/* ================== */
+
+/* req_timeout
+ * timeout routine for control output request
+ * argument:
+ *      B channel control structure
+ */
+static void req_timeout(unsigned long data)
+{
+        struct bc_state *bcs = (struct bc_state *) data;
+        struct bas_cardstate *ucs;
+        int pending;
+        unsigned long flags;
+
+        IFNULLRET(bcs);
+        IFNULLRET(bcs->cs);
+        ucs = bcs->cs->hw.bas;
+        IFNULLRET(ucs);
+
+        check_pending(ucs);
+
+        spin_lock_irqsave(&ucs->lock, flags);
+        pending = ucs->pending;
+        ucs->pending = 0;
+        spin_unlock_irqrestore(&ucs->lock, flags);
+
+        switch (pending) {
+        case 0:                                 /* no pending request */
+                dbg(DEBUG_USBREQ, "%s: no request pending", __func__);
+                break;
+
+        case HD_OPEN_ATCHANNEL:
+                err("timeout opening AT channel");
+                error_reset(bcs->cs);
+                break;
+
+        case HD_OPEN_B2CHANNEL:
+        case HD_OPEN_B1CHANNEL:
+                err("timeout opening channel %d", bcs->channel + 1);
+                error_hangup(bcs);
+                break;
+
+        case HD_CLOSE_ATCHANNEL:
+                err("timeout closing AT channel");
+                //wake_up_interruptible(cs->initwait);
+                //FIXME need own wait queue?
+                break;
+
+        case HD_CLOSE_B2CHANNEL:
+        case HD_CLOSE_B1CHANNEL:
+                err("timeout closing channel %d", bcs->channel + 1);
+                break;
+
+        default:
+                warn("request 0x%02x timed out, clearing", pending);
+        }
+}
+
+/* write_ctrl_callback
+ * USB completion handler for control pipe output
+ * called by the USB subsystem in interrupt context
+ * parameter:
+ *      urb     USB request block of completed request
+ *              urb->context = hardware specific controller state structure
+ */
+static void write_ctrl_callback(struct urb *urb, struct pt_regs *regs)
+{
+        struct bas_cardstate *ucs;
+        unsigned long flags;
+
+        IFNULLRET(urb);
+        IFNULLRET(urb->context);
+        IFNULLRET(cardstate);
+
+        ucs = (struct bas_cardstate *) urb->context;
+        spin_lock_irqsave(&ucs->lock, flags);
+        if (urb->status && ucs->pending) {
+                err("control request 0x%02x failed: %s",
+                    ucs->pending, get_usb_statmsg(urb->status));
+                del_timer(&ucs->timer_ctrl);
+                ucs->pending = 0;
+        }
+        /* individual handling of specific request types */
+        switch (ucs->pending) {
+        case HD_DEVICE_INIT_ACK:                /* no reply expected */
+                ucs->pending = 0;
+                break;
+        }
+        spin_unlock_irqrestore(&ucs->lock, flags);
+}
+
+/* req_submit
+ * submit a control output request without message buffer to the Gigaset base
+ * and optionally start a timeout
+ * parameters:
+ *      bcs     B channel control structure
+ *      req     control request code (HD_*)
+ *      val     control request parameter value (set to 0 if unused)
+ *      timeout timeout in seconds (0: no timeout)
+ * return value:
+ *      0 on success
+ *      -EINVAL if a NULL pointer is encountered somewhere
+ *      -EBUSY if another request is pending
+ *      any URB submission error code
+ */
+static int req_submit(struct bc_state *bcs, int req, int val, int timeout)
+{
+        struct bas_cardstate *ucs;
+        int ret;
+        unsigned long flags;
+
+        IFNULLRETVAL(bcs, -EINVAL);
+        IFNULLRETVAL(bcs->cs, -EINVAL);
+        ucs = bcs->cs->hw.bas;
+        IFNULLRETVAL(ucs, -EINVAL);
+        IFNULLRETVAL(ucs->urb_ctrl, -EINVAL);
+
+        dbg(DEBUG_USBREQ, "-------> 0x%02x (%d)", req, val);
+
+        spin_lock_irqsave(&ucs->lock, flags);
+        if (ucs->pending) {
+                spin_unlock_irqrestore(&ucs->lock, flags);
+                err("submission of request 0x%02x failed: request 0x%02x still pending",
+                    req, ucs->pending);
+                return -EBUSY;
+        }
+        if (ucs->urb_ctrl->status == -EINPROGRESS) {
+                spin_unlock_irqrestore(&ucs->lock, flags);
+                err("could not submit request 0x%02x: URB busy", req);
+                return -EBUSY;
+        }
+
+        ucs->dr_ctrl.bRequestType = OUT_VENDOR_REQ;
+        ucs->dr_ctrl.bRequest = req;
+        ucs->dr_ctrl.wValue = cpu_to_le16(val);
+        ucs->dr_ctrl.wIndex = 0;
+        ucs->dr_ctrl.wLength = 0;
+        usb_fill_control_urb(ucs->urb_ctrl, ucs->udev,
+                             usb_sndctrlpipe(ucs->udev, 0),
+                             (unsigned char*) &ucs->dr_ctrl, NULL, 0,
+                             write_ctrl_callback, ucs);
+        if ((ret = usb_submit_urb(ucs->urb_ctrl, SLAB_ATOMIC)) != 0) {
+                err("could not submit request 0x%02x: %s",
+                    req, get_usb_statmsg(ret));
+                spin_unlock_irqrestore(&ucs->lock, flags);
+                return ret;
+        }
+        ucs->pending = req;
+
+        if (timeout > 0) {
+                dbg(DEBUG_USBREQ, "setting timeout of %d/10 secs", timeout);
+                ucs->timer_ctrl.expires = jiffies + timeout * HZ / 10;
+                ucs->timer_ctrl.data = (unsigned long) bcs;
+                ucs->timer_ctrl.function = req_timeout;
+                add_timer(&ucs->timer_ctrl);
+        }
+
+        spin_unlock_irqrestore(&ucs->lock, flags);
+        return 0;
+}
+
+/* gigaset_init_bchannel
+ * called by common.c to connect a B channel
+ * initialize isochronous I/O and tell the Gigaset base to open the channel
+ * argument:
+ *      B channel control structure
+ * return value:
+ *      0 on success, error code < 0 on error
+ */
+static int gigaset_init_bchannel(struct bc_state *bcs)
+{
+        int req, ret;
+
+        IFNULLRETVAL(bcs, -EINVAL);
+
+        if ((ret = starturbs(bcs)) < 0) {
+                err("could not start isochronous I/O for channel %d",
+                    bcs->channel + 1);
+                error_hangup(bcs);
+                return ret;
+        }
+
+        req = bcs->channel ? HD_OPEN_B2CHANNEL : HD_OPEN_B1CHANNEL;
+        if ((ret = req_submit(bcs, req, 0, BAS_TIMEOUT)) < 0) {
+                err("could not open channel %d: %s",
+                    bcs->channel + 1, get_usb_statmsg(ret));
+                stopurbs(bcs->hw.bas);
+                error_hangup(bcs);
+        }
+        return ret;
+}
+
+/* gigaset_close_bchannel
+ * called by common.c to disconnect a B channel
+ * tell the Gigaset base to close the channel
+ * stopping isochronous I/O and LL notification will be done when the
+ * acknowledgement for the close arrives
+ * argument:
+ *      B channel control structure
+ * return value:
+ *      0 on success, error code < 0 on error
+ */
+static int gigaset_close_bchannel(struct bc_state *bcs)
+{
+        int req, ret;
+
+        IFNULLRETVAL(bcs, -EINVAL);
+
+        if (!(atomic_read(&bcs->cs->hw.bas->basstate) &
+              (bcs->channel ? BS_B2OPEN : BS_B1OPEN))) {
+                /* channel not running: just signal common.c */
+                gigaset_bchannel_down(bcs);
+                return 0;
+        }
+
+        req = bcs->channel ? HD_CLOSE_B2CHANNEL : HD_CLOSE_B1CHANNEL;
+        if ((ret = req_submit(bcs, req, 0, BAS_TIMEOUT)) < 0)
+                err("could not submit HD_CLOSE_BxCHANNEL request: %s",
+                    get_usb_statmsg(ret));
+        return ret;
+}
+
+/* Device Operations */
+/* ================= */
+
+/* complete_cb
+ * unqueue first command buffer from queue, waking any sleepers
+ * must be called with cs->cmdlock held
+ * parameter:
+ *      cs      controller state structure
+ */
+static void complete_cb(struct cardstate *cs)
+{
+        struct cmdbuf_t *cb;
+
+        IFNULLRET(cs);
+        cb = cs->cmdbuf;
+        IFNULLRET(cb);
+
+        /* unqueue completed buffer */
+        cs->cmdbytes -= cs->curlen;
+        dbg(DEBUG_TRANSCMD | DEBUG_LOCKCMD,
+            "write_command: sent %u bytes, %u left",
+            cs->curlen, cs->cmdbytes);
+        if ((cs->cmdbuf = cb->next) != NULL) {
+                cs->cmdbuf->prev = NULL;
+                cs->curlen = cs->cmdbuf->len;
+        } else {
+                cs->lastcmdbuf = NULL;
+                cs->curlen = 0;
+        }
+
+        if (cb->wake_tasklet)
+                tasklet_schedule(cb->wake_tasklet);
+
+        kfree(cb);
+}
+
+static int atwrite_submit(struct cardstate *cs, unsigned char *buf, int len);
+
+/* write_command_callback
+ * USB completion handler for AT command transmission
+ * called by the USB subsystem in interrupt context
+ * parameter:
+ *      urb     USB request block of completed request
+ *              urb->context = controller state structure
+ */
+static void write_command_callback(struct urb *urb, struct pt_regs *regs)
+{
+        struct cardstate *cs;
+        unsigned long flags;
+        struct bas_cardstate *ucs;
+
+        IFNULLRET(urb);
+        cs = (struct cardstate *) urb->context;
+        IFNULLRET(cs);
+        ucs = cs->hw.bas;
+        IFNULLRET(ucs);
+
+        /* check status */
+        switch (urb->status) {
+        case 0:                                 /* normal completion */
+                break;
+        case -ENOENT:                   /* canceled */
+        case -ECONNRESET:               /* canceled (async) */
+        case -EINPROGRESS:              /* pending */
+                /* ignore silently */
+                dbg(DEBUG_USBREQ,
+                    "%s: %s", __func__, get_usb_statmsg(urb->status));
+                return;
+        default:                                /* any failure */
+                if (++ucs->retry_cmd_out > BAS_RETRY) {
+                        warn("command write: %s, giving up after %d retries",
+                             get_usb_statmsg(urb->status), ucs->retry_cmd_out);
+                        break;
+                }
+                if (cs->cmdbuf == NULL) {
+                        warn("command write: %s, cannot retry - cmdbuf gone",
+                             get_usb_statmsg(urb->status));
+                        break;
+                }
+                notice("command write: %s, retry %d",
+                       get_usb_statmsg(urb->status), ucs->retry_cmd_out);
+                if (atwrite_submit(cs, cs->cmdbuf->buf, cs->cmdbuf->len) >= 0)
+                        /* resubmitted - bypass regular exit block */
+                        return;
+                /* command send failed, assume base still waiting */
+                update_basstate(ucs, BS_ATREADY, 0);
+        }
+
+        spin_lock_irqsave(&cs->cmdlock, flags);
+        if (cs->cmdbuf != NULL)
+                complete_cb(cs);
+        spin_unlock_irqrestore(&cs->cmdlock, flags);
+}
+
+/* atrdy_timeout
+ * timeout routine for AT command transmission
+ * argument:
+ *      controller state structure
+ */
+static void atrdy_timeout(unsigned long data)
+{
+        struct cardstate *cs = (struct cardstate *) data;
+        struct bas_cardstate *ucs;
+
+        IFNULLRET(cs);
+        ucs = cs->hw.bas;
+        IFNULLRET(ucs);
+
+        warn("timeout waiting for HD_READY_SEND_ATDATA");
+
+        /* fake the missing signal - what else can I do? */
+        update_basstate(ucs, BS_ATREADY, BS_ATTIMER);
+        start_cbsend(cs);
+}
+
+/* atwrite_submit
+ * submit an HD_WRITE_ATMESSAGE command URB
+ * parameters:
+ *      cs      controller state structure
+ *      buf     buffer containing command to send
+ *      len     length of command to send
+ * return value:
+ *      0 on success
+ *      -EFAULT if a NULL pointer is encountered somewhere
+ *      -EBUSY if another request is pending
+ *      any URB submission error code
+ */
+static int atwrite_submit(struct cardstate *cs, unsigned char *buf, int len)
+{
+        struct bas_cardstate *ucs;
+        int ret;
+
+        IFNULLRETVAL(cs, -EFAULT);
+        ucs = cs->hw.bas;
+        IFNULLRETVAL(ucs, -EFAULT);
+        IFNULLRETVAL(ucs->urb_cmd_out, -EFAULT);
+
+        dbg(DEBUG_USBREQ, "-------> HD_WRITE_ATMESSAGE (%d)", len);
+
+        if (ucs->urb_cmd_out->status == -EINPROGRESS) {
+                err("could not submit HD_WRITE_ATMESSAGE: URB busy");
+                return -EBUSY;
+        }
+
+        ucs->dr_cmd_out.bRequestType = OUT_VENDOR_REQ;
+        ucs->dr_cmd_out.bRequest = HD_WRITE_ATMESSAGE;
+        ucs->dr_cmd_out.wValue = 0;
+        ucs->dr_cmd_out.wIndex = 0;
+        ucs->dr_cmd_out.wLength = cpu_to_le16(len);
+        usb_fill_control_urb(ucs->urb_cmd_out, ucs->udev,
+                             usb_sndctrlpipe(ucs->udev, 0),
+                             (unsigned char*) &ucs->dr_cmd_out, buf, len,
+                             write_command_callback, cs);
+
+        if ((ret = usb_submit_urb(ucs->urb_cmd_out, SLAB_ATOMIC)) != 0) {
+                err("could not submit HD_WRITE_ATMESSAGE: %s",
+                    get_usb_statmsg(ret));
+                return ret;
+        }
+
+        /* submitted successfully */
+        update_basstate(ucs, 0, BS_ATREADY);
+
+        /* start timeout if necessary */
+        if (!(atomic_read(&ucs->basstate) & BS_ATTIMER)) {
+                dbg(DEBUG_OUTPUT,
+                    "setting ATREADY timeout of %d/10 secs", ATRDY_TIMEOUT);
+                ucs->timer_atrdy.expires = jiffies + ATRDY_TIMEOUT * HZ / 10;
+                ucs->timer_atrdy.data = (unsigned long) cs;
+                ucs->timer_atrdy.function = atrdy_timeout;
+                add_timer(&ucs->timer_atrdy);
+                update_basstate(ucs, BS_ATTIMER, 0);
+        }
+        return 0;
+}
+
+/* start_cbsend
+ * start transmission of AT command queue if necessary
+ * parameter:
+ *      cs              controller state structure
+ * return value:
+ *      0 on success
+ *      error code < 0 on error
+ */
+static int start_cbsend(struct cardstate *cs)
+{
+        struct cmdbuf_t *cb;
+        struct bas_cardstate *ucs;
+        unsigned long flags;
+        int rc;
+        int retval = 0;
+
+        IFNULLRETVAL(cs, -EFAULT);
+        ucs = cs->hw.bas;
+        IFNULLRETVAL(ucs, -EFAULT);
+
+        /* check if AT channel is open */
+        if (!(atomic_read(&ucs->basstate) & BS_ATOPEN)) {
+                dbg(DEBUG_TRANSCMD | DEBUG_LOCKCMD, "AT channel not open");
+                rc = req_submit(cs->bcs, HD_OPEN_ATCHANNEL, 0, BAS_TIMEOUT);
+                if (rc < 0) {
+                        err("could not open AT channel");
+                        /* flush command queue */
+                        spin_lock_irqsave(&cs->cmdlock, flags);
+                        while (cs->cmdbuf != NULL)
+                                complete_cb(cs);
+                        spin_unlock_irqrestore(&cs->cmdlock, flags);
+                }
+                return rc;
+        }
+
+        /* try to send first command in queue */
+        spin_lock_irqsave(&cs->cmdlock, flags);
+
+        while ((cb = cs->cmdbuf) != NULL &&
+               atomic_read(&ucs->basstate) & BS_ATREADY) {
+                ucs->retry_cmd_out = 0;
+                rc = atwrite_submit(cs, cb->buf, cb->len);
+                if (unlikely(rc)) {
+                        retval = rc;
+                        complete_cb(cs);
+                }
+        }
+
+        spin_unlock_irqrestore(&cs->cmdlock, flags);
+        return retval;
+}
+
+/* gigaset_write_cmd
+ * This function is called by the device independent part of the driver
+ * to transmit an AT command string to the Gigaset device.
+ * It encapsulates the device specific method for transmission over the
+ * direct USB connection to the base.
+ * The command string is added to the queue of commands to send, and
+ * USB transmission is started if necessary.
+ * parameters:
+ *      cs              controller state structure
+ *      buf             command string to send
+ *      len             number of bytes to send (max. IF_WRITEBUF)
+ *      wake_tasklet    tasklet to run when transmission is completed (NULL if none)
+ * return value:
+ *      number of bytes queued on success
+ *      error code < 0 on error
+ */
+static int gigaset_write_cmd(struct cardstate *cs,
+                             const unsigned char *buf, int len,
+                             struct tasklet_struct *wake_tasklet)
+{
+        struct cmdbuf_t *cb;
+        unsigned long flags;
+        int status;
+
+        gigaset_dbg_buffer(atomic_read(&cs->mstate) != MS_LOCKED ?
+                             DEBUG_TRANSCMD : DEBUG_LOCKCMD,
+                           "CMD Transmit", len, buf, 0);
+
+        if (!atomic_read(&cs->connected)) {
+                err("%s: not connected", __func__);
+                return -ENODEV;
+        }
+
+        if (len <= 0)
+                return 0;                       /* nothing to do */
+
+        if (len > IF_WRITEBUF)
+                len = IF_WRITEBUF;
+        if (!(cb = kmalloc(sizeof(struct cmdbuf_t) + len, GFP_ATOMIC))) {
+                err("%s: out of memory", __func__);
+                return -ENOMEM;
+        }
+
+        memcpy(cb->buf, buf, len);
+        cb->len = len;
+        cb->offset = 0;
+        cb->next = NULL;
+        cb->wake_tasklet = wake_tasklet;
+
+        spin_lock_irqsave(&cs->cmdlock, flags);
+        cb->prev = cs->lastcmdbuf;
+        if (cs->lastcmdbuf)
+                cs->lastcmdbuf->next = cb;
+        else {
+                cs->cmdbuf = cb;
+                cs->curlen = len;
+        }
+        cs->cmdbytes += len;
+        cs->lastcmdbuf = cb;
+        spin_unlock_irqrestore(&cs->cmdlock, flags);
+
+        status = start_cbsend(cs);
+
+        return status < 0 ? status : len;
+}
+
+/* gigaset_write_room
+ * tty_driver.write_room interface routine
+ * return number of characters the driver will accept to be written via gigaset_write_cmd
+ * parameter:
+ *      controller state structure
+ * return value:
+ *      number of characters
+ */
+static int gigaset_write_room(struct cardstate *cs)
+{
+        return IF_WRITEBUF;
+}
+
+/* gigaset_chars_in_buffer
+ * tty_driver.chars_in_buffer interface routine
+ * return number of characters waiting to be sent
+ * parameter:
+ *      controller state structure
+ * return value:
+ *      number of characters
+ */
+static int gigaset_chars_in_buffer(struct cardstate *cs)
+{
+        unsigned long flags;
+        unsigned bytes;
+
+        spin_lock_irqsave(&cs->cmdlock, flags);
+        bytes = cs->cmdbytes;
+        spin_unlock_irqrestore(&cs->cmdlock, flags);
+
+        return bytes;
+}
+
+/* gigaset_brkchars
+ * implementation of ioctl(GIGASET_BRKCHARS)
+ * parameter:
+ *      controller state structure
+ * return value:
+ *      -EINVAL (unimplemented function)
+ */
+static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
+{
+        return -EINVAL;
+}
+
+
+/* Device Initialization/Shutdown */
+/* ============================== */
+
+/* Free hardware dependent part of the B channel structure
+ * parameter:
+ *      bcs     B channel structure
+ * return value:
+ *      !=0 on success
+ */
+static int gigaset_freebcshw(struct bc_state *bcs)
+{
+        if (!bcs->hw.bas)
+                return 0;
+
+        if (bcs->hw.bas->isooutbuf)
+                kfree(bcs->hw.bas->isooutbuf);
+        kfree(bcs->hw.bas);
+        bcs->hw.bas = NULL;
+        return 1;
+}
+
+/* Initialize hardware dependent part of the B channel structure
+ * parameter:
+ *      bcs     B channel structure
+ * return value:
+ *      !=0 on success
+ */
+static int gigaset_initbcshw(struct bc_state *bcs)
+{
+        int i;
+        struct bas_bc_state *ubc;
+
+        bcs->hw.bas = ubc = kmalloc(sizeof(struct bas_bc_state), GFP_KERNEL);
+        if (!ubc) {
+                err("could not allocate bas_bc_state");
+                return 0;
+        }
+
+        atomic_set(&ubc->running, 0);
+        atomic_set(&ubc->corrbytes, 0);
+        spin_lock_init(&ubc->isooutlock);
+        for (i = 0; i < BAS_OUTURBS; ++i) {
+                ubc->isoouturbs[i].urb = NULL;
+                ubc->isoouturbs[i].bcs = bcs;
+        }
+        ubc->isooutdone = ubc->isooutfree = ubc->isooutovfl = NULL;
+        ubc->numsub = 0;
+        if (!(ubc->isooutbuf = kmalloc(sizeof(struct isowbuf_t), GFP_KERNEL))) {
+                err("could not allocate isochronous output buffer");
+                kfree(ubc);
+                bcs->hw.bas = NULL;
+                return 0;
+        }
+        tasklet_init(&ubc->sent_tasklet,
+                     &write_iso_tasklet, (unsigned long) bcs);
+
+        spin_lock_init(&ubc->isoinlock);
+        for (i = 0; i < BAS_INURBS; ++i)
+                ubc->isoinurbs[i] = NULL;
+        ubc->isoindone = NULL;
+        ubc->loststatus = -EINPROGRESS;
+        ubc->isoinlost = 0;
+        ubc->seqlen = 0;
+        ubc->inbyte = 0;
+        ubc->inbits = 0;
+        ubc->goodbytes = 0;
+        ubc->alignerrs = 0;
+        ubc->fcserrs = 0;
+        ubc->frameerrs = 0;
+        ubc->giants = 0;
+        ubc->runts = 0;
+        ubc->aborts = 0;
+        ubc->shared0s = 0;
+        ubc->stolen0s = 0;
+        tasklet_init(&ubc->rcvd_tasklet,
+                     &read_iso_tasklet, (unsigned long) bcs);
+        return 1;
+}
+
+static void gigaset_reinitbcshw(struct bc_state *bcs)
+{
+        struct bas_bc_state *ubc = bcs->hw.bas;
+
+        atomic_set(&bcs->hw.bas->running, 0);
+        atomic_set(&bcs->hw.bas->corrbytes, 0);
+        bcs->hw.bas->numsub = 0;
+        spin_lock_init(&ubc->isooutlock);
+        spin_lock_init(&ubc->isoinlock);
+        ubc->loststatus = -EINPROGRESS;
+}
+
+static void gigaset_freecshw(struct cardstate *cs)
+{
+        struct bas_cardstate *ucs = cs->hw.bas;
+
+        del_timer(&ucs->timer_ctrl);
+        del_timer(&ucs->timer_atrdy);
+        del_timer(&ucs->timer_cmd_in);
+
+        kfree(cs->hw.bas);
+}
+
+static int gigaset_initcshw(struct cardstate *cs)
+{
+        struct bas_cardstate *ucs;
+
+        cs->hw.bas = ucs = kmalloc(sizeof *ucs, GFP_KERNEL);
+        if (!ucs)
+                return 0;
+
+        ucs->urb_cmd_in = NULL;
+        ucs->urb_cmd_out = NULL;
+        ucs->rcvbuf = NULL;
+        ucs->rcvbuf_size = 0;
+
+        spin_lock_init(&ucs->lock);
+        ucs->pending = 0;
+
+        atomic_set(&ucs->basstate, 0);
+        init_timer(&ucs->timer_ctrl);
+        init_timer(&ucs->timer_atrdy);
+        init_timer(&ucs->timer_cmd_in);
+
+        return 1;
+}
+
+/* freeurbs
+ * unlink and deallocate all URBs unconditionally
+ * caller must make sure that no commands are still in progress
+ * parameter:
+ *      cs      controller state structure
+ */
+static void freeurbs(struct cardstate *cs)
+{
+        struct bas_cardstate *ucs;
+        struct bas_bc_state *ubc;
+        int i, j;
+
+        IFNULLRET(cs);
+        ucs = cs->hw.bas;
+        IFNULLRET(ucs);
+
+        for (j = 0; j < 2; ++j) {
+                ubc = cs->bcs[j].hw.bas;
+                IFNULLCONT(ubc);
+                for (i = 0; i < BAS_OUTURBS; ++i)
+                        if (ubc->isoouturbs[i].urb) {
+                                usb_kill_urb(ubc->isoouturbs[i].urb);
+                                dbg(DEBUG_INIT,
+                                    "%s: isoc output URB %d/%d unlinked",
+                                    __func__, j, i);
+                                usb_free_urb(ubc->isoouturbs[i].urb);
+                                ubc->isoouturbs[i].urb = NULL;
+                        }
+                for (i = 0; i < BAS_INURBS; ++i)
+                        if (ubc->isoinurbs[i]) {
+                                usb_kill_urb(ubc->isoinurbs[i]);
+                                dbg(DEBUG_INIT,
+                                    "%s: isoc input URB %d/%d unlinked",
+                                    __func__, j, i);
+                                usb_free_urb(ubc->isoinurbs[i]);
+                                ubc->isoinurbs[i] = NULL;
+                        }
+        }
+        if (ucs->urb_int_in) {
+                usb_kill_urb(ucs->urb_int_in);
+                dbg(DEBUG_INIT, "%s: interrupt input URB unlinked", __func__);
+                usb_free_urb(ucs->urb_int_in);
+                ucs->urb_int_in = NULL;
+        }
+        if (ucs->urb_cmd_out) {
+                usb_kill_urb(ucs->urb_cmd_out);
+                dbg(DEBUG_INIT, "%s: command output URB unlinked", __func__);
+                usb_free_urb(ucs->urb_cmd_out);
+                ucs->urb_cmd_out = NULL;
+        }
+        if (ucs->urb_cmd_in) {
+                usb_kill_urb(ucs->urb_cmd_in);
+                dbg(DEBUG_INIT, "%s: command input URB unlinked", __func__);
+                usb_free_urb(ucs->urb_cmd_in);
+                ucs->urb_cmd_in = NULL;
+        }
+        if (ucs->urb_ctrl) {
+                usb_kill_urb(ucs->urb_ctrl);
+                dbg(DEBUG_INIT, "%s: control output URB unlinked", __func__);
+                usb_free_urb(ucs->urb_ctrl);
+                ucs->urb_ctrl = NULL;
+        }
+}
+
+/* gigaset_probe
+ * This function is called when a new USB device is connected.
+ * It checks whether the new device is handled by this driver.
+ */
+static int gigaset_probe(struct usb_interface *interface,
+                         const struct usb_device_id *id)
+{
+        struct usb_host_interface *hostif;
+        struct usb_device *udev = interface_to_usbdev(interface);
+        struct cardstate *cs = NULL;
+        struct bas_cardstate *ucs = NULL;
+        struct bas_bc_state *ubc;
+        struct usb_endpoint_descriptor *endpoint;
+        int i, j;
+        int ret;
+
+        IFNULLRETVAL(udev, -ENODEV);
+
+        dbg(DEBUG_ANY,
+            "%s: Check if device matches .. (Vendor: 0x%x, Product: 0x%x)",
+            __func__, le16_to_cpu(udev->descriptor.idVendor),
+            le16_to_cpu(udev->descriptor.idProduct));
+
+        /* See if the device offered us matches what we can accept */
+        if ((le16_to_cpu(udev->descriptor.idVendor)  != USB_GIGA_VENDOR_ID) ||
+            (le16_to_cpu(udev->descriptor.idProduct) != USB_GIGA_PRODUCT_ID &&
+             le16_to_cpu(udev->descriptor.idProduct) != USB_4175_PRODUCT_ID &&
+             le16_to_cpu(udev->descriptor.idProduct) != USB_SX303_PRODUCT_ID &&
+             le16_to_cpu(udev->descriptor.idProduct) != USB_SX353_PRODUCT_ID)) {
+                dbg(DEBUG_ANY, "%s: unmatched ID - exiting", __func__);
+                return -ENODEV;
+        }
+
+        /* set required alternate setting */
+        hostif = interface->cur_altsetting;
+        if (hostif->desc.bAlternateSetting != 3) {
+                dbg(DEBUG_ANY,
+                    "%s: wrong alternate setting %d - trying to switch",
+                    __func__, hostif->desc.bAlternateSetting);
+                if (usb_set_interface(udev, hostif->desc.bInterfaceNumber, 3) < 0) {
+                        warn("usb_set_interface failed, device %d interface %d altsetting %d",
+                             udev->devnum, hostif->desc.bInterfaceNumber,
+                             hostif->desc.bAlternateSetting);
+                        return -ENODEV;
+                }
+                hostif = interface->cur_altsetting;
+        }
+
+        /* Reject application specific interfaces
+         */
+        if (hostif->desc.bInterfaceClass != 255) {
+                warn("%s: bInterfaceClass == %d",
+                     __func__, hostif->desc.bInterfaceClass);
+                return -ENODEV;
+        }
+
+        info("%s: Device matched (Vendor: 0x%x, Product: 0x%x)",
+             __func__, le16_to_cpu(udev->descriptor.idVendor),
+             le16_to_cpu(udev->descriptor.idProduct));
+
+        cs = gigaset_getunassignedcs(driver);
+        if (!cs) {
+                err("%s: no free cardstate", __func__);
+                return -ENODEV;
+        }
+        ucs = cs->hw.bas;
+        ucs->udev = udev;
+        ucs->interface = interface;
+
+        /* allocate URBs:
+         * - one for the interrupt pipe
+         * - three for the different uses of the default control pipe
+         * - three for each isochronous pipe
+         */
+        ucs->urb_int_in = usb_alloc_urb(0, SLAB_KERNEL);
+        if (!ucs->urb_int_in) {
+                err("No free urbs available");
+                goto error;
+        }
+        ucs->urb_cmd_in = usb_alloc_urb(0, SLAB_KERNEL);
+        if (!ucs->urb_cmd_in) {
+                err("No free urbs available");
+                goto error;
+        }
+        ucs->urb_cmd_out = usb_alloc_urb(0, SLAB_KERNEL);
+        if (!ucs->urb_cmd_out) {
+                err("No free urbs available");
+                goto error;
+        }
+        ucs->urb_ctrl = usb_alloc_urb(0, SLAB_KERNEL);
+        if (!ucs->urb_ctrl) {
+                err("No free urbs available");
+                goto error;
+        }
+
+        for (j = 0; j < 2; ++j) {
+                ubc = cs->bcs[j].hw.bas;
+                for (i = 0; i < BAS_OUTURBS; ++i) {
+                        ubc->isoouturbs[i].urb =
+                                usb_alloc_urb(BAS_NUMFRAMES, SLAB_KERNEL);
+                        if (!ubc->isoouturbs[i].urb) {
+                                err("No free urbs available");
+                                goto error;
+                        }
+                }
+                for (i = 0; i < BAS_INURBS; ++i) {
+                        ubc->isoinurbs[i] =
+                                usb_alloc_urb(BAS_NUMFRAMES, SLAB_KERNEL);
+                        if (!ubc->isoinurbs[i]) {
+                                err("No free urbs available");
+                                goto error;
+                        }
+                }
+        }
+
+        ucs->rcvbuf = NULL;
+        ucs->rcvbuf_size = 0;
+
+        /* Fill the interrupt urb and send it to the core */
+        endpoint = &hostif->endpoint[0].desc;
+        usb_fill_int_urb(ucs->urb_int_in, udev,
+                         usb_rcvintpipe(udev,
+                                        (endpoint->bEndpointAddress) & 0x0f),
+                         ucs->int_in_buf, 3, read_int_callback, cs,
+                         endpoint->bInterval);
+        ret = usb_submit_urb(ucs->urb_int_in, SLAB_KERNEL);
+        if (ret) {
+                err("could not submit interrupt URB: %s", get_usb_statmsg(ret));
+                goto error;
+        }
+
+        /* tell the device that the driver is ready */
+        if ((ret = req_submit(cs->bcs, HD_DEVICE_INIT_ACK, 0, 0)) != 0)
+                goto error;
+
+        /* tell common part that the device is ready */
+        if (startmode == SM_LOCKED)
+                atomic_set(&cs->mstate, MS_LOCKED);
+        if (!gigaset_start(cs))
+                goto error;
+
+        /* save address of controller structure */
+        usb_set_intfdata(interface, cs);
+
+        /* set up device sysfs */
+        gigaset_init_dev_sysfs(interface);
+        return 0;
+
+error:
+        freeurbs(cs);
+        gigaset_unassign(cs);
+        return -ENODEV;
+}
+
+/* gigaset_disconnect
+ * This function is called when the Gigaset base is unplugged.
+ */
+static void gigaset_disconnect(struct usb_interface *interface)
+{
+        struct cardstate *cs;
+        struct bas_cardstate *ucs;
+
+        /* clear device sysfs */
+        gigaset_free_dev_sysfs(interface);
+
+        cs = usb_get_intfdata(interface);
+        usb_set_intfdata(interface, NULL);
+
+        IFNULLRET(cs);
+        ucs = cs->hw.bas;
+        IFNULLRET(ucs);
+
+        info("disconnecting GigaSet base");
+        gigaset_stop(cs);
+        freeurbs(cs);
+        kfree(ucs->rcvbuf);
+        ucs->rcvbuf = NULL;
+        ucs->rcvbuf_size = 0;
+        atomic_set(&ucs->basstate, 0);
+        gigaset_unassign(cs);
+}
+
+static struct gigaset_ops gigops = {
+        gigaset_write_cmd,
+        gigaset_write_room,
+        gigaset_chars_in_buffer,
+        gigaset_brkchars,
+        gigaset_init_bchannel,
+        gigaset_close_bchannel,
+        gigaset_initbcshw,
+        gigaset_freebcshw,
+        gigaset_reinitbcshw,
+        gigaset_initcshw,
+        gigaset_freecshw,
+        gigaset_set_modem_ctrl,
+        gigaset_baud_rate,
+        gigaset_set_line_ctrl,
+        gigaset_isoc_send_skb,
+        gigaset_isoc_input,
+};
+
+/* bas_gigaset_init
+ * This function is called after the kernel module is loaded.
+ */
+static int __init bas_gigaset_init(void)
+{
+        int result;
+
+        /* allocate memory for our driver state and intialize it */
+        if ((driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,
+                                       GIGASET_MODULENAME, GIGASET_DEVNAME,
+                                       GIGASET_DEVFSNAME, &gigops,
+                                       THIS_MODULE)) == NULL)
+                goto error;
+
+        /* allocate memory for our device state and intialize it */
+        cardstate = gigaset_initcs(driver, 2, 0, 0, cidmode, GIGASET_MODULENAME);
+        if (!cardstate)
+                goto error;
+
+        /* register this driver with the USB subsystem */
+        result = usb_register(&gigaset_usb_driver);
+        if (result < 0) {
+                err("usb_register failed (error %d)", -result);
+                goto error;
+        }
+
+        info(DRIVER_AUTHOR);
+        info(DRIVER_DESC);
+        return 0;
+
+error:  if (cardstate)
+                gigaset_freecs(cardstate);
+        cardstate = NULL;
+        if (driver)
+                gigaset_freedriver(driver);
+        driver = NULL;
+        return -1;
+}
+
+/* bas_gigaset_exit
+ * This function is called before the kernel module is unloaded.
+ */
+static void __exit bas_gigaset_exit(void)
+{
+        gigaset_blockdriver(driver); /* => probe will fail
+                                      * => no gigaset_start any more
+                                      */
+
+        gigaset_shutdown(cardstate);
+        /* from now on, no isdn callback should be possible */
+
+        if (atomic_read(&cardstate->hw.bas->basstate) & BS_ATOPEN) {
+                dbg(DEBUG_ANY, "closing AT channel");
+                if (req_submit(cardstate->bcs,
+                               HD_CLOSE_ATCHANNEL, 0, BAS_TIMEOUT) >= 0) {
+                        /* successfully submitted - wait for completion */
+                        //wait_event_interruptible(cs->initwait, !cs->hw.bas->pending);
+                        //FIXME need own wait queue? wakeup?
+                }
+        }
+
+        /* deregister this driver with the USB subsystem */
+        usb_deregister(&gigaset_usb_driver);
+        /* this will call the disconnect-callback */
+        /* from now on, no disconnect/probe callback should be running */
+
+        gigaset_freecs(cardstate);
+        cardstate = NULL;
+        gigaset_freedriver(driver);
+        driver = NULL;
+}
+
+
+module_init(bas_gigaset_init);
+module_exit(bas_gigaset_exit);
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
new file mode 100644
index 0000000000..64371995c1
--- /dev/null
+++ b/drivers/isdn/gigaset/common.c
@@ -0,0 +1,1203 @@
+/*
+ * Stuff used by all variants of the driver
+ *
+ * Copyright (c) 2001 by Stefan Eilers <Eilers.Stefan@epost.de>,
+ *                       Hansjoerg Lipp <hjlipp@web.de>,
+ *                       Tilman Schmidt <tilman@imap.cc>.
+ *
+ * =====================================================================
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License as
+ *      published by the Free Software Foundation; either version 2 of
+ *      the License, or (at your option) any later version.
+ * =====================================================================
+ * ToDo: ...
+ * =====================================================================
+ * Version: $Id: common.c,v 1.104.4.22 2006/02/04 18:28:16 hjlipp Exp $
+ * =====================================================================
+ */
+
+#include "gigaset.h"
+#include <linux/ctype.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+
+/* Version Information */
+#define DRIVER_AUTHOR "Hansjoerg Lipp <hjlipp@web.de>, Tilman Schmidt <tilman@imap.cc>, Stefan Eilers <Eilers.Stefan@epost.de>"
+#define DRIVER_DESC "Driver for Gigaset 307x"
+
+/* Module parameters */
+int gigaset_debuglevel = DEBUG_DEFAULT;
+EXPORT_SYMBOL_GPL(gigaset_debuglevel);
+module_param_named(debug, gigaset_debuglevel, int, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(debug, "debug level");
+
+/*======================================================================
+  Prototypes of internal functions
+ */
+
+//static void gigaset_process_response(int resp_code, int parameter,
+//                                     struct at_state_t *at_state,
+//                                     unsigned char ** pstring);
+static struct cardstate *alloc_cs(struct gigaset_driver *drv);
+static void free_cs(struct cardstate *cs);
+static void make_valid(struct cardstate *cs, unsigned mask);
+static void make_invalid(struct cardstate *cs, unsigned mask);
+
+#define VALID_MINOR       0x01
+#define VALID_ID          0x02
+#define ASSIGNED          0x04
+
+/* bitwise byte inversion table */
+__u8 gigaset_invtab[256] = {
+        0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
+        0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
+        0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
+        0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
+        0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
+        0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
+        0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
+        0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
+        0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
+        0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
+        0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
+        0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
+        0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
+        0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
+        0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
+        0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
+        0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
+        0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
+        0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
+        0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
+        0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
+        0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
+        0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
+        0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
+        0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
+        0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
+        0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
+        0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
+        0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
+        0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
+        0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
+        0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
+};
+EXPORT_SYMBOL_GPL(gigaset_invtab);
+
+void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,
+                        size_t len, const unsigned char *buf, int from_user)
+{
+        unsigned char outbuf[80];
+        unsigned char inbuf[80 - 1];
+        size_t numin;
+        const unsigned char *in;
+        size_t space = sizeof outbuf - 1;
+        unsigned char *out = outbuf;
+
+        if (!from_user) {
+                in = buf;
+                numin = len;
+        } else {
+                numin = len < sizeof inbuf ? len : sizeof inbuf;
+                in = inbuf;
+                if (copy_from_user(inbuf, (const unsigned char __user *) buf, numin)) {
+                        strncpy(inbuf, "<FAULT>", sizeof inbuf);
+                        numin = sizeof "<FAULT>" - 1;
+                }
+        }
+
+        for (; numin && space; --numin, ++in) {
+                --space;
+                if (*in >= 32)
+                        *out++ = *in;
+                else {
+                        *out++ = '^';
+                        if (space) {
+                                *out++ = '@' + *in;
+                                --space;
+                        }
+                }
+        }
+        *out = 0;
+
+        dbg(level, "%s (%u bytes): %s", msg, (unsigned) len, outbuf);
+}
+EXPORT_SYMBOL_GPL(gigaset_dbg_buffer);
+
+static int setflags(struct cardstate *cs, unsigned flags, unsigned delay)
+{
+        int r;
+
+        r = cs->ops->set_modem_ctrl(cs, cs->control_state, flags);
+        cs->control_state = flags;
+        if (r < 0)
+                return r;
+
+        if (delay) {
+                set_current_state(TASK_INTERRUPTIBLE);
+                schedule_timeout(delay * HZ / 1000);
+        }
+
+        return 0;
+}
+
+int gigaset_enterconfigmode(struct cardstate *cs)
+{
+        int i, r;
+
+        if (!atomic_read(&cs->connected)) {
+                err("not connected!");
+                return -1;
+        }
+
+        cs->control_state = TIOCM_RTS; //FIXME
+
+        r = setflags(cs, TIOCM_DTR, 200);
+        if (r < 0)
+                goto error;
+        r = setflags(cs, 0, 200);
+        if (r < 0)
+                goto error;
+        for (i = 0; i < 5; ++i) {
+                r = setflags(cs, TIOCM_RTS, 100);
+                if (r < 0)
+                        goto error;
+                r = setflags(cs, 0, 100);
+                if (r < 0)
+                        goto error;
+        }
+        r = setflags(cs, TIOCM_RTS|TIOCM_DTR, 800);
+        if (r < 0)
+                goto error;
+
+        return 0;
+
+error:
+        err("error %d on setuartbits!\n", -r);
+        cs->control_state = TIOCM_RTS|TIOCM_DTR; // FIXME is this a good value?
+        cs->ops->set_modem_ctrl(cs, 0, TIOCM_RTS|TIOCM_DTR);
+
+        return -1; //r
+}
+
+static int test_timeout(struct at_state_t *at_state)
+{
+        if (!at_state->timer_expires)
+                return 0;
+
+        if (--at_state->timer_expires) {
+                dbg(DEBUG_MCMD, "decreased timer of %p to %lu",
+                    at_state, at_state->timer_expires);
+                return 0;
+        }
+
+        if (!gigaset_add_event(at_state->cs, at_state, EV_TIMEOUT, NULL,
+                               atomic_read(&at_state->timer_index), NULL)) {
+                //FIXME what should we do?
+        }
+
+        return 1;
+}
+
+static void timer_tick(unsigned long data)
+{
+        struct cardstate *cs = (struct cardstate *) data;
+        unsigned long flags;
+        unsigned channel;
+        struct at_state_t *at_state;
+        int timeout = 0;
+
+        spin_lock_irqsave(&cs->lock, flags);
+
+        for (channel = 0; channel < cs->channels; ++channel)
+                if (test_timeout(&cs->bcs[channel].at_state))
+                        timeout = 1;
+
+        if (test_timeout(&cs->at_state))
+                timeout = 1;
+
+        list_for_each_entry(at_state, &cs->temp_at_states, list)
+                if (test_timeout(at_state))
+                        timeout = 1;
+
+        if (atomic_read(&cs->running)) {
+                mod_timer(&cs->timer, jiffies + GIG_TICK);
+                if (timeout) {
+                        dbg(DEBUG_CMD, "scheduling timeout");
+                        tasklet_schedule(&cs->event_tasklet);
+                }
+        }
+
+        spin_unlock_irqrestore(&cs->lock, flags);
+}
+
+int gigaset_get_channel(struct bc_state *bcs)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&bcs->cs->lock, flags);
+        if (bcs->use_count) {
+                dbg(DEBUG_ANY, "could not allocate channel %d", bcs->channel);
+                spin_unlock_irqrestore(&bcs->cs->lock, flags);
+                return 0;
+        }
+        ++bcs->use_count;
+        bcs->busy = 1;
+        dbg(DEBUG_ANY, "allocated channel %d", bcs->channel);
+        spin_unlock_irqrestore(&bcs->cs->lock, flags);
+        return 1;
+}
+
+void gigaset_free_channel(struct bc_state *bcs)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&bcs->cs->lock, flags);
+        if (!bcs->busy) {
+                dbg(DEBUG_ANY, "could not free channel %d", bcs->channel);
+                spin_unlock_irqrestore(&bcs->cs->lock, flags);
+                return;
+        }
+        --bcs->use_count;
+        bcs->busy = 0;
+        dbg(DEBUG_ANY, "freed channel %d", bcs->channel);
+        spin_unlock_irqrestore(&bcs->cs->lock, flags);
+}
+
+int gigaset_get_channels(struct cardstate *cs)
+{
+        unsigned long flags;
+        int i;
+
+        spin_lock_irqsave(&cs->lock, flags);
+        for (i = 0; i < cs->channels; ++i)
+                if (cs->bcs[i].use_count) {
+                        spin_unlock_irqrestore(&cs->lock, flags);
+                        dbg(DEBUG_ANY, "could not allocated all channels");
+                        return 0;
+                }
+        for (i = 0; i < cs->channels; ++i)
+                ++cs->bcs[i].use_count;
+        spin_unlock_irqrestore(&cs->lock, flags);
+
+        dbg(DEBUG_ANY, "allocated all channels");
+
+        return 1;
+}
+
+void gigaset_free_channels(struct cardstate *cs)
+{
+        unsigned long flags;
+        int i;
+
+        dbg(DEBUG_ANY, "unblocking all channels");
+        spin_lock_irqsave(&cs->lock, flags);
+        for (i = 0; i < cs->channels; ++i)
+                --cs->bcs[i].use_count;
+        spin_unlock_irqrestore(&cs->lock, flags);
+}
+
+void gigaset_block_channels(struct cardstate *cs)
+{
+        unsigned long flags;
+        int i;
+
+        dbg(DEBUG_ANY, "blocking all channels");
+        spin_lock_irqsave(&cs->lock, flags);
+        for (i = 0; i < cs->channels; ++i)
+                ++cs->bcs[i].use_count;
+        spin_unlock_irqrestore(&cs->lock, flags);
+}
+
+static void clear_events(struct cardstate *cs)
+{
+        struct event_t *ev;
+        unsigned head, tail;
+
+        /* no locking needed (no reader/writer allowed) */
+
+        head = atomic_read(&cs->ev_head);
+        tail = atomic_read(&cs->ev_tail);
+
+        while (tail != head) {
+                ev = cs->events + head;
+                kfree(ev->ptr);
+
+                head = (head + 1) % MAX_EVENTS;
+        }
+
+        atomic_set(&cs->ev_head, tail);
+}
+
+struct event_t *gigaset_add_event(struct cardstate *cs,
+                                  struct at_state_t *at_state, int type,
+                                  void *ptr, int parameter, void *arg)
+{
+        unsigned long flags;
+        unsigned next, tail;
+        struct event_t *event = NULL;
+
+        spin_lock_irqsave(&cs->ev_lock, flags);
+
+        tail = atomic_read(&cs->ev_tail);
+        next = (tail + 1) % MAX_EVENTS;
+        if (unlikely(next == atomic_read(&cs->ev_head)))
+                err("event queue full");
+        else {
+                event = cs->events + tail;
+                event->type = type;
+                event->at_state = at_state;
+                event->cid = -1;
+                event->ptr = ptr;
+                event->arg = arg;
+                event->parameter = parameter;
+                atomic_set(&cs->ev_tail, next);
+        }
+
+        spin_unlock_irqrestore(&cs->ev_lock, flags);
+
+        return event;
+}
+EXPORT_SYMBOL_GPL(gigaset_add_event);
+
+static void free_strings(struct at_state_t *at_state)
+{
+        int i;
+
+        for (i = 0; i < STR_NUM; ++i) {
+                kfree(at_state->str_var[i]);
+                at_state->str_var[i] = NULL;
+        }
+}
+
+static void clear_at_state(struct at_state_t *at_state)
+{
+        free_strings(at_state);
+}
+
+static void dealloc_at_states(struct cardstate *cs)
+{
+        struct at_state_t *cur, *next;
+
+        list_for_each_entry_safe(cur, next, &cs->temp_at_states, list) {
+                list_del(&cur->list);
+                free_strings(cur);
+                kfree(cur);
+        }
+}
+
+static void gigaset_freebcs(struct bc_state *bcs)
+{
+        int i;
+
+        dbg(DEBUG_INIT, "freeing bcs[%d]->hw", bcs->channel);
+        if (!bcs->cs->ops->freebcshw(bcs)) {
+                dbg(DEBUG_INIT, "failed");
+        }
+
+        dbg(DEBUG_INIT, "clearing bcs[%d]->at_state", bcs->channel);
+        clear_at_state(&bcs->at_state);
+        dbg(DEBUG_INIT, "freeing bcs[%d]->skb", bcs->channel);
+
+        if (bcs->skb)
+                dev_kfree_skb(bcs->skb);
+        for (i = 0; i < AT_NUM; ++i) {
+                kfree(bcs->commands[i]);
+                bcs->commands[i] = NULL;
+        }
+}
+
+void gigaset_freecs(struct cardstate *cs)
+{
+        int i;
+        unsigned long flags;
+
+        if (!cs)
+                return;
+
+        down(&cs->sem);
+
+        if (!cs->bcs)
+                goto f_cs;
+        if (!cs->inbuf)
+                goto f_bcs;
+
+        spin_lock_irqsave(&cs->lock, flags);
+        atomic_set(&cs->running, 0);
+        spin_unlock_irqrestore(&cs->lock, flags); /* event handler and timer are not rescheduled below */
+
+        tasklet_kill(&cs->event_tasklet);
+        del_timer_sync(&cs->timer);
+
+        switch (cs->cs_init) {
+        default:
+                gigaset_if_free(cs);
+
+                dbg(DEBUG_INIT, "clearing hw");
+                cs->ops->freecshw(cs);
+
+                //FIXME cmdbuf
+
+                /* fall through */
+        case 2: /* error in initcshw */
+                /* Deregister from LL */
+                make_invalid(cs, VALID_ID);
+                dbg(DEBUG_INIT, "clearing iif");
+                gigaset_i4l_cmd(cs, ISDN_STAT_UNLOAD);
+
+                /* fall through */
+        case 1: /* error when regestering to LL */
+                dbg(DEBUG_INIT, "clearing at_state");
+                clear_at_state(&cs->at_state);
+                dealloc_at_states(cs);
+
+                /* fall through */
+        case 0: /* error in one call to initbcs */
+                for (i = 0; i < cs->channels; ++i) {
+                        dbg(DEBUG_INIT, "clearing bcs[%d]", i);
+                        gigaset_freebcs(cs->bcs + i);
+                }
+
+                clear_events(cs);
+                dbg(DEBUG_INIT, "freeing inbuf");
+                kfree(cs->inbuf);
+        }
+f_bcs:  dbg(DEBUG_INIT, "freeing bcs[]");
+        kfree(cs->bcs);
+f_cs:   dbg(DEBUG_INIT, "freeing cs");
+        up(&cs->sem);
+        free_cs(cs);
+}
+EXPORT_SYMBOL_GPL(gigaset_freecs);
+
+void gigaset_at_init(struct at_state_t *at_state, struct bc_state *bcs,
+                     struct cardstate *cs, int cid)
+{
+        int i;
+
+        INIT_LIST_HEAD(&at_state->list);
+        at_state->waiting = 0;
+        at_state->getstring = 0;
+        at_state->pending_commands = 0;
+        at_state->timer_expires = 0;
+        at_state->timer_active = 0;
+        atomic_set(&at_state->timer_index, 0);
+        atomic_set(&at_state->seq_index, 0);
+        at_state->ConState = 0;
+        for (i = 0; i < STR_NUM; ++i)
+                at_state->str_var[i] = NULL;
+        at_state->int_var[VAR_ZDLE] = 0;
+        at_state->int_var[VAR_ZCTP] = -1;
+        at_state->int_var[VAR_ZSAU] = ZSAU_NULL;
+        at_state->cs = cs;
+        at_state->bcs = bcs;
+        at_state->cid = cid;
+        if (!cid)
+                at_state->replystruct = cs->tabnocid;
+        else
+                at_state->replystruct = cs->tabcid;
+}
+
+
+static void gigaset_inbuf_init(struct inbuf_t *inbuf, struct bc_state *bcs,
+                               struct cardstate *cs, int inputstate)
+/* inbuf->read must be allocated before! */
+{
+        atomic_set(&inbuf->head, 0);
+        atomic_set(&inbuf->tail, 0);
+        inbuf->cs = cs;
+        inbuf->bcs = bcs; /*base driver: NULL*/
+        inbuf->rcvbuf = NULL; //FIXME
+        inbuf->inputstate = inputstate;
+}
+
+/* Initialize the b-channel structure */
+static struct bc_state *gigaset_initbcs(struct bc_state *bcs,
+                                        struct cardstate *cs, int channel)
+{
+        int i;
+
+        bcs->tx_skb = NULL; //FIXME -> hw part
+
+        skb_queue_head_init(&bcs->squeue);
+
+        bcs->corrupted = 0;
+        bcs->trans_down = 0;
+        bcs->trans_up = 0;
+
+        dbg(DEBUG_INIT, "setting up bcs[%d]->at_state", channel);
+        gigaset_at_init(&bcs->at_state, bcs, cs, -1);
+
+        bcs->rcvbytes = 0;
+
+#ifdef CONFIG_GIGASET_DEBUG
+        bcs->emptycount = 0;
+#endif
+
+        dbg(DEBUG_INIT, "allocating bcs[%d]->skb", channel);
+        bcs->fcs = PPP_INITFCS;
+        bcs->inputstate = 0;
+        if (cs->ignoreframes) {
+                bcs->inputstate |= INS_skip_frame;
+                bcs->skb = NULL;
+        } else if ((bcs->skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN)) != NULL)
+                skb_reserve(bcs->skb, HW_HDR_LEN);
+        else {
+                warn("could not allocate skb");
+                bcs->inputstate |= INS_skip_frame;
+        }
+
+        bcs->channel = channel;
+        bcs->cs = cs;
+
+        bcs->chstate = 0;
+        bcs->use_count = 1;
+        bcs->busy = 0;
+        bcs->ignore = cs->ignoreframes;
+
+        for (i = 0; i < AT_NUM; ++i)
+                bcs->commands[i] = NULL;
+
+        dbg(DEBUG_INIT, "  setting up bcs[%d]->hw", channel);
+        if (cs->ops->initbcshw(bcs))
+                return bcs;
+
+//error:
+        dbg(DEBUG_INIT, "  failed");
+
+        dbg(DEBUG_INIT, "  freeing bcs[%d]->skb", channel);
+        if (bcs->skb)
+                dev_kfree_skb(bcs->skb);
+
+        return NULL;
+}
+
+/* gigaset_initcs
+ * Allocate and initialize cardstate structure for Gigaset driver
+ * Calls hardware dependent gigaset_initcshw() function
+ * Calls B channel initialization function gigaset_initbcs() for each B channel
+ * parameters:
+ *      drv             hardware driver the device belongs to
+ *      channels        number of B channels supported by device
+ *      onechannel      !=0: B channel data and AT commands share one communication channel
+ *                      ==0: B channels have separate communication channels
+ *      ignoreframes    number of frames to ignore after setting up B channel
+ *      cidmode         !=0: start in CallID mode
+ *      modulename      name of driver module (used for I4L registration)
+ * return value:
+ *      pointer to cardstate structure
+ */
+struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
+                                 int onechannel, int ignoreframes,
+                                 int cidmode, const char *modulename)
+{
+        struct cardstate *cs = NULL;
+        int i;
+
+        dbg(DEBUG_INIT, "allocating cs");
+        cs = alloc_cs(drv);
+        if (!cs)
+                goto error;
+        dbg(DEBUG_INIT, "allocating bcs[0..%d]", channels - 1);
+        cs->bcs = kmalloc(channels * sizeof(struct bc_state), GFP_KERNEL);
+        if (!cs->bcs)
+                goto error;
+        dbg(DEBUG_INIT, "allocating inbuf");
+        cs->inbuf = kmalloc(sizeof(struct inbuf_t), GFP_KERNEL);
+        if (!cs->inbuf)
+                goto error;
+
+        cs->cs_init = 0;
+        cs->channels = channels;
+        cs->onechannel = onechannel;
+        cs->ignoreframes = ignoreframes;
+        INIT_LIST_HEAD(&cs->temp_at_states);
+        atomic_set(&cs->running, 0);
+        init_timer(&cs->timer); /* clear next & prev */
+        spin_lock_init(&cs->ev_lock);
+        atomic_set(&cs->ev_tail, 0);
+        atomic_set(&cs->ev_head, 0);
+        init_MUTEX_LOCKED(&cs->sem);
+        tasklet_init(&cs->event_tasklet, &gigaset_handle_event, (unsigned long) cs);
+        atomic_set(&cs->commands_pending, 0);
+        cs->cur_at_seq = 0;
+        cs->gotfwver = -1;
+        cs->open_count = 0;
+        cs->tty = NULL;
+        atomic_set(&cs->cidmode, cidmode != 0);
+
+        //if(onechannel) { //FIXME
+                cs->tabnocid = gigaset_tab_nocid_m10x;
+                cs->tabcid = gigaset_tab_cid_m10x;
+        //} else {
+        //      cs->tabnocid = gigaset_tab_nocid;
+        //      cs->tabcid = gigaset_tab_cid;
+        //}
+
+        init_waitqueue_head(&cs->waitqueue);
+        cs->waiting = 0;
+
+        atomic_set(&cs->mode, M_UNKNOWN);
+        atomic_set(&cs->mstate, MS_UNINITIALIZED);
+
+        for (i = 0; i < channels; ++i) {
+                dbg(DEBUG_INIT, "setting up bcs[%d].read", i);
+                if (!gigaset_initbcs(cs->bcs + i, cs, i))
+                        goto error;
+        }
+
+        ++cs->cs_init;
+
+        dbg(DEBUG_INIT, "setting up at_state");
+        spin_lock_init(&cs->lock);
+        gigaset_at_init(&cs->at_state, NULL, cs, 0);
+        cs->dle = 0;
+        cs->cbytes = 0;
+
+        dbg(DEBUG_INIT, "setting up inbuf");
+        if (onechannel) {                       //FIXME distinction necessary?
+                gigaset_inbuf_init(cs->inbuf, cs->bcs, cs, INS_command);
+        } else
+                gigaset_inbuf_init(cs->inbuf, NULL,    cs, INS_command);
+
+        atomic_set(&cs->connected, 0);
+
+        dbg(DEBUG_INIT, "setting up cmdbuf");
+        cs->cmdbuf = cs->lastcmdbuf = NULL;
+        spin_lock_init(&cs->cmdlock);
+        cs->curlen = 0;
+        cs->cmdbytes = 0;
+
+        /*
+         * Tell the ISDN4Linux subsystem (the LL) that
+         * a driver for a USB-Device is available !
+         * If this is done, "isdnctrl" is able to bind a device for this driver even
+         * if no physical usb-device is currently connected.
+         * But this device will just be accessable if a physical USB device is connected
+         * (via "gigaset_probe") .
+         */
+        dbg(DEBUG_INIT, "setting up iif");
+        if (!gigaset_register_to_LL(cs, modulename)) {
+                err("register_isdn=>error");
+                goto error;
+        }
+
+        make_valid(cs, VALID_ID);
+        ++cs->cs_init;
+        dbg(DEBUG_INIT, "setting up hw");
+        if (!cs->ops->initcshw(cs))
+                goto error;
+
+        ++cs->cs_init;
+
+        gigaset_if_init(cs);
+
+        atomic_set(&cs->running, 1);
+        cs->timer.data = (unsigned long) cs;
+        cs->timer.function = timer_tick;
+        cs->timer.expires = jiffies + GIG_TICK;
+        /* FIXME: can jiffies increase too much until the timer is added?
+         * Same problem(?) with mod_timer() in timer_tick(). */
+        add_timer(&cs->timer);
+
+        dbg(DEBUG_INIT, "cs initialized!");
+        up(&cs->sem);
+        return cs;
+
+error:  if (cs)
+                up(&cs->sem);
+        dbg(DEBUG_INIT, "failed");
+        gigaset_freecs(cs);
+        return NULL;
+}
+EXPORT_SYMBOL_GPL(gigaset_initcs);
+
+/* ReInitialize the b-channel structure */ /* e.g. called on hangup, disconnect */
+void gigaset_bcs_reinit(struct bc_state *bcs)
+{
+        struct sk_buff *skb;
+        struct cardstate *cs = bcs->cs;
+        unsigned long flags;
+
+        while ((skb = skb_dequeue(&bcs->squeue)) != NULL)
+                dev_kfree_skb(skb);
+
+        spin_lock_irqsave(&cs->lock, flags); //FIXME
+        clear_at_state(&bcs->at_state);
+        bcs->at_state.ConState = 0;
+        bcs->at_state.timer_active = 0;
+        bcs->at_state.timer_expires = 0;
+        bcs->at_state.cid = -1;                     /* No CID defined */
+        spin_unlock_irqrestore(&cs->lock, flags);
+
+        bcs->inputstate = 0;
+
+#ifdef CONFIG_GIGASET_DEBUG
+        bcs->emptycount = 0;
+#endif
+
+        bcs->fcs = PPP_INITFCS;
+        bcs->chstate = 0;
+
+        bcs->ignore = cs->ignoreframes;
+        if (bcs->ignore)
+                bcs->inputstate |= INS_skip_frame;
+
+
+        cs->ops->reinitbcshw(bcs);
+}
+
+static void cleanup_cs(struct cardstate *cs)
+{
+        struct cmdbuf_t *cb, *tcb;
+        int i;
+        unsigned long flags;
+
+        spin_lock_irqsave(&cs->lock, flags);
+
+        atomic_set(&cs->mode, M_UNKNOWN);
+        atomic_set(&cs->mstate, MS_UNINITIALIZED);
+
+        clear_at_state(&cs->at_state);
+        dealloc_at_states(cs);
+        free_strings(&cs->at_state);
+        gigaset_at_init(&cs->at_state, NULL, cs, 0);
+
+        kfree(cs->inbuf->rcvbuf);
+        cs->inbuf->rcvbuf = NULL;
+        cs->inbuf->inputstate = INS_command;
+        atomic_set(&cs->inbuf->head, 0);
+        atomic_set(&cs->inbuf->tail, 0);
+
+        cb = cs->cmdbuf;
+        while (cb) {
+                tcb = cb;
+                cb = cb->next;
+                kfree(tcb);
+        }
+        cs->cmdbuf = cs->lastcmdbuf = NULL;
+        cs->curlen = 0;
+        cs->cmdbytes = 0;
+        cs->gotfwver = -1;
+        cs->dle = 0;
+        cs->cur_at_seq = 0;
+        atomic_set(&cs->commands_pending, 0);
+        cs->cbytes = 0;
+
+        spin_unlock_irqrestore(&cs->lock, flags);
+
+        for (i = 0; i < cs->channels; ++i) {
+                gigaset_freebcs(cs->bcs + i);
+                if (!gigaset_initbcs(cs->bcs + i, cs, i))
+                        break;                  //FIXME error handling
+        }
+
+        if (cs->waiting) {
+                cs->cmd_result = -ENODEV;
+                cs->waiting = 0;
+                wake_up_interruptible(&cs->waitqueue);
+        }
+}
+
+
+int gigaset_start(struct cardstate *cs)
+{
+        if (down_interruptible(&cs->sem))
+                return 0;
+        //info("USB device for Gigaset 307x now attached to Dev %d", ucs->minor);
+
+        atomic_set(&cs->connected, 1);
+
+        if (atomic_read(&cs->mstate) != MS_LOCKED) {
+                cs->ops->set_modem_ctrl(cs, 0, TIOCM_DTR|TIOCM_RTS);
+                cs->ops->baud_rate(cs, B115200);
+                cs->ops->set_line_ctrl(cs, CS8);
+                cs->control_state = TIOCM_DTR|TIOCM_RTS;
+        } else {
+                //FIXME use some saved values?
+        }
+
+        cs->waiting = 1;
+
+        if (!gigaset_add_event(cs, &cs->at_state, EV_START, NULL, 0, NULL)) {
+                cs->waiting = 0;
+                //FIXME what should we do?
+                goto error;
+        }
+
+        dbg(DEBUG_CMD, "scheduling START");
+        gigaset_schedule_event(cs);
+
+        wait_event(cs->waitqueue, !cs->waiting);
+
+        up(&cs->sem);
+        return 1;
+
+error:
+        up(&cs->sem);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(gigaset_start);
+
+void gigaset_shutdown(struct cardstate *cs)
+{
+        down(&cs->sem);
+
+        cs->waiting = 1;
+
+        if (!gigaset_add_event(cs, &cs->at_state, EV_SHUTDOWN, NULL, 0, NULL)) {
+                //FIXME what should we do?
+                goto exit;
+        }
+
+        dbg(DEBUG_CMD, "scheduling SHUTDOWN");
+        gigaset_schedule_event(cs);
+
+        if (wait_event_interruptible(cs->waitqueue, !cs->waiting)) {
+                warn("aborted");
+                //FIXME
+        }
+
+        if (atomic_read(&cs->mstate) != MS_LOCKED) {
+                //FIXME?
+                //gigaset_baud_rate(cs, B115200);
+                //gigaset_set_line_ctrl(cs, CS8);
+                //gigaset_set_modem_ctrl(cs, TIOCM_DTR|TIOCM_RTS, 0);
+                //cs->control_state = 0;
+        } else {
+                //FIXME use some saved values?
+        }
+
+        cleanup_cs(cs);
+
+exit:
+        up(&cs->sem);
+}
+EXPORT_SYMBOL_GPL(gigaset_shutdown);
+
+void gigaset_stop(struct cardstate *cs)
+{
+        down(&cs->sem);
+
+        atomic_set(&cs->connected, 0);
+
+        cs->waiting = 1;
+
+        if (!gigaset_add_event(cs, &cs->at_state, EV_STOP, NULL, 0, NULL)) {
+                //FIXME what should we do?
+                goto exit;
+        }
+
+        dbg(DEBUG_CMD, "scheduling STOP");
+        gigaset_schedule_event(cs);
+
+        if (wait_event_interruptible(cs->waitqueue, !cs->waiting)) {
+                warn("aborted");
+                //FIXME
+        }
+
+        /* Tell the LL that the device is not available .. */
+        gigaset_i4l_cmd(cs, ISDN_STAT_STOP); // FIXME move to event layer?
+
+        cleanup_cs(cs);
+
+exit:
+        up(&cs->sem);
+}
+EXPORT_SYMBOL_GPL(gigaset_stop);
+
+static LIST_HEAD(drivers);
+static spinlock_t driver_lock = SPIN_LOCK_UNLOCKED;
+
+struct cardstate *gigaset_get_cs_by_id(int id)
+{
+        unsigned long flags;
+        static struct cardstate *ret = NULL;
+        static struct cardstate *cs;
+        struct gigaset_driver *drv;
+        unsigned i;
+
+        spin_lock_irqsave(&driver_lock, flags);
+        list_for_each_entry(drv, &drivers, list) {
+                spin_lock(&drv->lock);
+                for (i = 0; i < drv->minors; ++i) {
+                        if (drv->flags[i] & VALID_ID) {
+                                cs = drv->cs + i;
+                                if (cs->myid == id)
+                                        ret = cs;
+                        }
+                        if (ret)
+                                break;
+                }
+                spin_unlock(&drv->lock);
+                if (ret)
+                        break;
+        }
+        spin_unlock_irqrestore(&driver_lock, flags);
+        return ret;
+}
+
+void gigaset_debugdrivers(void)
+{
+        unsigned long flags;
+        static struct cardstate *cs;
+        struct gigaset_driver *drv;
+        unsigned i;
+
+        spin_lock_irqsave(&driver_lock, flags);
+        list_for_each_entry(drv, &drivers, list) {
+                dbg(DEBUG_DRIVER, "driver %p", drv);
+                spin_lock(&drv->lock);
+                for (i = 0; i < drv->minors; ++i) {
+                        dbg(DEBUG_DRIVER, "  index %u", i);
+                        dbg(DEBUG_DRIVER, "    flags 0x%02x", drv->flags[i]);
+                        cs = drv->cs + i;
+                        dbg(DEBUG_DRIVER, "    cardstate %p", cs);
+                        dbg(DEBUG_DRIVER, "    minor_index %u", cs->minor_index);
+                        dbg(DEBUG_DRIVER, "    driver %p", cs->driver);
+                        dbg(DEBUG_DRIVER, "    i4l id %d", cs->myid);
+                }
+                spin_unlock(&drv->lock);
+        }
+        spin_unlock_irqrestore(&driver_lock, flags);
+}
+EXPORT_SYMBOL_GPL(gigaset_debugdrivers);
+
+struct cardstate *gigaset_get_cs_by_tty(struct tty_struct *tty)
+{
+        if (tty->index < 0 || tty->index >= tty->driver->num)
+                return NULL;
+        return gigaset_get_cs_by_minor(tty->index + tty->driver->minor_start);
+}
+
+struct cardstate *gigaset_get_cs_by_minor(unsigned minor)
+{
+        unsigned long flags;
+        static struct cardstate *ret = NULL;
+        struct gigaset_driver *drv;
+        unsigned index;
+
+        spin_lock_irqsave(&driver_lock, flags);
+        list_for_each_entry(drv, &drivers, list) {
+                if (minor < drv->minor || minor >= drv->minor + drv->minors)
+                        continue;
+                index = minor - drv->minor;
+                spin_lock(&drv->lock);
+                if (drv->flags[index] & VALID_MINOR)
+                        ret = drv->cs + index;
+                spin_unlock(&drv->lock);
+                if (ret)
+                        break;
+        }
+        spin_unlock_irqrestore(&driver_lock, flags);
+        return ret;
+}
+
+void gigaset_freedriver(struct gigaset_driver *drv)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&driver_lock, flags);
+        list_del(&drv->list);
+        spin_unlock_irqrestore(&driver_lock, flags);
+
+        gigaset_if_freedriver(drv);
+        module_put(drv->owner);
+
+        kfree(drv->cs);
+        kfree(drv->flags);
+        kfree(drv);
+}
+EXPORT_SYMBOL_GPL(gigaset_freedriver);
+
+/* gigaset_initdriver
+ * Allocate and initialize gigaset_driver structure. Initialize interface.
+ * parameters:
+ *      minor           First minor number
+ *      minors          Number of minors this driver can handle
+ *      procname        Name of the driver (e.g. for /proc/tty/drivers, path in /proc/driver)
+ *      devname         Name of the device files (prefix without minor number)
+ *      devfsname       Devfs name of the device files without %d
+ * return value:
+ *      Pointer to the gigaset_driver structure on success, NULL on failure.
+ */
+struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,
+                                          const char *procname,
+                                          const char *devname,
+                                          const char *devfsname,
+                                          const struct gigaset_ops *ops,
+                                          struct module *owner)
+{
+        struct gigaset_driver *drv;
+        unsigned long flags;
+        unsigned i;
+
+        drv = kmalloc(sizeof *drv, GFP_KERNEL);
+        if (!drv)
+                return NULL;
+        if (!try_module_get(owner))
+                return NULL;
+
+        drv->cs = NULL;
+        drv->have_tty = 0;
+        drv->minor = minor;
+        drv->minors = minors;
+        spin_lock_init(&drv->lock);
+        drv->blocked = 0;
+        drv->ops = ops;
+        drv->owner = owner;
+        INIT_LIST_HEAD(&drv->list);
+
+        drv->cs = kmalloc(minors * sizeof *drv->cs, GFP_KERNEL);
+        if (!drv->cs)
+                goto out1;
+        drv->flags = kmalloc(minors * sizeof *drv->flags, GFP_KERNEL);
+        if (!drv->flags)
+                goto out2;
+
+        for (i = 0; i < minors; ++i) {
+                drv->flags[i] = 0;
+                drv->cs[i].driver = drv;
+                drv->cs[i].ops = drv->ops;
+                drv->cs[i].minor_index = i;
+        }
+
+        gigaset_if_initdriver(drv, procname, devname, devfsname);
+
+        spin_lock_irqsave(&driver_lock, flags);
+        list_add(&drv->list, &drivers);
+        spin_unlock_irqrestore(&driver_lock, flags);
+
+        return drv;
+
+out2:
+        kfree(drv->cs);
+out1:
+        kfree(drv);
+        module_put(owner);
+        return NULL;
+}
+EXPORT_SYMBOL_GPL(gigaset_initdriver);
+
+static struct cardstate *alloc_cs(struct gigaset_driver *drv)
+{
+        unsigned long flags;
+        unsigned i;
+        static struct cardstate *ret = NULL;
+
+        spin_lock_irqsave(&drv->lock, flags);
+        for (i = 0; i < drv->minors; ++i) {
+                if (!(drv->flags[i] & VALID_MINOR)) {
+                        drv->flags[i] = VALID_MINOR;
+                        ret = drv->cs + i;
+                }
+                if (ret)
+                        break;
+        }
+        spin_unlock_irqrestore(&drv->lock, flags);
+        return ret;
+}
+
+static void free_cs(struct cardstate *cs)
+{
+        unsigned long flags;
+        struct gigaset_driver *drv = cs->driver;
+        spin_lock_irqsave(&drv->lock, flags);
+        drv->flags[cs->minor_index] = 0;
+        spin_unlock_irqrestore(&drv->lock, flags);
+}
+
+static void make_valid(struct cardstate *cs, unsigned mask)
+{
+        unsigned long flags;
+        struct gigaset_driver *drv = cs->driver;
+        spin_lock_irqsave(&drv->lock, flags);
+        drv->flags[cs->minor_index] |= mask;
+        spin_unlock_irqrestore(&drv->lock, flags);
+}
+
+static void make_invalid(struct cardstate *cs, unsigned mask)
+{
+        unsigned long flags;
+        struct gigaset_driver *drv = cs->driver;
+        spin_lock_irqsave(&drv->lock, flags);
+        drv->flags[cs->minor_index] &= ~mask;
+        spin_unlock_irqrestore(&drv->lock, flags);
+}
+
+/* For drivers without fixed assignment device<->cardstate (usb) */
+struct cardstate *gigaset_getunassignedcs(struct gigaset_driver *drv)
+{
+        unsigned long flags;
+        struct cardstate *cs = NULL;
+        unsigned i;
+
+        spin_lock_irqsave(&drv->lock, flags);
+        if (drv->blocked)
+                goto exit;
+        for (i = 0; i < drv->minors; ++i) {
+                if ((drv->flags[i] & VALID_MINOR) &&
+                    !(drv->flags[i] & ASSIGNED)) {
+                        drv->flags[i] |= ASSIGNED;
+                        cs = drv->cs + i;
+                        break;
+                }
+        }
+exit:
+        spin_unlock_irqrestore(&drv->lock, flags);
+        return cs;
+}
+EXPORT_SYMBOL_GPL(gigaset_getunassignedcs);
+
+void gigaset_unassign(struct cardstate *cs)
+{
+        unsigned long flags;
+        unsigned *minor_flags;
+        struct gigaset_driver *drv;
+
+        if (!cs)
+                return;
+        drv = cs->driver;
+        spin_lock_irqsave(&drv->lock, flags);
+        minor_flags = drv->flags + cs->minor_index;
+        if (*minor_flags & VALID_MINOR)
+                *minor_flags &= ~ASSIGNED;
+        spin_unlock_irqrestore(&drv->lock, flags);
+}
+EXPORT_SYMBOL_GPL(gigaset_unassign);
+
+void gigaset_blockdriver(struct gigaset_driver *drv)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&drv->lock, flags);
+        drv->blocked = 1;
+        spin_unlock_irqrestore(&drv->lock, flags);
+}
+EXPORT_SYMBOL_GPL(gigaset_blockdriver);
+
+static int __init gigaset_init_module(void)
+{
+        /* in accordance with the principle of least astonishment,
+         * setting the 'debug' parameter to 1 activates a sensible
+         * set of default debug levels
+         */
+        if (gigaset_debuglevel == 1)
+                gigaset_debuglevel = DEBUG_DEFAULT;
+
+        info(DRIVER_AUTHOR);
+        info(DRIVER_DESC);
+        return 0;
+}
+
+static void __exit gigaset_exit_module(void)
+{
+}
+
+module_init(gigaset_init_module);
+module_exit(gigaset_exit_module);
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c
new file mode 100644
index 0000000000..fdcb80bb21
--- /dev/null
+++ b/drivers/isdn/gigaset/ev-layer.c
@@ -0,0 +1,1983 @@
+/*
+ * Stuff used by all variants of the driver
+ *
+ * Copyright (c) 2001 by Stefan Eilers <Eilers.Stefan@epost.de>,
+ *                       Hansjoerg Lipp <hjlipp@web.de>,
+ *                       Tilman Schmidt <tilman@imap.cc>.
+ *
+ * =====================================================================
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License as
+ *      published by the Free Software Foundation; either version 2 of
+ *      the License, or (at your option) any later version.
+ * =====================================================================
+ * ToDo: ...
+ * =====================================================================
+ * Version: $Id: ev-layer.c,v 1.4.2.18 2006/02/04 18:28:16 hjlipp Exp $
+ * =====================================================================
+ */
+
+#include "gigaset.h"
+
+/* ========================================================== */
+/* bit masks for pending commands */
+#define PC_INIT       0x004
+#define PC_DLE0       0x008
+#define PC_DLE1       0x010
+#define PC_CID        0x080
+#define PC_NOCID      0x100
+#define PC_HUP        0x002
+#define PC_DIAL       0x001
+#define PC_ACCEPT     0x040
+#define PC_SHUTDOWN   0x020
+#define PC_CIDMODE    0x200
+#define PC_UMMODE     0x400
+
+/* types of modem responses */
+#define RT_NOTHING 0
+#define RT_ZSAU    1
+#define RT_RING    2
+#define RT_NUMBER  3
+#define RT_STRING  4
+#define RT_HEX     5
+#define RT_ZCAU    6
+
+/* Possible ASCII responses */
+#define RSP_OK           0
+//#define RSP_BUSY       1
+//#define RSP_CONNECT    2
+#define RSP_ZGCI         3
+#define RSP_RING         4
+#define RSP_ZAOC         5
+#define RSP_ZCSTR        6
+#define RSP_ZCFGT        7
+#define RSP_ZCFG         8
+#define RSP_ZCCR         9
+#define RSP_EMPTY        10
+#define RSP_ZLOG         11
+#define RSP_ZCAU         12
+#define RSP_ZMWI         13
+#define RSP_ZABINFO      14
+#define RSP_ZSMLSTCHG    15
+#define RSP_VAR          100
+#define RSP_ZSAU         (RSP_VAR + VAR_ZSAU)
+#define RSP_ZDLE         (RSP_VAR + VAR_ZDLE)
+#define RSP_ZVLS         (RSP_VAR + VAR_ZVLS)
+#define RSP_ZCTP         (RSP_VAR + VAR_ZCTP)
+#define RSP_STR          (RSP_VAR + VAR_NUM)
+#define RSP_NMBR         (RSP_STR + STR_NMBR)
+#define RSP_ZCPN         (RSP_STR + STR_ZCPN)
+#define RSP_ZCON         (RSP_STR + STR_ZCON)
+#define RSP_ZBC          (RSP_STR + STR_ZBC)
+#define RSP_ZHLC         (RSP_STR + STR_ZHLC)
+#define RSP_ERROR       -1       /* ERROR              */
+#define RSP_WRONG_CID   -2       /* unknown cid in cmd */
+//#define RSP_EMPTY     -3
+#define RSP_UNKNOWN     -4       /* unknown response   */
+#define RSP_FAIL        -5       /* internal error     */
+#define RSP_INVAL       -6       /* invalid response   */
+
+#define RSP_NONE        -19
+#define RSP_STRING      -20
+#define RSP_NULL        -21
+//#define RSP_RETRYFAIL -22
+//#define RSP_RETRY     -23
+//#define RSP_SKIP      -24
+#define RSP_INIT        -27
+#define RSP_ANY         -26
+#define RSP_LAST        -28
+#define RSP_NODEV       -9
+
+/* actions for process_response */
+#define ACT_NOTHING             0
+#define ACT_SETDLE1             1
+#define ACT_SETDLE0             2
+#define ACT_FAILINIT            3
+#define ACT_HUPMODEM            4
+#define ACT_CONFIGMODE          5
+#define ACT_INIT                6
+#define ACT_DLE0                7
+#define ACT_DLE1                8
+#define ACT_FAILDLE0            9
+#define ACT_FAILDLE1            10
+#define ACT_RING                11
+#define ACT_CID                 12
+#define ACT_FAILCID             13
+#define ACT_SDOWN               14
+#define ACT_FAILSDOWN           15
+#define ACT_DEBUG               16
+#define ACT_WARN                17
+#define ACT_DIALING             18
+#define ACT_ABORTDIAL           19
+#define ACT_DISCONNECT          20
+#define ACT_CONNECT             21
+#define ACT_REMOTEREJECT        22
+#define ACT_CONNTIMEOUT         23
+#define ACT_REMOTEHUP           24
+#define ACT_ABORTHUP            25
+#define ACT_ICALL               26
+#define ACT_ACCEPTED            27
+#define ACT_ABORTACCEPT         28
+#define ACT_TIMEOUT             29
+#define ACT_GETSTRING           30
+#define ACT_SETVER              31
+#define ACT_FAILVER             32
+#define ACT_GOTVER              33
+#define ACT_TEST                34
+#define ACT_ERROR               35
+#define ACT_ABORTCID            36
+#define ACT_ZCAU                37
+#define ACT_NOTIFY_BC_DOWN      38
+#define ACT_NOTIFY_BC_UP        39
+#define ACT_DIAL                40
+#define ACT_ACCEPT              41
+#define ACT_PROTO_L2            42
+#define ACT_HUP                 43
+#define ACT_IF_LOCK             44
+#define ACT_START               45
+#define ACT_STOP                46
+#define ACT_FAKEDLE0            47
+#define ACT_FAKEHUP             48
+#define ACT_FAKESDOWN           49
+#define ACT_SHUTDOWN            50
+#define ACT_PROC_CIDMODE        51
+#define ACT_UMODESET            52
+#define ACT_FAILUMODE           53
+#define ACT_CMODESET            54
+#define ACT_FAILCMODE           55
+#define ACT_IF_VER              56
+#define ACT_CMD                 100
+
+/* at command sequences */
+#define SEQ_NONE      0
+#define SEQ_INIT      100
+#define SEQ_DLE0      200
+#define SEQ_DLE1      250
+#define SEQ_CID       300
+#define SEQ_NOCID     350
+#define SEQ_HUP       400
+#define SEQ_DIAL      600
+#define SEQ_ACCEPT    720
+#define SEQ_SHUTDOWN  500
+#define SEQ_CIDMODE   10
+#define SEQ_UMMODE    11
+
+
+// 100: init, 200: dle0, 250:dle1, 300: get cid (dial), 350: "hup" (no cid), 400: hup, 500: reset, 600: dial, 700: ring
+struct reply_t gigaset_tab_nocid_m10x[]= /* with dle mode */
+{
+        /* resp_code, min_ConState, max_ConState, parameter, new_ConState, timeout, action, command */
+
+        /* initialize device, set cid mode if possible */
+        //{RSP_INIT,     -1, -1,100,                900, 0, {ACT_TEST}},
+        //{RSP_ERROR,   900,900, -1,                  0, 0, {ACT_FAILINIT}},
+        //{RSP_OK,      900,900, -1,                100, INIT_TIMEOUT,
+        //                                                  {ACT_TIMEOUT}},
+
+        {RSP_INIT,     -1, -1,SEQ_INIT,           100, INIT_TIMEOUT,
+                                                          {ACT_TIMEOUT}},                /* wait until device is ready */
+
+        {EV_TIMEOUT,  100,100, -1,                101, 3, {0},             "Z\r"},       /* device in transparent mode? try to initialize it. */
+        {RSP_OK,      101,103, -1,                120, 5, {ACT_GETSTRING}, "+GMR\r"},    /* get version */
+
+        {EV_TIMEOUT,  101,101, -1,                102, 5, {0},             "Z\r"},       /* timeout => try once again. */
+        {RSP_ERROR,   101,101, -1,                102, 5, {0},             "Z\r"},       /* error => try once again. */
+
+        {EV_TIMEOUT,  102,102, -1,                108, 5, {ACT_SETDLE1},   "^SDLE=0\r"}, /* timeout => try again in DLE mode. */
+        {RSP_OK,      108,108, -1,                104,-1},
+        {RSP_ZDLE,    104,104,  0,                103, 5, {0},             "Z\r"},
+        {EV_TIMEOUT,  104,104, -1,                  0, 0, {ACT_FAILINIT}},
+        {RSP_ERROR,   108,108, -1,                  0, 0, {ACT_FAILINIT}},
+
+        {EV_TIMEOUT,  108,108, -1,                105, 2, {ACT_SETDLE0,
+                                                           ACT_HUPMODEM,
+                                                           ACT_TIMEOUT}},                /* still timeout => connection in unimodem mode? */
+        {EV_TIMEOUT,  105,105, -1,                103, 5, {0},             "Z\r"},
+
+        {RSP_ERROR,   102,102, -1,                107, 5, {0},             "^GETPRE\r"}, /* ERROR on ATZ => maybe in config mode? */
+        {RSP_OK,      107,107, -1,                  0, 0, {ACT_CONFIGMODE}},
+        {RSP_ERROR,   107,107, -1,                  0, 0, {ACT_FAILINIT}},
+        {EV_TIMEOUT,  107,107, -1,                  0, 0, {ACT_FAILINIT}},
+
+        {RSP_ERROR,   103,103, -1,                  0, 0, {ACT_FAILINIT}},
+        {EV_TIMEOUT,  103,103, -1,                  0, 0, {ACT_FAILINIT}},
+
+        {RSP_STRING,  120,120, -1,                121,-1, {ACT_SETVER}},
+
+        {EV_TIMEOUT,  120,121, -1,                  0, 0, {ACT_FAILVER, ACT_INIT}},
+        {RSP_ERROR,   120,121, -1,                  0, 0, {ACT_FAILVER, ACT_INIT}},
+        {RSP_OK,      121,121, -1,                  0, 0, {ACT_GOTVER,  ACT_INIT}},
+#if 0
+        {EV_TIMEOUT,  120,121, -1,                130, 5, {ACT_FAILVER},   "^SGCI=1\r"},
+        {RSP_ERROR,   120,121, -1,                130, 5, {ACT_FAILVER},   "^SGCI=1\r"},
+        {RSP_OK,      121,121, -1,                130, 5, {ACT_GOTVER},    "^SGCI=1\r"},
+
+        {RSP_OK,      130,130, -1,                  0, 0, {ACT_INIT}},
+        {RSP_ERROR,   130,130, -1,                  0, 0, {ACT_FAILINIT}},
+        {EV_TIMEOUT,  130,130, -1,                  0, 0, {ACT_FAILINIT}},
+#endif
+
+        /* leave dle mode */
+        {RSP_INIT,      0,  0,SEQ_DLE0,           201, 5, {0},             "^SDLE=0\r"},
+        {RSP_OK,      201,201, -1,                202,-1},
+        //{RSP_ZDLE,    202,202,  0,                202, 0, {ACT_ERROR}},//DELETE
+        {RSP_ZDLE,    202,202,  0,                  0, 0, {ACT_DLE0}},
+        {RSP_NODEV,   200,249, -1,                  0, 0, {ACT_FAKEDLE0}},
+        {RSP_ERROR,   200,249, -1,                  0, 0, {ACT_FAILDLE0}},
+        {EV_TIMEOUT,  200,249, -1,                  0, 0, {ACT_FAILDLE0}},
+
+        /* enter dle mode */
+        {RSP_INIT,      0,  0,SEQ_DLE1,           251, 5, {0},             "^SDLE=1\r"},
+        {RSP_OK,      251,251, -1,                252,-1},
+        {RSP_ZDLE,    252,252,  1,                  0, 0, {ACT_DLE1}},
+        {RSP_ERROR,   250,299, -1,                  0, 0, {ACT_FAILDLE1}},
+        {EV_TIMEOUT,  250,299, -1,                  0, 0, {ACT_FAILDLE1}},
+
+        /* incoming call */
+        {RSP_RING,     -1, -1, -1,                 -1,-1, {ACT_RING}},
+
+        /* get cid */
+        //{RSP_INIT,      0,  0,300,                901, 0, {ACT_TEST}},
+        //{RSP_ERROR,   901,901, -1,                  0, 0, {ACT_FAILCID}},
+        //{RSP_OK,      901,901, -1,                301, 5, {0},             "^SGCI?\r"},
+
+        {RSP_INIT,      0,  0,SEQ_CID,            301, 5, {0},             "^SGCI?\r"},
+        {RSP_OK,      301,301, -1,                302,-1},
+        {RSP_ZGCI,    302,302, -1,                  0, 0, {ACT_CID}},
+        {RSP_ERROR,   301,349, -1,                  0, 0, {ACT_FAILCID}},
+        {EV_TIMEOUT,  301,349, -1,                  0, 0, {ACT_FAILCID}},
+
+        /* enter cid mode */
+        {RSP_INIT,      0,  0,SEQ_CIDMODE,        150, 5, {0},             "^SGCI=1\r"},
+        {RSP_OK,      150,150, -1,                  0, 0, {ACT_CMODESET}},
+        {RSP_ERROR,   150,150, -1,                  0, 0, {ACT_FAILCMODE}},
+        {EV_TIMEOUT,  150,150, -1,                  0, 0, {ACT_FAILCMODE}},
+
+        /* leave cid mode */
+        //{RSP_INIT,      0,  0,SEQ_UMMODE,         160, 5, {0},             "^SGCI=0\r"},
+        {RSP_INIT,      0,  0,SEQ_UMMODE,         160, 5, {0},             "Z\r"},
+        {RSP_OK,      160,160, -1,                  0, 0, {ACT_UMODESET}},
+        {RSP_ERROR,   160,160, -1,                  0, 0, {ACT_FAILUMODE}},
+        {EV_TIMEOUT,  160,160, -1,                  0, 0, {ACT_FAILUMODE}},
+
+        /* abort getting cid */
+        {RSP_INIT,      0,  0,SEQ_NOCID,            0, 0, {ACT_ABORTCID}},
+
+        /* reset */
+#if 0
+        {RSP_INIT,      0,  0,SEQ_SHUTDOWN,       503, 5, {0},             "^SGCI=0\r"},
+        {RSP_OK,      503,503, -1,                504, 5, {0},             "Z\r"},
+#endif
+        {RSP_INIT,      0,  0,SEQ_SHUTDOWN,       504, 5, {0},             "Z\r"},
+        {RSP_OK,      504,504, -1,                  0, 0, {ACT_SDOWN}},
+        {RSP_ERROR,   501,599, -1,                  0, 0, {ACT_FAILSDOWN}},
+        {EV_TIMEOUT,  501,599, -1,                  0, 0, {ACT_FAILSDOWN}},
+        {RSP_NODEV,   501,599, -1,                  0, 0, {ACT_FAKESDOWN}},
+
+        {EV_PROC_CIDMODE,-1, -1, -1,               -1,-1, {ACT_PROC_CIDMODE}}, //FIXME
+        {EV_IF_LOCK,   -1, -1, -1,                 -1,-1, {ACT_IF_LOCK}}, //FIXME
+        {EV_IF_VER,    -1, -1, -1,                 -1,-1, {ACT_IF_VER}}, //FIXME
+        {EV_START,     -1, -1, -1,                 -1,-1, {ACT_START}}, //FIXME
+        {EV_STOP,      -1, -1, -1,                 -1,-1, {ACT_STOP}}, //FIXME
+        {EV_SHUTDOWN,  -1, -1, -1,                 -1,-1, {ACT_SHUTDOWN}}, //FIXME
+
+        /* misc. */
+        {RSP_EMPTY,    -1, -1, -1,                 -1,-1, {ACT_DEBUG}}, //FIXME
+        {RSP_ZCFGT,    -1, -1, -1,                 -1,-1, {ACT_DEBUG}}, //FIXME
+        {RSP_ZCFG,     -1, -1, -1,                 -1,-1, {ACT_DEBUG}}, //FIXME
+        {RSP_ZLOG,     -1, -1, -1,                 -1,-1, {ACT_DEBUG}}, //FIXME
+        {RSP_ZMWI,     -1, -1, -1,                 -1,-1, {ACT_DEBUG}}, //FIXME
+        {RSP_ZABINFO,  -1, -1, -1,                 -1,-1, {ACT_DEBUG}}, //FIXME
+        {RSP_ZSMLSTCHG,-1, -1, -1,                 -1,-1, {ACT_DEBUG}}, //FIXME
+
+        {RSP_ZCAU,     -1, -1, -1,                 -1,-1, {ACT_ZCAU}},
+        {RSP_NONE,     -1, -1, -1,                 -1,-1, {ACT_DEBUG}},
+        {RSP_ANY,      -1, -1, -1,                 -1,-1, {ACT_WARN}},
+        {RSP_LAST}
+};
+
+// 600: start dialing, 650: dial in progress, 800: connection is up, 700: ring, 400: hup, 750: accepted icall
+struct reply_t gigaset_tab_cid_m10x[] = /* for M10x */
+{
+        /* resp_code, min_ConState, max_ConState, parameter, new_ConState, timeout, action, command */
+
+        /* dial */
+        {EV_DIAL,      -1, -1, -1,                 -1,-1, {ACT_DIAL}}, //FIXME
+        {RSP_INIT,      0,  0,SEQ_DIAL,           601, 5, {ACT_CMD+AT_BC}},
+        {RSP_OK,      601,601, -1,                602, 5, {ACT_CMD+AT_HLC}},
+        {RSP_NULL,    602,602, -1,                603, 5, {ACT_CMD+AT_PROTO}},
+        {RSP_OK,      602,602, -1,                603, 5, {ACT_CMD+AT_PROTO}},
+        {RSP_OK,      603,603, -1,                604, 5, {ACT_CMD+AT_TYPE}},
+        {RSP_OK,      604,604, -1,                605, 5, {ACT_CMD+AT_MSN}},
+        {RSP_OK,      605,605, -1,                606, 5, {ACT_CMD+AT_ISO}},
+        {RSP_NULL,    605,605, -1,                606, 5, {ACT_CMD+AT_ISO}},
+        {RSP_OK,      606,606, -1,                607, 5, {0},             "+VLS=17\r"}, /* set "Endgeraetemodus" */
+        {RSP_OK,      607,607, -1,                608,-1},
+        //{RSP_ZSAU,    608,608,ZSAU_PROCEEDING,    608, 0, {ACT_ERROR}},//DELETE
+        {RSP_ZSAU,    608,608,ZSAU_PROCEEDING,    609, 5, {ACT_CMD+AT_DIAL}},
+        {RSP_OK,      609,609, -1,                650, 0, {ACT_DIALING}},
+
+        {RSP_ZVLS,    608,608, 17,                 -1,-1, {ACT_DEBUG}},
+        {RSP_ZCTP,    609,609, -1,                 -1,-1, {ACT_DEBUG}},
+        {RSP_ZCPN,    609,609, -1,                 -1,-1, {ACT_DEBUG}},
+        {RSP_ERROR,   601,609, -1,                  0, 0, {ACT_ABORTDIAL}},
+        {EV_TIMEOUT,  601,609, -1,                  0, 0, {ACT_ABORTDIAL}},
+
+        /* dialing */
+        {RSP_ZCTP,    650,650, -1,                 -1,-1, {ACT_DEBUG}},
+        {RSP_ZCPN,    650,650, -1,                 -1,-1, {ACT_DEBUG}},
+        {RSP_ZSAU,    650,650,ZSAU_CALL_DELIVERED, -1,-1, {ACT_DEBUG}}, /* some devices don't send this */
+
+        /* connection established  */
+        {RSP_ZSAU,    650,650,ZSAU_ACTIVE,        800,-1, {ACT_CONNECT}}, //FIXME -> DLE1
+        {RSP_ZSAU,    750,750,ZSAU_ACTIVE,        800,-1, {ACT_CONNECT}}, //FIXME -> DLE1
+
+        {EV_BC_OPEN,  800,800, -1,                800,-1, {ACT_NOTIFY_BC_UP}}, //FIXME new constate + timeout
+
+        /* remote hangup */
+        {RSP_ZSAU,    650,650,ZSAU_DISCONNECT_IND,  0, 0, {ACT_REMOTEREJECT}},
+        {RSP_ZSAU,    750,750,ZSAU_DISCONNECT_IND,  0, 0, {ACT_REMOTEHUP}},
+        {RSP_ZSAU,    800,800,ZSAU_DISCONNECT_IND,  0, 0, {ACT_REMOTEHUP}},
+
+        /* hangup */
+        {EV_HUP,       -1, -1, -1,                 -1,-1, {ACT_HUP}}, //FIXME
+        {RSP_INIT,     -1, -1,SEQ_HUP,            401, 5, {0},             "+VLS=0\r"}, /* hang up */ //-1,-1?
+        {RSP_OK,      401,401, -1,                402, 5},
+        {RSP_ZVLS,    402,402,  0,                403, 5},
+        {RSP_ZSAU,    403,403,ZSAU_DISCONNECT_REQ, -1,-1, {ACT_DEBUG}}, /* if not remote hup */
+        //{RSP_ZSAU,    403,403,ZSAU_NULL,          401, 0, {ACT_ERROR}}, //DELETE//FIXME -> DLE0 // should we do this _before_ hanging up for base driver?
+        {RSP_ZSAU,    403,403,ZSAU_NULL,            0, 0, {ACT_DISCONNECT}}, //FIXME -> DLE0 // should we do this _before_ hanging up for base driver?
+        {RSP_NODEV,   401,403, -1,                  0, 0, {ACT_FAKEHUP}}, //FIXME -> DLE0 // should we do this _before_ hanging up for base driver?
+        {RSP_ERROR,   401,401, -1,                  0, 0, {ACT_ABORTHUP}},
+        {EV_TIMEOUT,  401,403, -1,                  0, 0, {ACT_ABORTHUP}},
+
+        {EV_BC_CLOSED,  0,  0, -1,                  0,-1, {ACT_NOTIFY_BC_DOWN}}, //FIXME new constate + timeout
+
+        /* ring */
+        {RSP_ZBC,     700,700, -1,                 -1,-1, {0}},
+        {RSP_ZHLC,    700,700, -1,                 -1,-1, {0}},
+        {RSP_NMBR,    700,700, -1,                 -1,-1, {0}},
+        {RSP_ZCPN,    700,700, -1,                 -1,-1, {0}},
+        {RSP_ZCTP,    700,700, -1,                 -1,-1, {0}},
+        {EV_TIMEOUT,  700,700, -1,               720,720, {ACT_ICALL}},
+        {EV_BC_CLOSED,720,720, -1,                  0,-1, {ACT_NOTIFY_BC_DOWN}},
+
+        /*accept icall*/
+        {EV_ACCEPT,    -1, -1, -1,                 -1,-1, {ACT_ACCEPT}}, //FIXME
+        {RSP_INIT,    720,720,SEQ_ACCEPT,         721, 5, {ACT_CMD+AT_PROTO}},
+        {RSP_OK,      721,721, -1,                722, 5, {ACT_CMD+AT_ISO}},
+        {RSP_OK,      722,722, -1,                723, 5, {0},             "+VLS=17\r"}, /* set "Endgeraetemodus" */
+        {RSP_OK,      723,723, -1,                724, 5, {0}},
+        {RSP_ZVLS,    724,724, 17,                750,50, {ACT_ACCEPTED}},
+        {RSP_ERROR,   721,729, -1,                  0, 0, {ACT_ABORTACCEPT}},
+        {EV_TIMEOUT,  721,729, -1,                  0, 0, {ACT_ABORTACCEPT}},
+        {RSP_ZSAU,    700,729,ZSAU_NULL,            0, 0, {ACT_ABORTACCEPT}},
+        {RSP_ZSAU,    700,729,ZSAU_ACTIVE,          0, 0, {ACT_ABORTACCEPT}},
+        {RSP_ZSAU,    700,729,ZSAU_DISCONNECT_IND,  0, 0, {ACT_ABORTACCEPT}},
+
+        {EV_TIMEOUT,  750,750, -1,                  0, 0, {ACT_CONNTIMEOUT}},
+
+        /* misc. */
+        {EV_PROTO_L2,  -1, -1, -1,                 -1,-1, {ACT_PROTO_L2}}, //FIXME
+
+        {RSP_ZCON,     -1, -1, -1,                 -1,-1, {ACT_DEBUG}}, //FIXME
+        {RSP_ZCCR,     -1, -1, -1,                 -1,-1, {ACT_DEBUG}}, //FIXME
+        {RSP_ZAOC,     -1, -1, -1,                 -1,-1, {ACT_DEBUG}}, //FIXME
+        {RSP_ZCSTR,    -1, -1, -1,                 -1,-1, {ACT_DEBUG}}, //FIXME
+
+        {RSP_ZCAU,     -1, -1, -1,                 -1,-1, {ACT_ZCAU}},
+        {RSP_NONE,     -1, -1, -1,                 -1,-1, {ACT_DEBUG}},
+        {RSP_ANY,      -1, -1, -1,                 -1,-1, {ACT_WARN}},
+        {RSP_LAST}
+};
+
+
+#if 0
+static struct reply_t tab_nocid[]= /* no dle mode */ //FIXME aenderungen uebernehmen
+{
+        /* resp_code, min_ConState, max_ConState, parameter, new_ConState, timeout, action, command */
+
+        {RSP_ANY,      -1, -1, -1,                 -1,-1, ACT_WARN,         NULL},
+        {RSP_LAST,0,0,0,0,0,0}
+};
+
+static struct reply_t tab_cid[] = /* no dle mode */ //FIXME aenderungen uebernehmen
+{
+        /* resp_code, min_ConState, max_ConState, parameter, new_ConState, timeout, action, command */
+
+        {RSP_ANY,      -1, -1, -1,                 -1,-1, ACT_WARN,         NULL},
+        {RSP_LAST,0,0,0,0,0,0}
+};
+#endif
+
+static struct resp_type_t resp_type[]=
+{
+        /*{"",          RSP_EMPTY,  RT_NOTHING},*/
+        {"OK",        RSP_OK,     RT_NOTHING},
+        {"ERROR",     RSP_ERROR,  RT_NOTHING},
+        {"ZSAU",      RSP_ZSAU,   RT_ZSAU},
+        {"ZCAU",      RSP_ZCAU,   RT_ZCAU},
+        {"RING",      RSP_RING,   RT_RING},
+        {"ZGCI",      RSP_ZGCI,   RT_NUMBER},
+        {"ZVLS",      RSP_ZVLS,   RT_NUMBER},
+        {"ZCTP",      RSP_ZCTP,   RT_NUMBER},
+        {"ZDLE",      RSP_ZDLE,   RT_NUMBER},
+        {"ZCFGT",     RSP_ZCFGT,  RT_NUMBER},
+        {"ZCCR",      RSP_ZCCR,   RT_NUMBER},
+        {"ZMWI",      RSP_ZMWI,   RT_NUMBER},
+        {"ZHLC",      RSP_ZHLC,   RT_STRING},
+        {"ZBC",       RSP_ZBC,    RT_STRING},
+        {"NMBR",      RSP_NMBR,   RT_STRING},
+        {"ZCPN",      RSP_ZCPN,   RT_STRING},
+        {"ZCON",      RSP_ZCON,   RT_STRING},
+        {"ZAOC",      RSP_ZAOC,   RT_STRING},
+        {"ZCSTR",     RSP_ZCSTR,  RT_STRING},
+        {"ZCFG",      RSP_ZCFG,   RT_HEX},
+        {"ZLOG",      RSP_ZLOG,   RT_NOTHING},
+        {"ZABINFO",   RSP_ZABINFO, RT_NOTHING},
+        {"ZSMLSTCHG", RSP_ZSMLSTCHG, RT_NOTHING},
+        {NULL,0,0}
+};
+
+/*
+ * Get integer from char-pointer
+ */
+static int isdn_getnum(char *p)
+{
+        int v = -1;
+
+        IFNULLRETVAL(p, -1);
+
+        dbg(DEBUG_TRANSCMD, "string: %s", p);
+
+        while (*p >= '0' && *p <= '9')
+                v = ((v < 0) ? 0 : (v * 10)) + (int) ((*p++) - '0');
+        if (*p)
+                v = -1; /* invalid Character */
+        return v;
+}
+
+/*
+ * Get integer from char-pointer
+ */
+static int isdn_gethex(char *p)
+{
+        int v = 0;
+        int c;
+
+        IFNULLRETVAL(p, -1);
+
+        dbg(DEBUG_TRANSCMD, "string: %s", p);
+
+        if (!*p)
+                return -1;
+
+        do {
+                if (v > (INT_MAX - 15) / 16)
+                        return -1;
+                c = *p;
+                if (c >= '0' && c <= '9')
+                        c -= '0';
+                else if (c >= 'a' && c <= 'f')
+                        c -= 'a' - 10;
+                else if (c >= 'A' && c <= 'F')
+                        c -= 'A' - 10;
+                else
+                        return -1;
+                v = v * 16 + c;
+        } while (*++p);
+
+        return v;
+}
+
+static inline void new_index(atomic_t *index, int max)
+{
+        if (atomic_read(index) == max)  //FIXME race?
+                atomic_set(index, 0);
+        else
+                atomic_inc(index);
+}
+
+/* retrieve CID from parsed response
+ * returns 0 if no CID, -1 if invalid CID, or CID value 1..65535
+ */
+static int cid_of_response(char *s)
+{
+        int cid;
+
+        if (s[-1] != ';')
+                return 0;       /* no CID separator */
+        cid = isdn_getnum(s);
+        if (cid < 0)
+                return 0;       /* CID not numeric */
+        if (cid < 1 || cid > 65535)
+                return -1;      /* CID out of range */
+        return cid;
+        //FIXME is ;<digit>+ at end of non-CID response really impossible?
+}
+
+/* This function will be called via task queue from the callback handler.
+ * We received a modem response and have to handle it..
+ */
+void gigaset_handle_modem_response(struct cardstate *cs)
+{
+        unsigned char *argv[MAX_REC_PARAMS + 1];
+        int params;
+        int i, j;
+        struct resp_type_t *rt;
+        int curarg;
+        unsigned long flags;
+        unsigned next, tail, head;
+        struct event_t *event;
+        int resp_code;
+        int param_type;
+        int abort;
+        size_t len;
+        int cid;
+        int rawstring;
+
+        IFNULLRET(cs);
+
+        len = cs->cbytes;
+        if (!len) {
+                /* ignore additional LFs/CRs (M10x config mode or cx100) */
+                dbg(DEBUG_MCMD, "skipped EOL [%02X]", cs->respdata[len]);
+                return;
+        }
+        cs->respdata[len] = 0;
+        dbg(DEBUG_TRANSCMD, "raw string: '%s'", cs->respdata);
+        argv[0] = cs->respdata;
+        params = 1;
+        if (cs->at_state.getstring) {
+                /* getstring only allowed without cid at the moment */
+                cs->at_state.getstring = 0;
+                rawstring = 1;
+                cid = 0;
+        } else {
+                /* parse line */
+                for (i = 0; i < len; i++)
+                        switch (cs->respdata[i]) {
+                        case ';':
+                        case ',':
+                        case '=':
+                                if (params > MAX_REC_PARAMS) {
+                                        warn("too many parameters in response");
+                                        /* need last parameter (might be CID) */
+                                        params--;
+                                }
+                                argv[params++] = cs->respdata + i + 1;
+                        }
+
+                rawstring = 0;
+                cid = params > 1 ? cid_of_response(argv[params-1]) : 0;
+                if (cid < 0) {
+                        gigaset_add_event(cs, &cs->at_state, RSP_INVAL,
+                                          NULL, 0, NULL);
+                        return;
+                }
+
+                for (j = 1; j < params; ++j)
+                        argv[j][-1] = 0;
+
+                dbg(DEBUG_TRANSCMD, "CMD received: %s", argv[0]);
+                if (cid) {
+                        --params;
+                        dbg(DEBUG_TRANSCMD, "CID: %s", argv[params]);
+                }
+                dbg(DEBUG_TRANSCMD, "available params: %d", params - 1);
+                for (j = 1; j < params; j++)
+                        dbg(DEBUG_TRANSCMD, "param %d: %s", j, argv[j]);
+        }
+
+        spin_lock_irqsave(&cs->ev_lock, flags);
+        head = atomic_read(&cs->ev_head);
+        tail = atomic_read(&cs->ev_tail);
+
+        abort = 1;
+        curarg = 0;
+        while (curarg < params) {
+                next = (tail + 1) % MAX_EVENTS;
+                if (unlikely(next == head)) {
+                        err("event queue full");
+                        break;
+                }
+
+                event = cs->events + tail;
+                event->at_state = NULL;
+                event->cid = cid;
+                event->ptr = NULL;
+                event->arg = NULL;
+                tail = next;
+
+                if (rawstring) {
+                        resp_code = RSP_STRING;
+                        param_type = RT_STRING;
+                } else {
+                        for (rt = resp_type; rt->response; ++rt)
+                                if (!strcmp(argv[curarg], rt->response))
+                                        break;
+
+                        if (!rt->response) {
+                                event->type = RSP_UNKNOWN;
+                                warn("unknown modem response: %s",
+                                     argv[curarg]);
+                                break;
+                        }
+
+                        resp_code = rt->resp_code;
+                        param_type = rt->type;
+                        ++curarg;
+                }
+
+                event->type = resp_code;
+
+                switch (param_type) {
+                case RT_NOTHING:
+                        break;
+                case RT_RING:
+                        if (!cid) {
+                                err("received RING without CID!");
+                                event->type = RSP_INVAL;
+                                abort = 1;
+                        } else {
+                                event->cid = 0;
+                                event->parameter = cid;
+                                abort = 0;
+                        }
+                        break;
+                case RT_ZSAU:
+                        if (curarg >= params) {
+                                event->parameter = ZSAU_NONE;
+                                break;
+                        }
+                        if (!strcmp(argv[curarg], "OUTGOING_CALL_PROCEEDING"))
+                                event->parameter = ZSAU_OUTGOING_CALL_PROCEEDING;
+                        else if (!strcmp(argv[curarg], "CALL_DELIVERED"))
+                                event->parameter = ZSAU_CALL_DELIVERED;
+                        else if (!strcmp(argv[curarg], "ACTIVE"))
+                                event->parameter = ZSAU_ACTIVE;
+                        else if (!strcmp(argv[curarg], "DISCONNECT_IND"))
+                                event->parameter = ZSAU_DISCONNECT_IND;
+                        else if (!strcmp(argv[curarg], "NULL"))
+                                event->parameter = ZSAU_NULL;
+                        else if (!strcmp(argv[curarg], "DISCONNECT_REQ"))
+                                event->parameter = ZSAU_DISCONNECT_REQ;
+                        else {
+                                event->parameter = ZSAU_UNKNOWN;
+                                warn("%s: unknown parameter %s after ZSAU",
+                                     __func__, argv[curarg]);
+                        }
+                        ++curarg;
+                        break;
+                case RT_STRING:
+                        if (curarg < params) {
+                                len = strlen(argv[curarg]) + 1;
+                                event->ptr = kmalloc(len, GFP_ATOMIC);
+                                if (event->ptr)
+                                        memcpy(event->ptr, argv[curarg], len);
+                                else
+                                        err("no memory for string!");
+                                ++curarg;
+                        }
+#ifdef CONFIG_GIGASET_DEBUG
+                        if (!event->ptr)
+                                dbg(DEBUG_CMD, "string==NULL");
+                        else
+                                dbg(DEBUG_CMD,
+                                    "string==%s", (char *) event->ptr);
+#endif
+                        break;
+                case RT_ZCAU:
+                        event->parameter = -1;
+                        if (curarg + 1 < params) {
+                                i = isdn_gethex(argv[curarg]);
+                                j = isdn_gethex(argv[curarg + 1]);
+                                if (i >= 0 && i < 256 && j >= 0 && j < 256)
+                                        event->parameter = (unsigned) i << 8
+                                                           | j;
+                                curarg += 2;
+                        } else
+                                curarg = params - 1;
+                        break;
+                case RT_NUMBER:
+                case RT_HEX:
+                        if (curarg < params) {
+                                if (param_type == RT_HEX)
+                                        event->parameter =
+                                                isdn_gethex(argv[curarg]);
+                                else
+                                        event->parameter =
+                                                isdn_getnum(argv[curarg]);
+                                ++curarg;
+                        } else
+                                event->parameter = -1;
+#ifdef CONFIG_GIGASET_DEBUG
+                        dbg(DEBUG_CMD, "parameter==%d", event->parameter);
+#endif
+                        break;
+                }
+
+                if (resp_code == RSP_ZDLE)
+                        cs->dle = event->parameter;
+
+                if (abort)
+                        break;
+        }
+
+        atomic_set(&cs->ev_tail, tail);
+        spin_unlock_irqrestore(&cs->ev_lock, flags);
+
+        if (curarg != params)
+                dbg(DEBUG_ANY, "invalid number of processed parameters: %d/%d",
+                    curarg, params);
+}
+EXPORT_SYMBOL_GPL(gigaset_handle_modem_response);
+
+/* disconnect
+ * process closing of connection associated with given AT state structure
+ */
+static void disconnect(struct at_state_t **at_state_p)
+{
+        unsigned long flags;
+        struct bc_state *bcs;
+        struct cardstate *cs;
+
+        IFNULLRET(at_state_p);
+        IFNULLRET(*at_state_p);
+        bcs = (*at_state_p)->bcs;
+        cs = (*at_state_p)->cs;
+        IFNULLRET(cs);
+
+        new_index(&(*at_state_p)->seq_index, MAX_SEQ_INDEX);
+
+        /* revert to selected idle mode */
+        if (!atomic_read(&cs->cidmode)) {
+                cs->at_state.pending_commands |= PC_UMMODE;
+                atomic_set(&cs->commands_pending, 1); //FIXME
+                dbg(DEBUG_CMD, "Scheduling PC_UMMODE");
+        }
+
+        if (bcs) {
+                /* B channel assigned: invoke hardware specific handler */
+                cs->ops->close_bchannel(bcs);
+        } else {
+                /* no B channel assigned: just deallocate */
+                spin_lock_irqsave(&cs->lock, flags);
+                list_del(&(*at_state_p)->list);
+                kfree(*at_state_p);
+                *at_state_p = NULL;
+                spin_unlock_irqrestore(&cs->lock, flags);
+        }
+}
+
+/* get_free_channel
+ * get a free AT state structure: either one of those associated with the
+ * B channels of the Gigaset device, or if none of those is available,
+ * a newly allocated one with bcs=NULL
+ * The structure should be freed by calling disconnect() after use.
+ */
+static inline struct at_state_t *get_free_channel(struct cardstate *cs,
+                                                  int cid)
+/* cids: >0: siemens-cid
+          0: without cid
+         -1: no cid assigned yet
+*/
+{
+        unsigned long flags;
+        int i;
+        struct at_state_t *ret;
+
+        for (i = 0; i < cs->channels; ++i)
+                if (gigaset_get_channel(cs->bcs + i)) {
+                        ret = &cs->bcs[i].at_state;
+                        ret->cid = cid;
+                        return ret;
+                }
+
+        spin_lock_irqsave(&cs->lock, flags);
+        ret = kmalloc(sizeof(struct at_state_t), GFP_ATOMIC);
+        if (ret) {
+                gigaset_at_init(ret, NULL, cs, cid);
+                list_add(&ret->list, &cs->temp_at_states);
+        }
+        spin_unlock_irqrestore(&cs->lock, flags);
+        return ret;
+}
+
+static void init_failed(struct cardstate *cs, int mode)
+{
+        int i;
+        struct at_state_t *at_state;
+
+        cs->at_state.pending_commands &= ~PC_INIT;
+        atomic_set(&cs->mode, mode);
+        atomic_set(&cs->mstate, MS_UNINITIALIZED);
+        gigaset_free_channels(cs);
+        for (i = 0; i < cs->channels; ++i) {
+                at_state = &cs->bcs[i].at_state;
+                if (at_state->pending_commands & PC_CID) {
+                        at_state->pending_commands &= ~PC_CID;
+                        at_state->pending_commands |= PC_NOCID;
+                        atomic_set(&cs->commands_pending, 1);
+                }
+        }
+}
+
+static void schedule_init(struct cardstate *cs, int state)
+{
+        if (cs->at_state.pending_commands & PC_INIT) {
+                dbg(DEBUG_CMD, "not scheduling PC_INIT again");
+                return;
+        }
+        atomic_set(&cs->mstate, state);
+        atomic_set(&cs->mode, M_UNKNOWN);
+        gigaset_block_channels(cs);
+        cs->at_state.pending_commands |= PC_INIT;
+        atomic_set(&cs->commands_pending, 1);
+        dbg(DEBUG_CMD, "Scheduling PC_INIT");
+}
+
+/* Add "AT" to a command, add the cid, dle encode it, send the result to the hardware. */
+static void send_command(struct cardstate *cs, const char *cmd, int cid,
+                         int dle, gfp_t kmallocflags)
+{
+        size_t cmdlen, buflen;
+        char *cmdpos, *cmdbuf, *cmdtail;
+
+        cmdlen = strlen(cmd);
+        buflen = 11 + cmdlen;
+
+        if (likely(buflen > cmdlen)) {
+                cmdbuf = kmalloc(buflen, kmallocflags);
+                if (likely(cmdbuf != NULL)) {
+                        cmdpos = cmdbuf + 9;
+                        cmdtail = cmdpos + cmdlen;
+                        memcpy(cmdpos, cmd, cmdlen);
+
+                        if (cid > 0 && cid <= 65535) {
+                                do {
+                                        *--cmdpos = '0' + cid % 10;
+                                        cid /= 10;
+                                        ++cmdlen;
+                                } while (cid);
+                        }
+
+                        cmdlen += 2;
+                        *--cmdpos = 'T';
+                        *--cmdpos = 'A';
+
+                        if (dle) {
+                                cmdlen += 4;
+                                *--cmdpos = '(';
+                                *--cmdpos = 0x10;
+                                *cmdtail++ = 0x10;
+                                *cmdtail++ = ')';
+                        }
+
+                        cs->ops->write_cmd(cs, cmdpos, cmdlen, NULL);
+                        kfree(cmdbuf);
+                } else
+                        err("no memory for command buffer");
+        } else
+                err("overflow in buflen");
+}
+
+static struct at_state_t *at_state_from_cid(struct cardstate *cs, int cid)
+{
+        struct at_state_t *at_state;
+        int i;
+        unsigned long flags;
+
+        if (cid == 0)
+                return &cs->at_state;
+
+        for (i = 0; i < cs->channels; ++i)
+                if (cid == cs->bcs[i].at_state.cid)
+                        return &cs->bcs[i].at_state;
+
+        spin_lock_irqsave(&cs->lock, flags);
+
+        list_for_each_entry(at_state, &cs->temp_at_states, list)
+                if (cid == at_state->cid) {
+                        spin_unlock_irqrestore(&cs->lock, flags);
+                        return at_state;
+                }
+
+        spin_unlock_irqrestore(&cs->lock, flags);
+
+        return NULL;
+}
+
+static void bchannel_down(struct bc_state *bcs)
+{
+        IFNULLRET(bcs);
+        IFNULLRET(bcs->cs);
+
+        if (bcs->chstate & CHS_B_UP) {
+                bcs->chstate &= ~CHS_B_UP;
+                gigaset_i4l_channel_cmd(bcs, ISDN_STAT_BHUP);
+        }
+
+        if (bcs->chstate & (CHS_D_UP | CHS_NOTIFY_LL)) {
+                bcs->chstate &= ~(CHS_D_UP | CHS_NOTIFY_LL);
+                gigaset_i4l_channel_cmd(bcs, ISDN_STAT_DHUP);
+        }
+
+        gigaset_free_channel(bcs);
+
+        gigaset_bcs_reinit(bcs);
+}
+
+static void bchannel_up(struct bc_state *bcs)
+{
+        IFNULLRET(bcs);
+
+        if (!(bcs->chstate & CHS_D_UP)) {
+                notice("%s: D channel not up", __func__);
+                bcs->chstate |= CHS_D_UP;
+                gigaset_i4l_channel_cmd(bcs, ISDN_STAT_DCONN);
+        }
+
+        if (bcs->chstate & CHS_B_UP) {
+                notice("%s: B channel already up", __func__);
+                return;
+        }
+
+        bcs->chstate |= CHS_B_UP;
+        gigaset_i4l_channel_cmd(bcs, ISDN_STAT_BCONN);
+}
+
+static void start_dial(struct at_state_t *at_state, void *data, int seq_index)
+{
+        struct bc_state *bcs = at_state->bcs;
+        struct cardstate *cs = at_state->cs;
+        int retval;
+
+        bcs->chstate |= CHS_NOTIFY_LL;
+        //atomic_set(&bcs->status, BCS_INIT);
+
+        if (atomic_read(&at_state->seq_index) != seq_index)
+                goto error;
+
+        retval = gigaset_isdn_setup_dial(at_state, data);
+        if (retval != 0)
+                goto error;
+
+
+        at_state->pending_commands |= PC_CID;
+        dbg(DEBUG_CMD, "Scheduling PC_CID");
+//#ifdef GIG_MAYINITONDIAL
+//      if (atomic_read(&cs->MState) == MS_UNKNOWN) {
+//              cs->at_state.pending_commands |= PC_INIT;
+//              dbg(DEBUG_CMD, "Scheduling PC_INIT");
+//      }
+//#endif
+        atomic_set(&cs->commands_pending, 1); //FIXME
+        return;
+
+error:
+        at_state->pending_commands |= PC_NOCID;
+        dbg(DEBUG_CMD, "Scheduling PC_NOCID");
+        atomic_set(&cs->commands_pending, 1); //FIXME
+        return;
+}
+
+static void start_accept(struct at_state_t *at_state)
+{
+        struct cardstate *cs = at_state->cs;
+        int retval;
+
+        retval = gigaset_isdn_setup_accept(at_state);
+
+        if (retval == 0) {
+                at_state->pending_commands |= PC_ACCEPT;
+                dbg(DEBUG_CMD, "Scheduling PC_ACCEPT");
+                atomic_set(&cs->commands_pending, 1); //FIXME
+        } else {
+                //FIXME
+                at_state->pending_commands |= PC_HUP;
+                dbg(DEBUG_CMD, "Scheduling PC_HUP");
+                atomic_set(&cs->commands_pending, 1); //FIXME
+        }
+}
+
+static void do_start(struct cardstate *cs)
+{
+        gigaset_free_channels(cs);
+
+        if (atomic_read(&cs->mstate) != MS_LOCKED)
+                schedule_init(cs, MS_INIT);
+
+        gigaset_i4l_cmd(cs, ISDN_STAT_RUN);
+                                        // FIXME: not in locked mode
+                                        // FIXME 2: only after init sequence
+
+        cs->waiting = 0;
+        wake_up(&cs->waitqueue);
+}
+
+static void finish_shutdown(struct cardstate *cs)
+{
+        if (atomic_read(&cs->mstate) != MS_LOCKED) {
+                atomic_set(&cs->mstate, MS_UNINITIALIZED);
+                atomic_set(&cs->mode, M_UNKNOWN);
+        }
+
+        /* The rest is done by cleanup_cs () in user mode. */
+
+        cs->cmd_result = -ENODEV;
+        cs->waiting = 0;
+        wake_up_interruptible(&cs->waitqueue);
+}
+
+static void do_shutdown(struct cardstate *cs)
+{
+        gigaset_block_channels(cs);
+
+        if (atomic_read(&cs->mstate) == MS_READY) {
+                atomic_set(&cs->mstate, MS_SHUTDOWN);
+                cs->at_state.pending_commands |= PC_SHUTDOWN;
+                atomic_set(&cs->commands_pending, 1); //FIXME
+                dbg(DEBUG_CMD, "Scheduling PC_SHUTDOWN"); //FIXME
+                //gigaset_schedule_event(cs); //FIXME
+        } else
+                finish_shutdown(cs);
+}
+
+static void do_stop(struct cardstate *cs)
+{
+        do_shutdown(cs);
+}
+
+/* Entering cid mode or getting a cid failed:
+ * try to initialize the device and try again.
+ *
+ * channel >= 0: getting cid for the channel failed
+ * channel < 0:  entering cid mode failed
+ *
+ * returns 0 on failure
+ */
+static int reinit_and_retry(struct cardstate *cs, int channel)
+{
+        int i;
+
+        if (--cs->retry_count <= 0)
+                return 0;
+
+        for (i = 0; i < cs->channels; ++i)
+                if (cs->bcs[i].at_state.cid > 0)
+                        return 0;
+
+        if (channel < 0)
+                warn("Could not enter cid mode. Reinit device and try again.");
+        else {
+                warn("Could not get a call id. Reinit device and try again.");
+                cs->bcs[channel].at_state.pending_commands |= PC_CID;
+        }
+        schedule_init(cs, MS_INIT);
+        return 1;
+}
+
+static int at_state_invalid(struct cardstate *cs,
+                            struct at_state_t *test_ptr)
+{
+        unsigned long flags;
+        unsigned channel;
+        struct at_state_t *at_state;
+        int retval = 0;
+
+        spin_lock_irqsave(&cs->lock, flags);
+
+        if (test_ptr == &cs->at_state)
+                goto exit;
+
+        list_for_each_entry(at_state, &cs->temp_at_states, list)
+                if (at_state == test_ptr)
+                        goto exit;
+
+        for (channel = 0; channel < cs->channels; ++channel)
+                if (&cs->bcs[channel].at_state == test_ptr)
+                        goto exit;
+
+        retval = 1;
+exit:
+        spin_unlock_irqrestore(&cs->lock, flags);
+        return retval;
+}
+
+static void handle_icall(struct cardstate *cs, struct bc_state *bcs,
+                         struct at_state_t **p_at_state)
+{
+        int retval;
+        struct at_state_t *at_state = *p_at_state;
+
+        retval = gigaset_isdn_icall(at_state);
+        switch (retval) {
+        case ICALL_ACCEPT:
+                break;
+        default:
+                err("internal error: disposition=%d", retval);
+                /* --v-- fall through --v-- */
+        case ICALL_IGNORE:
+        case ICALL_REJECT:
+                /* hang up actively
+                 * Device doc says that would reject the call.
+                 * In fact it doesn't.
+                 */
+                at_state->pending_commands |= PC_HUP;
+                atomic_set(&cs->commands_pending, 1);
+                break;
+        }
+}
+
+static int do_lock(struct cardstate *cs)
+{
+        int mode;
+        int i;
+
+        switch (atomic_read(&cs->mstate)) {
+        case MS_UNINITIALIZED:
+        case MS_READY:
+                if (cs->cur_at_seq || !list_empty(&cs->temp_at_states) ||
+                    cs->at_state.pending_commands)
+                        return -EBUSY;
+
+                for (i = 0; i < cs->channels; ++i)
+                        if (cs->bcs[i].at_state.pending_commands)
+                                return -EBUSY;
+
+                if (!gigaset_get_channels(cs))
+                        return -EBUSY;
+
+                break;
+        case MS_LOCKED:
+                //retval = -EACCES;
+                break;
+        default:
+                return -EBUSY;
+        }
+
+        mode = atomic_read(&cs->mode);
+        atomic_set(&cs->mstate, MS_LOCKED);
+        atomic_set(&cs->mode, M_UNKNOWN);
+        //FIXME reset card state / at states / bcs states
+
+        return mode;
+}
+
+static int do_unlock(struct cardstate *cs)
+{
+        if (atomic_read(&cs->mstate) != MS_LOCKED)
+                return -EINVAL;
+
+        atomic_set(&cs->mstate, MS_UNINITIALIZED);
+        atomic_set(&cs->mode, M_UNKNOWN);
+        gigaset_free_channels(cs);
+        //FIXME reset card state / at states / bcs states
+        if (atomic_read(&cs->connected))
+                schedule_init(cs, MS_INIT);
+
+        return 0;
+}
+
+static void do_action(int action, struct cardstate *cs,
+                      struct bc_state *bcs,
+                      struct at_state_t **p_at_state, char **pp_command,
+                      int *p_genresp, int *p_resp_code,
+                      struct event_t *ev)
+{
+        struct at_state_t *at_state = *p_at_state;
+        struct at_state_t *at_state2;
+        unsigned long flags;
+
+        int channel;
+
+        unsigned char *s, *e;
+        int i;
+        unsigned long val;
+
+        switch (action) {
+        case ACT_NOTHING:
+                break;
+        case ACT_TIMEOUT:
+                at_state->waiting = 1;
+                break;
+        case ACT_INIT:
+                //FIXME setup everything
+                cs->at_state.pending_commands &= ~PC_INIT;
+                cs->cur_at_seq = SEQ_NONE;
+                atomic_set(&cs->mode, M_UNIMODEM);
+                if (!atomic_read(&cs->cidmode)) {
+                        gigaset_free_channels(cs);
+                        atomic_set(&cs->mstate, MS_READY);
+                        break;
+                }
+                cs->at_state.pending_commands |= PC_CIDMODE;
+                atomic_set(&cs->commands_pending, 1); //FIXME
+                dbg(DEBUG_CMD, "Scheduling PC_CIDMODE");
+                break;
+        case ACT_FAILINIT:
+                warn("Could not initialize the device.");
+                cs->dle = 0;
+                init_failed(cs, M_UNKNOWN);
+                cs->cur_at_seq = SEQ_NONE;
+                break;
+        case ACT_CONFIGMODE:
+                init_failed(cs, M_CONFIG);
+                cs->cur_at_seq = SEQ_NONE;
+                break;
+        case ACT_SETDLE1:
+                cs->dle = 1;
+                /* cs->inbuf[0].inputstate |= INS_command | INS_DLE_command; */
+                cs->inbuf[0].inputstate &=
+                        ~(INS_command | INS_DLE_command);
+                break;
+        case ACT_SETDLE0:
+                cs->dle = 0;
+                cs->inbuf[0].inputstate =
+                        (cs->inbuf[0].inputstate & ~INS_DLE_command)
+                        | INS_command;
+                break;
+        case ACT_CMODESET:
+                if (atomic_read(&cs->mstate) == MS_INIT ||
+                    atomic_read(&cs->mstate) == MS_RECOVER) {
+                        gigaset_free_channels(cs);
+                        atomic_set(&cs->mstate, MS_READY);
+                }
+                atomic_set(&cs->mode, M_CID);
+                cs->cur_at_seq = SEQ_NONE;
+                break;
+        case ACT_UMODESET:
+                atomic_set(&cs->mode, M_UNIMODEM);
+                cs->cur_at_seq = SEQ_NONE;
+                break;
+        case ACT_FAILCMODE:
+                cs->cur_at_seq = SEQ_NONE;
+                if (atomic_read(&cs->mstate) == MS_INIT ||
+                    atomic_read(&cs->mstate) == MS_RECOVER) {
+                        init_failed(cs, M_UNKNOWN);
+                        break;
+                }
+                if (!reinit_and_retry(cs, -1))
+                        schedule_init(cs, MS_RECOVER);
+                break;
+        case ACT_FAILUMODE:
+                cs->cur_at_seq = SEQ_NONE;
+                schedule_init(cs, MS_RECOVER);
+                break;
+        case ACT_HUPMODEM:
+                /* send "+++" (hangup in unimodem mode) */
+                cs->ops->write_cmd(cs, "+++", 3, NULL);
+                break;
+        case ACT_RING:
+                /* get fresh AT state structure for new CID */
+                at_state2 = get_free_channel(cs, ev->parameter);
+                if (!at_state2) {
+                        warn("RING ignored: "
+                             "could not allocate channel structure");
+                        break;
+                }
+
+                /* initialize AT state structure
+                 * note that bcs may be NULL if no B channel is free
+                 */
+                at_state2->ConState = 700;
+                kfree(at_state2->str_var[STR_NMBR]);
+                at_state2->str_var[STR_NMBR] = NULL;
+                kfree(at_state2->str_var[STR_ZCPN]);
+                at_state2->str_var[STR_ZCPN] = NULL;
+                kfree(at_state2->str_var[STR_ZBC]);
+                at_state2->str_var[STR_ZBC] = NULL;
+                kfree(at_state2->str_var[STR_ZHLC]);
+                at_state2->str_var[STR_ZHLC] = NULL;
+                at_state2->int_var[VAR_ZCTP] = -1;
+
+                spin_lock_irqsave(&cs->lock, flags);
+                at_state2->timer_expires = RING_TIMEOUT;
+                at_state2->timer_active = 1;
+                spin_unlock_irqrestore(&cs->lock, flags);
+                break;
+        case ACT_ICALL:
+                handle_icall(cs, bcs, p_at_state);
+                at_state = *p_at_state;
+                break;
+        case ACT_FAILSDOWN:
+                warn("Could not shut down the device.");
+                /* fall through */
+        case ACT_FAKESDOWN:
+        case ACT_SDOWN:
+                cs->cur_at_seq = SEQ_NONE;
+                finish_shutdown(cs);
+                break;
+        case ACT_CONNECT:
+                if (cs->onechannel) {
+                        at_state->pending_commands |= PC_DLE1;
+                        atomic_set(&cs->commands_pending, 1);
+                        break;
+                }
+                bcs->chstate |= CHS_D_UP;
+                gigaset_i4l_channel_cmd(bcs, ISDN_STAT_DCONN);
+                cs->ops->init_bchannel(bcs);
+                break;
+        case ACT_DLE1:
+                cs->cur_at_seq = SEQ_NONE;
+                bcs = cs->bcs + cs->curchannel;
+
+                bcs->chstate |= CHS_D_UP;
+                gigaset_i4l_channel_cmd(bcs, ISDN_STAT_DCONN);
+                cs->ops->init_bchannel(bcs);
+                break;
+        case ACT_FAKEHUP:
+                at_state->int_var[VAR_ZSAU] = ZSAU_NULL;
+                /* fall through */
+        case ACT_DISCONNECT:
+                cs->cur_at_seq = SEQ_NONE;
+                at_state->cid = -1;
+                if (bcs && cs->onechannel && cs->dle) {
+                        /* Check for other open channels not needed:
+                         * DLE only used for M10x with one B channel.
+                         */
+                        at_state->pending_commands |= PC_DLE0;
+                        atomic_set(&cs->commands_pending, 1);
+                } else {
+                        disconnect(p_at_state);
+                        at_state = *p_at_state;
+                }
+                break;
+        case ACT_FAKEDLE0:
+                at_state->int_var[VAR_ZDLE] = 0;
+                cs->dle = 0;
+                /* fall through */
+        case ACT_DLE0:
+                cs->cur_at_seq = SEQ_NONE;
+                at_state2 = &cs->bcs[cs->curchannel].at_state;
+                disconnect(&at_state2);
+                break;
+        case ACT_ABORTHUP:
+                cs->cur_at_seq = SEQ_NONE;
+                warn("Could not hang up.");
+                at_state->cid = -1;
+                if (bcs && cs->onechannel)
+                        at_state->pending_commands |= PC_DLE0;
+                else {
+                        disconnect(p_at_state);
+                        at_state = *p_at_state;
+                }
+                schedule_init(cs, MS_RECOVER);
+                break;
+        case ACT_FAILDLE0:
+                cs->cur_at_seq = SEQ_NONE;
+                warn("Could not leave DLE mode.");
+                at_state2 = &cs->bcs[cs->curchannel].at_state;
+                disconnect(&at_state2);
+                schedule_init(cs, MS_RECOVER);
+                break;
+        case ACT_FAILDLE1:
+                cs->cur_at_seq = SEQ_NONE;
+                warn("Could not enter DLE mode. Try to hang up.");
+                channel = cs->curchannel;
+                cs->bcs[channel].at_state.pending_commands |= PC_HUP;
+                atomic_set(&cs->commands_pending, 1);
+                break;
+
+        case ACT_CID: /* got cid; start dialing */
+                cs->cur_at_seq = SEQ_NONE;
+                channel = cs->curchannel;
+                if (ev->parameter > 0 && ev->parameter <= 65535) {
+                        cs->bcs[channel].at_state.cid = ev->parameter;
+                        cs->bcs[channel].at_state.pending_commands |=
+                                PC_DIAL;
+                        atomic_set(&cs->commands_pending, 1);
+                        break;
+                }
+                /* fall through */
+        case ACT_FAILCID:
+                cs->cur_at_seq = SEQ_NONE;
+                channel = cs->curchannel;
+                if (!reinit_and_retry(cs, channel)) {
+                        warn("Could not get a call id. Dialing not possible");
+                        at_state2 = &cs->bcs[channel].at_state;
+                        disconnect(&at_state2);
+                }
+                break;
+        case ACT_ABORTCID:
+                cs->cur_at_seq = SEQ_NONE;
+                at_state2 = &cs->bcs[cs->curchannel].at_state;
+                disconnect(&at_state2);
+                break;
+
+        case ACT_DIALING:
+        case ACT_ACCEPTED:
+                cs->cur_at_seq = SEQ_NONE;
+                break;
+
+        case ACT_ABORTACCEPT:   /* hangup/error/timeout during ICALL processing */
+                disconnect(p_at_state);
+                at_state = *p_at_state;
+                break;
+
+        case ACT_ABORTDIAL:     /* error/timeout during dial preparation */
+                cs->cur_at_seq = SEQ_NONE;
+                at_state->pending_commands |= PC_HUP;
+                atomic_set(&cs->commands_pending, 1);
+                break;
+
+        case ACT_REMOTEREJECT:  /* DISCONNECT_IND after dialling */
+        case ACT_CONNTIMEOUT:   /* timeout waiting for ZSAU=ACTIVE */
+        case ACT_REMOTEHUP:     /* DISCONNECT_IND with established connection */
+                at_state->pending_commands |= PC_HUP;
+                atomic_set(&cs->commands_pending, 1);
+                break;
+        case ACT_GETSTRING: /* warning: RING, ZDLE, ... are not handled properly any more */
+                at_state->getstring = 1;
+                break;
+        case ACT_SETVER:
+                if (!ev->ptr) {
+                        *p_genresp = 1;
+                        *p_resp_code = RSP_ERROR;
+                        break;
+                }
+                s = ev->ptr;
+
+                if (!strcmp(s, "OK")) {
+                        *p_genresp = 1;
+                        *p_resp_code = RSP_ERROR;
+                        break;
+                }
+
+                for (i = 0; i < 4; ++i) {
+                        val = simple_strtoul(s, (char **) &e, 10);
+                        if (val > INT_MAX || e == s)
+                                break;
+                        if (i == 3) {
+                                if (*e)
+                                        break;
+                        } else if (*e != '.')
+                                break;
+                        else
+                                s = e + 1;
+                        cs->fwver[i] = val;
+                }
+                if (i != 4) {
+                        *p_genresp = 1;
+                        *p_resp_code = RSP_ERROR;
+                        break;
+                }
+                /*at_state->getstring = 1;*/
+                cs->gotfwver = 0;
+                break;
+        case ACT_GOTVER:
+                if (cs->gotfwver == 0) {
+                        cs->gotfwver = 1;
+                        dbg(DEBUG_ANY,
+                            "firmware version %02d.%03d.%02d.%02d",
+                            cs->fwver[0], cs->fwver[1],
+                            cs->fwver[2], cs->fwver[3]);
+                        break;
+                }
+                /* fall through */
+        case ACT_FAILVER:
+                cs->gotfwver = -1;
+                err("could not read firmware version.");
+                break;
+#ifdef CONFIG_GIGASET_DEBUG
+        case ACT_ERROR:
+                *p_genresp = 1;
+                *p_resp_code = RSP_ERROR;
+                break;
+        case ACT_TEST:
+                {
+                        static int count = 3; //2; //1;
+                        *p_genresp = 1;
+                        *p_resp_code = count ? RSP_ERROR : RSP_OK;
+                        if (count > 0)
+                                --count;
+                }
+                break;
+#endif
+        case ACT_DEBUG:
+                dbg(DEBUG_ANY, "%s: resp_code %d in ConState %d",
+                        __func__, ev->type, at_state->ConState);
+                break;
+        case ACT_WARN:
+                warn("%s: resp_code %d in ConState %d!",
+                        __func__, ev->type, at_state->ConState);
+                break;
+        case ACT_ZCAU:
+                warn("cause code %04x in connection state %d.",
+                     ev->parameter, at_state->ConState);
+                break;
+
+        /* events from the LL */
+        case ACT_DIAL:
+                start_dial(at_state, ev->ptr, ev->parameter);
+                break;
+        case ACT_ACCEPT:
+                start_accept(at_state);
+                break;
+        case ACT_PROTO_L2:
+                dbg(DEBUG_CMD,
+                    "set protocol to %u", (unsigned) ev->parameter);
+                at_state->bcs->proto2 = ev->parameter;
+                break;
+        case ACT_HUP:
+                at_state->pending_commands |= PC_HUP;
+                atomic_set(&cs->commands_pending, 1); //FIXME
+                dbg(DEBUG_CMD, "Scheduling PC_HUP");
+                break;
+
+        /* hotplug events */
+        case ACT_STOP:
+                do_stop(cs);
+                break;
+        case ACT_START:
+                do_start(cs);
+                break;
+
+        /* events from the interface */ // FIXME without ACT_xxxx?
+        case ACT_IF_LOCK:
+                cs->cmd_result = ev->parameter ? do_lock(cs) : do_unlock(cs);
+                cs->waiting = 0;
+                wake_up(&cs->waitqueue);
+                break;
+        case ACT_IF_VER:
+                if (ev->parameter != 0)
+                        cs->cmd_result = -EINVAL;
+                else if (cs->gotfwver != 1) {
+                        cs->cmd_result = -ENOENT;
+                } else {
+                        memcpy(ev->arg, cs->fwver, sizeof cs->fwver);
+                        cs->cmd_result = 0;
+                }
+                cs->waiting = 0;
+                wake_up(&cs->waitqueue);
+                break;
+
+        /* events from the proc file system */ // FIXME without ACT_xxxx?
+        case ACT_PROC_CIDMODE:
+                if (ev->parameter != atomic_read(&cs->cidmode)) {
+                        atomic_set(&cs->cidmode, ev->parameter);
+                        if (ev->parameter) {
+                                cs->at_state.pending_commands |= PC_CIDMODE;
+                                dbg(DEBUG_CMD, "Scheduling PC_CIDMODE");
+                        } else {
+                                cs->at_state.pending_commands |= PC_UMMODE;
+                                dbg(DEBUG_CMD, "Scheduling PC_UMMODE");
+                        }
+                        atomic_set(&cs->commands_pending, 1);
+                }
+                cs->waiting = 0;
+                wake_up(&cs->waitqueue);
+                break;
+
+        /* events from the hardware drivers */
+        case ACT_NOTIFY_BC_DOWN:
+                bchannel_down(bcs);
+                break;
+        case ACT_NOTIFY_BC_UP:
+                bchannel_up(bcs);
+                break;
+        case ACT_SHUTDOWN:
+                do_shutdown(cs);
+                break;
+
+
+        default:
+                if (action >= ACT_CMD && action < ACT_CMD + AT_NUM) {
+                        *pp_command = at_state->bcs->commands[action - ACT_CMD];
+                        if (!*pp_command) {
+                                *p_genresp = 1;
+                                *p_resp_code = RSP_NULL;
+                        }
+                } else
+                        err("%s: action==%d!", __func__, action);
+        }
+}
+
+/* State machine to do the calling and hangup procedure */
+static void process_event(struct cardstate *cs, struct event_t *ev)
+{
+        struct bc_state *bcs;
+        char *p_command = NULL;
+        struct reply_t *rep;
+        int rcode;
+        int genresp = 0;
+        int resp_code = RSP_ERROR;
+        int sendcid;
+        struct at_state_t *at_state;
+        int index;
+        int curact;
+        unsigned long flags;
+
+        IFNULLRET(cs);
+        IFNULLRET(ev);
+
+        if (ev->cid >= 0) {
+                at_state = at_state_from_cid(cs, ev->cid);
+                if (!at_state) {
+                        gigaset_add_event(cs, &cs->at_state, RSP_WRONG_CID,
+                                          NULL, 0, NULL);
+                        return;
+                }
+        } else {
+                at_state = ev->at_state;
+                if (at_state_invalid(cs, at_state)) {
+                        dbg(DEBUG_ANY,
+                            "event for invalid at_state %p", at_state);
+                        return;
+                }
+        }
+
+        dbg(DEBUG_CMD,
+            "connection state %d, event %d", at_state->ConState, ev->type);
+
+        bcs = at_state->bcs;
+        sendcid = at_state->cid;
+
+        /* Setting the pointer to the dial array */
+        rep = at_state->replystruct;
+        IFNULLRET(rep);
+
+        if (ev->type == EV_TIMEOUT) {
+                if (ev->parameter != atomic_read(&at_state->timer_index)
+                    || !at_state->timer_active) {
+                        ev->type = RSP_NONE; /* old timeout */
+                        dbg(DEBUG_ANY, "old timeout");
+                } else if (!at_state->waiting)
+                        dbg(DEBUG_ANY, "timeout occured");
+                else
+                        dbg(DEBUG_ANY, "stopped waiting");
+        }
+
+        /* if the response belongs to a variable in at_state->int_var[VAR_XXXX] or at_state->str_var[STR_XXXX], set it */
+        if (ev->type >= RSP_VAR && ev->type < RSP_VAR + VAR_NUM) {
+                index = ev->type - RSP_VAR;
+                at_state->int_var[index] = ev->parameter;
+        } else if (ev->type >= RSP_STR && ev->type < RSP_STR + STR_NUM) {
+                index = ev->type - RSP_STR;
+                kfree(at_state->str_var[index]);
+                at_state->str_var[index] = ev->ptr;
+                ev->ptr = NULL; /* prevent process_events() from deallocating ptr */
+        }
+
+        if (ev->type == EV_TIMEOUT || ev->type == RSP_STRING)
+                at_state->getstring = 0;
+
+        /* Search row in dial array which matches modem response and current constate */
+        for (;; rep++) {
+                rcode = rep->resp_code;
+                /* dbg (DEBUG_ANY, "rcode %d", rcode); */
+                if (rcode == RSP_LAST) {
+                        /* found nothing...*/
+                        warn("%s: rcode=RSP_LAST: resp_code %d in ConState %d!",
+                                __func__, ev->type, at_state->ConState);
+                        return;
+                }
+                if ((rcode == RSP_ANY || rcode == ev->type)
+                  && ((int) at_state->ConState >= rep->min_ConState)
+                  && (rep->max_ConState < 0
+                      || (int) at_state->ConState <= rep->max_ConState)
+                  && (rep->parameter < 0 || rep->parameter == ev->parameter))
+                        break;
+        }
+
+        p_command = rep->command;
+
+        at_state->waiting = 0;
+        for (curact = 0; curact < MAXACT; ++curact) {
+                /* The row tells us what we should do  ..
+                 */
+                do_action(rep->action[curact], cs, bcs, &at_state, &p_command, &genresp, &resp_code, ev);
+                if (!at_state)
+                        break; /* may be freed after disconnect */
+        }
+
+        if (at_state) {
+                /* Jump to the next con-state regarding the array */
+                if (rep->new_ConState >= 0)
+                        at_state->ConState = rep->new_ConState;
+
+                if (genresp) {
+                        spin_lock_irqsave(&cs->lock, flags);
+                        at_state->timer_expires = 0; //FIXME
+                        at_state->timer_active = 0; //FIXME
+                        spin_unlock_irqrestore(&cs->lock, flags);
+                        gigaset_add_event(cs, at_state, resp_code, NULL, 0, NULL);
+                } else {
+                        /* Send command to modem if not NULL... */
+                        if (p_command/*rep->command*/) {
+                                if (atomic_read(&cs->connected))
+                                        send_command(cs, p_command,
+                                                     sendcid, cs->dle,
+                                                     GFP_ATOMIC);
+                                else
+                                        gigaset_add_event(cs, at_state,
+                                                          RSP_NODEV,
+                                                          NULL, 0, NULL);
+                        }
+
+                        spin_lock_irqsave(&cs->lock, flags);
+                        if (!rep->timeout) {
+                                at_state->timer_expires = 0;
+                                at_state->timer_active = 0;
+                        } else if (rep->timeout > 0) { /* new timeout */
+                                at_state->timer_expires = rep->timeout * 10;
+                                at_state->timer_active = 1;
+                                new_index(&at_state->timer_index,
+                                          MAX_TIMER_INDEX);
+                        }
+                        spin_unlock_irqrestore(&cs->lock, flags);
+                }
+        }
+}
+
+static void schedule_sequence(struct cardstate *cs,
+                              struct at_state_t *at_state, int sequence)
+{
+        cs->cur_at_seq = sequence;
+        gigaset_add_event(cs, at_state, RSP_INIT, NULL, sequence, NULL);
+}
+
+static void process_command_flags(struct cardstate *cs)
+{
+        struct at_state_t *at_state = NULL;
+        struct bc_state *bcs;
+        int i;
+        int sequence;
+
+        IFNULLRET(cs);
+
+        atomic_set(&cs->commands_pending, 0);
+
+        if (cs->cur_at_seq) {
+                dbg(DEBUG_CMD, "not searching scheduled commands: busy");
+                return;
+        }
+
+        dbg(DEBUG_CMD, "searching scheduled commands");
+
+        sequence = SEQ_NONE;
+
+        /* clear pending_commands and hangup channels on shutdown */
+        if (cs->at_state.pending_commands & PC_SHUTDOWN) {
+                cs->at_state.pending_commands &= ~PC_CIDMODE;
+                for (i = 0; i < cs->channels; ++i) {
+                        bcs = cs->bcs + i;
+                        at_state = &bcs->at_state;
+                        at_state->pending_commands &=
+                                ~(PC_DLE1 | PC_ACCEPT | PC_DIAL);
+                        if (at_state->cid > 0)
+                                at_state->pending_commands |= PC_HUP;
+                        if (at_state->pending_commands & PC_CID) {
+                                at_state->pending_commands |= PC_NOCID;
+                                at_state->pending_commands &= ~PC_CID;
+                        }
+                }
+        }
+
+        /* clear pending_commands and hangup channels on reset */
+        if (cs->at_state.pending_commands & PC_INIT) {
+                cs->at_state.pending_commands &= ~PC_CIDMODE;
+                for (i = 0; i < cs->channels; ++i) {
+                        bcs = cs->bcs + i;
+                        at_state = &bcs->at_state;
+                        at_state->pending_commands &=
+                                ~(PC_DLE1 | PC_ACCEPT | PC_DIAL);
+                        if (at_state->cid > 0)
+                                at_state->pending_commands |= PC_HUP;
+                        if (atomic_read(&cs->mstate) == MS_RECOVER) {
+                                if (at_state->pending_commands & PC_CID) {
+                                        at_state->pending_commands |= PC_NOCID;
+                                        at_state->pending_commands &= ~PC_CID;
+                                }
+                        }
+                }
+        }
+
+        /* only switch back to unimodem mode, if no commands are pending and no channels are up */
+        if (cs->at_state.pending_commands == PC_UMMODE
+            && !atomic_read(&cs->cidmode)
+            && list_empty(&cs->temp_at_states)
+            && atomic_read(&cs->mode) == M_CID) {
+                sequence = SEQ_UMMODE;
+                at_state = &cs->at_state;
+                for (i = 0; i < cs->channels; ++i) {
+                        bcs = cs->bcs + i;
+                        if (bcs->at_state.pending_commands ||
+                            bcs->at_state.cid > 0) {
+                                sequence = SEQ_NONE;
+                                break;
+                        }
+                }
+        }
+        cs->at_state.pending_commands &= ~PC_UMMODE;
+        if (sequence != SEQ_NONE) {
+                schedule_sequence(cs, at_state, sequence);
+                return;
+        }
+
+        for (i = 0; i < cs->channels; ++i) {
+                bcs = cs->bcs + i;
+                if (bcs->at_state.pending_commands & PC_HUP) {
+                        bcs->at_state.pending_commands &= ~PC_HUP;
+                        if (bcs->at_state.pending_commands & PC_CID) {
+                                /* not yet dialing: PC_NOCID is sufficient */
+                                bcs->at_state.pending_commands |= PC_NOCID;
+                                bcs->at_state.pending_commands &= ~PC_CID;
+                        } else {
+                                schedule_sequence(cs, &bcs->at_state, SEQ_HUP);
+                                return;
+                        }
+                }
+                if (bcs->at_state.pending_commands & PC_NOCID) {
+                        bcs->at_state.pending_commands &= ~PC_NOCID;
+                        cs->curchannel = bcs->channel;
+                        schedule_sequence(cs, &cs->at_state, SEQ_NOCID);
+                        return;
+                } else if (bcs->at_state.pending_commands & PC_DLE0) {
+                        bcs->at_state.pending_commands &= ~PC_DLE0;
+                        cs->curchannel = bcs->channel;
+                        schedule_sequence(cs, &cs->at_state, SEQ_DLE0);
+                        return;
+                }
+        }
+
+        list_for_each_entry(at_state, &cs->temp_at_states, list)
+                if (at_state->pending_commands & PC_HUP) {
+                        at_state->pending_commands &= ~PC_HUP;
+                        schedule_sequence(cs, at_state, SEQ_HUP);
+                        return;
+                }
+
+        if (cs->at_state.pending_commands & PC_INIT) {
+                cs->at_state.pending_commands &= ~PC_INIT;
+                cs->dle = 0; //FIXME
+                cs->inbuf->inputstate = INS_command;
+                //FIXME reset card state (or -> LOCK0)?
+                schedule_sequence(cs, &cs->at_state, SEQ_INIT);
+                return;
+        }
+        if (cs->at_state.pending_commands & PC_SHUTDOWN) {
+                cs->at_state.pending_commands &= ~PC_SHUTDOWN;
+                schedule_sequence(cs, &cs->at_state, SEQ_SHUTDOWN);
+                return;
+        }
+        if (cs->at_state.pending_commands & PC_CIDMODE) {
+                cs->at_state.pending_commands &= ~PC_CIDMODE;
+                if (atomic_read(&cs->mode) == M_UNIMODEM) {
+#if 0
+                        cs->retry_count = 2;
+#else
+                        cs->retry_count = 1;
+#endif
+                        schedule_sequence(cs, &cs->at_state, SEQ_CIDMODE);
+                        return;
+                }
+        }
+
+        for (i = 0; i < cs->channels; ++i) {
+                bcs = cs->bcs + i;
+                if (bcs->at_state.pending_commands & PC_DLE1) {
+                        bcs->at_state.pending_commands &= ~PC_DLE1;
+                        cs->curchannel = bcs->channel;
+                        schedule_sequence(cs, &cs->at_state, SEQ_DLE1);
+                        return;
+                }
+                if (bcs->at_state.pending_commands & PC_ACCEPT) {
+                        bcs->at_state.pending_commands &= ~PC_ACCEPT;
+                        schedule_sequence(cs, &bcs->at_state, SEQ_ACCEPT);
+                        return;
+                }
+                if (bcs->at_state.pending_commands & PC_DIAL) {
+                        bcs->at_state.pending_commands &= ~PC_DIAL;
+                        schedule_sequence(cs, &bcs->at_state, SEQ_DIAL);
+                        return;
+                }
+                if (bcs->at_state.pending_commands & PC_CID) {
+                        switch (atomic_read(&cs->mode)) {
+                        case M_UNIMODEM:
+                                cs->at_state.pending_commands |= PC_CIDMODE;
+                                dbg(DEBUG_CMD, "Scheduling PC_CIDMODE");
+                                atomic_set(&cs->commands_pending, 1);
+                                return;
+#ifdef GIG_MAYINITONDIAL
+                        case M_UNKNOWN:
+                                schedule_init(cs, MS_INIT);
+                                return;
+#endif
+                        }
+                        bcs->at_state.pending_commands &= ~PC_CID;
+                        cs->curchannel = bcs->channel;
+#ifdef GIG_RETRYCID
+                        cs->retry_count = 2;
+#else
+                        cs->retry_count = 1;
+#endif
+                        schedule_sequence(cs, &cs->at_state, SEQ_CID);
+                        return;
+                }
+        }
+}
+
+static void process_events(struct cardstate *cs)
+{
+        struct event_t *ev;
+        unsigned head, tail;
+        int i;
+        int check_flags = 0;
+        int was_busy;
+
+        /* no locking needed (only one reader) */
+        head = atomic_read(&cs->ev_head);
+
+        for (i = 0; i < 2 * MAX_EVENTS; ++i) {
+                tail = atomic_read(&cs->ev_tail);
+                if (tail == head) {
+                        if (!check_flags && !atomic_read(&cs->commands_pending))
+                                break;
+                        check_flags = 0;
+                        process_command_flags(cs);
+                        tail = atomic_read(&cs->ev_tail);
+                        if (tail == head) {
+                                if (!atomic_read(&cs->commands_pending))
+                                        break;
+                                continue;
+                        }
+                }
+
+                ev = cs->events + head;
+                was_busy = cs->cur_at_seq != SEQ_NONE;
+                process_event(cs, ev);
+                kfree(ev->ptr);
+                ev->ptr = NULL;
+                if (was_busy && cs->cur_at_seq == SEQ_NONE)
+                        check_flags = 1;
+
+                head = (head + 1) % MAX_EVENTS;
+                atomic_set(&cs->ev_head, head);
+        }
+
+        if (i == 2 * MAX_EVENTS) {
+                err("infinite loop in process_events; aborting.");
+        }
+}
+
+/* tasklet scheduled on any event received from the Gigaset device
+ * parameter:
+ *      data    ISDN controller state structure
+ */
+void gigaset_handle_event(unsigned long data)
+{
+        struct cardstate *cs = (struct cardstate *) data;
+
+        IFNULLRET(cs);
+        IFNULLRET(cs->inbuf);
+
+        /* handle incoming data on control/common channel */
+        if (atomic_read(&cs->inbuf->head) != atomic_read(&cs->inbuf->tail)) {
+                dbg(DEBUG_INTR, "processing new data");
+                cs->ops->handle_input(cs->inbuf);
+        }
+
+        process_events(cs);
+}
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
new file mode 100644
index 0000000000..729edcdb6d
--- /dev/null
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -0,0 +1,938 @@
+/* Siemens Gigaset 307x driver
+ * Common header file for all connection variants
+ *
+ * Written by Stefan Eilers <Eilers.Stefan@epost.de>
+ *        and Hansjoerg Lipp <hjlipp@web.de>
+ *
+ * Version: $Id: gigaset.h,v 1.97.4.26 2006/02/04 18:28:16 hjlipp Exp $
+ * ===========================================================================
+ */
+
+#ifndef GIGASET_H
+#define GIGASET_H
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/compiler.h>
+#include <linux/types.h>
+#include <asm/atomic.h>
+#include <linux/spinlock.h>
+#include <linux/isdnif.h>
+#include <linux/usb.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/ppp_defs.h>
+#include <linux/timer.h>
+#include <linux/interrupt.h>
+#include <linux/tty.h>
+#include <linux/tty_driver.h>
+#include <linux/list.h>
+
+#define GIG_VERSION {0,5,0,0}
+#define GIG_COMPAT  {0,4,0,0}
+
+#define MAX_REC_PARAMS 10                         /* Max. number of params in response string */
+#define MAX_RESP_SIZE 512                         /* Max. size of a response string */
+#define HW_HDR_LEN 2                              /* Header size used to store ack info */
+
+#define MAX_EVENTS 64                          /* size of event queue */
+
+#define RBUFSIZE 8192
+#define SBUFSIZE 4096                           /* sk_buff payload size */
+
+#define MAX_BUF_SIZE (SBUFSIZE - 2)             /* Max. size of a data packet from LL */
+#define TRANSBUFSIZE 768                        /* bytes per skb for transparent receive */
+
+/* compile time options */
+#define GIG_MAJOR 0
+
+#define GIG_MAYINITONDIAL
+#define GIG_RETRYCID
+#define GIG_X75
+
+#define MAX_TIMER_INDEX 1000
+#define MAX_SEQ_INDEX   1000
+
+#define GIG_TICK (HZ / 10)
+
+/* timeout values (unit: 1 sec) */
+#define INIT_TIMEOUT 1
+
+/* timeout values (unit: 0.1 sec) */
+#define RING_TIMEOUT 3          /* for additional parameters to RING */
+#define BAS_TIMEOUT 20          /* for response to Base USB ops */
+#define ATRDY_TIMEOUT 3         /* for HD_READY_SEND_ATDATA */
+
+#define BAS_RETRY 3             /* max. retries for base USB ops */
+
+#define MAXACT 3
+
+#define IFNULL(a)         if (unlikely(!(a)))
+#define IFNULLRET(a)      if (unlikely(!(a))) {err("%s==NULL at %s:%d!", #a, __FILE__, __LINE__); return; }
+#define IFNULLRETVAL(a,b) if (unlikely(!(a))) {err("%s==NULL at %s:%d!", #a, __FILE__, __LINE__); return (b); }
+#define IFNULLCONT(a)     if (unlikely(!(a))) {err("%s==NULL at %s:%d!", #a, __FILE__, __LINE__); continue; }
+#define IFNULLGOTO(a,b)   if (unlikely(!(a))) {err("%s==NULL at %s:%d!", #a, __FILE__, __LINE__); goto b; }
+
+extern int gigaset_debuglevel;  /* "needs" cast to (enum debuglevel) */
+
+/* any combination of these can be given with the 'debug=' parameter to insmod, e.g.
+ * 'insmod usb_gigaset.o debug=0x2c' will set DEBUG_OPEN, DEBUG_CMD and DEBUG_INTR. */
+enum debuglevel { /* up to 24 bits (atomic_t) */
+        DEBUG_REG         = 0x0002, /* serial port I/O register operations */
+        DEBUG_OPEN        = 0x0004, /* open/close serial port */
+        DEBUG_INTR        = 0x0008, /* interrupt processing */
+        DEBUG_INTR_DUMP   = 0x0010, /* Activating hexdump debug output on interrupt
+                                      requests, not available as run-time option */
+        DEBUG_CMD         = 0x00020, /* sent/received LL commands */
+        DEBUG_STREAM      = 0x00040, /* application data stream I/O events */
+        DEBUG_STREAM_DUMP = 0x00080, /* application data stream content */
+        DEBUG_LLDATA      = 0x00100, /* sent/received LL data */
+        DEBUG_INTR_0      = 0x00200, /* serial port output interrupt processing */
+        DEBUG_DRIVER      = 0x00400, /* driver structure */
+        DEBUG_HDLC        = 0x00800, /* M10x HDLC processing */
+        DEBUG_WRITE       = 0x01000, /* M105 data write */
+        DEBUG_TRANSCMD    = 0x02000, /*AT-COMMANDS+RESPONSES*/
+        DEBUG_MCMD        = 0x04000, /*COMMANDS THAT ARE SENT VERY OFTEN*/
+        DEBUG_INIT        = 0x08000, /* (de)allocation+initialization of data structures */
+        DEBUG_LOCK        = 0x10000, /* semaphore operations */
+        DEBUG_OUTPUT      = 0x20000, /* output to device */
+        DEBUG_ISO         = 0x40000, /* isochronous transfers */
+        DEBUG_IF          = 0x80000, /* character device operations */
+        DEBUG_USBREQ      = 0x100000, /* USB communication (except payload data) */
+        DEBUG_LOCKCMD     = 0x200000, /* AT commands and responses when MS_LOCKED */
+
+        DEBUG_ANY         = 0x3fffff, /* print message if any of the others is activated */
+};
+
+#ifdef CONFIG_GIGASET_DEBUG
+#define DEBUG_DEFAULT (DEBUG_INIT | DEBUG_TRANSCMD | DEBUG_CMD | DEBUG_USBREQ)
+//#define DEBUG_DEFAULT (DEBUG_LOCK | DEBUG_INIT | DEBUG_TRANSCMD | DEBUG_CMD | DEBUF_IF | DEBUG_DRIVER | DEBUG_OUTPUT | DEBUG_INTR)
+#else
+#define DEBUG_DEFAULT 0
+#endif
+
+/* redefine syslog macros to prepend module name instead of entire source path */
+/* The space before the comma in ", ##" is needed by gcc 2.95 */
+#undef info
+#define info(format, arg...) printk(KERN_INFO "%s: " format "\n", THIS_MODULE ? THIS_MODULE->name : "gigaset_hw" , ## arg)
+
+#undef notice
+#define notice(format, arg...) printk(KERN_NOTICE "%s: " format "\n", THIS_MODULE ? THIS_MODULE->name : "gigaset_hw" , ## arg)
+
+#undef warn
+#define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", THIS_MODULE ? THIS_MODULE->name : "gigaset_hw" , ## arg)
+
+#undef err
+#define err(format, arg...) printk(KERN_ERR "%s: " format "\n", THIS_MODULE ? THIS_MODULE->name : "gigaset_hw" , ## arg)
+
+#undef dbg
+#ifdef CONFIG_GIGASET_DEBUG
+#define dbg(level, format, arg...) do { if (unlikely(((enum debuglevel)gigaset_debuglevel) & (level))) \
+        printk(KERN_DEBUG "%s: " format "\n", THIS_MODULE ? THIS_MODULE->name : "gigaset_hw" , ## arg); } while (0)
+#else
+#define dbg(level, format, arg...) do {} while (0)
+#endif
+
+void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,
+                        size_t len, const unsigned char *buf, int from_user);
+
+/* connection state */
+#define ZSAU_NONE                       0
+#define ZSAU_DISCONNECT_IND             4
+#define ZSAU_OUTGOING_CALL_PROCEEDING   1
+#define ZSAU_PROCEEDING                 1
+#define ZSAU_CALL_DELIVERED             2
+#define ZSAU_ACTIVE                     3
+#define ZSAU_NULL                       5
+#define ZSAU_DISCONNECT_REQ             6
+#define ZSAU_UNKNOWN                    -1
+
+/* USB control transfer requests */
+#define OUT_VENDOR_REQ                  (USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT)
+#define IN_VENDOR_REQ                   (USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT)
+
+/* int-in-events 3070 */
+#define HD_B1_FLOW_CONTROL              0x80
+#define HD_B2_FLOW_CONTROL              0x81
+#define HD_RECEIVEATDATA_ACK            (0x35)          // 3070         // att: HD_RECEIVE>>AT<<DATA_ACK
+#define HD_READY_SEND_ATDATA            (0x36)          // 3070
+#define HD_OPEN_ATCHANNEL_ACK           (0x37)          // 3070
+#define HD_CLOSE_ATCHANNEL_ACK          (0x38)          // 3070
+#define HD_DEVICE_INIT_OK               (0x11)          // ISurf USB + 3070
+#define HD_OPEN_B1CHANNEL_ACK           (0x51)          // ISurf USB + 3070
+#define HD_OPEN_B2CHANNEL_ACK           (0x52)          // ISurf USB + 3070
+#define HD_CLOSE_B1CHANNEL_ACK          (0x53)          // ISurf USB + 3070
+#define HD_CLOSE_B2CHANNEL_ACK          (0x54)          // ISurf USB + 3070
+//       Powermangment
+#define HD_SUSPEND_END                  (0x61)          // ISurf USB
+//   Configuration
+#define HD_RESET_INTERRUPT_PIPE_ACK     (0xFF)          // ISurf USB + 3070
+
+/* control requests 3070 */
+#define HD_OPEN_B1CHANNEL               (0x23)          // ISurf USB + 3070
+#define HD_CLOSE_B1CHANNEL              (0x24)          // ISurf USB + 3070
+#define HD_OPEN_B2CHANNEL               (0x25)          // ISurf USB + 3070
+#define HD_CLOSE_B2CHANNEL              (0x26)          // ISurf USB + 3070
+#define HD_RESET_INTERRUPT_PIPE         (0x27)          // ISurf USB + 3070
+#define HD_DEVICE_INIT_ACK              (0x34)          // ISurf USB + 3070
+#define HD_WRITE_ATMESSAGE              (0x12)          // 3070
+#define HD_READ_ATMESSAGE               (0x13)          // 3070
+#define HD_OPEN_ATCHANNEL               (0x28)          // 3070
+#define HD_CLOSE_ATCHANNEL              (0x29)          // 3070
+
+/* USB frames for isochronous transfer */
+#define BAS_FRAMETIME   1               /* number of milliseconds between frames */
+#define BAS_NUMFRAMES   8               /* number of frames per URB */
+#define BAS_MAXFRAME    16              /* allocated bytes per frame */
+#define BAS_NORMFRAME   8               /* send size without flow control */
+#define BAS_HIGHFRAME   10              /* "    "    with positive flow control */
+#define BAS_LOWFRAME    5               /* "    "    with negative flow control */
+#define BAS_CORRFRAMES  4               /* flow control multiplicator */
+
+#define BAS_INBUFSIZE   (BAS_MAXFRAME * BAS_NUMFRAMES) /* size of isochronous input buffer per URB */
+#define BAS_OUTBUFSIZE  4096            /* size of common isochronous output buffer */
+#define BAS_OUTBUFPAD   BAS_MAXFRAME    /* size of pad area for isochronous output buffer */
+
+#define BAS_INURBS      3
+#define BAS_OUTURBS     3
+
+/* variable commands in struct bc_state */
+#define AT_ISO          0
+#define AT_DIAL         1
+#define AT_MSN          2
+#define AT_BC           3
+#define AT_PROTO        4
+#define AT_TYPE         5
+#define AT_HLC          6
+#define AT_NUM          7
+
+/* variables in struct at_state_t */
+#define VAR_ZSAU   0
+#define VAR_ZDLE   1
+#define VAR_ZVLS   2
+#define VAR_ZCTP   3
+#define VAR_NUM    4
+
+#define STR_NMBR   0
+#define STR_ZCPN   1
+#define STR_ZCON   2
+#define STR_ZBC    3
+#define STR_ZHLC   4
+#define STR_NUM    5
+
+#define EV_TIMEOUT      -105
+#define EV_IF_VER       -106
+#define EV_PROC_CIDMODE -107
+#define EV_SHUTDOWN     -108
+#define EV_START        -110
+#define EV_STOP         -111
+#define EV_IF_LOCK      -112
+#define EV_PROTO_L2     -113
+#define EV_ACCEPT       -114
+#define EV_DIAL         -115
+#define EV_HUP          -116
+#define EV_BC_OPEN      -117
+#define EV_BC_CLOSED    -118
+
+/* input state */
+#define INS_command     0x0001
+#define INS_DLE_char    0x0002
+#define INS_byte_stuff  0x0004
+#define INS_have_data   0x0008
+#define INS_skip_frame  0x0010
+#define INS_DLE_command 0x0020
+#define INS_flag_hunt   0x0040
+
+/* channel state */
+#define CHS_D_UP        0x01
+#define CHS_B_UP        0x02
+#define CHS_NOTIFY_LL   0x04
+
+#define ICALL_REJECT  0
+#define ICALL_ACCEPT  1
+#define ICALL_IGNORE  2
+
+/* device state */
+#define MS_UNINITIALIZED        0
+#define MS_INIT                 1
+#define MS_LOCKED               2
+#define MS_SHUTDOWN             3
+#define MS_RECOVER              4
+#define MS_READY                5
+
+/* mode */
+#define M_UNKNOWN       0
+#define M_CONFIG        1
+#define M_UNIMODEM      2
+#define M_CID           3
+
+/* start mode */
+#define SM_LOCKED       0
+#define SM_ISDN         1 /* default */
+
+struct gigaset_ops;
+struct gigaset_driver;
+
+struct usb_cardstate;
+struct ser_cardstate;
+struct bas_cardstate;
+
+struct bc_state;
+struct usb_bc_state;
+struct ser_bc_state;
+struct bas_bc_state;
+
+struct reply_t {
+        int     resp_code;      /* RSP_XXXX */
+        int     min_ConState;   /* <0 => ignore */
+        int     max_ConState;   /* <0 => ignore */
+        int     parameter;      /* e.g. ZSAU_XXXX <0: ignore*/
+        int     new_ConState;   /* <0 => ignore */
+        int     timeout;        /* >0 => *HZ; <=0 => TOUT_XXXX*/
+        int     action[MAXACT]; /* ACT_XXXX */
+        char *command;        /* NULL==none */
+};
+
+extern struct reply_t gigaset_tab_cid_m10x[];
+extern struct reply_t gigaset_tab_nocid_m10x[];
+
+struct inbuf_t {
+        unsigned char           *rcvbuf;                /* usb-gigaset receive buffer */
+        struct bc_state         *bcs;
+        struct cardstate *cs;
+        int inputstate;
+
+        atomic_t head, tail;
+        unsigned char data[RBUFSIZE];
+};
+
+/* isochronous write buffer structure
+ * circular buffer with pad area for extraction of complete USB frames
+ * - data[read..nextread-1] is valid data already submitted to the USB subsystem
+ * - data[nextread..write-1] is valid data yet to be sent
+ * - data[write] is the next byte to write to
+ *   - in byte-oriented L2 procotols, it is completely free
+ *   - in bit-oriented L2 procotols, it may contain a partial byte of valid data
+ * - data[write+1..read-1] is free
+ * - wbits is the number of valid data bits in data[write], starting at the LSB
+ * - writesem is the semaphore for writing to the buffer:
+ *   if writesem <= 0, data[write..read-1] is currently being written to
+ * - idle contains the byte value to repeat when the end of valid data is
+ *   reached; if nextread==write (buffer contains no data to send), either the
+ *   BAS_OUTBUFPAD bytes immediately before data[write] (if write>=BAS_OUTBUFPAD)
+ *   or those of the pad area (if write<BAS_OUTBUFPAD) are also filled with that
+ *   value
+ * - optionally, the following statistics on the buffer's usage can be collected:
+ *   maxfill: maximum number of bytes occupied
+ *   idlefills: number of times a frame of idle bytes is prepared
+ *   emptygets: number of times the buffer was empty when a data frame was requested
+ *   backtoback: number of times two data packets were entered into the buffer
+ *    without intervening idle flags
+ *   nakedback: set if no idle flags have been inserted since the last data packet
+ */
+struct isowbuf_t {
+        atomic_t        read;
+        atomic_t        nextread;
+        atomic_t        write;
+        atomic_t        writesem;
+        int             wbits;
+        unsigned char   data[BAS_OUTBUFSIZE + BAS_OUTBUFPAD];
+        unsigned char   idle;
+};
+
+/* isochronous write URB context structure
+ * data to be stored along with the URB and retrieved when it is returned
+ * as completed by the USB subsystem
+ * - urb: pointer to the URB itself
+ * - bcs: pointer to the B Channel control structure
+ * - limit: end of write buffer area covered by this URB
+ */
+struct isow_urbctx_t {
+        struct urb *urb;
+        struct bc_state *bcs;
+        int limit;
+};
+
+/* AT state structure
+ * data associated with the state of an ISDN connection, whether or not
+ * it is currently assigned a B channel
+ */
+struct at_state_t {
+        struct list_head        list;
+        int                     waiting;
+        int                     getstring;
+        atomic_t                timer_index;
+        unsigned long           timer_expires;
+        int                     timer_active;
+        unsigned int            ConState;                           /* State of connection */
+        struct reply_t          *replystruct;
+        int                     cid;
+        int                     int_var[VAR_NUM];   /* see VAR_XXXX */
+        char                    *str_var[STR_NUM];  /* see STR_XXXX */
+        unsigned                pending_commands;   /* see PC_XXXX */
+        atomic_t                seq_index;
+
+        struct cardstate    *cs;
+        struct bc_state         *bcs;
+};
+
+struct resp_type_t {
+        unsigned char   *response;
+        int             resp_code;           /* RSP_XXXX */
+        int             type;                /* RT_XXXX */
+};
+
+struct prot_skb {
+        atomic_t                empty;
+        struct semaphore        *sem;
+        struct sk_buff          *skb;
+};
+
+struct event_t {
+        int type;
+        void *ptr, *arg;
+        int parameter;
+        int cid;
+        struct at_state_t *at_state;
+};
+
+/* This buffer holds all information about the used B-Channel */
+struct bc_state {
+        struct sk_buff *tx_skb;                        /* Current transfer buffer to modem */
+        struct sk_buff_head squeue;                    /* B-Channel send Queue */
+
+        /* Variables for debugging .. */
+        int corrupted;                                   /* Counter for corrupted packages */
+        int trans_down;                                  /* Counter of packages (downstream) */
+        int trans_up;                                    /* Counter of packages (upstream) */
+
+        struct at_state_t at_state;
+        unsigned long rcvbytes;
+
+        __u16 fcs;
+        struct sk_buff *skb;
+        int inputstate; /* see INS_XXXX */
+
+        int channel;
+
+        struct cardstate *cs;
+
+        unsigned chstate;                       /* bitmap (CHS_*) */
+        int ignore;
+        unsigned        proto2;                 /* Layer 2 protocol (ISDN_PROTO_L2_*) */
+        char            *commands[AT_NUM]; /* see AT_XXXX */
+
+#ifdef CONFIG_GIGASET_DEBUG
+        int emptycount;
+#endif
+        int busy;
+        int use_count;
+
+        /* hardware drivers */
+        union {
+                struct ser_bc_state *ser;                /* private data of serial hardware driver */
+                struct usb_bc_state *usb;                /* private data of usb hardware driver */
+                struct bas_bc_state *bas;
+        } hw;
+};
+
+struct cardstate {
+        struct gigaset_driver *driver;
+        unsigned minor_index;
+
+        const struct gigaset_ops *ops;
+
+        /* Stuff to handle communication */
+        //wait_queue_head_t initwait;
+        wait_queue_head_t waitqueue;
+        int waiting;
+        atomic_t mode;                       /* see M_XXXX */
+        atomic_t mstate;                     /* Modem state: see MS_XXXX */
+                                             /* only changed by the event layer */
+        int cmd_result;
+
+        int channels;
+        struct bc_state *bcs;                /* Array of struct bc_state */
+
+        int onechannel;                      /* data and commands transmitted in one stream (M10x) */
+
+        spinlock_t lock;
+        struct at_state_t at_state;          /* at_state_t for cid == 0 */
+        struct list_head temp_at_states;     /* list of temporary "struct at_state_t"s without B channel */
+
+        struct inbuf_t *inbuf;
+
+        struct cmdbuf_t *cmdbuf, *lastcmdbuf;
+        spinlock_t cmdlock;
+        unsigned curlen, cmdbytes;
+
+        unsigned open_count;
+        struct tty_struct *tty;
+        struct tasklet_struct if_wake_tasklet;
+        unsigned control_state;
+
+        unsigned fwver[4];
+        int gotfwver;
+
+        atomic_t running;                    /* !=0 if events are handled */
+        atomic_t connected;                  /* !=0 if hardware is connected */
+
+        atomic_t cidmode;
+
+        int myid;                            /* id for communication with LL */
+        isdn_if iif;
+
+        struct reply_t *tabnocid;
+        struct reply_t *tabcid;
+        int cs_init;
+        int ignoreframes;                    /* frames to ignore after setting up the B channel */
+        struct semaphore sem;                /* locks this structure: */
+                                             /*   connected is not changed, */
+                                             /*   hardware_up is not changed, */
+                                             /*   MState is not changed to or from MS_LOCKED */
+
+        struct timer_list timer;
+        int retry_count;
+        int dle;                             /* !=0 if modem commands/responses are dle encoded */
+        int cur_at_seq;                      /* sequence of AT commands being processed */
+        int curchannel;                      /* channel, those commands are meant for */
+        atomic_t commands_pending;           /* flag(s) in xxx.commands_pending have been set */
+        struct tasklet_struct event_tasklet; /* tasklet for serializing AT commands. Scheduled
+                                              *   -> for modem reponses (and incomming data for M10x)
+                                              *   -> on timeout
+                                              *   -> after setting bits in xxx.at_state.pending_command
+                                              *      (e.g. command from LL) */
+        struct tasklet_struct write_tasklet; /* tasklet for serial output
+                                              * (not used in base driver) */
+
+        /* event queue */
+        struct event_t events[MAX_EVENTS];
+        atomic_t ev_tail, ev_head;
+        spinlock_t ev_lock;
+
+        /* current modem response */
+        unsigned char respdata[MAX_RESP_SIZE];
+        unsigned cbytes;
+
+        /* hardware drivers */
+        union {
+                struct usb_cardstate *usb; /* private data of USB hardware driver */
+                struct ser_cardstate *ser; /* private data of serial hardware driver */
+                struct bas_cardstate *bas; /* private data of base hardware driver */
+        } hw;
+};
+
+struct gigaset_driver {
+        struct list_head list;
+        spinlock_t lock;                       /* locks minor tables and blocked */
+        //struct semaphore sem;                /* locks this structure */
+        struct tty_driver *tty;
+        unsigned have_tty;
+        unsigned minor;
+        unsigned minors;
+        struct cardstate *cs;
+        unsigned *flags;
+        int blocked;
+
+        const struct gigaset_ops *ops;
+        struct module *owner;
+};
+
+struct cmdbuf_t {
+        struct cmdbuf_t *next, *prev;
+        int len, offset;
+        struct tasklet_struct *wake_tasklet;
+        unsigned char buf[0];
+};
+
+struct bas_bc_state {
+        /* isochronous output state */
+        atomic_t        running;
+        atomic_t        corrbytes;
+        spinlock_t      isooutlock;
+        struct isow_urbctx_t    isoouturbs[BAS_OUTURBS];
+        struct isow_urbctx_t    *isooutdone, *isooutfree, *isooutovfl;
+        struct isowbuf_t        *isooutbuf;
+        unsigned numsub;                        /* submitted URB counter (for diagnostic messages only) */
+        struct tasklet_struct   sent_tasklet;
+
+        /* isochronous input state */
+        spinlock_t isoinlock;
+        struct urb *isoinurbs[BAS_INURBS];
+        unsigned char isoinbuf[BAS_INBUFSIZE * BAS_INURBS];
+        struct urb *isoindone;                  /* completed isoc read URB */
+        int loststatus;                         /* status of dropped URB */
+        unsigned isoinlost;                     /* number of bytes lost */
+        /* state of bit unstuffing algorithm (in addition to BC_state.inputstate) */
+        unsigned seqlen;                        /* number of '1' bits not yet unstuffed */
+        unsigned inbyte, inbits;                /* collected bits for next byte */
+        /* statistics */
+        unsigned goodbytes;                     /* bytes correctly received */
+        unsigned alignerrs;                     /* frames with incomplete byte at end */
+        unsigned fcserrs;                       /* FCS errors */
+        unsigned frameerrs;                     /* framing errors */
+        unsigned giants;                        /* long frames */
+        unsigned runts;                         /* short frames */
+        unsigned aborts;                        /* HDLC aborts */
+        unsigned shared0s;                      /* '0' bits shared between flags */
+        unsigned stolen0s;                      /* '0' stuff bits also serving as leading flag bits */
+        struct tasklet_struct rcvd_tasklet;
+};
+
+struct gigaset_ops {
+        /* Called from ev-layer.c/interface.c for sending AT commands to the device */
+        int (*write_cmd)(struct cardstate *cs,
+                         const unsigned char *buf, int len,
+                         struct tasklet_struct *wake_tasklet);
+
+        /* Called from interface.c for additional device control */
+        int (*write_room)(struct cardstate *cs);
+        int (*chars_in_buffer)(struct cardstate *cs);
+        int (*brkchars)(struct cardstate *cs, const unsigned char buf[6]);
+
+        /* Called from ev-layer.c after setting up connection
+         * Should call gigaset_bchannel_up(), when finished. */
+        int (*init_bchannel)(struct bc_state *bcs);
+
+        /* Called from ev-layer.c after hanging up
+         * Should call gigaset_bchannel_down(), when finished. */
+        int (*close_bchannel)(struct bc_state *bcs);
+
+        /* Called by gigaset_initcs() for setting up bcs->hw.xxx */
+        int (*initbcshw)(struct bc_state *bcs);
+
+        /* Called by gigaset_freecs() for freeing bcs->hw.xxx */
+        int (*freebcshw)(struct bc_state *bcs);
+
+        /* Called by gigaset_stop() or gigaset_bchannel_down() for resetting bcs->hw.xxx */
+        void (*reinitbcshw)(struct bc_state *bcs);
+
+        /* Called by gigaset_initcs() for setting up cs->hw.xxx */
+        int (*initcshw)(struct cardstate *cs);
+
+        /* Called by gigaset_freecs() for freeing cs->hw.xxx */
+        void (*freecshw)(struct cardstate *cs);
+
+        ///* Called by gigaset_stop() for killing URBs, shutting down the device, ...
+        //   hardwareup: ==0: don't try to shut down the device, hardware is really not accessible
+        //             !=0: hardware still up */
+        //void (*stophw)(struct cardstate *cs, int hardwareup);
+
+        /* Called from common.c/interface.c for additional serial port control */
+        int (*set_modem_ctrl)(struct cardstate *cs, unsigned old_state, unsigned new_state);
+        int (*baud_rate)(struct cardstate *cs, unsigned cflag);
+        int (*set_line_ctrl)(struct cardstate *cs, unsigned cflag);
+
+        /* Called from i4l.c to put an skb into the send-queue. */
+        int (*send_skb)(struct bc_state *bcs, struct sk_buff *skb);
+
+        /* Called from ev-layer.c to process a block of data
+         * received through the common/control channel. */
+        void (*handle_input)(struct inbuf_t *inbuf);
+
+};
+
+/* = Common structures and definitions ======================================= */
+
+/* Parser states for DLE-Event:
+ * <DLE-EVENT>: <DLE_FLAG> "X" <EVENT> <DLE_FLAG> "."
+ * <DLE_FLAG>:  0x10
+ * <EVENT>:     ((a-z)* | (A-Z)* | (0-10)*)+
+ */
+#define DLE_FLAG       0x10
+
+/* ===========================================================================
+ *  Functions implemented in asyncdata.c
+ */
+
+/* Called from i4l.c to put an skb into the send-queue.
+ * After sending gigaset_skb_sent() should be called. */
+int gigaset_m10x_send_skb(struct bc_state *bcs, struct sk_buff *skb);
+
+/* Called from ev-layer.c to process a block of data
+ * received through the common/control channel. */
+void gigaset_m10x_input(struct inbuf_t *inbuf);
+
+/* ===========================================================================
+ *  Functions implemented in isocdata.c
+ */
+
+/* Called from i4l.c to put an skb into the send-queue.
+ * After sending gigaset_skb_sent() should be called. */
+int gigaset_isoc_send_skb(struct bc_state *bcs, struct sk_buff *skb);
+
+/* Called from ev-layer.c to process a block of data
+ * received through the common/control channel. */
+void gigaset_isoc_input(struct inbuf_t *inbuf);
+
+/* Called from bas-gigaset.c to process a block of data
+ * received through the isochronous channel */
+void gigaset_isoc_receive(unsigned char *src, unsigned count, struct bc_state *bcs);
+
+/* Called from bas-gigaset.c to put a block of data
+ * into the isochronous output buffer */
+int gigaset_isoc_buildframe(struct bc_state *bcs, unsigned char *in, int len);
+
+/* Called from bas-gigaset.c to initialize the isochronous output buffer */
+void gigaset_isowbuf_init(struct isowbuf_t *iwb, unsigned char idle);
+
+/* Called from bas-gigaset.c to retrieve a block of bytes for sending */
+int gigaset_isowbuf_getbytes(struct isowbuf_t *iwb, int size);
+
+/* ===========================================================================
+ *  Functions implemented in i4l.c/gigaset.h
+ */
+
+/* Called by gigaset_initcs() for setting up with the isdn4linux subsystem */
+int gigaset_register_to_LL(struct cardstate *cs, const char *isdnid);
+
+/* Called from xxx-gigaset.c to indicate completion of sending an skb */
+void gigaset_skb_sent(struct bc_state *bcs, struct sk_buff *skb);
+
+/* Called from common.c/ev-layer.c to indicate events relevant to the LL */
+int gigaset_isdn_icall(struct at_state_t *at_state);
+int gigaset_isdn_setup_accept(struct at_state_t *at_state);
+int gigaset_isdn_setup_dial(struct at_state_t *at_state, void *data);
+
+void gigaset_i4l_cmd(struct cardstate *cs, int cmd);
+void gigaset_i4l_channel_cmd(struct bc_state *bcs, int cmd);
+
+
+static inline void gigaset_isdn_rcv_err(struct bc_state *bcs)
+{
+        isdn_ctrl response;
+
+        /* error -> LL */
+        dbg(DEBUG_CMD, "sending L1ERR");
+        response.driver = bcs->cs->myid;
+        response.command = ISDN_STAT_L1ERR;
+        response.arg = bcs->channel;
+        response.parm.errcode = ISDN_STAT_L1ERR_RECV;
+        bcs->cs->iif.statcallb(&response);
+}
+
+/* ===========================================================================
+ *  Functions implemented in ev-layer.c
+ */
+
+/* tasklet called from common.c to process queued events */
+void gigaset_handle_event(unsigned long data);
+
+/* called from isocdata.c / asyncdata.c
+ * when a complete modem response line has been received */
+void gigaset_handle_modem_response(struct cardstate *cs);
+
+/* ===========================================================================
+ *  Functions implemented in proc.c
+ */
+
+/* initialize sysfs for device */
+void gigaset_init_dev_sysfs(struct usb_interface *interface);
+void gigaset_free_dev_sysfs(struct usb_interface *interface);
+
+/* ===========================================================================
+ *  Functions implemented in common.c/gigaset.h
+ */
+
+void gigaset_bcs_reinit(struct bc_state *bcs);
+void gigaset_at_init(struct at_state_t *at_state, struct bc_state *bcs,
+                     struct cardstate *cs, int cid);
+int gigaset_get_channel(struct bc_state *bcs);
+void gigaset_free_channel(struct bc_state *bcs);
+int gigaset_get_channels(struct cardstate *cs);
+void gigaset_free_channels(struct cardstate *cs);
+void gigaset_block_channels(struct cardstate *cs);
+
+/* Allocate and initialize driver structure. */
+struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,
+                                          const char *procname,
+                                          const char *devname,
+                                          const char *devfsname,
+                                          const struct gigaset_ops *ops,
+                                          struct module *owner);
+
+/* Deallocate driver structure. */
+void gigaset_freedriver(struct gigaset_driver *drv);
+void gigaset_debugdrivers(void);
+struct cardstate *gigaset_get_cs_by_minor(unsigned minor);
+struct cardstate *gigaset_get_cs_by_tty(struct tty_struct *tty);
+struct cardstate *gigaset_get_cs_by_id(int id);
+
+/* For drivers without fixed assignment device<->cardstate (usb) */
+struct cardstate *gigaset_getunassignedcs(struct gigaset_driver *drv);
+void gigaset_unassign(struct cardstate *cs);
+void gigaset_blockdriver(struct gigaset_driver *drv);
+
+/* Allocate and initialize card state. Calls hardware dependent gigaset_init[b]cs(). */
+struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
+                                 int onechannel, int ignoreframes,
+                                 int cidmode, const char *modulename);
+
+/* Free card state. Calls hardware dependent gigaset_free[b]cs(). */
+void gigaset_freecs(struct cardstate *cs);
+
+/* Tell common.c that hardware and driver are ready. */
+int gigaset_start(struct cardstate *cs);
+
+/* Tell common.c that the device is not present any more. */
+void gigaset_stop(struct cardstate *cs);
+
+/* Tell common.c that the driver is being unloaded. */
+void gigaset_shutdown(struct cardstate *cs);
+
+/* Tell common.c that an skb has been sent. */
+void gigaset_skb_sent(struct bc_state *bcs, struct sk_buff *skb);
+
+/* Append event to the queue.
+ * Returns NULL on failure or a pointer to the event on success.
+ * ptr must be kmalloc()ed (and not be freed by the caller).
+ */
+struct event_t *gigaset_add_event(struct cardstate *cs,
+                                  struct at_state_t *at_state, int type,
+                                  void *ptr, int parameter, void *arg);
+
+/* Called on CONFIG1 command from frontend. */
+int gigaset_enterconfigmode(struct cardstate *cs); //0: success <0: errorcode
+
+/* cs->lock must not be locked */
+static inline void gigaset_schedule_event(struct cardstate *cs)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&cs->lock, flags);
+        if (atomic_read(&cs->running))
+                tasklet_schedule(&cs->event_tasklet);
+        spin_unlock_irqrestore(&cs->lock, flags);
+}
+
+/* Tell common.c that B channel has been closed. */
+/* cs->lock must not be locked */
+static inline void gigaset_bchannel_down(struct bc_state *bcs)
+{
+        gigaset_add_event(bcs->cs, &bcs->at_state, EV_BC_CLOSED, NULL, 0, NULL);
+
+        dbg(DEBUG_CMD, "scheduling BC_CLOSED");
+        gigaset_schedule_event(bcs->cs);
+}
+
+/* Tell common.c that B channel has been opened. */
+/* cs->lock must not be locked */
+static inline void gigaset_bchannel_up(struct bc_state *bcs)
+{
+        gigaset_add_event(bcs->cs, &bcs->at_state, EV_BC_OPEN, NULL, 0, NULL);
+
+        dbg(DEBUG_CMD, "scheduling BC_OPEN");
+        gigaset_schedule_event(bcs->cs);
+}
+
+/* handling routines for sk_buff */
+/* ============================= */
+
+/* private version of __skb_put()
+ * append 'len' bytes to the content of 'skb', already knowing that the
+ * existing buffer can accomodate them
+ * returns a pointer to the location where the new bytes should be copied to
+ * This function does not take any locks so it must be called with the
+ * appropriate locks held only.
+ */
+static inline unsigned char *gigaset_skb_put_quick(struct sk_buff *skb,
+                                                   unsigned int len)
+{
+        unsigned char *tmp = skb->tail;
+        /*SKB_LINEAR_ASSERT(skb);*/             /* not needed here */
+        skb->tail += len;
+        skb->len += len;
+        return tmp;
+}
+
+/* pass received skb to LL
+ * Warning: skb must not be accessed anymore!
+ */
+static inline void gigaset_rcv_skb(struct sk_buff *skb,
+                                   struct cardstate *cs,
+                                   struct bc_state *bcs)
+{
+        cs->iif.rcvcallb_skb(cs->myid, bcs->channel, skb);
+        bcs->trans_down++;
+}
+
+/* handle reception of corrupted skb
+ * Warning: skb must not be accessed anymore!
+ */
+static inline void gigaset_rcv_error(struct sk_buff *procskb,
+                                     struct cardstate *cs,
+                                     struct bc_state *bcs)
+{
+        if (procskb)
+                dev_kfree_skb(procskb);
+
+        if (bcs->ignore)
+                --bcs->ignore;
+        else {
+                ++bcs->corrupted;
+                gigaset_isdn_rcv_err(bcs);
+        }
+}
+
+
+/* bitwise byte inversion table */
+extern __u8 gigaset_invtab[];   /* in common.c */
+
+
+/* append received bytes to inbuf */
+static inline int gigaset_fill_inbuf(struct inbuf_t *inbuf,
+                                     const unsigned char *src,
+                                     unsigned numbytes)
+{
+        unsigned n, head, tail, bytesleft;
+
+        dbg(DEBUG_INTR, "received %u bytes", numbytes);
+
+        if (!numbytes)
+                return 0;
+
+        bytesleft = numbytes;
+        tail = atomic_read(&inbuf->tail);
+        head = atomic_read(&inbuf->head);
+        dbg(DEBUG_INTR, "buffer state: %u -> %u", head, tail);
+
+        while (bytesleft) {
+                if (head > tail)
+                        n = head - 1 - tail;
+                else if (head == 0)
+                        n = (RBUFSIZE-1) - tail;
+                else
+                        n = RBUFSIZE - tail;
+                if (!n) {
+                        err("buffer overflow (%u bytes lost)", bytesleft);
+                        break;
+                }
+                if (n > bytesleft)
+                        n = bytesleft;
+                memcpy(inbuf->data + tail, src, n);
+                bytesleft -= n;
+                tail = (tail + n) % RBUFSIZE;
+                src += n;
+        }
+        dbg(DEBUG_INTR, "setting tail to %u", tail);
+        atomic_set(&inbuf->tail, tail);
+        return numbytes != bytesleft;
+}
+
+/* ===========================================================================
+ *  Functions implemented in interface.c
+ */
+
+/* initialize interface */
+void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
+                           const char *devname, const char *devfsname);
+/* release interface */
+void gigaset_if_freedriver(struct gigaset_driver *drv);
+/* add minor */
+void gigaset_if_init(struct cardstate *cs);
+/* remove minor */
+void gigaset_if_free(struct cardstate *cs);
+/* device received data */
+void gigaset_if_receive(struct cardstate *cs,
+                        unsigned char *buffer, size_t len);
+
+#endif
diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c
new file mode 100644
index 0000000000..731a675f21
--- /dev/null
+++ b/drivers/isdn/gigaset/i4l.c
@@ -0,0 +1,567 @@
+/*
+ * Stuff used by all variants of the driver
+ *
+ * Copyright (c) 2001 by Stefan Eilers (Eilers.Stefan@epost.de),
+ *                       Hansjoerg Lipp (hjlipp@web.de),
+ *                       Tilman Schmidt (tilman@imap.cc).
+ *
+ * =====================================================================
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License as
+ *      published by the Free Software Foundation; either version 2 of
+ *      the License, or (at your option) any later version.
+ * =====================================================================
+ * ToDo: ...
+ * =====================================================================
+ * Version: $Id: i4l.c,v 1.3.2.9 2006/02/04 18:28:16 hjlipp Exp $
+ * =====================================================================
+ */
+
+#include "gigaset.h"
+
+/* == Handling of I4L IO ============================================================================*/
+
+/* writebuf_from_LL
+ * called by LL to transmit data on an open channel
+ * inserts the buffer data into the send queue and starts the transmission
+ * Note that this operation must not sleep!
+ * When the buffer is processed completely, gigaset_skb_sent() should be called.
+ * parameters:
+ *      driverID        driver ID as assigned by LL
+ *      channel         channel number
+ *      ack             if != 0 LL wants to be notified on completion via statcallb(ISDN_STAT_BSENT)
+ *      skb             skb containing data to send
+ * return value:
+ *      number of accepted bytes
+ *      0 if temporarily unable to accept data (out of buffer space)
+ *      <0 on error (eg. -EINVAL)
+ */
+static int writebuf_from_LL(int driverID, int channel, int ack, struct sk_buff *skb)
+{
+        struct cardstate *cs;
+        struct bc_state *bcs;
+        unsigned len;
+        unsigned skblen;
+
+        if (!(cs = gigaset_get_cs_by_id(driverID))) {
+                err("%s: invalid driver ID (%d)", __func__, driverID);
+                return -ENODEV;
+        }
+        if (channel < 0 || channel >= cs->channels) {
+                err("%s: invalid channel ID (%d)", __func__, channel);
+                return -ENODEV;
+        }
+        bcs = &cs->bcs[channel];
+        len = skb->len;
+
+        dbg(DEBUG_LLDATA,
+            "Receiving data from LL (id: %d, channel: %d, ack: %d, size: %d)",
+            driverID, channel, ack, len);
+
+        if (!len) {
+                if (ack)
+                        warn("not ACKing empty packet from LL");
+                return 0;
+        }
+        if (len > MAX_BUF_SIZE) {
+                err("%s: packet too large (%d bytes)", __func__, channel);
+                return -EINVAL;
+        }
+
+        if (!atomic_read(&cs->connected))
+                return -ENODEV;
+
+        skblen = ack ? len : 0;
+        skb->head[0] = skblen & 0xff;
+        skb->head[1] = skblen >> 8;
+        dbg(DEBUG_MCMD, "skb: len=%u, skblen=%u: %02x %02x", len, skblen,
+             (unsigned) skb->head[0], (unsigned) skb->head[1]);
+
+        /* pass to device-specific module */
+        return cs->ops->send_skb(bcs, skb);
+}
+
+void gigaset_skb_sent(struct bc_state *bcs, struct sk_buff *skb)
+{
+        unsigned len;
+        isdn_ctrl response;
+
+        ++bcs->trans_up;
+
+        if (skb->len)
+                warn("%s: skb->len==%d", __func__, skb->len);
+
+        len = (unsigned char) skb->head[0] |
+              (unsigned) (unsigned char) skb->head[1] << 8;
+        if (len) {
+                dbg(DEBUG_MCMD,
+                    "Acknowledge sending to LL (id: %d, channel: %d size: %u)",
+                    bcs->cs->myid, bcs->channel, len);
+
+                response.driver = bcs->cs->myid;
+                response.command = ISDN_STAT_BSENT;
+                response.arg = bcs->channel;
+                response.parm.length = len;
+                bcs->cs->iif.statcallb(&response);
+        }
+}
+EXPORT_SYMBOL_GPL(gigaset_skb_sent);
+
+/* This function will be called by LL to send commands
+ * NOTE: LL ignores the returned value, for commands other than ISDN_CMD_IOCTL,
+ * so don't put too much effort into it.
+ */
+static int command_from_LL(isdn_ctrl *cntrl)
+{
+        struct cardstate *cs = gigaset_get_cs_by_id(cntrl->driver);
+        //isdn_ctrl response;
+        //unsigned long flags;
+        struct bc_state *bcs;
+        int retval = 0;
+        struct setup_parm *sp;
+
+        //dbg(DEBUG_ANY, "Gigaset_HW: Receiving command");
+        gigaset_debugdrivers();
+
+        /* Terminate this call if no device is present. Bt if the command is "ISDN_CMD_LOCK" or
+         * "ISDN_CMD_UNLOCK" then execute it due to the fact that they are device independent !
+         */
+        //FIXME "remove test for &connected"
+        if ((!cs || !atomic_read(&cs->connected))) {
+                warn("LL tried to access unknown device with nr. %d",
+                     cntrl->driver);
+                return -ENODEV;
+        }
+
+        switch (cntrl->command) {
+        case ISDN_CMD_IOCTL:
+
+                dbg(DEBUG_ANY, "ISDN_CMD_IOCTL (driver:%d,arg: %ld)",
+                    cntrl->driver, cntrl->arg);
+
+                warn("ISDN_CMD_IOCTL is not supported.");
+                return -EINVAL;
+
+        case ISDN_CMD_DIAL:
+                dbg(DEBUG_ANY, "ISDN_CMD_DIAL (driver: %d, channel: %ld, "
+                    "phone: %s,ownmsn: %s, si1: %d, si2: %d)",
+                    cntrl->driver, cntrl->arg,
+                    cntrl->parm.setup.phone, cntrl->parm.setup.eazmsn,
+                    cntrl->parm.setup.si1, cntrl->parm.setup.si2);
+
+                if (cntrl->arg >= cs->channels) {
+                        err("invalid channel (%d)", (int) cntrl->arg);
+                        return -EINVAL;
+                }
+
+                bcs = cs->bcs + cntrl->arg;
+
+                if (!gigaset_get_channel(bcs)) {
+                        err("channel not free");
+                        return -EBUSY;
+                }
+
+                sp = kmalloc(sizeof *sp, GFP_ATOMIC);
+                if (!sp) {
+                        gigaset_free_channel(bcs);
+                        err("ISDN_CMD_DIAL: out of memory");
+                        return -ENOMEM;
+                }
+                *sp = cntrl->parm.setup;
+
+                if (!gigaset_add_event(cs, &bcs->at_state, EV_DIAL, sp,
+                                       atomic_read(&bcs->at_state.seq_index),
+                                       NULL)) {
+                        //FIXME what should we do?
+                        kfree(sp);
+                        gigaset_free_channel(bcs);
+                        return -ENOMEM;
+                }
+
+                dbg(DEBUG_CMD, "scheduling DIAL");
+                gigaset_schedule_event(cs);
+                break;
+        case ISDN_CMD_ACCEPTD: //FIXME
+                dbg(DEBUG_ANY, "ISDN_CMD_ACCEPTD");
+
+                if (cntrl->arg >= cs->channels) {
+                        err("invalid channel (%d)", (int) cntrl->arg);
+                        return -EINVAL;
+                }
+
+                if (!gigaset_add_event(cs, &cs->bcs[cntrl->arg].at_state,
+                                       EV_ACCEPT, NULL, 0, NULL)) {
+                        //FIXME what should we do?
+                        return -ENOMEM;
+                }
+
+                dbg(DEBUG_CMD, "scheduling ACCEPT");
+                gigaset_schedule_event(cs);
+
+                break;
+        case ISDN_CMD_ACCEPTB:
+                dbg(DEBUG_ANY, "ISDN_CMD_ACCEPTB");
+                break;
+        case ISDN_CMD_HANGUP:
+                dbg(DEBUG_ANY,
+                    "ISDN_CMD_HANGUP (channel: %d)", (int) cntrl->arg);
+
+                if (cntrl->arg >= cs->channels) {
+                        err("ISDN_CMD_HANGUP: invalid channel (%u)",
+                            (unsigned) cntrl->arg);
+                        return -EINVAL;
+                }
+
+                if (!gigaset_add_event(cs, &cs->bcs[cntrl->arg].at_state,
+                                       EV_HUP, NULL, 0, NULL)) {
+                        //FIXME what should we do?
+                        return -ENOMEM;
+                }
+
+                dbg(DEBUG_CMD, "scheduling HUP");
+                gigaset_schedule_event(cs);
+
+                break;
+        case ISDN_CMD_CLREAZ:               /* Do not signal incoming signals */ //FIXME
+                dbg(DEBUG_ANY, "ISDN_CMD_CLREAZ");
+                break;
+        case ISDN_CMD_SETEAZ:               /* Signal incoming calls for given MSN */ //FIXME
+                dbg(DEBUG_ANY,
+                    "ISDN_CMD_SETEAZ (id:%d, channel: %ld, number: %s)",
+                    cntrl->driver, cntrl->arg, cntrl->parm.num);
+                break;
+        case ISDN_CMD_SETL2:                /* Set L2 to given protocol */
+                dbg(DEBUG_ANY, "ISDN_CMD_SETL2 (Channel: %ld, Proto: %lx)",
+                     cntrl->arg & 0xff, (cntrl->arg >> 8));
+
+                if ((cntrl->arg & 0xff) >= cs->channels) {
+                        err("invalid channel (%u)",
+                            (unsigned) cntrl->arg & 0xff);
+                        return -EINVAL;
+                }
+
+                if (!gigaset_add_event(cs, &cs->bcs[cntrl->arg & 0xff].at_state,
+                                       EV_PROTO_L2, NULL, cntrl->arg >> 8,
+                                       NULL)) {
+                        //FIXME what should we do?
+                        return -ENOMEM;
+                }
+
+                dbg(DEBUG_CMD, "scheduling PROTO_L2");
+                gigaset_schedule_event(cs);
+                break;
+        case ISDN_CMD_SETL3:              /* Set L3 to given protocol */
+                dbg(DEBUG_ANY, "ISDN_CMD_SETL3 (Channel: %ld, Proto: %lx)",
+                     cntrl->arg & 0xff, (cntrl->arg >> 8));
+
+                if ((cntrl->arg & 0xff) >= cs->channels) {
+                        err("invalid channel (%u)",
+                            (unsigned) cntrl->arg & 0xff);
+                        return -EINVAL;
+                }
+
+                if (cntrl->arg >> 8 != ISDN_PROTO_L3_TRANS) {
+                        err("invalid protocol %lu", cntrl->arg >> 8);
+                        return -EINVAL;
+                }
+
+                break;
+        case ISDN_CMD_PROCEED:
+                dbg(DEBUG_ANY, "ISDN_CMD_PROCEED"); //FIXME
+                break;
+        case ISDN_CMD_ALERT:
+                dbg(DEBUG_ANY, "ISDN_CMD_ALERT"); //FIXME
+                if (cntrl->arg >= cs->channels) {
+                        err("invalid channel (%d)", (int) cntrl->arg);
+                        return -EINVAL;
+                }
+                //bcs = cs->bcs + cntrl->arg;
+                //bcs->proto2 = -1;
+                // FIXME
+                break;
+        case ISDN_CMD_REDIR:
+                dbg(DEBUG_ANY, "ISDN_CMD_REDIR"); //FIXME
+                break;
+        case ISDN_CMD_PROT_IO:
+                dbg(DEBUG_ANY, "ISDN_CMD_PROT_IO");
+                break;
+        case ISDN_CMD_FAXCMD:
+                dbg(DEBUG_ANY, "ISDN_CMD_FAXCMD");
+                break;
+        case ISDN_CMD_GETL2:
+                dbg(DEBUG_ANY, "ISDN_CMD_GETL2");
+                break;
+        case ISDN_CMD_GETL3:
+                dbg(DEBUG_ANY, "ISDN_CMD_GETL3");
+                break;
+        case ISDN_CMD_GETEAZ:
+                dbg(DEBUG_ANY, "ISDN_CMD_GETEAZ");
+                break;
+        case ISDN_CMD_SETSIL:
+                dbg(DEBUG_ANY, "ISDN_CMD_SETSIL");
+                break;
+        case ISDN_CMD_GETSIL:
+                dbg(DEBUG_ANY, "ISDN_CMD_GETSIL");
+                break;
+        default:
+                err("unknown command %d from LL",
+                     cntrl->command);
+                return -EINVAL;
+        }
+
+        return retval;
+}
+
+void gigaset_i4l_cmd(struct cardstate *cs, int cmd)
+{
+        isdn_ctrl command;
+
+        command.driver = cs->myid;
+        command.command = cmd;
+        command.arg = 0;
+        cs->iif.statcallb(&command);
+}
+
+void gigaset_i4l_channel_cmd(struct bc_state *bcs, int cmd)
+{
+        isdn_ctrl command;
+
+        command.driver = bcs->cs->myid;
+        command.command = cmd;
+        command.arg = bcs->channel;
+        bcs->cs->iif.statcallb(&command);
+}
+
+int gigaset_isdn_setup_dial(struct at_state_t *at_state, void *data)
+{
+        struct bc_state *bcs = at_state->bcs;
+        unsigned proto;
+        const char *bc;
+        size_t length[AT_NUM];
+        size_t l;
+        int i;
+        struct setup_parm *sp = data;
+
+        switch (bcs->proto2) {
+        case ISDN_PROTO_L2_HDLC:
+                proto = 1; /* 0: Bitsynchron, 1: HDLC, 2: voice */
+                break;
+        case ISDN_PROTO_L2_TRANS:
+                proto = 2; /* 0: Bitsynchron, 1: HDLC, 2: voice */
+                break;
+        default:
+                err("invalid protocol: %u", bcs->proto2);
+                return -EINVAL;
+        }
+
+        switch (sp->si1) {
+        case 1:         /* audio */
+                bc = "9090A3";  /* 3.1 kHz audio, A-law */
+                break;
+        case 7:         /* data */
+        default:        /* hope the app knows what it is doing */
+                bc = "8890";    /* unrestricted digital information */
+        }
+        //FIXME add missing si1 values from 1TR6, inspect si2, set HLC/LLC
+
+        length[AT_DIAL ] = 1 + strlen(sp->phone) + 1 + 1;
+        l = strlen(sp->eazmsn);
+        length[AT_MSN  ] = l ? 6 + l + 1 + 1 : 0;
+        length[AT_BC   ] = 5 + strlen(bc) + 1 + 1;
+        length[AT_PROTO] = 6 + 1 + 1 + 1; /* proto: 1 character */
+        length[AT_ISO  ] = 6 + 1 + 1 + 1; /* channel: 1 character */
+        length[AT_TYPE ] = 6 + 1 + 1 + 1; /* call type: 1 character */
+        length[AT_HLC  ] = 0;
+
+        for (i = 0; i < AT_NUM; ++i) {
+                kfree(bcs->commands[i]);
+                bcs->commands[i] = NULL;
+                if (length[i] &&
+                    !(bcs->commands[i] = kmalloc(length[i], GFP_ATOMIC))) {
+                        err("out of memory");
+                        return -ENOMEM;
+                }
+        }
+
+        /* type = 1: extern, 0: intern, 2: recall, 3: door, 4: centrex */
+        if (sp->phone[0] == '*' && sp->phone[1] == '*') {
+                /* internal call: translate ** prefix to CTP value */
+                snprintf(bcs->commands[AT_DIAL], length[AT_DIAL],
+                         "D%s\r", sp->phone+2);
+                strncpy(bcs->commands[AT_TYPE], "^SCTP=0\r", length[AT_TYPE]);
+        } else {
+                snprintf(bcs->commands[AT_DIAL], length[AT_DIAL],
+                         "D%s\r", sp->phone);
+                strncpy(bcs->commands[AT_TYPE], "^SCTP=1\r", length[AT_TYPE]);
+        }
+
+        if (bcs->commands[AT_MSN])
+                snprintf(bcs->commands[AT_MSN], length[AT_MSN], "^SMSN=%s\r", sp->eazmsn);
+        snprintf(bcs->commands[AT_BC   ], length[AT_BC   ], "^SBC=%s\r", bc);
+        snprintf(bcs->commands[AT_PROTO], length[AT_PROTO], "^SBPR=%u\r", proto);
+        snprintf(bcs->commands[AT_ISO  ], length[AT_ISO  ], "^SISO=%u\r", (unsigned)bcs->channel + 1);
+
+        return 0;
+}
+
+int gigaset_isdn_setup_accept(struct at_state_t *at_state)
+{
+        unsigned proto;
+        size_t length[AT_NUM];
+        int i;
+        struct bc_state *bcs = at_state->bcs;
+
+        switch (bcs->proto2) {
+        case ISDN_PROTO_L2_HDLC:
+                proto = 1; /* 0: Bitsynchron, 1: HDLC, 2: voice */
+                break;
+        case ISDN_PROTO_L2_TRANS:
+                proto = 2; /* 0: Bitsynchron, 1: HDLC, 2: voice */
+                break;
+        default:
+                err("invalid protocol: %u", bcs->proto2);
+                return -EINVAL;
+        }
+
+        length[AT_DIAL ] = 0;
+        length[AT_MSN  ] = 0;
+        length[AT_BC   ] = 0;
+        length[AT_PROTO] = 6 + 1 + 1 + 1; /* proto: 1 character */
+        length[AT_ISO  ] = 6 + 1 + 1 + 1; /* channel: 1 character */
+        length[AT_TYPE ] = 0;
+        length[AT_HLC  ] = 0;
+
+        for (i = 0; i < AT_NUM; ++i) {
+                kfree(bcs->commands[i]);
+                bcs->commands[i] = NULL;
+                if (length[i] &&
+                    !(bcs->commands[i] = kmalloc(length[i], GFP_ATOMIC))) {
+                        err("out of memory");
+                        return -ENOMEM;
+                }
+        }
+
+        snprintf(bcs->commands[AT_PROTO], length[AT_PROTO], "^SBPR=%u\r", proto);
+        snprintf(bcs->commands[AT_ISO  ], length[AT_ISO  ], "^SISO=%u\r", (unsigned) bcs->channel + 1);
+
+        return 0;
+}
+
+int gigaset_isdn_icall(struct at_state_t *at_state)
+{
+        struct cardstate *cs = at_state->cs;
+        struct bc_state *bcs = at_state->bcs;
+        isdn_ctrl response;
+        int retval;
+
+        /* fill ICALL structure */
+        response.parm.setup.si1 = 0;    /* default: unknown */
+        response.parm.setup.si2 = 0;
+        response.parm.setup.screen = 0; //FIXME how to set these?
+        response.parm.setup.plan = 0;
+        if (!at_state->str_var[STR_ZBC]) {
+                /* no BC (internal call): assume speech, A-law */
+                response.parm.setup.si1 = 1;
+        } else if (!strcmp(at_state->str_var[STR_ZBC], "8890")) {
+                /* unrestricted digital information */
+                response.parm.setup.si1 = 7;
+        } else if (!strcmp(at_state->str_var[STR_ZBC], "8090A3")) {
+                /* speech, A-law */
+                response.parm.setup.si1 = 1;
+        } else if (!strcmp(at_state->str_var[STR_ZBC], "9090A3")) {
+                /* 3,1 kHz audio, A-law */
+                response.parm.setup.si1 = 1;
+                response.parm.setup.si2 = 2;
+        } else {
+                warn("RING ignored - unsupported BC %s",
+                     at_state->str_var[STR_ZBC]);
+                return ICALL_IGNORE;
+        }
+        if (at_state->str_var[STR_NMBR]) {
+                strncpy(response.parm.setup.phone, at_state->str_var[STR_NMBR],
+                        sizeof response.parm.setup.phone - 1);
+                response.parm.setup.phone[sizeof response.parm.setup.phone - 1] = 0;
+        } else
+                response.parm.setup.phone[0] = 0;
+        if (at_state->str_var[STR_ZCPN]) {
+                strncpy(response.parm.setup.eazmsn, at_state->str_var[STR_ZCPN],
+                        sizeof response.parm.setup.eazmsn - 1);
+                response.parm.setup.eazmsn[sizeof response.parm.setup.eazmsn - 1] = 0;
+        } else
+                response.parm.setup.eazmsn[0] = 0;
+
+        if (!bcs) {
+                notice("no channel for incoming call");
+                dbg(DEBUG_CMD, "Sending ICALLW");
+                response.command = ISDN_STAT_ICALLW;
+                response.arg = 0; //FIXME
+        } else {
+                dbg(DEBUG_CMD, "Sending ICALL");
+                response.command = ISDN_STAT_ICALL;
+                response.arg = bcs->channel; //FIXME
+        }
+        response.driver = cs->myid;
+        retval = cs->iif.statcallb(&response);
+        dbg(DEBUG_CMD, "Response: %d", retval);
+        switch (retval) {
+        case 0: /* no takers */
+                return ICALL_IGNORE;
+        case 1: /* alerting */
+                bcs->chstate |= CHS_NOTIFY_LL;
+                return ICALL_ACCEPT;
+        case 2: /* reject */
+                return ICALL_REJECT;
+        case 3: /* incomplete */
+                warn("LL requested unsupported feature: Incomplete Number");
+                return ICALL_IGNORE;
+        case 4: /* proceeding */
+                /* Gigaset will send ALERTING anyway.
+                 * There doesn't seem to be a way to avoid this.
+                 */
+                return ICALL_ACCEPT;
+        case 5: /* deflect */
+                warn("LL requested unsupported feature: Call Deflection");
+                return ICALL_IGNORE;
+        default:
+                err("LL error %d on ICALL", retval);
+                return ICALL_IGNORE;
+        }
+}
+
+/* Set Callback function pointer */
+int gigaset_register_to_LL(struct cardstate *cs, const char *isdnid)
+{
+        isdn_if *iif = &cs->iif;
+
+        dbg(DEBUG_ANY, "Register driver capabilities to LL");
+
+        //iif->id[sizeof(iif->id) - 1]=0;
+        //strncpy(iif->id, isdnid, sizeof(iif->id) - 1);
+        if (snprintf(iif->id, sizeof iif->id, "%s_%u", isdnid, cs->minor_index)
+            >= sizeof iif->id)
+                return -ENOMEM; //FIXME EINVAL/...??
+
+        iif->owner = THIS_MODULE;
+        iif->channels = cs->channels;                        /* I am supporting just one channel *//* I was supporting...*/
+        iif->maxbufsize = MAX_BUF_SIZE;
+        iif->features = ISDN_FEATURE_L2_TRANS |   /* Our device is very advanced, therefore */
+                ISDN_FEATURE_L2_HDLC |
+#ifdef GIG_X75
+                ISDN_FEATURE_L2_X75I |
+#endif
+                ISDN_FEATURE_L3_TRANS |
+                ISDN_FEATURE_P_EURO;
+        iif->hl_hdrlen = HW_HDR_LEN;              /* Area for storing ack */
+        iif->command = command_from_LL;
+        iif->writebuf_skb = writebuf_from_LL;
+        iif->writecmd = NULL;                     /* Don't support isdnctrl */
+        iif->readstat = NULL;                     /* Don't support isdnctrl */
+        iif->rcvcallb_skb = NULL;                 /* Will be set by LL */
+        iif->statcallb = NULL;                    /* Will be set by LL */
+
+        if (!register_isdn(iif))
+                return 0;
+
+        cs->myid = iif->channels;                 /* Set my device id */
+        return 1;
+}
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
new file mode 100644
index 0000000000..3a81d9c651
--- /dev/null
+++ b/drivers/isdn/gigaset/interface.c
@@ -0,0 +1,718 @@
+/*
+ * interface to user space for the gigaset driver
+ *
+ * Copyright (c) 2004 by Hansjoerg Lipp <hjlipp@web.de>
+ *
+ * =====================================================================
+ *    This program is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU General Public License as
+ *    published by the Free Software Foundation; either version 2 of
+ *    the License, or (at your option) any later version.
+ * =====================================================================
+ * Version: $Id: interface.c,v 1.14.4.15 2006/02/04 18:28:16 hjlipp Exp $
+ * =====================================================================
+ */
+
+#include "gigaset.h"
+#include <linux/gigaset_dev.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+
+/*** our ioctls ***/
+
+static int if_lock(struct cardstate *cs, int *arg)
+{
+        int cmd = *arg;
+
+        dbg(DEBUG_IF, "%u: if_lock (%d)", cs->minor_index, cmd);
+
+        if (cmd > 1)
+                return -EINVAL;
+
+        if (cmd < 0) {
+                *arg = atomic_read(&cs->mstate) == MS_LOCKED; //FIXME remove?
+                return 0;
+        }
+
+        if (!cmd && atomic_read(&cs->mstate) == MS_LOCKED
+            && atomic_read(&cs->connected)) {
+                cs->ops->set_modem_ctrl(cs, 0, TIOCM_DTR|TIOCM_RTS);
+                cs->ops->baud_rate(cs, B115200);
+                cs->ops->set_line_ctrl(cs, CS8);
+                cs->control_state = TIOCM_DTR|TIOCM_RTS;
+        }
+
+        cs->waiting = 1;
+        if (!gigaset_add_event(cs, &cs->at_state, EV_IF_LOCK,
+                               NULL, cmd, NULL)) {
+                cs->waiting = 0;
+                return -ENOMEM;
+        }
+
+        dbg(DEBUG_CMD, "scheduling IF_LOCK");
+        gigaset_schedule_event(cs);
+
+        wait_event(cs->waitqueue, !cs->waiting);
+
+        if (cs->cmd_result >= 0) {
+                *arg = cs->cmd_result;
+                return 0;
+        }
+
+        return cs->cmd_result;
+}
+
+static int if_version(struct cardstate *cs, unsigned arg[4])
+{
+        static const unsigned version[4] = GIG_VERSION;
+        static const unsigned compat[4] = GIG_COMPAT;
+        unsigned cmd = arg[0];
+
+        dbg(DEBUG_IF, "%u: if_version (%d)", cs->minor_index, cmd);
+
+        switch (cmd) {
+        case GIGVER_DRIVER:
+                memcpy(arg, version, sizeof version);
+                return 0;
+        case GIGVER_COMPAT:
+                memcpy(arg, compat, sizeof compat);
+                return 0;
+        case GIGVER_FWBASE:
+                cs->waiting = 1;
+                if (!gigaset_add_event(cs, &cs->at_state, EV_IF_VER,
+                                       NULL, 0, arg)) {
+                        cs->waiting = 0;
+                        return -ENOMEM;
+                }
+
+                dbg(DEBUG_CMD, "scheduling IF_VER");
+                gigaset_schedule_event(cs);
+
+                wait_event(cs->waitqueue, !cs->waiting);
+
+                if (cs->cmd_result >= 0)
+                        return 0;
+
+                return cs->cmd_result;
+        default:
+                return -EINVAL;
+        }
+}
+
+static int if_config(struct cardstate *cs, int *arg)
+{
+        dbg(DEBUG_IF, "%u: if_config (%d)", cs->minor_index, *arg);
+
+        if (*arg != 1)
+                return -EINVAL;
+
+        if (atomic_read(&cs->mstate) != MS_LOCKED)
+                return -EBUSY;
+
+        *arg = 0;
+        return gigaset_enterconfigmode(cs);
+}
+
+/*** the terminal driver ***/
+/* stolen from usbserial and some other tty drivers */
+
+static int  if_open(struct tty_struct *tty, struct file *filp);
+static void if_close(struct tty_struct *tty, struct file *filp);
+static int  if_ioctl(struct tty_struct *tty, struct file *file,
+                     unsigned int cmd, unsigned long arg);
+static int  if_write_room(struct tty_struct *tty);
+static int  if_chars_in_buffer(struct tty_struct *tty);
+static void if_throttle(struct tty_struct *tty);
+static void if_unthrottle(struct tty_struct *tty);
+static void if_set_termios(struct tty_struct *tty, struct termios *old);
+static int  if_tiocmget(struct tty_struct *tty, struct file *file);
+static int  if_tiocmset(struct tty_struct *tty, struct file *file,
+                        unsigned int set, unsigned int clear);
+static int  if_write(struct tty_struct *tty,
+                     const unsigned char *buf, int count);
+
+static struct tty_operations if_ops = {
+        .open =                 if_open,
+        .close =                if_close,
+        .ioctl =                if_ioctl,
+        .write =                if_write,
+        .write_room =           if_write_room,
+        .chars_in_buffer =      if_chars_in_buffer,
+        .set_termios =          if_set_termios,
+        .throttle =             if_throttle,
+        .unthrottle =           if_unthrottle,
+#if 0
+        .break_ctl =            serial_break,
+#endif
+        .tiocmget =             if_tiocmget,
+        .tiocmset =             if_tiocmset,
+};
+
+static int if_open(struct tty_struct *tty, struct file *filp)
+{
+        struct cardstate *cs;
+        unsigned long flags;
+
+        dbg(DEBUG_IF, "%d+%d: %s()", tty->driver->minor_start, tty->index,
+            __FUNCTION__);
+
+        tty->driver_data = NULL;
+
+        cs = gigaset_get_cs_by_tty(tty);
+        if (!cs)
+                return -ENODEV;
+
+        if (down_interruptible(&cs->sem))
+                return -ERESTARTSYS; // FIXME -EINTR?
+        tty->driver_data = cs;
+
+        ++cs->open_count;
+
+        if (cs->open_count == 1) {
+                spin_lock_irqsave(&cs->lock, flags);
+                cs->tty = tty;
+                spin_unlock_irqrestore(&cs->lock, flags);
+                tty->low_latency = 1; //FIXME test
+                //FIXME
+        }
+
+        up(&cs->sem);
+        return 0;
+}
+
+static void if_close(struct tty_struct *tty, struct file *filp)
+{
+        struct cardstate *cs;
+        unsigned long flags;
+
+        cs = (struct cardstate *) tty->driver_data;
+        if (!cs) {
+                err("cs==NULL in %s", __FUNCTION__);
+                return;
+        }
+
+        dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __FUNCTION__);
+
+        down(&cs->sem);
+
+        if (!cs->open_count)
+                warn("%s: device not opened", __FUNCTION__);
+        else {
+                if (!--cs->open_count) {
+                        spin_lock_irqsave(&cs->lock, flags);
+                        cs->tty = NULL;
+                        spin_unlock_irqrestore(&cs->lock, flags);
+                        //FIXME
+                }
+        }
+
+        up(&cs->sem);
+}
+
+static int if_ioctl(struct tty_struct *tty, struct file *file,
+                    unsigned int cmd, unsigned long arg)
+{
+        struct cardstate *cs;
+        int retval = -ENODEV;
+        int int_arg;
+        unsigned char buf[6];
+        unsigned version[4];
+
+        cs = (struct cardstate *) tty->driver_data;
+        if (!cs) {
+                err("cs==NULL in %s", __FUNCTION__);
+                return -ENODEV;
+        }
+
+        dbg(DEBUG_IF, "%u: %s(0x%x)", cs->minor_index, __FUNCTION__, cmd);
+
+        if (down_interruptible(&cs->sem))
+                return -ERESTARTSYS; // FIXME -EINTR?
+
+        if (!cs->open_count)
+                warn("%s: device not opened", __FUNCTION__);
+        else {
+                retval = 0;
+                switch (cmd) {
+                case GIGASET_REDIR:
+                        retval = get_user(int_arg, (int __user *) arg);
+                        if (retval >= 0)
+                                retval = if_lock(cs, &int_arg);
+                        if (retval >= 0)
+                                retval = put_user(int_arg, (int __user *) arg);
+                        break;
+                case GIGASET_CONFIG:
+                        retval = get_user(int_arg, (int __user *) arg);
+                        if (retval >= 0)
+                                retval = if_config(cs, &int_arg);
+                        if (retval >= 0)
+                                retval = put_user(int_arg, (int __user *) arg);
+                        break;
+                case GIGASET_BRKCHARS:
+                        //FIXME test if MS_LOCKED
+                        gigaset_dbg_buffer(DEBUG_IF, "GIGASET_BRKCHARS",
+                                           6, (const unsigned char *) arg, 1);
+                        if (!atomic_read(&cs->connected)) {
+                                dbg(DEBUG_ANY, "can't communicate with unplugged device");
+                                retval = -ENODEV;
+                                break;
+                        }
+                        retval = copy_from_user(&buf,
+                                                (const unsigned char __user *) arg, 6)
+                                 ? -EFAULT : 0;
+                        if (retval >= 0)
+                                retval = cs->ops->brkchars(cs, buf);
+                        break;
+                case GIGASET_VERSION:
+                        retval = copy_from_user(version, (unsigned __user *) arg,
+                                                sizeof version) ? -EFAULT : 0;
+                        if (retval >= 0)
+                                retval = if_version(cs, version);
+                        if (retval >= 0)
+                                retval = copy_to_user((unsigned __user *) arg, version,
+                                                      sizeof version)
+                                         ? -EFAULT : 0;
+                        break;
+                default:
+                        dbg(DEBUG_ANY, "%s: arg not supported - 0x%04x",
+                            __FUNCTION__, cmd);
+                        retval = -ENOIOCTLCMD;
+                }
+        }
+
+        up(&cs->sem);
+
+        return retval;
+}
+
+static int if_tiocmget(struct tty_struct *tty, struct file *file)
+{
+        struct cardstate *cs;
+        int retval;
+
+        cs = (struct cardstate *) tty->driver_data;
+        if (!cs) {
+                err("cs==NULL in %s", __FUNCTION__);
+                return -ENODEV;
+        }
+
+        dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __FUNCTION__);
+
+        if (down_interruptible(&cs->sem))
+                return -ERESTARTSYS; // FIXME -EINTR?
+
+        // FIXME read from device?
+        retval = cs->control_state & (TIOCM_RTS|TIOCM_DTR);
+
+        up(&cs->sem);
+
+        return retval;
+}
+
+static int if_tiocmset(struct tty_struct *tty, struct file *file,
+                       unsigned int set, unsigned int clear)
+{
+        struct cardstate *cs;
+        int retval;
+        unsigned mc;
+
+        cs = (struct cardstate *) tty->driver_data;
+        if (!cs) {
+                err("cs==NULL in %s", __FUNCTION__);
+                return -ENODEV;
+        }
+
+        dbg(DEBUG_IF,
+            "%u: %s(0x%x, 0x%x)", cs->minor_index, __FUNCTION__, set, clear);
+
+        if (down_interruptible(&cs->sem))
+                return -ERESTARTSYS; // FIXME -EINTR?
+
+        if (!atomic_read(&cs->connected)) {
+                dbg(DEBUG_ANY, "can't communicate with unplugged device");
+                retval = -ENODEV;
+        } else {
+                mc = (cs->control_state | set) & ~clear & (TIOCM_RTS|TIOCM_DTR);
+                retval = cs->ops->set_modem_ctrl(cs, cs->control_state, mc);
+                cs->control_state = mc;
+        }
+
+        up(&cs->sem);
+
+        return retval;
+}
+
+static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)
+{
+        struct cardstate *cs;
+        int retval = -ENODEV;
+
+        cs = (struct cardstate *) tty->driver_data;
+        if (!cs) {
+                err("cs==NULL in %s", __FUNCTION__);
+                return -ENODEV;
+        }
+
+        dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __FUNCTION__);
+
+        if (down_interruptible(&cs->sem))
+                return -ERESTARTSYS; // FIXME -EINTR?
+
+        if (!cs->open_count)
+                warn("%s: device not opened", __FUNCTION__);
+        else if (atomic_read(&cs->mstate) != MS_LOCKED) {
+                warn("can't write to unlocked device");
+                retval = -EBUSY;
+        } else if (!atomic_read(&cs->connected)) {
+                dbg(DEBUG_ANY, "can't write to unplugged device");
+                retval = -EBUSY; //FIXME
+        } else {
+                retval = cs->ops->write_cmd(cs, buf, count,
+                                            &cs->if_wake_tasklet);
+        }
+
+        up(&cs->sem);
+
+        return retval;
+}
+
+static int if_write_room(struct tty_struct *tty)
+{
+        struct cardstate *cs;
+        int retval = -ENODEV;
+
+        cs = (struct cardstate *) tty->driver_data;
+        if (!cs) {
+                err("cs==NULL in %s", __FUNCTION__);
+                return -ENODEV;
+        }
+
+        dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __FUNCTION__);
+
+        if (down_interruptible(&cs->sem))
+                return -ERESTARTSYS; // FIXME -EINTR?
+
+        if (!cs->open_count)
+                warn("%s: device not opened", __FUNCTION__);
+        else if (atomic_read(&cs->mstate) != MS_LOCKED) {
+                warn("can't write to unlocked device");
+                retval = -EBUSY; //FIXME
+        } else if (!atomic_read(&cs->connected)) {
+                dbg(DEBUG_ANY, "can't write to unplugged device");
+                retval = -EBUSY; //FIXME
+        } else
+                retval = cs->ops->write_room(cs);
+
+        up(&cs->sem);
+
+        return retval;
+}
+
+static int if_chars_in_buffer(struct tty_struct *tty)
+{
+        struct cardstate *cs;
+        int retval = -ENODEV;
+
+        cs = (struct cardstate *) tty->driver_data;
+        if (!cs) {
+                err("cs==NULL in %s", __FUNCTION__);
+                return -ENODEV;
+        }
+
+        dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __FUNCTION__);
+
+        if (down_interruptible(&cs->sem))
+                return -ERESTARTSYS; // FIXME -EINTR?
+
+        if (!cs->open_count)
+                warn("%s: device not opened", __FUNCTION__);
+        else if (atomic_read(&cs->mstate) != MS_LOCKED) {
+                warn("can't write to unlocked device");
+                retval = -EBUSY;
+        } else if (!atomic_read(&cs->connected)) {
+                dbg(DEBUG_ANY, "can't write to unplugged device");
+                retval = -EBUSY; //FIXME
+        } else
+                retval = cs->ops->chars_in_buffer(cs);
+
+        up(&cs->sem);
+
+        return retval;
+}
+
+static void if_throttle(struct tty_struct *tty)
+{
+        struct cardstate *cs;
+
+        cs = (struct cardstate *) tty->driver_data;
+        if (!cs) {
+                err("cs==NULL in %s", __FUNCTION__);
+                return;
+        }
+
+        dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __FUNCTION__);
+
+        down(&cs->sem);
+
+        if (!cs->open_count)
+                warn("%s: device not opened", __FUNCTION__);
+        else {
+                //FIXME
+        }
+
+        up(&cs->sem);
+}
+
+static void if_unthrottle(struct tty_struct *tty)
+{
+        struct cardstate *cs;
+
+        cs = (struct cardstate *) tty->driver_data;
+        if (!cs) {
+                err("cs==NULL in %s", __FUNCTION__);
+                return;
+        }
+
+        dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __FUNCTION__);
+
+        down(&cs->sem);
+
+        if (!cs->open_count)
+                warn("%s: device not opened", __FUNCTION__);
+        else {
+                //FIXME
+        }
+
+        up(&cs->sem);
+}
+
+static void if_set_termios(struct tty_struct *tty, struct termios *old)
+{
+        struct cardstate *cs;
+        unsigned int iflag;
+        unsigned int cflag;
+        unsigned int old_cflag;
+        unsigned int control_state, new_state;
+
+        cs = (struct cardstate *) tty->driver_data;
+        if (!cs) {
+                err("cs==NULL in %s", __FUNCTION__);
+                return;
+        }
+
+        dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __FUNCTION__);
+
+        down(&cs->sem);
+
+        if (!cs->open_count) {
+                warn("%s: device not opened", __FUNCTION__);
+                goto out;
+        }
+
+        if (!atomic_read(&cs->connected)) {
+                dbg(DEBUG_ANY, "can't communicate with unplugged device");
+                goto out;
+        }
+
+        // stolen from mct_u232.c
+        iflag = tty->termios->c_iflag;
+        cflag = tty->termios->c_cflag;
+        old_cflag = old ? old->c_cflag : cflag; //FIXME?
+        dbg(DEBUG_IF, "%u: iflag %x cflag %x old %x", cs->minor_index,
+            iflag, cflag, old_cflag);
+
+        /* get a local copy of the current port settings */
+        control_state = cs->control_state;
+
+        /*
+         * Update baud rate.
+         * Do not attempt to cache old rates and skip settings,
+         * disconnects screw such tricks up completely.
+         * Premature optimization is the root of all evil.
+         */
+
+        /* reassert DTR and (maybe) RTS on transition from B0 */
+        if ((old_cflag & CBAUD) == B0) {
+                new_state = control_state | TIOCM_DTR;
+                /* don't set RTS if using hardware flow control */
+                if (!(old_cflag & CRTSCTS))
+                        new_state |= TIOCM_RTS;
+                dbg(DEBUG_IF, "%u: from B0 - set DTR%s", cs->minor_index,
+                    (new_state & TIOCM_RTS) ? " only" : "/RTS");
+                cs->ops->set_modem_ctrl(cs, control_state, new_state);
+                control_state = new_state;
+        }
+
+        cs->ops->baud_rate(cs, cflag & CBAUD);
+
+        if ((cflag & CBAUD) == B0) {
+                /* Drop RTS and DTR */
+                dbg(DEBUG_IF, "%u: to B0 - drop DTR/RTS", cs->minor_index);
+                new_state = control_state & ~(TIOCM_DTR | TIOCM_RTS);
+                cs->ops->set_modem_ctrl(cs, control_state, new_state);
+                control_state = new_state;
+        }
+
+        /*
+         * Update line control register (LCR)
+         */
+
+        cs->ops->set_line_ctrl(cs, cflag);
+
+#if 0
+        //FIXME this hangs M101 [ts 2005-03-09]
+        //FIXME do we need this?
+        /*
+         * Set flow control: well, I do not really now how to handle DTR/RTS.
+         * Just do what we have seen with SniffUSB on Win98.
+         */
+        /* Drop DTR/RTS if no flow control otherwise assert */
+        dbg(DEBUG_IF, "%u: control_state %x", cs->minor_index, control_state);
+        new_state = control_state;
+        if ((iflag & IXOFF) || (iflag & IXON) || (cflag & CRTSCTS))
+                new_state |= TIOCM_DTR | TIOCM_RTS;
+        else
+                new_state &= ~(TIOCM_DTR | TIOCM_RTS);
+        if (new_state != control_state) {
+                dbg(DEBUG_IF, "%u: new_state %x", cs->minor_index, new_state);
+                gigaset_set_modem_ctrl(cs, control_state, new_state); // FIXME: mct_u232.c sets the old state here. is this a bug?
+                control_state = new_state;
+        }
+#endif
+
+        /* save off the modified port settings */
+        cs->control_state = control_state;
+
+out:
+        up(&cs->sem);
+}
+
+
+/* wakeup tasklet for the write operation */
+static void if_wake(unsigned long data)
+{
+        struct cardstate *cs = (struct cardstate *) data;
+        struct tty_struct *tty;
+
+        tty = cs->tty;
+        if (!tty)
+                return;
+
+        if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
+            tty->ldisc.write_wakeup) {
+                dbg(DEBUG_IF, "write wakeup call");
+                tty->ldisc.write_wakeup(tty);
+        }
+
+        wake_up_interruptible(&tty->write_wait);
+}
+
+/*** interface to common ***/
+
+void gigaset_if_init(struct cardstate *cs)
+{
+        struct gigaset_driver *drv;
+
+        drv = cs->driver;
+        if (!drv->have_tty)
+                return;
+
+        tasklet_init(&cs->if_wake_tasklet, &if_wake, (unsigned long) cs);
+        tty_register_device(drv->tty, cs->minor_index, NULL);
+}
+
+void gigaset_if_free(struct cardstate *cs)
+{
+        struct gigaset_driver *drv;
+
+        drv = cs->driver;
+        if (!drv->have_tty)
+                return;
+
+        tasklet_disable(&cs->if_wake_tasklet);
+        tasklet_kill(&cs->if_wake_tasklet);
+        tty_unregister_device(drv->tty, cs->minor_index);
+}
+
+void gigaset_if_receive(struct cardstate *cs,
+                        unsigned char *buffer, size_t len)
+{
+        unsigned long flags;
+        struct tty_struct *tty;
+
+        spin_lock_irqsave(&cs->lock, flags);
+        if ((tty = cs->tty) == NULL)
+                dbg(DEBUG_ANY, "receive on closed device");
+        else {
+                tty_buffer_request_room(tty, len);
+                tty_insert_flip_string(tty, buffer, len);
+                tty_flip_buffer_push(tty);
+        }
+        spin_unlock_irqrestore(&cs->lock, flags);
+}
+EXPORT_SYMBOL_GPL(gigaset_if_receive);
+
+/* gigaset_if_initdriver
+ * Initialize tty interface.
+ * parameters:
+ *      drv             Driver
+ *      procname        Name of the driver (e.g. for /proc/tty/drivers)
+ *      devname         Name of the device files (prefix without minor number)
+ *      devfsname       Devfs name of the device files without %d
+ */
+void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
+                           const char *devname, const char *devfsname)
+{
+        unsigned minors = drv->minors;
+        int ret;
+        struct tty_driver *tty;
+
+        drv->have_tty = 0;
+
+        if ((drv->tty = alloc_tty_driver(minors)) == NULL)
+                goto enomem;
+        tty = drv->tty;
+
+        tty->magic =            TTY_DRIVER_MAGIC,
+        tty->major =            GIG_MAJOR,
+        tty->type =             TTY_DRIVER_TYPE_SERIAL,
+        tty->subtype =          SERIAL_TYPE_NORMAL,
+        tty->flags =            TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS,
+
+        tty->driver_name =      procname;
+        tty->name =             devname;
+        tty->minor_start =      drv->minor;
+        tty->num =              drv->minors;
+
+        tty->owner =            THIS_MODULE;
+        tty->devfs_name =       devfsname;
+
+        tty->init_termios          = tty_std_termios; //FIXME
+        tty->init_termios.c_cflag  = B9600 | CS8 | CREAD | HUPCL | CLOCAL; //FIXME
+        tty_set_operations(tty, &if_ops);
+
+        ret = tty_register_driver(tty);
+        if (ret < 0) {
+                warn("failed to register tty driver (error %d)", ret);
+                goto error;
+        }
+        dbg(DEBUG_IF, "tty driver initialized");
+        drv->have_tty = 1;
+        return;
+
+enomem:
+        warn("could not allocate tty structures");
+error:
+        if (drv->tty)
+                put_tty_driver(drv->tty);
+}
+
+void gigaset_if_freedriver(struct gigaset_driver *drv)
+{
+        if (!drv->have_tty)
+                return;
+
+        drv->have_tty = 0;
+        tty_unregister_driver(drv->tty);
+        put_tty_driver(drv->tty);
+}
diff --git a/drivers/isdn/gigaset/isocdata.c b/drivers/isdn/gigaset/isocdata.c
new file mode 100644
index 0000000000..5744eb91b3
--- /dev/null
+++ b/drivers/isdn/gigaset/isocdata.c
@@ -0,0 +1,1009 @@
+/*
+ * Common data handling layer for bas_gigaset
+ *
+ * Copyright (c) 2005 by Tilman Schmidt <tilman@imap.cc>,
+ *                       Hansjoerg Lipp <hjlipp@web.de>.
+ *
+ * =====================================================================
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License as
+ *      published by the Free Software Foundation; either version 2 of
+ *      the License, or (at your option) any later version.
+ * =====================================================================
+ * ToDo: ...
+ * =====================================================================
+ * Version: $Id: isocdata.c,v 1.2.2.5 2005/11/13 23:05:19 hjlipp Exp $
+ * =====================================================================
+ */
+
+#include "gigaset.h"
+#include <linux/crc-ccitt.h>
+
+/* access methods for isowbuf_t */
+/* ============================ */
+
+/* initialize buffer structure
+ */
+void gigaset_isowbuf_init(struct isowbuf_t *iwb, unsigned char idle)
+{
+        atomic_set(&iwb->read, 0);
+        atomic_set(&iwb->nextread, 0);
+        atomic_set(&iwb->write, 0);
+        atomic_set(&iwb->writesem, 1);
+        iwb->wbits = 0;
+        iwb->idle = idle;
+        memset(iwb->data + BAS_OUTBUFSIZE, idle, BAS_OUTBUFPAD);
+}
+
+/* compute number of bytes which can be appended to buffer
+ * so that there is still room to append a maximum frame of flags
+ */
+static inline int isowbuf_freebytes(struct isowbuf_t *iwb)
+{
+        int read, write, freebytes;
+
+        read = atomic_read(&iwb->read);
+        write = atomic_read(&iwb->write);
+        if ((freebytes = read - write) > 0) {
+                /* no wraparound: need padding space within regular area */
+                return freebytes - BAS_OUTBUFPAD;
+        } else if (read < BAS_OUTBUFPAD) {
+                /* wraparound: can use space up to end of regular area */
+                return BAS_OUTBUFSIZE - write;
+        } else {
+                /* following the wraparound yields more space */
+                return freebytes + BAS_OUTBUFSIZE - BAS_OUTBUFPAD;
+        }
+}
+
+/* compare two offsets within the buffer
+ * The buffer is seen as circular, with the read position as start
+ * returns -1/0/1 if position a </=/> position b without crossing 'read'
+ */
+static inline int isowbuf_poscmp(struct isowbuf_t *iwb, int a, int b)
+{
+        int read;
+        if (a == b)
+                return 0;
+        read = atomic_read(&iwb->read);
+        if (a < b) {
+                if (a < read && read <= b)
+                        return +1;
+                else
+                        return -1;
+        } else {
+                if (b < read && read <= a)
+                        return -1;
+                else
+                        return +1;
+        }
+}
+
+/* start writing
+ * acquire the write semaphore
+ * return true if acquired, false if busy
+ */
+static inline int isowbuf_startwrite(struct isowbuf_t *iwb)
+{
+        if (!atomic_dec_and_test(&iwb->writesem)) {
+                atomic_inc(&iwb->writesem);
+                dbg(DEBUG_ISO,
+                    "%s: couldn't acquire iso write semaphore", __func__);
+                return 0;
+        }
+#ifdef CONFIG_GIGASET_DEBUG
+        dbg(DEBUG_ISO,
+            "%s: acquired iso write semaphore, data[write]=%02x, nbits=%d",
+            __func__, iwb->data[atomic_read(&iwb->write)], iwb->wbits);
+#endif
+        return 1;
+}
+
+/* finish writing
+ * release the write semaphore and update the maximum buffer fill level
+ * returns the current write position
+ */
+static inline int isowbuf_donewrite(struct isowbuf_t *iwb)
+{
+        int write = atomic_read(&iwb->write);
+        atomic_inc(&iwb->writesem);
+        return write;
+}
+
+/* append bits to buffer without any checks
+ * - data contains bits to append, starting at LSB
+ * - nbits is number of bits to append (0..24)
+ * must be called with the write semaphore held
+ * If more than nbits bits are set in data, the extraneous bits are set in the
+ * buffer too, but the write position is only advanced by nbits.
+ */
+static inline void isowbuf_putbits(struct isowbuf_t *iwb, u32 data, int nbits)
+{
+        int write = atomic_read(&iwb->write);
+        data <<= iwb->wbits;
+        data |= iwb->data[write];
+        nbits += iwb->wbits;
+        while (nbits >= 8) {
+                iwb->data[write++] = data & 0xff;
+                write %= BAS_OUTBUFSIZE;
+                data >>= 8;
+                nbits -= 8;
+        }
+        iwb->wbits = nbits;
+        iwb->data[write] = data & 0xff;
+        atomic_set(&iwb->write, write);
+}
+
+/* put final flag on HDLC bitstream
+ * also sets the idle fill byte to the correspondingly shifted flag pattern
+ * must be called with the write semaphore held
+ */
+static inline void isowbuf_putflag(struct isowbuf_t *iwb)
+{
+        int write;
+
+        /* add two flags, thus reliably covering one byte */
+        isowbuf_putbits(iwb, 0x7e7e, 8);
+        /* recover the idle flag byte */
+        write = atomic_read(&iwb->write);
+        iwb->idle = iwb->data[write];
+        dbg(DEBUG_ISO, "idle fill byte %02x", iwb->idle);
+        /* mask extraneous bits in buffer */
+        iwb->data[write] &= (1 << iwb->wbits) - 1;
+}
+
+/* retrieve a block of bytes for sending
+ * The requested number of bytes is provided as a contiguous block.
+ * If necessary, the frame is filled to the requested number of bytes
+ * with the idle value.
+ * returns offset to frame, < 0 on busy or error
+ */
+int gigaset_isowbuf_getbytes(struct isowbuf_t *iwb, int size)
+{
+        int read, write, limit, src, dst;
+        unsigned char pbyte;
+
+        read = atomic_read(&iwb->nextread);
+        write = atomic_read(&iwb->write);
+        if (likely(read == write)) {
+                //dbg(DEBUG_STREAM, "%s: send buffer empty", __func__);
+                /* return idle frame */
+                return read < BAS_OUTBUFPAD ?
+                        BAS_OUTBUFSIZE : read - BAS_OUTBUFPAD;
+        }
+
+        limit = read + size;
+        dbg(DEBUG_STREAM,
+            "%s: read=%d write=%d limit=%d", __func__, read, write, limit);
+#ifdef CONFIG_GIGASET_DEBUG
+        if (unlikely(size < 0 || size > BAS_OUTBUFPAD)) {
+                err("invalid size %d", size);
+                return -EINVAL;
+        }
+        src = atomic_read(&iwb->read);
+        if (unlikely(limit > BAS_OUTBUFSIZE + BAS_OUTBUFPAD ||
+                     (read < src && limit >= src))) {
+                err("isoc write buffer frame reservation violated");
+                return -EFAULT;
+        }
+#endif
+
+        if (read < write) {
+                /* no wraparound in valid data */
+                if (limit >= write) {
+                        /* append idle frame */
+                        if (!isowbuf_startwrite(iwb))
+                                return -EBUSY;
+                        /* write position could have changed */
+                        if (limit >= (write = atomic_read(&iwb->write))) {
+                                pbyte = iwb->data[write]; /* save partial byte */
+                                limit = write + BAS_OUTBUFPAD;
+                                dbg(DEBUG_STREAM,
+                                    "%s: filling %d->%d with %02x",
+                                    __func__, write, limit, iwb->idle);
+                                if (write + BAS_OUTBUFPAD < BAS_OUTBUFSIZE)
+                                        memset(iwb->data + write, iwb->idle,
+                                               BAS_OUTBUFPAD);
+                                else {
+                                        /* wraparound, fill entire pad area */
+                                        memset(iwb->data + write, iwb->idle,
+                                               BAS_OUTBUFSIZE + BAS_OUTBUFPAD
+                                               - write);
+                                        limit = 0;
+                                }
+                                dbg(DEBUG_STREAM, "%s: restoring %02x at %d",
+                                    __func__, pbyte, limit);
+                                iwb->data[limit] = pbyte; /* restore partial byte */
+                                atomic_set(&iwb->write, limit);
+                        }
+                        isowbuf_donewrite(iwb);
+                }
+        } else {
+                /* valid data wraparound */
+                if (limit >= BAS_OUTBUFSIZE) {
+                        /* copy wrapped part into pad area */
+                        src = 0;
+                        dst = BAS_OUTBUFSIZE;
+                        while (dst < limit && src < write)
+                                iwb->data[dst++] = iwb->data[src++];
+                        if (dst <= limit) {
+                                /* fill pad area with idle byte */
+                                memset(iwb->data + dst, iwb->idle,
+                                       BAS_OUTBUFSIZE + BAS_OUTBUFPAD - dst);
+                        }
+                        limit = src;
+                }
+        }
+        atomic_set(&iwb->nextread, limit);
+        return read;
+}
+
+/* dump_bytes
+ * write hex bytes to syslog for debugging
+ */
+static inline void dump_bytes(enum debuglevel level, const char *tag,
+                              unsigned char *bytes, int count)
+{
+#ifdef CONFIG_GIGASET_DEBUG
+        unsigned char c;
+        static char dbgline[3 * 32 + 1];
+        static const char hexdigit[] = "0123456789abcdef";
+        int i = 0;
+        IFNULLRET(tag);
+        IFNULLRET(bytes);
+        while (count-- > 0) {
+                if (i > sizeof(dbgline) - 4) {
+                        dbgline[i] = '\0';
+                        dbg(level, "%s:%s", tag, dbgline);
+                        i = 0;
+                }
+                c = *bytes++;
+                dbgline[i] = (i && !(i % 12)) ? '-' : ' ';
+                i++;
+                dbgline[i++] = hexdigit[(c >> 4) & 0x0f];
+                dbgline[i++] = hexdigit[c & 0x0f];
+        }
+        dbgline[i] = '\0';
+        dbg(level, "%s:%s", tag, dbgline);
+#endif
+}
+
+/*============================================================================*/
+
+/* bytewise HDLC bitstuffing via table lookup
+ * lookup table: 5 subtables for 0..4 preceding consecutive '1' bits
+ * index: 256*(number of preceding '1' bits) + (next byte to stuff)
+ * value: bit  9.. 0 = result bits
+ *        bit 12..10 = number of trailing '1' bits in result
+ *        bit 14..13 = number of bits added by stuffing
+ */
+static u16 stufftab[5 * 256] = {
+// previous 1s = 0:
+ 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
+ 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x201f,
+ 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f,
+ 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x203e, 0x205f,
+ 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f,
+ 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x209f,
+ 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f,
+ 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x207c, 0x207d, 0x20be, 0x20df,
+ 0x0480, 0x0481, 0x0482, 0x0483, 0x0484, 0x0485, 0x0486, 0x0487, 0x0488, 0x0489, 0x048a, 0x048b, 0x048c, 0x048d, 0x048e, 0x048f,
+ 0x0490, 0x0491, 0x0492, 0x0493, 0x0494, 0x0495, 0x0496, 0x0497, 0x0498, 0x0499, 0x049a, 0x049b, 0x049c, 0x049d, 0x049e, 0x251f,
+ 0x04a0, 0x04a1, 0x04a2, 0x04a3, 0x04a4, 0x04a5, 0x04a6, 0x04a7, 0x04a8, 0x04a9, 0x04aa, 0x04ab, 0x04ac, 0x04ad, 0x04ae, 0x04af,
+ 0x04b0, 0x04b1, 0x04b2, 0x04b3, 0x04b4, 0x04b5, 0x04b6, 0x04b7, 0x04b8, 0x04b9, 0x04ba, 0x04bb, 0x04bc, 0x04bd, 0x253e, 0x255f,
+ 0x08c0, 0x08c1, 0x08c2, 0x08c3, 0x08c4, 0x08c5, 0x08c6, 0x08c7, 0x08c8, 0x08c9, 0x08ca, 0x08cb, 0x08cc, 0x08cd, 0x08ce, 0x08cf,
+ 0x08d0, 0x08d1, 0x08d2, 0x08d3, 0x08d4, 0x08d5, 0x08d6, 0x08d7, 0x08d8, 0x08d9, 0x08da, 0x08db, 0x08dc, 0x08dd, 0x08de, 0x299f,
+ 0x0ce0, 0x0ce1, 0x0ce2, 0x0ce3, 0x0ce4, 0x0ce5, 0x0ce6, 0x0ce7, 0x0ce8, 0x0ce9, 0x0cea, 0x0ceb, 0x0cec, 0x0ced, 0x0cee, 0x0cef,
+ 0x10f0, 0x10f1, 0x10f2, 0x10f3, 0x10f4, 0x10f5, 0x10f6, 0x10f7, 0x20f8, 0x20f9, 0x20fa, 0x20fb, 0x257c, 0x257d, 0x29be, 0x2ddf,
+
+// previous 1s = 1:
+ 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x200f,
+ 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x202f,
+ 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x204f,
+ 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x203e, 0x206f,
+ 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x208f,
+ 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x20af,
+ 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x20cf,
+ 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x207c, 0x207d, 0x20be, 0x20ef,
+ 0x0480, 0x0481, 0x0482, 0x0483, 0x0484, 0x0485, 0x0486, 0x0487, 0x0488, 0x0489, 0x048a, 0x048b, 0x048c, 0x048d, 0x048e, 0x250f,
+ 0x0490, 0x0491, 0x0492, 0x0493, 0x0494, 0x0495, 0x0496, 0x0497, 0x0498, 0x0499, 0x049a, 0x049b, 0x049c, 0x049d, 0x049e, 0x252f,
+ 0x04a0, 0x04a1, 0x04a2, 0x04a3, 0x04a4, 0x04a5, 0x04a6, 0x04a7, 0x04a8, 0x04a9, 0x04aa, 0x04ab, 0x04ac, 0x04ad, 0x04ae, 0x254f,
+ 0x04b0, 0x04b1, 0x04b2, 0x04b3, 0x04b4, 0x04b5, 0x04b6, 0x04b7, 0x04b8, 0x04b9, 0x04ba, 0x04bb, 0x04bc, 0x04bd, 0x253e, 0x256f,
+ 0x08c0, 0x08c1, 0x08c2, 0x08c3, 0x08c4, 0x08c5, 0x08c6, 0x08c7, 0x08c8, 0x08c9, 0x08ca, 0x08cb, 0x08cc, 0x08cd, 0x08ce, 0x298f,
+ 0x08d0, 0x08d1, 0x08d2, 0x08d3, 0x08d4, 0x08d5, 0x08d6, 0x08d7, 0x08d8, 0x08d9, 0x08da, 0x08db, 0x08dc, 0x08dd, 0x08de, 0x29af,
+ 0x0ce0, 0x0ce1, 0x0ce2, 0x0ce3, 0x0ce4, 0x0ce5, 0x0ce6, 0x0ce7, 0x0ce8, 0x0ce9, 0x0cea, 0x0ceb, 0x0cec, 0x0ced, 0x0cee, 0x2dcf,
+ 0x10f0, 0x10f1, 0x10f2, 0x10f3, 0x10f4, 0x10f5, 0x10f6, 0x10f7, 0x20f8, 0x20f9, 0x20fa, 0x20fb, 0x257c, 0x257d, 0x29be, 0x31ef,
+
+// previous 1s = 2:
+ 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x2007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x2017,
+ 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x2027, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x2037,
+ 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x2047, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x2057,
+ 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x2067, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x203e, 0x2077,
+ 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x2087, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x2097,
+ 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x20a7, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x20b7,
+ 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x20c7, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x20d7,
+ 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x20e7, 0x0078, 0x0079, 0x007a, 0x007b, 0x207c, 0x207d, 0x20be, 0x20f7,
+ 0x0480, 0x0481, 0x0482, 0x0483, 0x0484, 0x0485, 0x0486, 0x2507, 0x0488, 0x0489, 0x048a, 0x048b, 0x048c, 0x048d, 0x048e, 0x2517,
+ 0x0490, 0x0491, 0x0492, 0x0493, 0x0494, 0x0495, 0x0496, 0x2527, 0x0498, 0x0499, 0x049a, 0x049b, 0x049c, 0x049d, 0x049e, 0x2537,
+ 0x04a0, 0x04a1, 0x04a2, 0x04a3, 0x04a4, 0x04a5, 0x04a6, 0x2547, 0x04a8, 0x04a9, 0x04aa, 0x04ab, 0x04ac, 0x04ad, 0x04ae, 0x2557,
+ 0x04b0, 0x04b1, 0x04b2, 0x04b3, 0x04b4, 0x04b5, 0x04b6, 0x2567, 0x04b8, 0x04b9, 0x04ba, 0x04bb, 0x04bc, 0x04bd, 0x253e, 0x2577,
+ 0x08c0, 0x08c1, 0x08c2, 0x08c3, 0x08c4, 0x08c5, 0x08c6, 0x2987, 0x08c8, 0x08c9, 0x08ca, 0x08cb, 0x08cc, 0x08cd, 0x08ce, 0x2997,
+ 0x08d0, 0x08d1, 0x08d2, 0x08d3, 0x08d4, 0x08d5, 0x08d6, 0x29a7, 0x08d8, 0x08d9, 0x08da, 0x08db, 0x08dc, 0x08dd, 0x08de, 0x29b7,
+ 0x0ce0, 0x0ce1, 0x0ce2, 0x0ce3, 0x0ce4, 0x0ce5, 0x0ce6, 0x2dc7, 0x0ce8, 0x0ce9, 0x0cea, 0x0ceb, 0x0cec, 0x0ced, 0x0cee, 0x2dd7,
+ 0x10f0, 0x10f1, 0x10f2, 0x10f3, 0x10f4, 0x10f5, 0x10f6, 0x31e7, 0x20f8, 0x20f9, 0x20fa, 0x20fb, 0x257c, 0x257d, 0x29be, 0x41f7,
+
+// previous 1s = 3:
+ 0x0000, 0x0001, 0x0002, 0x2003, 0x0004, 0x0005, 0x0006, 0x200b, 0x0008, 0x0009, 0x000a, 0x2013, 0x000c, 0x000d, 0x000e, 0x201b,
+ 0x0010, 0x0011, 0x0012, 0x2023, 0x0014, 0x0015, 0x0016, 0x202b, 0x0018, 0x0019, 0x001a, 0x2033, 0x001c, 0x001d, 0x001e, 0x203b,
+ 0x0020, 0x0021, 0x0022, 0x2043, 0x0024, 0x0025, 0x0026, 0x204b, 0x0028, 0x0029, 0x002a, 0x2053, 0x002c, 0x002d, 0x002e, 0x205b,
+ 0x0030, 0x0031, 0x0032, 0x2063, 0x0034, 0x0035, 0x0036, 0x206b, 0x0038, 0x0039, 0x003a, 0x2073, 0x003c, 0x003d, 0x203e, 0x207b,
+ 0x0040, 0x0041, 0x0042, 0x2083, 0x0044, 0x0045, 0x0046, 0x208b, 0x0048, 0x0049, 0x004a, 0x2093, 0x004c, 0x004d, 0x004e, 0x209b,
+ 0x0050, 0x0051, 0x0052, 0x20a3, 0x0054, 0x0055, 0x0056, 0x20ab, 0x0058, 0x0059, 0x005a, 0x20b3, 0x005c, 0x005d, 0x005e, 0x20bb,
+ 0x0060, 0x0061, 0x0062, 0x20c3, 0x0064, 0x0065, 0x0066, 0x20cb, 0x0068, 0x0069, 0x006a, 0x20d3, 0x006c, 0x006d, 0x006e, 0x20db,
+ 0x0070, 0x0071, 0x0072, 0x20e3, 0x0074, 0x0075, 0x0076, 0x20eb, 0x0078, 0x0079, 0x007a, 0x20f3, 0x207c, 0x207d, 0x20be, 0x40fb,
+ 0x0480, 0x0481, 0x0482, 0x2503, 0x0484, 0x0485, 0x0486, 0x250b, 0x0488, 0x0489, 0x048a, 0x2513, 0x048c, 0x048d, 0x048e, 0x251b,
+ 0x0490, 0x0491, 0x0492, 0x2523, 0x0494, 0x0495, 0x0496, 0x252b, 0x0498, 0x0499, 0x049a, 0x2533, 0x049c, 0x049d, 0x049e, 0x253b,
+ 0x04a0, 0x04a1, 0x04a2, 0x2543, 0x04a4, 0x04a5, 0x04a6, 0x254b, 0x04a8, 0x04a9, 0x04aa, 0x2553, 0x04ac, 0x04ad, 0x04ae, 0x255b,
+ 0x04b0, 0x04b1, 0x04b2, 0x2563, 0x04b4, 0x04b5, 0x04b6, 0x256b, 0x04b8, 0x04b9, 0x04ba, 0x2573, 0x04bc, 0x04bd, 0x253e, 0x257b,
+ 0x08c0, 0x08c1, 0x08c2, 0x2983, 0x08c4, 0x08c5, 0x08c6, 0x298b, 0x08c8, 0x08c9, 0x08ca, 0x2993, 0x08cc, 0x08cd, 0x08ce, 0x299b,
+ 0x08d0, 0x08d1, 0x08d2, 0x29a3, 0x08d4, 0x08d5, 0x08d6, 0x29ab, 0x08d8, 0x08d9, 0x08da, 0x29b3, 0x08dc, 0x08dd, 0x08de, 0x29bb,
+ 0x0ce0, 0x0ce1, 0x0ce2, 0x2dc3, 0x0ce4, 0x0ce5, 0x0ce6, 0x2dcb, 0x0ce8, 0x0ce9, 0x0cea, 0x2dd3, 0x0cec, 0x0ced, 0x0cee, 0x2ddb,
+ 0x10f0, 0x10f1, 0x10f2, 0x31e3, 0x10f4, 0x10f5, 0x10f6, 0x31eb, 0x20f8, 0x20f9, 0x20fa, 0x41f3, 0x257c, 0x257d, 0x29be, 0x46fb,
+
+// previous 1s = 4:
+ 0x0000, 0x2001, 0x0002, 0x2005, 0x0004, 0x2009, 0x0006, 0x200d, 0x0008, 0x2011, 0x000a, 0x2015, 0x000c, 0x2019, 0x000e, 0x201d,
+ 0x0010, 0x2021, 0x0012, 0x2025, 0x0014, 0x2029, 0x0016, 0x202d, 0x0018, 0x2031, 0x001a, 0x2035, 0x001c, 0x2039, 0x001e, 0x203d,
+ 0x0020, 0x2041, 0x0022, 0x2045, 0x0024, 0x2049, 0x0026, 0x204d, 0x0028, 0x2051, 0x002a, 0x2055, 0x002c, 0x2059, 0x002e, 0x205d,
+ 0x0030, 0x2061, 0x0032, 0x2065, 0x0034, 0x2069, 0x0036, 0x206d, 0x0038, 0x2071, 0x003a, 0x2075, 0x003c, 0x2079, 0x203e, 0x407d,
+ 0x0040, 0x2081, 0x0042, 0x2085, 0x0044, 0x2089, 0x0046, 0x208d, 0x0048, 0x2091, 0x004a, 0x2095, 0x004c, 0x2099, 0x004e, 0x209d,
+ 0x0050, 0x20a1, 0x0052, 0x20a5, 0x0054, 0x20a9, 0x0056, 0x20ad, 0x0058, 0x20b1, 0x005a, 0x20b5, 0x005c, 0x20b9, 0x005e, 0x20bd,
+ 0x0060, 0x20c1, 0x0062, 0x20c5, 0x0064, 0x20c9, 0x0066, 0x20cd, 0x0068, 0x20d1, 0x006a, 0x20d5, 0x006c, 0x20d9, 0x006e, 0x20dd,
+ 0x0070, 0x20e1, 0x0072, 0x20e5, 0x0074, 0x20e9, 0x0076, 0x20ed, 0x0078, 0x20f1, 0x007a, 0x20f5, 0x207c, 0x40f9, 0x20be, 0x417d,
+ 0x0480, 0x2501, 0x0482, 0x2505, 0x0484, 0x2509, 0x0486, 0x250d, 0x0488, 0x2511, 0x048a, 0x2515, 0x048c, 0x2519, 0x048e, 0x251d,
+ 0x0490, 0x2521, 0x0492, 0x2525, 0x0494, 0x2529, 0x0496, 0x252d, 0x0498, 0x2531, 0x049a, 0x2535, 0x049c, 0x2539, 0x049e, 0x253d,
+ 0x04a0, 0x2541, 0x04a2, 0x2545, 0x04a4, 0x2549, 0x04a6, 0x254d, 0x04a8, 0x2551, 0x04aa, 0x2555, 0x04ac, 0x2559, 0x04ae, 0x255d,
+ 0x04b0, 0x2561, 0x04b2, 0x2565, 0x04b4, 0x2569, 0x04b6, 0x256d, 0x04b8, 0x2571, 0x04ba, 0x2575, 0x04bc, 0x2579, 0x253e, 0x467d,
+ 0x08c0, 0x2981, 0x08c2, 0x2985, 0x08c4, 0x2989, 0x08c6, 0x298d, 0x08c8, 0x2991, 0x08ca, 0x2995, 0x08cc, 0x2999, 0x08ce, 0x299d,
+ 0x08d0, 0x29a1, 0x08d2, 0x29a5, 0x08d4, 0x29a9, 0x08d6, 0x29ad, 0x08d8, 0x29b1, 0x08da, 0x29b5, 0x08dc, 0x29b9, 0x08de, 0x29bd,
+ 0x0ce0, 0x2dc1, 0x0ce2, 0x2dc5, 0x0ce4, 0x2dc9, 0x0ce6, 0x2dcd, 0x0ce8, 0x2dd1, 0x0cea, 0x2dd5, 0x0cec, 0x2dd9, 0x0cee, 0x2ddd,
+ 0x10f0, 0x31e1, 0x10f2, 0x31e5, 0x10f4, 0x31e9, 0x10f6, 0x31ed, 0x20f8, 0x41f1, 0x20fa, 0x41f5, 0x257c, 0x46f9, 0x29be, 0x4b7d
+};
+
+/* hdlc_bitstuff_byte
+ * perform HDLC bitstuffing for one input byte (8 bits, LSB first)
+ * parameters:
+ *      cin     input byte
+ *      ones    number of trailing '1' bits in result before this step
+ *      iwb     pointer to output buffer structure (write semaphore must be held)
+ * return value:
+ *      number of trailing '1' bits in result after this step
+ */
+
+static inline int hdlc_bitstuff_byte(struct isowbuf_t *iwb, unsigned char cin,
+                                     int ones)
+{
+        u16 stuff;
+        int shiftinc, newones;
+
+        /* get stuffing information for input byte
+         * value: bit  9.. 0 = result bits
+         *        bit 12..10 = number of trailing '1' bits in result
+         *        bit 14..13 = number of bits added by stuffing
+         */
+        stuff = stufftab[256 * ones + cin];
+        shiftinc = (stuff >> 13) & 3;
+        newones = (stuff >> 10) & 7;
+        stuff &= 0x3ff;
+
+        /* append stuffed byte to output stream */
+        isowbuf_putbits(iwb, stuff, 8 + shiftinc);
+        return newones;
+}
+
+/* hdlc_buildframe
+ * Perform HDLC framing with bitstuffing on a byte buffer
+ * The input buffer is regarded as a sequence of bits, starting with the least
+ * significant bit of the first byte and ending with the most significant bit
+ * of the last byte. A 16 bit FCS is appended as defined by RFC 1662.
+ * Whenever five consecutive '1' bits appear in the resulting bit sequence, a
+ * '0' bit is inserted after them.
+ * The resulting bit string and a closing flag pattern (PPP_FLAG, '01111110')
+ * are appended to the output buffer starting at the given bit position, which
+ * is assumed to already contain a leading flag.
+ * The output buffer must have sufficient length; count + count/5 + 6 bytes
+ * starting at *out are safe and are verified to be present.
+ * parameters:
+ *      in      input buffer
+ *      count   number of bytes in input buffer
+ *      iwb     pointer to output buffer structure (write semaphore must be held)
+ * return value:
+ *      position of end of packet in output buffer on success,
+ *      -EAGAIN if write semaphore busy or buffer full
+ */
+
+static inline int hdlc_buildframe(struct isowbuf_t *iwb,
+                                  unsigned char *in, int count)
+{
+        int ones;
+        u16 fcs;
+        int end;
+        unsigned char c;
+
+        if (isowbuf_freebytes(iwb) < count + count / 5 + 6 ||
+            !isowbuf_startwrite(iwb)) {
+                dbg(DEBUG_ISO, "%s: %d bytes free -> -EAGAIN",
+                    __func__, isowbuf_freebytes(iwb));
+                return -EAGAIN;
+        }
+
+        dump_bytes(DEBUG_STREAM, "snd data", in, count);
+
+        /* bitstuff and checksum input data */
+        fcs = PPP_INITFCS;
+        ones = 0;
+        while (count-- > 0) {
+                c = *in++;
+                ones = hdlc_bitstuff_byte(iwb, c, ones);
+                fcs = crc_ccitt_byte(fcs, c);
+        }
+
+        /* bitstuff and append FCS (complemented, least significant byte first) */
+        fcs ^= 0xffff;
+        ones = hdlc_bitstuff_byte(iwb, fcs & 0x00ff, ones);
+        ones = hdlc_bitstuff_byte(iwb, (fcs >> 8) & 0x00ff, ones);
+
+        /* put closing flag and repeat byte for flag idle */
+        isowbuf_putflag(iwb);
+        end = isowbuf_donewrite(iwb);
+        dump_bytes(DEBUG_STREAM_DUMP, "isowbuf", iwb->data, end + 1);
+        return end;
+}
+
+/* trans_buildframe
+ * Append a block of 'transparent' data to the output buffer,
+ * inverting the bytes.
+ * The output buffer must have sufficient length; count bytes
+ * starting at *out are safe and are verified to be present.
+ * parameters:
+ *      in      input buffer
+ *      count   number of bytes in input buffer
+ *      iwb     pointer to output buffer structure (write semaphore must be held)
+ * return value:
+ *      position of end of packet in output buffer on success,
+ *      -EAGAIN if write semaphore busy or buffer full
+ */
+
+static inline int trans_buildframe(struct isowbuf_t *iwb,
+                                   unsigned char *in, int count)
+{
+        int write;
+        unsigned char c;
+
+        if (unlikely(count <= 0))
+                return atomic_read(&iwb->write); /* better ideas? */
+
+        if (isowbuf_freebytes(iwb) < count ||
+            !isowbuf_startwrite(iwb)) {
+                dbg(DEBUG_ISO, "can't put %d bytes", count);
+                return -EAGAIN;
+        }
+
+        dbg(DEBUG_STREAM, "put %d bytes", count);
+        write = atomic_read(&iwb->write);
+        do {
+                c = gigaset_invtab[*in++];
+                iwb->data[write++] = c;
+                write %= BAS_OUTBUFSIZE;
+        } while (--count > 0);
+        atomic_set(&iwb->write, write);
+        iwb->idle = c;
+
+        return isowbuf_donewrite(iwb);
+}
+
+int gigaset_isoc_buildframe(struct bc_state *bcs, unsigned char *in, int len)
+{
+        int result;
+
+        switch (bcs->proto2) {
+        case ISDN_PROTO_L2_HDLC:
+                result = hdlc_buildframe(bcs->hw.bas->isooutbuf, in, len);
+                dbg(DEBUG_ISO, "%s: %d bytes HDLC -> %d", __func__, len, result);
+                break;
+        default:                        /* assume transparent */
+                result = trans_buildframe(bcs->hw.bas->isooutbuf, in, len);
+                dbg(DEBUG_ISO, "%s: %d bytes trans -> %d", __func__, len, result);
+        }
+        return result;
+}
+
+/* hdlc_putbyte
+ * append byte c to current skb of B channel structure *bcs, updating fcs
+ */
+static inline void hdlc_putbyte(unsigned char c, struct bc_state *bcs)
+{
+        bcs->fcs = crc_ccitt_byte(bcs->fcs, c);
+        if (unlikely(bcs->skb == NULL)) {
+                /* skipping */
+                return;
+        }
+        if (unlikely(bcs->skb->len == SBUFSIZE)) {
+                warn("received oversized packet discarded");
+                bcs->hw.bas->giants++;
+                dev_kfree_skb_any(bcs->skb);
+                bcs->skb = NULL;
+                return;
+        }
+        *gigaset_skb_put_quick(bcs->skb, 1) = c;
+}
+
+/* hdlc_flush
+ * drop partial HDLC data packet
+ */
+static inline void hdlc_flush(struct bc_state *bcs)
+{
+        /* clear skb or allocate new if not skipping */
+        if (likely(bcs->skb != NULL))
+                skb_trim(bcs->skb, 0);
+        else if (!bcs->ignore) {
+                if ((bcs->skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN)) != NULL)
+                        skb_reserve(bcs->skb, HW_HDR_LEN);
+                else
+                        err("could not allocate skb");
+        }
+
+        /* reset packet state */
+        bcs->fcs = PPP_INITFCS;
+}
+
+/* hdlc_done
+ * process completed HDLC data packet
+ */
+static inline void hdlc_done(struct bc_state *bcs)
+{
+        struct sk_buff *procskb;
+
+        if (unlikely(bcs->ignore)) {
+                bcs->ignore--;
+                hdlc_flush(bcs);
+                return;
+        }
+
+        if ((procskb = bcs->skb) == NULL) {
+                /* previous error */
+                dbg(DEBUG_ISO, "%s: skb=NULL", __func__);
+                gigaset_rcv_error(NULL, bcs->cs, bcs);
+        } else if (procskb->len < 2) {
+                notice("received short frame (%d octets)", procskb->len);
+                bcs->hw.bas->runts++;
+                gigaset_rcv_error(procskb, bcs->cs, bcs);
+        } else if (bcs->fcs != PPP_GOODFCS) {
+                notice("frame check error (0x%04x)", bcs->fcs);
+                bcs->hw.bas->fcserrs++;
+                gigaset_rcv_error(procskb, bcs->cs, bcs);
+        } else {
+                procskb->len -= 2;              /* subtract FCS */
+                procskb->tail -= 2;
+                dbg(DEBUG_ISO,
+                    "%s: good frame (%d octets)", __func__, procskb->len);
+                dump_bytes(DEBUG_STREAM,
+                           "rcv data", procskb->data, procskb->len);
+                bcs->hw.bas->goodbytes += procskb->len;
+                gigaset_rcv_skb(procskb, bcs->cs, bcs);
+        }
+
+        if ((bcs->skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN)) != NULL)
+                skb_reserve(bcs->skb, HW_HDR_LEN);
+        else
+                err("could not allocate skb");
+        bcs->fcs = PPP_INITFCS;
+}
+
+/* hdlc_frag
+ * drop HDLC data packet with non-integral last byte
+ */
+static inline void hdlc_frag(struct bc_state *bcs, unsigned inbits)
+{
+        if (unlikely(bcs->ignore)) {
+                bcs->ignore--;
+                hdlc_flush(bcs);
+                return;
+        }
+
+        notice("received partial byte (%d bits)", inbits);
+        bcs->hw.bas->alignerrs++;
+        gigaset_rcv_error(bcs->skb, bcs->cs, bcs);
+
+        if ((bcs->skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN)) != NULL)
+                skb_reserve(bcs->skb, HW_HDR_LEN);
+        else
+                err("could not allocate skb");
+        bcs->fcs = PPP_INITFCS;
+}
+
+/* bit counts lookup table for HDLC bit unstuffing
+ * index: input byte
+ * value: bit 0..3 = number of consecutive '1' bits starting from LSB
+ *        bit 4..6 = number of consecutive '1' bits starting from MSB
+ *                   (replacing 8 by 7 to make it fit; the algorithm won't care)
+ *        bit 7 set if there are 5 or more "interior" consecutive '1' bits
+ */
+static unsigned char bitcounts[256] = {
+  0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x04,
+  0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x05,
+  0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x04,
+  0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x80, 0x06,
+  0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x04,
+  0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x05,
+  0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x04,
+  0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x02, 0x80, 0x81, 0x80, 0x07,
+  0x10, 0x11, 0x10, 0x12, 0x10, 0x11, 0x10, 0x13, 0x10, 0x11, 0x10, 0x12, 0x10, 0x11, 0x10, 0x14,
+  0x10, 0x11, 0x10, 0x12, 0x10, 0x11, 0x10, 0x13, 0x10, 0x11, 0x10, 0x12, 0x10, 0x11, 0x10, 0x15,
+  0x10, 0x11, 0x10, 0x12, 0x10, 0x11, 0x10, 0x13, 0x10, 0x11, 0x10, 0x12, 0x10, 0x11, 0x10, 0x14,
+  0x10, 0x11, 0x10, 0x12, 0x10, 0x11, 0x10, 0x13, 0x10, 0x11, 0x10, 0x12, 0x10, 0x11, 0x90, 0x16,
+  0x20, 0x21, 0x20, 0x22, 0x20, 0x21, 0x20, 0x23, 0x20, 0x21, 0x20, 0x22, 0x20, 0x21, 0x20, 0x24,
+  0x20, 0x21, 0x20, 0x22, 0x20, 0x21, 0x20, 0x23, 0x20, 0x21, 0x20, 0x22, 0x20, 0x21, 0x20, 0x25,
+  0x30, 0x31, 0x30, 0x32, 0x30, 0x31, 0x30, 0x33, 0x30, 0x31, 0x30, 0x32, 0x30, 0x31, 0x30, 0x34,
+  0x40, 0x41, 0x40, 0x42, 0x40, 0x41, 0x40, 0x43, 0x50, 0x51, 0x50, 0x52, 0x60, 0x61, 0x70, 0x78
+};
+
+/* hdlc_unpack
+ * perform HDLC frame processing (bit unstuffing, flag detection, FCS calculation)
+ * on a sequence of received data bytes (8 bits each, LSB first)
+ * pass on successfully received, complete frames as SKBs via gigaset_rcv_skb
+ * notify of errors via gigaset_rcv_error
+ * tally frames, errors etc. in BC structure counters
+ * parameters:
+ *      src     received data
+ *      count   number of received bytes
+ *      bcs     receiving B channel structure
+ */
+static inline void hdlc_unpack(unsigned char *src, unsigned count,
+                               struct bc_state *bcs)
+{
+        struct bas_bc_state *ubc;
+        int inputstate;
+        unsigned seqlen, inbyte, inbits;
+
+        IFNULLRET(bcs);
+        ubc = bcs->hw.bas;
+        IFNULLRET(ubc);
+
+        /* load previous state:
+         * inputstate = set of flag bits:
+         * - INS_flag_hunt: no complete opening flag received since connection setup or last abort
+         * - INS_have_data: at least one complete data byte received since last flag
+         * seqlen = number of consecutive '1' bits in last 7 input stream bits (0..7)
+         * inbyte = accumulated partial data byte (if !INS_flag_hunt)
+         * inbits = number of valid bits in inbyte, starting at LSB (0..6)
+         */
+        inputstate = bcs->inputstate;
+        seqlen = ubc->seqlen;
+        inbyte = ubc->inbyte;
+        inbits = ubc->inbits;
+
+        /* bit unstuffing a byte a time
+         * Take your time to understand this; it's straightforward but tedious.
+         * The "bitcounts" lookup table is used to speed up the counting of
+         * leading and trailing '1' bits.
+         */
+        while (count--) {
+                unsigned char c = *src++;
+                unsigned char tabentry = bitcounts[c];
+                unsigned lead1 = tabentry & 0x0f;
+                unsigned trail1 = (tabentry >> 4) & 0x0f;
+
+                seqlen += lead1;
+
+                if (unlikely(inputstate & INS_flag_hunt)) {
+                        if (c == PPP_FLAG) {
+                                /* flag-in-one */
+                                inputstate &= ~(INS_flag_hunt | INS_have_data);
+                                inbyte = 0;
+                                inbits = 0;
+                        } else if (seqlen == 6 && trail1 != 7) {
+                                /* flag completed & not followed by abort */
+                                inputstate &= ~(INS_flag_hunt | INS_have_data);
+                                inbyte = c >> (lead1 + 1);
+                                inbits = 7 - lead1;
+                                if (trail1 >= 8) {
+                                        /* interior stuffing: omitting the MSB handles most cases */
+                                        inbits--;
+                                        /* correct the incorrectly handled cases individually */
+                                        switch (c) {
+                                        case 0xbe:
+                                                inbyte = 0x3f;
+                                                break;
+                                        }
+                                }
+                        }
+                        /* else: continue flag-hunting */
+                } else if (likely(seqlen < 5 && trail1 < 7)) {
+                        /* streamlined case: 8 data bits, no stuffing */
+                        inbyte |= c << inbits;
+                        hdlc_putbyte(inbyte & 0xff, bcs);
+                        inputstate |= INS_have_data;
+                        inbyte >>= 8;
+                        /* inbits unchanged */
+                } else if (likely(seqlen == 6 && inbits == 7 - lead1 &&
+                                  trail1 + 1 == inbits &&
+                                  !(inputstate & INS_have_data))) {
+                        /* streamlined case: flag idle - state unchanged */
+                } else if (unlikely(seqlen > 6)) {
+                        /* abort sequence */
+                        ubc->aborts++;
+                        hdlc_flush(bcs);
+                        inputstate |= INS_flag_hunt;
+                } else if (seqlen == 6) {
+                        /* closing flag, including (6 - lead1) '1's and one '0' from inbits */
+                        if (inbits > 7 - lead1) {
+                                hdlc_frag(bcs, inbits + lead1 - 7);
+                                inputstate &= ~INS_have_data;
+                        } else {
+                                if (inbits < 7 - lead1)
+                                        ubc->stolen0s ++;
+                                if (inputstate & INS_have_data) {
+                                        hdlc_done(bcs);
+                                        inputstate &= ~INS_have_data;
+                                }
+                        }
+
+                        if (c == PPP_FLAG) {
+                                /* complete flag, LSB overlaps preceding flag */
+                                ubc->shared0s ++;
+                                inbits = 0;
+                                inbyte = 0;
+                        } else if (trail1 != 7) {
+                                /* remaining bits */
+                                inbyte = c >> (lead1 + 1);
+                                inbits = 7 - lead1;
+                                if (trail1 >= 8) {
+                                        /* interior stuffing: omitting the MSB handles most cases */
+                                        inbits--;
+                                        /* correct the incorrectly handled cases individually */
+                                        switch (c) {
+                                        case 0xbe:
+                                                inbyte = 0x3f;
+                                                break;
+                                        }
+                                }
+                        } else {
+                                /* abort sequence follows, skb already empty anyway */
+                                ubc->aborts++;
+                                inputstate |= INS_flag_hunt;
+                        }
+                } else { /* (seqlen < 6) && (seqlen == 5 || trail1 >= 7) */
+
+                        if (c == PPP_FLAG) {
+                                /* complete flag */
+                                if (seqlen == 5)
+                                        ubc->stolen0s++;
+                                if (inbits) {
+                                        hdlc_frag(bcs, inbits);
+                                        inbits = 0;
+                                        inbyte = 0;
+                                } else if (inputstate & INS_have_data)
+                                        hdlc_done(bcs);
+                                inputstate &= ~INS_have_data;
+                        } else if (trail1 == 7) {
+                                /* abort sequence */
+                                ubc->aborts++;
+                                hdlc_flush(bcs);
+                                inputstate |= INS_flag_hunt;
+                        } else {
+                                /* stuffed data */
+                                if (trail1 < 7) { /* => seqlen == 5 */
+                                        /* stuff bit at position lead1, no interior stuffing */
+                                        unsigned char mask = (1 << lead1) - 1;
+                                        c = (c & mask) | ((c & ~mask) >> 1);
+                                        inbyte |= c << inbits;
+                                        inbits += 7;
+                                } else if (seqlen < 5) { /* trail1 >= 8 */
+                                        /* interior stuffing: omitting the MSB handles most cases */
+                                        /* correct the incorrectly handled cases individually */
+                                        switch (c) {
+                                        case 0xbe:
+                                                c = 0x7e;
+                                                break;
+                                        }
+                                        inbyte |= c << inbits;
+                                        inbits += 7;
+                                } else { /* seqlen == 5 && trail1 >= 8 */
+
+                                        /* stuff bit at lead1 *and* interior stuffing */
+                                        switch (c) {    /* unstuff individually */
+                                        case 0x7d:
+                                                c = 0x3f;
+                                                break;
+                                        case 0xbe:
+                                                c = 0x3f;
+                                                break;
+                                        case 0x3e:
+                                                c = 0x1f;
+                                                break;
+                                        case 0x7c:
+                                                c = 0x3e;
+                                                break;
+                                        }
+                                        inbyte |= c << inbits;
+                                        inbits += 6;
+                                }
+                                if (inbits >= 8) {
+                                        inbits -= 8;
+                                        hdlc_putbyte(inbyte & 0xff, bcs);
+                                        inputstate |= INS_have_data;
+                                        inbyte >>= 8;
+                                }
+                        }
+                }
+                seqlen = trail1 & 7;
+        }
+
+        /* save new state */
+        bcs->inputstate = inputstate;
+        ubc->seqlen = seqlen;
+        ubc->inbyte = inbyte;
+        ubc->inbits = inbits;
+}
+
+/* trans_receive
+ * pass on received USB frame transparently as SKB via gigaset_rcv_skb
+ * invert bytes
+ * tally frames, errors etc. in BC structure counters
+ * parameters:
+ *      src     received data
+ *      count   number of received bytes
+ *      bcs     receiving B channel structure
+ */
+static inline void trans_receive(unsigned char *src, unsigned count,
+                                 struct bc_state *bcs)
+{
+        struct sk_buff *skb;
+        int dobytes;
+        unsigned char *dst;
+
+        if (unlikely(bcs->ignore)) {
+                bcs->ignore--;
+                hdlc_flush(bcs);
+                return;
+        }
+        if (unlikely((skb = bcs->skb) == NULL)) {
+                bcs->skb = skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN);
+                if (!skb) {
+                        err("could not allocate skb");
+                        return;
+                }
+                skb_reserve(skb, HW_HDR_LEN);
+        }
+        bcs->hw.bas->goodbytes += skb->len;
+        dobytes = TRANSBUFSIZE - skb->len;
+        while (count > 0) {
+                dst = skb_put(skb, count < dobytes ? count : dobytes);
+                while (count > 0 && dobytes > 0) {
+                        *dst++ = gigaset_invtab[*src++];
+                        count--;
+                        dobytes--;
+                }
+                if (dobytes == 0) {
+                        gigaset_rcv_skb(skb, bcs->cs, bcs);
+                        bcs->skb = skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN);
+                        if (!skb) {
+                                err("could not allocate skb");
+                                return;
+                        }
+                        skb_reserve(bcs->skb, HW_HDR_LEN);
+                        dobytes = TRANSBUFSIZE;
+                }
+        }
+}
+
+void gigaset_isoc_receive(unsigned char *src, unsigned count, struct bc_state *bcs)
+{
+        switch (bcs->proto2) {
+        case ISDN_PROTO_L2_HDLC:
+                hdlc_unpack(src, count, bcs);
+                break;
+        default:                /* assume transparent */
+                trans_receive(src, count, bcs);
+        }
+}
+
+/* == data input =========================================================== */
+
+static void cmd_loop(unsigned char *src, int numbytes, struct inbuf_t *inbuf)
+{
+        struct cardstate *cs = inbuf->cs;
+        unsigned cbytes      = cs->cbytes;
+
+        while (numbytes--) {
+                /* copy next character, check for end of line */
+                switch (cs->respdata[cbytes] = *src++) {
+                case '\r':
+                case '\n':
+                        /* end of line */
+                        dbg(DEBUG_TRANSCMD, "%s: End of Command (%d Bytes)",
+                            __func__, cbytes);
+                        cs->cbytes = cbytes;
+                        gigaset_handle_modem_response(cs);
+                        cbytes = 0;
+                        break;
+                default:
+                        /* advance in line buffer, checking for overflow */
+                        if (cbytes < MAX_RESP_SIZE - 1)
+                                cbytes++;
+                        else
+                                warn("response too large");
+                }
+        }
+
+        /* save state */
+        cs->cbytes = cbytes;
+}
+
+
+/* process a block of data received through the control channel
+ */
+void gigaset_isoc_input(struct inbuf_t *inbuf)
+{
+        struct cardstate *cs = inbuf->cs;
+        unsigned tail, head, numbytes;
+        unsigned char *src;
+
+        head = atomic_read(&inbuf->head);
+        while (head != (tail = atomic_read(&inbuf->tail))) {
+                dbg(DEBUG_INTR, "buffer state: %u -> %u", head, tail);
+                if (head > tail)
+                        tail = RBUFSIZE;
+                src = inbuf->data + head;
+                numbytes = tail - head;
+                dbg(DEBUG_INTR, "processing %u bytes", numbytes);
+
+                if (atomic_read(&cs->mstate) == MS_LOCKED) {
+                        gigaset_dbg_buffer(DEBUG_LOCKCMD, "received response",
+                                           numbytes, src, 0);
+                        gigaset_if_receive(inbuf->cs, src, numbytes);
+                } else {
+                        gigaset_dbg_buffer(DEBUG_CMD, "received response",
+                                           numbytes, src, 0);
+                        cmd_loop(src, numbytes, inbuf);
+                }
+
+                head += numbytes;
+                if (head == RBUFSIZE)
+                        head = 0;
+                dbg(DEBUG_INTR, "setting head to %u", head);
+                atomic_set(&inbuf->head, head);
+        }
+}
+
+
+/* == data output ========================================================== */
+
+/* gigaset_send_skb
+ * called by common.c to queue an skb for sending
+ * and start transmission if necessary
+ * parameters:
+ *      B Channel control structure
+ *      skb
+ * return value:
+ *      number of bytes accepted for sending
+ *      (skb->len if ok, 0 if out of buffer space)
+ *      or error code (< 0, eg. -EINVAL)
+ */
+int gigaset_isoc_send_skb(struct bc_state *bcs, struct sk_buff *skb)
+{
+        int len;
+
+        IFNULLRETVAL(bcs, -EFAULT);
+        IFNULLRETVAL(skb, -EFAULT);
+        len = skb->len;
+
+        skb_queue_tail(&bcs->squeue, skb);
+        dbg(DEBUG_ISO,
+            "%s: skb queued, qlen=%d", __func__, skb_queue_len(&bcs->squeue));
+
+        /* tasklet submits URB if necessary */
+        tasklet_schedule(&bcs->hw.bas->sent_tasklet);
+
+        return len;     /* ok so far */
+}
diff --git a/drivers/isdn/gigaset/proc.c b/drivers/isdn/gigaset/proc.c
new file mode 100644
index 0000000000..c6915fa2be
--- /dev/null
+++ b/drivers/isdn/gigaset/proc.c
@@ -0,0 +1,81 @@
+/*
+ * Stuff used by all variants of the driver
+ *
+ * Copyright (c) 2001 by Stefan Eilers <Eilers.Stefan@epost.de>,
+ *                       Hansjoerg Lipp <hjlipp@web.de>,
+ *                       Tilman Schmidt <tilman@imap.cc>.
+ *
+ * =====================================================================
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License as
+ *      published by the Free Software Foundation; either version 2 of
+ *      the License, or (at your option) any later version.
+ * =====================================================================
+ * ToDo: ...
+ * =====================================================================
+ * Version: $Id: proc.c,v 1.5.2.13 2006/02/04 18:28:16 hjlipp Exp $
+ * =====================================================================
+ */
+
+#include "gigaset.h"
+#include <linux/ctype.h>
+
+static ssize_t show_cidmode(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct usb_interface *intf = to_usb_interface(dev);
+        struct cardstate *cs = usb_get_intfdata(intf);
+        return sprintf(buf, "%d\n", atomic_read(&cs->cidmode)); // FIXME use scnprintf for 13607 bit architectures (if PAGE_SIZE==4096)
+}
+
+static ssize_t set_cidmode(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct usb_interface *intf = to_usb_interface(dev);
+        struct cardstate *cs = usb_get_intfdata(intf);
+        long int value;
+        char *end;
+
+        value = simple_strtol(buf, &end, 0);
+        while (*end)
+                if (!isspace(*end++))
+                        return -EINVAL;
+        if (value < 0 || value > 1)
+                        return -EINVAL;
+
+        if (down_interruptible(&cs->sem))
+                return -ERESTARTSYS; // FIXME -EINTR?
+
+        cs->waiting = 1;
+        if (!gigaset_add_event(cs, &cs->at_state, EV_PROC_CIDMODE,
+                               NULL, value, NULL)) {
+                cs->waiting = 0;
+                up(&cs->sem);
+                return -ENOMEM;
+        }
+
+        dbg(DEBUG_CMD, "scheduling PROC_CIDMODE");
+        gigaset_schedule_event(cs);
+
+        wait_event(cs->waitqueue, !cs->waiting);
+
+        up(&cs->sem);
+
+        return count;
+}
+
+static DEVICE_ATTR(cidmode, S_IRUGO|S_IWUSR, show_cidmode, set_cidmode);
+
+/* free sysfs for device */
+void gigaset_free_dev_sysfs(struct usb_interface *interface)
+{
+        dbg(DEBUG_INIT, "removing sysfs entries");
+        device_remove_file(&interface->dev, &dev_attr_cidmode);
+}
+EXPORT_SYMBOL_GPL(gigaset_free_dev_sysfs);
+
+/* initialize sysfs for device */
+void gigaset_init_dev_sysfs(struct usb_interface *interface)
+{
+        dbg(DEBUG_INIT, "setting up sysfs");
+        device_create_file(&interface->dev, &dev_attr_cidmode);
+}
+EXPORT_SYMBOL_GPL(gigaset_init_dev_sysfs);
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
new file mode 100644
index 0000000000..323fc7349d
--- /dev/null
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -0,0 +1,1008 @@
+/*
+ * USB driver for Gigaset 307x directly or using M105 Data.
+ *
+ * Copyright (c) 2001 by Stefan Eilers <Eilers.Stefan@epost.de>
+ *                   and Hansjoerg Lipp <hjlipp@web.de>.
+ *
+ * This driver was derived from the USB skeleton driver by
+ * Greg Kroah-Hartman <greg@kroah.com>
+ *
+ * =====================================================================
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License as
+ *      published by the Free Software Foundation; either version 2 of
+ *      the License, or (at your option) any later version.
+ * =====================================================================
+ * ToDo: ...
+ * =====================================================================
+ * Version: $Id: usb-gigaset.c,v 1.85.4.18 2006/02/04 18:28:16 hjlipp Exp $
+ * =====================================================================
+ */
+
+#include "gigaset.h"
+
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/usb.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+
+/* Version Information */
+#define DRIVER_AUTHOR "Hansjoerg Lipp <hjlipp@web.de>, Stefan Eilers <Eilers.Stefan@epost.de>"
+#define DRIVER_DESC "USB Driver for Gigaset 307x using M105"
+
+/* Module parameters */
+
+static int startmode = SM_ISDN;
+static int cidmode = 1;
+
+module_param(startmode, int, S_IRUGO);
+module_param(cidmode, int, S_IRUGO);
+MODULE_PARM_DESC(startmode, "start in isdn4linux mode");
+MODULE_PARM_DESC(cidmode, "Call-ID mode");
+
+#define GIGASET_MINORS     1
+#define GIGASET_MINOR      8
+#define GIGASET_MODULENAME "usb_gigaset"
+#define GIGASET_DEVFSNAME  "gig/usb/"
+#define GIGASET_DEVNAME    "ttyGU"
+
+#define IF_WRITEBUF 2000 //FIXME  // WAKEUP_CHARS: 256
+
+/* Values for the Gigaset M105 Data */
+#define USB_M105_VENDOR_ID      0x0681
+#define USB_M105_PRODUCT_ID     0x0009
+
+/* table of devices that work with this driver */
+static struct usb_device_id gigaset_table [] = {
+        { USB_DEVICE(USB_M105_VENDOR_ID, USB_M105_PRODUCT_ID) },
+        { }                                     /* Terminating entry */
+};
+
+MODULE_DEVICE_TABLE(usb, gigaset_table);
+
+/* Get a minor range for your devices from the usb maintainer */
+#define USB_SKEL_MINOR_BASE     200
+
+
+/*
+ * Control requests (empty fields: 00)
+ *
+ *       RT|RQ|VALUE|INDEX|LEN  |DATA
+ * In:
+ *       C1 08             01
+ *            Get flags (1 byte). Bits: 0=dtr,1=rts,3-7:?
+ *       C1 0F             ll ll
+ *            Get device information/status (llll: 0x200 and 0x40 seen).
+ *            Real size: I only saw MIN(llll,0x64).
+ *            Contents: seems to be always the same...
+ *              offset 0x00: Length of this structure (0x64) (len: 1,2,3 bytes)
+ *              offset 0x3c: String (16 bit chars): "MCCI USB Serial V2.0"
+ *              rest:        ?
+ * Out:
+ *       41 11
+ *            Initialize/reset device ?
+ *       41 00 xx 00
+ *            ? (xx=00 or 01; 01 on start, 00 on close)
+ *       41 07 vv mm
+ *            Set/clear flags vv=value, mm=mask (see RQ 08)
+ *       41 12 xx
+ *            Used before the following configuration requests are issued
+ *            (with xx=0x0f). I've seen other values<0xf, though.
+ *       41 01 xx xx
+ *            Set baud rate. xxxx=ceil(0x384000/rate)=trunc(0x383fff/rate)+1.
+ *       41 03 ps bb
+ *            Set byte size and parity. p:  0x20=even,0x10=odd,0x00=no parity
+ *                                     [    0x30: m, 0x40: s           ]
+ *                                     [s:  0: 1 stop bit; 1: 1.5; 2: 2]
+ *                                      bb: bits/byte (seen 7 and 8)
+ *       41 13 -- -- -- -- 10 00 ww 00 00 00 xx 00 00 00 yy 00 00 00 zz 00 00 00
+ *            ??
+ *            Initialization: 01, 40, 00, 00
+ *            Open device:    00  40, 00, 00
+ *            yy and zz seem to be equal, either 0x00 or 0x0a
+ *            (ww,xx) pairs seen: (00,00), (00,40), (01,40), (09,80), (19,80)
+ *       41 19 -- -- -- -- 06 00 00 00 00 xx 11 13
+ *            Used after every "configuration sequence" (RQ 12, RQs 01/03/13).
+ *            xx is usually 0x00 but was 0x7e before starting data transfer
+ *            in unimodem mode. So, this might be an array of characters that need
+ *            special treatment ("commit all bufferd data"?), 11=^Q, 13=^S.
+ *
+ * Unimodem mode: use "modprobe ppp_async flag_time=0" as the device _needs_ two
+ * flags per packet.
+ */
+
+static int gigaset_probe(struct usb_interface *interface,
+                         const struct usb_device_id *id);
+static void gigaset_disconnect(struct usb_interface *interface);
+
+static struct gigaset_driver *driver = NULL;
+static struct cardstate *cardstate = NULL;
+
+/* usb specific object needed to register this driver with the usb subsystem */
+static struct usb_driver gigaset_usb_driver = {
+        .name =         GIGASET_MODULENAME,
+        .probe =        gigaset_probe,
+        .disconnect =   gigaset_disconnect,
+        .id_table =     gigaset_table,
+};
+
+struct usb_cardstate {
+        struct usb_device       *udev;                  /* save off the usb device pointer */
+        struct usb_interface    *interface;             /* the interface for this device */
+        atomic_t                busy;                   /* bulk output in progress */
+
+        /* Output buffer for commands (M105: and data)*/
+        unsigned char           *bulk_out_buffer;       /* the buffer to send data */
+        int                     bulk_out_size;          /* the size of the send buffer */
+        __u8                    bulk_out_endpointAddr;  /* the address of the bulk out endpoint */
+        struct urb              *bulk_out_urb;          /* the urb used to transmit data */
+
+        /* Input buffer for command responses (M105: and data)*/
+        int                     rcvbuf_size;            /* the size of the receive buffer */
+        struct urb              *read_urb;              /* the urb used to receive data */
+        __u8                    int_in_endpointAddr;    /* the address of the bulk in endpoint */
+
+        char                    bchars[6];              /* req. 0x19 */
+};
+
+struct usb_bc_state {};
+
+static inline unsigned tiocm_to_gigaset(unsigned state)
+{
+        return ((state & TIOCM_DTR) ? 1 : 0) | ((state & TIOCM_RTS) ? 2 : 0);
+}
+
+#ifdef CONFIG_GIGASET_UNDOCREQ
+/* WARNING: EXPERIMENTAL! */
+static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state,
+                                  unsigned new_state)
+{
+        unsigned mask, val;
+        int r;
+
+        mask = tiocm_to_gigaset(old_state ^ new_state);
+        val = tiocm_to_gigaset(new_state);
+
+        dbg(DEBUG_USBREQ, "set flags 0x%02x with mask 0x%02x", val, mask);
+        r = usb_control_msg(cs->hw.usb->udev,
+                            usb_sndctrlpipe(cs->hw.usb->udev, 0), 7, 0x41,
+                            (val & 0xff) | ((mask & 0xff) << 8), 0,
+                            NULL, 0, 2000 /*timeout??*/); // don't use this in an interrupt/BH
+        if (r < 0)
+                return r;
+        //..
+        return 0;
+}
+
+static int set_value(struct cardstate *cs, u8 req, u16 val)
+{
+        int r, r2;
+
+        dbg(DEBUG_USBREQ, "request %02x (%04x)", (unsigned)req, (unsigned)val);
+        r = usb_control_msg(cs->hw.usb->udev,
+                            usb_sndctrlpipe(cs->hw.usb->udev, 0), 0x12, 0x41,
+                            0xf /*?*/, 0,
+                            NULL, 0, 2000 /*?*/); /* no idea, what this does */
+        if (r < 0) {
+                err("error %d on request 0x12", -r);
+                return r;
+        }
+
+        r = usb_control_msg(cs->hw.usb->udev,
+                            usb_sndctrlpipe(cs->hw.usb->udev, 0), req, 0x41,
+                            val, 0,
+                            NULL, 0, 2000 /*?*/);
+        if (r < 0)
+                err("error %d on request 0x%02x", -r, (unsigned)req);
+
+        r2 = usb_control_msg(cs->hw.usb->udev,
+                             usb_sndctrlpipe(cs->hw.usb->udev, 0), 0x19, 0x41,
+                             0, 0, cs->hw.usb->bchars, 6, 2000 /*?*/);
+        if (r2 < 0)
+                err("error %d on request 0x19", -r2);
+
+        return r < 0 ? r : (r2 < 0 ? r2 : 0);
+}
+
+/* WARNING: HIGHLY EXPERIMENTAL! */
+// don't use this in an interrupt/BH
+static int gigaset_baud_rate(struct cardstate *cs, unsigned cflag)
+{
+        u16 val;
+        u32 rate;
+
+        cflag &= CBAUD;
+
+        switch (cflag) {
+        //FIXME more values?
+        case    B300: rate =     300; break;
+        case    B600: rate =     600; break;
+        case   B1200: rate =    1200; break;
+        case   B2400: rate =    2400; break;
+        case   B4800: rate =    4800; break;
+        case   B9600: rate =    9600; break;
+        case  B19200: rate =   19200; break;
+        case  B38400: rate =   38400; break;
+        case  B57600: rate =   57600; break;
+        case B115200: rate =  115200; break;
+        default:
+                rate =  9600;
+                err("unsupported baudrate request 0x%x,"
+                    " using default of B9600", cflag);
+        }
+
+        val = 0x383fff / rate + 1;
+
+        return set_value(cs, 1, val);
+}
+
+/* WARNING: HIGHLY EXPERIMENTAL! */
+// don't use this in an interrupt/BH
+static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
+{
+        u16 val = 0;
+
+        /* set the parity */
+        if (cflag & PARENB)
+                val |= (cflag & PARODD) ? 0x10 : 0x20;
+
+        /* set the number of data bits */
+        switch (cflag & CSIZE) {
+        case CS5:
+                val |= 5 << 8; break;
+        case CS6:
+                val |= 6 << 8; break;
+        case CS7:
+                val |= 7 << 8; break;
+        case CS8:
+                val |= 8 << 8; break;
+        default:
+                err("CSIZE was not CS5-CS8, using default of 8");
+                val |= 8 << 8;
+                break;
+        }
+
+        /* set the number of stop bits */
+        if (cflag & CSTOPB) {
+                if ((cflag & CSIZE) == CS5)
+                        val |= 1; /* 1.5 stop bits */ //FIXME is this okay?
+                else
+                        val |= 2; /* 2 stop bits */
+        }
+
+        return set_value(cs, 3, val);
+}
+
+#else
+static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state,
+                                  unsigned new_state)
+{
+        return -EINVAL;
+}
+
+static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
+{
+        return -EINVAL;
+}
+
+static int gigaset_baud_rate(struct cardstate *cs, unsigned cflag)
+{
+        return -EINVAL;
+}
+#endif
+
+
+ /*================================================================================================================*/
+static int gigaset_init_bchannel(struct bc_state *bcs)
+{
+        /* nothing to do for M10x */
+        gigaset_bchannel_up(bcs);
+        return 0;
+}
+
+static int gigaset_close_bchannel(struct bc_state *bcs)
+{
+        /* nothing to do for M10x */
+        gigaset_bchannel_down(bcs);
+        return 0;
+}
+
+//void send_ack_to_LL(void *data);
+static int write_modem(struct cardstate *cs);
+static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb);
+
+
+/* Handling of send queue. If there is already a skb opened, put data to
+ * the transfer buffer by calling "write_modem". Otherwise take a new skb out of the queue.
+ * This function will be called by the ISR via "transmit_chars" (USB: B-Channel Bulk callback handler
+ * via immediate task queue) or by writebuf_from_LL if the LL wants to transmit data.
+ */
+static void gigaset_modem_fill(unsigned long data)
+{
+        struct cardstate *cs = (struct cardstate *) data;
+        struct bc_state *bcs = &cs->bcs[0]; /* only one channel */
+        struct cmdbuf_t *cb;
+        unsigned long flags;
+        int again;
+
+        dbg(DEBUG_OUTPUT, "modem_fill");
+
+        if (atomic_read(&cs->hw.usb->busy)) {
+                dbg(DEBUG_OUTPUT, "modem_fill: busy");
+                return;
+        }
+
+        do {
+                again = 0;
+                if (!bcs->tx_skb) { /* no skb is being sent */
+                        spin_lock_irqsave(&cs->cmdlock, flags);
+                        cb = cs->cmdbuf;
+                        spin_unlock_irqrestore(&cs->cmdlock, flags);
+                        if (cb) { /* commands to send? */
+                                dbg(DEBUG_OUTPUT, "modem_fill: cb");
+                                if (send_cb(cs, cb) < 0) {
+                                        dbg(DEBUG_OUTPUT,
+                                            "modem_fill: send_cb failed");
+                                        again = 1; /* no callback will be called! */
+                                }
+                        } else { /* skbs to send? */
+                                bcs->tx_skb = skb_dequeue(&bcs->squeue);
+                                if (bcs->tx_skb)
+                                        dbg(DEBUG_INTR,
+                                            "Dequeued skb (Adr: %lx)!",
+                                            (unsigned long) bcs->tx_skb);
+                        }
+                }
+
+                if (bcs->tx_skb) {
+                        dbg(DEBUG_OUTPUT, "modem_fill: tx_skb");
+                        if (write_modem(cs) < 0) {
+                                dbg(DEBUG_OUTPUT,
+                                    "modem_fill: write_modem failed");
+                                // FIXME should we tell the LL?
+                                again = 1; /* no callback will be called! */
+                        }
+                }
+        } while (again);
+}
+
+/**
+ *      gigaset_read_int_callback
+ *
+ *      It is called if the data was received from the device. This is almost similiar to
+ *      the interrupt service routine in the serial device.
+ */
+static void gigaset_read_int_callback(struct urb *urb, struct pt_regs *regs)
+{
+        int resubmit = 0;
+        int r;
+        struct cardstate *cs;
+        unsigned numbytes;
+        unsigned char *src;
+        //unsigned long flags;
+        struct inbuf_t *inbuf;
+
+        IFNULLRET(urb);
+        inbuf = (struct inbuf_t *) urb->context;
+        IFNULLRET(inbuf);
+        //spin_lock_irqsave(&inbuf->lock, flags);
+        cs = inbuf->cs;
+        IFNULLGOTO(cs, exit);
+        IFNULLGOTO(cardstate, exit);
+
+        if (!atomic_read(&cs->connected)) {
+                err("%s: disconnected", __func__);
+                goto exit;
+        }
+
+        if (!urb->status) {
+                numbytes = urb->actual_length;
+
+                if (numbytes) {
+                        src = inbuf->rcvbuf;
+                        if (unlikely(*src))
+                                warn("%s: There was no leading 0, but 0x%02x!",
+                                     __func__, (unsigned) *src);
+                        ++src; /* skip leading 0x00 */
+                        --numbytes;
+                        if (gigaset_fill_inbuf(inbuf, src, numbytes)) {
+                                dbg(DEBUG_INTR, "%s-->BH", __func__);
+                                gigaset_schedule_event(inbuf->cs);
+                        }
+                } else
+                        dbg(DEBUG_INTR, "Received zero block length");
+                resubmit = 1;
+        } else {
+                /* The urb might have been killed. */
+                dbg(DEBUG_ANY, "%s - nonzero read bulk status received: %d",
+                    __func__, urb->status);
+                if (urb->status != -ENOENT) /* not killed */
+                        resubmit = 1;
+        }
+exit:
+        //spin_unlock_irqrestore(&inbuf->lock, flags);
+        if (resubmit) {
+                r = usb_submit_urb(urb, SLAB_ATOMIC);
+                if (r)
+                        err("error %d when resubmitting urb.", -r);
+        }
+}
+
+
+/* This callback routine is called when data was transmitted to a B-Channel.
+ * Therefore it has to check if there is still data to transmit. This
+ * happens by calling modem_fill via task queue.
+ *
+ */
+static void gigaset_write_bulk_callback(struct urb *urb, struct pt_regs *regs)
+{
+        struct cardstate *cs = (struct cardstate *) urb->context;
+
+        IFNULLRET(cs);
+#ifdef CONFIG_GIGASET_DEBUG
+        if (!atomic_read(&cs->connected)) {
+                err("%s:not connected", __func__);
+                return;
+        }
+#endif
+        if (urb->status)
+                err("bulk transfer failed (status %d)", -urb->status); /* That's all we can do. Communication problems
+                                                                           are handeled by timeouts or network protocols */
+
+        atomic_set(&cs->hw.usb->busy, 0);
+        tasklet_schedule(&cs->write_tasklet);
+}
+
+static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb)
+{
+        struct cmdbuf_t *tcb;
+        unsigned long flags;
+        int count;
+        int status = -ENOENT; // FIXME
+        struct usb_cardstate *ucs = cs->hw.usb;
+
+        do {
+                if (!cb->len) {
+                        tcb = cb;
+
+                        spin_lock_irqsave(&cs->cmdlock, flags);
+                        cs->cmdbytes -= cs->curlen;
+                        dbg(DEBUG_OUTPUT, "send_cb: sent %u bytes, %u left",
+                            cs->curlen, cs->cmdbytes);
+                        cs->cmdbuf = cb = cb->next;
+                        if (cb) {
+                                cb->prev = NULL;
+                                cs->curlen = cb->len;
+                        } else {
+                                cs->lastcmdbuf = NULL;
+                                cs->curlen = 0;
+                        }
+                        spin_unlock_irqrestore(&cs->cmdlock, flags);
+
+                        if (tcb->wake_tasklet)
+                                tasklet_schedule(tcb->wake_tasklet);
+                        kfree(tcb);
+                }
+                if (cb) {
+                        count = min(cb->len, ucs->bulk_out_size);
+                        usb_fill_bulk_urb(ucs->bulk_out_urb, ucs->udev,
+                                          usb_sndbulkpipe(ucs->udev,
+                                             ucs->bulk_out_endpointAddr & 0x0f),
+                                          cb->buf + cb->offset, count,
+                                          gigaset_write_bulk_callback, cs);
+
+                        cb->offset += count;
+                        cb->len -= count;
+                        atomic_set(&ucs->busy, 1);
+                        dbg(DEBUG_OUTPUT, "send_cb: send %d bytes", count);
+
+                        status = usb_submit_urb(ucs->bulk_out_urb, SLAB_ATOMIC);
+                        if (status) {
+                                atomic_set(&ucs->busy, 0);
+                                err("could not submit urb (error %d).",
+                                    -status);
+                                cb->len = 0; /* skip urb => remove cb+wakeup in next loop cycle */
+                        }
+                }
+        } while (cb && status); /* bei Fehler naechster Befehl //FIXME: ist das OK? */
+
+        return status;
+}
+
+/* Write string into transbuf and send it to modem.
+ */
+static int gigaset_write_cmd(struct cardstate *cs, const unsigned char *buf,
+                             int len, struct tasklet_struct *wake_tasklet)
+{
+        struct cmdbuf_t *cb;
+        unsigned long flags;
+
+        gigaset_dbg_buffer(atomic_read(&cs->mstate) != MS_LOCKED ?
+                             DEBUG_TRANSCMD : DEBUG_LOCKCMD,
+                           "CMD Transmit", len, buf, 0);
+
+        if (!atomic_read(&cs->connected)) {
+                err("%s: not connected", __func__);
+                return -ENODEV;
+        }
+
+        if (len <= 0)
+                return 0;
+
+        if (!(cb = kmalloc(sizeof(struct cmdbuf_t) + len, GFP_ATOMIC))) {
+                err("%s: out of memory", __func__);
+                return -ENOMEM;
+        }
+
+        memcpy(cb->buf, buf, len);
+        cb->len = len;
+        cb->offset = 0;
+        cb->next = NULL;
+        cb->wake_tasklet = wake_tasklet;
+
+        spin_lock_irqsave(&cs->cmdlock, flags);
+        cb->prev = cs->lastcmdbuf;
+        if (cs->lastcmdbuf)
+                cs->lastcmdbuf->next = cb;
+        else {
+                cs->cmdbuf = cb;
+                cs->curlen = len;
+        }
+        cs->cmdbytes += len;
+        cs->lastcmdbuf = cb;
+        spin_unlock_irqrestore(&cs->cmdlock, flags);
+
+        tasklet_schedule(&cs->write_tasklet);
+        return len;
+}
+
+static int gigaset_write_room(struct cardstate *cs)
+{
+        unsigned long flags;
+        unsigned bytes;
+
+        spin_lock_irqsave(&cs->cmdlock, flags);
+        bytes = cs->cmdbytes;
+        spin_unlock_irqrestore(&cs->cmdlock, flags);
+
+        return bytes < IF_WRITEBUF ? IF_WRITEBUF - bytes : 0;
+}
+
+static int gigaset_chars_in_buffer(struct cardstate *cs)
+{
+        return cs->cmdbytes;
+}
+
+static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
+{
+#ifdef CONFIG_GIGASET_UNDOCREQ
+        gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf, 0);
+        memcpy(cs->hw.usb->bchars, buf, 6);
+        return usb_control_msg(cs->hw.usb->udev,
+                               usb_sndctrlpipe(cs->hw.usb->udev, 0), 0x19, 0x41,
+                               0, 0, &buf, 6, 2000);
+#else
+        return -EINVAL;
+#endif
+}
+
+static int gigaset_freebcshw(struct bc_state *bcs)
+{
+        if (!bcs->hw.usb)
+                return 0;
+        //FIXME
+        kfree(bcs->hw.usb);
+        return 1;
+}
+
+/* Initialize the b-channel structure */
+static int gigaset_initbcshw(struct bc_state *bcs)
+{
+        bcs->hw.usb = kmalloc(sizeof(struct usb_bc_state), GFP_KERNEL);
+        if (!bcs->hw.usb)
+                return 0;
+
+        //bcs->hw.usb->trans_flg = READY_TO_TRNSMIT; /* B-Channel ready to transmit */
+        return 1;
+}
+
+static void gigaset_reinitbcshw(struct bc_state *bcs)
+{
+}
+
+static void gigaset_freecshw(struct cardstate *cs)
+{
+        //FIXME
+        tasklet_kill(&cs->write_tasklet);
+        kfree(cs->hw.usb);
+}
+
+static int gigaset_initcshw(struct cardstate *cs)
+{
+        struct usb_cardstate *ucs;
+
+        cs->hw.usb = ucs =
+                kmalloc(sizeof(struct usb_cardstate), GFP_KERNEL);
+        if (!ucs)
+                return 0;
+
+        ucs->bchars[0] = 0;
+        ucs->bchars[1] = 0;
+        ucs->bchars[2] = 0;
+        ucs->bchars[3] = 0;
+        ucs->bchars[4] = 0x11;
+        ucs->bchars[5] = 0x13;
+        ucs->bulk_out_buffer = NULL;
+        ucs->bulk_out_urb = NULL;
+        //ucs->urb_cmd_out = NULL;
+        ucs->read_urb = NULL;
+        tasklet_init(&cs->write_tasklet,
+                     &gigaset_modem_fill, (unsigned long) cs);
+
+        return 1;
+}
+
+/* Writes the data of the current open skb into the modem.
+ * We have to protect against multiple calls until the
+ * callback handler () is called , due to the fact that we
+ * are just allowed to send data once to an endpoint. Therefore
+ * we using "trans_flg" to synchonize ...
+ */
+static int write_modem(struct cardstate *cs)
+{
+        int ret;
+        int count;
+        struct bc_state *bcs = &cs->bcs[0]; /* only one channel */
+        struct usb_cardstate *ucs = cs->hw.usb;
+        //unsigned long flags;
+
+        IFNULLRETVAL(bcs->tx_skb, -EINVAL);
+
+        dbg(DEBUG_WRITE, "len: %d...", bcs->tx_skb->len);
+
+        ret = -ENODEV;
+        IFNULLGOTO(ucs->bulk_out_buffer, error);
+        IFNULLGOTO(ucs->bulk_out_urb, error);
+        ret = 0;
+
+        if (!bcs->tx_skb->len) {
+                dev_kfree_skb_any(bcs->tx_skb);
+                bcs->tx_skb = NULL;
+                return -EINVAL;
+        }
+
+        /* Copy data to bulk out buffer and  // FIXME copying not necessary
+         * transmit data
+         */
+        count = min(bcs->tx_skb->len, (unsigned) ucs->bulk_out_size);
+        memcpy(ucs->bulk_out_buffer, bcs->tx_skb->data, count);
+        skb_pull(bcs->tx_skb, count);
+
+        usb_fill_bulk_urb(ucs->bulk_out_urb, ucs->udev,
+                          usb_sndbulkpipe(ucs->udev,
+                                          ucs->bulk_out_endpointAddr & 0x0f),
+                          ucs->bulk_out_buffer, count,
+                          gigaset_write_bulk_callback, cs);
+        atomic_set(&ucs->busy, 1);
+        dbg(DEBUG_OUTPUT, "write_modem: send %d bytes", count);
+
+        ret = usb_submit_urb(ucs->bulk_out_urb, SLAB_ATOMIC);
+        if (ret) {
+                err("could not submit urb (error %d).", -ret);
+                atomic_set(&ucs->busy, 0);
+        }
+        if (!bcs->tx_skb->len) {
+                /* skb sent completely */
+                gigaset_skb_sent(bcs, bcs->tx_skb); //FIXME also, when ret<0?
+
+                dbg(DEBUG_INTR,
+                    "kfree skb (Adr: %lx)!", (unsigned long) bcs->tx_skb);
+                dev_kfree_skb_any(bcs->tx_skb);
+                bcs->tx_skb = NULL;
+        }
+
+        return ret;
+error:
+        dev_kfree_skb_any(bcs->tx_skb);
+        bcs->tx_skb = NULL;
+        return ret;
+
+}
+
+static int gigaset_probe(struct usb_interface *interface,
+                         const struct usb_device_id *id)
+{
+        int retval;
+        struct usb_device *udev = interface_to_usbdev(interface);
+        unsigned int ifnum;
+        struct usb_host_interface *hostif;
+        struct cardstate *cs = NULL;
+        struct usb_cardstate *ucs = NULL;
+        //struct usb_interface_descriptor *iface_desc;
+        struct usb_endpoint_descriptor *endpoint;
+        //isdn_ctrl command;
+        int buffer_size;
+        int alt;
+        //unsigned long flags;
+
+        info("%s: Check if device matches .. (Vendor: 0x%x, Product: 0x%x)",
+            __func__, le16_to_cpu(udev->descriptor.idVendor),
+            le16_to_cpu(udev->descriptor.idProduct));
+
+        retval = -ENODEV; //FIXME
+
+        /* See if the device offered us matches what we can accept */
+        if ((le16_to_cpu(udev->descriptor.idVendor  != USB_M105_VENDOR_ID)) ||
+            (le16_to_cpu(udev->descriptor.idProduct != USB_M105_PRODUCT_ID)))
+                return -ENODEV;
+
+        /* this starts to become ascii art... */
+        hostif = interface->cur_altsetting;
+        alt = hostif->desc.bAlternateSetting;
+        ifnum = hostif->desc.bInterfaceNumber; // FIXME ?
+
+        if (alt != 0 || ifnum != 0) {
+                warn("ifnum %d, alt %d", ifnum, alt);
+                return -ENODEV;
+        }
+
+        /* Reject application specific intefaces
+         *
+         */
+        if (hostif->desc.bInterfaceClass != 255) {
+                info("%s: Device matched, but iface_desc[%d]->bInterfaceClass==%d !",
+                       __func__, ifnum, hostif->desc.bInterfaceClass);
+                return -ENODEV;
+        }
+
+        info("%s: Device matched ... !", __func__);
+
+        cs = gigaset_getunassignedcs(driver);
+        if (!cs) {
+                warn("No free cardstate!");
+                return -ENODEV;
+        }
+        ucs = cs->hw.usb;
+
+#if 0
+        if (usb_set_configuration(udev, udev->config[0].desc.bConfigurationValue) < 0) {
+                warn("set_configuration failed");
+                goto error;
+        }
+
+
+        if (usb_set_interface(udev, ifnum/*==0*/, alt/*==0*/) < 0) {
+                warn("usb_set_interface failed, device %d interface %d altsetting %d",
+                     udev->devnum, ifnum, alt);
+                goto error;
+        }
+#endif
+
+        /* set up the endpoint information */
+        /* check out the endpoints */
+        /* We will get 2 endpoints: One for sending commands to the device (bulk out) and one to
+         * poll messages from the device(int in).
+         * Therefore we will have an almost similiar situation as with our serial port handler.
+         * If an connection will be established, we will have to create data in/out pipes
+         * dynamically...
+         */
+
+        endpoint = &hostif->endpoint[0].desc;
+
+        buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
+        ucs->bulk_out_size = buffer_size;
+        ucs->bulk_out_endpointAddr = endpoint->bEndpointAddress;
+        ucs->bulk_out_buffer = kmalloc(buffer_size, GFP_KERNEL);
+        if (!ucs->bulk_out_buffer) {
+                err("Couldn't allocate bulk_out_buffer");
+                retval = -ENOMEM;
+                goto error;
+        }
+
+        ucs->bulk_out_urb = usb_alloc_urb(0, SLAB_KERNEL);
+        if (!ucs->bulk_out_urb) {
+                err("Couldn't allocate bulk_out_buffer");
+                retval = -ENOMEM;
+                goto error;
+        }
+
+        endpoint = &hostif->endpoint[1].desc;
+
+        atomic_set(&ucs->busy, 0);
+        ucs->udev = udev;
+        ucs->interface = interface;
+
+        ucs->read_urb = usb_alloc_urb(0, SLAB_KERNEL);
+        if (!ucs->read_urb) {
+                err("No free urbs available");
+                retval = -ENOMEM;
+                goto error;
+        }
+        buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
+        ucs->rcvbuf_size = buffer_size;
+        ucs->int_in_endpointAddr = endpoint->bEndpointAddress;
+        cs->inbuf[0].rcvbuf = kmalloc(buffer_size, GFP_KERNEL);
+        if (!cs->inbuf[0].rcvbuf) {
+                err("Couldn't allocate rcvbuf");
+                retval = -ENOMEM;
+                goto error;
+        }
+        /* Fill the interrupt urb and send it to the core */
+        usb_fill_int_urb(ucs->read_urb, udev,
+                         usb_rcvintpipe(udev,
+                                        endpoint->bEndpointAddress & 0x0f),
+                         cs->inbuf[0].rcvbuf, buffer_size,
+                         gigaset_read_int_callback,
+                         cs->inbuf + 0, endpoint->bInterval);
+
+        retval = usb_submit_urb(ucs->read_urb, SLAB_KERNEL);
+        if (retval) {
+                err("Could not submit URB!");
+                goto error;
+        }
+
+        /* tell common part that the device is ready */
+        if (startmode == SM_LOCKED)
+                atomic_set(&cs->mstate, MS_LOCKED);
+        if (!gigaset_start(cs)) {
+                tasklet_kill(&cs->write_tasklet);
+                retval = -ENODEV; //FIXME
+                goto error;
+        }
+
+        /* save address of controller structure */
+        usb_set_intfdata(interface, cs);
+
+        /* set up device sysfs */
+        gigaset_init_dev_sysfs(interface);
+        return 0;
+
+error:
+        if (ucs->read_urb)
+                usb_kill_urb(ucs->read_urb);
+        kfree(ucs->bulk_out_buffer);
+        if (ucs->bulk_out_urb != NULL)
+                usb_free_urb(ucs->bulk_out_urb);
+        kfree(cs->inbuf[0].rcvbuf);
+        if (ucs->read_urb != NULL)
+                usb_free_urb(ucs->read_urb);
+        ucs->read_urb = ucs->bulk_out_urb = NULL;
+        cs->inbuf[0].rcvbuf = ucs->bulk_out_buffer = NULL;
+        gigaset_unassign(cs);
+        return retval;
+}
+
+/**
+ *      skel_disconnect
+ */
+static void gigaset_disconnect(struct usb_interface *interface)
+{
+        struct cardstate *cs;
+        struct usb_cardstate *ucs;
+
+        cs = usb_get_intfdata(interface);
+
+        /* clear device sysfs */
+        gigaset_free_dev_sysfs(interface);
+
+        usb_set_intfdata(interface, NULL);
+        ucs = cs->hw.usb;
+        usb_kill_urb(ucs->read_urb);
+        //info("GigaSet USB device #%d will be disconnected", minor);
+
+        gigaset_stop(cs);
+
+        tasklet_kill(&cs->write_tasklet);
+
+        usb_kill_urb(ucs->bulk_out_urb);  /* FIXME: nur, wenn noetig */
+        //usb_kill_urb(ucs->urb_cmd_out);  /* FIXME: nur, wenn noetig */
+
+        kfree(ucs->bulk_out_buffer);
+        if (ucs->bulk_out_urb != NULL)
+                usb_free_urb(ucs->bulk_out_urb);
+        //if(ucs->urb_cmd_out != NULL)
+        //      usb_free_urb(ucs->urb_cmd_out);
+        kfree(cs->inbuf[0].rcvbuf);
+        if (ucs->read_urb != NULL)
+                usb_free_urb(ucs->read_urb);
+        ucs->read_urb = ucs->bulk_out_urb/*=ucs->urb_cmd_out*/=NULL;
+        cs->inbuf[0].rcvbuf = ucs->bulk_out_buffer = NULL;
+
+        gigaset_unassign(cs);
+}
+
+static struct gigaset_ops ops = {
+        gigaset_write_cmd,
+        gigaset_write_room,
+        gigaset_chars_in_buffer,
+        gigaset_brkchars,
+        gigaset_init_bchannel,
+        gigaset_close_bchannel,
+        gigaset_initbcshw,
+        gigaset_freebcshw,
+        gigaset_reinitbcshw,
+        gigaset_initcshw,
+        gigaset_freecshw,
+        gigaset_set_modem_ctrl,
+        gigaset_baud_rate,
+        gigaset_set_line_ctrl,
+        gigaset_m10x_send_skb,
+        gigaset_m10x_input,
+};
+
+/**
+ *      usb_gigaset_init
+ * This function is called while kernel-module is loaded
+ */
+static int __init usb_gigaset_init(void)
+{
+        int result;
+
+        /* allocate memory for our driver state and intialize it */
+        if ((driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,
+                                       GIGASET_MODULENAME, GIGASET_DEVNAME,
+                                       GIGASET_DEVFSNAME, &ops,
+                                       THIS_MODULE)) == NULL)
+                goto error;
+
+        /* allocate memory for our device state and intialize it */
+        cardstate = gigaset_initcs(driver, 1, 1, 0, cidmode, GIGASET_MODULENAME);
+        if (!cardstate)
+                goto error;
+
+        /* register this driver with the USB subsystem */
+        result = usb_register(&gigaset_usb_driver);
+        if (result < 0) {
+                err("usb_gigaset: usb_register failed (error %d)",
+                    -result);
+                goto error;
+        }
+
+        info(DRIVER_AUTHOR);
+        info(DRIVER_DESC);
+        return 0;
+
+error:  if (cardstate)
+                gigaset_freecs(cardstate);
+        cardstate = NULL;
+        if (driver)
+                gigaset_freedriver(driver);
+        driver = NULL;
+        return -1;
+}
+
+
+/**
+ *      usb_gigaset_exit
+ * This function is called while unloading the kernel-module
+ */
+static void __exit usb_gigaset_exit(void)
+{
+        gigaset_blockdriver(driver); /* => probe will fail
+                                      * => no gigaset_start any more
+                                      */
+
+        gigaset_shutdown(cardstate);
+        /* from now on, no isdn callback should be possible */
+
+        /* deregister this driver with the USB subsystem */
+        usb_deregister(&gigaset_usb_driver);
+        /* this will call the disconnect-callback */
+        /* from now on, no disconnect/probe callback should be running */
+
+        gigaset_freecs(cardstate);
+        cardstate = NULL;
+        gigaset_freedriver(driver);
+        driver = NULL;
+}
+
+
+module_init(usb_gigaset_init);
+module_exit(usb_gigaset_exit);
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/isdn/hardware/avm/avmcard.h b/drivers/isdn/hardware/avm/avmcard.h
index 296d6a6f74..3b431723c7 100644
--- a/drivers/isdn/hardware/avm/avmcard.h
+++ b/drivers/isdn/hardware/avm/avmcard.h
@@ -437,9 +437,7 @@ static inline unsigned int t1_get_slice(unsigned int base,
 #endif
                                         dp += i;
                                         i = 0;
-                                        if (i == 0)
-                                                break;
-                                        /* fall through */
+                                        break;
                                 default:
                                         *dp++ = b1_get_byte(base);
                                         i--;
diff --git a/drivers/isdn/hardware/avm/b1dma.c b/drivers/isdn/hardware/avm/b1dma.c
index 91dd0551fc..4d64e5cbcd 100644
--- a/drivers/isdn/hardware/avm/b1dma.c
+++ b/drivers/isdn/hardware/avm/b1dma.c
@@ -39,7 +39,7 @@ MODULE_AUTHOR("Carsten Paeth");
 MODULE_LICENSE("GPL");
 
 static int suppress_pollack = 0;
-MODULE_PARM(suppress_pollack, "0-1i");
+module_param(suppress_pollack, bool, 0);
 
 /* ------------------------------------------------------------- */
 
diff --git a/drivers/isdn/hardware/avm/b1isa.c b/drivers/isdn/hardware/avm/b1isa.c
index 38bd4dfecb..80fb488848 100644
--- a/drivers/isdn/hardware/avm/b1isa.c
+++ b/drivers/isdn/hardware/avm/b1isa.c
@@ -169,8 +169,8 @@ static struct pci_dev isa_dev[MAX_CARDS];
 static int io[MAX_CARDS];
 static int irq[MAX_CARDS];
 
-MODULE_PARM(io, "1-" __MODULE_STRING(MAX_CARDS) "i");
-MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_CARDS) "i");
+module_param_array(io, int, NULL, 0);
+module_param_array(irq, int, NULL, 0);
 MODULE_PARM_DESC(io, "I/O base address(es)");
 MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)");
 
diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c
index 724aac2c1c..f7253b2136 100644
--- a/drivers/isdn/hardware/avm/c4.c
+++ b/drivers/isdn/hardware/avm/c4.c
@@ -50,7 +50,7 @@ MODULE_DEVICE_TABLE(pci, c4_pci_tbl);
 MODULE_DESCRIPTION("CAPI4Linux: Driver for AVM C2/C4 cards");
 MODULE_AUTHOR("Carsten Paeth");
 MODULE_LICENSE("GPL");
-MODULE_PARM(suppress_pollack, "0-1i");
+module_param(suppress_pollack, bool, 0);
 
 /* ------------------------------------------------------------- */
 
diff --git a/drivers/isdn/hardware/avm/t1isa.c b/drivers/isdn/hardware/avm/t1isa.c
index 3b701d97bd..5a2f854d55 100644
--- a/drivers/isdn/hardware/avm/t1isa.c
+++ b/drivers/isdn/hardware/avm/t1isa.c
@@ -519,9 +519,9 @@ static int io[MAX_CARDS];
 static int irq[MAX_CARDS];
 static int cardnr[MAX_CARDS];
 
-MODULE_PARM(io, "1-" __MODULE_STRING(MAX_CARDS) "i");
-MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_CARDS) "i");
-MODULE_PARM(cardnr, "1-" __MODULE_STRING(MAX_CARDS) "i");
+module_param_array(io, int, NULL, 0);
+module_param_array(irq, int, NULL, 0);
+module_param_array(cardnr, int, NULL, 0);
 MODULE_PARM_DESC(io, "I/O base address(es)");
 MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)");
 MODULE_PARM_DESC(cardnr, "Card number(s) (as jumpered)");
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index dc7ef957e8..dbcca287ee 100644
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -387,8 +387,7 @@ static void hdlc_fill_fifo(struct fritz_bcs *bcs)
 
         DBG(0x40, "hdlc_fill_fifo");
 
-        if (skb->len == 0)
-                BUG();
+        BUG_ON(skb->len == 0);
 
         bcs->ctrl.sr.cmd &= ~HDLC_CMD_XME;
         if (bcs->tx_skb->len > bcs->fifo_size) {
@@ -630,9 +629,7 @@ static void fritz_b_l2l1(struct hisax_if *ifc, int pr, void *arg)
 
         switch (pr) {
         case PH_DATA | REQUEST:
-                if (bcs->tx_skb)
-                        BUG();
-                
+                BUG_ON(bcs->tx_skb);
                 bcs->tx_skb = skb;
                 DBG_SKB(1, skb);
                 hdlc_fill_fifo(bcs);
diff --git a/drivers/isdn/hisax/hisax_isac.c b/drivers/isdn/hisax/hisax_isac.c
index f4972f6c1f..81eac344bb 100644
--- a/drivers/isdn/hisax/hisax_isac.c
+++ b/drivers/isdn/hisax/hisax_isac.c
@@ -476,12 +476,10 @@ static void isac_fill_fifo(struct isac *isac)
         unsigned char cmd;
         u_char *ptr;
 
-        if (!isac->tx_skb)
-                BUG();
+        BUG_ON(!isac->tx_skb);
 
         count = isac->tx_skb->len;
-        if (count <= 0)
-                BUG();
+        BUG_ON(count <= 0);
 
         DBG(DBG_IRQ, "count %d", count);
 
@@ -859,8 +857,7 @@ void isac_d_l2l1(struct hisax_if *hisax_d_if, int pr, void *arg)
                         dev_kfree_skb(skb);
                         break;
                 }
-                if (isac->tx_skb)
-                        BUG();
+                BUG_ON(isac->tx_skb);
 
                 isac->tx_skb = skb;
                 isac_fill_fifo(isac);
diff --git a/drivers/isdn/hisax/st5481_b.c b/drivers/isdn/hisax/st5481_b.c
index 657817a591..22fd5db18d 100644
--- a/drivers/isdn/hisax/st5481_b.c
+++ b/drivers/isdn/hisax/st5481_b.c
@@ -356,9 +356,7 @@ void st5481_b_l2l1(struct hisax_if *ifc, int pr, void *arg)
 
         switch (pr) {
         case PH_DATA | REQUEST:
-                if (bcs->b_out.tx_skb)
-                        BUG();
-                
+                BUG_ON(bcs->b_out.tx_skb);
                 bcs->b_out.tx_skb = skb;
                 break;
         case PH_ACTIVATE | REQUEST:
diff --git a/drivers/isdn/hisax/st5481_d.c b/drivers/isdn/hisax/st5481_d.c
index 941f7022ad..493dc94992 100644
--- a/drivers/isdn/hisax/st5481_d.c
+++ b/drivers/isdn/hisax/st5481_d.c
@@ -596,9 +596,7 @@ void st5481_d_l2l1(struct hisax_if *hisax_d_if, int pr, void *arg)
                 break;
         case PH_DATA | REQUEST:
                 DBG(2, "PH_DATA REQUEST len %d", skb->len);
-                if (adapter->d_out.tx_skb)
-                        BUG();
-
+                BUG_ON(adapter->d_out.tx_skb);
                 adapter->d_out.tx_skb = skb;
                 FsmEvent(&adapter->d_out.fsm, EV_DOUT_START_XMIT, NULL);
                 break;
diff --git a/drivers/isdn/hysdn/boardergo.c b/drivers/isdn/hysdn/boardergo.c
index e19a01a305..48d134be99 100644
--- a/drivers/isdn/hysdn/boardergo.c
+++ b/drivers/isdn/hysdn/boardergo.c
@@ -38,8 +38,8 @@ ergo_interrupt(int intno, void *dev_id, struct pt_regs *regs)
 {
         hysdn_card *card = dev_id;      /* parameter from irq */
         tErgDpram *dpr;
-        ulong flags;
-        uchar volatile b;
+        unsigned long flags;
+        unsigned char volatile b;
 
         if (!card)
                 return IRQ_NONE;                /* error -> spurious interrupt */
@@ -77,7 +77,7 @@ ergo_irq_bh(hysdn_card * card)
 {
         tErgDpram *dpr;
         int again;
-        ulong flags;
+        unsigned long flags;
 
         if (card->state != CARD_STATE_RUN)
                 return;         /* invalid call */
@@ -131,8 +131,8 @@ ergo_irq_bh(hysdn_card * card)
 static void
 ergo_stopcard(hysdn_card * card)
 {
-        ulong flags;
-        uchar val;
+        unsigned long flags;
+        unsigned char val;
 
         hysdn_net_release(card);        /* first release the net device if existing */
 #ifdef CONFIG_HYSDN_CAPI
@@ -157,7 +157,7 @@ ergo_stopcard(hysdn_card * card)
 static void
 ergo_set_errlog_state(hysdn_card * card, int on)
 {
-        ulong flags;
+        unsigned long flags;
 
         if (card->state != CARD_STATE_RUN) {
                 card->err_log_state = ERRLOG_STATE_OFF;         /* must be off */
@@ -217,9 +217,10 @@ ergo_testram(hysdn_card * card)
 /* Negative return values are interpreted as errors.                         */
 /*****************************************************************************/
 static int
-ergo_writebootimg(struct HYSDN_CARD *card, uchar * buf, ulong offs)
+ergo_writebootimg(struct HYSDN_CARD *card, unsigned char *buf,
+                        unsigned long offs)
 {
-        uchar *dst;
+        unsigned char *dst;
         tErgDpram *dpram;
         int cnt = (BOOT_IMG_SIZE >> 2);         /* number of words to move and swap (byte order!) */
         
@@ -264,14 +265,14 @@ ergo_writebootimg(struct HYSDN_CARD *card, uchar * buf, ulong offs)
 /* case of errors a negative error value is returned.                           */
 /********************************************************************************/
 static int
-ergo_writebootseq(struct HYSDN_CARD *card, uchar * buf, int len)
+ergo_writebootseq(struct HYSDN_CARD *card, unsigned char *buf, int len)
 {
         tDpramBootSpooler *sp = (tDpramBootSpooler *) card->dpram;
-        uchar *dst;
-        uchar buflen;
+        unsigned char *dst;
+        unsigned char buflen;
         int nr_write;
-        uchar tmp_rdptr;
-        uchar wr_mirror;
+        unsigned char tmp_rdptr;
+        unsigned char wr_mirror;
         int i;
 
         if (card->debug_flags & LOG_POF_CARD)
@@ -330,7 +331,7 @@ ergo_waitpofready(struct HYSDN_CARD *card)
 {
         tErgDpram *dpr = card->dpram;   /* pointer to DPRAM structure */
         int timecnt = 10000 / 50;       /* timeout is 10 secs max. */
-        ulong flags;
+        unsigned long flags;
         int msg_size;
         int i;
 
@@ -345,7 +346,7 @@ ergo_waitpofready(struct HYSDN_CARD *card)
                         if ((dpr->ToPcChannel != CHAN_SYSTEM) ||
                             (dpr->ToPcSize < MIN_RDY_MSG_SIZE) ||
                             (dpr->ToPcSize > MAX_RDY_MSG_SIZE) ||
-                            ((*(ulong *) dpr->ToPcBuf) != RDY_MAGIC))
+                            ((*(unsigned long *) dpr->ToPcBuf) != RDY_MAGIC))
                                 break;  /* an error occurred */
 
                         /* Check for additional data delivered during SysReady */
diff --git a/drivers/isdn/hysdn/boardergo.h b/drivers/isdn/hysdn/boardergo.h
index b56ff0889e..c59422aa8c 100644
--- a/drivers/isdn/hysdn/boardergo.h
+++ b/drivers/isdn/hysdn/boardergo.h
@@ -23,36 +23,36 @@
 
 /* following DPRAM layout copied from OS2-driver boarderg.h */
 typedef struct ErgDpram_tag {
-/*0000 */ uchar ToHyBuf[ERG_TO_HY_BUF_SIZE];
-/*0E00 */ uchar ToPcBuf[ERG_TO_PC_BUF_SIZE];
+/*0000 */ unsigned char ToHyBuf[ERG_TO_HY_BUF_SIZE];
+/*0E00 */ unsigned char ToPcBuf[ERG_TO_PC_BUF_SIZE];
 
-        /*1C00 */ uchar bSoftUart[SIZE_RSV_SOFT_UART];
+        /*1C00 */ unsigned char bSoftUart[SIZE_RSV_SOFT_UART];
         /* size 0x1B0 */
 
-        /*1DB0 *//* tErrLogEntry */ uchar volatile ErrLogMsg[64];
+        /*1DB0 *//* tErrLogEntry */ unsigned char volatile ErrLogMsg[64];
         /* size 64 bytes */
-        /*1DB0  ulong ulErrType;               */
-        /*1DB4  ulong ulErrSubtype;            */
-        /*1DB8  ulong ucTextSize;              */
-        /*1DB9  ulong ucText[ERRLOG_TEXT_SIZE]; *//* ASCIIZ of len ucTextSize-1 */
+        /*1DB0  unsigned long ulErrType;               */
+        /*1DB4  unsigned long ulErrSubtype;            */
+        /*1DB8  unsigned long ucTextSize;              */
+        /*1DB9  unsigned long ucText[ERRLOG_TEXT_SIZE]; *//* ASCIIZ of len ucTextSize-1 */
         /*1DF0 */
 
-/*1DF0 */ word volatile ToHyChannel;
-/*1DF2 */ word volatile ToHySize;
-        /*1DF4 */ uchar volatile ToHyFlag;
+/*1DF0 */ unsigned short volatile ToHyChannel;
+/*1DF2 */ unsigned short volatile ToHySize;
+        /*1DF4 */ unsigned char volatile ToHyFlag;
         /* !=0: msg for Hy waiting */
-        /*1DF5 */ uchar volatile ToPcFlag;
+        /*1DF5 */ unsigned char volatile ToPcFlag;
         /* !=0: msg for PC waiting */
-/*1DF6 */ word volatile ToPcChannel;
-/*1DF8 */ word volatile ToPcSize;
-        /*1DFA */ uchar bRes1DBA[0x1E00 - 0x1DFA];
+/*1DF6 */ unsigned short volatile ToPcChannel;
+/*1DF8 */ unsigned short volatile ToPcSize;
+        /*1DFA */ unsigned char bRes1DBA[0x1E00 - 0x1DFA];
         /* 6 bytes */
 
-/*1E00 */ uchar bRestOfEntryTbl[0x1F00 - 0x1E00];
-/*1F00 */ ulong TrapTable[62];
-        /*1FF8 */ uchar bRes1FF8[0x1FFB - 0x1FF8];
+/*1E00 */ unsigned char bRestOfEntryTbl[0x1F00 - 0x1E00];
+/*1F00 */ unsigned long TrapTable[62];
+        /*1FF8 */ unsigned char bRes1FF8[0x1FFB - 0x1FF8];
         /* low part of reset vetor */
-/*1FFB */ uchar ToPcIntMetro;
+/*1FFB */ unsigned char ToPcIntMetro;
         /* notes:
          * - metro has 32-bit boot ram - accessing
          *   ToPcInt and ToHyInt would be the same;
@@ -65,16 +65,16 @@ typedef struct ErgDpram_tag {
          *   so E1 side should NOT change this byte
          *   when writing!
          */
-/*1FFC */ uchar volatile ToHyNoDpramErrLog;
+/*1FFC */ unsigned char volatile ToHyNoDpramErrLog;
         /* note: ToHyNoDpramErrLog is used to inform
          *       boot loader, not to use DPRAM based
          *       ErrLog; when DOS driver is rewritten
          *       this becomes obsolete
          */
-/*1FFD */ uchar bRes1FFD;
-        /*1FFE */ uchar ToPcInt;
+/*1FFD */ unsigned char bRes1FFD;
+        /*1FFE */ unsigned char ToPcInt;
         /* E1_intclear; on CHAMP2: E1_intset   */
-        /*1FFF */ uchar ToHyInt;
+        /*1FFF */ unsigned char ToHyInt;
         /* E1_intset;   on CHAMP2: E1_intclear */
 } tErgDpram;
 
diff --git a/drivers/isdn/hysdn/hycapi.c b/drivers/isdn/hysdn/hycapi.c
index acc1d3ccee..6bac43cc91 100644
--- a/drivers/isdn/hysdn/hycapi.c
+++ b/drivers/isdn/hysdn/hycapi.c
@@ -31,7 +31,7 @@
 static char hycapi_revision[]="$Revision: 1.8.6.4 $";
 
 unsigned int hycapi_enable = 0xffffffff; 
-MODULE_PARM(hycapi_enable, "i");
+module_param(hycapi_enable, uint, 0);
 
 typedef struct _hycapi_appl {
         unsigned int ctrl_mask;
@@ -523,7 +523,7 @@ New nccis are created if necessary.
 *******************************************************************/
 
 void
-hycapi_rx_capipkt(hysdn_card * card, uchar * buf, word len)
+hycapi_rx_capipkt(hysdn_card * card, unsigned char *buf, unsigned short len)
 {
         struct sk_buff *skb;
         hycapictrl_info *cinfo = card->hyctrlinfo;
diff --git a/drivers/isdn/hysdn/hysdn_boot.c b/drivers/isdn/hysdn/hysdn_boot.c
index 7bfba196f3..6d0eb0f42f 100644
--- a/drivers/isdn/hysdn/hysdn_boot.c
+++ b/drivers/isdn/hysdn/hysdn_boot.c
@@ -30,17 +30,17 @@
 /* needed during boot and so allocated dynamically.         */
 /************************************************************/
 struct boot_data {
-        word Cryptor;           /* for use with Decrypt function */
-        word Nrecs;             /* records remaining in file */
-        uchar pof_state;        /* actual state of read handler */
-        uchar is_crypted;       /* card data is crypted */
+        unsigned short Cryptor; /* for use with Decrypt function */
+        unsigned short Nrecs;   /* records remaining in file */
+        unsigned char pof_state;/* actual state of read handler */
+        unsigned char is_crypted;/* card data is crypted */
         int BufSize;            /* actual number of bytes bufferd */
         int last_error;         /* last occurred error */
-        word pof_recid;         /* actual pof recid */
-        ulong pof_reclen;       /* total length of pof record data */
-        ulong pof_recoffset;    /* actual offset inside pof record */
+        unsigned short pof_recid;/* actual pof recid */
+        unsigned long pof_reclen;/* total length of pof record data */
+        unsigned long pof_recoffset;/* actual offset inside pof record */
         union {
-                uchar BootBuf[BOOT_BUF_SIZE];   /* buffer as byte count */
+                unsigned char BootBuf[BOOT_BUF_SIZE];/* buffer as byte count */
                 tPofRecHdr PofRecHdr;   /* header for actual record/chunk */
                 tPofFileHdr PofFileHdr;         /* header from POF file */
                 tPofTimeStamp PofTime;  /* time information */
@@ -69,11 +69,11 @@ StartDecryption(struct boot_data *boot)
 static void
 DecryptBuf(struct boot_data *boot, int cnt)
 {
-        uchar *bufp = boot->buf.BootBuf;
+        unsigned char *bufp = boot->buf.BootBuf;
 
         while (cnt--) {
                 boot->Cryptor = (boot->Cryptor >> 1) ^ ((boot->Cryptor & 1U) ? CRYPT_FEEDTERM : 0);
-                *bufp++ ^= (uchar) boot->Cryptor;
+                *bufp++ ^= (unsigned char)boot->Cryptor;
         }
 }                               /* DecryptBuf */
 
@@ -86,7 +86,7 @@ pof_handle_data(hysdn_card * card, int datlen)
 {
         struct boot_data *boot = card->boot;    /* pointer to boot specific data */
         long l;
-        uchar *imgp;
+        unsigned char *imgp;
         int img_len;
 
         /* handle the different record types */
@@ -197,7 +197,7 @@ pof_write_buffer(hysdn_card * card, int datlen)
                                 break;
                         }
                         /* Setup the new state and vars */
-                        boot->Nrecs = (word) (boot->buf.PofFileHdr.N_PofRecs);  /* limited to 65535 */
+                        boot->Nrecs = (unsigned short)(boot->buf.PofFileHdr.N_PofRecs); /* limited to 65535 */
                         boot->pof_state = POF_READ_TAG_HEAD;    /* now start with single tags */
                         boot->last_error = sizeof(tPofRecHdr);  /* new length */
                         break;
@@ -268,7 +268,7 @@ pof_write_buffer(hysdn_card * card, int datlen)
 /* occurred. Additionally the pointer to the buffer data area is set on success */
 /*******************************************************************************/
 int
-pof_write_open(hysdn_card * card, uchar ** bufp)
+pof_write_open(hysdn_card * card, unsigned char **bufp)
 {
         struct boot_data *boot; /* pointer to boot specific data */
 
@@ -335,7 +335,7 @@ pof_write_close(hysdn_card * card)
 /* when POF has been booted. A return value of 0 is used if no error occurred.    */
 /*********************************************************************************/
 int
-EvalSysrTokData(hysdn_card * card, uchar * cp, int len)
+EvalSysrTokData(hysdn_card *card, unsigned char *cp, int len)
 {
         u_char *p;
         u_char crc;
diff --git a/drivers/isdn/hysdn/hysdn_defs.h b/drivers/isdn/hysdn/hysdn_defs.h
index 432f6f9908..3a9b29b38b 100644
--- a/drivers/isdn/hysdn/hysdn_defs.h
+++ b/drivers/isdn/hysdn/hysdn_defs.h
@@ -20,14 +20,6 @@
 #include <linux/workqueue.h>
 #include <linux/skbuff.h>
 
-/****************************/
-/* storage type definitions */
-/****************************/
-#define uchar unsigned char
-#define uint unsigned int
-#define ulong unsigned long
-#define word unsigned short
-
 #include "ince1pc.h"
 
 #ifdef CONFIG_HYSDN_CAPI
@@ -147,18 +139,18 @@ typedef struct HYSDN_CARD {
 
         /* general variables for the cards */
         int myid;               /* own driver card id */
-        uchar bus;              /* pci bus the card is connected to */
-        uchar devfn;            /* slot+function bit encoded */
-        word subsysid;          /* PCI subsystem id */
-        uchar brdtype;          /* type of card */
-        uint bchans;            /* number of available B-channels */
-        uint faxchans;          /* number of available fax-channels */
-        uchar mac_addr[6];      /* MAC Address read from card */
-        uint irq;               /* interrupt number */
-        uint iobase;            /* IO-port base address */
-        ulong plxbase;          /* PLX memory base */
-        ulong membase;          /* DPRAM memory base */
-        ulong memend;           /* DPRAM memory end */
+        unsigned char bus;      /* pci bus the card is connected to */
+        unsigned char devfn;    /* slot+function bit encoded */
+        unsigned short subsysid;/* PCI subsystem id */
+        unsigned char brdtype;  /* type of card */
+        unsigned int bchans;    /* number of available B-channels */
+        unsigned int faxchans;  /* number of available fax-channels */
+        unsigned char mac_addr[6];/* MAC Address read from card */
+        unsigned int irq;       /* interrupt number */
+        unsigned int iobase;    /* IO-port base address */
+        unsigned long plxbase;  /* PLX memory base */
+        unsigned long membase;  /* DPRAM memory base */
+        unsigned long memend;   /* DPRAM memory end */
         void *dpram;            /* mapped dpram */
         int state;              /* actual state of card -> CARD_STATE_** */
         struct HYSDN_CARD *next;        /* pointer to next card */
@@ -168,26 +160,26 @@ typedef struct HYSDN_CARD {
         void *procconf;         /* pointer to procconf filesystem specific data */
 
         /* debugging and logging */
-        uchar err_log_state;    /* actual error log state of the card */
-        ulong debug_flags;      /* tells what should be debugged and where */
+        unsigned char err_log_state;/* actual error log state of the card */
+        unsigned long debug_flags;/* tells what should be debugged and where */
         void (*set_errlog_state) (struct HYSDN_CARD *, int);
 
         /* interrupt handler + interrupt synchronisation */
         struct work_struct irq_queue;   /* interrupt task queue */
-        uchar volatile irq_enabled;     /* interrupt enabled if != 0 */
-        uchar volatile hw_lock; /* hardware is currently locked -> no access */
+        unsigned char volatile irq_enabled;/* interrupt enabled if != 0 */
+        unsigned char volatile hw_lock;/* hardware is currently locked -> no access */
 
         /* boot process */
         void *boot;             /* pointer to boot private data */
-        int (*writebootimg) (struct HYSDN_CARD *, uchar *, ulong);
-        int (*writebootseq) (struct HYSDN_CARD *, uchar *, int);
+        int (*writebootimg) (struct HYSDN_CARD *, unsigned char *, unsigned long);
+        int (*writebootseq) (struct HYSDN_CARD *, unsigned char *, int);
         int (*waitpofready) (struct HYSDN_CARD *);
         int (*testram) (struct HYSDN_CARD *);
 
         /* scheduler for data transfer (only async parts) */
-        uchar async_data[256];  /* async data to be sent (normally for config) */
-        word volatile async_len;        /* length of data to sent */
-        word volatile async_channel;    /* channel number for async transfer */
+        unsigned char async_data[256];/* async data to be sent (normally for config) */
+        unsigned short volatile async_len;/* length of data to sent */
+        unsigned short volatile async_channel;/* channel number for async transfer */
         int volatile async_busy;        /* flag != 0 sending in progress */
         int volatile net_tx_busy;       /* a network packet tx is in progress */
 
@@ -251,15 +243,18 @@ extern int ergo_inithardware(hysdn_card * card);	/* get hardware -> module init
 
 /* hysdn_boot.c */
 extern int pof_write_close(hysdn_card *);       /* close proc file after writing pof */
-extern int pof_write_open(hysdn_card *, uchar **);      /* open proc file for writing pof */
+extern int pof_write_open(hysdn_card *, unsigned char **);      /* open proc file for writing pof */
 extern int pof_write_buffer(hysdn_card *, int);         /* write boot data to card */
-extern int EvalSysrTokData(hysdn_card *, uchar *, int);         /* Check Sysready Token Data */
+extern int EvalSysrTokData(hysdn_card *, unsigned char *, int);         /* Check Sysready Token Data */
 
 /* hysdn_sched.c */
-extern int hysdn_sched_tx(hysdn_card *, uchar *, word volatile *, word volatile *,
-                          word);
-extern int hysdn_sched_rx(hysdn_card *, uchar *, word, word);
-extern int hysdn_tx_cfgline(hysdn_card *, uchar *, word);       /* send one cfg line */
+extern int hysdn_sched_tx(hysdn_card *, unsigned char *,
+                        unsigned short volatile *, unsigned short volatile *,
+                        unsigned short);
+extern int hysdn_sched_rx(hysdn_card *, unsigned char *, unsigned short,
+                        unsigned short);
+extern int hysdn_tx_cfgline(hysdn_card *, unsigned char *,
+                        unsigned short);        /* send one cfg line */
 
 /* hysdn_net.c */
 extern unsigned int hynet_enable; 
@@ -269,14 +264,16 @@ extern int hysdn_net_release(hysdn_card *);	/* delete the device */
 extern char *hysdn_net_getname(hysdn_card *);   /* get name of net interface */
 extern void hysdn_tx_netack(hysdn_card *);      /* acknowledge a packet tx */
 extern struct sk_buff *hysdn_tx_netget(hysdn_card *);   /* get next network packet */
-extern void hysdn_rx_netpkt(hysdn_card *, uchar *, word);       /* rxed packet from network */
+extern void hysdn_rx_netpkt(hysdn_card *, unsigned char *,
+                        unsigned short);        /* rxed packet from network */
 
 #ifdef CONFIG_HYSDN_CAPI
 extern unsigned int hycapi_enable; 
 extern int hycapi_capi_create(hysdn_card *);    /* create a new capi device */
 extern int hycapi_capi_release(hysdn_card *);   /* delete the device */
 extern int hycapi_capi_stop(hysdn_card *card);   /* suspend */
-extern void hycapi_rx_capipkt(hysdn_card * card, uchar * buf, word len);
+extern void hycapi_rx_capipkt(hysdn_card * card, unsigned char * buf,
+                                unsigned short len);
 extern void hycapi_tx_capiack(hysdn_card * card);
 extern struct sk_buff *hycapi_tx_capiget(hysdn_card *card);
 extern int hycapi_init(void);
diff --git a/drivers/isdn/hysdn/hysdn_init.c b/drivers/isdn/hysdn/hysdn_init.c
index cb791f8e79..b75ac5af23 100644
--- a/drivers/isdn/hysdn/hysdn_init.c
+++ b/drivers/isdn/hysdn/hysdn_init.c
@@ -41,8 +41,8 @@ hysdn_card *card_root = NULL;	/* pointer to first card */
 /* the last entry contains all 0              */
 /**********************************************/
 static struct {
-        word subid;             /* PCI sub id */
-        uchar cardtyp;          /* card type assigned */
+        unsigned short subid;           /* PCI sub id */
+        unsigned char cardtyp;          /* card type assigned */
 } pci_subid_map[] = {
 
         {
diff --git a/drivers/isdn/hysdn/hysdn_net.c b/drivers/isdn/hysdn/hysdn_net.c
index aa01628d74..d205249a12 100644
--- a/drivers/isdn/hysdn/hysdn_net.c
+++ b/drivers/isdn/hysdn/hysdn_net.c
@@ -24,7 +24,7 @@
 #include "hysdn_defs.h"
 
 unsigned int hynet_enable = 0xffffffff; 
-MODULE_PARM(hynet_enable, "i");
+module_param(hynet_enable, uint, 0);
 
 /* store the actual version for log reporting */
 char *hysdn_net_revision = "$Revision: 1.8.6.4 $";
@@ -83,12 +83,12 @@ net_open(struct net_device *dev)
 
         /* Fill in the MAC-level header (if not already set) */
         if (!card->mac_addr[0]) {
-                for (i = 0; i < ETH_ALEN - sizeof(ulong); i++)
+                for (i = 0; i < ETH_ALEN - sizeof(unsigned long); i++)
                         dev->dev_addr[i] = 0xfc;
                 if ((in_dev = dev->ip_ptr) != NULL) {
                         struct in_ifaddr *ifa = in_dev->ifa_list;
                         if (ifa != NULL)
-                                memcpy(dev->dev_addr + (ETH_ALEN - sizeof(ulong)), &ifa->ifa_local, sizeof(ulong));
+                                memcpy(dev->dev_addr + (ETH_ALEN - sizeof(unsigned long)), &ifa->ifa_local, sizeof(unsigned long));
                 }
         } else
                 memcpy(dev->dev_addr, card->mac_addr, ETH_ALEN);
@@ -197,7 +197,7 @@ hysdn_tx_netack(hysdn_card * card)
 /* we got a packet from the network, go and queue it */
 /*****************************************************/
 void
-hysdn_rx_netpkt(hysdn_card * card, uchar * buf, word len)
+hysdn_rx_netpkt(hysdn_card * card, unsigned char *buf, unsigned short len)
 {
         struct net_local *lp = card->netif;
         struct sk_buff *skb;
diff --git a/drivers/isdn/hysdn/hysdn_pof.h b/drivers/isdn/hysdn/hysdn_pof.h
index 6cd81b9b08..a368d6caca 100644
--- a/drivers/isdn/hysdn/hysdn_pof.h
+++ b/drivers/isdn/hysdn/hysdn_pof.h
@@ -47,20 +47,20 @@
 
 /*--------------------------------------POF file record structs------------*/
 typedef struct PofFileHdr_tag { /* Pof file header */
-/*00 */ ulong Magic __attribute__((packed));
-/*04 */ ulong N_PofRecs __attribute__((packed));
+/*00 */ unsigned long Magic __attribute__((packed));
+/*04 */ unsigned long N_PofRecs __attribute__((packed));
 /*08 */
 } tPofFileHdr;
 
 typedef struct PofRecHdr_tag {  /* Pof record header */
-/*00 */ word PofRecId __attribute__((packed));
-/*02 */ ulong PofRecDataLen __attribute__((packed));
+/*00 */ unsigned short PofRecId __attribute__((packed));
+/*02 */ unsigned long PofRecDataLen __attribute__((packed));
 /*06 */
 } tPofRecHdr;
 
 typedef struct PofTimeStamp_tag {
-/*00 */ ulong UnixTime __attribute__((packed));
-        /*04 */ uchar DateTimeText[0x28] __attribute__((packed));
+/*00 */ unsigned long UnixTime __attribute__((packed));
+        /*04 */ unsigned char DateTimeText[0x28] __attribute__((packed));
         /* =40 */
 /*2C */
 } tPofTimeStamp;
diff --git a/drivers/isdn/hysdn/hysdn_procconf.c b/drivers/isdn/hysdn/hysdn_procconf.c
index 40e56143c7..8e2b03889f 100644
--- a/drivers/isdn/hysdn/hysdn_procconf.c
+++ b/drivers/isdn/hysdn/hysdn_procconf.c
@@ -36,9 +36,9 @@ struct conf_writedata {
         int buf_size;           /* actual number of bytes in the buffer */
         int needed_size;        /* needed size when reading pof */
         int state;              /* actual interface states from above constants */
-        uchar conf_line[CONF_LINE_LEN];         /* buffered conf line */
-        word channel;           /* active channel number */
-        uchar *pof_buffer;      /* buffer when writing pof */
+        unsigned char conf_line[CONF_LINE_LEN]; /* buffered conf line */
+        unsigned short channel;         /* active channel number */
+        unsigned char *pof_buffer;      /* buffer when writing pof */
 };
 
 /***********************************************************************/
@@ -49,7 +49,7 @@ struct conf_writedata {
 static int
 process_line(struct conf_writedata *cnf)
 {
-        uchar *cp = cnf->conf_line;
+        unsigned char *cp = cnf->conf_line;
         int i;
 
         if (cnf->card->debug_flags & LOG_CNF_LINE)
@@ -92,7 +92,7 @@ hysdn_conf_write(struct file *file, const char __user *buf, size_t count, loff_t
 {
         struct conf_writedata *cnf;
         int i;
-        uchar ch, *cp;
+        unsigned char ch, *cp;
 
         if (!count)
                 return (0);     /* nothing to handle */
@@ -390,7 +390,7 @@ int
 hysdn_procconf_init(void)
 {
         hysdn_card *card;
-        uchar conf_name[20];
+        unsigned char conf_name[20];
 
         hysdn_proc_entry = proc_mkdir(PROC_SUBDIR_NAME, proc_net);
         if (!hysdn_proc_entry) {
@@ -423,7 +423,7 @@ void
 hysdn_procconf_release(void)
 {
         hysdn_card *card;
-        uchar conf_name[20];
+        unsigned char conf_name[20];
 
         card = card_root;       /* start with first card */
         while (card) {
diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c
index 6c26f1efab..c4301e8338 100644
--- a/drivers/isdn/hysdn/hysdn_proclog.c
+++ b/drivers/isdn/hysdn/hysdn_proclog.c
@@ -28,7 +28,7 @@ static void put_log_buffer(hysdn_card * card, char *cp);
 /*************************************************/
 struct log_data {
         struct log_data *next;
-        ulong usage_cnt;        /* number of files still to work */
+        unsigned long usage_cnt;/* number of files still to work */
         void *proc_ctrl;        /* pointer to own control procdata structure */
         char log_start[2];      /* log string start (final len aligned by size) */
 };
@@ -42,7 +42,7 @@ struct procdata {
         struct log_data *log_head, *log_tail;   /* head and tail for queue */
         int if_used;            /* open count for interface */
         int volatile del_lock;  /* lock for delete operations */
-        uchar logtmp[LOG_MAX_LINELEN];
+        unsigned char logtmp[LOG_MAX_LINELEN];
         wait_queue_head_t rd_queue;
 };
 
@@ -153,9 +153,9 @@ put_log_buffer(hysdn_card * card, char *cp)
 static ssize_t
 hysdn_log_write(struct file *file, const char __user *buf, size_t count, loff_t * off)
 {
-        ulong u = 0;
+        unsigned long u = 0;
         int found = 0;
-        uchar *cp, valbuf[128];
+        unsigned char *cp, valbuf[128];
         long base = 10;
         hysdn_card *card = (hysdn_card *) file->private_data;
 
@@ -249,7 +249,7 @@ hysdn_log_open(struct inode *ino, struct file *filep)
 {
         hysdn_card *card;
         struct procdata *pd = NULL;
-        ulong flags;
+        unsigned long flags;
 
         lock_kernel();
         card = card_root;
diff --git a/drivers/isdn/hysdn/hysdn_sched.c b/drivers/isdn/hysdn/hysdn_sched.c
index 4fa3b01707..133032920f 100644
--- a/drivers/isdn/hysdn/hysdn_sched.c
+++ b/drivers/isdn/hysdn/hysdn_sched.c
@@ -30,7 +30,8 @@
 /* to keep the data until later.                                             */
 /*****************************************************************************/
 int
-hysdn_sched_rx(hysdn_card * card, uchar * buf, word len, word chan)
+hysdn_sched_rx(hysdn_card *card, unsigned char *buf, unsigned short len,
+                        unsigned short chan)
 {
 
         switch (chan) {
@@ -72,7 +73,9 @@ hysdn_sched_rx(hysdn_card * card, uchar * buf, word len, word chan)
 /* sending.                                                                  */
 /*****************************************************************************/
 int
-hysdn_sched_tx(hysdn_card * card, uchar * buf, word volatile *len, word volatile *chan, word maxlen)
+hysdn_sched_tx(hysdn_card *card, unsigned char *buf,
+                unsigned short volatile *len, unsigned short volatile *chan,
+                unsigned short maxlen)
 {
         struct sk_buff *skb;
 
@@ -145,10 +148,10 @@ hysdn_sched_tx(hysdn_card * card, uchar * buf, word volatile *len, word volatile
 /* are to be sent and this happens very seldom.                              */
 /*****************************************************************************/
 int
-hysdn_tx_cfgline(hysdn_card * card, uchar * line, word chan)
+hysdn_tx_cfgline(hysdn_card *card, unsigned char *line, unsigned short chan)
 {
         int cnt = 50;           /* timeout intervalls */
-        ulong flags;
+        unsigned long flags;
 
         if (card->debug_flags & LOG_SCHED_ASYN)
                 hysdn_addlog(card, "async tx-cfg chan=%d len=%d", chan, strlen(line) + 1);
diff --git a/drivers/isdn/hysdn/ince1pc.h b/drivers/isdn/hysdn/ince1pc.h
index 4a115a87c7..7a36694df6 100644
--- a/drivers/isdn/hysdn/ince1pc.h
+++ b/drivers/isdn/hysdn/ince1pc.h
@@ -62,7 +62,7 @@
  *                     s. RotlCRC algorithm
  *
  *  RotlCRC algorithm:
- *      ucSum= 0                        1 uchar
+ *      ucSum= 0                        1 unsigned char
  *      for all NonEndTokenChunk bytes:
  *          ROTL(ucSum,1)               rotate left by 1
  *          ucSum += Char;              add current byte with swap around
@@ -85,13 +85,13 @@
 
 typedef struct ErrLogEntry_tag {
         
-/*00 */ ulong ulErrType;
+/*00 */ unsigned long ulErrType;
         
-/*04 */ ulong ulErrSubtype;
+/*04 */ unsigned long ulErrSubtype;
         
-/*08 */ uchar ucTextSize;
+/*08 */ unsigned char ucTextSize;
         
-        /*09 */ uchar ucText[ERRLOG_TEXT_SIZE];
+        /*09 */ unsigned char ucText[ERRLOG_TEXT_SIZE];
         /* ASCIIZ of len ucTextSize-1 */
         
 /*40 */ 
@@ -111,13 +111,13 @@ typedef struct ErrLogEntry_tag {
 #define DPRAM_SPOOLER_DATA_SIZE 0x20
 typedef struct DpramBootSpooler_tag {
         
-/*00 */ uchar Len;
+/*00 */ unsigned char Len;
         
-/*01 */ volatile uchar RdPtr;
+/*01 */ volatile unsigned char RdPtr;
         
-/*02 */ uchar WrPtr;
+/*02 */ unsigned char WrPtr;
         
-/*03 */ uchar Data[DPRAM_SPOOLER_DATA_SIZE];
+/*03 */ unsigned char Data[DPRAM_SPOOLER_DATA_SIZE];
         
 /*23 */ 
 } tDpramBootSpooler;
diff --git a/drivers/isdn/i4l/Kconfig b/drivers/isdn/i4l/Kconfig
index 1789b607f0..a4f7288a1f 100644
--- a/drivers/isdn/i4l/Kconfig
+++ b/drivers/isdn/i4l/Kconfig
@@ -139,3 +139,4 @@ source "drivers/isdn/hysdn/Kconfig"
 
 endmenu
 
+source "drivers/isdn/gigaset/Kconfig"
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 1a19a0f894..a0927d1b7a 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -782,7 +782,8 @@ isdn_ppp_read(int min, struct file *file, char __user *buf, int count)
         is->first = b;
 
         spin_unlock_irqrestore(&is->buflock, flags);
-        copy_to_user(buf, save_buf, count);
+        if (copy_to_user(buf, save_buf, count))
+                count = -EFAULT;
         kfree(save_buf);
 
         return count;
@@ -973,8 +974,7 @@ void isdn_ppp_receive(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buf
         int slot;
         int proto;
 
-        if (net_dev->local->master)
-                BUG(); // we're called with the master device always
+        BUG_ON(net_dev->local->master); // we're called with the master device always
 
         slot = lp->ppp_slot;
         if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
@@ -2526,8 +2526,7 @@ static struct sk_buff *isdn_ppp_decompress(struct sk_buff *skb,struct ippp_struc
                 printk(KERN_DEBUG "ippp: no decompressor defined!\n");
                 return skb;
         }
-        if (!stat) // if we have a compressor, stat has been set as well
-                BUG();
+        BUG_ON(!stat); // if we have a compressor, stat has been set as well
 
         if((master && *proto == PPP_COMP) || (!master && *proto == PPP_COMPFRAG) ) {
                 // compressed packets are compressed by their protocol type
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index aeaa1db74b..3585fb1f33 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -2345,12 +2345,15 @@ isdn_tty_at_cout(char *msg, modem_info * info)
         u_long flags;
         struct sk_buff *skb = NULL;
         char *sp = NULL;
-        int l = strlen(msg);
+        int l;
 
         if (!msg) {
                 printk(KERN_WARNING "isdn_tty: Null-Message in isdn_tty_at_cout\n");
                 return;
         }
+
+        l = strlen(msg);
+
         spin_lock_irqsave(&info->readlock, flags);
         tty = info->tty;
         if ((info->flags & ISDN_ASYNC_CLOSING) || (!tty)) {
diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
index edf14a2aa3..743ac4077f 100644
--- a/drivers/isdn/i4l/isdn_x25iface.c
+++ b/drivers/isdn/i4l/isdn_x25iface.c
@@ -7,7 +7,7 @@
  *
  * stuff needed to support the Linux X.25 PLP code on top of devices that
  * can provide a lab_b service using the concap_proto mechanism.
- * This module supports a network interface wich provides lapb_sematics
+ * This module supports a network interface which provides lapb_sematics
  * -- as defined in Documentation/networking/x25-iface.txt -- to
  * the upper layer and assumes that the lower layer provides a reliable
  * data link service by means of the concap_device_ops callbacks.
diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c
index 33d3397004..a67d31af79 100644
--- a/drivers/isdn/isdnloop/isdnloop.c
+++ b/drivers/isdn/isdnloop/isdnloop.c
@@ -22,7 +22,7 @@ static char *isdnloop_id = "loop0";
 MODULE_DESCRIPTION("ISDN4Linux: Pseudo Driver that simulates an ISDN card");
 MODULE_AUTHOR("Fritz Elfert");
 MODULE_LICENSE("GPL");
-MODULE_PARM(isdnloop_id, "s");
+module_param(isdnloop_id, charp, 0);
 MODULE_PARM_DESC(isdnloop_id, "ID-String of first card");
 
 static int isdnloop_addcard(char *);
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index d2ead1776c..259fd8973c 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -42,6 +42,7 @@
 #include <asm/semaphore.h>
 #ifdef CONFIG_PPC
 #include <asm/prom.h>
+#include <asm/machdep.h>
 #endif
 
 
@@ -80,7 +81,7 @@ static struct adb_driver *adb_driver_list[] = {
 static struct class *adb_dev_class;
 
 struct adb_driver *adb_controller;
-struct notifier_block *adb_client_list = NULL;
+BLOCKING_NOTIFIER_HEAD(adb_client_list);
 static int adb_got_sleep;
 static int adb_inited;
 static pid_t adb_probe_task_pid;
@@ -294,7 +295,7 @@ int __init adb_init(void)
         int i;
 
 #ifdef CONFIG_PPC32
-        if ( (_machine != _MACH_chrp) && (_machine != _MACH_Pmac) )
+        if (!machine_is(chrp) && !machine_is(powermac))
                 return 0;
 #endif
 #ifdef CONFIG_MAC
@@ -354,7 +355,8 @@ adb_notify_sleep(struct pmu_sleep_notifier *self, int when)
                 /* Stop autopoll */
                 if (adb_controller->autopoll)
                         adb_controller->autopoll(0);
-                ret = notifier_call_chain(&adb_client_list, ADB_MSG_POWERDOWN, NULL);
+                ret = blocking_notifier_call_chain(&adb_client_list,
+                                ADB_MSG_POWERDOWN, NULL);
                 if (ret & NOTIFY_STOP_MASK) {
                         up(&adb_probe_mutex);
                         return PBOOK_SLEEP_REFUSE;
@@ -391,7 +393,8 @@ do_adb_reset_bus(void)
         if (adb_controller->autopoll)
                 adb_controller->autopoll(0);
 
-        nret = notifier_call_chain(&adb_client_list, ADB_MSG_PRE_RESET, NULL);
+        nret = blocking_notifier_call_chain(&adb_client_list,
+                        ADB_MSG_PRE_RESET, NULL);
         if (nret & NOTIFY_STOP_MASK) {
                 if (adb_controller->autopoll)
                         adb_controller->autopoll(autopoll_devs);
@@ -426,7 +429,8 @@ do_adb_reset_bus(void)
         }
         up(&adb_handler_sem);
 
-        nret = notifier_call_chain(&adb_client_list, ADB_MSG_POST_RESET, NULL);
+        nret = blocking_notifier_call_chain(&adb_client_list,
+                        ADB_MSG_POST_RESET, NULL);
         if (nret & NOTIFY_STOP_MASK)
                 return -EBUSY;
         
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index c0b46bceb5..394334ec57 100644
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -1206,15 +1206,16 @@ init_ms_a3(int id)
 static int __init adbhid_init(void)
 {
 #ifndef CONFIG_MAC
-        if ( (_machine != _MACH_chrp) && (_machine != _MACH_Pmac) )
-            return 0;
+        if (!machine_is(chrp) && !machine_is(powermac))
+                return 0;
 #endif
 
         led_request.complete = 1;
 
         adbhid_probe();
 
-        notifier_chain_register(&adb_client_list, &adbhid_adb_notifier);
+        blocking_notifier_chain_register(&adb_client_list,
+                        &adbhid_adb_notifier);
 
         return 0;
 }
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c
index 8dbf2852ba..53c1c79094 100644
--- a/drivers/macintosh/mediabay.c
+++ b/drivers/macintosh/mediabay.c
@@ -839,8 +839,8 @@ static int __init media_bay_init(void)
                 media_bays[i].cd_index          = -1;
 #endif
         }
-        if (_machine != _MACH_Pmac)
-                return -ENODEV;
+        if (!machine_is(powermac))
+                return 0;
 
         macio_register_driver(&media_bay_driver);       
 
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 4eb05d7143..f4516ca7aa 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -35,6 +35,7 @@
 #include <linux/delay.h>
 #include <linux/sysdev.h>
 #include <linux/poll.h>
+#include <linux/mutex.h>
 
 #include <asm/byteorder.h>
 #include <asm/io.h>
@@ -92,7 +93,7 @@ struct smu_device {
  * for now, just hard code that
  */
 static struct smu_device        *smu;
-static DECLARE_MUTEX(smu_part_access);
+static DEFINE_MUTEX(smu_part_access);
 
 static void smu_i2c_retry(unsigned long data);
 
@@ -976,11 +977,11 @@ struct smu_sdbp_header *__smu_get_sdb_partition(int id, unsigned int *size,
 
         if (interruptible) {
                 int rc;
-                rc = down_interruptible(&smu_part_access);
+                rc = mutex_lock_interruptible(&smu_part_access);
                 if (rc)
                         return ERR_PTR(rc);
         } else
-                down(&smu_part_access);
+                mutex_lock(&smu_part_access);
 
         part = (struct smu_sdbp_header *)get_property(smu->of_node,
                                                       pname, size);
@@ -990,7 +991,7 @@ struct smu_sdbp_header *__smu_get_sdb_partition(int id, unsigned int *size,
                 if (part != NULL && size)
                         *size = part->len << 2;
         }
-        up(&smu_part_access);
+        mutex_unlock(&smu_part_access);
         return part;
 }
 
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 4f5f3abc9c..0b5ff553e3 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -187,7 +187,7 @@ extern int disable_kernel_backlight;
 
 int __fake_sleep;
 int asleep;
-struct notifier_block *sleep_notifier_list;
+BLOCKING_NOTIFIER_HEAD(sleep_notifier_list);
 
 #ifdef CONFIG_ADB
 static int adb_dev_map = 0;
diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c
index f08e52f210..35b70323e7 100644
--- a/drivers/macintosh/via-pmu68k.c
+++ b/drivers/macintosh/via-pmu68k.c
@@ -102,7 +102,7 @@ static int pmu_kind = PMU_UNKNOWN;
 static int pmu_fully_inited = 0;
 
 int asleep;
-struct notifier_block *sleep_notifier_list;
+BLOCKING_NOTIFIER_HEAD(sleep_notifier_list);
 
 static int pmu_probe(void);
 static int pmu_init(void);
@@ -913,7 +913,8 @@ int powerbook_sleep(void)
         struct adb_request sleep_req;
 
         /* Notify device drivers */
-        ret = notifier_call_chain(&sleep_notifier_list, PBOOK_SLEEP, NULL);
+        ret = blocking_notifier_call_chain(&sleep_notifier_list,
+                        PBOOK_SLEEP, NULL);
         if (ret & NOTIFY_STOP_MASK)
                 return -EBUSY;
 
@@ -984,7 +985,7 @@ int powerbook_sleep(void)
                         enable_irq(i);
 
         /* Notify drivers */
-        notifier_call_chain(&sleep_notifier_list, PBOOK_WAKE, NULL);
+        blocking_notifier_call_chain(&sleep_notifier_list, PBOOK_WAKE, NULL);
 
         /* reenable ADB autopoll */
         pmu_adb_autopoll(adb_dev_map);
diff --git a/drivers/macintosh/windfarm_core.c b/drivers/macintosh/windfarm_core.c
index 6c0ba04bc5..ab3faa702d 100644
--- a/drivers/macintosh/windfarm_core.c
+++ b/drivers/macintosh/windfarm_core.c
@@ -52,7 +52,7 @@
 static LIST_HEAD(wf_controls);
 static LIST_HEAD(wf_sensors);
 static DEFINE_MUTEX(wf_lock);
-static struct notifier_block *wf_client_list;
+static BLOCKING_NOTIFIER_HEAD(wf_client_list);
 static int wf_client_count;
 static unsigned int wf_overtemp;
 static unsigned int wf_overtemp_counter;
@@ -68,7 +68,7 @@ static struct platform_device wf_platform_device = {
 
 static inline void wf_notify(int event, void *param)
 {
-        notifier_call_chain(&wf_client_list, event, param);
+        blocking_notifier_call_chain(&wf_client_list, event, param);
 }
 
 int wf_critical_overtemp(void)
@@ -398,7 +398,7 @@ int wf_register_client(struct notifier_block *nb)
         struct wf_sensor *sr;
 
         mutex_lock(&wf_lock);
-        rc = notifier_chain_register(&wf_client_list, nb);
+        rc = blocking_notifier_chain_register(&wf_client_list, nb);
         if (rc != 0)
                 goto bail;
         wf_client_count++;
@@ -417,7 +417,7 @@ EXPORT_SYMBOL_GPL(wf_register_client);
 int wf_unregister_client(struct notifier_block *nb)
 {
         mutex_lock(&wf_lock);
-        notifier_chain_unregister(&wf_client_list, nb);
+        blocking_notifier_chain_unregister(&wf_client_list, nb);
         wf_client_count++;
         if (wf_client_count == 0)
                 wf_stop_thread();
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index ac43f98062..fd2aae150c 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -127,6 +127,32 @@ config MD_RAID5
 
           If unsure, say Y.
 
+config MD_RAID5_RESHAPE
+        bool "Support adding drives to a raid-5 array (experimental)"
+        depends on MD_RAID5 && EXPERIMENTAL
+        ---help---
+          A RAID-5 set can be expanded by adding extra drives. This
+          requires "restriping" the array which means (almost) every
+          block must be written to a different place.
+
+          This option allows such restriping to be done while the array
+          is online.  However it is still EXPERIMENTAL code.  It should
+          work, but please be sure that you have backups.
+
+          You will need a version of mdadm newer than 2.3.1.   During the
+          early stage of reshape there is a critical section where live data
+          is being over-written.  A crash during this time needs extra care
+          for recovery.  The newer mdadm takes a copy of the data in the
+          critical section and will restore it, if necessary, after a crash.
+
+          The mdadm usage is e.g.
+               mdadm --grow /dev/md1 --raid-disks=6
+          to grow '/dev/md1' to having 6 disks.
+
+          Note: The array can only be expanded, not contracted.
+          There should be enough spares already present to make the new
+          array workable.
+
 config MD_RAID6
         tristate "RAID-6 mode"
         depends on BLK_DEV_MD
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index eae4473ead..f8ffaee20f 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -89,16 +89,6 @@ int bitmap_active(struct bitmap *bitmap)
 }
 
 #define WRITE_POOL_SIZE 256
-/* mempool for queueing pending writes on the bitmap file */
-static void *write_pool_alloc(gfp_t gfp_flags, void *data)
-{
-        return kmalloc(sizeof(struct page_list), gfp_flags);
-}
-
-static void write_pool_free(void *ptr, void *data)
-{
-        kfree(ptr);
-}
 
 /*
  * just a placeholder - calls kmalloc for bitmap pages
@@ -556,7 +546,7 @@ static void bitmap_mask_state(struct bitmap *bitmap, enum bitmap_state bits,
         unsigned long flags;
 
         spin_lock_irqsave(&bitmap->lock, flags);
-        if (!bitmap || !bitmap->sb_page) { /* can't set the state */
+        if (!bitmap->sb_page) { /* can't set the state */
                 spin_unlock_irqrestore(&bitmap->lock, flags);
                 return;
         }
@@ -1309,7 +1299,7 @@ int bitmap_startwrite(struct bitmap *bitmap, sector_t offset, unsigned long sect
                 case 1:
                         *bmc = 2;
                 }
-                if ((*bmc & COUNTER_MAX) == COUNTER_MAX) BUG();
+                BUG_ON((*bmc & COUNTER_MAX) == COUNTER_MAX);
                 (*bmc)++;
 
                 spin_unlock_irq(&bitmap->lock);
@@ -1564,8 +1554,8 @@ int bitmap_create(mddev_t *mddev)
         spin_lock_init(&bitmap->write_lock);
         INIT_LIST_HEAD(&bitmap->complete_pages);
         init_waitqueue_head(&bitmap->write_wait);
-        bitmap->write_pool = mempool_create(WRITE_POOL_SIZE, write_pool_alloc,
-                                write_pool_free, NULL);
+        bitmap->write_pool = mempool_create_kmalloc_pool(WRITE_POOL_SIZE,
+                                                sizeof(struct page_list));
         err = -ENOMEM;
         if (!bitmap->write_pool)
                 goto error;
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index e7a650f9ca..61a590bb62 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -94,20 +94,6 @@ struct crypt_config {
 static kmem_cache_t *_crypt_io_pool;
 
 /*
- * Mempool alloc and free functions for the page
- */
-static void *mempool_alloc_page(gfp_t gfp_mask, void *data)
-{
-        return alloc_page(gfp_mask);
-}
-
-static void mempool_free_page(void *page, void *data)
-{
-        __free_page(page);
-}
-
-
-/*
  * Different IV generation algorithms:
  *
  * plain: the initial vector is the 32-bit low-endian version of the sector
@@ -532,6 +518,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         char *ivopts;
         unsigned int crypto_flags;
         unsigned int key_size;
+        unsigned long long tmpll;
 
         if (argc != 5) {
                 ti->error = PFX "Not enough arguments";
@@ -630,15 +617,13 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 }
         }
 
-        cc->io_pool = mempool_create(MIN_IOS, mempool_alloc_slab,
-                                     mempool_free_slab, _crypt_io_pool);
+        cc->io_pool = mempool_create_slab_pool(MIN_IOS, _crypt_io_pool);
         if (!cc->io_pool) {
                 ti->error = PFX "Cannot allocate crypt io mempool";
                 goto bad3;
         }
 
-        cc->page_pool = mempool_create(MIN_POOL_PAGES, mempool_alloc_page,
-                                       mempool_free_page, NULL);
+        cc->page_pool = mempool_create_page_pool(MIN_POOL_PAGES, 0);
         if (!cc->page_pool) {
                 ti->error = PFX "Cannot allocate page mempool";
                 goto bad4;
@@ -649,15 +634,17 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 goto bad5;
         }
 
-        if (sscanf(argv[2], SECTOR_FORMAT, &cc->iv_offset) != 1) {
+        if (sscanf(argv[2], "%llu", &tmpll) != 1) {
                 ti->error = PFX "Invalid iv_offset sector";
                 goto bad5;
         }
+        cc->iv_offset = tmpll;
 
-        if (sscanf(argv[4], SECTOR_FORMAT, &cc->start) != 1) {
+        if (sscanf(argv[4], "%llu", &tmpll) != 1) {
                 ti->error = PFX "Invalid device sector";
                 goto bad5;
         }
+        cc->start = tmpll;
 
         if (dm_get_device(ti, argv[3], cc->start, ti->len,
                           dm_table_get_mode(ti->table), &cc->dev)) {
@@ -901,8 +888,8 @@ static int crypt_status(struct dm_target *ti, status_type_t type,
                         result[sz++] = '-';
                 }
 
-                DMEMIT(" " SECTOR_FORMAT " %s " SECTOR_FORMAT,
-                       cc->iv_offset, cc->dev->name, cc->start);
+                DMEMIT(" %llu %s %llu", (unsigned long long)cc->iv_offset,
+                                cc->dev->name, (unsigned long long)cc->start);
                 break;
         }
         return 0;
diff --git a/drivers/md/dm-hw-handler.c b/drivers/md/dm-hw-handler.c
index 4cc0010e01..baafaaba4d 100644
--- a/drivers/md/dm-hw-handler.c
+++ b/drivers/md/dm-hw-handler.c
@@ -83,8 +83,7 @@ void dm_put_hw_handler(struct hw_handler_type *hwht)
         if (--hwhi->use == 0)
                 module_put(hwhi->hwht.module);
 
-        if (hwhi->use < 0)
-                BUG();
+        BUG_ON(hwhi->use < 0);
 
       out:
         up_read(&_hwh_lock);
diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c
index 4809b209fb..da663d2ff5 100644
--- a/drivers/md/dm-io.c
+++ b/drivers/md/dm-io.c
@@ -32,16 +32,6 @@ struct io {
 static unsigned _num_ios;
 static mempool_t *_io_pool;
 
-static void *alloc_io(gfp_t gfp_mask, void *pool_data)
-{
-        return kmalloc(sizeof(struct io), gfp_mask);
-}
-
-static void free_io(void *element, void *pool_data)
-{
-        kfree(element);
-}
-
 static unsigned int pages_to_ios(unsigned int pages)
 {
         return 4 * pages;       /* too many ? */
@@ -65,7 +55,8 @@ static int resize_pool(unsigned int new_ios)
 
         } else {
                 /* create new pool */
-                _io_pool = mempool_create(new_ios, alloc_io, free_io, NULL);
+                _io_pool = mempool_create_kmalloc_pool(new_ios,
+                                                       sizeof(struct io));
                 if (!_io_pool)
                         return -ENOMEM;
 
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 442e2be605..8edd643541 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -15,6 +15,7 @@
 #include <linux/slab.h>
 #include <linux/devfs_fs_kernel.h>
 #include <linux/dm-ioctl.h>
+#include <linux/hdreg.h>
 
 #include <asm/uaccess.h>
 
@@ -244,9 +245,9 @@ static void __hash_remove(struct hash_cell *hc)
                 dm_table_put(table);
         }
 
-        dm_put(hc->md);
         if (hc->new_map)
                 dm_table_put(hc->new_map);
+        dm_put(hc->md);
         free_cell(hc);
 }
 
@@ -600,12 +601,22 @@ static int dev_create(struct dm_ioctl *param, size_t param_size)
  */
 static struct hash_cell *__find_device_hash_cell(struct dm_ioctl *param)
 {
+        struct mapped_device *md;
+        void *mdptr = NULL;
+
         if (*param->uuid)
                 return __get_uuid_cell(param->uuid);
-        else if (*param->name)
+
+        if (*param->name)
                 return __get_name_cell(param->name);
-        else
-                return dm_get_mdptr(huge_decode_dev(param->dev));
+
+        md = dm_get_md(huge_decode_dev(param->dev));
+        if (md) {
+                mdptr = dm_get_mdptr(md);
+                dm_put(md);
+        }
+
+        return mdptr;
 }
 
 static struct mapped_device *find_device(struct dm_ioctl *param)
@@ -690,6 +701,54 @@ static int dev_rename(struct dm_ioctl *param, size_t param_size)
         return dm_hash_rename(param->name, new_name);
 }
 
+static int dev_set_geometry(struct dm_ioctl *param, size_t param_size)
+{
+        int r = -EINVAL, x;
+        struct mapped_device *md;
+        struct hd_geometry geometry;
+        unsigned long indata[4];
+        char *geostr = (char *) param + param->data_start;
+
+        md = find_device(param);
+        if (!md)
+                return -ENXIO;
+
+        if (geostr < (char *) (param + 1) ||
+            invalid_str(geostr, (void *) param + param_size)) {
+                DMWARN("Invalid geometry supplied.");
+                goto out;
+        }
+
+        x = sscanf(geostr, "%lu %lu %lu %lu", indata,
+                   indata + 1, indata + 2, indata + 3);
+
+        if (x != 4) {
+                DMWARN("Unable to interpret geometry settings.");
+                goto out;
+        }
+
+        if (indata[0] > 65535 || indata[1] > 255 ||
+            indata[2] > 255 || indata[3] > ULONG_MAX) {
+                DMWARN("Geometry exceeds range limits.");
+                goto out;
+        }
+
+        geometry.cylinders = indata[0];
+        geometry.heads = indata[1];
+        geometry.sectors = indata[2];
+        geometry.start = indata[3];
+
+        r = dm_set_geometry(md, &geometry);
+        if (!r)
+                r = __dev_status(md, param);
+
+        param->data_size = 0;
+
+out:
+        dm_put(md);
+        return r;
+}
+
 static int do_suspend(struct dm_ioctl *param)
 {
         int r = 0;
@@ -975,33 +1034,43 @@ static int table_load(struct dm_ioctl *param, size_t param_size)
         int r;
         struct hash_cell *hc;
         struct dm_table *t;
+        struct mapped_device *md;
 
-        r = dm_table_create(&t, get_mode(param), param->target_count);
+        md = find_device(param);
+        if (!md)
+                return -ENXIO;
+
+        r = dm_table_create(&t, get_mode(param), param->target_count, md);
         if (r)
-                return r;
+                goto out;
 
         r = populate_table(t, param, param_size);
         if (r) {
                 dm_table_put(t);
-                return r;
+                goto out;
         }
 
         down_write(&_hash_lock);
-        hc = __find_device_hash_cell(param);
-        if (!hc) {
-                DMWARN("device doesn't appear to be in the dev hash table.");
-                up_write(&_hash_lock);
+        hc = dm_get_mdptr(md);
+        if (!hc || hc->md != md) {
+                DMWARN("device has been removed from the dev hash table.");
                 dm_table_put(t);
-                return -ENXIO;
+                up_write(&_hash_lock);
+                r = -ENXIO;
+                goto out;
         }
 
         if (hc->new_map)
                 dm_table_put(hc->new_map);
         hc->new_map = t;
+        up_write(&_hash_lock);
+
         param->flags |= DM_INACTIVE_PRESENT_FLAG;
+        r = __dev_status(md, param);
+
+out:
+        dm_put(md);
 
-        r = __dev_status(hc->md, param);
-        up_write(&_hash_lock);
         return r;
 }
 
@@ -1214,7 +1283,8 @@ static ioctl_fn lookup_ioctl(unsigned int cmd)
 
                 {DM_LIST_VERSIONS_CMD, list_versions},
 
-                {DM_TARGET_MSG_CMD, target_message}
+                {DM_TARGET_MSG_CMD, target_message},
+                {DM_DEV_SET_GEOMETRY_CMD, dev_set_geometry}
         };
 
         return (cmd >= ARRAY_SIZE(_ioctls)) ? NULL : _ioctls[cmd].fn;
diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c
index 6a2cd5dc8a..daf586c089 100644
--- a/drivers/md/dm-linear.c
+++ b/drivers/md/dm-linear.c
@@ -26,6 +26,7 @@ struct linear_c {
 static int linear_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 {
         struct linear_c *lc;
+        unsigned long long tmp;
 
         if (argc != 2) {
                 ti->error = "dm-linear: Invalid argument count";
@@ -38,10 +39,11 @@ static int linear_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 return -ENOMEM;
         }
 
-        if (sscanf(argv[1], SECTOR_FORMAT, &lc->start) != 1) {
+        if (sscanf(argv[1], "%llu", &tmp) != 1) {
                 ti->error = "dm-linear: Invalid device sector";
                 goto bad;
         }
+        lc->start = tmp;
 
         if (dm_get_device(ti, argv[0], lc->start, ti->len,
                           dm_table_get_mode(ti->table), &lc->dev)) {
@@ -87,8 +89,8 @@ static int linear_status(struct dm_target *ti, status_type_t type,
                 break;
 
         case STATUSTYPE_TABLE:
-                snprintf(result, maxlen, "%s " SECTOR_FORMAT, lc->dev->name,
-                         lc->start);
+                snprintf(result, maxlen, "%s %llu", lc->dev->name,
+                                (unsigned long long)lc->start);
                 break;
         }
         return 0;
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index f72a82fb94..1816f30678 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -179,8 +179,7 @@ static struct multipath *alloc_multipath(void)
                 m->queue_io = 1;
                 INIT_WORK(&m->process_queued_ios, process_queued_ios, m);
                 INIT_WORK(&m->trigger_event, trigger_event, m);
-                m->mpio_pool = mempool_create(MIN_IOS, mempool_alloc_slab,
-                                              mempool_free_slab, _mpio_cache);
+                m->mpio_pool = mempool_create_slab_pool(MIN_IOS, _mpio_cache);
                 if (!m->mpio_pool) {
                         kfree(m);
                         return NULL;
diff --git a/drivers/md/dm-path-selector.c b/drivers/md/dm-path-selector.c
index a28c1c2b4e..f10a0c89b3 100644
--- a/drivers/md/dm-path-selector.c
+++ b/drivers/md/dm-path-selector.c
@@ -86,8 +86,7 @@ void dm_put_path_selector(struct path_selector_type *pst)
         if (--psi->use == 0)
                 module_put(psi->pst.module);
 
-        if (psi->use < 0)
-                BUG();
+        BUG_ON(psi->use < 0);
 
 out:
         up_read(&_ps_lock);
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index 6cfa8d435d..d12cf3e5e0 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -122,16 +122,6 @@ static inline sector_t region_to_sector(struct region_hash *rh, region_t region)
 /* FIXME move this */
 static void queue_bio(struct mirror_set *ms, struct bio *bio, int rw);
 
-static void *region_alloc(gfp_t gfp_mask, void *pool_data)
-{
-        return kmalloc(sizeof(struct region), gfp_mask);
-}
-
-static void region_free(void *element, void *pool_data)
-{
-        kfree(element);
-}
-
 #define MIN_REGIONS 64
 #define MAX_RECOVERY 1
 static int rh_init(struct region_hash *rh, struct mirror_set *ms,
@@ -173,8 +163,8 @@ static int rh_init(struct region_hash *rh, struct mirror_set *ms,
         INIT_LIST_HEAD(&rh->quiesced_regions);
         INIT_LIST_HEAD(&rh->recovered_regions);
 
-        rh->region_pool = mempool_create(MIN_REGIONS, region_alloc,
-                                         region_free, NULL);
+        rh->region_pool = mempool_create_kmalloc_pool(MIN_REGIONS,
+                                                      sizeof(struct region));
         if (!rh->region_pool) {
                 vfree(rh->buckets);
                 rh->buckets = NULL;
@@ -412,9 +402,21 @@ static void rh_dec(struct region_hash *rh, region_t region)
 
         spin_lock_irqsave(&rh->region_lock, flags);
         if (atomic_dec_and_test(&reg->pending)) {
+                /*
+                 * There is no pending I/O for this region.
+                 * We can move the region to corresponding list for next action.
+                 * At this point, the region is not yet connected to any list.
+                 *
+                 * If the state is RH_NOSYNC, the region should be kept off
+                 * from clean list.
+                 * The hash entry for RH_NOSYNC will remain in memory
+                 * until the region is recovered or the map is reloaded.
+                 */
+
+                /* do nothing for RH_NOSYNC */
                 if (reg->state == RH_RECOVERING) {
                         list_add_tail(&reg->list, &rh->quiesced_regions);
-                } else {
+                } else if (reg->state == RH_DIRTY) {
                         reg->state = RH_CLEAN;
                         list_add(&reg->list, &rh->clean_regions);
                 }
@@ -932,9 +934,9 @@ static inline int _check_region_size(struct dm_target *ti, uint32_t size)
 static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
                       unsigned int mirror, char **argv)
 {
-        sector_t offset;
+        unsigned long long offset;
 
-        if (sscanf(argv[1], SECTOR_FORMAT, &offset) != 1) {
+        if (sscanf(argv[1], "%llu", &offset) != 1) {
                 ti->error = "dm-mirror: Invalid offset";
                 return -EINVAL;
         }
@@ -1201,16 +1203,17 @@ static int mirror_status(struct dm_target *ti, status_type_t type,
                 for (m = 0; m < ms->nr_mirrors; m++)
                         DMEMIT("%s ", ms->mirror[m].dev->name);
 
-                DMEMIT(SECTOR_FORMAT "/" SECTOR_FORMAT,
-                       ms->rh.log->type->get_sync_count(ms->rh.log),
-                       ms->nr_regions);
+                DMEMIT("%llu/%llu",
+                        (unsigned long long)ms->rh.log->type->
+                                get_sync_count(ms->rh.log),
+                        (unsigned long long)ms->nr_regions);
                 break;
 
         case STATUSTYPE_TABLE:
                 DMEMIT("%d ", ms->nr_mirrors);
                 for (m = 0; m < ms->nr_mirrors; m++)
-                        DMEMIT("%s " SECTOR_FORMAT " ",
-                               ms->mirror[m].dev->name, ms->mirror[m].offset);
+                        DMEMIT("%s %llu ", ms->mirror[m].dev->name,
+                                (unsigned long long)ms->mirror[m].offset);
         }
 
         return 0;
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index f3759dd782..08312b4646 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -49,11 +49,26 @@ struct pending_exception {
         struct bio_list snapshot_bios;
 
         /*
-         * Other pending_exceptions that are processing this
-         * chunk.  When this list is empty, we know we can
-         * complete the origins.
+         * Short-term queue of pending exceptions prior to submission.
          */
-        struct list_head siblings;
+        struct list_head list;
+
+        /*
+         * The primary pending_exception is the one that holds
+         * the sibling_count and the list of origin_bios for a
+         * group of pending_exceptions.  It is always last to get freed.
+         * These fields get set up when writing to the origin.
+         */
+        struct pending_exception *primary_pe;
+
+        /*
+         * Number of pending_exceptions processing this chunk.
+         * When this drops to zero we must complete the origin bios.
+         * If incrementing or decrementing this, hold pe->snap->lock for
+         * the sibling concerned and not pe->primary_pe->snap->lock unless
+         * they are the same.
+         */
+        atomic_t sibling_count;
 
         /* Pointer back to snapshot context */
         struct dm_snapshot *snap;
@@ -377,6 +392,8 @@ static void read_snapshot_metadata(struct dm_snapshot *s)
                 down_write(&s->lock);
                 s->valid = 0;
                 up_write(&s->lock);
+
+                dm_table_event(s->table);
         }
 }
 
@@ -542,8 +559,12 @@ static void snapshot_dtr(struct dm_target *ti)
 {
         struct dm_snapshot *s = (struct dm_snapshot *) ti->private;
 
+        /* Prevent further origin writes from using this snapshot. */
+        /* After this returns there can be no new kcopyd jobs. */
         unregister_snapshot(s);
 
+        kcopyd_client_destroy(s->kcopyd_client);
+
         exit_exception_table(&s->pending, pending_cache);
         exit_exception_table(&s->complete, exception_cache);
 
@@ -552,7 +573,7 @@ static void snapshot_dtr(struct dm_target *ti)
 
         dm_put_device(ti, s->origin);
         dm_put_device(ti, s->cow);
-        kcopyd_client_destroy(s->kcopyd_client);
+
         kfree(s);
 }
 
@@ -586,78 +607,117 @@ static void error_bios(struct bio *bio)
         }
 }
 
+static inline void error_snapshot_bios(struct pending_exception *pe)
+{
+        error_bios(bio_list_get(&pe->snapshot_bios));
+}
+
 static struct bio *__flush_bios(struct pending_exception *pe)
 {
-        struct pending_exception *sibling;
+        /*
+         * If this pe is involved in a write to the origin and
+         * it is the last sibling to complete then release
+         * the bios for the original write to the origin.
+         */
+
+        if (pe->primary_pe &&
+            atomic_dec_and_test(&pe->primary_pe->sibling_count))
+                return bio_list_get(&pe->primary_pe->origin_bios);
+
+        return NULL;
+}
+
+static void __invalidate_snapshot(struct dm_snapshot *s,
+                                struct pending_exception *pe, int err)
+{
+        if (!s->valid)
+                return;
 
-        if (list_empty(&pe->siblings))
-                return bio_list_get(&pe->origin_bios);
+        if (err == -EIO)
+                DMERR("Invalidating snapshot: Error reading/writing.");
+        else if (err == -ENOMEM)
+                DMERR("Invalidating snapshot: Unable to allocate exception.");
 
-        sibling = list_entry(pe->siblings.next,
-                             struct pending_exception, siblings);
+        if (pe)
+                remove_exception(&pe->e);
 
-        list_del(&pe->siblings);
+        if (s->store.drop_snapshot)
+                s->store.drop_snapshot(&s->store);
 
-        /* This is fine as long as kcopyd is single-threaded. If kcopyd
-         * becomes multi-threaded, we'll need some locking here.
-         */
-        bio_list_merge(&sibling->origin_bios, &pe->origin_bios);
+        s->valid = 0;
 
-        return NULL;
+        dm_table_event(s->table);
 }
 
 static void pending_complete(struct pending_exception *pe, int success)
 {
         struct exception *e;
+        struct pending_exception *primary_pe;
         struct dm_snapshot *s = pe->snap;
         struct bio *flush = NULL;
 
-        if (success) {
-                e = alloc_exception();
-                if (!e) {
-                        DMWARN("Unable to allocate exception.");
-                        down_write(&s->lock);
-                        s->store.drop_snapshot(&s->store);
-                        s->valid = 0;
-                        flush = __flush_bios(pe);
-                        up_write(&s->lock);
-
-                        error_bios(bio_list_get(&pe->snapshot_bios));
-                        goto out;
-                }
-                *e = pe->e;
-
-                /*
-                 * Add a proper exception, and remove the
-                 * in-flight exception from the list.
-                 */
+        if (!success) {
+                /* Read/write error - snapshot is unusable */
                 down_write(&s->lock);
-                insert_exception(&s->complete, e);
-                remove_exception(&pe->e);
+                __invalidate_snapshot(s, pe, -EIO);
                 flush = __flush_bios(pe);
-
-                /* Submit any pending write bios */
                 up_write(&s->lock);
 
-                flush_bios(bio_list_get(&pe->snapshot_bios));
-        } else {
-                /* Read/write error - snapshot is unusable */
+                error_snapshot_bios(pe);
+                goto out;
+        }
+
+        e = alloc_exception();
+        if (!e) {
                 down_write(&s->lock);
-                if (s->valid)
-                        DMERR("Error reading/writing snapshot");
-                s->store.drop_snapshot(&s->store);
-                s->valid = 0;
-                remove_exception(&pe->e);
+                __invalidate_snapshot(s, pe, -ENOMEM);
                 flush = __flush_bios(pe);
                 up_write(&s->lock);
 
-                error_bios(bio_list_get(&pe->snapshot_bios));
+                error_snapshot_bios(pe);
+                goto out;
+        }
+        *e = pe->e;
 
-                dm_table_event(s->table);
+        /*
+         * Add a proper exception, and remove the
+         * in-flight exception from the list.
+         */
+        down_write(&s->lock);
+        if (!s->valid) {
+                flush = __flush_bios(pe);
+                up_write(&s->lock);
+
+                free_exception(e);
+
+                error_snapshot_bios(pe);
+                goto out;
         }
 
+        insert_exception(&s->complete, e);
+        remove_exception(&pe->e);
+        flush = __flush_bios(pe);
+
+        up_write(&s->lock);
+
+        /* Submit any pending write bios */
+        flush_bios(bio_list_get(&pe->snapshot_bios));
+
  out:
-        free_pending_exception(pe);
+        primary_pe = pe->primary_pe;
+
+        /*
+         * Free the pe if it's not linked to an origin write or if
+         * it's not itself a primary pe.
+         */
+        if (!primary_pe || primary_pe != pe)
+                free_pending_exception(pe);
+
+        /*
+         * Free the primary pe if nothing references it.
+         */
+        if (primary_pe && !atomic_read(&primary_pe->sibling_count))
+                free_pending_exception(primary_pe);
 
         if (flush)
                 flush_bios(flush);
@@ -734,38 +794,45 @@ __find_pending_exception(struct dm_snapshot *s, struct bio *bio)
         if (e) {
                 /* cast the exception to a pending exception */
                 pe = container_of(e, struct pending_exception, e);
+                goto out;
+        }
 
-        } else {
-                /*
-                 * Create a new pending exception, we don't want
-                 * to hold the lock while we do this.
-                 */
-                up_write(&s->lock);
-                pe = alloc_pending_exception();
-                down_write(&s->lock);
+        /*
+         * Create a new pending exception, we don't want
+         * to hold the lock while we do this.
+         */
+        up_write(&s->lock);
+        pe = alloc_pending_exception();
+        down_write(&s->lock);
 
-                e = lookup_exception(&s->pending, chunk);
-                if (e) {
-                        free_pending_exception(pe);
-                        pe = container_of(e, struct pending_exception, e);
-                } else {
-                        pe->e.old_chunk = chunk;
-                        bio_list_init(&pe->origin_bios);
-                        bio_list_init(&pe->snapshot_bios);
-                        INIT_LIST_HEAD(&pe->siblings);
-                        pe->snap = s;
-                        pe->started = 0;
-
-                        if (s->store.prepare_exception(&s->store, &pe->e)) {
-                                free_pending_exception(pe);
-                                s->valid = 0;
-                                return NULL;
-                        }
+        if (!s->valid) {
+                free_pending_exception(pe);
+                return NULL;
+        }
 
-                        insert_exception(&s->pending, &pe->e);
-                }
+        e = lookup_exception(&s->pending, chunk);
+        if (e) {
+                free_pending_exception(pe);
+                pe = container_of(e, struct pending_exception, e);
+                goto out;
+        }
+
+        pe->e.old_chunk = chunk;
+        bio_list_init(&pe->origin_bios);
+        bio_list_init(&pe->snapshot_bios);
+        pe->primary_pe = NULL;
+        atomic_set(&pe->sibling_count, 1);
+        pe->snap = s;
+        pe->started = 0;
+
+        if (s->store.prepare_exception(&s->store, &pe->e)) {
+                free_pending_exception(pe);
+                return NULL;
         }
 
+        insert_exception(&s->pending, &pe->e);
+
+ out:
         return pe;
 }
 
@@ -782,13 +849,15 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio,
 {
         struct exception *e;
         struct dm_snapshot *s = (struct dm_snapshot *) ti->private;
+        int copy_needed = 0;
         int r = 1;
         chunk_t chunk;
-        struct pending_exception *pe;
+        struct pending_exception *pe = NULL;
 
         chunk = sector_to_chunk(s, bio->bi_sector);
 
         /* Full snapshots are not usable */
+        /* To get here the table must be live so s->active is always set. */
         if (!s->valid)
                 return -EIO;
 
@@ -806,36 +875,41 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio,
                  * to copy an exception */
                 down_write(&s->lock);
 
+                if (!s->valid) {
+                        r = -EIO;
+                        goto out_unlock;
+                }
+
                 /* If the block is already remapped - use that, else remap it */
                 e = lookup_exception(&s->complete, chunk);
                 if (e) {
                         remap_exception(s, e, bio);
-                        up_write(&s->lock);
-
-                } else {
-                        pe = __find_pending_exception(s, bio);
-
-                        if (!pe) {
-                                if (s->store.drop_snapshot)
-                                        s->store.drop_snapshot(&s->store);
-                                s->valid = 0;
-                                r = -EIO;
-                                up_write(&s->lock);
-                        } else {
-                                remap_exception(s, &pe->e, bio);
-                                bio_list_add(&pe->snapshot_bios, bio);
-
-                                if (!pe->started) {
-                                        /* this is protected by snap->lock */
-                                        pe->started = 1;
-                                        up_write(&s->lock);
-                                        start_copy(pe);
-                                } else
-                                        up_write(&s->lock);
-                                r = 0;
-                        }
+                        goto out_unlock;
+                }
+
+                pe = __find_pending_exception(s, bio);
+                if (!pe) {
+                        __invalidate_snapshot(s, pe, -ENOMEM);
+                        r = -EIO;
+                        goto out_unlock;
+                }
+
+                remap_exception(s, &pe->e, bio);
+                bio_list_add(&pe->snapshot_bios, bio);
+
+                if (!pe->started) {
+                        /* this is protected by snap->lock */
+                        pe->started = 1;
+                        copy_needed = 1;
                 }
 
+                r = 0;
+
+ out_unlock:
+                up_write(&s->lock);
+
+                if (copy_needed)
+                        start_copy(pe);
         } else {
                 /*
                  * FIXME: this read path scares me because we
@@ -847,6 +921,11 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio,
                 /* Do reads */
                 down_read(&s->lock);
 
+                if (!s->valid) {
+                        up_read(&s->lock);
+                        return -EIO;
+                }
+
                 /* See if it it has been remapped */
                 e = lookup_exception(&s->complete, chunk);
                 if (e)
@@ -884,9 +963,9 @@ static int snapshot_status(struct dm_target *ti, status_type_t type,
                                 snap->store.fraction_full(&snap->store,
                                                           &numerator,
                                                           &denominator);
-                                snprintf(result, maxlen,
-                                         SECTOR_FORMAT "/" SECTOR_FORMAT,
-                                         numerator, denominator);
+                                snprintf(result, maxlen, "%llu/%llu",
+                                        (unsigned long long)numerator,
+                                        (unsigned long long)denominator);
                         }
                         else
                                 snprintf(result, maxlen, "Unknown");
@@ -899,9 +978,10 @@ static int snapshot_status(struct dm_target *ti, status_type_t type,
                  * to make private copies if the output is to
                  * make sense.
                  */
-                snprintf(result, maxlen, "%s %s %c " SECTOR_FORMAT,
+                snprintf(result, maxlen, "%s %s %c %llu",
                          snap->origin->name, snap->cow->name,
-                         snap->type, snap->chunk_size);
+                         snap->type,
+                         (unsigned long long)snap->chunk_size);
                 break;
         }
 
@@ -911,40 +991,27 @@ static int snapshot_status(struct dm_target *ti, status_type_t type,
 /*-----------------------------------------------------------------
  * Origin methods
  *---------------------------------------------------------------*/
-static void list_merge(struct list_head *l1, struct list_head *l2)
-{
-        struct list_head *l1_n, *l2_p;
-
-        l1_n = l1->next;
-        l2_p = l2->prev;
-
-        l1->next = l2;
-        l2->prev = l1;
-
-        l2_p->next = l1_n;
-        l1_n->prev = l2_p;
-}
-
 static int __origin_write(struct list_head *snapshots, struct bio *bio)
 {
-        int r = 1, first = 1;
+        int r = 1, first = 0;
         struct dm_snapshot *snap;
         struct exception *e;
-        struct pending_exception *pe, *last = NULL;
+        struct pending_exception *pe, *next_pe, *primary_pe = NULL;
         chunk_t chunk;
+        LIST_HEAD(pe_queue);
 
         /* Do all the snapshots on this origin */
         list_for_each_entry (snap, snapshots, list) {
 
+                down_write(&snap->lock);
+
                 /* Only deal with valid and active snapshots */
                 if (!snap->valid || !snap->active)
-                        continue;
+                        goto next_snapshot;
 
                 /* Nothing to do if writing beyond end of snapshot */
                 if (bio->bi_sector >= dm_table_get_size(snap->table))
-                        continue;
-
-                down_write(&snap->lock);
+                        goto next_snapshot;
 
                 /*
                  * Remember, different snapshots can have
@@ -956,49 +1023,75 @@ static int __origin_write(struct list_head *snapshots, struct bio *bio)
                  * Check exception table to see if block
                  * is already remapped in this snapshot
                  * and trigger an exception if not.
+                 *
+                 * sibling_count is initialised to 1 so pending_complete()
+                 * won't destroy the primary_pe while we're inside this loop.
                  */
                 e = lookup_exception(&snap->complete, chunk);
-                if (!e) {
-                        pe = __find_pending_exception(snap, bio);
-                        if (!pe) {
-                                snap->store.drop_snapshot(&snap->store);
-                                snap->valid = 0;
-
-                        } else {
-                                if (last)
-                                        list_merge(&pe->siblings,
-                                                   &last->siblings);
-
-                                last = pe;
-                                r = 0;
+                if (e)
+                        goto next_snapshot;
+
+                pe = __find_pending_exception(snap, bio);
+                if (!pe) {
+                        __invalidate_snapshot(snap, pe, ENOMEM);
+                        goto next_snapshot;
+                }
+
+                if (!primary_pe) {
+                        /*
+                         * Either every pe here has same
+                         * primary_pe or none has one yet.
+                         */
+                        if (pe->primary_pe)
+                                primary_pe = pe->primary_pe;
+                        else {
+                                primary_pe = pe;
+                                first = 1;
                         }
+
+                        bio_list_add(&primary_pe->origin_bios, bio);
+
+                        r = 0;
+                }
+
+                if (!pe->primary_pe) {
+                        atomic_inc(&primary_pe->sibling_count);
+                        pe->primary_pe = primary_pe;
+                }
+
+                if (!pe->started) {
+                        pe->started = 1;
+                        list_add_tail(&pe->list, &pe_queue);
                 }
 
+ next_snapshot:
                 up_write(&snap->lock);
         }
 
+        if (!primary_pe)
+                goto out;
+
         /*
-         * Now that we have a complete pe list we can start the copying.
+         * If this is the first time we're processing this chunk and
+         * sibling_count is now 1 it means all the pending exceptions
+         * got completed while we were in the loop above, so it falls to
+         * us here to remove the primary_pe and submit any origin_bios.
          */
-        if (last) {
-                pe = last;
-                do {
-                        down_write(&pe->snap->lock);
-                        if (first)
-                                bio_list_add(&pe->origin_bios, bio);
-                        if (!pe->started) {
-                                pe->started = 1;
-                                up_write(&pe->snap->lock);
-                                start_copy(pe);
-                        } else
-                                up_write(&pe->snap->lock);
-                        first = 0;
-                        pe = list_entry(pe->siblings.next,
-                                        struct pending_exception, siblings);
-
-                } while (pe != last);
+
+        if (first && atomic_dec_and_test(&primary_pe->sibling_count)) {
+                flush_bios(bio_list_get(&primary_pe->origin_bios));
+                free_pending_exception(primary_pe);
+                /* If we got here, pe_queue is necessarily empty. */
+                goto out;
         }
 
+        /*
+         * Now that we have a complete pe list we can start the copying.
+         */
+        list_for_each_entry_safe(pe, next_pe, &pe_queue, list)
+                start_copy(pe);
+
+ out:
         return r;
 }
 
@@ -1174,8 +1267,7 @@ static int __init dm_snapshot_init(void)
                 goto bad4;
         }
 
-        pending_pool = mempool_create(128, mempool_alloc_slab,
-                                      mempool_free_slab, pending_cache);
+        pending_pool = mempool_create_slab_pool(128, pending_cache);
         if (!pending_pool) {
                 DMERR("Couldn't create pending pool.");
                 r = -ENOMEM;
diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
index 697aacafb0..08328a8f5a 100644
--- a/drivers/md/dm-stripe.c
+++ b/drivers/md/dm-stripe.c
@@ -49,9 +49,9 @@ static inline struct stripe_c *alloc_context(unsigned int stripes)
 static int get_stripe(struct dm_target *ti, struct stripe_c *sc,
                       unsigned int stripe, char **argv)
 {
-        sector_t start;
+        unsigned long long start;
 
-        if (sscanf(argv[1], SECTOR_FORMAT, &start) != 1)
+        if (sscanf(argv[1], "%llu", &start) != 1)
                 return -EINVAL;
 
         if (dm_get_device(ti, argv[0], start, sc->stripe_width,
@@ -103,7 +103,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 return -EINVAL;
         }
 
-        if (((uint32_t)ti->len) & (chunk_size - 1)) {
+        if (ti->len & (chunk_size - 1)) {
                 ti->error = "dm-stripe: Target length not divisible by "
                     "chunk size";
                 return -EINVAL;
@@ -201,10 +201,11 @@ static int stripe_status(struct dm_target *ti,
                 break;
 
         case STATUSTYPE_TABLE:
-                DMEMIT("%d " SECTOR_FORMAT, sc->stripes, sc->chunk_mask + 1);
+                DMEMIT("%d %llu", sc->stripes,
+                        (unsigned long long)sc->chunk_mask + 1);
                 for (i = 0; i < sc->stripes; i++)
-                        DMEMIT(" %s " SECTOR_FORMAT, sc->stripe[i].dev->name,
-                               sc->stripe[i].physical_start);
+                        DMEMIT(" %s %llu", sc->stripe[i].dev->name,
+                            (unsigned long long)sc->stripe[i].physical_start);
                 break;
         }
         return 0;
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 9b1e2f5ca6..8f56a54cf0 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -14,6 +14,7 @@
 #include <linux/ctype.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
+#include <linux/mutex.h>
 #include <asm/atomic.h>
 
 #define MAX_DEPTH 16
@@ -22,6 +23,7 @@
 #define CHILDREN_PER_NODE (KEYS_PER_NODE + 1)
 
 struct dm_table {
+        struct mapped_device *md;
         atomic_t holders;
 
         /* btree table */
@@ -97,6 +99,8 @@ static void combine_restrictions_low(struct io_restrictions *lhs,
 
         lhs->seg_boundary_mask =
                 min_not_zero(lhs->seg_boundary_mask, rhs->seg_boundary_mask);
+
+        lhs->no_cluster |= rhs->no_cluster;
 }
 
 /*
@@ -204,7 +208,8 @@ static int alloc_targets(struct dm_table *t, unsigned int num)
         return 0;
 }
 
-int dm_table_create(struct dm_table **result, int mode, unsigned num_targets)
+int dm_table_create(struct dm_table **result, int mode,
+                    unsigned num_targets, struct mapped_device *md)
 {
         struct dm_table *t = kmalloc(sizeof(*t), GFP_KERNEL);
 
@@ -227,6 +232,7 @@ int dm_table_create(struct dm_table **result, int mode, unsigned num_targets)
         }
 
         t->mode = mode;
+        t->md = md;
         *result = t;
         return 0;
 }
@@ -345,20 +351,19 @@ static struct dm_dev *find_device(struct list_head *l, dev_t dev)
 /*
  * Open a device so we can use it as a map destination.
  */
-static int open_dev(struct dm_dev *d, dev_t dev)
+static int open_dev(struct dm_dev *d, dev_t dev, struct mapped_device *md)
 {
         static char *_claim_ptr = "I belong to device-mapper";
         struct block_device *bdev;
 
         int r;
 
-        if (d->bdev)
-                BUG();
+        BUG_ON(d->bdev);
 
         bdev = open_by_devnum(dev, d->mode);
         if (IS_ERR(bdev))
                 return PTR_ERR(bdev);
-        r = bd_claim(bdev, _claim_ptr);
+        r = bd_claim_by_disk(bdev, _claim_ptr, dm_disk(md));
         if (r)
                 blkdev_put(bdev);
         else
@@ -369,12 +374,12 @@ static int open_dev(struct dm_dev *d, dev_t dev)
 /*
  * Close a device that we've been using.
  */
-static void close_dev(struct dm_dev *d)
+static void close_dev(struct dm_dev *d, struct mapped_device *md)
 {
         if (!d->bdev)
                 return;
 
-        bd_release(d->bdev);
+        bd_release_from_disk(d->bdev, dm_disk(md));
         blkdev_put(d->bdev);
         d->bdev = NULL;
 }
@@ -395,7 +400,7 @@ static int check_device_area(struct dm_dev *dd, sector_t start, sector_t len)
  * careful to leave things as they were if we fail to reopen the
  * device.
  */
-static int upgrade_mode(struct dm_dev *dd, int new_mode)
+static int upgrade_mode(struct dm_dev *dd, int new_mode, struct mapped_device *md)
 {
         int r;
         struct dm_dev dd_copy;
@@ -405,9 +410,9 @@ static int upgrade_mode(struct dm_dev *dd, int new_mode)
 
         dd->mode |= new_mode;
         dd->bdev = NULL;
-        r = open_dev(dd, dev);
+        r = open_dev(dd, dev, md);
         if (!r)
-                close_dev(&dd_copy);
+                close_dev(&dd_copy, md);
         else
                 *dd = dd_copy;
 
@@ -427,8 +432,7 @@ static int __table_get_device(struct dm_table *t, struct dm_target *ti,
         struct dm_dev *dd;
         unsigned int major, minor;
 
-        if (!t)
-                BUG();
+        BUG_ON(!t);
 
         if (sscanf(path, "%u:%u", &major, &minor) == 2) {
                 /* Extract the major/minor numbers */
@@ -450,7 +454,7 @@ static int __table_get_device(struct dm_table *t, struct dm_target *ti,
                 dd->mode = mode;
                 dd->bdev = NULL;
 
-                if ((r = open_dev(dd, dev))) {
+                if ((r = open_dev(dd, dev, t->md))) {
                         kfree(dd);
                         return r;
                 }
@@ -461,7 +465,7 @@ static int __table_get_device(struct dm_table *t, struct dm_target *ti,
                 list_add(&dd->list, &t->devices);
 
         } else if (dd->mode != (mode | dd->mode)) {
-                r = upgrade_mode(dd, mode);
+                r = upgrade_mode(dd, mode, t->md);
                 if (r)
                         return r;
         }
@@ -525,6 +529,8 @@ int dm_get_device(struct dm_target *ti, const char *path, sector_t start,
                 rs->seg_boundary_mask =
                         min_not_zero(rs->seg_boundary_mask,
                                      q->seg_boundary_mask);
+
+                rs->no_cluster |= !test_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags);
         }
 
         return r;
@@ -536,7 +542,7 @@ int dm_get_device(struct dm_target *ti, const char *path, sector_t start,
 void dm_put_device(struct dm_target *ti, struct dm_dev *dd)
 {
         if (atomic_dec_and_test(&dd->count)) {
-                close_dev(dd);
+                close_dev(dd, ti->table->md);
                 list_del(&dd->list);
                 kfree(dd);
         }
@@ -765,14 +771,14 @@ int dm_table_complete(struct dm_table *t)
         return r;
 }
 
-static DECLARE_MUTEX(_event_lock);
+static DEFINE_MUTEX(_event_lock);
 void dm_table_event_callback(struct dm_table *t,
                              void (*fn)(void *), void *context)
 {
-        down(&_event_lock);
+        mutex_lock(&_event_lock);
         t->event_fn = fn;
         t->event_context = context;
-        up(&_event_lock);
+        mutex_unlock(&_event_lock);
 }
 
 void dm_table_event(struct dm_table *t)
@@ -783,10 +789,10 @@ void dm_table_event(struct dm_table *t)
          */
         BUG_ON(in_interrupt());
 
-        down(&_event_lock);
+        mutex_lock(&_event_lock);
         if (t->event_fn)
                 t->event_fn(t->event_context);
-        up(&_event_lock);
+        mutex_unlock(&_event_lock);
 }
 
 sector_t dm_table_get_size(struct dm_table *t)
@@ -834,6 +840,11 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q)
         q->hardsect_size = t->limits.hardsect_size;
         q->max_segment_size = t->limits.max_segment_size;
         q->seg_boundary_mask = t->limits.seg_boundary_mask;
+        if (t->limits.no_cluster)
+                q->queue_flags &= ~(1 << QUEUE_FLAG_CLUSTER);
+        else
+                q->queue_flags |= (1 << QUEUE_FLAG_CLUSTER);
+
 }
 
 unsigned int dm_table_get_num_targets(struct dm_table *t)
@@ -945,12 +956,20 @@ int dm_table_flush_all(struct dm_table *t)
         return ret;
 }
 
+struct mapped_device *dm_table_get_md(struct dm_table *t)
+{
+        dm_get(t->md);
+
+        return t->md;
+}
+
 EXPORT_SYMBOL(dm_vcalloc);
 EXPORT_SYMBOL(dm_get_device);
 EXPORT_SYMBOL(dm_put_device);
 EXPORT_SYMBOL(dm_table_event);
 EXPORT_SYMBOL(dm_table_get_size);
 EXPORT_SYMBOL(dm_table_get_mode);
+EXPORT_SYMBOL(dm_table_get_md);
 EXPORT_SYMBOL(dm_table_put);
 EXPORT_SYMBOL(dm_table_get);
 EXPORT_SYMBOL(dm_table_unplug_all);
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 8c82373f7f..4d710b7a13 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -10,6 +10,7 @@
 
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/mutex.h>
 #include <linux/moduleparam.h>
 #include <linux/blkpg.h>
 #include <linux/bio.h>
@@ -17,6 +18,7 @@
 #include <linux/mempool.h>
 #include <linux/slab.h>
 #include <linux/idr.h>
+#include <linux/hdreg.h>
 #include <linux/blktrace_api.h>
 
 static const char *_name = DM_NAME;
@@ -69,6 +71,7 @@ struct mapped_device {
 
         request_queue_t *queue;
         struct gendisk *disk;
+        char name[16];
 
         void *interface_ptr;
 
@@ -101,6 +104,9 @@ struct mapped_device {
          */
         struct super_block *frozen_sb;
         struct block_device *suspended_bdev;
+
+        /* forced geometry settings */
+        struct hd_geometry geometry;
 };
 
 #define MIN_IOS 256
@@ -226,6 +232,13 @@ static int dm_blk_close(struct inode *inode, struct file *file)
         return 0;
 }
 
+static int dm_blk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
+{
+        struct mapped_device *md = bdev->bd_disk->private_data;
+
+        return dm_get_geometry(md, geo);
+}
+
 static inline struct dm_io *alloc_io(struct mapped_device *md)
 {
         return mempool_alloc(md->io_pool, GFP_NOIO);
@@ -312,6 +325,33 @@ struct dm_table *dm_get_table(struct mapped_device *md)
         return t;
 }
 
+/*
+ * Get the geometry associated with a dm device
+ */
+int dm_get_geometry(struct mapped_device *md, struct hd_geometry *geo)
+{
+        *geo = md->geometry;
+
+        return 0;
+}
+
+/*
+ * Set the geometry of a device.
+ */
+int dm_set_geometry(struct mapped_device *md, struct hd_geometry *geo)
+{
+        sector_t sz = (sector_t)geo->cylinders * geo->heads * geo->sectors;
+
+        if (geo->start > sz) {
+                DMWARN("Start sector is beyond the geometry limits.");
+                return -EINVAL;
+        }
+
+        md->geometry = *geo;
+
+        return 0;
+}
+
 /*-----------------------------------------------------------------
  * CRUD START:
  *   A more elegant soln is in the works that uses the queue
@@ -704,14 +744,14 @@ static int dm_any_congested(void *congested_data, int bdi_bits)
 /*-----------------------------------------------------------------
  * An IDR is used to keep track of allocated minor numbers.
  *---------------------------------------------------------------*/
-static DECLARE_MUTEX(_minor_lock);
+static DEFINE_MUTEX(_minor_lock);
 static DEFINE_IDR(_minor_idr);
 
 static void free_minor(unsigned int minor)
 {
-        down(&_minor_lock);
+        mutex_lock(&_minor_lock);
         idr_remove(&_minor_idr, minor);
-        up(&_minor_lock);
+        mutex_unlock(&_minor_lock);
 }
 
 /*
@@ -724,7 +764,7 @@ static int specific_minor(struct mapped_device *md, unsigned int minor)
         if (minor >= (1 << MINORBITS))
                 return -EINVAL;
 
-        down(&_minor_lock);
+        mutex_lock(&_minor_lock);
 
         if (idr_find(&_minor_idr, minor)) {
                 r = -EBUSY;
@@ -749,7 +789,7 @@ static int specific_minor(struct mapped_device *md, unsigned int minor)
         }
 
 out:
-        up(&_minor_lock);
+        mutex_unlock(&_minor_lock);
         return r;
 }
 
@@ -758,7 +798,7 @@ static int next_free_minor(struct mapped_device *md, unsigned int *minor)
         int r;
         unsigned int m;
 
-        down(&_minor_lock);
+        mutex_lock(&_minor_lock);
 
         r = idr_pre_get(&_minor_idr, GFP_KERNEL);
         if (!r) {
@@ -780,7 +820,7 @@ static int next_free_minor(struct mapped_device *md, unsigned int *minor)
         *minor = m;
 
 out:
-        up(&_minor_lock);
+        mutex_unlock(&_minor_lock);
         return r;
 }
 
@@ -823,13 +863,11 @@ static struct mapped_device *alloc_dev(unsigned int minor, int persistent)
         md->queue->unplug_fn = dm_unplug_all;
         md->queue->issue_flush_fn = dm_flush_all;
 
-        md->io_pool = mempool_create(MIN_IOS, mempool_alloc_slab,
-                                     mempool_free_slab, _io_cache);
+        md->io_pool = mempool_create_slab_pool(MIN_IOS, _io_cache);
         if (!md->io_pool)
                 goto bad2;
 
-        md->tio_pool = mempool_create(MIN_IOS, mempool_alloc_slab,
-                                      mempool_free_slab, _tio_cache);
+        md->tio_pool = mempool_create_slab_pool(MIN_IOS, _tio_cache);
         if (!md->tio_pool)
                 goto bad3;
 
@@ -844,6 +882,7 @@ static struct mapped_device *alloc_dev(unsigned int minor, int persistent)
         md->disk->private_data = md;
         sprintf(md->disk->disk_name, "dm-%d", minor);
         add_disk(md->disk);
+        format_dev_t(md->name, MKDEV(_major, minor));
 
         atomic_set(&md->pending, 0);
         init_waitqueue_head(&md->wait);
@@ -906,6 +945,13 @@ static int __bind(struct mapped_device *md, struct dm_table *t)
         sector_t size;
 
         size = dm_table_get_size(t);
+
+        /*
+         * Wipe any geometry if the size of the table changed.
+         */
+        if (size != get_capacity(md->disk))
+                memset(&md->geometry, 0, sizeof(md->geometry));
+
         __set_size(md, size);
         if (size == 0)
                 return 0;
@@ -969,13 +1015,13 @@ static struct mapped_device *dm_find_md(dev_t dev)
         if (MAJOR(dev) != _major || minor >= (1 << MINORBITS))
                 return NULL;
 
-        down(&_minor_lock);
+        mutex_lock(&_minor_lock);
 
         md = idr_find(&_minor_idr, minor);
         if (!md || (dm_disk(md)->first_minor != minor))
                 md = NULL;
 
-        up(&_minor_lock);
+        mutex_unlock(&_minor_lock);
 
         return md;
 }
@@ -990,15 +1036,9 @@ struct mapped_device *dm_get_md(dev_t dev)
         return md;
 }
 
-void *dm_get_mdptr(dev_t dev)
+void *dm_get_mdptr(struct mapped_device *md)
 {
-        struct mapped_device *md;
-        void *mdptr = NULL;
-
-        md = dm_find_md(dev);
-        if (md)
-                mdptr = md->interface_ptr;
-        return mdptr;
+        return md->interface_ptr;
 }
 
 void dm_set_mdptr(struct mapped_device *md, void *ptr)
@@ -1013,18 +1053,18 @@ void dm_get(struct mapped_device *md)
 
 void dm_put(struct mapped_device *md)
 {
-        struct dm_table *map = dm_get_table(md);
+        struct dm_table *map;
 
         if (atomic_dec_and_test(&md->holders)) {
+                map = dm_get_table(md);
                 if (!dm_suspended(md)) {
                         dm_table_presuspend_targets(map);
                         dm_table_postsuspend_targets(map);
                 }
                 __unbind(md);
+                dm_table_put(map);
                 free_dev(md);
         }
-
-        dm_table_put(map);
 }
 
 /*
@@ -1109,6 +1149,7 @@ int dm_suspend(struct mapped_device *md, int do_lockfs)
 {
         struct dm_table *map = NULL;
         DECLARE_WAITQUEUE(wait, current);
+        struct bio *def;
         int r = -EINVAL;
 
         down(&md->suspend_lock);
@@ -1168,9 +1209,11 @@ int dm_suspend(struct mapped_device *md, int do_lockfs)
         /* were we interrupted ? */
         r = -EINTR;
         if (atomic_read(&md->pending)) {
+                clear_bit(DMF_BLOCK_IO, &md->flags);
+                def = bio_list_get(&md->deferred);
+                __flush_deferred_io(md, def);
                 up_write(&md->io_lock);
                 unlock_fs(md);
-                clear_bit(DMF_BLOCK_IO, &md->flags);
                 goto out;
         }
         up_write(&md->io_lock);
@@ -1264,6 +1307,7 @@ int dm_suspended(struct mapped_device *md)
 static struct block_device_operations dm_blk_dops = {
         .open = dm_blk_open,
         .release = dm_blk_close,
+        .getgeo = dm_blk_getgeo,
         .owner = THIS_MODULE
 };
 
diff --git a/drivers/md/dm.h b/drivers/md/dm.h
index 4eaf075da2..fd90bc8f9e 100644
--- a/drivers/md/dm.h
+++ b/drivers/md/dm.h
@@ -14,6 +14,7 @@
 #include <linux/device-mapper.h>
 #include <linux/list.h>
 #include <linux/blkdev.h>
+#include <linux/hdreg.h>
 
 #define DM_NAME "device-mapper"
 #define DMWARN(f, x...) printk(KERN_WARNING DM_NAME ": " f "\n" , ## x)
@@ -23,16 +24,6 @@
 #define DMEMIT(x...) sz += ((sz >= maxlen) ? \
                           0 : scnprintf(result + sz, maxlen - sz, x))
 
-/*
- * FIXME: I think this should be with the definition of sector_t
- * in types.h.
- */
-#ifdef CONFIG_LBD
-#define SECTOR_FORMAT "%llu"
-#else
-#define SECTOR_FORMAT "%lu"
-#endif
-
 #define SECTOR_SHIFT 9
 
 /*
@@ -57,7 +48,7 @@ struct mapped_device;
 int dm_create(struct mapped_device **md);
 int dm_create_with_minor(unsigned int minor, struct mapped_device **md);
 void dm_set_mdptr(struct mapped_device *md, void *ptr);
-void *dm_get_mdptr(dev_t dev);
+void *dm_get_mdptr(struct mapped_device *md);
 struct mapped_device *dm_get_md(dev_t dev);
 
 /*
@@ -95,11 +86,18 @@ int dm_wait_event(struct mapped_device *md, int event_nr);
 struct gendisk *dm_disk(struct mapped_device *md);
 int dm_suspended(struct mapped_device *md);
 
+/*
+ * Geometry functions.
+ */
+int dm_get_geometry(struct mapped_device *md, struct hd_geometry *geo);
+int dm_set_geometry(struct mapped_device *md, struct hd_geometry *geo);
+
 /*-----------------------------------------------------------------
  * Functions for manipulating a table.  Tables are also reference
  * counted.
  *---------------------------------------------------------------*/
-int dm_table_create(struct dm_table **result, int mode, unsigned num_targets);
+int dm_table_create(struct dm_table **result, int mode,
+                    unsigned num_targets, struct mapped_device *md);
 
 void dm_table_get(struct dm_table *t);
 void dm_table_put(struct dm_table *t);
@@ -117,6 +115,7 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q);
 unsigned int dm_table_get_num_targets(struct dm_table *t);
 struct list_head *dm_table_get_devices(struct dm_table *t);
 int dm_table_get_mode(struct dm_table *t);
+struct mapped_device *dm_table_get_md(struct dm_table *t);
 void dm_table_presuspend_targets(struct dm_table *t);
 void dm_table_postsuspend_targets(struct dm_table *t);
 void dm_table_resume_targets(struct dm_table *t);
diff --git a/drivers/md/kcopyd.c b/drivers/md/kcopyd.c
index 8b3515f394..72480a48d8 100644
--- a/drivers/md/kcopyd.c
+++ b/drivers/md/kcopyd.c
@@ -22,6 +22,7 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/workqueue.h>
+#include <linux/mutex.h>
 
 #include "kcopyd.h"
 
@@ -44,6 +45,9 @@ struct kcopyd_client {
         struct page_list *pages;
         unsigned int nr_pages;
         unsigned int nr_free_pages;
+
+        wait_queue_head_t destroyq;
+        atomic_t nr_jobs;
 };
 
 static struct page_list *alloc_pl(void)
@@ -227,8 +231,7 @@ static int jobs_init(void)
         if (!_job_cache)
                 return -ENOMEM;
 
-        _job_pool = mempool_create(MIN_JOBS, mempool_alloc_slab,
-                                   mempool_free_slab, _job_cache);
+        _job_pool = mempool_create_slab_pool(MIN_JOBS, _job_cache);
         if (!_job_pool) {
                 kmem_cache_destroy(_job_cache);
                 return -ENOMEM;
@@ -293,10 +296,15 @@ static int run_complete_job(struct kcopyd_job *job)
         int read_err = job->read_err;
         unsigned int write_err = job->write_err;
         kcopyd_notify_fn fn = job->fn;
+        struct kcopyd_client *kc = job->kc;
 
-        kcopyd_put_pages(job->kc, job->pages);
+        kcopyd_put_pages(kc, job->pages);
         mempool_free(job, _job_pool);
         fn(read_err, write_err, context);
+
+        if (atomic_dec_and_test(&kc->nr_jobs))
+                wake_up(&kc->destroyq);
+
         return 0;
 }
 
@@ -431,6 +439,7 @@ static void do_work(void *ignored)
  */
 static void dispatch_job(struct kcopyd_job *job)
 {
+        atomic_inc(&job->kc->nr_jobs);
         push(&_pages_jobs, job);
         wake();
 }
@@ -573,68 +582,68 @@ int kcopyd_cancel(struct kcopyd_job *job, int block)
 /*-----------------------------------------------------------------
  * Unit setup
  *---------------------------------------------------------------*/
-static DECLARE_MUTEX(_client_lock);
+static DEFINE_MUTEX(_client_lock);
 static LIST_HEAD(_clients);
 
 static void client_add(struct kcopyd_client *kc)
 {
-        down(&_client_lock);
+        mutex_lock(&_client_lock);
         list_add(&kc->list, &_clients);
-        up(&_client_lock);
+        mutex_unlock(&_client_lock);
 }
 
 static void client_del(struct kcopyd_client *kc)
 {
-        down(&_client_lock);
+        mutex_lock(&_client_lock);
         list_del(&kc->list);
-        up(&_client_lock);
+        mutex_unlock(&_client_lock);
 }
 
-static DECLARE_MUTEX(kcopyd_init_lock);
+static DEFINE_MUTEX(kcopyd_init_lock);
 static int kcopyd_clients = 0;
 
 static int kcopyd_init(void)
 {
         int r;
 
-        down(&kcopyd_init_lock);
+        mutex_lock(&kcopyd_init_lock);
 
         if (kcopyd_clients) {
                 /* Already initialized. */
                 kcopyd_clients++;
-                up(&kcopyd_init_lock);
+                mutex_unlock(&kcopyd_init_lock);
                 return 0;
         }
 
         r = jobs_init();
         if (r) {
-                up(&kcopyd_init_lock);
+                mutex_unlock(&kcopyd_init_lock);
                 return r;
         }
 
         _kcopyd_wq = create_singlethread_workqueue("kcopyd");
         if (!_kcopyd_wq) {
                 jobs_exit();
-                up(&kcopyd_init_lock);
+                mutex_unlock(&kcopyd_init_lock);
                 return -ENOMEM;
         }
 
         kcopyd_clients++;
         INIT_WORK(&_kcopyd_work, do_work, NULL);
-        up(&kcopyd_init_lock);
+        mutex_unlock(&kcopyd_init_lock);
         return 0;
 }
 
 static void kcopyd_exit(void)
 {
-        down(&kcopyd_init_lock);
+        mutex_lock(&kcopyd_init_lock);
         kcopyd_clients--;
         if (!kcopyd_clients) {
                 jobs_exit();
                 destroy_workqueue(_kcopyd_wq);
                 _kcopyd_wq = NULL;
         }
-        up(&kcopyd_init_lock);
+        mutex_unlock(&kcopyd_init_lock);
 }
 
 int kcopyd_client_create(unsigned int nr_pages, struct kcopyd_client **result)
@@ -670,6 +679,9 @@ int kcopyd_client_create(unsigned int nr_pages, struct kcopyd_client **result)
                 return r;
         }
 
+        init_waitqueue_head(&kc->destroyq);
+        atomic_set(&kc->nr_jobs, 0);
+
         client_add(kc);
         *result = kc;
         return 0;
@@ -677,6 +689,9 @@ int kcopyd_client_create(unsigned int nr_pages, struct kcopyd_client **result)
 
 void kcopyd_client_destroy(struct kcopyd_client *kc)
 {
+        /* Wait for completion of all jobs submitted by this client. */
+        wait_event(kc->destroyq, !atomic_read(&kc->nr_jobs));
+
         dm_io_put(kc->nr_pages);
         client_free_pages(kc);
         client_del(kc);
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 5ed2228745..039e071c10 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -43,6 +43,7 @@
 #include <linux/buffer_head.h> /* for invalidate_bdev */
 #include <linux/suspend.h>
 #include <linux/poll.h>
+#include <linux/mutex.h>
 
 #include <linux/init.h>
 
@@ -158,11 +159,12 @@ static int start_readonly;
  */
 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
 static atomic_t md_event_count;
-static void md_new_event(mddev_t *mddev)
+void md_new_event(mddev_t *mddev)
 {
         atomic_inc(&md_event_count);
         wake_up(&md_event_waiters);
 }
+EXPORT_SYMBOL_GPL(md_new_event);
 
 /*
  * Enables to iterate over all existing md arrays
@@ -253,7 +255,7 @@ static mddev_t * mddev_find(dev_t unit)
         else
                 new->md_minor = MINOR(unit) >> MdpMinorShift;
 
-        init_MUTEX(&new->reconfig_sem);
+        mutex_init(&new->reconfig_mutex);
         INIT_LIST_HEAD(&new->disks);
         INIT_LIST_HEAD(&new->all_mddevs);
         init_timer(&new->safemode_timer);
@@ -266,6 +268,7 @@ static mddev_t * mddev_find(dev_t unit)
                 kfree(new);
                 return NULL;
         }
+        set_bit(QUEUE_FLAG_CLUSTER, &new->queue->queue_flags);
 
         blk_queue_make_request(new->queue, md_fail_request);
 
@@ -274,22 +277,22 @@ static mddev_t * mddev_find(dev_t unit)
 
 static inline int mddev_lock(mddev_t * mddev)
 {
-        return down_interruptible(&mddev->reconfig_sem);
+        return mutex_lock_interruptible(&mddev->reconfig_mutex);
 }
 
 static inline void mddev_lock_uninterruptible(mddev_t * mddev)
 {
-        down(&mddev->reconfig_sem);
+        mutex_lock(&mddev->reconfig_mutex);
 }
 
 static inline int mddev_trylock(mddev_t * mddev)
 {
-        return down_trylock(&mddev->reconfig_sem);
+        return mutex_trylock(&mddev->reconfig_mutex);
 }
 
 static inline void mddev_unlock(mddev_t * mddev)
 {
-        up(&mddev->reconfig_sem);
+        mutex_unlock(&mddev->reconfig_mutex);
 
         md_wakeup_thread(mddev->thread);
 }
@@ -660,7 +663,8 @@ static int super_90_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version
         }
 
         if (sb->major_version != 0 ||
-            sb->minor_version != 90) {
+            sb->minor_version < 90 ||
+            sb->minor_version > 91) {
                 printk(KERN_WARNING "Bad version number %d.%d on %s\n",
                         sb->major_version, sb->minor_version,
                         b);
@@ -745,6 +749,20 @@ static int super_90_validate(mddev_t *mddev, mdk_rdev_t *rdev)
                 mddev->bitmap_offset = 0;
                 mddev->default_bitmap_offset = MD_SB_BYTES >> 9;
 
+                if (mddev->minor_version >= 91) {
+                        mddev->reshape_position = sb->reshape_position;
+                        mddev->delta_disks = sb->delta_disks;
+                        mddev->new_level = sb->new_level;
+                        mddev->new_layout = sb->new_layout;
+                        mddev->new_chunk = sb->new_chunk;
+                } else {
+                        mddev->reshape_position = MaxSector;
+                        mddev->delta_disks = 0;
+                        mddev->new_level = mddev->level;
+                        mddev->new_layout = mddev->layout;
+                        mddev->new_chunk = mddev->chunk_size;
+                }
+
                 if (sb->state & (1<<MD_SB_CLEAN))
                         mddev->recovery_cp = MaxSector;
                 else {
@@ -764,7 +782,8 @@ static int super_90_validate(mddev_t *mddev, mdk_rdev_t *rdev)
 
                 if (sb->state & (1<<MD_SB_BITMAP_PRESENT) &&
                     mddev->bitmap_file == NULL) {
-                        if (mddev->level != 1 && mddev->level != 5 && mddev->level != 6
+                        if (mddev->level != 1 && mddev->level != 4
+                            && mddev->level != 5 && mddev->level != 6
                             && mddev->level != 10) {
                                 /* FIXME use a better test */
                                 printk(KERN_WARNING "md: bitmaps not supported for this level.\n");
@@ -838,7 +857,6 @@ static void super_90_sync(mddev_t *mddev, mdk_rdev_t *rdev)
 
         sb->md_magic = MD_SB_MAGIC;
         sb->major_version = mddev->major_version;
-        sb->minor_version = mddev->minor_version;
         sb->patch_version = mddev->patch_version;
         sb->gvalid_words  = 0; /* ignored */
         memcpy(&sb->set_uuid0, mddev->uuid+0, 4);
@@ -857,6 +875,17 @@ static void super_90_sync(mddev_t *mddev, mdk_rdev_t *rdev)
         sb->events_hi = (mddev->events>>32);
         sb->events_lo = (u32)mddev->events;
 
+        if (mddev->reshape_position == MaxSector)
+                sb->minor_version = 90;
+        else {
+                sb->minor_version = 91;
+                sb->reshape_position = mddev->reshape_position;
+                sb->new_level = mddev->new_level;
+                sb->delta_disks = mddev->delta_disks;
+                sb->new_layout = mddev->new_layout;
+                sb->new_chunk = mddev->new_chunk;
+        }
+        mddev->minor_version = sb->minor_version;
         if (mddev->in_sync)
         {
                 sb->recovery_cp = mddev->recovery_cp;
@@ -893,10 +922,9 @@ static void super_90_sync(mddev_t *mddev, mdk_rdev_t *rdev)
                         d->raid_disk = rdev2->raid_disk;
                 else
                         d->raid_disk = rdev2->desc_nr; /* compatibility */
-                if (test_bit(Faulty, &rdev2->flags)) {
+                if (test_bit(Faulty, &rdev2->flags))
                         d->state = (1<<MD_DISK_FAULTY);
-                        failed++;
-                } else if (test_bit(In_sync, &rdev2->flags)) {
+                else if (test_bit(In_sync, &rdev2->flags)) {
                         d->state = (1<<MD_DISK_ACTIVE);
                         d->state |= (1<<MD_DISK_SYNC);
                         active++;
@@ -1102,6 +1130,20 @@ static int super_1_validate(mddev_t *mddev, mdk_rdev_t *rdev)
                         }
                         mddev->bitmap_offset = (__s32)le32_to_cpu(sb->bitmap_offset);
                 }
+                if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE)) {
+                        mddev->reshape_position = le64_to_cpu(sb->reshape_position);
+                        mddev->delta_disks = le32_to_cpu(sb->delta_disks);
+                        mddev->new_level = le32_to_cpu(sb->new_level);
+                        mddev->new_layout = le32_to_cpu(sb->new_layout);
+                        mddev->new_chunk = le32_to_cpu(sb->new_chunk)<<9;
+                } else {
+                        mddev->reshape_position = MaxSector;
+                        mddev->delta_disks = 0;
+                        mddev->new_level = mddev->level;
+                        mddev->new_layout = mddev->layout;
+                        mddev->new_chunk = mddev->chunk_size;
+                }
+
         } else if (mddev->pers == NULL) {
                 /* Insist of good event counter while assembling */
                 __u64 ev1 = le64_to_cpu(sb->events);
@@ -1173,6 +1215,14 @@ static void super_1_sync(mddev_t *mddev, mdk_rdev_t *rdev)
                 sb->bitmap_offset = cpu_to_le32((__u32)mddev->bitmap_offset);
                 sb->feature_map = cpu_to_le32(MD_FEATURE_BITMAP_OFFSET);
         }
+        if (mddev->reshape_position != MaxSector) {
+                sb->feature_map |= cpu_to_le32(MD_FEATURE_RESHAPE_ACTIVE);
+                sb->reshape_position = cpu_to_le64(mddev->reshape_position);
+                sb->new_layout = cpu_to_le32(mddev->new_layout);
+                sb->delta_disks = cpu_to_le32(mddev->delta_disks);
+                sb->new_level = cpu_to_le32(mddev->new_level);
+                sb->new_chunk = cpu_to_le32(mddev->new_chunk>>9);
+        }
 
         max_dev = 0;
         ITERATE_RDEV(mddev,rdev2,tmp)
@@ -1301,6 +1351,7 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev)
         else
                 ko = &rdev->bdev->bd_disk->kobj;
         sysfs_create_link(&rdev->kobj, ko, "block");
+        bd_claim_by_disk(rdev->bdev, rdev, mddev->gendisk);
         return 0;
 }
 
@@ -1311,6 +1362,7 @@ static void unbind_rdev_from_array(mdk_rdev_t * rdev)
                 MD_BUG();
                 return;
         }
+        bd_release_from_disk(rdev->bdev, rdev->mddev->gendisk);
         list_del_init(&rdev->same_set);
         printk(KERN_INFO "md: unbind<%s>\n", bdevname(rdev->bdev,b));
         rdev->mddev = NULL;
@@ -1493,7 +1545,7 @@ static void sync_sbs(mddev_t * mddev)
         }
 }
 
-static void md_update_sb(mddev_t * mddev)
+void md_update_sb(mddev_t * mddev)
 {
         int err;
         struct list_head *tmp;
@@ -1570,6 +1622,7 @@ repeat:
         wake_up(&mddev->sb_wait);
 
 }
+EXPORT_SYMBOL_GPL(md_update_sb);
 
 /* words written to sysfs files may, or my not, be \n terminated.
  * We want to accept with case. For this we use cmd_match.
@@ -2162,7 +2215,9 @@ action_show(mddev_t *mddev, char *page)
         char *type = "idle";
         if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) ||
             test_bit(MD_RECOVERY_NEEDED, &mddev->recovery)) {
-                if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) {
+                if (test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery))
+                        type = "reshape";
+                else if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) {
                         if (!test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery))
                                 type = "resync";
                         else if (test_bit(MD_RECOVERY_CHECK, &mddev->recovery))
@@ -2193,7 +2248,14 @@ action_store(mddev_t *mddev, const char *page, size_t len)
                 return -EBUSY;
         else if (cmd_match(page, "resync") || cmd_match(page, "recover"))
                 set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
-        else {
+        else if (cmd_match(page, "reshape")) {
+                int err;
+                if (mddev->pers->start_reshape == NULL)
+                        return -EINVAL;
+                err = mddev->pers->start_reshape(mddev);
+                if (err)
+                        return err;
+        } else {
                 if (cmd_match(page, "check"))
                         set_bit(MD_RECOVERY_CHECK, &mddev->recovery);
                 else if (cmd_match(page, "repair"))
@@ -2304,6 +2366,63 @@ sync_completed_show(mddev_t *mddev, char *page)
 static struct md_sysfs_entry
 md_sync_completed = __ATTR_RO(sync_completed);
 
+static ssize_t
+suspend_lo_show(mddev_t *mddev, char *page)
+{
+        return sprintf(page, "%llu\n", (unsigned long long)mddev->suspend_lo);
+}
+
+static ssize_t
+suspend_lo_store(mddev_t *mddev, const char *buf, size_t len)
+{
+        char *e;
+        unsigned long long new = simple_strtoull(buf, &e, 10);
+
+        if (mddev->pers->quiesce == NULL)
+                return -EINVAL;
+        if (buf == e || (*e && *e != '\n'))
+                return -EINVAL;
+        if (new >= mddev->suspend_hi ||
+            (new > mddev->suspend_lo && new < mddev->suspend_hi)) {
+                mddev->suspend_lo = new;
+                mddev->pers->quiesce(mddev, 2);
+                return len;
+        } else
+                return -EINVAL;
+}
+static struct md_sysfs_entry md_suspend_lo =
+__ATTR(suspend_lo, S_IRUGO|S_IWUSR, suspend_lo_show, suspend_lo_store);
+
+
+static ssize_t
+suspend_hi_show(mddev_t *mddev, char *page)
+{
+        return sprintf(page, "%llu\n", (unsigned long long)mddev->suspend_hi);
+}
+
+static ssize_t
+suspend_hi_store(mddev_t *mddev, const char *buf, size_t len)
+{
+        char *e;
+        unsigned long long new = simple_strtoull(buf, &e, 10);
+
+        if (mddev->pers->quiesce == NULL)
+                return -EINVAL;
+        if (buf == e || (*e && *e != '\n'))
+                return -EINVAL;
+        if ((new <= mddev->suspend_lo && mddev->suspend_lo >= mddev->suspend_hi) ||
+            (new > mddev->suspend_lo && new > mddev->suspend_hi)) {
+                mddev->suspend_hi = new;
+                mddev->pers->quiesce(mddev, 1);
+                mddev->pers->quiesce(mddev, 0);
+                return len;
+        } else
+                return -EINVAL;
+}
+static struct md_sysfs_entry md_suspend_hi =
+__ATTR(suspend_hi, S_IRUGO|S_IWUSR, suspend_hi_show, suspend_hi_store);
+
+
 static struct attribute *md_default_attrs[] = {
         &md_level.attr,
         &md_raid_disks.attr,
@@ -2321,6 +2440,8 @@ static struct attribute *md_redundancy_attrs[] = {
         &md_sync_max.attr,
         &md_sync_speed.attr,
         &md_sync_completed.attr,
+        &md_suspend_lo.attr,
+        &md_suspend_hi.attr,
         NULL,
 };
 static struct attribute_group md_redundancy_group = {
@@ -2380,7 +2501,7 @@ int mdp_major = 0;
 
 static struct kobject *md_probe(dev_t dev, int *part, void *data)
 {
-        static DECLARE_MUTEX(disks_sem);
+        static DEFINE_MUTEX(disks_mutex);
         mddev_t *mddev = mddev_find(dev);
         struct gendisk *disk;
         int partitioned = (MAJOR(dev) != MD_MAJOR);
@@ -2390,15 +2511,15 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data)
         if (!mddev)
                 return NULL;
 
-        down(&disks_sem);
+        mutex_lock(&disks_mutex);
         if (mddev->gendisk) {
-                up(&disks_sem);
+                mutex_unlock(&disks_mutex);
                 mddev_put(mddev);
                 return NULL;
         }
         disk = alloc_disk(1 << shift);
         if (!disk) {
-                up(&disks_sem);
+                mutex_unlock(&disks_mutex);
                 mddev_put(mddev);
                 return NULL;
         }
@@ -2416,7 +2537,7 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data)
         disk->queue = mddev->queue;
         add_disk(disk);
         mddev->gendisk = disk;
-        up(&disks_sem);
+        mutex_unlock(&disks_mutex);
         mddev->kobj.parent = &disk->kobj;
         mddev->kobj.k_name = NULL;
         snprintf(mddev->kobj.name, KOBJ_NAME_LEN, "%s", "md");
@@ -2539,6 +2660,14 @@ static int do_md_run(mddev_t * mddev)
         mddev->level = pers->level;
         strlcpy(mddev->clevel, pers->name, sizeof(mddev->clevel));
 
+        if (mddev->reshape_position != MaxSector &&
+            pers->start_reshape == NULL) {
+                /* This personality cannot handle reshaping... */
+                mddev->pers = NULL;
+                module_put(pers->owner);
+                return -EINVAL;
+        }
+
         mddev->recovery = 0;
         mddev->resync_max_sectors = mddev->size << 1; /* may be over-ridden by personality */
         mddev->barriers_work = 1;
@@ -2772,7 +2901,6 @@ static void autorun_array(mddev_t *mddev)
  */
 static void autorun_devices(int part)
 {
-        struct list_head candidates;
         struct list_head *tmp;
         mdk_rdev_t *rdev0, *rdev;
         mddev_t *mddev;
@@ -2781,6 +2909,7 @@ static void autorun_devices(int part)
         printk(KERN_INFO "md: autorun ...\n");
         while (!list_empty(&pending_raid_disks)) {
                 dev_t dev;
+                LIST_HEAD(candidates);
                 rdev0 = list_entry(pending_raid_disks.next,
                                          mdk_rdev_t, same_set);
 
@@ -3427,11 +3556,18 @@ static int set_array_info(mddev_t * mddev, mdu_array_info_t *info)
         mddev->default_bitmap_offset = MD_SB_BYTES >> 9;
         mddev->bitmap_offset = 0;
 
+        mddev->reshape_position = MaxSector;
+
         /*
          * Generate a 128 bit UUID
          */
         get_random_bytes(mddev->uuid, 16);
 
+        mddev->new_level = mddev->level;
+        mddev->new_chunk = mddev->chunk_size;
+        mddev->new_layout = mddev->layout;
+        mddev->delta_disks = 0;
+
         return 0;
 }
 
@@ -3440,6 +3576,7 @@ static int update_size(mddev_t *mddev, unsigned long size)
         mdk_rdev_t * rdev;
         int rv;
         struct list_head *tmp;
+        int fit = (size == 0);
 
         if (mddev->pers->resize == NULL)
                 return -EINVAL;
@@ -3457,7 +3594,6 @@ static int update_size(mddev_t *mddev, unsigned long size)
                 return -EBUSY;
         ITERATE_RDEV(mddev,rdev,tmp) {
                 sector_t avail;
-                int fit = (size == 0);
                 if (rdev->sb_offset > rdev->data_offset)
                         avail = (rdev->sb_offset*2) - rdev->data_offset;
                 else
@@ -3487,14 +3623,16 @@ static int update_raid_disks(mddev_t *mddev, int raid_disks)
 {
         int rv;
         /* change the number of raid disks */
-        if (mddev->pers->reshape == NULL)
+        if (mddev->pers->check_reshape == NULL)
                 return -EINVAL;
         if (raid_disks <= 0 ||
             raid_disks >= mddev->max_disks)
                 return -EINVAL;
-        if (mddev->sync_thread)
+        if (mddev->sync_thread || mddev->reshape_position != MaxSector)
                 return -EBUSY;
-        rv = mddev->pers->reshape(mddev, raid_disks);
+        mddev->delta_disks = raid_disks - mddev->raid_disks;
+
+        rv = mddev->pers->check_reshape(mddev);
         return rv;
 }
 
@@ -4041,7 +4179,10 @@ static void status_unused(struct seq_file *seq)
 
 static void status_resync(struct seq_file *seq, mddev_t * mddev)
 {
-        unsigned long max_blocks, resync, res, dt, db, rt;
+        sector_t max_blocks, resync, res;
+        unsigned long dt, db, rt;
+        int scale;
+        unsigned int per_milli;
 
         resync = (mddev->curr_resync - atomic_read(&mddev->recovery_active))/2;
 
@@ -4057,9 +4198,22 @@ static void status_resync(struct seq_file *seq, mddev_t * mddev)
                 MD_BUG();
                 return;
         }
-        res = (resync/1024)*1000/(max_blocks/1024 + 1);
+        /* Pick 'scale' such that (resync>>scale)*1000 will fit
+         * in a sector_t, and (max_blocks>>scale) will fit in a
+         * u32, as those are the requirements for sector_div.
+         * Thus 'scale' must be at least 10
+         */
+        scale = 10;
+        if (sizeof(sector_t) > sizeof(unsigned long)) {
+                while ( max_blocks/2 > (1ULL<<(scale+32)))
+                        scale++;
+        }
+        res = (resync>>scale)*1000;
+        sector_div(res, (u32)((max_blocks>>scale)+1));
+
+        per_milli = res;
         {
-                int i, x = res/50, y = 20-x;
+                int i, x = per_milli/50, y = 20-x;
                 seq_printf(seq, "[");
                 for (i = 0; i < x; i++)
                         seq_printf(seq, "=");
@@ -4068,10 +4222,14 @@ static void status_resync(struct seq_file *seq, mddev_t * mddev)
                         seq_printf(seq, ".");
                 seq_printf(seq, "] ");
         }
-        seq_printf(seq, " %s =%3lu.%lu%% (%lu/%lu)",
+        seq_printf(seq, " %s =%3u.%u%% (%llu/%llu)",
+                   (test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery)?
+                    "reshape" :
                       (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) ?
-                       "resync" : "recovery"),
-                      res/10, res % 10, resync, max_blocks);
+                       "resync" : "recovery")),
+                      per_milli/10, per_milli % 10,
+                   (unsigned long long) resync,
+                   (unsigned long long) max_blocks);
 
         /*
          * We do not want to overflow, so the order of operands and
@@ -4085,7 +4243,7 @@ static void status_resync(struct seq_file *seq, mddev_t * mddev)
         dt = ((jiffies - mddev->resync_mark) / HZ);
         if (!dt) dt++;
         db = resync - (mddev->resync_mark_cnt/2);
-        rt = (dt * ((max_blocks-resync) / (db/100+1)))/100;
+        rt = (dt * ((unsigned long)(max_blocks-resync) / (db/100+1)))/100;
 
         seq_printf(seq, " finish=%lu.%lumin", rt / 60, (rt % 60)/6);
 
@@ -4442,7 +4600,7 @@ static DECLARE_WAIT_QUEUE_HEAD(resync_wait);
 
 #define SYNC_MARKS      10
 #define SYNC_MARK_STEP  (3*HZ)
-static void md_do_sync(mddev_t *mddev)
+void md_do_sync(mddev_t *mddev)
 {
         mddev_t *mddev2;
         unsigned int currspeed = 0,
@@ -4522,7 +4680,9 @@ static void md_do_sync(mddev_t *mddev)
                  */
                 max_sectors = mddev->resync_max_sectors;
                 mddev->resync_mismatches = 0;
-        } else
+        } else if (test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery))
+                max_sectors = mddev->size << 1;
+        else
                 /* recovery follows the physical size of devices */
                 max_sectors = mddev->size << 1;
 
@@ -4658,6 +4818,8 @@ static void md_do_sync(mddev_t *mddev)
         mddev->pers->sync_request(mddev, max_sectors, &skipped, 1);
 
         if (!test_bit(MD_RECOVERY_ERR, &mddev->recovery) &&
+            test_bit(MD_RECOVERY_SYNC, &mddev->recovery) &&
+            !test_bit(MD_RECOVERY_CHECK, &mddev->recovery) &&
             mddev->curr_resync > 2 &&
             mddev->curr_resync >= mddev->recovery_cp) {
                 if (test_bit(MD_RECOVERY_INTR, &mddev->recovery)) {
@@ -4675,6 +4837,7 @@ static void md_do_sync(mddev_t *mddev)
         set_bit(MD_RECOVERY_DONE, &mddev->recovery);
         md_wakeup_thread(mddev->thread);
 }
+EXPORT_SYMBOL_GPL(md_do_sync);
 
 
 /*
@@ -4730,7 +4893,7 @@ void md_check_recovery(mddev_t *mddev)
                 ))
                 return;
 
-        if (mddev_trylock(mddev)==0) {
+        if (mddev_trylock(mddev)) {
                 int spares =0;
 
                 spin_lock_irq(&mddev->write_lock);
@@ -4866,7 +5029,7 @@ static int md_notify_reboot(struct notifier_block *this,
                 printk(KERN_INFO "md: stopping all md devices.\n");
 
                 ITERATE_MDDEV(mddev,tmp)
-                        if (mddev_trylock(mddev)==0)
+                        if (mddev_trylock(mddev))
                                 do_md_stop (mddev, 1);
                 /*
                  * certain more exotic SCSI devices are known to be
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 96f7af4ae4..1cc9de44ce 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -35,18 +35,6 @@
 #define NR_RESERVED_BUFS        32
 
 
-static void *mp_pool_alloc(gfp_t gfp_flags, void *data)
-{
-        struct multipath_bh *mpb;
-        mpb = kzalloc(sizeof(*mpb), gfp_flags);
-        return mpb;
-}
-
-static void mp_pool_free(void *mpb, void *data)
-{
-        kfree(mpb);
-}
-
 static int multipath_map (multipath_conf_t *conf)
 {
         int i, disks = conf->raid_disks;
@@ -494,9 +482,8 @@ static int multipath_run (mddev_t *mddev)
         }
         mddev->degraded = conf->raid_disks = conf->working_disks;
 
-        conf->pool = mempool_create(NR_RESERVED_BUFS,
-                                    mp_pool_alloc, mp_pool_free,
-                                    NULL);
+        conf->pool = mempool_create_kzalloc_pool(NR_RESERVED_BUFS,
+                                                 sizeof(struct multipath_bh));
         if (conf->pool == NULL) {
                 printk(KERN_ERR 
                         "multipath: couldn't allocate memory for %s\n",
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 5d88329e3c..3cb0872a84 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1402,6 +1402,9 @@ static void raid1d(mddev_t *mddev)
                         clear_bit(R1BIO_BarrierRetry, &r1_bio->state);
                         clear_bit(R1BIO_Barrier, &r1_bio->state);
                         for (i=0; i < conf->raid_disks; i++)
+                                if (r1_bio->bios[i])
+                                        atomic_inc(&r1_bio->remaining);
+                        for (i=0; i < conf->raid_disks; i++)
                                 if (r1_bio->bios[i]) {
                                         struct bio_vec *bvec;
                                         int j;
@@ -1789,6 +1792,11 @@ static int run(mddev_t *mddev)
                        mdname(mddev), mddev->level);
                 goto out;
         }
+        if (mddev->reshape_position != MaxSector) {
+                printk("raid1: %s: reshape_position set but not supported\n",
+                       mdname(mddev));
+                goto out;
+        }
         /*
          * copy the already verified devices into our private RAID1
          * bookkeeping area. [whatever we allocate in run(),
@@ -1971,7 +1979,7 @@ static int raid1_resize(mddev_t *mddev, sector_t sectors)
         return 0;
 }
 
-static int raid1_reshape(mddev_t *mddev, int raid_disks)
+static int raid1_reshape(mddev_t *mddev)
 {
         /* We need to:
          * 1/ resize the r1bio_pool
@@ -1988,10 +1996,22 @@ static int raid1_reshape(mddev_t *mddev, int raid_disks)
         struct pool_info *newpoolinfo;
         mirror_info_t *newmirrors;
         conf_t *conf = mddev_to_conf(mddev);
-        int cnt;
+        int cnt, raid_disks;
 
         int d, d2;
 
+        /* Cannot change chunk_size, layout, or level */
+        if (mddev->chunk_size != mddev->new_chunk ||
+            mddev->layout != mddev->new_layout ||
+            mddev->level != mddev->new_level) {
+                mddev->new_chunk = mddev->chunk_size;
+                mddev->new_layout = mddev->layout;
+                mddev->new_level = mddev->level;
+                return -EINVAL;
+        }
+
+        raid_disks = mddev->raid_disks + mddev->delta_disks;
+
         if (raid_disks < conf->raid_disks) {
                 cnt=0;
                 for (d= 0; d < conf->raid_disks; d++)
@@ -2038,6 +2058,7 @@ static int raid1_reshape(mddev_t *mddev, int raid_disks)
 
         mddev->degraded += (raid_disks - conf->raid_disks);
         conf->raid_disks = mddev->raid_disks = raid_disks;
+        mddev->delta_disks = 0;
 
         conf->last_used = 0; /* just make sure it is in-range */
         lower_barrier(conf);
@@ -2079,7 +2100,7 @@ static struct mdk_personality raid1_personality =
         .spare_active   = raid1_spare_active,
         .sync_request   = sync_request,
         .resize         = raid1_resize,
-        .reshape        = raid1_reshape,
+        .check_reshape  = raid1_reshape,
         .quiesce        = raid1_quiesce,
 };
 
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 2dba305daf..dae740adaf 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -22,6 +22,7 @@
 #include <linux/raid/raid5.h>
 #include <linux/highmem.h>
 #include <linux/bitops.h>
+#include <linux/kthread.h>
 #include <asm/atomic.h>
 
 #include <linux/raid/bitmap.h>
@@ -93,11 +94,11 @@ static void __release_stripe(raid5_conf_t *conf, struct stripe_head *sh)
                                 if (atomic_read(&conf->preread_active_stripes) < IO_THRESHOLD)
                                         md_wakeup_thread(conf->mddev->thread);
                         }
-                        list_add_tail(&sh->lru, &conf->inactive_list);
                         atomic_dec(&conf->active_stripes);
-                        if (!conf->inactive_blocked ||
-                            atomic_read(&conf->active_stripes) < (conf->max_nr_stripes*3/4))
+                        if (!test_bit(STRIPE_EXPANDING, &sh->state)) {
+                                list_add_tail(&sh->lru, &conf->inactive_list);
                                 wake_up(&conf->wait_for_stripe);
+                        }
                 }
         }
 }
@@ -178,10 +179,10 @@ static int grow_buffers(struct stripe_head *sh, int num)
 
 static void raid5_build_block (struct stripe_head *sh, int i);
 
-static void init_stripe(struct stripe_head *sh, sector_t sector, int pd_idx)
+static void init_stripe(struct stripe_head *sh, sector_t sector, int pd_idx, int disks)
 {
         raid5_conf_t *conf = sh->raid_conf;
-        int disks = conf->raid_disks, i;
+        int i;
 
         if (atomic_read(&sh->count) != 0)
                 BUG();
@@ -198,7 +199,9 @@ static void init_stripe(struct stripe_head *sh, sector_t sector, int pd_idx)
         sh->pd_idx = pd_idx;
         sh->state = 0;
 
-        for (i=disks; i--; ) {
+        sh->disks = disks;
+
+        for (i = sh->disks; i--; ) {
                 struct r5dev *dev = &sh->dev[i];
 
                 if (dev->toread || dev->towrite || dev->written ||
@@ -215,7 +218,7 @@ static void init_stripe(struct stripe_head *sh, sector_t sector, int pd_idx)
         insert_hash(conf, sh);
 }
 
-static struct stripe_head *__find_stripe(raid5_conf_t *conf, sector_t sector)
+static struct stripe_head *__find_stripe(raid5_conf_t *conf, sector_t sector, int disks)
 {
         struct stripe_head *sh;
         struct hlist_node *hn;
@@ -223,7 +226,7 @@ static struct stripe_head *__find_stripe(raid5_conf_t *conf, sector_t sector)
         CHECK_DEVLOCK();
         PRINTK("__find_stripe, sector %llu\n", (unsigned long long)sector);
         hlist_for_each_entry(sh, hn, stripe_hash(conf, sector), hash)
-                if (sh->sector == sector)
+                if (sh->sector == sector && sh->disks == disks)
                         return sh;
         PRINTK("__stripe %llu not in cache\n", (unsigned long long)sector);
         return NULL;
@@ -232,8 +235,8 @@ static struct stripe_head *__find_stripe(raid5_conf_t *conf, sector_t sector)
 static void unplug_slaves(mddev_t *mddev);
 static void raid5_unplug_device(request_queue_t *q);
 
-static struct stripe_head *get_active_stripe(raid5_conf_t *conf, sector_t sector,
-                                             int pd_idx, int noblock) 
+static struct stripe_head *get_active_stripe(raid5_conf_t *conf, sector_t sector, int disks,
+                                             int pd_idx, int noblock)
 {
         struct stripe_head *sh;
 
@@ -245,7 +248,7 @@ static struct stripe_head *get_active_stripe(raid5_conf_t *conf, sector_t sector
                 wait_event_lock_irq(conf->wait_for_stripe,
                                     conf->quiesce == 0,
                                     conf->device_lock, /* nothing */);
-                sh = __find_stripe(conf, sector);
+                sh = __find_stripe(conf, sector, disks);
                 if (!sh) {
                         if (!conf->inactive_blocked)
                                 sh = get_free_stripe(conf);
@@ -259,11 +262,11 @@ static struct stripe_head *get_active_stripe(raid5_conf_t *conf, sector_t sector
                                                      < (conf->max_nr_stripes *3/4)
                                                      || !conf->inactive_blocked),
                                                     conf->device_lock,
-                                                    unplug_slaves(conf->mddev);
+                                                    unplug_slaves(conf->mddev)
                                         );
                                 conf->inactive_blocked = 0;
                         } else
-                                init_stripe(sh, sector, pd_idx);
+                                init_stripe(sh, sector, pd_idx, disks);
                 } else {
                         if (atomic_read(&sh->count)) {
                                 if (!list_empty(&sh->lru))
@@ -271,9 +274,8 @@ static struct stripe_head *get_active_stripe(raid5_conf_t *conf, sector_t sector
                         } else {
                                 if (!test_bit(STRIPE_HANDLE, &sh->state))
                                         atomic_inc(&conf->active_stripes);
-                                if (list_empty(&sh->lru))
-                                        BUG();
-                                list_del_init(&sh->lru);
+                                if (!list_empty(&sh->lru))
+                                        list_del_init(&sh->lru);
                         }
                 }
         } while (sh == NULL);
@@ -300,6 +302,7 @@ static int grow_one_stripe(raid5_conf_t *conf)
                 kmem_cache_free(conf->slab_cache, sh);
                 return 0;
         }
+        sh->disks = conf->raid_disks;
         /* we just created an active stripe so... */
         atomic_set(&sh->count, 1);
         atomic_inc(&conf->active_stripes);
@@ -313,14 +316,16 @@ static int grow_stripes(raid5_conf_t *conf, int num)
         kmem_cache_t *sc;
         int devs = conf->raid_disks;
 
-        sprintf(conf->cache_name, "raid5/%s", mdname(conf->mddev));
-
-        sc = kmem_cache_create(conf->cache_name, 
+        sprintf(conf->cache_name[0], "raid5/%s", mdname(conf->mddev));
+        sprintf(conf->cache_name[1], "raid5/%s-alt", mdname(conf->mddev));
+        conf->active_name = 0;
+        sc = kmem_cache_create(conf->cache_name[conf->active_name],
                                sizeof(struct stripe_head)+(devs-1)*sizeof(struct r5dev),
                                0, 0, NULL, NULL);
         if (!sc)
                 return 1;
         conf->slab_cache = sc;
+        conf->pool_size = devs;
         while (num--) {
                 if (!grow_one_stripe(conf))
                         return 1;
@@ -328,6 +333,129 @@ static int grow_stripes(raid5_conf_t *conf, int num)
         return 0;
 }
 
+#ifdef CONFIG_MD_RAID5_RESHAPE
+static int resize_stripes(raid5_conf_t *conf, int newsize)
+{
+        /* Make all the stripes able to hold 'newsize' devices.
+         * New slots in each stripe get 'page' set to a new page.
+         *
+         * This happens in stages:
+         * 1/ create a new kmem_cache and allocate the required number of
+         *    stripe_heads.
+         * 2/ gather all the old stripe_heads and tranfer the pages across
+         *    to the new stripe_heads.  This will have the side effect of
+         *    freezing the array as once all stripe_heads have been collected,
+         *    no IO will be possible.  Old stripe heads are freed once their
+         *    pages have been transferred over, and the old kmem_cache is
+         *    freed when all stripes are done.
+         * 3/ reallocate conf->disks to be suitable bigger.  If this fails,
+         *    we simple return a failre status - no need to clean anything up.
+         * 4/ allocate new pages for the new slots in the new stripe_heads.
+         *    If this fails, we don't bother trying the shrink the
+         *    stripe_heads down again, we just leave them as they are.
+         *    As each stripe_head is processed the new one is released into
+         *    active service.
+         *
+         * Once step2 is started, we cannot afford to wait for a write,
+         * so we use GFP_NOIO allocations.
+         */
+        struct stripe_head *osh, *nsh;
+        LIST_HEAD(newstripes);
+        struct disk_info *ndisks;
+        int err = 0;
+        kmem_cache_t *sc;
+        int i;
+
+        if (newsize <= conf->pool_size)
+                return 0; /* never bother to shrink */
+
+        /* Step 1 */
+        sc = kmem_cache_create(conf->cache_name[1-conf->active_name],
+                               sizeof(struct stripe_head)+(newsize-1)*sizeof(struct r5dev),
+                               0, 0, NULL, NULL);
+        if (!sc)
+                return -ENOMEM;
+
+        for (i = conf->max_nr_stripes; i; i--) {
+                nsh = kmem_cache_alloc(sc, GFP_KERNEL);
+                if (!nsh)
+                        break;
+
+                memset(nsh, 0, sizeof(*nsh) + (newsize-1)*sizeof(struct r5dev));
+
+                nsh->raid_conf = conf;
+                spin_lock_init(&nsh->lock);
+
+                list_add(&nsh->lru, &newstripes);
+        }
+        if (i) {
+                /* didn't get enough, give up */
+                while (!list_empty(&newstripes)) {
+                        nsh = list_entry(newstripes.next, struct stripe_head, lru);
+                        list_del(&nsh->lru);
+                        kmem_cache_free(sc, nsh);
+                }
+                kmem_cache_destroy(sc);
+                return -ENOMEM;
+        }
+        /* Step 2 - Must use GFP_NOIO now.
+         * OK, we have enough stripes, start collecting inactive
+         * stripes and copying them over
+         */
+        list_for_each_entry(nsh, &newstripes, lru) {
+                spin_lock_irq(&conf->device_lock);
+                wait_event_lock_irq(conf->wait_for_stripe,
+                                    !list_empty(&conf->inactive_list),
+                                    conf->device_lock,
+                                    unplug_slaves(conf->mddev)
+                        );
+                osh = get_free_stripe(conf);
+                spin_unlock_irq(&conf->device_lock);
+                atomic_set(&nsh->count, 1);
+                for(i=0; i<conf->pool_size; i++)
+                        nsh->dev[i].page = osh->dev[i].page;
+                for( ; i<newsize; i++)
+                        nsh->dev[i].page = NULL;
+                kmem_cache_free(conf->slab_cache, osh);
+        }
+        kmem_cache_destroy(conf->slab_cache);
+
+        /* Step 3.
+         * At this point, we are holding all the stripes so the array
+         * is completely stalled, so now is a good time to resize
+         * conf->disks.
+         */
+        ndisks = kzalloc(newsize * sizeof(struct disk_info), GFP_NOIO);
+        if (ndisks) {
+                for (i=0; i<conf->raid_disks; i++)
+                        ndisks[i] = conf->disks[i];
+                kfree(conf->disks);
+                conf->disks = ndisks;
+        } else
+                err = -ENOMEM;
+
+        /* Step 4, return new stripes to service */
+        while(!list_empty(&newstripes)) {
+                nsh = list_entry(newstripes.next, struct stripe_head, lru);
+                list_del_init(&nsh->lru);
+                for (i=conf->raid_disks; i < newsize; i++)
+                        if (nsh->dev[i].page == NULL) {
+                                struct page *p = alloc_page(GFP_NOIO);
+                                nsh->dev[i].page = p;
+                                if (!p)
+                                        err = -ENOMEM;
+                        }
+                release_stripe(nsh);
+        }
+        /* critical section pass, GFP_NOIO no longer needed */
+
+        conf->slab_cache = sc;
+        conf->active_name = 1-conf->active_name;
+        conf->pool_size = newsize;
+        return err;
+}
+#endif
+
 static int drop_one_stripe(raid5_conf_t *conf)
 {
         struct stripe_head *sh;
@@ -339,7 +467,7 @@ static int drop_one_stripe(raid5_conf_t *conf)
                 return 0;
         if (atomic_read(&sh->count))
                 BUG();
-        shrink_buffers(sh, conf->raid_disks);
+        shrink_buffers(sh, conf->pool_size);
         kmem_cache_free(conf->slab_cache, sh);
         atomic_dec(&conf->active_stripes);
         return 1;
@@ -360,7 +488,7 @@ static int raid5_end_read_request(struct bio * bi, unsigned int bytes_done,
 {
         struct stripe_head *sh = bi->bi_private;
         raid5_conf_t *conf = sh->raid_conf;
-        int disks = conf->raid_disks, i;
+        int disks = sh->disks, i;
         int uptodate = test_bit(BIO_UPTODATE, &bi->bi_flags);
 
         if (bi->bi_size)
@@ -458,7 +586,7 @@ static int raid5_end_write_request (struct bio *bi, unsigned int bytes_done,
 {
         struct stripe_head *sh = bi->bi_private;
         raid5_conf_t *conf = sh->raid_conf;
-        int disks = conf->raid_disks, i;
+        int disks = sh->disks, i;
         unsigned long flags;
         int uptodate = test_bit(BIO_UPTODATE, &bi->bi_flags);
 
@@ -612,7 +740,7 @@ static sector_t raid5_compute_sector(sector_t r_sector, unsigned int raid_disks,
 static sector_t compute_blocknr(struct stripe_head *sh, int i)
 {
         raid5_conf_t *conf = sh->raid_conf;
-        int raid_disks = conf->raid_disks, data_disks = raid_disks - 1;
+        int raid_disks = sh->disks, data_disks = raid_disks - 1;
         sector_t new_sector = sh->sector, check;
         int sectors_per_chunk = conf->chunk_size >> 9;
         sector_t stripe;
@@ -713,8 +841,7 @@ static void copy_data(int frombio, struct bio *bio,
 
 static void compute_block(struct stripe_head *sh, int dd_idx)
 {
-        raid5_conf_t *conf = sh->raid_conf;
-        int i, count, disks = conf->raid_disks;
+        int i, count, disks = sh->disks;
         void *ptr[MAX_XOR_BLOCKS], *p;
 
         PRINTK("compute_block, stripe %llu, idx %d\n", 
@@ -744,7 +871,7 @@ static void compute_block(struct stripe_head *sh, int dd_idx)
 static void compute_parity(struct stripe_head *sh, int method)
 {
         raid5_conf_t *conf = sh->raid_conf;
-        int i, pd_idx = sh->pd_idx, disks = conf->raid_disks, count;
+        int i, pd_idx = sh->pd_idx, disks = sh->disks, count;
         void *ptr[MAX_XOR_BLOCKS];
         struct bio *chosen;
 
@@ -910,6 +1037,20 @@ static int add_stripe_bio(struct stripe_head *sh, struct bio *bi, int dd_idx, in
         return 0;
 }
 
+static void end_reshape(raid5_conf_t *conf);
+
+static int stripe_to_pdidx(sector_t stripe, raid5_conf_t *conf, int disks)
+{
+        int sectors_per_chunk = conf->chunk_size >> 9;
+        sector_t x = stripe;
+        int pd_idx, dd_idx;
+        int chunk_offset = sector_div(x, sectors_per_chunk);
+        stripe = x;
+        raid5_compute_sector(stripe*(disks-1)*sectors_per_chunk
+                             + chunk_offset, disks, disks-1, &dd_idx, &pd_idx, conf);
+        return pd_idx;
+}
+
 
 /*
  * handle_stripe - do things to a stripe.
@@ -932,11 +1073,11 @@ static int add_stripe_bio(struct stripe_head *sh, struct bio *bi, int dd_idx, in
 static void handle_stripe(struct stripe_head *sh)
 {
         raid5_conf_t *conf = sh->raid_conf;
-        int disks = conf->raid_disks;
+        int disks = sh->disks;
         struct bio *return_bi= NULL;
         struct bio *bi;
         int i;
-        int syncing;
+        int syncing, expanding, expanded;
         int locked=0, uptodate=0, to_read=0, to_write=0, failed=0, written=0;
         int non_overwrite = 0;
         int failed_num=0;
@@ -951,6 +1092,8 @@ static void handle_stripe(struct stripe_head *sh)
         clear_bit(STRIPE_DELAYED, &sh->state);
 
         syncing = test_bit(STRIPE_SYNCING, &sh->state);
+        expanding = test_bit(STRIPE_EXPAND_SOURCE, &sh->state);
+        expanded = test_bit(STRIPE_EXPAND_READY, &sh->state);
         /* Now to look around and see what can be done */
 
         rcu_read_lock();
@@ -1143,13 +1286,14 @@ static void handle_stripe(struct stripe_head *sh)
          * parity, or to satisfy requests
          * or to load a block that is being partially written.
          */
-        if (to_read || non_overwrite || (syncing && (uptodate < disks))) {
+        if (to_read || non_overwrite || (syncing && (uptodate < disks)) || expanding) {
                 for (i=disks; i--;) {
                         dev = &sh->dev[i];
                         if (!test_bit(R5_LOCKED, &dev->flags) && !test_bit(R5_UPTODATE, &dev->flags) &&
                             (dev->toread ||
                              (dev->towrite && !test_bit(R5_OVERWRITE, &dev->flags)) ||
                              syncing ||
+                             expanding ||
                              (failed && (sh->dev[failed_num].toread ||
                                          (sh->dev[failed_num].towrite && !test_bit(R5_OVERWRITE, &sh->dev[failed_num].flags))))
                                     )
@@ -1339,13 +1483,77 @@ static void handle_stripe(struct stripe_head *sh)
                         set_bit(R5_Wantwrite, &dev->flags);
                         set_bit(R5_ReWrite, &dev->flags);
                         set_bit(R5_LOCKED, &dev->flags);
+                        locked++;
                 } else {
                         /* let's read it back */
                         set_bit(R5_Wantread, &dev->flags);
                         set_bit(R5_LOCKED, &dev->flags);
+                        locked++;
                 }
         }
 
+        if (expanded && test_bit(STRIPE_EXPANDING, &sh->state)) {
+                /* Need to write out all blocks after computing parity */
+                sh->disks = conf->raid_disks;
+                sh->pd_idx = stripe_to_pdidx(sh->sector, conf, conf->raid_disks);
+                compute_parity(sh, RECONSTRUCT_WRITE);
+                for (i= conf->raid_disks; i--;) {
+                        set_bit(R5_LOCKED, &sh->dev[i].flags);
+                        locked++;
+                        set_bit(R5_Wantwrite, &sh->dev[i].flags);
+                }
+                clear_bit(STRIPE_EXPANDING, &sh->state);
+        } else if (expanded) {
+                clear_bit(STRIPE_EXPAND_READY, &sh->state);
+                atomic_dec(&conf->reshape_stripes);
+                wake_up(&conf->wait_for_overlap);
+                md_done_sync(conf->mddev, STRIPE_SECTORS, 1);
+        }
+
+        if (expanding && locked == 0) {
+                /* We have read all the blocks in this stripe and now we need to
+                 * copy some of them into a target stripe for expand.
+                 */
+                clear_bit(STRIPE_EXPAND_SOURCE, &sh->state);
+                for (i=0; i< sh->disks; i++)
+                        if (i != sh->pd_idx) {
+                                int dd_idx, pd_idx, j;
+                                struct stripe_head *sh2;
+
+                                sector_t bn = compute_blocknr(sh, i);
+                                sector_t s = raid5_compute_sector(bn, conf->raid_disks,
+                                                                  conf->raid_disks-1,
+                                                                  &dd_idx, &pd_idx, conf);
+                                sh2 = get_active_stripe(conf, s, conf->raid_disks, pd_idx, 1);
+                                if (sh2 == NULL)
+                                        /* so far only the early blocks of this stripe
+                                         * have been requested.  When later blocks
+                                         * get requested, we will try again
+                                         */
+                                        continue;
+                                if(!test_bit(STRIPE_EXPANDING, &sh2->state) ||
+                                   test_bit(R5_Expanded, &sh2->dev[dd_idx].flags)) {
+                                        /* must have already done this block */
+                                        release_stripe(sh2);
+                                        continue;
+                                }
+                                memcpy(page_address(sh2->dev[dd_idx].page),
+                                       page_address(sh->dev[i].page),
+                                       STRIPE_SIZE);
+                                set_bit(R5_Expanded, &sh2->dev[dd_idx].flags);
+                                set_bit(R5_UPTODATE, &sh2->dev[dd_idx].flags);
+                                for (j=0; j<conf->raid_disks; j++)
+                                        if (j != sh2->pd_idx &&
+                                            !test_bit(R5_Expanded, &sh2->dev[j].flags))
+                                                break;
+                                if (j == conf->raid_disks) {
+                                        set_bit(STRIPE_EXPAND_READY, &sh2->state);
+                                        set_bit(STRIPE_HANDLE, &sh2->state);
+                                }
+                                release_stripe(sh2);
+                        }
+        }
+
         spin_unlock(&sh->lock);
 
         while ((bi=return_bi)) {
@@ -1384,7 +1592,7 @@ static void handle_stripe(struct stripe_head *sh)
                 rcu_read_unlock();
  
                 if (rdev) {
-                        if (syncing)
+                        if (syncing || expanding || expanded)
                                 md_sync_acct(rdev->bdev, STRIPE_SECTORS);
 
                         bi->bi_bdev = rdev->bdev;
@@ -1526,17 +1734,16 @@ static inline void raid5_plug_device(raid5_conf_t *conf)
         spin_unlock_irq(&conf->device_lock);
 }
 
-static int make_request (request_queue_t *q, struct bio * bi)
+static int make_request(request_queue_t *q, struct bio * bi)
 {
         mddev_t *mddev = q->queuedata;
         raid5_conf_t *conf = mddev_to_conf(mddev);
-        const unsigned int raid_disks = conf->raid_disks;
-        const unsigned int data_disks = raid_disks - 1;
         unsigned int dd_idx, pd_idx;
         sector_t new_sector;
         sector_t logical_sector, last_sector;
         struct stripe_head *sh;
         const int rw = bio_data_dir(bi);
+        int remaining;
 
         if (unlikely(bio_barrier(bi))) {
                 bio_endio(bi, bi->bi_size, -EOPNOTSUPP);
@@ -1555,20 +1762,77 @@ static int make_request (request_queue_t *q, struct bio * bi)
 
         for (;logical_sector < last_sector; logical_sector += STRIPE_SECTORS) {
                 DEFINE_WAIT(w);
-                
-                new_sector = raid5_compute_sector(logical_sector,
-                                                  raid_disks, data_disks, &dd_idx, &pd_idx, conf);
+                int disks;
 
+        retry:
+                prepare_to_wait(&conf->wait_for_overlap, &w, TASK_UNINTERRUPTIBLE);
+                if (likely(conf->expand_progress == MaxSector))
+                        disks = conf->raid_disks;
+                else {
+                        /* spinlock is needed as expand_progress may be
+                         * 64bit on a 32bit platform, and so it might be
+                         * possible to see a half-updated value
+                         * Ofcourse expand_progress could change after
+                         * the lock is dropped, so once we get a reference
+                         * to the stripe that we think it is, we will have
+                         * to check again.
+                         */
+                        spin_lock_irq(&conf->device_lock);
+                        disks = conf->raid_disks;
+                        if (logical_sector >= conf->expand_progress)
+                                disks = conf->previous_raid_disks;
+                        else {
+                                if (logical_sector >= conf->expand_lo) {
+                                        spin_unlock_irq(&conf->device_lock);
+                                        schedule();
+                                        goto retry;
+                                }
+                        }
+                        spin_unlock_irq(&conf->device_lock);
+                }
+                new_sector = raid5_compute_sector(logical_sector, disks, disks - 1,
+                                                  &dd_idx, &pd_idx, conf);
                 PRINTK("raid5: make_request, sector %llu logical %llu\n",
                         (unsigned long long)new_sector, 
                         (unsigned long long)logical_sector);
 
-        retry:
-                prepare_to_wait(&conf->wait_for_overlap, &w, TASK_UNINTERRUPTIBLE);
-                sh = get_active_stripe(conf, new_sector, pd_idx, (bi->bi_rw&RWA_MASK));
+                sh = get_active_stripe(conf, new_sector, disks, pd_idx, (bi->bi_rw&RWA_MASK));
                 if (sh) {
-                        if (!add_stripe_bio(sh, bi, dd_idx, (bi->bi_rw&RW_MASK))) {
-                                /* Add failed due to overlap.  Flush everything
+                        if (unlikely(conf->expand_progress != MaxSector)) {
+                                /* expansion might have moved on while waiting for a
+                                 * stripe, so we must do the range check again.
+                                 * Expansion could still move past after this
+                                 * test, but as we are holding a reference to
+                                 * 'sh', we know that if that happens,
+                                 *  STRIPE_EXPANDING will get set and the expansion
+                                 * won't proceed until we finish with the stripe.
+                                 */
+                                int must_retry = 0;
+                                spin_lock_irq(&conf->device_lock);
+                                if (logical_sector <  conf->expand_progress &&
+                                    disks == conf->previous_raid_disks)
+                                        /* mismatch, need to try again */
+                                        must_retry = 1;
+                                spin_unlock_irq(&conf->device_lock);
+                                if (must_retry) {
+                                        release_stripe(sh);
+                                        goto retry;
+                                }
+                        }
+                        /* FIXME what if we get a false positive because these
+                         * are being updated.
+                         */
+                        if (logical_sector >= mddev->suspend_lo &&
+                            logical_sector < mddev->suspend_hi) {
+                                release_stripe(sh);
+                                schedule();
+                                goto retry;
+                        }
+
+                        if (test_bit(STRIPE_EXPANDING, &sh->state) ||
+                            !add_stripe_bio(sh, bi, dd_idx, (bi->bi_rw&RW_MASK))) {
+                                /* Stripe is busy expanding or
+                                 * add failed due to overlap.  Flush everything
                                  * and wait a while
                                  */
                                 raid5_unplug_device(mddev->queue);
@@ -1580,7 +1844,6 @@ static int make_request (request_queue_t *q, struct bio * bi)
                         raid5_plug_device(conf);
                         handle_stripe(sh);
                         release_stripe(sh);
-
                 } else {
                         /* cannot get stripe for read-ahead, just give-up */
                         clear_bit(BIO_UPTODATE, &bi->bi_flags);
@@ -1590,7 +1853,9 @@ static int make_request (request_queue_t *q, struct bio * bi)
                         
         }
         spin_lock_irq(&conf->device_lock);
-        if (--bi->bi_phys_segments == 0) {
+        remaining = --bi->bi_phys_segments;
+        spin_unlock_irq(&conf->device_lock);
+        if (remaining == 0) {
                 int bytes = bi->bi_size;
 
                 if ( bio_data_dir(bi) == WRITE )
@@ -1598,7 +1863,6 @@ static int make_request (request_queue_t *q, struct bio * bi)
                 bi->bi_size = 0;
                 bi->bi_end_io(bi, bytes, 0);
         }
-        spin_unlock_irq(&conf->device_lock);
         return 0;
 }
 
@@ -1607,12 +1871,8 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
 {
         raid5_conf_t *conf = (raid5_conf_t *) mddev->private;
         struct stripe_head *sh;
-        int sectors_per_chunk = conf->chunk_size >> 9;
-        sector_t x;
-        unsigned long stripe;
-        int chunk_offset;
-        int dd_idx, pd_idx;
-        sector_t first_sector;
+        int pd_idx;
+        sector_t first_sector, last_sector;
         int raid_disks = conf->raid_disks;
         int data_disks = raid_disks-1;
         sector_t max_sector = mddev->size << 1;
@@ -1621,6 +1881,10 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
         if (sector_nr >= max_sector) {
                 /* just being told to finish up .. nothing much to do */
                 unplug_slaves(mddev);
+                if (test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery)) {
+                        end_reshape(conf);
+                        return 0;
+                }
 
                 if (mddev->curr_resync < max_sector) /* aborted */
                         bitmap_end_sync(mddev->bitmap, mddev->curr_resync,
@@ -1631,6 +1895,123 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
 
                 return 0;
         }
+
+        if (test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery)) {
+                /* reshaping is quite different to recovery/resync so it is
+                 * handled quite separately ... here.
+                 *
+                 * On each call to sync_request, we gather one chunk worth of
+                 * destination stripes and flag them as expanding.
+                 * Then we find all the source stripes and request reads.
+                 * As the reads complete, handle_stripe will copy the data
+                 * into the destination stripe and release that stripe.
+                 */
+                int i;
+                int dd_idx;
+                sector_t writepos, safepos, gap;
+
+                if (sector_nr == 0 &&
+                    conf->expand_progress != 0) {
+                        /* restarting in the middle, skip the initial sectors */
+                        sector_nr = conf->expand_progress;
+                        sector_div(sector_nr, conf->raid_disks-1);
+                        *skipped = 1;
+                        return sector_nr;
+                }
+
+                /* we update the metadata when there is more than 3Meg
+                 * in the block range (that is rather arbitrary, should
+                 * probably be time based) or when the data about to be
+                 * copied would over-write the source of the data at
+                 * the front of the range.
+                 * i.e. one new_stripe forward from expand_progress new_maps
+                 * to after where expand_lo old_maps to
+                 */
+                writepos = conf->expand_progress +
+                        conf->chunk_size/512*(conf->raid_disks-1);
+                sector_div(writepos, conf->raid_disks-1);
+                safepos = conf->expand_lo;
+                sector_div(safepos, conf->previous_raid_disks-1);
+                gap = conf->expand_progress - conf->expand_lo;
+
+                if (writepos >= safepos ||
+                    gap > (conf->raid_disks-1)*3000*2 /*3Meg*/) {
+                        /* Cannot proceed until we've updated the superblock... */
+                        wait_event(conf->wait_for_overlap,
+                                   atomic_read(&conf->reshape_stripes)==0);
+                        mddev->reshape_position = conf->expand_progress;
+                        mddev->sb_dirty = 1;
+                        md_wakeup_thread(mddev->thread);
+                        wait_event(mddev->sb_wait, mddev->sb_dirty == 0 ||
+                                   kthread_should_stop());
+                        spin_lock_irq(&conf->device_lock);
+                        conf->expand_lo = mddev->reshape_position;
+                        spin_unlock_irq(&conf->device_lock);
+                        wake_up(&conf->wait_for_overlap);
+                }
+
+                for (i=0; i < conf->chunk_size/512; i+= STRIPE_SECTORS) {
+                        int j;
+                        int skipped = 0;
+                        pd_idx = stripe_to_pdidx(sector_nr+i, conf, conf->raid_disks);
+                        sh = get_active_stripe(conf, sector_nr+i,
+                                               conf->raid_disks, pd_idx, 0);
+                        set_bit(STRIPE_EXPANDING, &sh->state);
+                        atomic_inc(&conf->reshape_stripes);
+                        /* If any of this stripe is beyond the end of the old
+                         * array, then we need to zero those blocks
+                         */
+                        for (j=sh->disks; j--;) {
+                                sector_t s;
+                                if (j == sh->pd_idx)
+                                        continue;
+                                s = compute_blocknr(sh, j);
+                                if (s < (mddev->array_size<<1)) {
+                                        skipped = 1;
+                                        continue;
+                                }
+                                memset(page_address(sh->dev[j].page), 0, STRIPE_SIZE);
+                                set_bit(R5_Expanded, &sh->dev[j].flags);
+                                set_bit(R5_UPTODATE, &sh->dev[j].flags);
+                        }
+                        if (!skipped) {
+                                set_bit(STRIPE_EXPAND_READY, &sh->state);
+                                set_bit(STRIPE_HANDLE, &sh->state);
+                        }
+                        release_stripe(sh);
+                }
+                spin_lock_irq(&conf->device_lock);
+                conf->expand_progress = (sector_nr + i)*(conf->raid_disks-1);
+                spin_unlock_irq(&conf->device_lock);
+                /* Ok, those stripe are ready. We can start scheduling
+                 * reads on the source stripes.
+                 * The source stripes are determined by mapping the first and last
+                 * block on the destination stripes.
+                 */
+                raid_disks = conf->previous_raid_disks;
+                data_disks = raid_disks - 1;
+                first_sector =
+                        raid5_compute_sector(sector_nr*(conf->raid_disks-1),
+                                             raid_disks, data_disks,
+                                             &dd_idx, &pd_idx, conf);
+                last_sector =
+                        raid5_compute_sector((sector_nr+conf->chunk_size/512)
+                                               *(conf->raid_disks-1) -1,
+                                             raid_disks, data_disks,
+                                             &dd_idx, &pd_idx, conf);
+                if (last_sector >= (mddev->size<<1))
+                        last_sector = (mddev->size<<1)-1;
+                while (first_sector <= last_sector) {
+                        pd_idx = stripe_to_pdidx(first_sector, conf, conf->previous_raid_disks);
+                        sh = get_active_stripe(conf, first_sector,
+                                               conf->previous_raid_disks, pd_idx, 0);
+                        set_bit(STRIPE_EXPAND_SOURCE, &sh->state);
+                        set_bit(STRIPE_HANDLE, &sh->state);
+                        release_stripe(sh);
+                        first_sector += STRIPE_SECTORS;
+                }
+                return conf->chunk_size>>9;
+        }
         /* if there is 1 or more failed drives and we are trying
          * to resync, then assert that we are finished, because there is
          * nothing we can do.
@@ -1649,16 +2030,10 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
                 return sync_blocks * STRIPE_SECTORS; /* keep things rounded to whole stripes */
         }
 
-        x = sector_nr;
-        chunk_offset = sector_div(x, sectors_per_chunk);
-        stripe = x;
-        BUG_ON(x != stripe);
-
-        first_sector = raid5_compute_sector((sector_t)stripe*data_disks*sectors_per_chunk
-                + chunk_offset, raid_disks, data_disks, &dd_idx, &pd_idx, conf);
-        sh = get_active_stripe(conf, sector_nr, pd_idx, 1);
+        pd_idx = stripe_to_pdidx(sector_nr, conf, raid_disks);
+        sh = get_active_stripe(conf, sector_nr, raid_disks, pd_idx, 1);
         if (sh == NULL) {
-                sh = get_active_stripe(conf, sector_nr, pd_idx, 0);
+                sh = get_active_stripe(conf, sector_nr, raid_disks, pd_idx, 0);
                 /* make sure we don't swamp the stripe cache if someone else
                  * is trying to get access 
                  */
@@ -1822,11 +2197,64 @@ static int run(mddev_t *mddev)
                 return -EIO;
         }
 
-        mddev->private = kzalloc(sizeof (raid5_conf_t)
-                                 + mddev->raid_disks * sizeof(struct disk_info),
-                                 GFP_KERNEL);
+        if (mddev->reshape_position != MaxSector) {
+                /* Check that we can continue the reshape.
+                 * Currently only disks can change, it must
+                 * increase, and we must be past the point where
+                 * a stripe over-writes itself
+                 */
+                sector_t here_new, here_old;
+                int old_disks;
+
+                if (mddev->new_level != mddev->level ||
+                    mddev->new_layout != mddev->layout ||
+                    mddev->new_chunk != mddev->chunk_size) {
+                        printk(KERN_ERR "raid5: %s: unsupported reshape required - aborting.\n",
+                               mdname(mddev));
+                        return -EINVAL;
+                }
+                if (mddev->delta_disks <= 0) {
+                        printk(KERN_ERR "raid5: %s: unsupported reshape (reduce disks) required - aborting.\n",
+                               mdname(mddev));
+                        return -EINVAL;
+                }
+                old_disks = mddev->raid_disks - mddev->delta_disks;
+                /* reshape_position must be on a new-stripe boundary, and one
+                 * further up in new geometry must map after here in old geometry.
+                 */
+                here_new = mddev->reshape_position;
+                if (sector_div(here_new, (mddev->chunk_size>>9)*(mddev->raid_disks-1))) {
+                        printk(KERN_ERR "raid5: reshape_position not on a stripe boundary\n");
+                        return -EINVAL;
+                }
+                /* here_new is the stripe we will write to */
+                here_old = mddev->reshape_position;
+                sector_div(here_old, (mddev->chunk_size>>9)*(old_disks-1));
+                /* here_old is the first stripe that we might need to read from */
+                if (here_new >= here_old) {
+                        /* Reading from the same stripe as writing to - bad */
+                        printk(KERN_ERR "raid5: reshape_position too early for auto-recovery - aborting.\n");
+                        return -EINVAL;
+                }
+                printk(KERN_INFO "raid5: reshape will continue\n");
+                /* OK, we should be able to continue; */
+        }
+
+
+        mddev->private = kzalloc(sizeof (raid5_conf_t), GFP_KERNEL);
         if ((conf = mddev->private) == NULL)
                 goto abort;
+        if (mddev->reshape_position == MaxSector) {
+                conf->previous_raid_disks = conf->raid_disks = mddev->raid_disks;
+        } else {
+                conf->raid_disks = mddev->raid_disks;
+                conf->previous_raid_disks = mddev->raid_disks - mddev->delta_disks;
+        }
+
+        conf->disks = kzalloc(conf->raid_disks * sizeof(struct disk_info),
+                              GFP_KERNEL);
+        if (!conf->disks)
+                goto abort;
 
         conf->mddev = mddev;
 
@@ -1847,7 +2275,7 @@ static int run(mddev_t *mddev)
 
         ITERATE_RDEV(mddev,rdev,tmp) {
                 raid_disk = rdev->raid_disk;
-                if (raid_disk >= mddev->raid_disks
+                if (raid_disk >= conf->raid_disks
                     || raid_disk < 0)
                         continue;
                 disk = conf->disks + raid_disk;
@@ -1863,7 +2291,6 @@ static int run(mddev_t *mddev)
                 }
         }
 
-        conf->raid_disks = mddev->raid_disks;
         /*
          * 0 for a fully functional array, 1 for a degraded array.
          */
@@ -1873,6 +2300,7 @@ static int run(mddev_t *mddev)
         conf->level = mddev->level;
         conf->algorithm = mddev->layout;
         conf->max_nr_stripes = NR_STRIPES;
+        conf->expand_progress = mddev->reshape_position;
 
         /* device size must be a multiple of chunk size */
         mddev->size &= ~(mddev->chunk_size/1024 -1);
@@ -1945,6 +2373,21 @@ static int run(mddev_t *mddev)
 
         print_raid5_conf(conf);
 
+        if (conf->expand_progress != MaxSector) {
+                printk("...ok start reshape thread\n");
+                conf->expand_lo = conf->expand_progress;
+                atomic_set(&conf->reshape_stripes, 0);
+                clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);
+                clear_bit(MD_RECOVERY_CHECK, &mddev->recovery);
+                set_bit(MD_RECOVERY_RESHAPE, &mddev->recovery);
+                set_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
+                mddev->sync_thread = md_register_thread(md_do_sync, mddev,
+                                                        "%s_reshape");
+                /* FIXME if md_register_thread fails?? */
+                md_wakeup_thread(mddev->sync_thread);
+
+        }
+
         /* read-ahead size must cover two whole stripes, which is
          * 2 * (n-1) * chunksize where 'n' is the number of raid devices
          */
@@ -1960,12 +2403,13 @@ static int run(mddev_t *mddev)
 
         mddev->queue->unplug_fn = raid5_unplug_device;
         mddev->queue->issue_flush_fn = raid5_issue_flush;
+        mddev->array_size =  mddev->size * (conf->previous_raid_disks - 1);
 
-        mddev->array_size =  mddev->size * (mddev->raid_disks - 1);
         return 0;
 abort:
         if (conf) {
                 print_raid5_conf(conf);
+                kfree(conf->disks);
                 kfree(conf->stripe_hashtbl);
                 kfree(conf);
         }
@@ -1986,6 +2430,7 @@ static int stop(mddev_t *mddev)
         kfree(conf->stripe_hashtbl);
         blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/
         sysfs_remove_group(&mddev->kobj, &raid5_attrs_group);
+        kfree(conf->disks);
         kfree(conf);
         mddev->private = NULL;
         return 0;
@@ -2001,7 +2446,7 @@ static void print_sh (struct stripe_head *sh)
         printk("sh %llu,  count %d.\n",
                 (unsigned long long)sh->sector, atomic_read(&sh->count));
         printk("sh %llu, ", (unsigned long long)sh->sector);
-        for (i = 0; i < sh->raid_conf->raid_disks; i++) {
+        for (i = 0; i < sh->disks; i++) {
                 printk("(cache%d: %p %ld) ", 
                         i, sh->dev[i].page, sh->dev[i].flags);
         }
@@ -2132,7 +2577,7 @@ static int raid5_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
         /*
          * find the disk ...
          */
-        for (disk=0; disk < mddev->raid_disks; disk++)
+        for (disk=0; disk < conf->raid_disks; disk++)
                 if ((p=conf->disks + disk)->rdev == NULL) {
                         clear_bit(In_sync, &rdev->flags);
                         rdev->raid_disk = disk;
@@ -2168,11 +2613,146 @@ static int raid5_resize(mddev_t *mddev, sector_t sectors)
         return 0;
 }
 
+#ifdef CONFIG_MD_RAID5_RESHAPE
+static int raid5_check_reshape(mddev_t *mddev)
+{
+        raid5_conf_t *conf = mddev_to_conf(mddev);
+        int err;
+
+        if (mddev->delta_disks < 0 ||
+            mddev->new_level != mddev->level)
+                return -EINVAL; /* Cannot shrink array or change level yet */
+        if (mddev->delta_disks == 0)
+                return 0; /* nothing to do */
+
+        /* Can only proceed if there are plenty of stripe_heads.
+         * We need a minimum of one full stripe,, and for sensible progress
+         * it is best to have about 4 times that.
+         * If we require 4 times, then the default 256 4K stripe_heads will
+         * allow for chunk sizes up to 256K, which is probably OK.
+         * If the chunk size is greater, user-space should request more
+         * stripe_heads first.
+         */
+        if ((mddev->chunk_size / STRIPE_SIZE) * 4 > conf->max_nr_stripes ||
+            (mddev->new_chunk / STRIPE_SIZE) * 4 > conf->max_nr_stripes) {
+                printk(KERN_WARNING "raid5: reshape: not enough stripes.  Needed %lu\n",
+                       (mddev->chunk_size / STRIPE_SIZE)*4);
+                return -ENOSPC;
+        }
+
+        err = resize_stripes(conf, conf->raid_disks + mddev->delta_disks);
+        if (err)
+                return err;
+
+        /* looks like we might be able to manage this */
+        return 0;
+}
+
+static int raid5_start_reshape(mddev_t *mddev)
+{
+        raid5_conf_t *conf = mddev_to_conf(mddev);
+        mdk_rdev_t *rdev;
+        struct list_head *rtmp;
+        int spares = 0;
+        int added_devices = 0;
+
+        if (mddev->degraded ||
+            test_bit(MD_RECOVERY_RUNNING, &mddev->recovery))
+                return -EBUSY;
+
+        ITERATE_RDEV(mddev, rdev, rtmp)
+                if (rdev->raid_disk < 0 &&
+                    !test_bit(Faulty, &rdev->flags))
+                        spares++;
+
+        if (spares < mddev->delta_disks-1)
+                /* Not enough devices even to make a degraded array
+                 * of that size
+                 */
+                return -EINVAL;
+
+        atomic_set(&conf->reshape_stripes, 0);
+        spin_lock_irq(&conf->device_lock);
+        conf->previous_raid_disks = conf->raid_disks;
+        conf->raid_disks += mddev->delta_disks;
+        conf->expand_progress = 0;
+        conf->expand_lo = 0;
+        spin_unlock_irq(&conf->device_lock);
+
+        /* Add some new drives, as many as will fit.
+         * We know there are enough to make the newly sized array work.
+         */
+        ITERATE_RDEV(mddev, rdev, rtmp)
+                if (rdev->raid_disk < 0 &&
+                    !test_bit(Faulty, &rdev->flags)) {
+                        if (raid5_add_disk(mddev, rdev)) {
+                                char nm[20];
+                                set_bit(In_sync, &rdev->flags);
+                                conf->working_disks++;
+                                added_devices++;
+                                sprintf(nm, "rd%d", rdev->raid_disk);
+                                sysfs_create_link(&mddev->kobj, &rdev->kobj, nm);
+                        } else
+                                break;
+                }
+
+        mddev->degraded = (conf->raid_disks - conf->previous_raid_disks) - added_devices;
+        mddev->raid_disks = conf->raid_disks;
+        mddev->reshape_position = 0;
+        mddev->sb_dirty = 1;
+
+        clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);
+        clear_bit(MD_RECOVERY_CHECK, &mddev->recovery);
+        set_bit(MD_RECOVERY_RESHAPE, &mddev->recovery);
+        set_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
+        mddev->sync_thread = md_register_thread(md_do_sync, mddev,
+                                                "%s_reshape");
+        if (!mddev->sync_thread) {
+                mddev->recovery = 0;
+                spin_lock_irq(&conf->device_lock);
+                mddev->raid_disks = conf->raid_disks = conf->previous_raid_disks;
+                conf->expand_progress = MaxSector;
+                spin_unlock_irq(&conf->device_lock);
+                return -EAGAIN;
+        }
+        md_wakeup_thread(mddev->sync_thread);
+        md_new_event(mddev);
+        return 0;
+}
+#endif
+
+static void end_reshape(raid5_conf_t *conf)
+{
+        struct block_device *bdev;
+
+        if (!test_bit(MD_RECOVERY_INTR, &conf->mddev->recovery)) {
+                conf->mddev->array_size = conf->mddev->size * (conf->raid_disks-1);
+                set_capacity(conf->mddev->gendisk, conf->mddev->array_size << 1);
+                conf->mddev->changed = 1;
+
+                bdev = bdget_disk(conf->mddev->gendisk, 0);
+                if (bdev) {
+                        mutex_lock(&bdev->bd_inode->i_mutex);
+                        i_size_write(bdev->bd_inode, conf->mddev->array_size << 10);
+                        mutex_unlock(&bdev->bd_inode->i_mutex);
+                        bdput(bdev);
+                }
+                spin_lock_irq(&conf->device_lock);
+                conf->expand_progress = MaxSector;
+                spin_unlock_irq(&conf->device_lock);
+                conf->mddev->reshape_position = MaxSector;
+        }
+}
+
 static void raid5_quiesce(mddev_t *mddev, int state)
 {
         raid5_conf_t *conf = mddev_to_conf(mddev);
 
         switch(state) {
+        case 2: /* resume for a suspend */
+                wake_up(&conf->wait_for_overlap);
+                break;
+
         case 1: /* stop all writes */
                 spin_lock_irq(&conf->device_lock);
                 conf->quiesce = 1;
@@ -2186,6 +2766,7 @@ static void raid5_quiesce(mddev_t *mddev, int state)
                 spin_lock_irq(&conf->device_lock);
                 conf->quiesce = 0;
                 wake_up(&conf->wait_for_stripe);
+                wake_up(&conf->wait_for_overlap);
                 spin_unlock_irq(&conf->device_lock);
                 break;
         }
@@ -2206,6 +2787,10 @@ static struct mdk_personality raid5_personality =
         .spare_active   = raid5_spare_active,
         .sync_request   = sync_request,
         .resize         = raid5_resize,
+#ifdef CONFIG_MD_RAID5_RESHAPE
+        .check_reshape  = raid5_check_reshape,
+        .start_reshape  = raid5_start_reshape,
+#endif
         .quiesce        = raid5_quiesce,
 };
 
diff --git a/drivers/md/raid6main.c b/drivers/md/raid6main.c
index cd477ebf2e..6df4930fdd 100644
--- a/drivers/md/raid6main.c
+++ b/drivers/md/raid6main.c
@@ -331,9 +331,9 @@ static int grow_stripes(raid6_conf_t *conf, int num)
         kmem_cache_t *sc;
         int devs = conf->raid_disks;
 
-        sprintf(conf->cache_name, "raid6/%s", mdname(conf->mddev));
+        sprintf(conf->cache_name[0], "raid6/%s", mdname(conf->mddev));
 
-        sc = kmem_cache_create(conf->cache_name,
+        sc = kmem_cache_create(conf->cache_name[0],
                                sizeof(struct stripe_head)+(devs-1)*sizeof(struct r5dev),
                                0, 0, NULL, NULL);
         if (!sc)
@@ -2006,11 +2006,14 @@ static int run(mddev_t *mddev)
                 return -EIO;
         }
 
-        mddev->private = kzalloc(sizeof (raid6_conf_t)
-                                 + mddev->raid_disks * sizeof(struct disk_info),
-                                 GFP_KERNEL);
+        mddev->private = kzalloc(sizeof (raid6_conf_t), GFP_KERNEL);
         if ((conf = mddev->private) == NULL)
                 goto abort;
+        conf->disks = kzalloc(mddev->raid_disks * sizeof(struct disk_info),
+                                 GFP_KERNEL);
+        if (!conf->disks)
+                goto abort;
+
         conf->mddev = mddev;
 
         if ((conf->stripe_hashtbl = kzalloc(PAGE_SIZE, GFP_KERNEL)) == NULL)
@@ -2158,6 +2161,7 @@ abort:
                 print_raid6_conf(conf);
                 safe_put_page(conf->spare_page);
                 kfree(conf->stripe_hashtbl);
+                kfree(conf->disks);
                 kfree(conf);
         }
         mddev->private = NULL;
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index c2602b3404..baa9f58bef 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -50,5 +50,19 @@ config VIDEO_IR
 config VIDEO_TVEEPROM
         tristate
 
+config USB_DABUSB
+        tristate "DABUSB driver"
+        depends on USB
+        ---help---
+          A Digital Audio Broadcasting (DAB) Receiver for USB and Linux
+          brought to you by the DAB-Team
+          <http://wwwbode.cs.tum.edu/Par/arch/dab/>.  This driver can be taken
+          as an example for URB-based bulk, control, and isochronous
+          transactions. URB's are explained in
+          <Documentation/usb/URB.txt>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called dabusb.
+
 endmenu
 
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index 3870fa948c..523ab3851c 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -50,14 +50,15 @@ void saa7146_res_free(struct saa7146_fh *fh, unsigned int bits)
 /********************************************************************************/
 /* common dma functions */
 
-void saa7146_dma_free(struct saa7146_dev *dev,struct saa7146_buf *buf)
+void saa7146_dma_free(struct saa7146_dev *dev,struct videobuf_queue *q,
+                                                struct saa7146_buf *buf)
 {
         DEB_EE(("dev:%p, buf:%p\n",dev,buf));
 
         BUG_ON(in_interrupt());
 
         videobuf_waiton(&buf->vb,0,0);
-        videobuf_dma_pci_unmap(dev->pci, &buf->vb.dma);
+        videobuf_dma_unmap(q, &buf->vb.dma);
         videobuf_dma_free(&buf->vb.dma);
         buf->vb.state = STATE_NEEDS_INIT;
 }
diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146_vbi.c
index 500bd3f05e..063608462e 100644
--- a/drivers/media/common/saa7146_vbi.c
+++ b/drivers/media/common/saa7146_vbi.c
@@ -236,7 +236,7 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,e
         }
 
         if (buf->vb.size != size)
-                saa7146_dma_free(dev,buf);
+                saa7146_dma_free(dev,q,buf);
 
         if (STATE_NEEDS_INIT == buf->vb.state) {
                 buf->vb.width  = llength;
@@ -247,7 +247,7 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,e
                 saa7146_pgtable_free(dev->pci, &buf->pt[2]);
                 saa7146_pgtable_alloc(dev->pci, &buf->pt[2]);
 
-                err = videobuf_iolock(dev->pci,&buf->vb, NULL);
+                err = videobuf_iolock(q,&buf->vb, NULL);
                 if (err)
                         goto oops;
                 err = saa7146_pgtable_build_single(dev->pci, &buf->pt[2], buf->vb.dma.sglist, buf->vb.dma.sglen);
@@ -261,7 +261,7 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,e
 
  oops:
         DEB_VBI(("error out.\n"));
-        saa7146_dma_free(dev,buf);
+        saa7146_dma_free(dev,q,buf);
 
         return err;
 }
@@ -301,7 +301,7 @@ static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
         struct saa7146_buf *buf = (struct saa7146_buf *)vb;
 
         DEB_VBI(("vb:%p\n",vb));
-        saa7146_dma_free(dev,buf);
+        saa7146_dma_free(dev,q,buf);
 }
 
 static struct videobuf_queue_ops vbi_qops = {
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index 6b42713d97..e7079d1bd5 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -1275,7 +1275,7 @@ static int buffer_prepare(struct videobuf_queue *q,
             buf->vb.field  != field      ||
             buf->vb.field  != fh->video_fmt.field  ||
             buf->fmt       != &fh->video_fmt) {
-                saa7146_dma_free(dev,buf);
+                saa7146_dma_free(dev,q,buf);
         }
 
         if (STATE_NEEDS_INIT == buf->vb.state) {
@@ -1304,7 +1304,7 @@ static int buffer_prepare(struct videobuf_queue *q,
                         saa7146_pgtable_alloc(dev->pci, &buf->pt[0]);
                 }
 
-                err = videobuf_iolock(dev->pci,&buf->vb, &vv->ov_fb);
+                err = videobuf_iolock(q,&buf->vb, &vv->ov_fb);
                 if (err)
                         goto oops;
                 err = saa7146_pgtable_build(dev,buf);
@@ -1318,7 +1318,7 @@ static int buffer_prepare(struct videobuf_queue *q,
 
  oops:
         DEB_D(("error out.\n"));
-        saa7146_dma_free(dev,buf);
+        saa7146_dma_free(dev,q,buf);
 
         return err;
 }
@@ -1363,7 +1363,7 @@ static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
         struct saa7146_buf *buf = (struct saa7146_buf *)vb;
 
         DEB_CAP(("vbuf:%p\n",vb));
-        saa7146_dma_free(dev,buf);
+        saa7146_dma_free(dev,q,buf);
 }
 
 static struct videobuf_queue_ops video_qops = {
diff --git a/drivers/media/dvb/b2c2/flexcop-usb.c b/drivers/media/dvb/b2c2/flexcop-usb.c
index a6c91db40a..06ec9fff0e 100644
--- a/drivers/media/dvb/b2c2/flexcop-usb.c
+++ b/drivers/media/dvb/b2c2/flexcop-usb.c
@@ -541,6 +541,7 @@ static struct usb_device_id flexcop_usb_table [] = {
             { USB_DEVICE(0x0af7, 0x0101) },
             { }
 };
+MODULE_DEVICE_TABLE (usb, flexcop_usb_table);
 
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver flexcop_usb_driver = {
diff --git a/drivers/media/dvb/bt8xx/Makefile b/drivers/media/dvb/bt8xx/Makefile
index d188e4c670..9d197efb48 100644
--- a/drivers/media/dvb/bt8xx/Makefile
+++ b/drivers/media/dvb/bt8xx/Makefile
@@ -1,3 +1,3 @@
 obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/video -Idrivers/media/dvb/frontends
+EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/video/bt8xx -Idrivers/media/dvb/frontends
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index 54f8b95717..96fe0ecae2 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -86,7 +86,7 @@ static int dvb_device_open(struct inode *inode, struct file *file)
 
         if (dvbdev && dvbdev->fops) {
                 int err = 0;
-                struct file_operations *old_fops;
+                const struct file_operations *old_fops;
 
                 file->private_data = dvbdev;
                 old_fops = file->f_op;
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index e14bf43941..a14e737ec8 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -81,18 +81,19 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num)
                 return -EAGAIN;
 
         if (num > 2)
-                warn("more than 2 i2c messages at a time is not handled yet. TODO.");
+                warn("more than two i2c messages at a time is not handled yet. TODO.");
 
         for (i = 0; i < num; i++) {
 
-                switch (msg[i].addr) {
-                        case 0x63:
-                                cxusb_gpio_tuner(d,0);
-                                break;
-                        default:
-                                cxusb_gpio_tuner(d,1);
-                                break;
-                }
+                if (d->udev->descriptor.idVendor == USB_VID_MEDION)
+                        switch (msg[i].addr) {
+                                case 0x63:
+                                        cxusb_gpio_tuner(d,0);
+                                        break;
+                                default:
+                                        cxusb_gpio_tuner(d,1);
+                                        break;
+                        }
 
                 /* read request */
                 if (i+1 < num && (msg[i+1].flags & I2C_M_RD)) {
@@ -108,7 +109,7 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num)
                                 break;
 
                         if (ibuf[0] != 0x08)
-                                deb_info("i2c read could have been failed\n");
+                                deb_i2c("i2c read may have failed\n");
 
                         memcpy(msg[i+1].buf,&ibuf[1],msg[i+1].len);
 
@@ -122,7 +123,7 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num)
                         if (cxusb_ctrl_msg(d,CMD_I2C_WRITE, obuf, 2+msg[i].len, &ibuf,1) < 0)
                                 break;
                         if (ibuf != 0x08)
-                                deb_info("i2c write could have been failed\n");
+                                deb_i2c("i2c write may have failed\n");
                 }
         }
 
@@ -410,7 +411,6 @@ static int bluebird_patch_dvico_firmware_download(struct usb_device *udev, const
         if (fw->data[BLUEBIRD_01_ID_OFFSET] == (USB_VID_DVICO & 0xff) &&
             fw->data[BLUEBIRD_01_ID_OFFSET + 1] == USB_VID_DVICO >> 8) {
 
-                /* FIXME: are we allowed to change the fw-data ? */
                 fw->data[BLUEBIRD_01_ID_OFFSET + 2] = udev->descriptor.idProduct + 1;
                 fw->data[BLUEBIRD_01_ID_OFFSET + 3] = udev->descriptor.idProduct >> 8;
 
diff --git a/drivers/media/dvb/dvb-usb/cxusb.h b/drivers/media/dvb/dvb-usb/cxusb.h
index 087c994278..c8ef77554b 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.h
+++ b/drivers/media/dvb/dvb-usb/cxusb.h
@@ -6,6 +6,8 @@
 
 extern int dvb_usb_cxusb_debug;
 #define deb_info(args...)   dprintk(dvb_usb_cxusb_debug,0x01,args)
+#define deb_i2c(args...)    if (d->udev->descriptor.idVendor == USB_VID_MEDION) \
+                                dprintk(dvb_usb_cxusb_debug,0x01,args)
 
 /* usb commands - some of it are guesses, don't have a reference yet */
 #define CMD_I2C_WRITE     0x08
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c
index 2f23ceab8d..603a22e4bf 100644
--- a/drivers/media/dvb/ttpci/av7110_v4l.c
+++ b/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -369,6 +369,11 @@ static int av7110_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
                         fm_matrix = 0x3001; // stereo
                         src = 0x0020;
                         break;
+                case V4L2_TUNER_MODE_LANG1_LANG2:
+                        dprintk(2, "VIDIOC_S_TUNER: V4L2_TUNER_MODE_LANG1_LANG2\n");
+                        fm_matrix = 0x3000; // bilingual
+                        src = 0x0020;
+                        break;
                 case V4L2_TUNER_MODE_LANG1:
                         dprintk(2, "VIDIOC_S_TUNER: V4L2_TUNER_MODE_LANG1\n");
                         fm_matrix = 0x3000; // mono
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index c622a4da56..f31a19890b 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -16,31 +16,7 @@ config VIDEO_ADV_DEBUG
           V4L devices.
           In doubt, say N.
 
-config VIDEO_BT848
-        tristate "BT848 Video For Linux"
-        depends on VIDEO_DEV && PCI && I2C
-        select I2C_ALGOBIT
-        select FW_LOADER
-        select VIDEO_BTCX
-        select VIDEO_BUF
-        select VIDEO_IR
-        select VIDEO_TUNER
-        select VIDEO_TVEEPROM
-        select VIDEO_MSP3400
-        ---help---
-          Support for BT848 based frame grabber/overlay boards. This includes
-          the Miro, Hauppauge and STB boards. Please read the material in
-          <file:Documentation/video4linux/bttv/> for more information.
-
-          To compile this driver as a module, choose M here: the
-          module will be called bttv.
-
-config VIDEO_BT848_DVB
-        bool "DVB/ATSC Support for bt878 based TV cards"
-        depends on VIDEO_BT848 && DVB_CORE
-        select DVB_BT8XX
-        ---help---
-          This adds support for DVB/ATSC cards based on the BT878 chip.
+source "drivers/media/video/bt8xx/Kconfig"
 
 config VIDEO_SAA6588
         tristate "SAA6588 Radio Chip RDS decoder support on BT848 cards"
@@ -315,8 +291,6 @@ config VIDEO_HEXIUM_GEMINI
 
 source "drivers/media/video/cx88/Kconfig"
 
-source "drivers/media/video/em28xx/Kconfig"
-
 config VIDEO_OVCAMCHIP
         tristate "OmniVision Camera Chip support"
         depends on VIDEO_DEV && I2C
@@ -391,4 +365,234 @@ config VIDEO_SAA7127
           To compile this driver as a module, choose M here: the
           module will be called saa7127
 
+#
+# USB Multimedia device configuration
+#
+
+menu "V4L USB devices"
+        depends on USB && VIDEO_DEV
+
+source "drivers/media/video/em28xx/Kconfig"
+
+config USB_VICAM
+        tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)"
+        depends on USB && VIDEO_DEV && EXPERIMENTAL
+        ---help---
+          Say Y here if you have 3com homeconnect camera (vicam).
+
+          This driver uses the Video For Linux API. You must say Y or M to
+          "Video For Linux" (under Multimedia Devices) to use this driver.
+          Information on this API and pointers to "v4l" programs may be found
+          at <file:Documentation/video4linux/API.html>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called vicam.
+
+config USB_DSBR
+        tristate "D-Link USB FM radio support (EXPERIMENTAL)"
+        depends on USB && VIDEO_DEV && EXPERIMENTAL
+        ---help---
+          Say Y here if you want to connect this type of radio to your
+          computer's USB port. Note that the audio is not digital, and
+          you must connect the line out connector to a sound card or a
+          set of speakers.
+
+          This driver uses the Video For Linux API.  You must enable
+          (Y or M in config) Video For Linux (under Character Devices)
+          to use this driver.  Information on this API and pointers to
+          "v4l" programs may be found at
+          <file:Documentation/video4linux/API.html>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called dsbr100.
+
+config USB_ET61X251
+        tristate "USB ET61X[12]51 PC Camera Controller support"
+        depends on USB && VIDEO_DEV
+        ---help---
+          Say Y here if you want support for cameras based on Etoms ET61X151
+          or ET61X251 PC Camera Controllers.
+
+          See <file:Documentation/usb/et61x251.txt> for more informations.
+
+          This driver uses the Video For Linux API. You must say Y or M to
+          "Video For Linux" to use this driver.
+
+          To compile this driver as a module, choose M here: the
+          module will be called et61x251.
+
+config USB_IBMCAM
+        tristate "USB IBM (Xirlink) C-it Camera support"
+        depends on USB && VIDEO_DEV
+        ---help---
+          Say Y here if you want to connect a IBM "C-It" camera, also known as
+          "Xirlink PC Camera" to your computer's USB port.  For more
+          information, read <file:Documentation/usb/ibmcam.txt>.
+
+          This driver uses the Video For Linux API.  You must enable
+          (Y or M in config) Video For Linux (under Character Devices)
+          to use this driver.  Information on this API and pointers to
+          "v4l" programs may be found at
+          <file:Documentation/video4linux/API.html>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ibmcam.
+
+          This camera has several configuration options which
+          can be specified when you load the module. Read
+          <file:Documentation/usb/ibmcam.txt> to learn more.
+
+config USB_KONICAWC
+        tristate "USB Konica Webcam support"
+        depends on USB && VIDEO_DEV
+        ---help---
+          Say Y here if you want support for webcams based on a Konica
+          chipset. This is known to work with the Intel YC76 webcam.
+
+          This driver uses the Video For Linux API.  You must enable
+          (Y or M in config) Video For Linux (under Character Devices)
+          to use this driver.  Information on this API and pointers to
+          "v4l" programs may be found at
+          <file:Documentation/video4linux/API.html>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called konicawc.
+
+config USB_OV511
+        tristate "USB OV511 Camera support"
+        depends on USB && VIDEO_DEV
+        ---help---
+          Say Y here if you want to connect this type of camera to your
+          computer's USB port. See <file:Documentation/usb/ov511.txt> for more
+          information and for a list of supported cameras.
+
+          This driver uses the Video For Linux API. You must say Y or M to
+          "Video For Linux" (under Character Devices) to use this driver.
+          Information on this API and pointers to "v4l" programs may be found
+          at <file:Documentation/video4linux/API.html>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ov511.
+
+config USB_SE401
+        tristate "USB SE401 Camera support"
+        depends on USB && VIDEO_DEV
+        ---help---
+          Say Y here if you want to connect this type of camera to your
+          computer's USB port. See <file:Documentation/usb/se401.txt> for more
+          information and for a list of supported cameras.
+
+          This driver uses the Video For Linux API. You must say Y or M to
+          "Video For Linux" (under Multimedia Devices) to use this driver.
+          Information on this API and pointers to "v4l" programs may be found
+          at <file:Documentation/video4linux/API.html>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called se401.
+
+config USB_SN9C102
+        tristate "USB SN9C10x PC Camera Controller support"
+        depends on USB && VIDEO_DEV
+        ---help---
+          Say Y here if you want support for cameras based on SONiX SN9C101,
+          SN9C102 or SN9C103 PC Camera Controllers.
+
+          See <file:Documentation/usb/sn9c102.txt> for more informations.
+
+          This driver uses the Video For Linux API. You must say Y or M to
+          "Video For Linux" to use this driver.
+
+          To compile this driver as a module, choose M here: the
+          module will be called sn9c102.
+
+config USB_STV680
+        tristate "USB STV680 (Pencam) Camera support"
+        depends on USB && VIDEO_DEV
+        ---help---
+          Say Y here if you want to connect this type of camera to your
+          computer's USB port. This includes the Pencam line of cameras.
+          See <file:Documentation/usb/stv680.txt> for more information and for
+          a list of supported cameras.
+
+          This driver uses the Video For Linux API. You must say Y or M to
+          "Video For Linux" (under Multimedia Devices) to use this driver.
+          Information on this API and pointers to "v4l" programs may be found
+          at <file:Documentation/video4linux/API.html>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called stv680.
+
+config USB_W9968CF
+        tristate "USB W996[87]CF JPEG Dual Mode Camera support"
+        depends on USB && VIDEO_DEV && I2C && VIDEO_OVCAMCHIP
+        ---help---
+          Say Y here if you want support for cameras based on OV681 or
+          Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips.
+
+          This driver has an optional plugin, which is distributed as a
+          separate module only (released under GPL). It allows to use higher
+          resolutions and framerates, but cannot be included in the official
+          Linux kernel for performance purposes.
+
+          See <file:Documentation/usb/w9968cf.txt> for more informations.
+
+          This driver uses the Video For Linux and the I2C APIs. It needs the
+          OmniVision Camera Chip support as well. You must say Y or M to
+          "Video For Linux", "I2C Support" and "OmniVision Camera Chip
+          support" to use this driver.
+
+          To compile this driver as a module, choose M here: the
+          module will be called w9968cf.
+
+config USB_ZC0301
+        tristate "USB ZC0301 Image Processor and Control Chip support"
+        depends on USB && VIDEO_DEV
+        ---help---
+          Say Y here if you want support for cameras based on the ZC0301
+          Image Processor and Control Chip.
+
+          See <file:Documentation/usb/zc0301.txt> for more informations.
+
+          This driver uses the Video For Linux API. You must say Y or M to
+          "Video For Linux" to use this driver.
+
+          To compile this driver as a module, choose M here: the
+          module will be called zc0301.
+
+config USB_PWC
+        tristate "USB Philips Cameras"
+        depends on USB && VIDEO_DEV
+        ---help---
+          Say Y or M here if you want to use one of these Philips & OEM
+          webcams:
+           * Philips PCA645, PCA646
+           * Philips PCVC675, PCVC680, PCVC690
+           * Philips PCVC720/40, PCVC730, PCVC740, PCVC750
+           * Askey VC010
+           * Logitech QuickCam Pro 3000, 4000, 'Zoom', 'Notebook Pro'
+             and 'Orbit'/'Sphere'
+           * Samsung MPC-C10, MPC-C30
+           * Creative Webcam 5, Pro Ex
+           * SOTEC Afina Eye
+           * Visionite VCS-UC300, VCS-UM100
+
+          The PCA635, PCVC665 and PCVC720/20 are not supported by this driver
+          and never will be, but the 665 and 720/20 are supported by other
+          drivers.
+
+          See <file:Documentation/usb/philips.txt> for more information and
+          installation instructions.
+
+          The built-in microphone is enabled by selecting USB Audio support.
+
+          This driver uses the Video For Linux API. You must say Y or M to
+          "Video For Linux" (under Character Devices) to use this driver.
+          Information on this API and pointers to "v4l" programs may be found
+          at <file:Documentation/video4linux/API.html>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called pwc.
+
+endmenu # V4L USB devices
+
 endmenu
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index f2bd4c0c4f..1c0e72e5a5 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -2,9 +2,6 @@
 # Makefile for the video capture/playback device drivers.
 #
 
-bttv-objs       :=      bttv-driver.o bttv-cards.o bttv-if.o \
-                        bttv-risc.o bttv-vbi.o bttv-i2c.o bttv-gpio.o \
-                        bttv-input.o
 zoran-objs      :=      zr36120.o zr36120_i2c.o zr36120_mem.o
 zr36067-objs    :=      zoran_procfs.o zoran_device.o \
                         zoran_driver.o zoran_card.o
@@ -15,8 +12,8 @@ msp3400-objs	:=	msp3400-driver.o msp3400-kthreads.o
 
 obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o v4l1-compat.o compat_ioctl32.o
 
-obj-$(CONFIG_VIDEO_BT848) += bttv.o tvaudio.o \
-        tda7432.o tda9875.o ir-kbd-i2c.o
+obj-$(CONFIG_VIDEO_BT848) += bt8xx/
+obj-$(CONFIG_VIDEO_BT848) += tvaudio.o tda7432.o tda9875.o ir-kbd-i2c.o
 obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o
 
 obj-$(CONFIG_VIDEO_ZR36120) += zoran.o
@@ -68,4 +65,23 @@ obj-$(CONFIG_VIDEO_CX25840) += cx25840/
 obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o
 obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
 
+et61x251-objs   := et61x251_core.o et61x251_tas5130d1b.o
+zc0301-objs     := zc0301_core.o zc0301_pas202bcb.o
+
+obj-$(CONFIG_USB_DABUSB)        += dabusb.o
+obj-$(CONFIG_USB_DSBR)          += dsbr100.o
+obj-$(CONFIG_USB_OV511)         += ov511.o
+obj-$(CONFIG_USB_SE401)         += se401.o
+obj-$(CONFIG_USB_STV680)        += stv680.o
+obj-$(CONFIG_USB_W9968CF)       += w9968cf.o
+
+obj-$(CONFIG_USB_SN9C102)       += sn9c102/
+obj-$(CONFIG_USB_ET61X251)      += et61x251/
+obj-$(CONFIG_USB_PWC)           += pwc/
+obj-$(CONFIG_USB_ZC0301)        += zc0301/
+
+obj-$(CONFIG_USB_IBMCAM)        += usbvideo/
+obj-$(CONFIG_USB_KONICAWC)      += usbvideo/
+obj-$(CONFIG_USB_VICAM)         += usbvideo/
+
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 671e36db22..48709582a1 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -1,9 +1,9 @@
-/* 
+/*
  * adv7170 - adv7170, adv7171 video encoder driver version 0.0.1
  *
  * Copyright (C) 2002 Maxim Yevtyushkin <max@linuxmedialabs.com>
  *
- * Based on adv7176 driver by:    
+ * Based on adv7176 driver by:
  *
  * Copyright (C) 1998 Dave Perks <dperks@ibm.net>
  * Copyright (C) 1999 Wolfgang Scherr <scherr@net4you.net>
@@ -173,7 +173,7 @@ adv7170_write_block (struct i2c_client *client,
 static const unsigned char init_NTSC[] = {
         0x00, 0x10,             // MR0
         0x01, 0x20,             // MR1
-        0x02, 0x0e,             // MR2 RTC control: bits 2 and 1 
+        0x02, 0x0e,             // MR2 RTC control: bits 2 and 1
         0x03, 0x80,             // MR3
         0x04, 0x30,             // MR4
         0x05, 0x00,             // Reserved
@@ -196,7 +196,7 @@ static const unsigned char init_NTSC[] = {
         0x16, 0x00,             // CGMS_WSS_0
         0x17, 0x00,             // CGMS_WSS_1
         0x18, 0x00,             // CGMS_WSS_2
-        0x19, 0x00,             // Teletext Ctl 
+        0x19, 0x00,             // Teletext Ctl
 };
 
 static const unsigned char init_PAL[] = {
@@ -381,7 +381,7 @@ static unsigned short normal_i2c[] =
 };
 
 static unsigned short ignore = I2C_CLIENT_END;
-                                                                                
+
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index 085e8863ca..68e7d7aff5 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -1,4 +1,4 @@
-/* 
+/*
  *  adv7175 - adv7175a video encoder driver version 0.0.3
  *
  * Copyright (C) 1998 Dave Perks <dperks@ibm.net>
@@ -233,7 +233,7 @@ adv7175_command (struct i2c_client *client,
                                     sizeof(init_common));
                 adv7175_write(client, 0x07, TR0MODE | TR0RST);
                 adv7175_write(client, 0x07, TR0MODE);
-                break;
+                break;
 
         case ENCODER_GET_CAPABILITIES:
         {
@@ -399,7 +399,7 @@ static unsigned short normal_i2c[] =
 };
 
 static unsigned short ignore = I2C_CLIENT_END;
-                                                                                
+
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c
index c586f64b6b..dbe0251705 100644
--- a/drivers/media/video/arv.c
+++ b/drivers/media/video/arv.c
@@ -161,39 +161,39 @@ void iic(int n, unsigned long addr, unsigned long data1, unsigned long data2,
 {
         int i;
 
-        /* Slave Address */
-        ar_outl(addr, PLDI2CDATA);
+        /* Slave Address */
+        ar_outl(addr, PLDI2CDATA);
         wait_for_vsync();
 
-        /* Start */
-        ar_outl(1, PLDI2CCND);
+        /* Start */
+        ar_outl(1, PLDI2CCND);
         wait_acknowledge();
 
         /* Transfer data 1 */
-        ar_outl(data1, PLDI2CDATA);
+        ar_outl(data1, PLDI2CDATA);
         wait_for_vsync();
-        ar_outl(PLDI2CSTEN_STEN, PLDI2CSTEN);
+        ar_outl(PLDI2CSTEN_STEN, PLDI2CSTEN);
         wait_acknowledge();
 
         /* Transfer data 2 */
-        ar_outl(data2, PLDI2CDATA);
+        ar_outl(data2, PLDI2CDATA);
         wait_for_vsync();
-        ar_outl(PLDI2CSTEN_STEN, PLDI2CSTEN);
+        ar_outl(PLDI2CSTEN_STEN, PLDI2CSTEN);
         wait_acknowledge();
 
         if (n == 3) {
                 /* Transfer data 3 */
-                ar_outl(data3, PLDI2CDATA);
+                ar_outl(data3, PLDI2CDATA);
                 wait_for_vsync();
-                ar_outl(PLDI2CSTEN_STEN, PLDI2CSTEN);
+                ar_outl(PLDI2CSTEN_STEN, PLDI2CSTEN);
                 wait_acknowledge();
-        }
+        }
 
-        /* Stop */
+        /* Stop */
         for (i = 0; i < 100; i++)
                 cpu_relax();
-        ar_outl(2, PLDI2CCND);
-        ar_outl(2, PLDI2CCND);
+        ar_outl(2, PLDI2CCND);
+        ar_outl(2, PLDI2CCND);
 
         while (ar_inl(PLDI2CSTS) & PLDI2CSTS_BB)
                 cpu_relax();
@@ -204,24 +204,24 @@ void init_iic(void)
 {
         DEBUG(1, "init_iic:\n");
 
-        /*
+        /*
          * ICU Setting (iic)
          */
-        /* I2C Setting */
-        ar_outl(0x0, PLDI2CCR);         /* I2CCR Disable                   */
-        ar_outl(0x0300, PLDI2CMOD);     /* I2CMOD ACK/8b-data/7b-addr/auto */
-        ar_outl(0x1, PLDI2CACK);        /* I2CACK ACK                      */
+        /* I2C Setting */
+        ar_outl(0x0, PLDI2CCR);         /* I2CCR Disable                   */
+        ar_outl(0x0300, PLDI2CMOD);     /* I2CMOD ACK/8b-data/7b-addr/auto */
+        ar_outl(0x1, PLDI2CACK);        /* I2CACK ACK                      */
 
         /* I2C CLK */
-        /* 50MH-100k */
+        /* 50MH-100k */
         if (freq == 75) {
-                ar_outl(369, PLDI2CFREQ);       /* BCLK = 75MHz */
+                ar_outl(369, PLDI2CFREQ);       /* BCLK = 75MHz */
         } else if (freq == 50) {
                 ar_outl(244, PLDI2CFREQ);       /* BCLK = 50MHz */
         } else {
                 ar_outl(244, PLDI2CFREQ);       /* default: BCLK = 50MHz */
         }
-        ar_outl(0x1, PLDI2CCR);         /* I2CCR Enable */
+        ar_outl(0x1, PLDI2CCR);         /* I2CCR Enable */
 }
 
 /**************************************************************************
@@ -253,7 +253,7 @@ static inline void wait_for_vertical_sync(int exp_line)
 
         /*
          * check HCOUNT because we cannot check vertical sync.
-         */
+         */
         for (; tmout >= 0; tmout--) {
                 l = ar_inl(ARVHCOUNT);
                 if (l == exp_line)
@@ -562,8 +562,8 @@ static void ar_interrupt(int irq, void *dev, struct pt_regs *regs)
                 /* operations for interlace mode */
                 if ( line_count < (AR_HEIGHT_VGA/2) )   /* even line */
                         line_number = (line_count << 1);
-                else                                    /* odd line */
-                        line_number =
+                else                                    /* odd line */
+                        line_number =
                         (((line_count - (AR_HEIGHT_VGA/2)) << 1) + 1);
         } else {
                 line_number = line_count;
@@ -651,7 +651,7 @@ static int ar_initialize(struct video_device *dev)
                 cr |= ARVCR1_NORMAL;
         ar_outl(cr, ARVCR1);
 
-        /*
+        /*
          * Initialize IIC so that CPU can communicate with AR LSI,
          * and send boot commands to AR LSI.
          */
@@ -846,7 +846,7 @@ static int __init ar_init(void)
          * so register video device as a frame grabber type.
          * device is named "video[0-64]".
          * video_register_device() initializes h/w using ar_initialize().
-         */
+         */
         if (video_register_device(ar->vdev, VFL_TYPE_GRABBER, video_nr) != 0) {
                 /* return -1, -ENFILE(full) or others */
                 printk("arv: register video (Colour AR) failed.\n");
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index d8a18a6a5b..e7b38fdd5e 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -1,4 +1,4 @@
-/* 
+/*
  *  bt819 - BT819A VideoStream Decoder (Rockwell Part)
  *
  * Copyright (C) 1999 Mike Bernson <mike@mlb.org>
@@ -6,7 +6,7 @@
  *
  * Modifications for LML33/DC10plus unified driver
  * Copyright (C) 2000 Serguei Miridonov <mirsev@cicese.mx>
- *  
+ *
  * Changes by Ronald Bultje <rbultje@ronald.bitfreak.net>
  *    - moved over to linux>=2.4.x i2c protocol (9/9/2002)
  *
@@ -206,9 +206,9 @@ bt819_init (struct i2c_client *client)
                                            Bug in the bt819 stepping on my board?
                                         */
                 0x14, 0x00,     /* 0x14 Vertial Scaling lsb */
-                0x16, 0x07,     /* 0x16 Video Timing Polarity 
+                0x16, 0x07,     /* 0x16 Video Timing Polarity
                                            ACTIVE=active low
-                                           FIELD: high=odd, 
+                                           FIELD: high=odd,
                                            vreset=active high,
                                            hreset=active high */
                 0x18, 0x68,     /* 0x18 AGC Delay */
@@ -497,7 +497,7 @@ static unsigned short normal_i2c[] = {
 };
 
 static unsigned short ignore = I2C_CLIENT_END;
-                                                                                
+
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index 4d47a0a0e9..af3b61d4fa 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * bt856 - BT856A Digital Video Encoder (Rockwell Part)
  *
  * Copyright (C) 1999 Mike Bernson <mike@mlb.org>
@@ -285,7 +285,7 @@ bt856_command (struct i2c_client *client,
 static unsigned short normal_i2c[] = { I2C_BT856 >> 1, I2C_CLIENT_END };
 
 static unsigned short ignore = I2C_CLIENT_END;
-                                                                                
+
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig
new file mode 100644
index 0000000000..085477c126
--- /dev/null
+++ b/drivers/media/video/bt8xx/Kconfig
@@ -0,0 +1,25 @@
+config VIDEO_BT848
+        tristate "BT848 Video For Linux"
+        depends on VIDEO_DEV && PCI && I2C
+        select I2C_ALGOBIT
+        select FW_LOADER
+        select VIDEO_BTCX
+        select VIDEO_BUF
+        select VIDEO_IR
+        select VIDEO_TUNER
+        select VIDEO_TVEEPROM
+        select VIDEO_MSP3400
+        ---help---
+          Support for BT848 based frame grabber/overlay boards. This includes
+          the Miro, Hauppauge and STB boards. Please read the material in
+          <file:Documentation/video4linux/bttv/> for more information.
+
+          To compile this driver as a module, choose M here: the
+          module will be called bttv.
+
+config VIDEO_BT848_DVB
+        bool "DVB/ATSC Support for bt878 based TV cards"
+        depends on VIDEO_BT848 && DVB_CORE
+        select DVB_BT8XX
+        ---help---
+          This adds support for DVB/ATSC cards based on the BT878 chip.
diff --git a/drivers/media/video/bt8xx/Makefile b/drivers/media/video/bt8xx/Makefile
new file mode 100644
index 0000000000..94350f21cd
--- /dev/null
+++ b/drivers/media/video/bt8xx/Makefile
@@ -0,0 +1,12 @@
+#
+# Makefile for the video capture/playback device drivers.
+#
+
+bttv-objs      :=      bttv-driver.o bttv-cards.o bttv-if.o \
+                       bttv-risc.o bttv-vbi.o bttv-i2c.o bttv-gpio.o \
+                       bttv-input.o
+
+obj-$(CONFIG_VIDEO_BT848) += bttv.o
+
+EXTRA_CFLAGS += -I$(src)/..
+EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt8xx/bt832.c
index cc54b62f46..a518761378 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt8xx/bt832.c
@@ -30,7 +30,6 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
-#include <media/audiochip.h>
 #include <media/v4l2-common.h>
 
 #include "bttv.h"
@@ -39,7 +38,7 @@
 MODULE_LICENSE("GPL");
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { I2C_BT832_ALT1>>1, I2C_BT832_ALT2>>1,
+static unsigned short normal_i2c[] = { I2C_ADDR_BT832_ALT1>>1, I2C_ADDR_BT832_ALT2>>1,
                                        I2C_CLIENT_END };
 I2C_CLIENT_INSMOD;
 
diff --git a/drivers/media/video/bt832.h b/drivers/media/video/bt8xx/bt832.h
index 1ce8fa71f7..1ce8fa71f7 100644
--- a/drivers/media/video/bt832.h
+++ b/drivers/media/video/bt8xx/bt832.h
diff --git a/drivers/media/video/bt848.h b/drivers/media/video/bt8xx/bt848.h
index 0bcd95303b..0bcd95303b 100644
--- a/drivers/media/video/bt848.h
+++ b/drivers/media/video/bt8xx/bt848.h
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index abfa6ad857..f209a74920 100644
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -39,6 +39,7 @@
 
 #include "bttvp.h"
 #include <media/v4l2-common.h>
+#include <media/tvaudio.h>
 
 /* fwd decl */
 static void boot_msp34xx(struct bttv *btv, int pin);
@@ -336,7 +337,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 15,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 2, 0, 0, 0, 10 },
+                .gpiomux        = { 2, 0, 0, 0 },
+                .gpiomute       = 10,
                 .needs_tvaudio  = 1,
                 .tuner_type     = -1,
                 .tuner_addr     = ADDR_UNSET,
@@ -350,7 +352,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 7,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0, 1, 2, 3, 4 },
+                .gpiomux        = { 0, 1, 2, 3 },
+                .gpiomute       = 4,
                 .needs_tvaudio  = 1,
                 .tuner_type     = -1,
                 .tuner_addr     = ADDR_UNSET,
@@ -364,7 +367,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 7,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 4, 0, 2, 3, 1 },
+                .gpiomux        = { 4, 0, 2, 3 },
+                .gpiomute       = 1,
                 .no_msp34xx     = 1,
                 .needs_tvaudio  = 1,
                 .tuner_type     = TUNER_PHILIPS_NTSC,
@@ -383,7 +387,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0 },
+                .gpiomux        = { 0 },
                 .needs_tvaudio  = 0,
                 .tuner_type     = 4,
                 .tuner_addr     = ADDR_UNSET,
@@ -397,7 +401,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 3,
                 .muxsel         = { 2, 3, 1, 0 },
-                .audiomux       = { 0, 1, 0, 1, 3 },
+                .gpiomux        = { 0, 1, 0, 1 },
+                .gpiomute       = 3,
                 .needs_tvaudio  = 1,
                 .tuner_type     = -1,
                 .tuner_addr     = ADDR_UNSET,
@@ -411,7 +416,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 3,
                 .muxsel         = { 2, 3, 1, 1 },
                 .gpiomask       = 0x0f,
-                .audiomux       = { 0x0c, 0x04, 0x08, 0x04, 0 },
+                .gpiomux        = { 0x0c, 0x04, 0x08, 0x04 },
                 /*                0x04 for some cards ?? */
                 .needs_tvaudio  = 1,
                 .tuner_type     = -1,
@@ -428,7 +433,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 3,
                 .gpiomask       = 0,
                 .muxsel         = { 2, 3, 1, 0, 0 },
-                .audiomux       = { 0 },
+                .gpiomux        = { 0 },
                 .needs_tvaudio  = 1,
                 .tuner_type     = -1,
                 .tuner_addr     = ADDR_UNSET,
@@ -444,7 +449,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0xc00,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0, 0xc00, 0x800, 0x400, 0xc00, 0 },
+                .gpiomux        = { 0, 0xc00, 0x800, 0x400 },
+                .gpiomute       = 0xc00,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = -1,
@@ -459,7 +465,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 3,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 1, 1, 2, 3, 0 },
+                .gpiomux        = { 1, 1, 2, 3 },
                 .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_TEMIC_PAL,
@@ -474,7 +480,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x0f, /* old: 7 */
                 .muxsel         = { 2, 0, 1, 1 },
-                .audiomux       = { 0, 1, 2, 3, 4 },
+                .gpiomux        = { 0, 1, 2, 3 },
+                .gpiomute       = 4,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = -1,
@@ -489,7 +496,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x3014f,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0x20001,0x10001, 0, 0,10 },
+                .gpiomux        = { 0x20001,0x10001, 0, 0 },
+                .gpiomute       = 10,
                 .needs_tvaudio  = 1,
                 .tuner_type     = -1,
                 .tuner_addr     = ADDR_UNSET,
@@ -505,7 +513,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 15,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 13, 14, 11, 7, 0, 0 },
+                .gpiomux        = { 13, 14, 11, 7 },
                 .needs_tvaudio  = 1,
                 .tuner_type     = -1,
                 .tuner_addr     = ADDR_UNSET,
@@ -519,7 +527,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 15,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 13, 14, 11, 7, 0, 0 },
+                .gpiomux        = { 13, 14, 11, 7 },
                 .needs_tvaudio  = 1,
                 .msp34xx_alt    = 1,
                 .pll            = PLL_28,
@@ -537,7 +545,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 7,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0, 2, 1, 3, 4 }, /* old: {0, 1, 2, 3, 4} */
+                .gpiomux        = { 0, 2, 1, 3 }, /* old: {0, 1, 2, 3, 4} */
+                .gpiomute       = 4,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = -1,
@@ -552,7 +561,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 15,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0 , 0, 1 , 0, 10 },
+                .gpiomux        = { 0, 0, 1, 0 },
+                .gpiomute       = 10,
                 .needs_tvaudio  = 1,
                 .tuner_type     = -1,
                 .tuner_addr     = ADDR_UNSET,
@@ -570,10 +580,11 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = { 2, 3, 1, 1 },
         #if 0
                 /* old */
-                .audiomux       = { 0x01c000, 0, 0x018000, 0x014000, 0x002000, 0 },
+                .gpiomux        = { 0x01c000, 0, 0x018000, 0x014000, 0x002000 },
         #else
                 /* 2003-10-20 by "Anton A. Arapov" <arapov@mail.ru> */
-                .audiomux       = { 0x001e00, 0, 0x018000, 0x014000, 0x002000, 0 },
+                .gpiomux        = { 0x001e00, 0, 0x018000, 0x014000 },
+                .gpiomute       = 0x002000,
         #endif
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
@@ -587,7 +598,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x8300f8,
                 .muxsel         = { 2, 3, 1, 1,0 },
-                .audiomux       = { 0x4fa007,0xcfa007,0xcfa007,0xcfa007,0xcfa007,0xcfa007 },
+                .gpiomux        = { 0x4fa007,0xcfa007,0xcfa007,0xcfa007 },
+                .gpiomute       = 0xcfa007,
                 .needs_tvaudio  = 1,
                 .tuner_type     = -1,
                 .tuner_addr     = ADDR_UNSET,
@@ -603,7 +615,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 1, 0, 0, 0, 0 },
+                .gpiomux        = { 1, 0, 0, 0 },
                 .needs_tvaudio  = 1,
                 .tuner_type     = -1,
                 .tuner_addr     = ADDR_UNSET,
@@ -617,7 +629,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = -1,
                 .gpiomask       = 0x8dff00,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0 },
+                .gpiomux        = { 0 },
                 .no_msp34xx     = 1,
                 .tuner_type     = -1,
                 .tuner_addr     = ADDR_UNSET,
@@ -644,7 +656,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x1800,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0, 0x800, 0x1000, 0x1000, 0x1800 },
+                .gpiomux        = { 0, 0x800, 0x1000, 0x1000 },
+                .gpiomute       = 0x1800,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL_I,
                 .tuner_addr     = ADDR_UNSET,
@@ -658,7 +671,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0xc00,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0, 1, 0x800, 0x400, 0xc00, 0 },
+                .gpiomux        = { 0, 1, 0x800, 0x400 },
+                .gpiomute       = 0xc00,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = -1,
@@ -674,7 +688,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 7,
                 .muxsel         = { 2, 3, -1 },
                 .digital_mode   = DIGITAL_MODE_CAMERA,
-                .audiomux       = { 0, 0, 0, 0, 0 },
+                .gpiomux        = { 0, 0, 0, 0 },
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_ALPS_TSBB5_PAL_I,
@@ -691,7 +705,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0xe00,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = {0x400, 0x400, 0x400, 0x400, 0xc00 },
+                .gpiomux        = {0x400, 0x400, 0x400, 0x400 },
+                .gpiomute       = 0xc00,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = -1,
@@ -707,7 +722,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x1f0fff,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0x20000, 0x30000, 0x10000, 0, 0x40000 },
+                .gpiomux        = { 0x20000, 0x30000, 0x10000, 0 },
+                .gpiomute       = 0x40000,
                 .needs_tvaudio  = 0,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
@@ -722,7 +738,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 3,
                 .gpiomask       = 7,
                 .muxsel         = { 2, 0, 1, 1 },
-                .audiomux       = { 0, 1, 2, 3, 4 },
+                .gpiomux        = { 0, 1, 2, 3 },
+                .gpiomute       = 4,
                 .needs_tvaudio  = 1,
                 .tuner_type     = -1,
                 .tuner_addr     = ADDR_UNSET,
@@ -736,7 +753,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x1800,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0, 0x800, 0x1000, 0x1000, 0x1800 },
+                .gpiomux        = { 0, 0x800, 0x1000, 0x1000 },
+                .gpiomute       = 0x1800,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_SECAM,
                 .tuner_addr     = ADDR_UNSET,
@@ -752,7 +770,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x1f0fff,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0x20000, 0x30000, 0x10000, 0x00000, 0x40000 },
+                .gpiomux        = { 0x20000, 0x30000, 0x10000, 0x00000 },
+                .gpiomute       = 0x40000,
                 .needs_tvaudio  = 0,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
@@ -799,7 +818,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 1, /* was: 4 */
                 .gpiomask       = 0,
                 .muxsel         = { 2, 3, 1, 0, 0},
-                .audiomux       = { 0 },
+                .gpiomux        = { 0 },
                 .needs_tvaudio  = 1,
                 .tuner_type     = -1,
                 .tuner_addr     = ADDR_UNSET,
@@ -815,7 +834,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x1800,  /* 0x8dfe00 */
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0, 0x0800, 0x1000, 0x1000, 0x1800, 0 },
+                .gpiomux        = { 0, 0x0800, 0x1000, 0x1000 },
+                .gpiomute       = 0x1800,
                 .pll            = PLL_28,
                 .tuner_type     = -1,
                 .tuner_addr     = ADDR_UNSET,
@@ -829,7 +849,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 3,
                 .gpiomask       = 1,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 1, 0, 0, 0, 0 },
+                .gpiomux        = { 1, 0, 0, 0 },
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
@@ -845,7 +865,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0 },
+                .gpiomux        = { 0 },
                 .needs_tvaudio  = 0,
                 .tuner_type     = 4,
                 .tuner_addr     = ADDR_UNSET,
@@ -859,7 +879,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0xffff00,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0x500, 0, 0x300, 0x900, 0x900 },
+                .gpiomux        = { 0x500, 0, 0x300, 0x900 },
+                .gpiomute       = 0x900,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
@@ -875,11 +896,12 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = { 2, 3, 1, 1, 0 }, /* TV, CVid, SVid, CVid over SVid connector */
         #if 0
                 .gpiomask       = 0xc33000,
-                .audiomux       = { 0x422000,0x1000,0x0000,0x620000,0x800000 },
+                .gpiomux        = { 0x422000,0x1000,0x0000,0x620000,0x800000 },
         #else
                 /* Alexander Varakin <avarakin@hotmail.com> [stereo version] */
                 .gpiomask       = 0xb33000,
-                .audiomux       = { 0x122000,0x1000,0x0000,0x620000,0x800000 },
+                .gpiomux        = { 0x122000,0x1000,0x0000,0x620000 },
+                .gpiomute       = 0x800000,
         #endif
                 /* Audio Routing for "WinFast 2000 XP" (no tv stereo !)
                         gpio23 -- hef4052:nEnable (0x800000)
@@ -909,7 +931,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x1800,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0, 0x800, 0x1000, 0x1000, 0x1800 },
+                .gpiomux        = { 0, 0x800, 0x1000, 0x1000 },
+                .gpiomute       = 0x1800,
                 .pll            = PLL_28,
                 .tuner_type     = -1,
                 .tuner_addr     = ADDR_UNSET,
@@ -925,7 +948,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x1800,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0, 0x800, 0x1000, 0x1000, 0x1800, 0 },
+                .gpiomux        = { 0, 0x800, 0x1000, 0x1000 },
+                .gpiomute       = 0x1800,
                 .pll            = PLL_28,
                 .tuner_type     = -1,
                 .tuner_addr     = ADDR_UNSET,
@@ -940,7 +964,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0xff,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0x21, 0x20, 0x24, 0x2c, 0x29, 0x29 },
+                .gpiomux        = { 0x21, 0x20, 0x24, 0x2c },
+                .gpiomute       = 0x29,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = -1,
@@ -955,7 +980,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x551e00,
                 .muxsel         = { 2, 3, 1, 0 },
-                .audiomux       = { 0x551400, 0x551200, 0, 0, 0x551c00, 0x551200 },
+                .gpiomux        = { 0x551400, 0x551200, 0, 0 },
+                .gpiomute       = 0x551c00,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = 1,
@@ -971,7 +997,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x03000F,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 2, 0xd0001, 0, 0, 1 },
+                .gpiomux        = { 2, 0xd0001, 0, 0 },
+                .gpiomute       = 1,
                 .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = -1,
@@ -988,7 +1015,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 7,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 4, 0, 2, 3, 1 },
+                .gpiomux        = { 4, 0, 2, 3 },
+                .gpiomute       = 1,
                 .no_msp34xx     = 1,
                 .needs_tvaudio  = 1,
                 .tuner_type     = TUNER_PHILIPS_NTSC,
@@ -1005,7 +1033,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 15,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 13, 4, 11, 7, 0, 0 },
+                .gpiomux        = { 13, 4, 11, 7 },
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = -1,
@@ -1022,7 +1050,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0,
                 .muxsel         = { 2, 3, 1, 1},
-                .audiomux       = { 0, 0, 0, 0, 0},
+                .gpiomux        = { 0, 0, 0, 0},
                 .needs_tvaudio  = 1,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
@@ -1038,7 +1066,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0xe00b,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0xff9ff6, 0xff9ff6, 0xff1ff7, 0, 0xff3ffc },
+                .gpiomux        = { 0xff9ff6, 0xff9ff6, 0xff1ff7, 0 },
+                .gpiomute       = 0xff3ffc,
                 .no_msp34xx     = 1,
                 .tuner_type     = -1,
                 .tuner_addr     = ADDR_UNSET,
@@ -1054,7 +1083,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = -1,
                 .gpiomask       = 3,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 1, 1, 0, 2, 3 },
+                .gpiomux        = { 1, 1, 0, 2 },
+                .gpiomute       = 3,
                 .no_msp34xx     = 1,
                 .pll            = PLL_NONE,
                 .tuner_type     = -1,
@@ -1069,7 +1099,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 3,
                 .gpiomask       = 0,
                 .muxsel         = { 2, 3, 1, 0, 0 },
-                .audiomux       = { 0 },
+                .gpiomux        = { 0 },
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = -1,
@@ -1084,7 +1114,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0xbcf03f,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0xbc803f, 0xbc903f, 0xbcb03f, 0, 0xbcb03f },
+                .gpiomux        = { 0xbc803f, 0xbc903f, 0xbcb03f, 0 },
+                .gpiomute       = 0xbcb03f,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = 21,
@@ -1099,7 +1130,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x70000,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0x20000, 0x30000, 0x10000, 0, 0x40000, 0x20000 },
+                .gpiomux        = { 0x20000, 0x30000, 0x10000, 0 },
+                .gpiomute       = 0x40000,
                 .needs_tvaudio  = 1,
                 .no_msp34xx     = 1,
                 .pll            = PLL_35,
@@ -1118,7 +1150,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 15,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = {2,0,0,0,1 },
+                .gpiomux        = {2,0,0,0 },
+                .gpiomute       = 1,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = -1,
@@ -1133,7 +1166,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x010f00,
                 .muxsel         = {2, 3, 0, 0 },
-                .audiomux       = {0x10000, 0, 0x10000, 0, 0, 0 },
+                .gpiomux        = {0x10000, 0, 0x10000, 0 },
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_ALPS_TSHC6_NTSC,
@@ -1150,7 +1183,8 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0xAA0000,
                 .muxsel         = { 2,3,1,1,-1 },
                 .digital_mode   = DIGITAL_MODE_CAMERA,
-                .audiomux       = { 0x20000, 0, 0x80000, 0x80000, 0xa8000, 0x46000  },
+                .gpiomux        = { 0x20000, 0, 0x80000, 0x80000 },
+                .gpiomute       = 0xa8000,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL_I,
@@ -1175,7 +1209,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 7,
                 .muxsel         = { 2, 0, 1, 1 },
-                .audiomux       = { 0, 1, 2, 3, 4 },
+                .gpiomux        = { 0, 1, 2, 3 },
+                .gpiomute       = 4,
                 .pll            = PLL_28,
                 .tuner_type     = -1 /* TUNER_ALPS_TMDH2_NTSC */,
                 .tuner_addr     = ADDR_UNSET,
@@ -1192,7 +1227,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 3,
                 .gpiomask       = 0x03000F,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 1, 0xd0001, 0, 0, 10 },
+                .gpiomux        = { 1, 0xd0001, 0, 0 },
+                .gpiomute       = 10,
                                 /* sound path (5 sources):
                                 MUX1 (mask 0x03), Enable Pin 0x08 (0=enable, 1=disable)
                                         0= ext. Audio IN
@@ -1218,7 +1254,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x1c,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0, 0, 0x10, 8, 4 },
+                .gpiomux        = { 0, 0, 0x10, 8 },
+                .gpiomute       = 4,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
@@ -1230,7 +1267,7 @@ struct tvcard bttv_tvcards[] = {
                 /* Tim Röstermundt <rosterm@uni-muenster.de>
                 in de.comp.os.unix.linux.hardware:
                         options bttv card=0 pll=1 radio=1 gpiomask=0x18e0
-                        audiomux=0x44c71f,0x44d71f,0,0x44d71f,0x44dfff
+                        gpiomux =0x44c71f,0x44d71f,0,0x44d71f,0x44dfff
                         options tuner type=5 */
                 .name           = "Lifeview FlyVideo 2000 /FlyVideo A2/ Lifetec LT 9415 TV [LR90]",
                 .video_inputs   = 4,
@@ -1239,7 +1276,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x18e0,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0x0000,0x0800,0x1000,0x1000,0x18e0 },
+                .gpiomux        = { 0x0000,0x0800,0x1000,0x1000 },
+                .gpiomute       = 0x18e0,
                         /* For cards with tda9820/tda9821:
                                 0x0000: Tuner normal stereo
                                 0x0080: Tuner A2 SAP (second audio program = Zweikanalton)
@@ -1259,7 +1297,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0xF,
                 .muxsel         = { 2, 3, 1, 0 },
-                .audiomux       = { 2, 0, 0, 0, 10 },
+                .gpiomux        = { 2, 0, 0, 0 },
+                .gpiomute       = 10,
                 .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_TEMIC_PAL,
@@ -1277,7 +1316,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x1800,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0, 0x800, 0x1000, 0x1000, 0x1800, 0 },
+                .gpiomux        = { 0, 0x800, 0x1000, 0x1000 },
+                .gpiomute       = 0x1800,
                 .pll            = PLL_28,
                 .tuner_type     = 5,
                 .tuner_addr     = ADDR_UNSET,
@@ -1294,7 +1334,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 1,
                 .gpiomask       = 0,
                 .muxsel         = { 3, 1 },
-                .audiomux       = { 0 },
+                .gpiomux        = { 0 },
                 .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
                 .pll            = PLL_35,
@@ -1311,7 +1351,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0xe00,
                 .muxsel         = { 2, 3, 1, 1},
-                .audiomux       = { 0x400, 0x400, 0x400, 0x400, 0x800, 0x400 },
+                .gpiomux        = { 0x400, 0x400, 0x400, 0x400 },
+                .gpiomute       = 0x800,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_TEMIC_4036FY5_NTSC,
@@ -1327,7 +1368,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x03000F,
                 .muxsel         = { 2, 3, 1, 0 },
-                .audiomux       = { 2, 0, 0, 0, 1 },
+                .gpiomux        = { 2, 0, 0, 0 },
+                .gpiomute       = 1,
                 .pll            = PLL_28,
                 .tuner_type     = 0,
                 .tuner_addr     = ADDR_UNSET,
@@ -1344,7 +1386,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = -1,
                 .gpiomask       = 11,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 2, 0, 0, 1, 8 },
+                .gpiomux        = { 2, 0, 0, 1 },
+                .gpiomute       = 8,
                 .pll            = PLL_35,
                 .tuner_type     = TUNER_TEMIC_PAL,
                 .tuner_addr     = ADDR_UNSET,
@@ -1359,7 +1402,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 1,
                 .gpiomask       = 0xF,
                 .muxsel         = { 2, 2 },
-                .audiomux       = { },
+                .gpiomux        = { },
                 .no_msp34xx     = 1,
                 .needs_tvaudio  = 0,
                 .pll            = PLL_28,
@@ -1378,7 +1421,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0xFF,
                 .muxsel         = { 2, 3, 1, 0 },
-                .audiomux       = { 1, 0, 4, 4, 9 },
+                .gpiomux        = { 1, 0, 4, 4 },
+                .gpiomute       = 9,
                 .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
@@ -1394,7 +1438,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0xf03f,
                 .muxsel         = { 2, 3, 1, 0 },
-                .audiomux       = { 0xbffe, 0, 0xbfff, 0, 0xbffe },
+                .gpiomux        = { 0xbffe, 0, 0xbfff, 0 },
+                .gpiomute       = 0xbffe,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_TEMIC_4006FN5_MULTI_PAL,
                 .tuner_addr     = ADDR_UNSET,
@@ -1411,7 +1456,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = -1,
                 .gpiomask       = 1,
                 .muxsel         = { 2, 3, 0, 1 },
-                .audiomux       = { 0, 0, 1, 0, 0 },
+                .gpiomux        = { 0, 0, 1, 0 },
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_TEMIC_4006FN5_MULTI_PAL,
@@ -1430,7 +1475,8 @@ struct tvcard bttv_tvcards[] = {
                                 /* Radio changed from 1e80 to 0x800 to make
                                 FlyVideo2000S in .hu happy (gm)*/
                                 /* -dk-???: set mute=0x1800 for tda9874h daughterboard */
-                .audiomux       = { 0x0000,0x0800,0x1000,0x1000,0x1800, 0x1080 },
+                .gpiomux        = { 0x0000,0x0800,0x1000,0x1000 },
+                .gpiomute       = 0x1800,
                 .audio_hook     = fv2000s_audio,
                 .no_msp34xx     = 1,
                 .no_tda9875     = 1,
@@ -1448,7 +1494,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0xffff00,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0x500, 0x500, 0x300, 0x900, 0x900 },
+                .gpiomux        = { 0x500, 0x500, 0x300, 0x900 },
+                .gpiomute       = 0x900,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
@@ -1465,7 +1512,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x010f00,
                 .muxsel         = {2, 3, 0, 0 },
-                .audiomux       = {0x10000, 0, 0x10000, 0, 0, 0 },
+                .gpiomux        = {0x10000, 0, 0x10000, 0 },
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_SHARP_2U5JF5540_NTSC,
@@ -1486,7 +1533,8 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0x4f8a00,
                 /* 0x100000: 1=MSP enabled (0=disable again)
                 * 0x010000: Connected to "S0" on tda9880 (0=Pal/BG, 1=NTSC) */
-                .audiomux       = {0x947fff, 0x987fff,0x947fff,0x947fff, 0x947fff},
+                .gpiomux        = {0x947fff, 0x987fff,0x947fff,0x947fff },
+                .gpiomute       = 0x947fff,
                 /* tvtuner, radio,   external,internal, mute,  stereo
                 * tuner, Composit, SVid, Composit-on-Svid-adapter */
                 .muxsel         = { 2, 3 ,0 ,1 },
@@ -1518,7 +1566,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 15,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0, 0, 11, 7, 13, 0 }, /* TV and Radio with same GPIO ! */
+                .gpiomux        = { 0, 0, 11, 7 }, /* TV and Radio with same GPIO ! */
+                .gpiomute       = 13,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = 25,
@@ -1557,7 +1606,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x3f,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0x01, 0x00, 0x03, 0x03, 0x09, 0x02 },
+                .gpiomux        = { 0x01, 0x00, 0x03, 0x03 },
+                .gpiomute       = 0x09,
                 .needs_tvaudio  = 1,
                 .no_msp34xx     = 1,
                 .no_tda9875     = 1,
@@ -1586,7 +1636,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 4,
                 .gpiomask       = 0,
                 .muxsel         = { 2, 3, 1, 0, 0 },
-                .audiomux       = { 0 },
+                .gpiomux        = { 0 },
                 .needs_tvaudio  = 0,
                 .tuner_type     = -1,
                 .tuner_addr     = ADDR_UNSET,
@@ -1618,7 +1668,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x1C800F,  /* Bit0-2: Audio select, 8-12:remote control 14:remote valid 15:remote reset */
                 .muxsel         = { 2, 1, 1, },
-                .audiomux       = { 0, 1, 2, 2, 4 },
+                .gpiomux        = { 0, 1, 2, 2 },
+                .gpiomute       = 4,
                 .needs_tvaudio  = 0,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
@@ -1637,7 +1688,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x140007,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0, 1, 2, 3, 4, 0 },
+                .gpiomux        = { 0, 1, 2, 3 },
+                .gpiomute       = 4,
                 .tuner_type     = TUNER_PHILIPS_NTSC,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -1651,7 +1703,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = -1,
                 .gpiomask       = 0,
                 .muxsel         = { 2, 3, 1, 0 },
-                .audiomux       = { 0 },
+                .gpiomux        = { 0 },
                 .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
@@ -1667,13 +1719,14 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 7,
                 .muxsel         = { 2, 3, 1, 1 },   /* Tuner, SVid, SVHS, SVid to SVHS connector */
-                .audiomux       = { 0 ,0 ,4, 4,4,4},/* Yes, this tuner uses the same audio output for TV and FM radio!
+                .gpiomux        = { 0, 0, 4, 4 },/* Yes, this tuner uses the same audio output for TV and FM radio!
                                                 * This card lacks external Audio In, so we mute it on Ext. & Int.
                                                 * The PCB can take a sbx1637/sbx1673, wiring unknown.
                                                 * This card lacks PCI subsystem ID, sigh.
-                                                * audiomux=1: lower volume, 2+3: mute
+                                                * gpiomux =1: lower volume, 2+3: mute
                                                 * btwincap uses 0x80000/0x80003
                                                 */
+                .gpiomute       = 4,
                 .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
@@ -1720,7 +1773,7 @@ struct tvcard bttv_tvcards[] = {
                 .radio_addr     = ADDR_UNSET,
 
                 .gpiomask       = 7,
-                .audiomux       = {7},
+                .gpiomux        = {7},
         },
         [BTTV_BOARD_GVBCTV5PCI] = {
                 .name           = "IODATA GV-BCTV5/PCI",
@@ -1730,7 +1783,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x0f0f80,
                 .muxsel         = {2, 3, 1, 0 },
-                .audiomux       = {0x030000, 0x010000, 0, 0, 0x020000, 0},
+                .gpiomux        = {0x030000, 0x010000, 0, 0 },
+                .gpiomute       = 0x020000,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_NTSC_M,
@@ -1960,7 +2014,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 2,
                 /* TV, Comp1, Composite over SVID con, SVID */
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 2, 2, 0, 0, 0 },
+                .gpiomux        = { 2, 2, 0, 0 },
                 .pll            = PLL_28,
                 .has_radio      = 1,
                 .tuner_type     = TUNER_PHILIPS_PAL,
@@ -1984,7 +2038,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = -1,
                 .gpiomask       = 7,
                 .muxsel         = { 2, 3, 1, 1},
-                .audiomux       = { 0, 1, 2, 3, 4},
+                .gpiomux        = { 0, 1, 2, 3},
+                .gpiomute       = 4,
                 .needs_tvaudio  = 1,
                 .tuner_type     = 5,
                 .tuner_addr     = ADDR_UNSET,
@@ -2016,7 +2071,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = -1,
                 .gpiomask       = 0,
                 .muxsel         = { 2, 3 },
-                .audiomux       = { 0 },
+                .gpiomux        = { 0 },
                 .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
@@ -2035,7 +2090,8 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0x001e8007,
                 .muxsel         = { 2, 3, 1, 0 },
                 /*                  Tuner, Radio, external, internal, off,  on */
-                .audiomux       = { 0x08,  0x0f,  0x0a,     0x08,     0x0f, 0x08 },
+                .gpiomux        = { 0x08,  0x0f,  0x0a,     0x08 },
+                .gpiomute       = 0x0f,
                 .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
@@ -2152,7 +2208,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = -1,
                 .gpiomask       = 0,
                 .muxsel         = { 2, 3, 1, 0 },
-                .audiomux       = { 0 },
+                .gpiomux        = { 0 },
                 .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
@@ -2169,7 +2225,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 3,
                 .gpiomask       = 0x00,
                 .muxsel         = { 2, 3, 1, 0 },
-                .audiomux       = { 0, 0, 0, 0, 0, 0 }, /* card has no audio */
+                .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = -1,
@@ -2184,7 +2240,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 3,
                 .gpiomask       = 0x00,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0, 0, 0, 0, 0, 0 }, /* card has no audio */
+                .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = -1,
@@ -2204,7 +2260,7 @@ struct tvcard bttv_tvcards[] = {
                                         via the upper nibble of muxsel. here: used for
                                         xternal video-mux */
                 .muxsel         = { 0x02, 0x12, 0x22, 0x32, 0x03, 0x13, 0x23, 0x33, 0x01, 0x00 },
-                .audiomux       = { 0, 0, 0, 0, 0, 0 }, /* card has no audio */
+                .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = -1,
@@ -2222,7 +2278,7 @@ struct tvcard bttv_tvcards[] = {
                                         via the upper nibble of muxsel. here: used for
                                         xternal video-mux */
                 .muxsel         = { 0x02, 0x12, 0x22, 0x32, 0x03, 0x13, 0x23, 0x33, 0x01, 0x01 },
-                .audiomux       = { 0, 0, 0, 0, 0, 0 }, /* card has no audio */
+                .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = -1,
@@ -2310,7 +2366,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 3,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 1, 1, 1, 1, 0 },
+                .gpiomux        = { 1, 1, 1, 1 },
                 .needs_tvaudio  = 1,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
@@ -2341,7 +2397,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x008007,
                 .muxsel         = { 2, 3, 0, 0 },
-                .audiomux       = { 0, 0, 0, 0, 0x000003, 0 },
+                .gpiomux        = { 0, 0, 0, 0 },
+                .gpiomute       = 0x000003,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
@@ -2377,7 +2434,7 @@ struct tvcard bttv_tvcards[] = {
                 .needs_tvaudio  = 0,
                 .gpiomask       = 0x68,
                 .muxsel         = { 2, 3, 1 },
-                .audiomux       = { 0x68, 0x68, 0x61, 0x61, 0x00 },
+                .gpiomux        = { 0x68, 0x68, 0x61, 0x61 },
                 .pll            = PLL_28,
         },
 
@@ -2392,7 +2449,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x008007,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0, 1, 2, 2, 3 },
+                .gpiomux        = { 0, 1, 2, 2 },
+                .gpiomute       = 3,
                 .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
@@ -2417,7 +2475,7 @@ struct tvcard bttv_tvcards[] = {
                 .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .muxsel         = {2,2,2,2},/*878A input is always MUX0, see above.*/
-                .audiomux       = { 0, 0, 0, 0, 0, 0 }, /* card has no audio */
+                .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
                 .pll            = PLL_28,
                 .needs_tvaudio  = 0,
                 .muxsel_hook    = picolo_tetra_muxsel,/*Required as it doesn't follow the classic input selection policy*/
@@ -2435,7 +2493,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x0000000f,
                 .muxsel         = { 2, 1, 1 },
-                .audiomux       = { 0x02, 0x00, 0x00, 0x00, 0x00 },
+                .gpiomux        = { 0x02, 0x00, 0x00, 0x00 },
                 .tuner_type     = TUNER_TEMIC_PAL,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -2491,7 +2549,7 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel           = { 2, 2, 2, 2, 2, 2, 2, 2,
                                 3, 3, 3, 3, 3, 3, 3, 3 },
                 .muxsel_hook      = sigmaSQ_muxsel,
-                .audiomux         = { 0 },
+                .gpiomux          = { 0 },
                 .no_msp34xx       = 1,
                 .pll              = PLL_28,
                 .tuner_type       = -1,
@@ -2508,7 +2566,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask         = 0x0,
                 .muxsel           = { 2, 2, 2, 2 },
                 .muxsel_hook      = sigmaSLC_muxsel,
-                .audiomux         = { 0 },
+                .gpiomux          = { 0 },
                 .no_msp34xx       = 1,
                 .pll              = PLL_28,
                 .tuner_type       = -1,
@@ -2526,7 +2584,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = -1,
                 .gpiomask       = 0xFF,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 2, 0, 0, 0, 10 },
+                .gpiomux        = { 2, 0, 0, 0 },
+                .gpiomute       = 10,
                 .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
@@ -2560,7 +2619,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x3f,
                 .muxsel         = {2, 3, 1, 0 },
-                .audiomux       = {0x31, 0x31, 0x31, 0x31, 0x31, 0x31 },
+                .gpiomux        = {0x31, 0x31, 0x31, 0x31 },
+                .gpiomute       = 0x31,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_NTSC_M,
@@ -2583,7 +2643,7 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0x008007,
-                .audiomux       = { 0, 0x000001,0,0, 0 },
+                .gpiomux        = { 0, 0x000001,0,0 },
                 .needs_tvaudio  = 1,
                 .has_radio      = 1,
         },
@@ -2693,7 +2753,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .muxsel         = { 2, 3, 1 },
                 .gpiomask       = 0x00e00007,
-                .audiomux       = { 0x00400005, 0, 0x00000001, 0, 0x00c00007, 0 },
+                .gpiomux        = { 0x00400005, 0, 0x00000001, 0 },
+                .gpiomute       = 0x00c00007,
                 .no_msp34xx     = 1,
                 .no_tda9875     = 1,
                 .no_tda7432     = 1,
@@ -2709,7 +2770,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x01fe00,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0x001e00, 0, 0x018000, 0x014000, 0x002000, 0 },
+                .gpiomux        = { 0x001e00, 0, 0x018000, 0x014000 },
+                .gpiomute       = 0x002000,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_YMEC_TVF66T5_B_DFF,
@@ -2726,7 +2788,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x001c0007,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0, 1, 2, 2, 3 },
+                .gpiomux        = { 0, 1, 2, 2 },
+                .gpiomute       = 3,
                 .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_TENA_9533_DI,
@@ -2745,7 +2808,8 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask      = 0x01fe00,
                 .muxsel        = { 2,3,1,1,-1 },
                 .digital_mode  = DIGITAL_MODE_CAMERA,
-                .audiomux      = { 0x00400, 0x10400, 0x04400, 0x80000, 0x12400, 0x46000  },
+                .gpiomux       = { 0x00400, 0x10400, 0x04400, 0x80000 },
+                .gpiomute      = 0x12400,
                 .no_msp34xx    = 1,
                 .pll           = PLL_28,
                 .tuner_type    = TUNER_LG_PAL_FM,
@@ -2763,7 +2827,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x3f,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0x21, 0x20, 0x24, 0x2c, 0x29, 0x29 },
+                .gpiomux        = { 0x21, 0x20, 0x24, 0x2c },
+                .gpiomute       = 0x29,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_YMEC_TVF_5533MF,
@@ -2797,7 +2862,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 15,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 2, 0, 0, 0, 1 },
+                .gpiomux        = { 2, 0, 0, 0 },
+                .gpiomute       = 1,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = 2,
@@ -2813,7 +2879,7 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x108007,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 100000, 100002, 100002, 100000 },
+                .gpiomux        = { 100000, 100002, 100002, 100000 },
                 .no_msp34xx     = 1,
                 .no_tda9875     = 1,
                 .no_tda7432     = 1,
@@ -2853,7 +2919,8 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 7,
                 .muxsel         = { 2, 3, 1, 1 },
-                .audiomux       = { 0, 1, 2, 3, 4 },
+                .gpiomux        = { 0, 1, 2, 3 },
+                .gpiomute       = 4,
                 .tuner_type     = TUNER_TEMIC_4009FR5_PAL,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -2925,20 +2992,20 @@ void __devinit bttv_idcard(struct bttv *btv)
         if (UNSET != audiomux[0]) {
                 gpiobits = 0;
                 for (i = 0; i < 5; i++) {
-                        bttv_tvcards[btv->c.type].audiomux[i] = audiomux[i];
+                        bttv_tvcards[btv->c.type].gpiomux[i] = audiomux[i];
                         gpiobits |= audiomux[i];
                 }
         } else {
                 gpiobits = audioall;
                 for (i = 0; i < 5; i++) {
-                        bttv_tvcards[btv->c.type].audiomux[i] = audioall;
+                        bttv_tvcards[btv->c.type].gpiomux[i] = audioall;
                 }
         }
         bttv_tvcards[btv->c.type].gpiomask = (UNSET != gpiomask) ? gpiomask : gpiobits;
         printk(KERN_INFO "bttv%d: gpio config override: mask=0x%x, mux=",
                btv->c.nr,bttv_tvcards[btv->c.type].gpiomask);
         for (i = 0; i < 5; i++) {
-                printk("%s0x%x", i ? "," : "", bttv_tvcards[btv->c.type].audiomux[i]);
+                printk("%s0x%x", i ? "," : "", bttv_tvcards[btv->c.type].gpiomux[i]);
         }
         printk("\n");
 }
@@ -3046,7 +3113,7 @@ static void miro_pinnacle_gpio(struct bttv *btv)
         gpio_inout(0xffffff, 0);
         gpio = gpio_read();
         id   = ((gpio>>10) & 63) -1;
-        msp  = bttv_I2CRead(btv, I2C_MSP3400, "MSP34xx");
+        msp  = bttv_I2CRead(btv, I2C_ADDR_MSP3400, "MSP34xx");
         if (id < 32) {
                 btv->tuner_type = miro_tunermap[id];
                 if (0 == (gpio & 0x20)) {
@@ -3442,8 +3509,8 @@ void __devinit bttv_init_card2(struct bttv *btv)
 
         if (bttv_tvcards[btv->c.type].digital_mode == DIGITAL_MODE_CAMERA) {
                 /* detect Bt832 chip for quartzsight digital camera */
-                if ((bttv_I2CRead(btv, I2C_BT832_ALT1, "Bt832") >=0) ||
-                    (bttv_I2CRead(btv, I2C_BT832_ALT2, "Bt832") >=0))
+                if ((bttv_I2CRead(btv, I2C_ADDR_BT832_ALT1, "Bt832") >=0) ||
+                    (bttv_I2CRead(btv, I2C_ADDR_BT832_ALT2, "Bt832") >=0))
                         boot_bt832(btv);
         }
 
@@ -3452,19 +3519,19 @@ void __devinit bttv_init_card2(struct bttv *btv)
 
         /* try to detect audio/fader chips */
         if (!bttv_tvcards[btv->c.type].no_msp34xx &&
-            bttv_I2CRead(btv, I2C_MSP3400, "MSP34xx") >=0)
+            bttv_I2CRead(btv, I2C_ADDR_MSP3400, "MSP34xx") >=0)
                 request_module("msp3400");
 
         if (bttv_tvcards[btv->c.type].msp34xx_alt &&
-            bttv_I2CRead(btv, I2C_MSP3400_ALT, "MSP34xx (alternate address)") >=0)
+            bttv_I2CRead(btv, I2C_ADDR_MSP3400_ALT, "MSP34xx (alternate address)") >=0)
                 request_module("msp3400");
 
         if (!bttv_tvcards[btv->c.type].no_tda9875 &&
-            bttv_I2CRead(btv, I2C_TDA9875, "TDA9875") >=0)
+            bttv_I2CRead(btv, I2C_ADDR_TDA9875, "TDA9875") >=0)
                 request_module("tda9875");
 
         if (!bttv_tvcards[btv->c.type].no_tda7432 &&
-            bttv_I2CRead(btv, I2C_TDA7432, "TDA7432") >=0)
+            bttv_I2CRead(btv, I2C_ADDR_TDA7432, "TDA7432") >=0)
                 request_module("tda7432");
 
         if (bttv_tvcards[btv->c.type].needs_tvaudio)
@@ -3475,7 +3542,7 @@ void __devinit bttv_init_card2(struct bttv *btv)
         if (btv->tda9887_conf)
                 tda9887 = 1;
         if (0 == tda9887 && 0 == bttv_tvcards[btv->c.type].has_dvb &&
-            bttv_I2CRead(btv, I2C_TDA9887, "TDA9887") >=0)
+            bttv_I2CRead(btv, I2C_ADDR_TDA9887, "TDA9887") >=0)
                 tda9887 = 1;
         /* Hybrid DVB card, DOES have a tda9887 */
         if (btv->c.type == BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE)
@@ -3796,18 +3863,18 @@ void bttv_tda9880_setnorm(struct bttv *btv, int norm)
 {
         /* fix up our card entry */
         if(norm==VIDEO_MODE_NTSC) {
-                bttv_tvcards[BTTV_BOARD_VOODOOTV_FM].audiomux[0]=0x957fff;
-                bttv_tvcards[BTTV_BOARD_VOODOOTV_FM].audiomux[4]=0x957fff;
+                bttv_tvcards[BTTV_BOARD_VOODOOTV_FM].gpiomux[TVAUDIO_INPUT_TUNER]=0x957fff;
+                bttv_tvcards[BTTV_BOARD_VOODOOTV_FM].gpiomute=0x957fff;
                 dprintk("bttv_tda9880_setnorm to NTSC\n");
         }
         else {
-                bttv_tvcards[BTTV_BOARD_VOODOOTV_FM].audiomux[0]=0x947fff;
-                bttv_tvcards[BTTV_BOARD_VOODOOTV_FM].audiomux[4]=0x947fff;
+                bttv_tvcards[BTTV_BOARD_VOODOOTV_FM].gpiomux[TVAUDIO_INPUT_TUNER]=0x947fff;
+                bttv_tvcards[BTTV_BOARD_VOODOOTV_FM].gpiomute=0x947fff;
                 dprintk("bttv_tda9880_setnorm to PAL\n");
         }
         /* set GPIO according */
         gpio_bits(bttv_tvcards[btv->c.type].gpiomask,
-                  bttv_tvcards[btv->c.type].audiomux[btv->audio]);
+                  bttv_tvcards[btv->c.type].gpiomux[btv->audio]);
 }
 
 
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index c0415d6e7f..74def9c239 100644
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -36,13 +36,15 @@
 #include <linux/kdev_t.h>
 #include "bttvp.h"
 #include <media/v4l2-common.h>
+#include <media/tvaudio.h>
+#include <media/msp3400.h>
 
 #include <linux/dma-mapping.h>
 
 #include <asm/io.h>
 #include <asm/byteorder.h>
 
-#include "rds.h"
+#include <media/rds.h>
 
 
 unsigned int bttv_num;                  /* number of Bt848s in use */
@@ -926,45 +928,98 @@ video_mux(struct bttv *btv, unsigned int input)
 
 static char *audio_modes[] = {
         "audio: tuner", "audio: radio", "audio: extern",
-        "audio: intern", "audio: off"
+        "audio: intern", "audio: mute"
 };
 
 static int
-audio_mux(struct bttv *btv, int mode)
+audio_mux(struct bttv *btv, int input, int mute)
 {
-        int val,mux,i2c_mux,signal;
+        int gpio_val, signal;
+        struct v4l2_control ctrl;
+        struct i2c_client *c;
 
         gpio_inout(bttv_tvcards[btv->c.type].gpiomask,
                    bttv_tvcards[btv->c.type].gpiomask);
         signal = btread(BT848_DSTATUS) & BT848_DSTATUS_HLOC;
 
-        switch (mode) {
-        case AUDIO_MUTE:
-                btv->audio |= AUDIO_MUTE;
-                break;
-        case AUDIO_UNMUTE:
-                btv->audio &= ~AUDIO_MUTE;
-                break;
-        case AUDIO_TUNER:
-        case AUDIO_RADIO:
-        case AUDIO_EXTERN:
-        case AUDIO_INTERN:
-                btv->audio &= AUDIO_MUTE;
-                btv->audio |= mode;
-        }
-        i2c_mux = mux = (btv->audio & AUDIO_MUTE) ? AUDIO_OFF : btv->audio;
-        if (btv->opt_automute && !signal && !btv->radio_user)
-                mux = AUDIO_OFF;
-
-        val = bttv_tvcards[btv->c.type].audiomux[mux];
-        gpio_bits(bttv_tvcards[btv->c.type].gpiomask,val);
+        btv->mute = mute;
+        btv->audio = input;
+
+        /* automute */
+        mute = mute || (btv->opt_automute && !signal && !btv->radio_user);
+
+        if (mute)
+                gpio_val = bttv_tvcards[btv->c.type].gpiomute;
+        else
+                gpio_val = bttv_tvcards[btv->c.type].gpiomux[input];
+
+        gpio_bits(bttv_tvcards[btv->c.type].gpiomask, gpio_val);
         if (bttv_gpio)
-                bttv_gpio_tracking(btv,audio_modes[mux]);
-        if (!in_interrupt())
-                bttv_call_i2c_clients(btv,AUDC_SET_INPUT,&(i2c_mux));
+                bttv_gpio_tracking(btv, audio_modes[mute ? 4 : input]);
+        if (in_interrupt())
+                return 0;
+
+        ctrl.id = V4L2_CID_AUDIO_MUTE;
+        ctrl.value = btv->mute;
+        bttv_call_i2c_clients(btv, VIDIOC_S_CTRL, &ctrl);
+        c = btv->i2c_msp34xx_client;
+        if (c) {
+                struct v4l2_routing route;
+
+                /* Note: the inputs tuner/radio/extern/intern are translated
+                   to msp routings. This assumes common behavior for all msp3400
+                   based TV cards. When this assumption fails, then the
+                   specific MSP routing must be added to the card table.
+                   For now this is sufficient. */
+                switch (input) {
+                case TVAUDIO_INPUT_RADIO:
+                        route.input = MSP_INPUT(MSP_IN_SCART_2, MSP_IN_TUNER_1,
+                                    MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART);
+                        break;
+                case TVAUDIO_INPUT_EXTERN:
+                        route.input = MSP_INPUT(MSP_IN_SCART_1, MSP_IN_TUNER_1,
+                                    MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART);
+                        break;
+                case TVAUDIO_INPUT_INTERN:
+                        /* Yes, this is the same input as for RADIO. I doubt
+                           if this is ever used. The only board with an INTERN
+                           input is the BTTV_BOARD_AVERMEDIA98. I wonder how
+                           that was tested. My guess is that the whole INTERN
+                           input does not work. */
+                        route.input = MSP_INPUT(MSP_IN_SCART_2, MSP_IN_TUNER_1,
+                                    MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART);
+                        break;
+                case TVAUDIO_INPUT_TUNER:
+                default:
+                        route.input = MSP_INPUT_DEFAULT;
+                        break;
+                }
+                route.output = MSP_OUTPUT_DEFAULT;
+                c->driver->command(c, VIDIOC_INT_S_AUDIO_ROUTING, &route);
+        }
+        c = btv->i2c_tvaudio_client;
+        if (c) {
+                struct v4l2_routing route;
+
+                route.input = input;
+                route.output = 0;
+                c->driver->command(c, VIDIOC_INT_S_AUDIO_ROUTING, &route);
+        }
         return 0;
 }
 
+static inline int
+audio_mute(struct bttv *btv, int mute)
+{
+        return audio_mux(btv, btv->audio, mute);
+}
+
+static inline int
+audio_input(struct bttv *btv, int input)
+{
+        return audio_mux(btv, input, btv->mute);
+}
+
 static void
 i2c_vidiocschan(struct bttv *btv)
 {
@@ -1023,8 +1078,8 @@ set_input(struct bttv *btv, unsigned int input)
         } else {
                 video_mux(btv,input);
         }
-        audio_mux(btv,(input == bttv_tvcards[btv->c.type].tuner ?
-                       AUDIO_TUNER : AUDIO_EXTERN));
+        audio_input(btv,(input == bttv_tvcards[btv->c.type].tuner ?
+                       TVAUDIO_INPUT_TUNER : TVAUDIO_INPUT_EXTERN));
         set_tvnorm(btv,btv->tvnorm);
         i2c_vidiocschan(btv);
 }
@@ -1236,10 +1291,10 @@ static int set_control(struct bttv *btv, struct v4l2_control *c)
         case V4L2_CID_AUDIO_MUTE:
                 if (c->value) {
                         va.flags |= VIDEO_AUDIO_MUTE;
-                        audio_mux(btv, AUDIO_MUTE);
+                        audio_mute(btv, 1);
                 } else {
                         va.flags &= ~VIDEO_AUDIO_MUTE;
-                        audio_mux(btv, AUDIO_UNMUTE);
+                        audio_mute(btv, 0);
                 }
                 break;
 
@@ -1397,7 +1452,7 @@ bttv_switch_overlay(struct bttv *btv, struct bttv_fh *fh,
                 free_btres(btv,fh,RESOURCE_OVERLAY);
         if (NULL != old) {
                 dprintk("switch_overlay: old=%p state is %d\n",old,old->vb.state);
-                bttv_dma_free(btv, old);
+                bttv_dma_free(&fh->cap,btv, old);
                 kfree(old);
         }
         dprintk("switch_overlay: done\n");
@@ -1407,7 +1462,8 @@ bttv_switch_overlay(struct bttv *btv, struct bttv_fh *fh,
 /* ----------------------------------------------------------------------- */
 /* video4linux (1) interface                                               */
 
-static int bttv_prepare_buffer(struct bttv *btv, struct bttv_buffer *buf,
+static int bttv_prepare_buffer(struct videobuf_queue *q,struct bttv *btv,
+                               struct bttv_buffer *buf,
                                const struct bttv_format *fmt,
                                unsigned int width, unsigned int height,
                                enum v4l2_field field)
@@ -1450,7 +1506,7 @@ static int bttv_prepare_buffer(struct bttv *btv, struct bttv_buffer *buf,
         /* alloc risc memory */
         if (STATE_NEEDS_INIT == buf->vb.state) {
                 redo_dma_risc = 1;
-                if (0 != (rc = videobuf_iolock(btv->c.pci,&buf->vb,&btv->fbuf)))
+                if (0 != (rc = videobuf_iolock(q,&buf->vb,&btv->fbuf)))
                         goto fail;
         }
 
@@ -1462,7 +1518,7 @@ static int bttv_prepare_buffer(struct bttv *btv, struct bttv_buffer *buf,
         return 0;
 
  fail:
-        bttv_dma_free(btv,buf);
+        bttv_dma_free(q,btv,buf);
         return rc;
 }
 
@@ -1486,7 +1542,7 @@ buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
         struct bttv_buffer *buf = container_of(vb,struct bttv_buffer,vb);
         struct bttv_fh *fh = q->priv_data;
 
-        return bttv_prepare_buffer(fh->btv, buf, fh->fmt,
+        return bttv_prepare_buffer(q,fh->btv, buf, fh->fmt,
                                    fh->width, fh->height, field);
 }
 
@@ -1510,7 +1566,7 @@ static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
         struct bttv_buffer *buf = container_of(vb,struct bttv_buffer,vb);
         struct bttv_fh *fh = q->priv_data;
 
-        bttv_dma_free(fh->btv,buf);
+        bttv_dma_free(&fh->cap,fh->btv,buf);
 }
 
 static struct videobuf_queue_ops bttv_video_qops = {
@@ -1653,7 +1709,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
                         return -EINVAL;
 
                 mutex_lock(&btv->lock);
-                audio_mux(btv, (v->flags&VIDEO_AUDIO_MUTE) ? AUDIO_MUTE : AUDIO_UNMUTE);
+                audio_mute(btv, (v->flags&VIDEO_AUDIO_MUTE) ? 1 : 0);
                 bttv_call_i2c_clients(btv,cmd,v);
 
                 /* card specific hooks */
@@ -1822,7 +1878,8 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
                         bttv_call_i2c_clients(btv, VIDIOCGAUDIO, &va);
                         if (t->audmode == V4L2_TUNER_MODE_MONO)
                                 va.mode = VIDEO_SOUND_MONO;
-                        else if (t->audmode == V4L2_TUNER_MODE_STEREO)
+                        else if (t->audmode == V4L2_TUNER_MODE_STEREO ||
+                                 t->audmode == V4L2_TUNER_MODE_LANG1_LANG2)
                                 va.mode = VIDEO_SOUND_STEREO;
                         else if (t->audmode == V4L2_TUNER_MODE_LANG1)
                                 va.mode = VIDEO_SOUND_LANG1;
@@ -2496,7 +2553,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                 field = (vm->height > bttv_tvnorms[btv->tvnorm].sheight/2)
                         ? V4L2_FIELD_INTERLACED
                         : V4L2_FIELD_BOTTOM;
-                retval = bttv_prepare_buffer(btv,buf,
+                retval = bttv_prepare_buffer(&fh->cap,btv,buf,
                                              format_by_palette(vm->format),
                                              vm->width,vm->height,field);
                 if (0 != retval)
@@ -2528,8 +2585,8 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                         retval = -EIO;
                         /* fall through */
                 case STATE_DONE:
-                        videobuf_dma_pci_sync(btv->c.pci,&buf->vb.dma);
-                        bttv_dma_free(btv,buf);
+                        videobuf_dma_sync(&fh->cap,&buf->vb.dma);
+                        bttv_dma_free(&fh->cap,btv,buf);
                         break;
                 default:
                         retval = -EINVAL;
@@ -3162,8 +3219,8 @@ static int radio_open(struct inode *inode, struct file *file)
 
         file->private_data = btv;
 
-        bttv_call_i2c_clients(btv,AUDC_SET_RADIO,&btv->tuner_type);
-        audio_mux(btv,AUDIO_RADIO);
+        bttv_call_i2c_clients(btv,AUDC_SET_RADIO,NULL);
+        audio_input(btv,TVAUDIO_INPUT_RADIO);
 
         mutex_unlock(&btv->lock);
         return 0;
@@ -3749,7 +3806,7 @@ static irqreturn_t bttv_irq(int irq, void *dev_id, struct pt_regs * regs)
                         bttv_irq_switch_video(btv);
 
                 if ((astat & BT848_INT_HLOCK)  &&  btv->opt_automute)
-                        audio_mux(btv, -1);
+                        audio_mute(btv, btv->mute);  /* trigger automute */
 
                 if (astat & (BT848_INT_SCERR|BT848_INT_OCERR)) {
                         printk(KERN_INFO "bttv%d: %s%s @ %08x,",btv->c.nr,
@@ -4050,7 +4107,7 @@ static int __devinit bttv_probe(struct pci_dev *dev,
                 bt848_contrast(btv,32768);
                 bt848_hue(btv,32768);
                 bt848_sat(btv,32768);
-                audio_mux(btv,AUDIO_MUTE);
+                audio_mute(btv, 1);
                 set_input(btv,0);
         }
 
diff --git a/drivers/media/video/bttv-gpio.c b/drivers/media/video/bt8xx/bttv-gpio.c
index c4d5e2b70c..c4d5e2b70c 100644
--- a/drivers/media/video/bttv-gpio.c
+++ b/drivers/media/video/bt8xx/bttv-gpio.c
diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bt8xx/bttv-i2c.c
index 614c120185..4b562b386f 100644
--- a/drivers/media/video/bttv-i2c.c
+++ b/drivers/media/video/bt8xx/bttv-i2c.c
@@ -302,6 +302,10 @@ static int attach_inform(struct i2c_client *client)
         if (!client->driver->command)
                 return 0;
 
+        if (client->driver->id == I2C_DRIVERID_MSP3400)
+                btv->i2c_msp34xx_client = client;
+        if (client->driver->id == I2C_DRIVERID_TVAUDIO)
+                btv->i2c_tvaudio_client = client;
         if (btv->tuner_type != UNSET) {
                 struct tuner_setup tun_setup;
 
diff --git a/drivers/media/video/bttv-if.c b/drivers/media/video/bt8xx/bttv-if.c
index 19b564ab0e..19b564ab0e 100644
--- a/drivers/media/video/bttv-if.c
+++ b/drivers/media/video/bt8xx/bttv-if.c
diff --git a/drivers/media/video/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index 69efa0e517..69efa0e517 100644
--- a/drivers/media/video/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
diff --git a/drivers/media/video/bttv-risc.c b/drivers/media/video/bt8xx/bttv-risc.c
index 344f84e9af..16323a5d68 100644
--- a/drivers/media/video/bttv-risc.c
+++ b/drivers/media/video/bt8xx/bttv-risc.c
@@ -509,11 +509,11 @@ bttv_risc_hook(struct bttv *btv, int slot, struct btcx_riscmem *risc,
 }
 
 void
-bttv_dma_free(struct bttv *btv, struct bttv_buffer *buf)
+bttv_dma_free(struct videobuf_queue *q,struct bttv *btv, struct bttv_buffer *buf)
 {
         BUG_ON(in_interrupt());
         videobuf_waiton(&buf->vb,0,0);
-        videobuf_dma_pci_unmap(btv->c.pci, &buf->vb.dma);
+        videobuf_dma_unmap(q, &buf->vb.dma);
         videobuf_dma_free(&buf->vb.dma);
         btcx_riscmem_free(btv->c.pci,&buf->bottom);
         btcx_riscmem_free(btv->c.pci,&buf->top);
diff --git a/drivers/media/video/bttv-vbi.c b/drivers/media/video/bt8xx/bttv-vbi.c
index 72afdd64b8..e20ff238e4 100644
--- a/drivers/media/video/bttv-vbi.c
+++ b/drivers/media/video/bt8xx/bttv-vbi.c
@@ -96,7 +96,7 @@ static int vbi_buffer_prepare(struct videobuf_queue *q,
                 return -EINVAL;
 
         if (STATE_NEEDS_INIT == buf->vb.state) {
-                if (0 != (rc = videobuf_iolock(btv->c.pci, &buf->vb, NULL)))
+                if (0 != (rc = videobuf_iolock(q, &buf->vb, NULL)))
                         goto fail;
                 if (0 != (rc = vbi_buffer_risc(btv,buf,fh->lines)))
                         goto fail;
@@ -109,7 +109,7 @@ static int vbi_buffer_prepare(struct videobuf_queue *q,
         return 0;
 
  fail:
-        bttv_dma_free(btv,buf);
+        bttv_dma_free(q,btv,buf);
         return rc;
 }
 
@@ -136,7 +136,7 @@ static void vbi_buffer_release(struct videobuf_queue *q, struct videobuf_buffer
         struct bttv_buffer *buf = container_of(vb,struct bttv_buffer,vb);
 
         dprintk("free %p\n",vb);
-        bttv_dma_free(fh->btv,buf);
+        bttv_dma_free(&fh->cap,fh->btv,buf);
 }
 
 struct videobuf_queue_ops bttv_vbi_qops = {
diff --git a/drivers/media/video/bttv.h b/drivers/media/video/bt8xx/bttv.h
index 9908c8e0c9..3a23265c15 100644
--- a/drivers/media/video/bttv.h
+++ b/drivers/media/video/bt8xx/bttv.h
@@ -18,6 +18,7 @@
 #include <linux/i2c.h>
 #include <media/ir-common.h>
 #include <media/ir-kbd-i2c.h>
+#include <media/i2c-addr.h>
 
 /* ---------------------------------------------------------- */
 /* exported by bttv-cards.c                                   */
@@ -168,25 +169,6 @@
 #define BTTV_BOARD_HAUPPAUGE_IMPACTVCB     0x8f
 #define BTTV_BOARD_MACHTV_MAGICTV          0x90
 
-/* i2c address list */
-#define I2C_TSA5522        0xc2
-#define I2C_TDA7432        0x8a
-#define I2C_BT832_ALT1     0x88
-#define I2C_BT832_ALT2     0x8a // alternate setting
-#define I2C_TDA8425        0x82
-#define I2C_TDA9840        0x84
-#define I2C_TDA9850        0xb6 /* also used by 9855,9873 */
-#define I2C_TDA9874        0xb0 /* also used by 9875 */
-#define I2C_TDA9875        0xb0
-#define I2C_HAUPEE         0xa0
-#define I2C_STBEE          0xae
-#define I2C_VHX            0xc0
-#define I2C_MSP3400        0x80
-#define I2C_MSP3400_ALT    0x88
-#define I2C_TEA6300        0x80 /* also used by 6320 */
-#define I2C_DPL3518        0x84
-#define I2C_TDA9887        0x86
-
 /* more card-specific defines */
 #define PT2254_L_CHANNEL 0x10
 #define PT2254_R_CHANNEL 0x08
@@ -252,7 +234,8 @@ struct tvcard
         unsigned int digital_mode; // DIGITAL_MODE_CAMERA or DIGITAL_MODE_VIDEO
         u32 gpiomask;
         u32 muxsel[16];
-        u32 audiomux[6]; /* Tuner, Radio, external, internal, mute, stereo */
+        u32 gpiomux[4];  /* Tuner, Radio, external, internal */
+        u32 gpiomute;    /* GPIO mute setting */
         u32 gpiomask2;   /* GPIO MUX mask */
 
         /* i2c audio flags */
diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index 9cb72f176f..ee989d2e15 100644
--- a/drivers/media/video/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -41,7 +41,6 @@
 
 #include <linux/device.h>
 #include <media/video-buf.h>
-#include <media/audiochip.h>
 #include <media/tuner.h>
 #include <media/tveeprom.h>
 #include <media/ir-common.h>
@@ -190,7 +189,8 @@ int bttv_buffer_activate_video(struct bttv *btv,
                                struct bttv_buffer_set *set);
 int bttv_buffer_activate_vbi(struct bttv *btv,
                              struct bttv_buffer *vbi);
-void bttv_dma_free(struct bttv *btv, struct bttv_buffer *buf);
+void bttv_dma_free(struct videobuf_queue *q, struct bttv *btv,
+                   struct bttv_buffer *buf);
 
 /* overlay handling */
 int bttv_overlay_risc(struct bttv *btv, struct bttv_overlay *ov,
@@ -298,6 +298,8 @@ struct bttv {
         int                        i2c_state, i2c_rc;
         int                        i2c_done;
         wait_queue_head_t          i2c_queue;
+        struct i2c_client         *i2c_msp34xx_client;
+        struct i2c_client         *i2c_tvaudio_client;
 
         /* video4linux (1) */
         struct video_device *video_dev;
@@ -320,6 +322,7 @@ struct bttv {
         /* video state */
         unsigned int input;
         unsigned int audio;
+        unsigned int mute;
         unsigned long freq;
         int tvnorm,hue,contrast,bright,saturation;
         struct v4l2_framebuffer fbuf;
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c
index d97b7d8ac3..cf61c590f4 100644
--- a/drivers/media/video/bw-qcam.c
+++ b/drivers/media/video/bw-qcam.c
@@ -150,7 +150,7 @@ static int qc_calibrate(struct qcam_device *q)
 static struct qcam_device *qcam_init(struct parport *port)
 {
         struct qcam_device *q;
-        
+
         q = kmalloc(sizeof(struct qcam_device), GFP_KERNEL);
         if(q==NULL)
                 return NULL;
@@ -158,16 +158,16 @@ static struct qcam_device *qcam_init(struct parport *port)
         q->pport = port;
         q->pdev = parport_register_device(port, "bw-qcam", NULL, NULL,
                                           NULL, 0, NULL);
-        if (q->pdev == NULL) 
+        if (q->pdev == NULL)
         {
                 printk(KERN_ERR "bw-qcam: couldn't register for %s.\n",
                        port->name);
                 kfree(q);
                 return NULL;
         }
-        
+
         memcpy(&q->vdev, &qcam_template, sizeof(qcam_template));
-        
+
         mutex_init(&q->lock);
 
         q->port_mode = (QC_ANY | QC_NOTSET);
@@ -236,12 +236,12 @@ static int qc_waithand(struct qcam_device *q, int val)
                 while (!((status = read_lpstatus(q)) & 8))
                 {
                         /* 1000 is enough spins on the I/O for all normal
-                           cases, at that point we start to poll slowly 
+                           cases, at that point we start to poll slowly
                            until the camera wakes up. However, we are
                            busy blocked until the camera responds, so
                            setting it lower is much better for interactive
                            response. */
-                           
+
                         if(runs++>maxpoll)
                         {
                                 msleep_interruptible(5);
@@ -255,12 +255,12 @@ static int qc_waithand(struct qcam_device *q, int val)
                 while (((status = read_lpstatus(q)) & 8))
                 {
                         /* 1000 is enough spins on the I/O for all normal
-                           cases, at that point we start to poll slowly 
+                           cases, at that point we start to poll slowly
                            until the camera wakes up. However, we are
                            busy blocked until the camera responds, so
                            setting it lower is much better for interactive
                            response. */
-                           
+
                         if(runs++>maxpoll)
                         {
                                 msleep_interruptible(5);
@@ -282,17 +282,17 @@ static unsigned int qc_waithand2(struct qcam_device *q, int val)
 {
         unsigned int status;
         int runs=0;
-        
-        do 
+
+        do
         {
                 status = read_lpdata(q);
                 /* 1000 is enough spins on the I/O for all normal
-                   cases, at that point we start to poll slowly 
+                   cases, at that point we start to poll slowly
                    until the camera wakes up. However, we are
                    busy blocked until the camera responds, so
                    setting it lower is much better for interactive
                    response. */
-                   
+
                 if(runs++>maxpoll)
                 {
                         msleep_interruptible(5);
@@ -321,7 +321,7 @@ static int qc_detect(struct qcam_device *q)
 
         lastreg = reg = read_lpstatus(q) & 0xf0;
 
-        for (i = 0; i < 500; i++) 
+        for (i = 0; i < 500; i++)
         {
                 reg = read_lpstatus(q) & 0xf0;
                 if (reg != lastreg)
@@ -357,7 +357,7 @@ static int qc_detect(struct qcam_device *q)
 
 static void qc_reset(struct qcam_device *q)
 {
-        switch (q->port_mode & QC_FORCE_MASK) 
+        switch (q->port_mode & QC_FORCE_MASK)
         {
                 case QC_FORCE_UNIDIR:
                         q->port_mode = (q->port_mode & ~QC_MODE_MASK) | QC_UNIDIR;
@@ -370,7 +370,7 @@ static void qc_reset(struct qcam_device *q)
                 case QC_ANY:
                         write_lpcontrol(q, 0x20);
                         write_lpdata(q, 0x75);
-        
+
                         if (read_lpdata(q) != 0x75) {
                                 q->port_mode = (q->port_mode & ~QC_MODE_MASK) | QC_BIDIR;
                         } else {
@@ -398,8 +398,8 @@ static void qc_reset(struct qcam_device *q)
 static int qc_setscanmode(struct qcam_device *q)
 {
         int old_mode = q->mode;
-        
-        switch (q->transfer_scale) 
+
+        switch (q->transfer_scale)
         {
                 case 1:
                         q->mode = 0;
@@ -412,7 +412,7 @@ static int qc_setscanmode(struct qcam_device *q)
                         break;
         }
 
-        switch (q->bpp) 
+        switch (q->bpp)
         {
                 case 4:
                         break;
@@ -421,7 +421,7 @@ static int qc_setscanmode(struct qcam_device *q)
                         break;
         }
 
-        switch (q->port_mode & QC_MODE_MASK) 
+        switch (q->port_mode & QC_MODE_MASK)
         {
                 case QC_BIDIR:
                         q->mode += 1;
@@ -430,10 +430,10 @@ static int qc_setscanmode(struct qcam_device *q)
                 case QC_UNIDIR:
                         break;
         }
-        
+
         if (q->mode != old_mode)
                 q->status |= QC_PARAM_CHANGE;
-        
+
         return 0;
 }
 
@@ -451,7 +451,7 @@ static void qc_set(struct qcam_device *q)
         /* Set the brightness.  Yes, this is repetitive, but it works.
          * Shorter versions seem to fail subtly.  Feel free to try :-). */
         /* I think the problem was in qc_command, not here -- bls */
-        
+
         qc_command(q, 0xb);
         qc_command(q, q->brightness);
 
@@ -502,13 +502,13 @@ static inline int qc_readbytes(struct qcam_device *q, char buffer[])
         unsigned int hi2, lo2;
         static int state = 0;
 
-        if (buffer == NULL) 
+        if (buffer == NULL)
         {
                 state = 0;
                 return 0;
         }
-        
-        switch (q->port_mode & QC_MODE_MASK) 
+
+        switch (q->port_mode & QC_MODE_MASK)
         {
                 case QC_BIDIR:          /* Bi-directional Port */
                         write_lpcontrol(q, 0x26);
@@ -517,7 +517,7 @@ static inline int qc_readbytes(struct qcam_device *q, char buffer[])
                         write_lpcontrol(q, 0x2e);
                         lo2 = (qc_waithand2(q, 0) >> 1);
                         hi2 = (read_lpstatus(q) >> 3) & 0x1f;
-                        switch (q->bpp) 
+                        switch (q->bpp)
                         {
                                 case 4:
                                         buffer[0] = lo & 0xf;
@@ -544,7 +544,7 @@ static inline int qc_readbytes(struct qcam_device *q, char buffer[])
                         write_lpcontrol(q, 0xe);
                         hi = (qc_waithand(q, 0) & 0xf0) >> 4;
 
-                        switch (q->bpp) 
+                        switch (q->bpp)
                         {
                                 case 4:
                                         buffer[0] = lo;
@@ -552,7 +552,7 @@ static inline int qc_readbytes(struct qcam_device *q, char buffer[])
                                         ret = 2;
                                         break;
                                 case 6:
-                                        switch (state) 
+                                        switch (state)
                                         {
                                                 case 0:
                                                         buffer[0] = (lo << 2) | ((hi & 0xc) >> 2);
@@ -604,13 +604,13 @@ static long qc_capture(struct qcam_device * q, char __user *buf, unsigned long l
         int  shift=8-q->bpp;
         char invert;
 
-        if (q->mode == -1) 
+        if (q->mode == -1)
                 return -ENXIO;
 
         qc_command(q, 0x7);
         qc_command(q, q->mode);
 
-        if ((q->port_mode & QC_MODE_MASK) == QC_BIDIR) 
+        if ((q->port_mode & QC_MODE_MASK) == QC_BIDIR)
         {
                 write_lpcontrol(q, 0x2e);       /* turn port around */
                 write_lpcontrol(q, 0x26);
@@ -618,7 +618,7 @@ static long qc_capture(struct qcam_device * q, char __user *buf, unsigned long l
                 write_lpcontrol(q, 0x2e);
                 (void) qc_waithand(q, 0);
         }
-        
+
         /* strange -- should be 15:63 below, but 4bpp is odd */
         invert = (q->bpp == 4) ? 16 : 63;
 
@@ -629,15 +629,15 @@ static long qc_capture(struct qcam_device * q, char __user *buf, unsigned long l
             q->transfer_scale;
         transperline = (transperline + divisor - 1) / divisor;
 
-        for (i = 0, yield = yieldlines; i < linestotrans; i++) 
+        for (i = 0, yield = yieldlines; i < linestotrans; i++)
         {
-                for (pixels_read = j = 0; j < transperline; j++) 
+                for (pixels_read = j = 0; j < transperline; j++)
                 {
                         bytes = qc_readbytes(q, buffer);
-                        for (k = 0; k < bytes && (pixels_read + k) < pixels_per_line; k++) 
+                        for (k = 0; k < bytes && (pixels_read + k) < pixels_per_line; k++)
                         {
                                 int o;
-                                if (buffer[k] == 0 && invert == 16) 
+                                if (buffer[k] == 0 && invert == 16)
                                 {
                                         /* 4bpp is odd (again) -- inverter is 16, not 15, but output
                                            must be 0-15 -- bls */
@@ -653,7 +653,7 @@ static long qc_capture(struct qcam_device * q, char __user *buf, unsigned long l
                         pixels_read += bytes;
                 }
                 (void) qc_readbytes(q, NULL);   /* reset state machine */
-                
+
                 /* Grabbing an entire frame from the quickcam is a lengthy
                    process. We don't (usually) want to busy-block the
                    processor for the entire frame. yieldlines is a module
@@ -666,7 +666,7 @@ static long qc_capture(struct qcam_device * q, char __user *buf, unsigned long l
                 }
         }
 
-        if ((q->port_mode & QC_MODE_MASK) == QC_BIDIR) 
+        if ((q->port_mode & QC_MODE_MASK) == QC_BIDIR)
         {
                 write_lpcontrol(q, 2);
                 write_lpcontrol(q, 6);
@@ -687,7 +687,7 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file,
 {
         struct video_device *dev = video_devdata(file);
         struct qcam_device *qcam=(struct qcam_device *)dev;
-        
+
         switch(cmd)
         {
                 case VIDIOCGCAP:
@@ -762,7 +762,7 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file,
                                 return -EINVAL;
                         if(p->depth!=4 && p->depth!=6)
                                 return -EINVAL;
-                        
+
                         /*
                          *      Now load the camera.
                          */
@@ -790,11 +790,11 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file,
                                 return -EINVAL;
                         if(vw->width<80||vw->width>320)
                                 return -EINVAL;
-                                
+
                         qcam->width = 320;
                         qcam->height = 240;
                         qcam->transfer_scale = 4;
-                        
+
                         if(vw->width>=160 && vw->height>=120)
                         {
                                 qcam->transfer_scale = 2;
@@ -808,11 +808,11 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file,
                         mutex_lock(&qcam->lock);
                         qc_setscanmode(qcam);
                         mutex_unlock(&qcam->lock);
-                        
+
                         /* We must update the camera before we grab. We could
                            just have changed the grab size */
                         qcam->status |= QC_PARAM_CHANGE;
-                        
+
                         /* Ok we figured out what to use from our wide choice */
                         return 0;
                 }
@@ -853,9 +853,9 @@ static ssize_t qcam_read(struct file *file, char __user *buf,
         struct qcam_device *qcam=(struct qcam_device *)v;
         int len;
         parport_claim_or_block(qcam->pdev);
-        
+
         mutex_lock(&qcam->lock);
-        
+
         qc_reset(qcam);
 
         /* Update the camera parameters if we need to */
@@ -863,13 +863,13 @@ static ssize_t qcam_read(struct file *file, char __user *buf,
                 qc_set(qcam);
 
         len=qc_capture(qcam, buf,count);
-        
+
         mutex_unlock(&qcam->lock);
-        
+
         parport_release(qcam->pdev);
         return len;
 }
- 
+
 static struct file_operations qcam_fops = {
         .owner          = THIS_MODULE,
         .open           = video_exclusive_open,
@@ -905,11 +905,11 @@ static int init_bwqcam(struct parport *port)
         qcam=qcam_init(port);
         if(qcam==NULL)
                 return -ENODEV;
-                
+
         parport_claim_or_block(qcam->pdev);
 
         qc_reset(qcam);
-        
+
         if(qc_detect(qcam)==0)
         {
                 parport_release(qcam->pdev);
@@ -920,9 +920,9 @@ static int init_bwqcam(struct parport *port)
         qc_calibrate(qcam);
 
         parport_release(qcam->pdev);
-        
+
         printk(KERN_INFO "Connectix Quickcam on %s\n", qcam->pport->name);
-        
+
         if(video_register_device(&qcam->vdev, VFL_TYPE_GRABBER, video_nr)==-1)
         {
                 parport_unregister_device(qcam->pdev);
@@ -1013,7 +1013,7 @@ static int __init init_bw_qcams(void)
                 printk("Connectix Quickcam max-poll was above 5000. Using 5000.\n");
                 maxpoll = 5000;
         }
-        
+
         if (yieldlines < 1) {
                 printk("Connectix Quickcam yieldlines was less than 1. Using 1.\n");
                 yieldlines = 1;
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c
index 8211fd8d7c..22a7386bbe 100644
--- a/drivers/media/video/c-qcam.c
+++ b/drivers/media/video/c-qcam.c
@@ -16,7 +16,7 @@
  *
  * The parport parameter controls which parports will be scanned.
  * Scanning all parports causes some printers to print a garbage page.
- *       -- March 14, 1999  Billy Donahue <billy@escape.com> 
+ *       -- March 14, 1999  Billy Donahue <billy@escape.com>
  *
  * Fixed data format to BGR, added force_rgb parameter. Added missing
  * parport_unregister_driver() on module removal.
@@ -88,7 +88,7 @@ static inline unsigned int qcam_ready2(struct qcam_device *qcam)
         return (parport_read_data(qcam->pport) & 0x1)?1:0;
 }
 
-static unsigned int qcam_await_ready1(struct qcam_device *qcam, 
+static unsigned int qcam_await_ready1(struct qcam_device *qcam,
                                              int value)
 {
         unsigned long oldjiffies = jiffies;
@@ -98,7 +98,7 @@ static unsigned int qcam_await_ready1(struct qcam_device *qcam,
                 if (qcam_ready1(qcam) == value)
                         return 0;
 
-        /* If the camera didn't respond within 1/25 second, poll slowly 
+        /* If the camera didn't respond within 1/25 second, poll slowly
            for a while. */
         for (i = 0; i < 50; i++)
         {
@@ -123,7 +123,7 @@ static unsigned int qcam_await_ready2(struct qcam_device *qcam, int value)
                 if (qcam_ready2(qcam) == value)
                         return 0;
 
-        /* If the camera didn't respond within 1/25 second, poll slowly 
+        /* If the camera didn't respond within 1/25 second, poll slowly
            for a while. */
         for (i = 0; i < 50; i++)
         {
@@ -157,12 +157,12 @@ static int qcam_write_data(struct qcam_device *qcam, unsigned int data)
         unsigned int idata;
         parport_write_data(qcam->pport, data);
         idata = qcam_read_data(qcam);
-        if (data != idata) 
+        if (data != idata)
         {
-                printk(KERN_WARNING "cqcam: sent %x but received %x\n", data, 
+                printk(KERN_WARNING "cqcam: sent %x but received %x\n", data,
                        idata);
                 return 1;
-        } 
+        }
         return 0;
 }
 
@@ -193,12 +193,12 @@ static int qc_detect(struct qcam_device *qcam)
            no device was found".  Fix this one day. */
         if (qcam->pport->probe_info[0].class == PARPORT_CLASS_MEDIA
             && qcam->pport->probe_info[0].model
-            && !strcmp(qcam->pdev->port->probe_info[0].model, 
+            && !strcmp(qcam->pdev->port->probe_info[0].model,
                        "Color QuickCam 2.0")) {
                 printk(KERN_DEBUG "QuickCam: Found by IEEE1284 probe.\n");
                 return 1;
         }
-        
+
         if (probe < 2)
                 return 0;
 
@@ -206,11 +206,11 @@ static int qc_detect(struct qcam_device *qcam)
 
         /* look for a heartbeat */
         ostat = stat = parport_read_status(qcam->pport);
-        for (i=0; i<250; i++) 
+        for (i=0; i<250; i++)
         {
                 mdelay(1);
                 stat = parport_read_status(qcam->pport);
-                if (ostat != stat) 
+                if (ostat != stat)
                 {
                         if (++count >= 3) return 1;
                         ostat = stat;
@@ -226,11 +226,11 @@ static int qc_detect(struct qcam_device *qcam)
         count = 0;
 
         ostat = stat = parport_read_status(qcam->pport);
-        for (i=0; i<250; i++) 
+        for (i=0; i<250; i++)
         {
                 mdelay(1);
                 stat = parport_read_status(qcam->pport);
-                if (ostat != stat) 
+                if (ostat != stat)
                 {
                         if (++count >= 3) return 1;
                         ostat = stat;
@@ -247,7 +247,7 @@ static void qc_reset(struct qcam_device *qcam)
         parport_write_control(qcam->pport, 0x8);
         mdelay(1);
         parport_write_control(qcam->pport, 0xc);
-        mdelay(1);          
+        mdelay(1);
 }
 
 /* Reset the QuickCam and program for brightness, contrast,
@@ -258,7 +258,7 @@ static void qc_setup(struct qcam_device *q)
         qc_reset(q);
 
         /* Set the brightness.  */
-        qcam_set(q, 11, q->brightness);
+        qcam_set(q, 11, q->brightness);
 
         /* Set the height and width.  These refer to the actual
            CCD area *before* applying the selected decimation.  */
@@ -272,12 +272,12 @@ static void qc_setup(struct qcam_device *q)
         /* Set contrast and white balance.  */
         qcam_set(q, 0x19, q->contrast);
         qcam_set(q, 0x1f, q->whitebal);
-        
+
         /* Set the speed.  */
         qcam_set(q, 45, 2);
 }
 
-/* Read some bytes from the camera and put them in the buffer. 
+/* Read some bytes from the camera and put them in the buffer.
    nbytes should be a multiple of 3, because bidirectional mode gives
    us three bytes at a time.  */
 
@@ -383,7 +383,7 @@ static long qc_capture(struct qcam_device *q, char __user *buf, unsigned long le
 
         if (qcam_set(q, 7, (q->mode | (is_bi_dir?1:0)) + 1))
                 return -EIO;
-        
+
         lines = q->height;
         pixelsperline = q->width;
         bitsperxfer = (is_bi_dir) ? 24 : 8;
@@ -499,7 +499,7 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file,
 {
         struct video_device *dev = video_devdata(file);
         struct qcam_device *qcam=(struct qcam_device *)dev;
-        
+
         switch(cmd)
         {
                 case VIDIOCGCAP:
@@ -574,7 +574,7 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file,
                          */
                         if (p->depth != 24 || p->palette != VIDEO_PALETTE_RGB24)
                                 return -EINVAL;
-                        
+
                         /*
                          *      Now load the camera.
                          */
@@ -584,7 +584,7 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file,
 
                         mutex_lock(&qcam->lock);
                         parport_claim_or_block(qcam->pdev);
-                        qc_setup(qcam); 
+                        qc_setup(qcam);
                         parport_release(qcam->pdev);
                         mutex_unlock(&qcam->lock);
                         return 0;
@@ -601,11 +601,11 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file,
                                 return -EINVAL;
                         if(vw->width<80||vw->width>320)
                                 return -EINVAL;
-                                
+
                         qcam->width = 80;
                         qcam->height = 60;
                         qcam->mode = QC_DECIMATION_4;
-                        
+
                         if(vw->width>=160 && vw->height>=120)
                         {
                                 qcam->width = 160;
@@ -627,7 +627,7 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file,
                                 qcam->mode = QC_BILLIONS | QC_DECIMATION_1;
                         }
 #endif
-                        /* Ok we figured out what to use from our 
+                        /* Ok we figured out what to use from our
                            wide choice */
                         mutex_lock(&qcam->lock);
                         parport_claim_or_block(qcam->pdev);
@@ -676,7 +676,7 @@ static ssize_t qcam_read(struct file *file, char __user *buf,
         mutex_lock(&qcam->lock);
         parport_claim_or_block(qcam->pdev);
         /* Probably should have a semaphore against multiple users */
-        len = qc_capture(qcam, buf,count); 
+        len = qc_capture(qcam, buf,count);
         parport_release(qcam->pdev);
         mutex_unlock(&qcam->lock);
         return len;
@@ -707,7 +707,7 @@ static struct video_device qcam_template=
 static struct qcam_device *qcam_init(struct parport *port)
 {
         struct qcam_device *q;
-        
+
         q = kmalloc(sizeof(struct qcam_device), GFP_KERNEL);
         if(q==NULL)
                 return NULL;
@@ -718,14 +718,14 @@ static struct qcam_device *qcam_init(struct parport *port)
 
         q->bidirectional = (q->pport->modes & PARPORT_MODE_TRISTATE)?1:0;
 
-        if (q->pdev == NULL) 
+        if (q->pdev == NULL)
         {
                 printk(KERN_ERR "c-qcam: couldn't register for %s.\n",
                        port->name);
                 kfree(q);
                 return NULL;
         }
-        
+
         memcpy(&q->vdev, &qcam_template, sizeof(qcam_template));
 
         mutex_init(&q->lock);
@@ -766,11 +766,11 @@ static int init_cqcam(struct parport *port)
         qcam = qcam_init(port);
         if (qcam==NULL)
                 return -ENODEV;
-                
+
         parport_claim_or_block(qcam->pdev);
 
         qc_reset(qcam);
-        
+
         if (probe && qc_detect(qcam)==0)
         {
                 parport_release(qcam->pdev);
@@ -782,7 +782,7 @@ static int init_cqcam(struct parport *port)
         qc_setup(qcam);
 
         parport_release(qcam->pdev);
-        
+
         if (video_register_device(&qcam->vdev, VFL_TYPE_GRABBER, video_nr)==-1)
         {
                 printk(KERN_ERR "Unable to register Colour QuickCam on %s\n",
@@ -792,9 +792,9 @@ static int init_cqcam(struct parport *port)
                 return -ENODEV;
         }
 
-        printk(KERN_INFO "video%d: Colour QuickCam found on %s\n", 
+        printk(KERN_INFO "video%d: Colour QuickCam found on %s\n",
                qcam->vdev.minor, qcam->pport->name);
-        
+
         qcams[num_cams++] = qcam;
 
         return 0;
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index 3cebfa91ca..2227c5640c 100644
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
@@ -24,7 +24,7 @@
  */
 
 /* define _CPIA_DEBUG_ for verbose debug output (see cpia.h) */
-/* #define _CPIA_DEBUG_  1 */  
+/* #define _CPIA_DEBUG_  1 */
 
 #include <linux/config.h>
 
@@ -67,11 +67,11 @@ MODULE_SUPPORTED_DEVICE("video");
 static unsigned short colorspace_conv = 0;
 module_param(colorspace_conv, ushort, 0444);
 MODULE_PARM_DESC(colorspace_conv,
-                 "\n<n> Colorspace conversion:"
-                 "\n0 = disable"
-                 "\n1 = enable"
-                 "\nDefault value is 0"
-                 "\n");
+                 "\n<n> Colorspace conversion:"
+                 "\n0 = disable"
+                 "\n1 = enable"
+                 "\nDefault value is 0"
+                 "\n");
 
 #define ABOUT "V4L-Driver for Vision CPiA based cameras"
 
@@ -189,8 +189,8 @@ enum {
 #define TC             94
 #define EXP_ACC_DARK   50
 #define EXP_ACC_LIGHT  90
-#define HIGH_COMP_102 160               
-#define MAX_COMP      239               
+#define HIGH_COMP_102 160
+#define MAX_COMP      239
 #define DARK_TIME       3
 #define LIGHT_TIME      3
 
@@ -208,7 +208,7 @@ static u8 flicker_jumps[2][2][4] =
 static void reset_camera_struct(struct cam_data *cam);
 static int find_over_exposure(int brightness);
 static void set_flicker(struct cam_params *params, volatile u32 *command_flags,
-                        int on);
+                        int on);
 
 
 /**********************************************************************
@@ -262,7 +262,7 @@ static void rvfree(void *mem, unsigned long size)
 static struct proc_dir_entry *cpia_proc_root=NULL;
 
 static int cpia_read_proc(char *page, char **start, off_t off,
-                          int count, int *eof, void *data)
+                          int count, int *eof, void *data)
 {
         char *out = page;
         int len, tmp;
@@ -276,58 +276,58 @@ static int cpia_read_proc(char *page, char **start, off_t off,
         out += sprintf(out, "V4L Driver version:       %d.%d.%d\n",
                        CPIA_MAJ_VER, CPIA_MIN_VER, CPIA_PATCH_VER);
         out += sprintf(out, "CPIA Version:             %d.%02d (%d.%d)\n",
-                       cam->params.version.firmwareVersion,
-                       cam->params.version.firmwareRevision,
-                       cam->params.version.vcVersion,
-                       cam->params.version.vcRevision);
+                       cam->params.version.firmwareVersion,
+                       cam->params.version.firmwareRevision,
+                       cam->params.version.vcVersion,
+                       cam->params.version.vcRevision);
         out += sprintf(out, "CPIA PnP-ID:              %04x:%04x:%04x\n",
-                       cam->params.pnpID.vendor, cam->params.pnpID.product,
-                       cam->params.pnpID.deviceRevision);
+                       cam->params.pnpID.vendor, cam->params.pnpID.product,
+                       cam->params.pnpID.deviceRevision);
         out += sprintf(out, "VP-Version:               %d.%d %04x\n",
-                       cam->params.vpVersion.vpVersion,
-                       cam->params.vpVersion.vpRevision,
-                       cam->params.vpVersion.cameraHeadID);
-        
+                       cam->params.vpVersion.vpVersion,
+                       cam->params.vpVersion.vpRevision,
+                       cam->params.vpVersion.cameraHeadID);
+
         out += sprintf(out, "system_state:             %#04x\n",
-                       cam->params.status.systemState);
+                       cam->params.status.systemState);
         out += sprintf(out, "grab_state:               %#04x\n",
-                       cam->params.status.grabState);
+                       cam->params.status.grabState);
         out += sprintf(out, "stream_state:             %#04x\n",
-                       cam->params.status.streamState);
+                       cam->params.status.streamState);
         out += sprintf(out, "fatal_error:              %#04x\n",
-                       cam->params.status.fatalError);
+                       cam->params.status.fatalError);
         out += sprintf(out, "cmd_error:                %#04x\n",
-                       cam->params.status.cmdError);
+                       cam->params.status.cmdError);
         out += sprintf(out, "debug_flags:              %#04x\n",
-                       cam->params.status.debugFlags);
+                       cam->params.status.debugFlags);
         out += sprintf(out, "vp_status:                %#04x\n",
-                       cam->params.status.vpStatus);
+                       cam->params.status.vpStatus);
         out += sprintf(out, "error_code:               %#04x\n",
-                       cam->params.status.errorCode);
+                       cam->params.status.errorCode);
         /* QX3 specific entries */
         if (cam->params.qx3.qx3_detected) {
                 out += sprintf(out, "button:                   %4d\n",
-                               cam->params.qx3.button);
+                               cam->params.qx3.button);
                 out += sprintf(out, "cradled:                  %4d\n",
-                               cam->params.qx3.cradled);
+                               cam->params.qx3.cradled);
         }
         out += sprintf(out, "video_size:               %s\n",
-                       cam->params.format.videoSize == VIDEOSIZE_CIF ?
+                       cam->params.format.videoSize == VIDEOSIZE_CIF ?
                        "CIF " : "QCIF");
         out += sprintf(out, "roi:                      (%3d, %3d) to (%3d, %3d)\n",
-                       cam->params.roi.colStart*8,
-                       cam->params.roi.rowStart*4,
-                       cam->params.roi.colEnd*8,
-                       cam->params.roi.rowEnd*4);
+                       cam->params.roi.colStart*8,
+                       cam->params.roi.rowStart*4,
+                       cam->params.roi.colEnd*8,
+                       cam->params.roi.rowEnd*4);
         out += sprintf(out, "actual_fps:               %3d\n", cam->fps);
         out += sprintf(out, "transfer_rate:            %4dkB/s\n",
-                       cam->transfer_rate);
-        
+                       cam->transfer_rate);
+
         out += sprintf(out, "\nread-write\n");
         out += sprintf(out, "-----------------------  current       min"
-                       "       max   default  comment\n");
+                       "       max   default  comment\n");
         out += sprintf(out, "brightness:             %8d  %8d  %8d  %8d\n",
-                       cam->params.colourParams.brightness, 0, 100, 50);
+                       cam->params.colourParams.brightness, 0, 100, 50);
         if (cam->params.version.firmwareVersion == 1 &&
            cam->params.version.firmwareRevision == 2)
                 /* 1-02 firmware limits contrast to 80 */
@@ -336,26 +336,26 @@ static int cpia_read_proc(char *page, char **start, off_t off,
                 tmp = 96;
 
         out += sprintf(out, "contrast:               %8d  %8d  %8d  %8d"
-                       "  steps of 8\n",
-                       cam->params.colourParams.contrast, 0, tmp, 48);
+                       "  steps of 8\n",
+                       cam->params.colourParams.contrast, 0, tmp, 48);
         out += sprintf(out, "saturation:             %8d  %8d  %8d  %8d\n",
-                       cam->params.colourParams.saturation, 0, 100, 50);
+                       cam->params.colourParams.saturation, 0, 100, 50);
         tmp = (25000+5000*cam->params.sensorFps.baserate)/
               (1<<cam->params.sensorFps.divisor);
         out += sprintf(out, "sensor_fps:             %4d.%03d  %8d  %8d  %8d\n",
-                       tmp/1000, tmp%1000, 3, 30, 15);
+                       tmp/1000, tmp%1000, 3, 30, 15);
         out += sprintf(out, "stream_start_line:      %8d  %8d  %8d  %8d\n",
-                       2*cam->params.streamStartLine, 0,
+                       2*cam->params.streamStartLine, 0,
                        cam->params.format.videoSize == VIDEOSIZE_CIF ? 288:144,
                        cam->params.format.videoSize == VIDEOSIZE_CIF ? 240:120);
         out += sprintf(out, "sub_sample:             %8s  %8s  %8s  %8s\n",
-                       cam->params.format.subSample == SUBSAMPLE_420 ?
+                       cam->params.format.subSample == SUBSAMPLE_420 ?
                        "420" : "422", "420", "422", "422");
         out += sprintf(out, "yuv_order:              %8s  %8s  %8s  %8s\n",
-                       cam->params.format.yuvOrder == YUVORDER_YUYV ?
+                       cam->params.format.yuvOrder == YUVORDER_YUYV ?
                        "YUYV" : "UYVY", "YUYV" , "UYVY", "YUYV");
         out += sprintf(out, "ecp_timing:             %8s  %8s  %8s  %8s\n",
-                       cam->params.ecpTiming ? "slow" : "normal", "slow",
+                       cam->params.ecpTiming ? "slow" : "normal", "slow",
                        "normal", "normal");
 
         if (cam->params.colourBalance.balanceMode == 2) {
@@ -366,11 +366,11 @@ static int cpia_read_proc(char *page, char **start, off_t off,
         out += sprintf(out, "color_balance_mode:     %8s  %8s  %8s"
                        "  %8s\n",  tmpstr, "manual", "auto", "auto");
         out += sprintf(out, "red_gain:               %8d  %8d  %8d  %8d\n",
-                       cam->params.colourBalance.redGain, 0, 212, 32);
+                       cam->params.colourBalance.redGain, 0, 212, 32);
         out += sprintf(out, "green_gain:             %8d  %8d  %8d  %8d\n",
-                       cam->params.colourBalance.greenGain, 0, 212, 6);
+                       cam->params.colourBalance.greenGain, 0, 212, 6);
         out += sprintf(out, "blue_gain:              %8d  %8d  %8d  %8d\n",
-                       cam->params.colourBalance.blueGain, 0, 212, 92);
+                       cam->params.colourBalance.blueGain, 0, 212, 92);
 
         if (cam->params.version.firmwareVersion == 1 &&
            cam->params.version.firmwareRevision == 2)
@@ -381,11 +381,11 @@ static int cpia_read_proc(char *page, char **start, off_t off,
 
         if (cam->params.exposure.gainMode == 0)
                 out += sprintf(out, "max_gain:                unknown  %28s"
-                               "  powers of 2\n", tmpstr); 
+                               "  powers of 2\n", tmpstr);
         else
                 out += sprintf(out, "max_gain:               %8d  %28s"
                                "  1,2,4 or 8 \n",
-                               1<<(cam->params.exposure.gainMode-1), tmpstr);
+                               1<<(cam->params.exposure.gainMode-1), tmpstr);
 
         switch(cam->params.exposure.expMode) {
         case 1:
@@ -402,10 +402,10 @@ static int cpia_read_proc(char *page, char **start, off_t off,
         out += sprintf(out, "exposure_mode:          %8s  %8s  %8s"
                        "  %8s\n",  tmpstr, "manual", "auto", "auto");
         out += sprintf(out, "centre_weight:          %8s  %8s  %8s  %8s\n",
-                       (2-cam->params.exposure.centreWeight) ? "on" : "off",
-                       "off", "on", "on");
+                       (2-cam->params.exposure.centreWeight) ? "on" : "off",
+                       "off", "on", "on");
         out += sprintf(out, "gain:                   %8d  %8d  max_gain  %8d  1,2,4,8 possible\n",
-                       1<<cam->params.exposure.gain, 1, 1);
+                       1<<cam->params.exposure.gain, 1, 1);
         if (cam->params.version.firmwareVersion == 1 &&
            cam->params.version.firmwareRevision == 2)
                 /* 1-02 firmware limits fineExp/2 to 127 */
@@ -414,7 +414,7 @@ static int cpia_read_proc(char *page, char **start, off_t off,
                 tmp = 510;
 
         out += sprintf(out, "fine_exp:               %8d  %8d  %8d  %8d\n",
-                       cam->params.exposure.fineExp*2, 0, tmp, 0);
+                       cam->params.exposure.fineExp*2, 0, tmp, 0);
         if (cam->params.version.firmwareVersion == 1 &&
            cam->params.version.firmwareRevision == 2)
                 /* 1-02 firmware limits coarseExpHi to 0 */
@@ -426,46 +426,46 @@ static int cpia_read_proc(char *page, char **start, off_t off,
                        "  %8d\n", cam->params.exposure.coarseExpLo+
                        256*cam->params.exposure.coarseExpHi, 0, tmp, 185);
         out += sprintf(out, "red_comp:               %8d  %8d  %8d  %8d\n",
-                       cam->params.exposure.redComp, COMP_RED, 255, COMP_RED);
+                       cam->params.exposure.redComp, COMP_RED, 255, COMP_RED);
         out += sprintf(out, "green1_comp:            %8d  %8d  %8d  %8d\n",
-                       cam->params.exposure.green1Comp, COMP_GREEN1, 255,
+                       cam->params.exposure.green1Comp, COMP_GREEN1, 255,
                        COMP_GREEN1);
         out += sprintf(out, "green2_comp:            %8d  %8d  %8d  %8d\n",
-                       cam->params.exposure.green2Comp, COMP_GREEN2, 255,
+                       cam->params.exposure.green2Comp, COMP_GREEN2, 255,
                        COMP_GREEN2);
         out += sprintf(out, "blue_comp:              %8d  %8d  %8d  %8d\n",
-                       cam->params.exposure.blueComp, COMP_BLUE, 255, COMP_BLUE);
-        
+                       cam->params.exposure.blueComp, COMP_BLUE, 255, COMP_BLUE);
+
         out += sprintf(out, "apcor_gain1:            %#8x  %#8x  %#8x  %#8x\n",
-                       cam->params.apcor.gain1, 0, 0xff, 0x1c);
+                       cam->params.apcor.gain1, 0, 0xff, 0x1c);
         out += sprintf(out, "apcor_gain2:            %#8x  %#8x  %#8x  %#8x\n",
-                       cam->params.apcor.gain2, 0, 0xff, 0x1a);
+                       cam->params.apcor.gain2, 0, 0xff, 0x1a);
         out += sprintf(out, "apcor_gain4:            %#8x  %#8x  %#8x  %#8x\n",
-                       cam->params.apcor.gain4, 0, 0xff, 0x2d);
+                       cam->params.apcor.gain4, 0, 0xff, 0x2d);
         out += sprintf(out, "apcor_gain8:            %#8x  %#8x  %#8x  %#8x\n",
-                       cam->params.apcor.gain8, 0, 0xff, 0x2a);
+                       cam->params.apcor.gain8, 0, 0xff, 0x2a);
         out += sprintf(out, "vl_offset_gain1:        %8d  %8d  %8d  %8d\n",
-                       cam->params.vlOffset.gain1, 0, 255, 24);
+                       cam->params.vlOffset.gain1, 0, 255, 24);
         out += sprintf(out, "vl_offset_gain2:        %8d  %8d  %8d  %8d\n",
-                       cam->params.vlOffset.gain2, 0, 255, 28);
+                       cam->params.vlOffset.gain2, 0, 255, 28);
         out += sprintf(out, "vl_offset_gain4:        %8d  %8d  %8d  %8d\n",
-                       cam->params.vlOffset.gain4, 0, 255, 30);
+                       cam->params.vlOffset.gain4, 0, 255, 30);
         out += sprintf(out, "vl_offset_gain8:        %8d  %8d  %8d  %8d\n",
-                       cam->params.vlOffset.gain8, 0, 255, 30);
+                       cam->params.vlOffset.gain8, 0, 255, 30);
         out += sprintf(out, "flicker_control:        %8s  %8s  %8s  %8s\n",
-                       cam->params.flickerControl.flickerMode ? "on" : "off",
+                       cam->params.flickerControl.flickerMode ? "on" : "off",
                        "off", "on", "off");
         out += sprintf(out, "mains_frequency:        %8d  %8d  %8d  %8d"
-                       " only 50/60\n",
-                       cam->mainsFreq ? 60 : 50, 50, 60, 50);
+                       " only 50/60\n",
+                       cam->mainsFreq ? 60 : 50, 50, 60, 50);
         if(cam->params.flickerControl.allowableOverExposure < 0)
                 out += sprintf(out, "allowable_overexposure: %4dauto      auto  %8d      auto\n",
-                               -cam->params.flickerControl.allowableOverExposure,
-                               255);
+                               -cam->params.flickerControl.allowableOverExposure,
+                               255);
         else
                 out += sprintf(out, "allowable_overexposure: %8d      auto  %8d      auto\n",
-                               cam->params.flickerControl.allowableOverExposure,
-                               255);
+                               cam->params.flickerControl.allowableOverExposure,
+                               255);
         out += sprintf(out, "compression_mode:       ");
         switch(cam->params.compression.mode) {
         case CPIA_COMPRESSION_NONE:
@@ -483,52 +483,52 @@ static int cpia_read_proc(char *page, char **start, off_t off,
         }
         out += sprintf(out, "    none,auto,manual      auto\n");
         out += sprintf(out, "decimation_enable:      %8s  %8s  %8s  %8s\n",
-                       cam->params.compression.decimation ==
-                       DECIMATION_ENAB ? "on":"off", "off", "on", 
+                       cam->params.compression.decimation ==
+                       DECIMATION_ENAB ? "on":"off", "off", "on",
                        "off");
         out += sprintf(out, "compression_target:    %9s %9s %9s %9s\n",
-                       cam->params.compressionTarget.frTargeting  == 
+                       cam->params.compressionTarget.frTargeting  ==
                        CPIA_COMPRESSION_TARGET_FRAMERATE ?
                        "framerate":"quality",
                        "framerate", "quality", "quality");
         out += sprintf(out, "target_framerate:       %8d  %8d  %8d  %8d\n",
-                       cam->params.compressionTarget.targetFR, 1, 30, 15);
+                       cam->params.compressionTarget.targetFR, 1, 30, 15);
         out += sprintf(out, "target_quality:         %8d  %8d  %8d  %8d\n",
-                       cam->params.compressionTarget.targetQ, 1, 64, 5);
+                       cam->params.compressionTarget.targetQ, 1, 64, 5);
         out += sprintf(out, "y_threshold:            %8d  %8d  %8d  %8d\n",
-                       cam->params.yuvThreshold.yThreshold, 0, 31, 6);
+                       cam->params.yuvThreshold.yThreshold, 0, 31, 6);
         out += sprintf(out, "uv_threshold:           %8d  %8d  %8d  %8d\n",
-                       cam->params.yuvThreshold.uvThreshold, 0, 31, 6);
+                       cam->params.yuvThreshold.uvThreshold, 0, 31, 6);
         out += sprintf(out, "hysteresis:             %8d  %8d  %8d  %8d\n",
-                       cam->params.compressionParams.hysteresis, 0, 255, 3);
+                       cam->params.compressionParams.hysteresis, 0, 255, 3);
         out += sprintf(out, "threshold_max:          %8d  %8d  %8d  %8d\n",
-                       cam->params.compressionParams.threshMax, 0, 255, 11);
+                       cam->params.compressionParams.threshMax, 0, 255, 11);
         out += sprintf(out, "small_step:             %8d  %8d  %8d  %8d\n",
-                       cam->params.compressionParams.smallStep, 0, 255, 1);
+                       cam->params.compressionParams.smallStep, 0, 255, 1);
         out += sprintf(out, "large_step:             %8d  %8d  %8d  %8d\n",
-                       cam->params.compressionParams.largeStep, 0, 255, 3);
+                       cam->params.compressionParams.largeStep, 0, 255, 3);
         out += sprintf(out, "decimation_hysteresis:  %8d  %8d  %8d  %8d\n",
-                       cam->params.compressionParams.decimationHysteresis,
+                       cam->params.compressionParams.decimationHysteresis,
                        0, 255, 2);
         out += sprintf(out, "fr_diff_step_thresh:    %8d  %8d  %8d  %8d\n",
-                       cam->params.compressionParams.frDiffStepThresh,
+                       cam->params.compressionParams.frDiffStepThresh,
                        0, 255, 5);
         out += sprintf(out, "q_diff_step_thresh:     %8d  %8d  %8d  %8d\n",
-                       cam->params.compressionParams.qDiffStepThresh,
+                       cam->params.compressionParams.qDiffStepThresh,
                        0, 255, 3);
         out += sprintf(out, "decimation_thresh_mod:  %8d  %8d  %8d  %8d\n",
-                       cam->params.compressionParams.decimationThreshMod,
+                       cam->params.compressionParams.decimationThreshMod,
                        0, 255, 2);
         /* QX3 specific entries */
         if (cam->params.qx3.qx3_detected) {
-                out += sprintf(out, "toplight:               %8s  %8s  %8s  %8s\n", 
-                               cam->params.qx3.toplight ? "on" : "off",
+                out += sprintf(out, "toplight:               %8s  %8s  %8s  %8s\n",
+                               cam->params.qx3.toplight ? "on" : "off",
                                "off", "on", "off");
-                out += sprintf(out, "bottomlight:            %8s  %8s  %8s  %8s\n", 
-                               cam->params.qx3.bottomlight ? "on" : "off",
+                out += sprintf(out, "bottomlight:            %8s  %8s  %8s  %8s\n",
+                               cam->params.qx3.bottomlight ? "on" : "off",
                                "off", "on", "off");
         }
-        
+
         len = out - page;
         len -= off;
         if (len < count) {
@@ -543,7 +543,7 @@ static int cpia_read_proc(char *page, char **start, off_t off,
 
 
 static int match(char *checkstr, char **buffer, unsigned long *count,
-                 int *find_colon, int *err)
+                 int *find_colon, int *err)
 {
         int ret, colon_found = 1;
         int len = strlen(checkstr);
@@ -583,7 +583,7 @@ static unsigned long int value(char **buffer, unsigned long *count, int *err)
 }
 
 static int cpia_write_proc(struct file *file, const char __user *buf,
-                           unsigned long count, void *data)
+                           unsigned long count, void *data)
 {
         struct cam_data *cam = data;
         struct cam_params new_params;
@@ -619,12 +619,12 @@ static int cpia_write_proc(struct file *file, const char __user *buf,
                 retval = -EINVAL;
                 goto out;
         }
-        
+
         buffer = page;
-        
+
         if (mutex_lock_interruptible(&cam->param_lock))
                 return -ERESTARTSYS;
-        
+
         /*
          * Skip over leading whitespace
          */
@@ -632,15 +632,15 @@ static int cpia_write_proc(struct file *file, const char __user *buf,
                 --count;
                 ++buffer;
         }
-        
+
         memcpy(&new_params, &cam->params, sizeof(struct cam_params));
         new_mains = cam->mainsFreq;
-        
+
 #define MATCH(x) (match(x, &buffer, &count, &find_colon, &retval))
 #define VALUE (value(&buffer,&count, &retval))
 #define FIRMWARE_VERSION(x,y) (new_params.version.firmwareVersion == (x) && \
-                               new_params.version.firmwareRevision == (y))
-        
+                               new_params.version.firmwareRevision == (y))
+
         retval = 0;
         while (count && !retval) {
                 find_colon = 1;
@@ -656,7 +656,7 @@ static int cpia_write_proc(struct file *file, const char __user *buf,
                         }
                         command_flags |= COMMAND_SETCOLOURPARAMS;
                         if(new_params.flickerControl.allowableOverExposure < 0)
-                                new_params.flickerControl.allowableOverExposure = 
+                                new_params.flickerControl.allowableOverExposure =
                                         -find_over_exposure(new_params.colourParams.brightness);
                         if(new_params.flickerControl.flickerMode != 0)
                                 command_flags |= COMMAND_SETFLICKERCTRL;
@@ -721,7 +721,7 @@ static int cpia_write_proc(struct file *file, const char __user *buf,
                                         /* Either base rate would work here */
                                         new_params.sensorFps.baserate = 1;
                                 }
-                                new_params.flickerControl.coarseJump = 
+                                new_params.flickerControl.coarseJump =
                                         flicker_jumps[new_mains]
                                         [new_params.sensorFps.baserate]
                                         [new_params.sensorFps.divisor];
@@ -1085,7 +1085,7 @@ static int cpia_write_proc(struct file *file, const char __user *buf,
                 } else if (MATCH("mains_frequency")) {
                         if (!retval && MATCH("50")) {
                                 new_mains = 0;
-                                new_params.flickerControl.coarseJump = 
+                                new_params.flickerControl.coarseJump =
                                         flicker_jumps[new_mains]
                                         [new_params.sensorFps.baserate]
                                         [new_params.sensorFps.divisor];
@@ -1093,7 +1093,7 @@ static int cpia_write_proc(struct file *file, const char __user *buf,
                                         command_flags |= COMMAND_SETFLICKERCTRL;
                         } else if (!retval && MATCH("60")) {
                                 new_mains = 1;
-                                new_params.flickerControl.coarseJump = 
+                                new_params.flickerControl.coarseJump =
                                         flicker_jumps[new_mains]
                                         [new_params.sensorFps.baserate]
                                         [new_params.sensorFps.divisor];
@@ -1103,7 +1103,7 @@ static int cpia_write_proc(struct file *file, const char __user *buf,
                                 retval = -EINVAL;
                 } else if (MATCH("allowable_overexposure")) {
                         if (!retval && MATCH("auto")) {
-                                new_params.flickerControl.allowableOverExposure = 
+                                new_params.flickerControl.allowableOverExposure =
                                         -find_over_exposure(new_params.colourParams.brightness);
                                 if(new_params.flickerControl.flickerMode != 0)
                                         command_flags |= COMMAND_SETFLICKERCTRL;
@@ -1146,10 +1146,10 @@ static int cpia_write_proc(struct file *file, const char __user *buf,
                         command_flags |= COMMAND_SETCOMPRESSION;
                 } else if (MATCH("compression_target")) {
                         if (!retval && MATCH("quality"))
-                                new_params.compressionTarget.frTargeting = 
+                                new_params.compressionTarget.frTargeting =
                                         CPIA_COMPRESSION_TARGET_QUALITY;
                         else if (!retval && MATCH("framerate"))
-                                new_params.compressionTarget.frTargeting = 
+                                new_params.compressionTarget.frTargeting =
                                         CPIA_COMPRESSION_TARGET_FRAMERATE;
                         else
                                 retval = -EINVAL;
@@ -1173,7 +1173,7 @@ static int cpia_write_proc(struct file *file, const char __user *buf,
                         if (!retval) {
                                 if(val > 0 && val <= 64)
                                         new_params.compressionTarget.targetQ = val;
-                                else 
+                                else
                                         retval = -EINVAL;
                         }
                         command_flags |= COMMAND_SETCOMPRESSIONTARGET;
@@ -1288,19 +1288,19 @@ static int cpia_write_proc(struct file *file, const char __user *buf,
                         }
                         command_flags |= COMMAND_SETCOMPRESSIONPARAMS;
                 } else if (MATCH("toplight")) {
-                        if (!retval && MATCH("on"))
+                        if (!retval && MATCH("on"))
                                 new_params.qx3.toplight = 1;
                         else if (!retval && MATCH("off"))
                                 new_params.qx3.toplight = 0;
-                        else 
+                        else
                                 retval = -EINVAL;
                         command_flags |= COMMAND_SETLIGHTS;
                 } else if (MATCH("bottomlight")) {
-                        if (!retval && MATCH("on"))
+                        if (!retval && MATCH("on"))
                                 new_params.qx3.bottomlight = 1;
-                        else if (!retval && MATCH("off"))  
+                        else if (!retval && MATCH("off"))
                                 new_params.qx3.bottomlight = 0;
-                        else 
+                        else
                                 retval = -EINVAL;
                         command_flags |= COMMAND_SETLIGHTS;
                 } else {
@@ -1326,7 +1326,7 @@ static int cpia_write_proc(struct file *file, const char __user *buf,
                         }
                 }
         }
-#undef MATCH    
+#undef MATCH
 #undef VALUE
 #undef FIRMWARE_VERSION
         if (!retval) {
@@ -1349,24 +1349,24 @@ static int cpia_write_proc(struct file *file, const char __user *buf,
                 retval = size;
         } else
                 DBG("error: %d\n", retval);
-        
+
         mutex_unlock(&cam->param_lock);
-        
+
 out:
         free_page((unsigned long)page);
-        return retval;
+        return retval;
 }
 
 static void create_proc_cpia_cam(struct cam_data *cam)
 {
         char name[7];
         struct proc_dir_entry *ent;
-        
+
         if (!cpia_proc_root || !cam)
                 return;
 
         sprintf(name, "video%d", cam->vdev.minor);
-        
+
         ent = create_proc_entry(name, S_IFREG|S_IRUGO|S_IWUSR, cpia_proc_root);
         if (!ent)
                 return;
@@ -1374,9 +1374,9 @@ static void create_proc_cpia_cam(struct cam_data *cam)
         ent->data = cam;
         ent->read_proc = cpia_read_proc;
         ent->write_proc = cpia_write_proc;
-        /* 
+        /*
            size of the proc entry is 3736 bytes for the standard webcam;
-           the extra features of the QX3 microscope add 189 bytes.
+           the extra features of the QX3 microscope add 189 bytes.
            (we have not yet probed the camera to see which type it is).
         */
         ent->size = 3736 + 189;
@@ -1386,10 +1386,10 @@ static void create_proc_cpia_cam(struct cam_data *cam)
 static void destroy_proc_cpia_cam(struct cam_data *cam)
 {
         char name[7];
-        
+
         if (!cam || !cam->proc_entry)
                 return;
-        
+
         sprintf(name, "video%d", cam->vdev.minor);
         remove_proc_entry(name, cpia_proc_root);
         cam->proc_entry = NULL;
@@ -1596,13 +1596,13 @@ static void set_vw_size(struct cam_data *cam)
                 cam->vc.width = cam->vw.width;
         if(cam->vc.height == 0)
                 cam->vc.height = cam->vw.height;
-        
+
         cam->params.roi.colStart += cam->vc.x >> 3;
         cam->params.roi.colEnd = cam->params.roi.colStart +
-                                 (cam->vc.width >> 3);
+                                 (cam->vc.width >> 3);
         cam->params.roi.rowStart += cam->vc.y >> 2;
         cam->params.roi.rowEnd = cam->params.roi.rowStart +
-                                 (cam->vc.height >> 2);
+                                 (cam->vc.height >> 2);
 
         return;
 }
@@ -1624,7 +1624,7 @@ static int allocate_frame_buf(struct cam_data *cam)
 static int free_frame_buf(struct cam_data *cam)
 {
         int i;
-        
+
         rvfree(cam->frame_buf, FRAME_NUM*CPIA_MAX_FRAME_SIZE);
         cam->frame_buf = NULL;
         for (i=0; i < FRAME_NUM; i++)
@@ -1667,7 +1667,7 @@ static int do_command(struct cam_data *cam, u16 command, u8 a, u8 b, u8 c, u8 d)
                 mutex_lock(&cam->param_lock);
                 datasize=8;
                 break;
-        case CPIA_COMMAND_ReadMCPorts: 
+        case CPIA_COMMAND_ReadMCPorts:
         case CPIA_COMMAND_ReadVCRegs:
                 datasize = 4;
                 break;
@@ -1746,10 +1746,10 @@ static int do_command(struct cam_data *cam, u16 command, u8 a, u8 b, u8 c, u8 d)
                         mutex_unlock(&cam->param_lock);
                         break;
 
-                case CPIA_COMMAND_ReadMCPorts: 
-                        if (!cam->params.qx3.qx3_detected) 
+                case CPIA_COMMAND_ReadMCPorts:
+                        if (!cam->params.qx3.qx3_detected)
                                 break;
-                        /* test button press */ 
+                        /* test button press */
                         cam->params.qx3.button = ((data[1] & 0x02) == 0);
                         if (cam->params.qx3.button) {
                                 /* button pressed - unlock the latch */
@@ -1770,9 +1770,9 @@ static int do_command(struct cam_data *cam, u16 command, u8 a, u8 b, u8 c, u8 d)
 
 /* send a command  to the camera with an additional data transaction */
 static int do_command_extended(struct cam_data *cam, u16 command,
-                               u8 a, u8 b, u8 c, u8 d,
-                               u8 e, u8 f, u8 g, u8 h,
-                               u8 i, u8 j, u8 k, u8 l)
+                               u8 a, u8 b, u8 c, u8 d,
+                               u8 e, u8 f, u8 g, u8 h,
+                               u8 i, u8 j, u8 k, u8 l)
 {
         int retval;
         u8 cmd[8], data[8];
@@ -1809,10 +1809,10 @@ static int do_command_extended(struct cam_data *cam, u16 command,
 #define LIMIT(x) ((((x)>0xffffff)?0xff0000:(((x)<=0xffff)?0:(x)&0xff0000))>>16)
 
 static int convert420(unsigned char *yuv, unsigned char *rgb, int out_fmt,
-                      int linesize, int mmap_kludge)
+                      int linesize, int mmap_kludge)
 {
         int y, u, v, r, g, b, y1;
-        
+
         /* Odd lines use the same u and v as the previous line.
          * Because of compression, it is necessary to get this
          * information from the decoded image. */
@@ -1925,7 +1925,7 @@ static int convert420(unsigned char *yuv, unsigned char *rgb, int out_fmt,
 
 
 static int yuvconvert(unsigned char *yuv, unsigned char *rgb, int out_fmt,
-                      int in_uyvy, int mmap_kludge)
+                      int in_uyvy, int mmap_kludge)
 {
         int y, u, v, r, g, b, y1;
 
@@ -2078,21 +2078,21 @@ static int parse_picture(struct cam_data *cam, int size)
                 mutex_unlock(&cam->param_lock);
                 return -1;
         }
-        
+
         if (ibuf[17] != SUBSAMPLE_420 && ibuf[17] != SUBSAMPLE_422) {
                 LOG("illegal subtype %d\n",ibuf[17]);
                 mutex_unlock(&cam->param_lock);
                 return -1;
         }
         subsample_422 = ibuf[17] == SUBSAMPLE_422;
-        
+
         if (ibuf[18] != YUVORDER_YUYV && ibuf[18] != YUVORDER_UYVY) {
                 LOG("illegal yuvorder %d\n",ibuf[18]);
                 mutex_unlock(&cam->param_lock);
                 return -1;
         }
         in_uyvy = ibuf[18] == YUVORDER_UYVY;
-        
+
         if ((ibuf[24] != cam->params.roi.colStart) ||
             (ibuf[25] != cam->params.roi.colEnd) ||
             (ibuf[26] != cam->params.roi.rowStart) ||
@@ -2104,20 +2104,20 @@ static int parse_picture(struct cam_data *cam, int size)
         cols = 8*(ibuf[25] - ibuf[24]);
         rows = 4*(ibuf[27] - ibuf[26]);
 
-        
+
         if ((ibuf[28] != NOT_COMPRESSED) && (ibuf[28] != COMPRESSED)) {
                 LOG("illegal compression %d\n",ibuf[28]);
                 mutex_unlock(&cam->param_lock);
                 return -1;
         }
         compressed = (ibuf[28] == COMPRESSED);
-        
+
         if (ibuf[29] != NO_DECIMATION && ibuf[29] != DECIMATION_ENAB) {
                 LOG("illegal decimation %d\n",ibuf[29]);
                 mutex_unlock(&cam->param_lock);
                 return -1;
         }
-        decimation = (ibuf[29] == DECIMATION_ENAB);     
+        decimation = (ibuf[29] == DECIMATION_ENAB);
 
         cam->params.yuvThreshold.yThreshold = ibuf[30];
         cam->params.yuvThreshold.uvThreshold = ibuf[31];
@@ -2131,7 +2131,7 @@ static int parse_picture(struct cam_data *cam, int size)
         cam->params.status.errorCode = ibuf[39];
         cam->fps = ibuf[41];
         mutex_unlock(&cam->param_lock);
-        
+
         linesize = skipcount(cols, out_fmt);
         ibuf += FRAME_HEADER_SIZE;
         size -= FRAME_HEADER_SIZE;
@@ -2150,14 +2150,14 @@ static int parse_picture(struct cam_data *cam, int size)
                         if (!compressed || (compressed && !(*ibuf & 1))) {
                                 if(subsample_422 || even_line) {
                                 obuf += yuvconvert(ibuf, obuf, out_fmt,
-                                                   in_uyvy, cam->mmap_kludge);
+                                                   in_uyvy, cam->mmap_kludge);
                                 ibuf += 4;
                                 ll -= 4;
                         } else {
                                         /* SUBSAMPLE_420 on an odd line */
                                         obuf += convert420(ibuf, obuf,
-                                                           out_fmt, linesize,
-                                                           cam->mmap_kludge);
+                                                           out_fmt, linesize,
+                                                           cam->mmap_kludge);
                                         ibuf += 2;
                                         ll -= 2;
                                 }
@@ -2183,7 +2183,7 @@ static int parse_picture(struct cam_data *cam, int size)
 
                         if ((size > 3) && (ibuf[0] == EOI) && (ibuf[1] == EOI) &&
                            (ibuf[2] == EOI) && (ibuf[3] == EOI)) {
-                                size -= 4;
+                                size -= 4;
                                 break;
                         }
 
@@ -2204,7 +2204,7 @@ static int parse_picture(struct cam_data *cam, int size)
                         return -1;
                 }
         }
-        
+
         if(decimation) {
                 /* interpolate odd rows */
                 int i, j;
@@ -2233,7 +2233,7 @@ static int parse_picture(struct cam_data *cam, int size)
 static inline int init_stream_cap(struct cam_data *cam)
 {
         return do_command(cam, CPIA_COMMAND_InitStreamCap,
-                          0, cam->params.streamStartLine, 0, 0);
+                          0, cam->params.streamStartLine, 0, 0);
 }
 
 
@@ -2254,7 +2254,7 @@ static int find_over_exposure(int brightness)
         int MaxAllowableOverExposure, OverExposure;
 
         MaxAllowableOverExposure = FLICKER_MAX_EXPOSURE - brightness -
-                                   FLICKER_BRIGHTNESS_CONSTANT;
+                                   FLICKER_BRIGHTNESS_CONSTANT;
 
         if (MaxAllowableOverExposure < FLICKER_ALLOWABLE_OVER_EXPOSURE) {
                 OverExposure = MaxAllowableOverExposure;
@@ -2280,62 +2280,62 @@ static void dispatch_commands(struct cam_data *cam)
         DEB_BYTE(cam->cmd_queue>>8);
         if (cam->cmd_queue & COMMAND_SETFORMAT) {
                 do_command(cam, CPIA_COMMAND_SetFormat,
-                           cam->params.format.videoSize,
-                           cam->params.format.subSample,
-                           cam->params.format.yuvOrder, 0);
+                           cam->params.format.videoSize,
+                           cam->params.format.subSample,
+                           cam->params.format.yuvOrder, 0);
                 do_command(cam, CPIA_COMMAND_SetROI,
-                           cam->params.roi.colStart, cam->params.roi.colEnd,
-                           cam->params.roi.rowStart, cam->params.roi.rowEnd);
+                           cam->params.roi.colStart, cam->params.roi.colEnd,
+                           cam->params.roi.rowStart, cam->params.roi.rowEnd);
                 cam->first_frame = 1;
         }
 
         if (cam->cmd_queue & COMMAND_SETCOLOURPARAMS)
                 do_command(cam, CPIA_COMMAND_SetColourParams,
-                           cam->params.colourParams.brightness,
-                           cam->params.colourParams.contrast,
-                           cam->params.colourParams.saturation, 0);
+                           cam->params.colourParams.brightness,
+                           cam->params.colourParams.contrast,
+                           cam->params.colourParams.saturation, 0);
 
         if (cam->cmd_queue & COMMAND_SETAPCOR)
                 do_command(cam, CPIA_COMMAND_SetApcor,
-                           cam->params.apcor.gain1,
-                           cam->params.apcor.gain2,
-                           cam->params.apcor.gain4,
-                           cam->params.apcor.gain8);
+                           cam->params.apcor.gain1,
+                           cam->params.apcor.gain2,
+                           cam->params.apcor.gain4,
+                           cam->params.apcor.gain8);
 
         if (cam->cmd_queue & COMMAND_SETVLOFFSET)
                 do_command(cam, CPIA_COMMAND_SetVLOffset,
-                           cam->params.vlOffset.gain1,
-                           cam->params.vlOffset.gain2,
-                           cam->params.vlOffset.gain4,
-                           cam->params.vlOffset.gain8);
+                           cam->params.vlOffset.gain1,
+                           cam->params.vlOffset.gain2,
+                           cam->params.vlOffset.gain4,
+                           cam->params.vlOffset.gain8);
 
         if (cam->cmd_queue & COMMAND_SETEXPOSURE) {
                 do_command_extended(cam, CPIA_COMMAND_SetExposure,
-                                    cam->params.exposure.gainMode,
-                                    1,
-                                    cam->params.exposure.compMode,
-                                    cam->params.exposure.centreWeight,
-                                    cam->params.exposure.gain,
-                                    cam->params.exposure.fineExp,
-                                    cam->params.exposure.coarseExpLo,
-                                    cam->params.exposure.coarseExpHi,
-                                    cam->params.exposure.redComp,
-                                    cam->params.exposure.green1Comp,
-                                    cam->params.exposure.green2Comp,
-                                    cam->params.exposure.blueComp);
+                                    cam->params.exposure.gainMode,
+                                    1,
+                                    cam->params.exposure.compMode,
+                                    cam->params.exposure.centreWeight,
+                                    cam->params.exposure.gain,
+                                    cam->params.exposure.fineExp,
+                                    cam->params.exposure.coarseExpLo,
+                                    cam->params.exposure.coarseExpHi,
+                                    cam->params.exposure.redComp,
+                                    cam->params.exposure.green1Comp,
+                                    cam->params.exposure.green2Comp,
+                                    cam->params.exposure.blueComp);
                 if(cam->params.exposure.expMode != 1) {
                         do_command_extended(cam, CPIA_COMMAND_SetExposure,
-                                            0,
-                                            cam->params.exposure.expMode,
-                                            0, 0,
-                                            cam->params.exposure.gain,
-                                            cam->params.exposure.fineExp,
-                                            cam->params.exposure.coarseExpLo,
-                                            cam->params.exposure.coarseExpHi,
-                                            0, 0, 0, 0);
+                                            0,
+                                            cam->params.exposure.expMode,
+                                            0, 0,
+                                            cam->params.exposure.gain,
+                                            cam->params.exposure.fineExp,
+                                            cam->params.exposure.coarseExpLo,
+                                            cam->params.exposure.coarseExpHi,
+                                            0, 0, 0, 0);
                 }
         }
-        
+
         if (cam->cmd_queue & COMMAND_SETCOLOURBALANCE) {
                 if (cam->params.colourBalance.balanceMode == 1) {
                         do_command(cam, CPIA_COMMAND_SetColourBalance,
@@ -2358,47 +2358,47 @@ static void dispatch_commands(struct cam_data *cam)
 
         if (cam->cmd_queue & COMMAND_SETCOMPRESSIONTARGET)
                 do_command(cam, CPIA_COMMAND_SetCompressionTarget,
-                           cam->params.compressionTarget.frTargeting,
-                           cam->params.compressionTarget.targetFR,
-                           cam->params.compressionTarget.targetQ, 0);
+                           cam->params.compressionTarget.frTargeting,
+                           cam->params.compressionTarget.targetFR,
+                           cam->params.compressionTarget.targetQ, 0);
 
         if (cam->cmd_queue & COMMAND_SETYUVTHRESH)
                 do_command(cam, CPIA_COMMAND_SetYUVThresh,
-                           cam->params.yuvThreshold.yThreshold,
-                           cam->params.yuvThreshold.uvThreshold, 0, 0);
+                           cam->params.yuvThreshold.yThreshold,
+                           cam->params.yuvThreshold.uvThreshold, 0, 0);
 
         if (cam->cmd_queue & COMMAND_SETCOMPRESSIONPARAMS)
                 do_command_extended(cam, CPIA_COMMAND_SetCompressionParams,
-                            0, 0, 0, 0,
-                            cam->params.compressionParams.hysteresis,
-                            cam->params.compressionParams.threshMax,
-                            cam->params.compressionParams.smallStep,
-                            cam->params.compressionParams.largeStep,
-                            cam->params.compressionParams.decimationHysteresis,
-                            cam->params.compressionParams.frDiffStepThresh,
-                            cam->params.compressionParams.qDiffStepThresh,
-                            cam->params.compressionParams.decimationThreshMod);
+                            0, 0, 0, 0,
+                            cam->params.compressionParams.hysteresis,
+                            cam->params.compressionParams.threshMax,
+                            cam->params.compressionParams.smallStep,
+                            cam->params.compressionParams.largeStep,
+                            cam->params.compressionParams.decimationHysteresis,
+                            cam->params.compressionParams.frDiffStepThresh,
+                            cam->params.compressionParams.qDiffStepThresh,
+                            cam->params.compressionParams.decimationThreshMod);
 
         if (cam->cmd_queue & COMMAND_SETCOMPRESSION)
                 do_command(cam, CPIA_COMMAND_SetCompression,
-                           cam->params.compression.mode,
+                           cam->params.compression.mode,
                            cam->params.compression.decimation, 0, 0);
 
         if (cam->cmd_queue & COMMAND_SETSENSORFPS)
                 do_command(cam, CPIA_COMMAND_SetSensorFPS,
-                           cam->params.sensorFps.divisor,
-                           cam->params.sensorFps.baserate, 0, 0);
+                           cam->params.sensorFps.divisor,
+                           cam->params.sensorFps.baserate, 0, 0);
 
         if (cam->cmd_queue & COMMAND_SETFLICKERCTRL)
                 do_command(cam, CPIA_COMMAND_SetFlickerCtrl,
-                           cam->params.flickerControl.flickerMode,
-                           cam->params.flickerControl.coarseJump,
-                           abs(cam->params.flickerControl.allowableOverExposure),
-                           0);
+                           cam->params.flickerControl.flickerMode,
+                           cam->params.flickerControl.coarseJump,
+                           abs(cam->params.flickerControl.allowableOverExposure),
+                           0);
 
         if (cam->cmd_queue & COMMAND_SETECPTIMING)
                 do_command(cam, CPIA_COMMAND_SetECPTiming,
-                           cam->params.ecpTiming, 0, 0, 0);
+                           cam->params.ecpTiming, 0, 0, 0);
 
         if (cam->cmd_queue & COMMAND_PAUSE)
                 do_command(cam, CPIA_COMMAND_EndStreamCap, 0, 0, 0, 0);
@@ -2409,9 +2409,9 @@ static void dispatch_commands(struct cam_data *cam)
         if (cam->cmd_queue & COMMAND_SETLIGHTS && cam->params.qx3.qx3_detected)
           {
             int p1 = (cam->params.qx3.bottomlight == 0) << 1;
-            int p2 = (cam->params.qx3.toplight == 0) << 3;
-            do_command(cam, CPIA_COMMAND_WriteVCReg,  0x90, 0x8F, 0x50, 0);
-            do_command(cam, CPIA_COMMAND_WriteMCPort, 2, 0, (p1|p2|0xE0), 0);
+            int p2 = (cam->params.qx3.toplight == 0) << 3;
+            do_command(cam, CPIA_COMMAND_WriteVCReg,  0x90, 0x8F, 0x50, 0);
+            do_command(cam, CPIA_COMMAND_WriteMCPort, 2, 0, (p1|p2|0xE0), 0);
           }
 
         cam->cmd_queue = COMMAND_NONE;
@@ -2422,11 +2422,11 @@ static void dispatch_commands(struct cam_data *cam)
 
 
 static void set_flicker(struct cam_params *params, volatile u32 *command_flags,
-                        int on)
+                        int on)
 {
         /* Everything in here is from the Windows driver */
 #define FIRMWARE_VERSION(x,y) (params->version.firmwareVersion == (x) && \
-                               params->version.firmwareRevision == (y))
+                               params->version.firmwareRevision == (y))
 /* define for compgain calculation */
 #if 0
 #define COMPGAIN(base, curexp, newexp) \
@@ -2441,7 +2441,7 @@ static void set_flicker(struct cam_params *params, volatile u32 *command_flags,
      (u16)(((u32)(curexp * (u8)(curcomp + 128)) / (u8)(basecomp - 128)))
 #endif
 
- 
+
         int currentexp = params->exposure.coarseExpLo +
                          params->exposure.coarseExpHi*256;
         int startexp;
@@ -2482,7 +2482,7 @@ static void set_flicker(struct cam_params *params, volatile u32 *command_flags,
                 }
                 if(FIRMWARE_VERSION(1,2))
                         params->exposure.compMode = 0;
-                else 
+                else
                         params->exposure.compMode = 1;
 
                 params->apcor.gain1 = 0x18;
@@ -2533,14 +2533,14 @@ static void set_flicker(struct cam_params *params, volatile u32 *command_flags,
 }
 
 #define FIRMWARE_VERSION(x,y) (cam->params.version.firmwareVersion == (x) && \
-                               cam->params.version.firmwareRevision == (y))
+                               cam->params.version.firmwareRevision == (y))
 /* monitor the exposure and adjust the sensor frame rate if needed */
 static void monitor_exposure(struct cam_data *cam)
 {
         u8 exp_acc, bcomp, gain, coarseL, cmd[8], data[8];
         int retval, light_exp, dark_exp, very_dark_exp;
         int old_exposure, new_exposure, framerate;
-        
+
         /* get necessary stats and register settings from camera */
         /* do_command can't handle this, so do it ourselves */
         cmd[0] = CPIA_COMMAND_ReadVPRegs>>8;
@@ -2564,17 +2564,17 @@ static void monitor_exposure(struct cam_data *cam)
 
         mutex_lock(&cam->param_lock);
         light_exp = cam->params.colourParams.brightness +
-                    TC - 50 + EXP_ACC_LIGHT;
+                    TC - 50 + EXP_ACC_LIGHT;
         if(light_exp > 255)
                 light_exp = 255;
         dark_exp = cam->params.colourParams.brightness +
-                   TC - 50 - EXP_ACC_DARK;
+                   TC - 50 - EXP_ACC_DARK;
         if(dark_exp < 0)
                 dark_exp = 0;
         very_dark_exp = dark_exp/2;
-        
+
         old_exposure = cam->params.exposure.coarseExpHi * 256 +
-                       cam->params.exposure.coarseExpLo;
+                       cam->params.exposure.coarseExpLo;
 
         if(!cam->params.flickerControl.disabled) {
                 /* Flicker control on */
@@ -2667,11 +2667,11 @@ static void monitor_exposure(struct cam_data *cam)
                         cam->exposure_status = EXPOSURE_NORMAL;
                 }
         }
-        
+
         framerate = cam->fps;
         if(framerate > 30 || framerate < 1)
                 framerate = 1;
-        
+
         if(!cam->params.flickerControl.disabled) {
                 /* Flicker control on */
                 if((cam->exposure_status == EXPOSURE_VERY_DARK ||
@@ -2683,10 +2683,10 @@ static void monitor_exposure(struct cam_data *cam)
                         ++cam->params.sensorFps.divisor;
                         cam->cmd_queue |= COMMAND_SETSENSORFPS;
 
-                        cam->params.flickerControl.coarseJump = 
+                        cam->params.flickerControl.coarseJump =
                                 flicker_jumps[cam->mainsFreq]
-                                             [cam->params.sensorFps.baserate]
-                                             [cam->params.sensorFps.divisor];
+                                             [cam->params.sensorFps.baserate]
+                                             [cam->params.sensorFps.divisor];
                         cam->cmd_queue |= COMMAND_SETFLICKERCTRL;
 
                         new_exposure = cam->params.flickerControl.coarseJump-1;
@@ -2704,15 +2704,15 @@ static void monitor_exposure(struct cam_data *cam)
                    cam->params.sensorFps.divisor > 0) {
 
                         /* light for too long */
-                        int max_exp = FIRMWARE_VERSION(1,2) ? MAX_EXP_102 : MAX_EXP ; 
+                        int max_exp = FIRMWARE_VERSION(1,2) ? MAX_EXP_102 : MAX_EXP ;
 
                         --cam->params.sensorFps.divisor;
                         cam->cmd_queue |= COMMAND_SETSENSORFPS;
 
-                        cam->params.flickerControl.coarseJump = 
+                        cam->params.flickerControl.coarseJump =
                                 flicker_jumps[cam->mainsFreq]
-                                             [cam->params.sensorFps.baserate]
-                                             [cam->params.sensorFps.divisor];
+                                             [cam->params.sensorFps.baserate]
+                                             [cam->params.sensorFps.divisor];
                         cam->cmd_queue |= COMMAND_SETFLICKERCTRL;
 
                         new_exposure = cam->params.flickerControl.coarseJump-1;
@@ -2772,7 +2772,7 @@ static void monitor_exposure(struct cam_data *cam)
 
    It also adjust the colour balance when an exposure step is detected - as
    long as flicker is running
-*/   
+*/
 static void restart_flicker(struct cam_data *cam)
 {
         int cam_exposure, old_exp;
@@ -2786,22 +2786,22 @@ static void restart_flicker(struct cam_data *cam)
         }
         cam_exposure = cam->raw_image[39]*2;
         old_exp = cam->params.exposure.coarseExpLo +
-                  cam->params.exposure.coarseExpHi*256;
-        /* 
-          see how far away camera exposure is from a valid 
-          flicker exposure value
-        */
-        cam_exposure %= cam->params.flickerControl.coarseJump;
+                  cam->params.exposure.coarseExpHi*256;
+        /*
+          see how far away camera exposure is from a valid
+          flicker exposure value
+        */
+        cam_exposure %= cam->params.flickerControl.coarseJump;
         if(!cam->params.flickerControl.disabled &&
-           cam_exposure <= cam->params.flickerControl.coarseJump - 3) {
+           cam_exposure <= cam->params.flickerControl.coarseJump - 3) {
                 /* Flicker control auto-disabled */
                 cam->params.flickerControl.disabled = 1;
         }
-        
+
         if(cam->params.flickerControl.disabled &&
            cam->params.flickerControl.flickerMode &&
            old_exp > cam->params.flickerControl.coarseJump +
-                     ROUND_UP_EXP_FOR_FLICKER) {
+                     ROUND_UP_EXP_FOR_FLICKER) {
                 /* exposure is now high enough to switch
                    flicker control back on */
                 set_flicker(&cam->params, &cam->cmd_queue, 1);
@@ -2818,7 +2818,7 @@ static int clear_stall(struct cam_data *cam)
 {
         /* FIXME: Does this actually work? */
         LOG("Clearing stall\n");
-        
+
         cam->ops->streamRead(cam->lowlevel_data, cam->raw_image, 0);
         do_command(cam, CPIA_COMMAND_GetCameraStatus,0,0,0,0);
         return cam->params.status.streamState != STREAM_PAUSED;
@@ -2878,7 +2878,7 @@ static int fetch_frame(void *data)
                                         return -EINTR;
 
                                 do_command(cam, CPIA_COMMAND_GetCameraStatus,
-                                           0, 0, 0, 0);
+                                           0, 0, 0, 0);
                         }
                         if(cam->params.status.streamState != STREAM_READY) {
                                 continue;
@@ -2903,18 +2903,18 @@ static int fetch_frame(void *data)
 
                 /* Switch flicker control back on if it got turned off */
                 restart_flicker(cam);
-                
+
                 /* If AEC is enabled, monitor the exposure and
                    adjust the sensor frame rate if needed */
                 if(cam->params.exposure.expMode == 2)
                         monitor_exposure(cam);
-                
+
                 /* camera idle now so dispatch queued commands */
                 dispatch_commands(cam);
 
                 /* Update our knowledge of the camera state */
-                do_command(cam, CPIA_COMMAND_GetColourBalance, 0, 0, 0, 0);
-                do_command(cam, CPIA_COMMAND_GetExposure, 0, 0, 0, 0);
+                do_command(cam, CPIA_COMMAND_GetColourBalance, 0, 0, 0, 0);
+                do_command(cam, CPIA_COMMAND_GetExposure, 0, 0, 0, 0);
                 do_command(cam, CPIA_COMMAND_ReadMCPorts, 0, 0, 0, 0);
 
                 /* decompress and convert image to by copying it from
@@ -2933,7 +2933,7 @@ static int fetch_frame(void *data)
                                    uncompressed. */
                                 cam->first_frame = 1;
                                 do_command(cam, CPIA_COMMAND_SetGrabMode,
-                                           CPIA_GRAB_SINGLE, 0, 0, 0);
+                                           CPIA_GRAB_SINGLE, 0, 0, 0);
                                 /* FIXME: Trial & error - need up to 70ms for
                                    the grab mode change to complete ? */
                                 msleep_interruptible(70);
@@ -2957,12 +2957,12 @@ static int fetch_frame(void *data)
                 if (cam->first_frame) {
                         cam->first_frame = 0;
                         do_command(cam, CPIA_COMMAND_SetCompression,
-                                   cam->params.compression.mode,
+                                   cam->params.compression.mode,
                                    cam->params.compression.decimation, 0, 0);
 
                         /* Switch from single-grab to continuous grab */
                         do_command(cam, CPIA_COMMAND_SetGrabMode,
-                                   CPIA_GRAB_CONTINUOUS, 0, 0, 0);
+                                   CPIA_GRAB_CONTINUOUS, 0, 0, 0);
                 }
                 return 0;
         }
@@ -2977,12 +2977,12 @@ static int capture_frame(struct cam_data *cam, struct video_mmap *vm)
                 if ((err = allocate_frame_buf(cam)))
                         return err;
         }
-        
+
         cam->curframe = vm->frame;
         cam->frame[cam->curframe].state = FRAME_READY;
         return fetch_frame(cam);
 }
-  
+
 static int goto_high_power(struct cam_data *cam)
 {
         if (do_command(cam, CPIA_COMMAND_GotoHiPower, 0, 0, 0, 0))
@@ -3039,22 +3039,22 @@ static void save_camera_state(struct cam_data *cam)
 static int set_camera_state(struct cam_data *cam)
 {
         cam->cmd_queue = COMMAND_SETCOMPRESSION |
-                         COMMAND_SETCOMPRESSIONTARGET |
-                         COMMAND_SETCOLOURPARAMS |
-                         COMMAND_SETFORMAT |
-                         COMMAND_SETYUVTHRESH |
-                         COMMAND_SETECPTIMING |
-                         COMMAND_SETCOMPRESSIONPARAMS |
-                         COMMAND_SETEXPOSURE |
-                         COMMAND_SETCOLOURBALANCE |
-                         COMMAND_SETSENSORFPS |
-                         COMMAND_SETAPCOR |
-                         COMMAND_SETFLICKERCTRL |
-                         COMMAND_SETVLOFFSET;
+                         COMMAND_SETCOMPRESSIONTARGET |
+                         COMMAND_SETCOLOURPARAMS |
+                         COMMAND_SETFORMAT |
+                         COMMAND_SETYUVTHRESH |
+                         COMMAND_SETECPTIMING |
+                         COMMAND_SETCOMPRESSIONPARAMS |
+                         COMMAND_SETEXPOSURE |
+                         COMMAND_SETCOLOURBALANCE |
+                         COMMAND_SETSENSORFPS |
+                         COMMAND_SETAPCOR |
+                         COMMAND_SETFLICKERCTRL |
+                         COMMAND_SETVLOFFSET;
 
         do_command(cam, CPIA_COMMAND_SetGrabMode, CPIA_GRAB_SINGLE,0,0,0);
         dispatch_commands(cam);
-        
+
         /* Wait 6 frames for the sensor to get all settings and
            AEC/ACB to settle */
         msleep_interruptible(6*(cam->params.sensorFps.baserate ? 33 : 40) *
@@ -3062,7 +3062,7 @@ static int set_camera_state(struct cam_data *cam)
 
         if(signal_pending(current))
                 return -EINTR;
-        
+
         save_camera_state(cam);
 
         return 0;
@@ -3094,9 +3094,9 @@ static int reset_camera(struct cam_data *cam)
                 if (goto_low_power(cam))
                         return -ENODEV;
         }
-        
+
         /* procedure described in developer's guide p3-28 */
-        
+
         /* Check the firmware version. */
         cam->params.version.firmwareVersion = 0;
         get_version_information(cam);
@@ -3113,14 +3113,14 @@ static int reset_camera(struct cam_data *cam)
         cam->params.qx3.qx3_detected = (cam->params.pnpID.vendor == 0x0813 &&
                                         cam->params.pnpID.product == 0x0001);
 
-        /* The fatal error checking should be done after
+        /* The fatal error checking should be done after
          * the camera powers up (developer's guide p 3-38) */
 
         /* Set streamState before transition to high power to avoid bug
          * in firmware 1-02 */
         do_command(cam, CPIA_COMMAND_ModifyCameraStatus, STREAMSTATE, 0,
-                   STREAM_NOT_READY, 0);
-        
+                   STREAM_NOT_READY, 0);
+
         /* GotoHiPower */
         err = goto_high_power(cam);
         if (err)
@@ -3142,16 +3142,16 @@ static int reset_camera(struct cam_data *cam)
                         /* Firmware 1-02 may do this for parallel port cameras,
                          * just clear the flags (developer's guide p 3-38) */
                         do_command(cam, CPIA_COMMAND_ModifyCameraStatus,
-                                   FATALERROR, ~(COM_FLAG|CPIA_FLAG), 0, 0);
+                                   FATALERROR, ~(COM_FLAG|CPIA_FLAG), 0, 0);
                 }
         }
-        
+
         /* Check the camera status again */
         if (cam->params.status.fatalError) {
                 if (cam->params.status.fatalError)
                         return -EIO;
         }
-        
+
         /* VPVersion can't be retrieved before the camera is in HiPower,
          * so get it here instead of in get_version_information. */
         do_command(cam, CPIA_COMMAND_GetVPVersion, 0, 0, 0, 0);
@@ -3193,24 +3193,24 @@ static int cpia_open(struct inode *inode, struct file *file)
                 if (!cam->raw_image)
                         goto oops;
         }
-        
+
         if (!cam->decompressed_frame.data) {
                 cam->decompressed_frame.data = rvmalloc(CPIA_MAX_FRAME_SIZE);
                 if (!cam->decompressed_frame.data)
                         goto oops;
         }
-        
+
         /* open cpia */
         err = -ENODEV;
         if (cam->ops->open(cam->lowlevel_data))
                 goto oops;
-        
+
         /* reset the camera */
         if ((err = reset_camera(cam)) != 0) {
                 cam->ops->close(cam->lowlevel_data);
                 goto oops;
         }
-        
+
         err = -EINTR;
         if(signal_pending(current))
                 goto oops;
@@ -3224,7 +3224,7 @@ static int cpia_open(struct inode *inode, struct file *file)
 
         /* init it to something */
         cam->mmap_kludge = 0;
-        
+
         ++cam->open_count;
         file->private_data = dev;
         mutex_unlock(&cam->busy_lock);
@@ -3250,10 +3250,10 @@ static int cpia_close(struct inode *inode, struct file *file)
         struct cam_data *cam = dev->priv;
 
         if (cam->ops) {
-                /* Return ownership of /proc/cpia/videoX to root */
+                /* Return ownership of /proc/cpia/videoX to root */
                 if(cam->proc_entry)
                         cam->proc_entry->uid = 0;
-        
+
                 /* save camera state for later open (developers guide ch 3.5.3) */
                 save_camera_state(cam);
 
@@ -3342,7 +3342,7 @@ static ssize_t cpia_read(struct file *file, char __user *buf,
                 return -EFAULT;
         }
         if (copy_to_user(buf, cam->decompressed_frame.data,
-                        cam->decompressed_frame.count)) {
+                        cam->decompressed_frame.count)) {
                 DBG("copy_to_user failed\n");
                 mutex_unlock(&cam->busy_lock);
                 return -EFAULT;
@@ -3361,7 +3361,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
 
         if (!cam || !cam->ops)
                 return -ENODEV;
-        
+
         /* make this _really_ smp-safe */
         if (mutex_lock_interruptible(&cam->busy_lock))
                 return -EINTR;
@@ -3405,7 +3405,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
                 v->norm = 0;
                 break;
         }
-        
+
         case VIDIOCSCHAN:
         {
                 struct video_channel *v = arg;
@@ -3424,7 +3424,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
                 *pic = cam->vp;
                 break;
         }
-        
+
         case VIDIOCSPICT:
         {
                 struct video_picture *vp = arg;
@@ -3458,11 +3458,11 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
 
                 /* Adjust flicker control if necessary */
                 if(cam->params.flickerControl.allowableOverExposure < 0)
-                        cam->params.flickerControl.allowableOverExposure = 
+                        cam->params.flickerControl.allowableOverExposure =
                                 -find_over_exposure(cam->params.colourParams.brightness);
                 if(cam->params.flickerControl.flickerMode != 0)
                         cam->cmd_queue |= COMMAND_SETFLICKERCTRL;
-                
+
 
                 /* queue command to update camera */
                 cam->cmd_queue |= COMMAND_SETCOLOURPARAMS;
@@ -3482,7 +3482,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
                 *vw = cam->vw;
                 break;
         }
-        
+
         case VIDIOCSWIN:
         {
                 /* copy_from_user, check validity, copy to internal structure */
@@ -3514,7 +3514,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
 
                         /* video size is changing, reset the subcapture area */
                         memset(&cam->vc, 0, sizeof(cam->vc));
-                        
+
                         set_vw_size(cam);
                         DBG("%d / %d\n", cam->vw.width, cam->vw.height);
                         cam->cmd_queue |= COMMAND_SETFORMAT;
@@ -3547,7 +3547,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
                         vm->offsets[i] = CPIA_MAX_FRAME_SIZE * i;
                 break;
         }
-        
+
         case VIDIOCMCAPTURE:
         {
                 struct video_mmap *vm = arg;
@@ -3597,7 +3597,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
 
                         /* video size is changing, reset the subcapture area */
                         memset(&cam->vc, 0, sizeof(cam->vc));
-                        
+
                         set_vw_size(cam);
                         cam->cmd_queue |= COMMAND_SETFORMAT;
                         dispatch_commands(cam);
@@ -3608,7 +3608,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
 
                 break;
         }
-        
+
         case VIDIOCSYNC:
         {
                 int *frame = arg;
@@ -3649,7 +3649,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
                 *vc = cam->vc;
 
                 break;
-        }       
+        }
 
         case VIDIOCSCAPTURE:
         {
@@ -3665,7 +3665,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
                         retval = -EINVAL;
                         break;
                 }
-                
+
                 /* Clip to the resolution we can set for the ROI
                    (every 8 columns and 4 rows) */
                 vc->x      = vc->x      & ~(__u32)7;
@@ -3681,14 +3681,14 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
                 }
 
                 DBG("%d,%d/%dx%d\n", vc->x,vc->y,vc->width, vc->height);
-                
+
                 mutex_lock(&cam->param_lock);
-                
+
                 cam->vc.x      = vc->x;
                 cam->vc.y      = vc->y;
                 cam->vc.width  = vc->width;
                 cam->vc.height = vc->height;
-                
+
                 set_vw_size(cam);
                 cam->cmd_queue |= COMMAND_SETFORMAT;
 
@@ -3699,7 +3699,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
                 dispatch_commands(cam);
                 break;
         }
-        
+
         case VIDIOCGUNIT:
         {
                 struct video_unit *vu = arg;
@@ -3715,7 +3715,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
                 break;
         }
 
-                
+
         /* pointless to implement overlay with this camera */
         case VIDIOCCAPTURE:
         case VIDIOCGFBUF:
@@ -3738,7 +3738,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
 
         mutex_unlock(&cam->busy_lock);
         return retval;
-} 
+}
 
 static int cpia_ioctl(struct inode *inode, struct file *file,
                      unsigned int cmd, unsigned long arg)
@@ -3759,7 +3759,7 @@ static int cpia_mmap(struct file *file, struct vm_area_struct *vma)
 
         if (!cam || !cam->ops)
                 return -ENODEV;
-        
+
         DBG("cpia_mmap: %ld\n", size);
 
         if (size > FRAME_NUM*CPIA_MAX_FRAME_SIZE)
@@ -3767,7 +3767,7 @@ static int cpia_mmap(struct file *file, struct vm_area_struct *vma)
 
         if (!cam || !cam->ops)
                 return -ENODEV;
-        
+
         /* make this _really_ smp-safe */
         if (mutex_lock_interruptible(&cam->busy_lock))
                 return -EINTR;
@@ -3851,11 +3851,11 @@ static void reset_camera_struct(struct cam_data *cam)
         cam->params.flickerControl.flickerMode = 0;
         cam->params.flickerControl.disabled = 1;
 
-        cam->params.flickerControl.coarseJump = 
+        cam->params.flickerControl.coarseJump =
                 flicker_jumps[cam->mainsFreq]
-                             [cam->params.sensorFps.baserate]
-                             [cam->params.sensorFps.divisor];
-        cam->params.flickerControl.allowableOverExposure = 
+                             [cam->params.sensorFps.baserate]
+                             [cam->params.sensorFps.divisor];
+        cam->params.flickerControl.allowableOverExposure =
                 -find_over_exposure(cam->params.colourParams.brightness);
         cam->params.vlOffset.gain1 = 20;
         cam->params.vlOffset.gain2 = 24;
@@ -3870,21 +3870,21 @@ static void reset_camera_struct(struct cam_data *cam)
         cam->params.compressionParams.qDiffStepThresh = 3;
         cam->params.compressionParams.decimationThreshMod = 2;
         /* End of default values from Software Developer's Guide */
-        
+
         cam->transfer_rate = 0;
         cam->exposure_status = EXPOSURE_NORMAL;
-        
+
         /* Set Sensor FPS to 15fps. This seems better than 30fps
          * for indoor lighting. */
         cam->params.sensorFps.divisor = 1;
         cam->params.sensorFps.baserate = 1;
-        
+
         cam->params.yuvThreshold.yThreshold = 6; /* From windows driver */
         cam->params.yuvThreshold.uvThreshold = 6; /* From windows driver */
-        
+
         cam->params.format.subSample = SUBSAMPLE_422;
         cam->params.format.yuvOrder = YUVORDER_YUYV;
-        
+
         cam->params.compression.mode = CPIA_COMPRESSION_AUTO;
         cam->params.compressionTarget.frTargeting =
                 CPIA_COMPRESSION_TARGET_QUALITY;
@@ -3898,7 +3898,7 @@ static void reset_camera_struct(struct cam_data *cam)
         cam->params.qx3.cradled = 0;
 
         cam->video_size = VIDEOSIZE_CIF;
-        
+
         cam->vp.colour = 32768;      /* 50% */
         cam->vp.hue = 32768;         /* 50% */
         cam->vp.brightness = 32768;  /* 50% */
@@ -3911,7 +3911,7 @@ static void reset_camera_struct(struct cam_data *cam)
         cam->vc.y = 0;
         cam->vc.width = 0;
         cam->vc.height = 0;
-        
+
         cam->vw.x = 0;
         cam->vw.y = 0;
         set_vw_size(cam);
@@ -3928,7 +3928,7 @@ static void reset_camera_struct(struct cam_data *cam)
 
 /* initialize cam_data structure  */
 static void init_camera_struct(struct cam_data *cam,
-                               struct cpia_camera_ops *ops )
+                               struct cpia_camera_ops *ops )
 {
         int i;
 
@@ -3945,7 +3945,7 @@ static void init_camera_struct(struct cam_data *cam,
 
         memcpy(&cam->vdev, &cpia_template, sizeof(cpia_template));
         cam->vdev.priv = cam;
-        
+
         cam->curframe = 0;
         for (i = 0; i < FRAME_NUM; i++) {
                 cam->frame[i].width = 0;
@@ -3961,15 +3961,15 @@ static void init_camera_struct(struct cam_data *cam,
 
 struct cam_data *cpia_register_camera(struct cpia_camera_ops *ops, void *lowlevel)
 {
-        struct cam_data *camera;
-        
+        struct cam_data *camera;
+
         if ((camera = kmalloc(sizeof(struct cam_data), GFP_KERNEL)) == NULL)
                 return NULL;
 
-        
+
         init_camera_struct( camera, ops );
         camera->lowlevel_data = lowlevel;
-        
+
         /* register v4l device */
         if (video_register_device(&camera->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {
                 kfree(camera);
@@ -3982,7 +3982,7 @@ struct cam_data *cpia_register_camera(struct cpia_camera_ops *ops, void *lowleve
         /* open cpia */
         if (camera->ops->open(camera->lowlevel_data))
                 return camera;
-        
+
         /* reset the camera */
         if (reset_camera(camera) != 0) {
                 camera->ops->close(camera->lowlevel_data);
@@ -4022,11 +4022,11 @@ void cpia_unregister_camera(struct cam_data *cam)
                 DBG("camera open -- setting ops to NULL\n");
                 cam->ops = NULL;
         }
-        
+
 #ifdef CONFIG_PROC_FS
         DBG("destroying /proc/cpia/video%d\n", cam->vdev.minor);
         destroy_proc_cpia_cam(cam);
-#endif  
+#endif
         if (!cam->open_count) {
                 DBG("freeing camera\n");
                 kfree(cam);
diff --git a/drivers/media/video/cpia.h b/drivers/media/video/cpia.h
index de6678200a..dde27a6a4a 100644
--- a/drivers/media/video/cpia.h
+++ b/drivers/media/video/cpia.h
@@ -52,10 +52,10 @@
 struct cpia_camera_ops
 {
         /* open sets privdata to point to structure for this camera.
-         * Returns negative value on error, otherwise 0.
+         * Returns negative value on error, otherwise 0.
          */
         int (*open)(void *privdata);
-        
+
         /* Registers callback function cb to be called with cbdata
          * when an image is ready.  If cb is NULL, only single image grabs
          * should be used.  cb should immediately call streamRead to read
@@ -63,8 +63,8 @@ struct cpia_camera_ops
          * otherwise 0.
          */
         int (*registerCallback)(void *privdata, void (*cb)(void *cbdata),
-                                void *cbdata);
-        
+                                void *cbdata);
+
         /* transferCmd sends commands to the camera.  command MUST point to
          * an  8 byte buffer in kernel space. data can be NULL if no extra
          * data is needed.  The size of the data is given by the last 2
@@ -77,30 +77,30 @@ struct cpia_camera_ops
          * Returns negative value on error, otherwise 0.
          */
         int (*streamStart)(void *privdata);
-        
+
         /* streamStop terminates stream capture mode.
          * Returns negative value on error, otherwise 0.
          */
         int (*streamStop)(void *privdata);
-        
+
         /* streamRead reads a frame from the camera.  buffer points to a
-         * buffer large enough to hold a complete frame in kernel space.
-         * noblock indicates if this should be a non blocking read.
+         * buffer large enough to hold a complete frame in kernel space.
+         * noblock indicates if this should be a non blocking read.
          * Returns the number of bytes read, or negative value on error.
-         */
+         */
         int (*streamRead)(void *privdata, u8 *buffer, int noblock);
-        
+
         /* close disables the device until open() is called again.
          * Returns negative value on error, otherwise 0.
          */
         int (*close)(void *privdata);
-        
+
         /* If wait_for_stream_ready is non-zero, wait until the streamState
          * is STREAM_READY before calling streamRead.
          */
         int wait_for_stream_ready;
 
-        /* 
+        /*
          * Used to maintain lowlevel module usage counts
          */
         struct module *owner;
@@ -215,14 +215,14 @@ struct cam_params {
                 u8 videoSize;           /* CIF/QCIF */
                 u8 subSample;
                 u8 yuvOrder;
-        } format;
-        struct {                        /* Intel QX3 specific data */
-                u8 qx3_detected;        /* a QX3 is present */
-                u8 toplight;            /* top light lit , R/W */
-                u8 bottomlight;         /* bottom light lit, R/W */
-                u8 button;              /* snapshot button pressed (R/O) */
-                u8 cradled;             /* microscope is in cradle (R/O) */
-        } qx3;
+        } format;
+        struct {                        /* Intel QX3 specific data */
+                u8 qx3_detected;        /* a QX3 is present */
+                u8 toplight;            /* top light lit , R/W */
+                u8 bottomlight;         /* bottom light lit, R/W */
+                u8 button;              /* snapshot button pressed (R/O) */
+                u8 cradled;             /* microscope is in cradle (R/O) */
+        } qx3;
         struct {
                 u8 colStart;            /* skip first 8*colStart pixels */
                 u8 colEnd;              /* finish at 8*colEnd pixels */
@@ -247,13 +247,13 @@ enum v4l_camstates {
 struct cam_data {
         struct list_head cam_data_list;
 
-        struct mutex busy_lock;     /* guard against SMP multithreading */
+        struct mutex busy_lock;     /* guard against SMP multithreading */
         struct cpia_camera_ops *ops;    /* lowlevel driver operations */
         void *lowlevel_data;            /* private data for lowlevel driver */
         u8 *raw_image;                  /* buffer for raw image data */
         struct cpia_frame decompressed_frame;
-                                        /* buffer to hold decompressed frame */
-        int image_size;                 /* sizeof last decompressed image */
+                                        /* buffer to hold decompressed frame */
+        int image_size;                 /* sizeof last decompressed image */
         int open_count;                 /* # of process that have camera open */
 
                                 /* camera status */
@@ -265,7 +265,7 @@ struct cam_data {
         struct mutex param_lock;        /* params lock for this camera */
         struct cam_params params;       /* camera settings */
         struct proc_dir_entry *proc_entry;      /* /proc/cpia/videoX */
-        
+
                                         /* v4l */
         int video_size;                 /* VIDEO_SIZE_ */
         volatile enum v4l_camstates camstate;   /* v4l layer status */
@@ -277,7 +277,7 @@ struct cam_data {
                                 /* mmap interface */
         int curframe;                   /* the current frame to grab into */
         u8 *frame_buf;                  /* frame buffer data */
-        struct cpia_frame frame[FRAME_NUM];
+        struct cpia_frame frame[FRAME_NUM];
                                 /* FRAME_NUM-buffering, so we need a array */
 
         int first_frame;
@@ -424,7 +424,7 @@ void cpia_unregister_camera(struct cam_data *cam);
 #define DEB_BYTE(p)\
   DBG("%1d %1d %1d %1d %1d %1d %1d %1d \n",\
       (p)&0x80?1:0, (p)&0x40?1:0, (p)&0x20?1:0, (p)&0x10?1:0,\
-        (p)&0x08?1:0, (p)&0x04?1:0, (p)&0x02?1:0, (p)&0x01?1:0);
+        (p)&0x08?1:0, (p)&0x04?1:0, (p)&0x02?1:0, (p)&0x01?1:0);
 
 #endif /* __KERNEL__ */
 
diff --git a/drivers/media/video/cpia2/cpia2.h b/drivers/media/video/cpia2/cpia2.h
index 95d3afa94a..8394283993 100644
--- a/drivers/media/video/cpia2/cpia2.h
+++ b/drivers/media/video/cpia2/cpia2.h
@@ -381,7 +381,7 @@ struct cpia2_fh {
 
 struct camera_data {
         /* locks */
-        struct semaphore busy_lock;     /* guard against SMP multithreading */
+        struct mutex busy_lock; /* guard against SMP multithreading */
         struct v4l2_prio_state prio;
 
         /* camera status */
diff --git a/drivers/media/video/cpia2/cpia2_core.c b/drivers/media/video/cpia2/cpia2_core.c
index 5dfb242d5b..fd771c7a2f 100644
--- a/drivers/media/video/cpia2/cpia2_core.c
+++ b/drivers/media/video/cpia2/cpia2_core.c
@@ -2238,7 +2238,7 @@ struct camera_data *cpia2_init_camera_struct(void)
         memset(cam, 0, sizeof(struct camera_data));
 
         cam->present = 1;
-        init_MUTEX(&cam->busy_lock);
+        mutex_init(&cam->busy_lock);
         init_waitqueue_head(&cam->wq_stream);
 
         return cam;
@@ -2371,12 +2371,12 @@ long cpia2_read(struct camera_data *cam,
         }
 
         /* make this _really_ smp and multithread-safe */
-        if (down_interruptible(&cam->busy_lock))
+        if (mutex_lock_interruptible(&cam->busy_lock))
                 return -ERESTARTSYS;
 
         if (!cam->present) {
                 LOG("%s: camera removed\n",__FUNCTION__);
-                up(&cam->busy_lock);
+                mutex_unlock(&cam->busy_lock);
                 return 0;       /* EOF */
         }
 
@@ -2389,34 +2389,34 @@ long cpia2_read(struct camera_data *cam,
         /* Copy cam->curbuff in case it changes while we're processing */
         frame = cam->curbuff;
         if (noblock && frame->status != FRAME_READY) {
-                up(&cam->busy_lock);
+                mutex_unlock(&cam->busy_lock);
                 return -EAGAIN;
         }
 
         if(frame->status != FRAME_READY) {
-                up(&cam->busy_lock);
+                mutex_unlock(&cam->busy_lock);
                 wait_event_interruptible(cam->wq_stream,
                                !cam->present ||
                                (frame = cam->curbuff)->status == FRAME_READY);
                 if (signal_pending(current))
                         return -ERESTARTSYS;
                 /* make this _really_ smp and multithread-safe */
-                if (down_interruptible(&cam->busy_lock)) {
+                if (mutex_lock_interruptible(&cam->busy_lock)) {
                         return -ERESTARTSYS;
                 }
                 if(!cam->present) {
-                        up(&cam->busy_lock);
+                        mutex_unlock(&cam->busy_lock);
                         return 0;
                 }
         }
 
         /* copy data to user space */
         if (frame->length > count) {
-                up(&cam->busy_lock);
+                mutex_unlock(&cam->busy_lock);
                 return -EFAULT;
         }
         if (copy_to_user(buf, frame->data, frame->length)) {
-                up(&cam->busy_lock);
+                mutex_unlock(&cam->busy_lock);
                 return -EFAULT;
         }
 
@@ -2424,7 +2424,7 @@ long cpia2_read(struct camera_data *cam,
 
         frame->status = FRAME_EMPTY;
 
-        up(&cam->busy_lock);
+        mutex_unlock(&cam->busy_lock);
         return count;
 }
 
@@ -2443,10 +2443,10 @@ unsigned int cpia2_poll(struct camera_data *cam, struct file *filp,
                 return POLLERR;
         }
 
-        down(&cam->busy_lock);
+        mutex_lock(&cam->busy_lock);
 
         if(!cam->present) {
-                up(&cam->busy_lock);
+                mutex_unlock(&cam->busy_lock);
                 return POLLHUP;
         }
 
@@ -2456,16 +2456,16 @@ unsigned int cpia2_poll(struct camera_data *cam, struct file *filp,
                                        cam->params.camera_state.stream_mode);
         }
 
-        up(&cam->busy_lock);
+        mutex_unlock(&cam->busy_lock);
         poll_wait(filp, &cam->wq_stream, wait);
-        down(&cam->busy_lock);
+        mutex_lock(&cam->busy_lock);
 
         if(!cam->present)
                 status = POLLHUP;
         else if(cam->curbuff->status == FRAME_READY)
                 status = POLLIN | POLLRDNORM;
 
-        up(&cam->busy_lock);
+        mutex_unlock(&cam->busy_lock);
         return status;
 }
 
@@ -2488,18 +2488,18 @@ int cpia2_remap_buffer(struct camera_data *cam, struct vm_area_struct *vma)
         DBG("mmap offset:%ld size:%ld\n", start_offset, size);
 
         /* make this _really_ smp-safe */
-        if (down_interruptible(&cam->busy_lock))
+        if (mutex_lock_interruptible(&cam->busy_lock))
                 return -ERESTARTSYS;
 
         if (!cam->present) {
-                up(&cam->busy_lock);
+                mutex_unlock(&cam->busy_lock);
                 return -ENODEV;
         }
 
         if (size > cam->frame_size*cam->num_frames  ||
             (start_offset % cam->frame_size) != 0 ||
             (start_offset+size > cam->frame_size*cam->num_frames)) {
-                up(&cam->busy_lock);
+                mutex_unlock(&cam->busy_lock);
                 return -EINVAL;
         }
 
@@ -2507,7 +2507,7 @@ int cpia2_remap_buffer(struct camera_data *cam, struct vm_area_struct *vma)
         while (size > 0) {
                 page = kvirt_to_pa(pos);
                 if (remap_pfn_range(vma, start, page >> PAGE_SHIFT, PAGE_SIZE, PAGE_SHARED)) {
-                        up(&cam->busy_lock);
+                        mutex_unlock(&cam->busy_lock);
                         return -EAGAIN;
                 }
                 start += PAGE_SIZE;
@@ -2519,7 +2519,7 @@ int cpia2_remap_buffer(struct camera_data *cam, struct vm_area_struct *vma)
         }
 
         cam->mmapped = true;
-        up(&cam->busy_lock);
+        mutex_unlock(&cam->busy_lock);
         return 0;
 }
 
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c
index 08f8be345f..481e178ef5 100644
--- a/drivers/media/video/cpia2/cpia2_v4l.c
+++ b/drivers/media/video/cpia2/cpia2_v4l.c
@@ -255,7 +255,7 @@ static int cpia2_open(struct inode *inode, struct file *file)
                 return -ENODEV;
         }
 
-        if(down_interruptible(&cam->busy_lock))
+        if(mutex_lock_interruptible(&cam->busy_lock))
                 return -ERESTARTSYS;
 
         if(!cam->present) {
@@ -299,7 +299,7 @@ skip_init:
         cpia2_dbg_dump_registers(cam);
 
 err_return:
-        up(&cam->busy_lock);
+        mutex_unlock(&cam->busy_lock);
         return retval;
 }
 
@@ -314,7 +314,7 @@ static int cpia2_close(struct inode *inode, struct file *file)
         struct camera_data *cam = video_get_drvdata(dev);
         struct cpia2_fh *fh = file->private_data;
 
-        down(&cam->busy_lock);
+        mutex_lock(&cam->busy_lock);
 
         if (cam->present &&
             (cam->open_count == 1
@@ -347,7 +347,7 @@ static int cpia2_close(struct inode *inode, struct file *file)
                 }
         }
 
-        up(&cam->busy_lock);
+        mutex_unlock(&cam->busy_lock);
 
         return 0;
 }
@@ -523,11 +523,11 @@ static int sync(struct camera_data *cam, int frame_nr)
                         return 0;
                 }
 
-                up(&cam->busy_lock);
+                mutex_unlock(&cam->busy_lock);
                 wait_event_interruptible(cam->wq_stream,
                                          !cam->streaming ||
                                          frame->status == FRAME_READY);
-                down(&cam->busy_lock);
+                mutex_lock(&cam->busy_lock);
                 if (signal_pending(current))
                         return -ERESTARTSYS;
                 if(!cam->present)
@@ -1544,11 +1544,11 @@ static int ioctl_dqbuf(void *arg,struct camera_data *cam, struct file *file)
         if(frame < 0) {
                 /* Wait for a frame to become available */
                 struct framebuf *cb=cam->curbuff;
-                up(&cam->busy_lock);
+                mutex_unlock(&cam->busy_lock);
                 wait_event_interruptible(cam->wq_stream,
                                          !cam->present ||
                                          (cb=cam->curbuff)->status == FRAME_READY);
-                down(&cam->busy_lock);
+                mutex_lock(&cam->busy_lock);
                 if (signal_pending(current))
                         return -ERESTARTSYS;
                 if(!cam->present)
@@ -1591,11 +1591,11 @@ static int cpia2_do_ioctl(struct inode *inode, struct file *file,
                 return -ENOTTY;
 
         /* make this _really_ smp-safe */
-        if (down_interruptible(&cam->busy_lock))
+        if (mutex_lock_interruptible(&cam->busy_lock))
                 return -ERESTARTSYS;
 
         if (!cam->present) {
-                up(&cam->busy_lock);
+                mutex_unlock(&cam->busy_lock);
                 return -ENODEV;
         }
 
@@ -1608,7 +1608,7 @@ static int cpia2_do_ioctl(struct inode *inode, struct file *file,
                 struct cpia2_fh *fh = file->private_data;
                 retval = v4l2_prio_check(&cam->prio, &fh->prio);
                 if(retval) {
-                        up(&cam->busy_lock);
+                        mutex_unlock(&cam->busy_lock);
                         return retval;
                 }
                 break;
@@ -1618,7 +1618,7 @@ static int cpia2_do_ioctl(struct inode *inode, struct file *file,
         {
                 struct cpia2_fh *fh = file->private_data;
                 if(fh->prio != V4L2_PRIORITY_RECORD) {
-                        up(&cam->busy_lock);
+                        mutex_unlock(&cam->busy_lock);
                         return -EBUSY;
                 }
                 break;
@@ -1847,7 +1847,7 @@ static int cpia2_do_ioctl(struct inode *inode, struct file *file,
                 break;
         }
 
-        up(&cam->busy_lock);
+        mutex_unlock(&cam->busy_lock);
         return retval;
 }
 
@@ -1924,14 +1924,15 @@ static void reset_camera_struct_v4l(struct camera_data *cam)
  * The v4l video device structure initialized for this device
  ***/
 static struct file_operations fops_template = {
-        .owner=      THIS_MODULE,
-        .open=       cpia2_open,
-        .release=    cpia2_close,
-        .read=       cpia2_v4l_read,
-        .poll=       cpia2_v4l_poll,
-        .ioctl=      cpia2_ioctl,
-        .llseek=     no_llseek,
-        .mmap=       cpia2_mmap,
+        .owner          = THIS_MODULE,
+        .open           = cpia2_open,
+        .release        = cpia2_close,
+        .read           = cpia2_v4l_read,
+        .poll           = cpia2_v4l_poll,
+        .ioctl          = cpia2_ioctl,
+        .llseek         = no_llseek,
+        .compat_ioctl   = v4l_compat_ioctl32,
+        .mmap           = cpia2_mmap,
 };
 
 static struct video_device cpia2_template = {
diff --git a/drivers/media/video/cpia_pp.c b/drivers/media/video/cpia_pp.c
index 74cff626e0..3021f21aae 100644
--- a/drivers/media/video/cpia_pp.c
+++ b/drivers/media/video/cpia_pp.c
@@ -23,7 +23,7 @@
  */
 
 /* define _CPIA_DEBUG_ for verbose debug output (see cpia.h) */
-/* #define _CPIA_DEBUG_  1 */  
+/* #define _CPIA_DEBUG_  1 */
 
 #include <linux/config.h>
 
@@ -45,7 +45,7 @@
 
 static int cpia_pp_open(void *privdata);
 static int cpia_pp_registerCallback(void *privdata, void (*cb) (void *cbdata),
-                                    void *cbdata);
+                                    void *cbdata);
 static int cpia_pp_transferCmd(void *privdata, u8 *command, u8 *data);
 static int cpia_pp_streamStart(void *privdata);
 static int cpia_pp_streamStop(void *privdata);
@@ -93,7 +93,7 @@ struct pp_cam_entry {
         int stream_irq;
 };
 
-static struct cpia_camera_ops cpia_pp_ops = 
+static struct cpia_camera_ops cpia_pp_ops =
 {
         cpia_pp_open,
         cpia_pp_registerCallback,
@@ -123,7 +123,7 @@ static void cpia_parport_disable_irq( struct parport *port ) {
 }
 
 /* Special CPiA PPC modes: These are invoked by using the 1284 Extensibility
- * Link Flag during negotiation */  
+ * Link Flag during negotiation */
 #define UPLOAD_FLAG  0x08
 #define NIBBLE_TRANSFER 0x01
 #define ECP_TRANSFER 0x03
@@ -139,17 +139,17 @@ static void cpia_parport_disable_irq( struct parport *port ) {
 /*  CPiA nonstandard "Nibble" mode (no nDataAvail signal after each byte). */
 /* The standard kernel parport_ieee1284_read_nibble() fails with the CPiA... */
 
-static size_t cpia_read_nibble (struct parport *port, 
-                         void *buffer, size_t len, 
+static size_t cpia_read_nibble (struct parport *port,
+                         void *buffer, size_t len,
                          int flags)
 {
-        /* adapted verbatim, with one change, from 
+        /* adapted verbatim, with one change, from
            parport_ieee1284_read_nibble() in drivers/parport/ieee1284-ops.c */
 
         unsigned char *buf = buffer;
         int i;
         unsigned char byte = 0;
-        
+
         len *= 2; /* in nibbles */
         for (i=0; i < len; i++) {
                 unsigned char nibble;
@@ -158,12 +158,12 @@ static size_t cpia_read_nibble (struct parport *port,
                  * after every second nibble to signal that more
                  * data is available.  (the total number of Bytes that
                  * should be sent is known; if too few are received, an error
-                 * will be recorded after a timeout).  
+                 * will be recorded after a timeout).
                  * This is incompatible with parport_ieee1284_read_nibble(),
                  * which expects to find nFault LO after every second nibble.
                  */
 
-                /* Solution: modify cpia_read_nibble to only check for 
+                /* Solution: modify cpia_read_nibble to only check for
                  * nDataAvail before the first nibble is sent.
                  */
 
@@ -216,7 +216,7 @@ static size_t cpia_read_nibble (struct parport *port,
                         /* Second nibble */
                         byte |= nibble << 4;
                         *buf++ = byte;
-                } else 
+                } else
                         byte = nibble;
         }
 
@@ -238,18 +238,18 @@ static size_t cpia_read_nibble (struct parport *port,
 }
 
 /* CPiA nonstandard "Nibble Stream" mode (2 nibbles per cycle, instead of 1)
- * (See CPiA Data sheet p. 31) 
- * 
- * "Nibble Stream" mode used by CPiA for uploads to non-ECP ports is a 
- * nonstandard variant of nibble mode which allows the same (mediocre) 
- * data flow of 8 bits per cycle as software-enabled ECP by TRISTATE-capable 
+ * (See CPiA Data sheet p. 31)
+ *
+ * "Nibble Stream" mode used by CPiA for uploads to non-ECP ports is a
+ * nonstandard variant of nibble mode which allows the same (mediocre)
+ * data flow of 8 bits per cycle as software-enabled ECP by TRISTATE-capable
  * parallel ports, but works also for  non-TRISTATE-capable ports.
  * (Standard nibble mode only send 4 bits per cycle)
  *
  */
 
-static size_t cpia_read_nibble_stream(struct parport *port, 
-                               void *buffer, size_t len, 
+static size_t cpia_read_nibble_stream(struct parport *port,
+                               void *buffer, size_t len,
                                int flags)
 {
         int i;
@@ -260,7 +260,7 @@ static size_t cpia_read_nibble_stream(struct parport *port,
                 unsigned char nibble[2], byte = 0;
                 int j;
 
-                /* Image Data is complete when 4 consecutive EOI bytes (0xff) are seen */ 
+                /* Image Data is complete when 4 consecutive EOI bytes (0xff) are seen */
                 if (endseen > 3 )
                         break;
 
@@ -268,7 +268,7 @@ static size_t cpia_read_nibble_stream(struct parport *port,
                 parport_frob_control (port,
                                       PARPORT_CONTROL_AUTOFD,
                                       PARPORT_CONTROL_AUTOFD);
-                
+
                 /* Event 9: nAck goes low. */
                 port->ieee1284.phase = IEEE1284_PH_REV_DATA;
                 if (parport_wait_peripheral (port,
@@ -282,7 +282,7 @@ static size_t cpia_read_nibble_stream(struct parport *port,
 
                 /* Read lower nibble */
                 nibble[0] = parport_read_status (port) >>3;
-                
+
                 /* Event 10: Set nAutoFd high. */
                 parport_frob_control (port, PARPORT_CONTROL_AUTOFD, 0);
 
@@ -295,10 +295,10 @@ static size_t cpia_read_nibble_stream(struct parport *port,
                                  port->name);
                         break;
                 }
-                
+
                 /* Read upper nibble */
                 nibble[1] = parport_read_status (port) >>3;
-                
+
                 /* reassemble the byte */
                 for (j = 0; j < 2 ; j++ ) {
                         nibble[j] &= ~8;
@@ -335,8 +335,8 @@ static void EndTransferMode(struct pp_cam_entry *cam)
 static int ForwardSetup(struct pp_cam_entry *cam)
 {
         int retry;
-        
-        /* The CPiA uses ECP protocol for Downloads from the Host to the camera. 
+
+        /* The CPiA uses ECP protocol for Downloads from the Host to the camera.
          * This will be software-emulated if ECP hardware is not present
          */
 
@@ -375,9 +375,9 @@ static int ReverseSetup(struct pp_cam_entry *cam, int extensibility)
         upload_mode = mode;
         if(extensibility) mode = UPLOAD_FLAG|transfer_mode|IEEE1284_EXT_LINK;
 
-        /* the usual camera maximum response time is 10ms, but after 
+        /* the usual camera maximum response time is 10ms, but after
          * receiving some commands, it needs up to 40ms. */
-                
+
         for(retry = 0; retry < 4; ++retry) {
                 if(!parport_negotiate(cam->port, mode)) {
                         break;
@@ -439,10 +439,10 @@ static int ReadPacket(struct pp_cam_entry *cam, u8 *packet, size_t size)
 
         /* support for CPiA variant nibble reads */
         if(cam->port->ieee1284.mode == IEEE1284_MODE_NIBBLE) {
-                if(cpia_read_nibble(cam->port, packet, size, 0) != size) 
-                        retval = -EIO;                  
+                if(cpia_read_nibble(cam->port, packet, size, 0) != size)
+                        retval = -EIO;
         } else {
-                if(parport_read(cam->port, packet, size) != size) 
+                if(parport_read(cam->port, packet, size) != size)
                         retval = -EIO;
         }
         EndTransferMode(cam);
@@ -542,18 +542,18 @@ static int cpia_pp_streamRead(void *privdata, u8 *buffer, int noblock)
         block_size = PARPORT_CHUNK_SIZE;
         while( !cam->image_complete ) {
                 cond_resched();
-                
+
                 new_bytes = cpia_pp_read(cam->port, buffer, block_size );
                 if( new_bytes <= 0 ) {
                         break;
                 }
                 i=-1;
                 while(++i<new_bytes && endseen<4) {
-                        if(*buffer==EOI) {
-                                endseen++;
-                        } else {
-                                endseen=0;
-                        }
+                        if(*buffer==EOI) {
+                                endseen++;
+                        } else {
+                                endseen=0;
+                        }
                         buffer++;
                 }
                 read_bytes += i;
@@ -601,7 +601,7 @@ static int cpia_pp_transferCmd(void *privdata, u8 *command, u8 *data)
                 }
                 if((err = ReadPacket(cam, buffer, 8)) < 0) {
                         DBG("Error reading command result\n");
-                       return err;
+                       return err;
                 }
                 memcpy(data, buffer, databytes);
         } else if(command[0] == DATA_OUT) {
@@ -631,10 +631,10 @@ static int cpia_pp_transferCmd(void *privdata, u8 *command, u8 *data)
 static int cpia_pp_open(void *privdata)
 {
         struct pp_cam_entry *cam = (struct pp_cam_entry *)privdata;
-        
+
         if (cam == NULL)
                 return -EINVAL;
-        
+
         if(cam->open_count == 0) {
                 if (parport_claim(cam->pdev)) {
                         DBG("failed to claim the port\n");
@@ -645,12 +645,12 @@ static int cpia_pp_open(void *privdata)
                 parport_write_control(cam->port, PARPORT_CONTROL_SELECT);
                 udelay(50);
                 parport_write_control(cam->port,
-                                      PARPORT_CONTROL_SELECT
-                                      | PARPORT_CONTROL_INIT);
+                                      PARPORT_CONTROL_SELECT
+                                      | PARPORT_CONTROL_INIT);
         }
-        
+
         ++cam->open_count;
-        
+
         return 0;
 }
 
@@ -663,7 +663,7 @@ static int cpia_pp_registerCallback(void *privdata, void (*cb)(void *cbdata), vo
 {
         struct pp_cam_entry *cam = privdata;
         int retval = 0;
-        
+
         if(cam->port->irq != PARPORT_IRQ_NONE) {
                 INIT_WORK(&cam->cb_task, cb, cbdata);
         } else {
@@ -707,9 +707,9 @@ static int cpia_pp_register(struct parport *port)
                 LOG("failed to allocate camera structure\n");
                 return -ENOMEM;
         }
-        
+
         pdev = parport_register_device(port, "cpia_pp", NULL, NULL,
-                                       NULL, 0, cam);
+                                       NULL, 0, cam);
 
         if (!pdev) {
                 LOG("failed to parport_register_device\n");
@@ -753,19 +753,19 @@ static void cpia_pp_detach (struct parport *port)
                 }
                 cpia = NULL;
         }
-        spin_unlock( &cam_list_lock_pp );                       
+        spin_unlock( &cam_list_lock_pp );
 
         if (!cpia) {
                 DBG("cpia_pp_detach failed to find cam_data in cam_list\n");
                 return;
         }
-        
-        cam = (struct pp_cam_entry *) cpia->lowlevel_data;      
+
+        cam = (struct pp_cam_entry *) cpia->lowlevel_data;
         cpia_unregister_camera(cpia);
-        if(cam->open_count > 0) 
+        if(cam->open_count > 0)
                 cpia_pp_close(cam);
         parport_unregister_device(cam->pdev);
-        cpia->lowlevel_data = NULL;     
+        cpia->lowlevel_data = NULL;
         kfree(cam);
 }
 
@@ -805,14 +805,14 @@ static struct parport_driver cpia_pp_driver = {
 
 int cpia_pp_init(void)
 {
-        printk(KERN_INFO "%s v%d.%d.%d\n",ABOUT, 
+        printk(KERN_INFO "%s v%d.%d.%d\n",ABOUT,
                CPIA_PP_MAJ_VER,CPIA_PP_MIN_VER,CPIA_PP_PATCH_VER);
 
         if(parport_nr[0] == PPCPIA_PARPORT_OFF) {
                 printk("  disabled\n");
                 return 0;
         }
-        
+
         spin_lock_init( &cam_list_lock_pp );
 
         if (parport_register_driver (&cpia_pp_driver)) {
diff --git a/drivers/media/video/cpia_usb.c b/drivers/media/video/cpia_usb.c
index 03275c37c5..9c49a4b001 100644
--- a/drivers/media/video/cpia_usb.c
+++ b/drivers/media/video/cpia_usb.c
@@ -22,7 +22,7 @@
  */
 
 /* define _CPIA_DEBUG_ for verbose debug output (see cpia.h) */
-/* #define _CPIA_DEBUG_  1 */  
+/* #define _CPIA_DEBUG_  1 */
 
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -85,7 +85,7 @@ struct usb_cpia {
 
 static int cpia_usb_open(void *privdata);
 static int cpia_usb_registerCallback(void *privdata, void (*cb) (void *cbdata),
-                                     void *cbdata);
+                                     void *cbdata);
 static int cpia_usb_transferCmd(void *privdata, u8 *command, u8 *data);
 static int cpia_usb_streamStart(void *privdata);
 static int cpia_usb_streamStop(void *privdata);
@@ -127,7 +127,7 @@ static void cpia_usb_complete(struct urb *urb, struct pt_regs *regs)
                 ucpia->workbuff->status = FRAME_READING;
                 ucpia->workbuff->length = 0;
         }
-                  
+
         for (i = 0; i < urb->number_of_packets; i++) {
                 int n = urb->iso_frame_desc[i].actual_length;
                 int st = urb->iso_frame_desc[i].status;
@@ -141,9 +141,9 @@ static void cpia_usb_complete(struct urb *urb, struct pt_regs *regs)
                         printk(KERN_DEBUG "cpia: scratch buf overflow!scr_len: %d, n: %d\n", ucpia->workbuff->length, n);
                         return;
                 }
-            
+
                 if (n) {
-                        if ((ucpia->workbuff->length > 0) || 
+                        if ((ucpia->workbuff->length > 0) ||
                             (0x19 == cdata[0] && 0x68 == cdata[1])) {
                                 memcpy(ucpia->workbuff->data + ucpia->workbuff->length, cdata, n);
                                 ucpia->workbuff->length += n;
@@ -160,7 +160,7 @@ static void cpia_usb_complete(struct urb *urb, struct pt_regs *regs)
                                 ucpia->workbuff = ucpia->workbuff->next;
                                 ucpia->workbuff->status = FRAME_EMPTY;
                                 ucpia->workbuff->length = 0;
-                  
+
                                 if (waitqueue_active(&ucpia->wq_stream))
                                         wake_up_interruptible(&ucpia->wq_stream);
                         }
@@ -178,7 +178,7 @@ static int cpia_usb_open(void *privdata)
         struct usb_cpia *ucpia = (struct usb_cpia *) privdata;
         struct urb *urb;
         int ret, retval = 0, fx, err;
-  
+
         if (!ucpia)
                 return -EINVAL;
 
@@ -191,7 +191,7 @@ static int cpia_usb_open(void *privdata)
                 retval = -EINVAL;
                 goto error_0;
         }
-        
+
         ret = usb_set_interface(ucpia->dev, ucpia->iface, 3);
         if (ret < 0) {
                 printk(KERN_ERR "cpia_usb_open: usb_set_interface error (ret = %d)\n", ret);
@@ -286,7 +286,7 @@ error_1:
 error_0:
         kfree (ucpia->sbuf[0].data);
         ucpia->sbuf[0].data = NULL;
-        
+
         return retval;
 }
 
@@ -307,7 +307,7 @@ static int WritePacket(struct usb_device *udev, const u8 *packet, u8 *buf, size_
         return usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                          packet[1] + (packet[0] << 8),
                          USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                         packet[2] + (packet[3] << 8), 
+                         packet[2] + (packet[3] << 8),
                          packet[4] + (packet[5] << 8), buf, size, 1000);
 }
 
@@ -324,7 +324,7 @@ static int ReadPacket(struct usb_device *udev, u8 *packet, u8 *buf, size_t size)
         return usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
                          packet[1] + (packet[0] << 8),
                          USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                         packet[2] + (packet[3] << 8), 
+                         packet[2] + (packet[3] << 8),
                          packet[4] + (packet[5] << 8), buf, size, 1000);
 }
 
@@ -393,7 +393,7 @@ static int cpia_usb_streamRead(void *privdata, u8 *frame, int noblock)
 
         if (!ucpia || !ucpia->present)
                 return -1;
-  
+
         if (ucpia->curbuff->status != FRAME_READY)
                 interruptible_sleep_on(&ucpia->wq_stream);
         else
@@ -403,7 +403,7 @@ static int cpia_usb_streamRead(void *privdata, u8 *frame, int noblock)
 
         if (!mybuff)
                 return -1;
-  
+
         if (mybuff->status != FRAME_READY || mybuff->length < 4) {
                 DBG("Something went wrong!\n");
                 return -1;
@@ -411,7 +411,7 @@ static int cpia_usb_streamRead(void *privdata, u8 *frame, int noblock)
 
         memcpy(frame, mybuff->data, mybuff->length);
         mybuff->status = FRAME_EMPTY;
-  
+
 /*   DBG("read done, %d bytes, Header: %x/%x, Footer: %x%x%x%x\n",  */
 /*       mybuff->length, frame[0], frame[1], */
 /*       frame[mybuff->length-4], frame[mybuff->length-3],  */
@@ -447,7 +447,7 @@ static void cpia_usb_free_resources(struct usb_cpia *ucpia, int try)
 
         kfree(ucpia->sbuf[1].data);
         ucpia->sbuf[1].data = NULL;
- 
+
         if (ucpia->sbuf[0].urb) {
                 usb_kill_urb(ucpia->sbuf[0].urb);
                 usb_free_urb(ucpia->sbuf[0].urb);
@@ -490,7 +490,7 @@ static int cpia_probe(struct usb_interface *intf,
         struct usb_cpia *ucpia;
         struct cam_data *cam;
         int ret;
-  
+
         /* A multi-config CPiA camera? */
         if (udev->descriptor.bNumConfigurations != 1)
                 return -ENODEV;
@@ -539,7 +539,7 @@ static int cpia_probe(struct usb_interface *intf,
 
         /* Before register_camera, important */
         ucpia->present = 1;
-  
+
         cam = cpia_register_camera(&cpia_usb_ops, ucpia);
         if (!cam) {
                 LOG("failed to cpia_register_camera\n");
@@ -591,7 +591,7 @@ static void cpia_disconnect(struct usb_interface *intf)
         struct cam_data *cam = usb_get_intfdata(intf);
         struct usb_cpia *ucpia;
         struct usb_device *udev;
-  
+
         usb_set_intfdata(intf, NULL);
         if (!cam)
                 return;
@@ -600,7 +600,7 @@ static void cpia_disconnect(struct usb_interface *intf)
         spin_lock( &cam_list_lock_usb );
         list_del(&cam->cam_data_list);
         spin_unlock( &cam_list_lock_usb );
-        
+
         ucpia->present = 0;
 
         cpia_unregister_camera(cam);
@@ -631,7 +631,7 @@ static void cpia_disconnect(struct usb_interface *intf)
 
 static int __init usb_cpia_init(void)
 {
-        printk(KERN_INFO "%s v%d.%d.%d\n",ABOUT, 
+        printk(KERN_INFO "%s v%d.%d.%d\n",ABOUT,
                CPIA_USB_MAJ_VER,CPIA_USB_MIN_VER,CPIA_USB_PATCH_VER);
 
         spin_lock_init(&cam_list_lock_usb);
diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c
index 8739c64785..de87247c74 100644
--- a/drivers/media/video/cs53l32a.c
+++ b/drivers/media/video/cs53l32a.c
@@ -59,25 +59,25 @@ static int cs53l32a_read(struct i2c_client *client, u8 reg)
 static int cs53l32a_command(struct i2c_client *client, unsigned int cmd,
                             void *arg)
 {
-        struct v4l2_audio *input = arg;
+        struct v4l2_routing *route = arg;
         struct v4l2_control *ctrl = arg;
 
         switch (cmd) {
-        case VIDIOC_S_AUDIO:
+        case VIDIOC_INT_G_AUDIO_ROUTING:
+                route->input = (cs53l32a_read(client, 0x01) >> 4) & 3;
+                route->output = 0;
+                break;
+
+        case VIDIOC_INT_S_AUDIO_ROUTING:
                 /* There are 2 physical inputs, but the second input can be
                    placed in two modes, the first mode bypasses the PGA (gain),
                    the second goes through the PGA. Hence there are three
                    possible inputs to choose from. */
-                if (input->index > 2) {
-                        v4l_err(client, "Invalid input %d.\n", input->index);
+                if (route->input > 2) {
+                        v4l_err(client, "Invalid input %d.\n", route->input);
                         return -EINVAL;
                 }
-                cs53l32a_write(client, 0x01, 0x01 + (input->index << 4));
-                break;
-
-        case VIDIOC_G_AUDIO:
-                memset(input, 0, sizeof(*input));
-                input->index = (cs53l32a_read(client, 0x01) >> 4) & 3;
+                cs53l32a_write(client, 0x01, 0x01 + (route->input << 4));
                 break;
 
         case VIDIOC_G_CTRL:
diff --git a/drivers/media/video/cs8420.h b/drivers/media/video/cs8420.h
index 2b22f3a38d..621c0c6678 100644
--- a/drivers/media/video/cs8420.h
+++ b/drivers/media/video/cs8420.h
@@ -20,7 +20,7 @@
 #define __CS8420_H__
 
 /* Initialization Sequence */
-         
+
 static __u8 init8420[] = {
         1, 0x01,        2, 0x02,        3, 0x00,        4, 0x46,
         5, 0x24,        6, 0x84,        18, 0x18,       19, 0x13,
diff --git a/drivers/media/video/cx25840/cx25840-audio.c b/drivers/media/video/cx25840/cx25840-audio.c
index cb9a7981e4..a4540e858f 100644
--- a/drivers/media/video/cx25840/cx25840-audio.c
+++ b/drivers/media/video/cx25840/cx25840-audio.c
@@ -18,7 +18,6 @@
 
 #include <linux/videodev2.h>
 #include <linux/i2c.h>
-#include <media/audiochip.h>
 #include <media/v4l2-common.h>
 
 #include "cx25840.h"
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 8a25797805..a65b3cc4bf 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -31,7 +31,6 @@
 #include <linux/slab.h>
 #include <linux/videodev2.h>
 #include <linux/i2c.h>
-#include <media/audiochip.h>
 #include <media/v4l2-common.h>
 
 #include "cx25840.h"
@@ -176,9 +175,9 @@ static void cx25840_initialize(struct i2c_client *client, int loadfw)
         cx25840_write(client, 0x4a5, 0x00);
         cx25840_write(client, 0x402, 0x00);
         /* 8. */
-        cx25840_write(client, 0x401, 0x18);
-        cx25840_write(client, 0x4a2, 0x10);
-        cx25840_write(client, 0x402, 0x04);
+        cx25840_and_or(client, 0x401, ~0x18, 0);
+        cx25840_and_or(client, 0x4a2, ~0x10, 0x10);
+        /* steps 8c and 8d are done in change_input() */
         /* 10. */
         cx25840_write(client, 0x8d3, 0x1f);
         cx25840_write(client, 0x8e3, 0x03);
@@ -209,6 +208,17 @@ static void input_change(struct i2c_client *client)
         struct cx25840_state *state = i2c_get_clientdata(client);
         v4l2_std_id std = cx25840_get_v4lstd(client);
 
+        /* Follow step 8c and 8d of section 3.16 in the cx25840 datasheet */
+        if (std & V4L2_STD_SECAM) {
+                cx25840_write(client, 0x402, 0);
+        }
+        else {
+                cx25840_write(client, 0x402, 0x04);
+                cx25840_write(client, 0x49f, (std & V4L2_STD_NTSC) ? 0x14 : 0x11);
+        }
+        cx25840_and_or(client, 0x401, ~0x60, 0);
+        cx25840_and_or(client, 0x401, ~0x60, 0x60);
+
         /* Note: perhaps V4L2_STD_PAL_M should be handled as V4L2_STD_NTSC
            instead of V4L2_STD_PAL. Someone needs to test this. */
         if (std & V4L2_STD_PAL) {
@@ -343,6 +353,15 @@ static int set_v4lstd(struct i2c_client *client, v4l2_std_id std)
                 }
         }
 
+        /* Follow step 9 of section 3.16 in the cx25840 datasheet.
+           Without this PAL may display a vertical ghosting effect.
+           This happens for example with the Yuan MPC622. */
+        if (fmt >= 4 && fmt < 8) {
+                /* Set format to NTSC-M */
+                cx25840_and_or(client, 0x400, ~0xf, 1);
+                /* Turn off LCOMB */
+                cx25840_and_or(client, 0x47b, ~6, 0);
+        }
         cx25840_and_or(client, 0x400, ~0xf, fmt);
         cx25840_vbi_setup(client);
         return 0;
@@ -359,7 +378,14 @@ v4l2_std_id cx25840_get_v4lstd(struct i2c_client * client)
         }
 
         switch (fmt) {
-        case 0x1: return V4L2_STD_NTSC_M | V4L2_STD_NTSC_M_KR;
+        case 0x1:
+        {
+                /* if the audio std is A2-M, then this is the South Korean
+                   NTSC standard */
+                if (cx25840_read(client, 0x805) == 2)
+                        return V4L2_STD_NTSC_M_KR;
+                return V4L2_STD_NTSC_M;
+        }
         case 0x2: return V4L2_STD_NTSC_M_JP;
         case 0x3: return V4L2_STD_NTSC_443;
         case 0x4: return V4L2_STD_PAL;
@@ -737,16 +763,6 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd,
                 return set_input(client, state->vid_input, input->index);
         }
 
-        case VIDIOC_G_AUDIO:
-        {
-                struct v4l2_audio *input = arg;
-
-                memset(input, 0, sizeof(*input));
-                input->index = state->aud_input;
-                input->capability = V4L2_AUDCAP_STEREO;
-                break;
-        }
-
         case VIDIOC_S_FREQUENCY:
                 input_change(client);
                 break;
@@ -794,13 +810,14 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd,
                            bilingual -> lang1 */
                         cx25840_and_or(client, 0x809, ~0xf, 0x00);
                         break;
+                case V4L2_TUNER_MODE_STEREO:
                 case V4L2_TUNER_MODE_LANG1:
                         /* mono      -> mono
                            stereo    -> stereo
                            bilingual -> lang1 */
                         cx25840_and_or(client, 0x809, ~0xf, 0x04);
                         break;
-                case V4L2_TUNER_MODE_STEREO:
+                case V4L2_TUNER_MODE_LANG1_LANG2:
                         /* mono      -> mono
                            stereo    -> stereo
                            bilingual -> lang1/lang2 */
@@ -808,7 +825,7 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd,
                         break;
                 case V4L2_TUNER_MODE_LANG2:
                         /* mono      -> mono
-                           stereo    ->stereo
+                           stereo    -> stereo
                            bilingual -> lang2 */
                         cx25840_and_or(client, 0x809, ~0xf, 0x01);
                         break;
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index e140996e6e..ff0f72340d 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -16,12 +16,13 @@ config VIDEO_CX88
           module will be called cx8800
 
 config VIDEO_CX88_ALSA
-        tristate "ALSA DMA audio support"
+        tristate "Conexant 2388x DMA audio support"
         depends on VIDEO_CX88 && SND && EXPERIMENTAL
         select SND_PCM
         ---help---
           This is a video4linux driver for direct (DMA) audio on
-          Conexant 2388x based TV cards.
+          Conexant 2388x based TV cards using ALSA.
+
           It only works with boards with function 01 enabled.
           To check if your board supports, use lspci -n.
           If supported, you should see 1471:8801 or 1471:8811
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index 3170b8f72c..f9d87b8649 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -303,7 +303,7 @@ static int dsp_buffer_free(snd_cx88_card_t *chip)
         BUG_ON(!chip->dma_size);
 
         dprintk(2,"Freeing buffer\n");
-        videobuf_dma_pci_unmap(chip->pci, &chip->dma_risc);
+        videobuf_pci_dma_unmap(chip->pci, &chip->dma_risc);
         videobuf_dma_free(&chip->dma_risc);
         btcx_riscmem_free(chip->pci,&chip->buf->risc);
         kfree(chip->buf);
@@ -429,7 +429,7 @@ static int snd_cx88_hw_params(struct snd_pcm_substream * substream,
         videobuf_dma_init_kernel(&buf->vb.dma,PCI_DMA_FROMDEVICE,
                         (PAGE_ALIGN(buf->vb.size) >> PAGE_SHIFT));
 
-        videobuf_dma_pci_map(chip->pci,&buf->vb.dma);
+        videobuf_pci_dma_map(chip->pci,&buf->vb.dma);
 
 
         cx88_risc_databuffer(chip->pci, &buf->risc,
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index a502a4d6e4..e100d8ef36 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1341,7 +1341,7 @@ bb_buf_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
                enum v4l2_field field)
 {
         struct cx8802_fh *fh = q->priv_data;
-        return cx8802_buf_prepare(fh->dev, (struct cx88_buffer*)vb, field);
+        return cx8802_buf_prepare(q, fh->dev, (struct cx88_buffer*)vb, field);
 }
 
 static void
@@ -1354,8 +1354,7 @@ bb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
 static void
 bb_buf_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
 {
-        struct cx8802_fh *fh = q->priv_data;
-        cx88_free_buffer(fh->dev->pci, (struct cx88_buffer*)vb);
+        cx88_free_buffer(q, (struct cx88_buffer*)vb);
 }
 
 static struct videobuf_queue_ops blackbird_qops = {
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index c2cdbafdb7..2c3d9f1999 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -213,13 +213,13 @@ int cx88_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
 }
 
 void
-cx88_free_buffer(struct pci_dev *pci, struct cx88_buffer *buf)
+cx88_free_buffer(struct videobuf_queue *q, struct cx88_buffer *buf)
 {
         BUG_ON(in_interrupt());
         videobuf_waiton(&buf->vb,0,0);
-        videobuf_dma_pci_unmap(pci, &buf->vb.dma);
+        videobuf_dma_unmap(q, &buf->vb.dma);
         videobuf_dma_free(&buf->vb.dma);
-        btcx_riscmem_free(pci, &buf->risc);
+        btcx_riscmem_free((struct pci_dev *)q->dev, &buf->risc);
         buf->vb.state = STATE_NEEDS_INIT;
 }
 
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index a9fc2695b1..f0ea9b5cdb 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -90,7 +90,7 @@ static int dvb_buf_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
                            enum v4l2_field field)
 {
         struct cx8802_dev *dev = q->priv_data;
-        return cx8802_buf_prepare(dev, (struct cx88_buffer*)vb,field);
+        return cx8802_buf_prepare(q, dev, (struct cx88_buffer*)vb,field);
 }
 
 static void dvb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
@@ -101,8 +101,7 @@ static void dvb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
 
 static void dvb_buf_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
 {
-        struct cx8802_dev *dev = q->priv_data;
-        cx88_free_buffer(dev->pci, (struct cx88_buffer*)vb);
+        cx88_free_buffer(q, (struct cx88_buffer*)vb);
 }
 
 static struct videobuf_queue_ops dvb_qops = {
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index c79cc1d2bf..7d16888b4a 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -163,8 +163,8 @@ static int cx8802_restart_queue(struct cx8802_dev    *dev,
 
 /* ------------------------------------------------------------------ */
 
-int cx8802_buf_prepare(struct cx8802_dev *dev, struct cx88_buffer *buf,
-                        enum v4l2_field field)
+int cx8802_buf_prepare(struct videobuf_queue *q, struct cx8802_dev *dev,
+                        struct cx88_buffer *buf, enum v4l2_field field)
 {
         int size = dev->ts_packet_size * dev->ts_packet_count;
         int rc;
@@ -179,7 +179,7 @@ int cx8802_buf_prepare(struct cx8802_dev *dev, struct cx88_buffer *buf,
                 buf->vb.size   = size;
                 buf->vb.field  = field /*V4L2_FIELD_TOP*/;
 
-                if (0 != (rc = videobuf_iolock(dev->pci,&buf->vb,NULL)))
+                if (0 != (rc = videobuf_iolock(q,&buf->vb,NULL)))
                         goto fail;
                 cx88_risc_databuffer(dev->pci, &buf->risc,
                                      buf->vb.dma.sglist,
@@ -189,36 +189,36 @@ int cx8802_buf_prepare(struct cx8802_dev *dev, struct cx88_buffer *buf,
         return 0;
 
  fail:
-        cx88_free_buffer(dev->pci,buf);
+        cx88_free_buffer(q,buf);
         return rc;
 }
 
 void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)
 {
         struct cx88_buffer    *prev;
-        struct cx88_dmaqueue  *q    = &dev->mpegq;
+        struct cx88_dmaqueue  *cx88q = &dev->mpegq;
 
         dprintk( 1, "cx8802_buf_queue\n" );
         /* add jump to stopper */
         buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
-        buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma);
+        buf->risc.jmp[1] = cpu_to_le32(cx88q->stopper.dma);
 
-        if (list_empty(&q->active)) {
+        if (list_empty(&cx88q->active)) {
                 dprintk( 0, "queue is empty - first active\n" );
-                list_add_tail(&buf->vb.queue,&q->active);
-                cx8802_start_dma(dev, q, buf);
+                list_add_tail(&buf->vb.queue,&cx88q->active);
+                cx8802_start_dma(dev, cx88q, buf);
                 buf->vb.state = STATE_ACTIVE;
-                buf->count    = q->count++;
-                mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
+                buf->count    = cx88q->count++;
+                mod_timer(&cx88q->timeout, jiffies+BUFFER_TIMEOUT);
                 dprintk(0,"[%p/%d] %s - first active\n",
                         buf, buf->vb.i, __FUNCTION__);
 
         } else {
                 dprintk( 1, "queue is not empty - append to active\n" );
-                prev = list_entry(q->active.prev, struct cx88_buffer, vb.queue);
-                list_add_tail(&buf->vb.queue,&q->active);
+                prev = list_entry(cx88q->active.prev, struct cx88_buffer, vb.queue);
+                list_add_tail(&buf->vb.queue,&cx88q->active);
                 buf->vb.state = STATE_ACTIVE;
-                buf->count    = q->count++;
+                buf->count    = cx88q->count++;
                 prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
                 dprintk( 1, "[%p/%d] %s - append to active\n",
                         buf, buf->vb.i, __FUNCTION__);
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index da8d97ce0c..641a0c5a64 100644
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -885,6 +885,7 @@ void cx88_set_stereo(struct cx88_core *core, u32 mode, int manual)
                         set_audio_standard_BTSC(core, 1, EN_BTSC_FORCE_SAP);
                         break;
                 case V4L2_TUNER_MODE_STEREO:
+                case V4L2_TUNER_MODE_LANG1_LANG2:
                         set_audio_standard_BTSC(core, 0, EN_BTSC_FORCE_STEREO);
                         break;
                 }
@@ -905,6 +906,7 @@ void cx88_set_stereo(struct cx88_core *core, u32 mode, int manual)
                                                          EN_NICAM_FORCE_MONO2);
                                 break;
                         case V4L2_TUNER_MODE_STEREO:
+                        case V4L2_TUNER_MODE_LANG1_LANG2:
                                 set_audio_standard_NICAM(core,
                                                          EN_NICAM_FORCE_STEREO);
                                 break;
@@ -926,6 +928,7 @@ void cx88_set_stereo(struct cx88_core *core, u32 mode, int manual)
                                                               EN_A2_FORCE_MONO2);
                                         break;
                                 case V4L2_TUNER_MODE_STEREO:
+                                case V4L2_TUNER_MODE_LANG1_LANG2:
                                         set_audio_standard_A2(core,
                                                               EN_A2_FORCE_STEREO);
                                         break;
diff --git a/drivers/media/video/cx88/cx88-vbi.c b/drivers/media/video/cx88/cx88-vbi.c
index 9bc6c89955..846faadc9f 100644
--- a/drivers/media/video/cx88/cx88-vbi.c
+++ b/drivers/media/video/cx88/cx88-vbi.c
@@ -175,7 +175,7 @@ vbi_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
                 buf->vb.size   = size;
                 buf->vb.field  = V4L2_FIELD_SEQ_TB;
 
-                if (0 != (rc = videobuf_iolock(dev->pci,&buf->vb,NULL)))
+                if (0 != (rc = videobuf_iolock(q,&buf->vb,NULL)))
                         goto fail;
                 cx88_risc_buffer(dev->pci, &buf->risc,
                                  buf->vb.dma.sglist,
@@ -187,7 +187,7 @@ vbi_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
         return 0;
 
  fail:
-        cx88_free_buffer(dev->pci,buf);
+        cx88_free_buffer(q,buf);
         return rc;
 }
 
@@ -227,9 +227,8 @@ vbi_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
 static void vbi_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
 {
         struct cx88_buffer *buf = container_of(vb,struct cx88_buffer,vb);
-        struct cx8800_fh   *fh  = q->priv_data;
 
-        cx88_free_buffer(fh->dev->pci,buf);
+        cx88_free_buffer(q,buf);
 }
 
 struct videobuf_queue_ops cx8800_vbi_qops = {
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 6c97aa740d..72a417b317 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -564,7 +564,7 @@ buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
 
         if (STATE_NEEDS_INIT == buf->vb.state) {
                 init_buffer = 1;
-                if (0 != (rc = videobuf_iolock(dev->pci,&buf->vb,NULL)))
+                if (0 != (rc = videobuf_iolock(q,&buf->vb,NULL)))
                         goto fail;
         }
 
@@ -614,7 +614,7 @@ buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
         return 0;
 
  fail:
-        cx88_free_buffer(dev->pci,buf);
+        cx88_free_buffer(q,buf);
         return rc;
 }
 
@@ -671,9 +671,8 @@ buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
 static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
 {
         struct cx88_buffer *buf = container_of(vb,struct cx88_buffer,vb);
-        struct cx8800_fh   *fh  = q->priv_data;
 
-        cx88_free_buffer(fh->dev->pci,buf);
+        cx88_free_buffer(q,buf);
 }
 
 static struct videobuf_queue_ops cx8800_video_qops = {
@@ -1251,9 +1250,17 @@ int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,
 {
         int err;
 
-        dprintk(2, "CORE IOCTL: 0x%x\n", cmd );
-        if (video_debug > 1)
-                v4l_print_ioctl(core->name,cmd);
+       if (video_debug) {
+               if (video_debug > 1) {
+                       if (_IOC_DIR(cmd) & _IOC_WRITE)
+                               v4l_printk_ioctl_arg("cx88(w)",cmd, arg);
+                       else if (!_IOC_DIR(cmd) & _IOC_READ) {
+                               v4l_print_ioctl("cx88", cmd);
+                       }
+               } else
+                       v4l_print_ioctl(core->name,cmd);
+
+       }
 
         switch (cmd) {
         /* ---------- tv norms ---------- */
@@ -1460,7 +1467,19 @@ int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,
 static int video_ioctl(struct inode *inode, struct file *file,
                        unsigned int cmd, unsigned long arg)
 {
-        return video_usercopy(inode, file, cmd, arg, video_do_ioctl);
+       int retval;
+
+       retval=video_usercopy(inode, file, cmd, arg, video_do_ioctl);
+
+       if (video_debug > 1) {
+               if (retval < 0) {
+                       v4l_print_ioctl("cx88(err)", cmd);
+                       printk(KERN_DEBUG "cx88(err): errcode=%d\n",retval);
+               } else if (_IOC_DIR(cmd) & _IOC_READ)
+                       v4l_printk_ioctl_arg("cx88(r)",cmd, (void *)arg);
+       }
+
+       return retval;
 }
 
 /* ----------------------------------------------------------- */
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index cfa8668784..326a25f147 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -27,7 +27,6 @@
 
 #include <media/tuner.h>
 #include <media/tveeprom.h>
-#include <media/audiochip.h>
 #include <media/video-buf.h>
 #include <media/video-buf-dvb.h>
 
@@ -485,7 +484,7 @@ extern int
 cx88_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
                   u32 reg, u32 mask, u32 value);
 extern void
-cx88_free_buffer(struct pci_dev *pci, struct cx88_buffer *buf);
+cx88_free_buffer(struct videobuf_queue *q, struct cx88_buffer *buf);
 
 extern void cx88_risc_disasm(struct cx88_core *core,
                              struct btcx_riscmem *risc);
@@ -577,8 +576,8 @@ void cx88_ir_irq(struct cx88_core *core);
 /* ----------------------------------------------------------- */
 /* cx88-mpeg.c                                                 */
 
-int cx8802_buf_prepare(struct cx8802_dev *dev, struct cx88_buffer *buf,
-                        enum v4l2_field field);
+int cx8802_buf_prepare(struct videobuf_queue *q,struct cx8802_dev *dev,
+                        struct cx88_buffer *buf, enum v4l2_field field);
 void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf);
 void cx8802_cancel_buffers(struct cx8802_dev *dev);
 
diff --git a/drivers/usb/media/dabfirmware.h b/drivers/media/video/dabfirmware.h
index d14d803566..d14d803566 100644
--- a/drivers/usb/media/dabfirmware.h
+++ b/drivers/media/video/dabfirmware.h
diff --git a/drivers/usb/media/dabusb.c b/drivers/media/video/dabusb.c
index 1774ab7a40..b9ba95f5e0 100644
--- a/drivers/usb/media/dabusb.c
+++ b/drivers/media/video/dabusb.c
@@ -86,7 +86,7 @@ static int dabusb_add_buf_tail (pdabusb_t s, struct list_head *dst, struct list_
         return ret;
 }
 /*-------------------------------------------------------------------*/
-#ifdef DEBUG 
+#ifdef DEBUG
 static void dump_urb (struct urb *urb)
 {
         dbg("urb                   :%p", urb);
@@ -136,7 +136,7 @@ static int dabusb_free_queue (struct list_head *q)
         for (p = q->next; p != q;) {
                 b = list_entry (p, buff_t, buff_list);
 
-#ifdef DEBUG 
+#ifdef DEBUG
                 dump_urb(b->purb);
 #endif
                 kfree(b->purb->transfer_buffer);
@@ -287,7 +287,7 @@ static int dabusb_bulk (pdabusb_t s, pbulk_transfer_t pb)
                 }
 
         }
-        
+
         if( ret == -EPIPE ) {
                 warn("CLEAR_FEATURE request to remove STALL condition.");
                 if(usb_clear_halt(s->usbdev, usb_pipeendpoint(pipe)))
@@ -328,7 +328,7 @@ static int dabusb_loadmem (pdabusb_t s, const char *fname)
         PINTEL_HEX_RECORD ptr = firmware;
 
         dbg("Enter dabusb_loadmem (internal)");
-        
+
         ret = dabusb_8051_reset (s, 1);
         while (ptr->Type == 0) {
 
@@ -449,7 +449,7 @@ static int dabusb_startrek (pdabusb_t s)
         if (!list_empty (&s->free_buff_list)) {
                 pbuff_t end;
                 int ret;
-                
+
         while (!dabusb_add_buf_tail (s, &s->rec_buff_list, &s->free_buff_list)) {
 
                         dbg("submitting: end:%p s->rec_buff_list:%p", s->rec_buff_list.prev, &s->rec_buff_list);
@@ -506,7 +506,7 @@ static ssize_t dabusb_read (struct file *file, char __user *buf, size_t count, l
                         err("error: rec_buf_list is empty");
                         goto err;
                 }
-                
+
                 b = list_entry (s->rec_buff_list.next, buff_t, buff_list);
                 purb = b->purb;
 
@@ -783,9 +783,9 @@ static void dabusb_disconnect (struct usb_interface *intf)
         pdabusb_t s = usb_get_intfdata (intf);
 
         dbg("dabusb_disconnect");
-        
+
         init_waitqueue_entry(&__wait, current);
-        
+
         usb_set_intfdata (intf, NULL);
         if (s) {
                 usb_deregister_dev (intf, &dabusb_class);
@@ -797,7 +797,7 @@ static void dabusb_disconnect (struct usb_interface *intf)
                         schedule();
                 current->state = TASK_RUNNING;
                 remove_wait_queue(&s->remove_ok, &__wait);
-                
+
                 s->usbdev = NULL;
                 s->overruns = 0;
         }
diff --git a/drivers/usb/media/dabusb.h b/drivers/media/video/dabusb.h
index 96b03e4af8..00eb34c863 100644
--- a/drivers/usb/media/dabusb.h
+++ b/drivers/media/video/dabusb.h
@@ -10,7 +10,7 @@ typedef struct
 #define DABUSB_VERSION 0x1000
 #define IOCTL_DAB_BULK              _IOWR('d', 0x30, bulk_transfer_t)
 #define IOCTL_DAB_OVERRUNS          _IOR('d',  0x15, int)
-#define IOCTL_DAB_VERSION           _IOR('d', 0x3f, int) 
+#define IOCTL_DAB_VERSION           _IOR('d', 0x3f, int)
 
 #ifdef __KERNEL__
 
@@ -36,7 +36,7 @@ typedef struct
         struct list_head rec_buff_list;
 } dabusb_t,*pdabusb_t;
 
-typedef struct 
+typedef struct
 {
         pdabusb_t s;
         struct urb *purb;
diff --git a/drivers/usb/media/dsbr100.c b/drivers/media/video/dsbr100.c
index 25646804d5..3b4e9985c3 100644
--- a/drivers/usb/media/dsbr100.c
+++ b/drivers/media/video/dsbr100.c
@@ -37,28 +37,28 @@
   Markus: Updates for 2.6.x kernels, code layout changes, name sanitizing
 
  Version 0.30:
-        Markus: Updates for 2.5.x kernel and more ISO compliant source
+        Markus: Updates for 2.5.x kernel and more ISO compliant source
 
  Version 0.25:
-        PSL and Markus: Cleanup, radio now doesn't stop on device close
+        PSL and Markus: Cleanup, radio now doesn't stop on device close
 
  Version 0.24:
-        Markus: Hope I got these silly VIDEO_TUNER_LOW issues finally
+        Markus: Hope I got these silly VIDEO_TUNER_LOW issues finally
         right.  Some minor cleanup, improved standalone compilation
 
  Version 0.23:
-        Markus: Sign extension bug fixed by declaring transfer_buffer unsigned
+        Markus: Sign extension bug fixed by declaring transfer_buffer unsigned
 
  Version 0.22:
-        Markus: Some (brown bag) cleanup in what VIDIOCSTUNER returns, 
+        Markus: Some (brown bag) cleanup in what VIDIOCSTUNER returns,
         thanks to Mike Cox for pointing the problem out.
 
  Version 0.21:
-        Markus: Minor cleanup, warnings if something goes wrong, lame attempt
+        Markus: Minor cleanup, warnings if something goes wrong, lame attempt
         to adhere to Documentation/CodingStyle
 
- Version 0.2: 
-        Brad Hards <bradh@dynamite.com.au>: Fixes to make it work as non-module
+ Version 0.2:
+        Brad Hards <bradh@dynamite.com.au>: Fixes to make it work as non-module
         Markus: Copyright clarification
 
  Version 0.01: Markus: initial release
@@ -163,11 +163,11 @@ static struct usb_driver usb_dsbr100_driver = {
 static int dsbr100_start(dsbr100_device *radio)
 {
         if (usb_control_msg(radio->usbdev, usb_rcvctrlpipe(radio->usbdev, 0),
-                        USB_REQ_GET_STATUS, 
+                        USB_REQ_GET_STATUS,
                         USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
                         0x00, 0xC7, radio->transfer_buffer, 8, 300)<0 ||
         usb_control_msg(radio->usbdev, usb_rcvctrlpipe(radio->usbdev, 0),
-                        DSB100_ONOFF, 
+                        DSB100_ONOFF,
                         USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
                         0x01, 0x00, radio->transfer_buffer, 8, 300)<0)
                 return -1;
@@ -179,11 +179,11 @@ static int dsbr100_start(dsbr100_device *radio)
 static int dsbr100_stop(dsbr100_device *radio)
 {
         if (usb_control_msg(radio->usbdev, usb_rcvctrlpipe(radio->usbdev, 0),
-                        USB_REQ_GET_STATUS, 
+                        USB_REQ_GET_STATUS,
                         USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
                         0x16, 0x1C, radio->transfer_buffer, 8, 300)<0 ||
         usb_control_msg(radio->usbdev, usb_rcvctrlpipe(radio->usbdev, 0),
-                        DSB100_ONOFF, 
+                        DSB100_ONOFF,
                         USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
                         0x00, 0x00, radio->transfer_buffer, 8, 300)<0)
                 return -1;
@@ -195,16 +195,16 @@ static int dsbr100_setfreq(dsbr100_device *radio, int freq)
 {
         freq = (freq/16*80)/1000+856;
         if (usb_control_msg(radio->usbdev, usb_rcvctrlpipe(radio->usbdev, 0),
-                        DSB100_TUNE, 
+                        DSB100_TUNE,
                         USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
-                        (freq>>8)&0x00ff, freq&0xff, 
+                        (freq>>8)&0x00ff, freq&0xff,
                         radio->transfer_buffer, 8, 300)<0 ||
            usb_control_msg(radio->usbdev, usb_rcvctrlpipe(radio->usbdev, 0),
-                        USB_REQ_GET_STATUS, 
+                        USB_REQ_GET_STATUS,
                         USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
                         0x96, 0xB7, radio->transfer_buffer, 8, 300)<0 ||
         usb_control_msg(radio->usbdev, usb_rcvctrlpipe(radio->usbdev, 0),
-                        USB_REQ_GET_STATUS, 
+                        USB_REQ_GET_STATUS,
                         USB_TYPE_VENDOR | USB_RECIP_DEVICE |  USB_DIR_IN,
                         0x00, 0x24, radio->transfer_buffer, 8, 300)<0) {
                 radio->stereo = -1;
@@ -219,7 +219,7 @@ sees a stereo signal or not.  Pity. */
 static void dsbr100_getstat(dsbr100_device *radio)
 {
         if (usb_control_msg(radio->usbdev, usb_rcvctrlpipe(radio->usbdev, 0),
-                USB_REQ_GET_STATUS, 
+                USB_REQ_GET_STATUS,
                 USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
                 0x00 , 0x24, radio->transfer_buffer, 8, 300)<0)
                 radio->stereo = -1;
@@ -232,7 +232,7 @@ static void dsbr100_getstat(dsbr100_device *radio)
 
 /* check if the device is present and register with v4l and
 usb if it is */
-static int usb_dsbr100_probe(struct usb_interface *intf, 
+static int usb_dsbr100_probe(struct usb_interface *intf,
                          const struct usb_device_id *id)
 {
         dsbr100_device *radio;
@@ -243,7 +243,7 @@ static int usb_dsbr100_probe(struct usb_interface *intf,
                 kfree(radio);
                 return -ENOMEM;
         }
-        memcpy(radio->videodev, &dsbr100_videodev_template, 
+        memcpy(radio->videodev, &dsbr100_videodev_template,
                 sizeof(dsbr100_videodev_template));
         radio->removed = 0;
         radio->users = 0;
@@ -310,7 +310,7 @@ static int usb_dsbr100_do_ioctl(struct inode *inode, struct file *file,
                         struct video_tuner *v = arg;
 
                         dsbr100_getstat(radio);
-                        if(v->tuner)    /* Only 1 tuner */ 
+                        if(v->tuner)    /* Only 1 tuner */
                                 return -EINVAL;
                         v->rangelow = FREQ_MIN*FREQ_MUL;
                         v->rangehigh = FREQ_MAX*FREQ_MUL;
@@ -355,12 +355,12 @@ static int usb_dsbr100_do_ioctl(struct inode *inode, struct file *file,
                         v->volume = 1;
                         v->step = 1;
                         strcpy(v->name, "Radio");
-                        return 0;                       
+                        return 0;
                 }
                 case VIDIOCSAUDIO: {
                         struct video_audio *v = arg;
 
-                        if (v->audio) 
+                        if (v->audio)
                                 return -EINVAL;
                         if (v->flags&VIDEO_AUDIO_MUTE) {
                                 if (dsbr100_stop(radio)==-1)
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 4e22fc4889..f62fd706b4 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -28,10 +28,10 @@
 #include <linux/i2c.h>
 #include <linux/usb.h>
 #include <media/tuner.h>
-#include <media/audiochip.h>
+#include <media/msp3400.h>
 #include <media/tveeprom.h>
+#include <media/audiochip.h>
 #include <media/v4l2-common.h>
-#include "msp3400.h"
 
 #include "em28xx.h"
 
@@ -147,11 +147,12 @@ struct em28xx_board em28xx_boards[] = {
                 .input          = {{
                         .type     = EM28XX_VMUX_TELEVISION,
                         .vmux     = 0,
-                        .amux     = 6,
+                        .amux     = MSP_INPUT_DEFAULT,
                 },{
                         .type     = EM28XX_VMUX_SVIDEO,
                         .vmux     = 2,
-                        .amux     = 1,
+                        .amux     = MSP_INPUT(MSP_IN_SCART_1, MSP_IN_TUNER_1,
+                                        MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART),
                 }},
         },
         [EM2820_BOARD_MSI_VOX_USB_2] = {
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 780342f7b2..dfba33d0fa 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -38,6 +38,7 @@
 #include "em28xx.h"
 #include <media/tuner.h>
 #include <media/v4l2-common.h>
+#include <media/msp3400.h>
 
 #define DRIVER_AUTHOR "Ludovico Cavedon <cavedon@sssup.it>, " \
                       "Markus Rechberger <mrechberger@gmail.com>, " \
@@ -216,9 +217,14 @@ static void video_mux(struct em28xx *dev, int index)
         em28xx_videodbg("Setting input index=%d, vmux=%d, amux=%d\n",index,input,dev->ctl_ainput);
 
         if (dev->has_msp34xx) {
+                struct v4l2_routing route;
+
                 if (dev->i2s_speed)
                         em28xx_i2c_call_clients(dev, VIDIOC_INT_I2S_CLOCK_FREQ, &dev->i2s_speed);
-                em28xx_i2c_call_clients(dev, VIDIOC_S_AUDIO, &dev->ctl_ainput);
+                route.input = dev->ctl_ainput;
+                route.output = MSP_OUTPUT(MSP_OUT_SCART1_DA);
+                /* Note: this is msp3400 specific */
+                em28xx_i2c_call_clients(dev, VIDIOC_INT_S_AUDIO_ROUTING, &route);
                 ainput = EM28XX_AUDIO_SRC_TUNER;
                 em28xx_audio_source(dev, ainput);
         } else {
diff --git a/drivers/media/video/et61x251/Makefile b/drivers/media/video/et61x251/Makefile
new file mode 100644
index 0000000000..2ff4db9ec8
--- /dev/null
+++ b/drivers/media/video/et61x251/Makefile
@@ -0,0 +1,4 @@
+et61x251-objs   := et61x251_core.o et61x251_tas5130d1b.o
+
+obj-$(CONFIG_USB_ET61X251)      += et61x251.o
+
diff --git a/drivers/usb/media/et61x251.h b/drivers/media/video/et61x251/et61x251.h
index eee8afc9be..2e5ca40324 100644
--- a/drivers/usb/media/et61x251.h
+++ b/drivers/media/video/et61x251/et61x251.h
@@ -180,7 +180,7 @@ et61x251_match_id(struct et61x251_device* cam, const struct usb_device_id *id)
 
 void
 et61x251_attach_sensor(struct et61x251_device* cam,
-                       struct et61x251_sensor* sensor)
+                       struct et61x251_sensor* sensor)
 {
         memcpy(&cam->sensor, sensor, sizeof(struct et61x251_sensor));
 }
@@ -199,7 +199,7 @@ do {                                                                          \
                         dev_info(&cam->usbdev->dev, fmt "\n", ## args);       \
                 else if ((level) >= 3)                                        \
                         dev_info(&cam->usbdev->dev, "[%s:%d] " fmt "\n",      \
-                                 __FUNCTION__, __LINE__ , ## args);           \
+                                 __FUNCTION__, __LINE__ , ## args);           \
         }                                                                     \
 } while (0)
 #       define KDBG(level, fmt, args...)                                      \
@@ -209,7 +209,7 @@ do {                                                                          \
                         pr_info("et61x251: " fmt "\n", ## args);              \
                 else if ((level) == 3)                                        \
                         pr_debug("et61x251: [%s:%d] " fmt "\n", __FUNCTION__, \
-                                 __LINE__ , ## args);                         \
+                                 __LINE__ , ## args);                         \
         }                                                                     \
 } while (0)
 #       define V4LDBG(level, name, cmd)                                       \
@@ -226,7 +226,7 @@ do {                                                                          \
 #undef PDBG
 #define PDBG(fmt, args...)                                                    \
 dev_info(&cam->usbdev->dev, "[%s:%d] " fmt "\n",                              \
-         __FUNCTION__, __LINE__ , ## args)
+         __FUNCTION__, __LINE__ , ## args)
 
 #undef PDBGG
 #define PDBGG(fmt, args...) do {;} while(0) /* placeholder */
diff --git a/drivers/usb/media/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index 7cc01b828b..dfc9dd732c 100644
--- a/drivers/usb/media/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -44,7 +44,7 @@
 /*****************************************************************************/
 
 #define ET61X251_MODULE_NAME    "V4L2 driver for ET61X[12]51 "                \
-                                "PC Camera Controllers"
+                                "PC Camera Controllers"
 #define ET61X251_MODULE_AUTHOR  "(C) 2006 Luca Risolia"
 #define ET61X251_AUTHOR_EMAIL   "<luca.risolia@studio.unibo.it>"
 #define ET61X251_MODULE_LICENSE "GPL"
@@ -63,68 +63,68 @@ MODULE_LICENSE(ET61X251_MODULE_LICENSE);
 static short video_nr[] = {[0 ... ET61X251_MAX_DEVICES-1] = -1};
 module_param_array(video_nr, short, NULL, 0444);
 MODULE_PARM_DESC(video_nr,
-                 "\n<-1|n[,...]> Specify V4L2 minor mode number."
-                 "\n -1 = use next available (default)"
-                 "\n  n = use minor number n (integer >= 0)"
-                 "\nYou can specify up to "
-                 __MODULE_STRING(ET61X251_MAX_DEVICES) " cameras this way."
-                 "\nFor example:"
-                 "\nvideo_nr=-1,2,-1 would assign minor number 2 to"
-                 "\nthe second registered camera and use auto for the first"
-                 "\none and for every other camera."
-                 "\n");
+                 "\n<-1|n[,...]> Specify V4L2 minor mode number."
+                 "\n -1 = use next available (default)"
+                 "\n  n = use minor number n (integer >= 0)"
+                 "\nYou can specify up to "
+                 __MODULE_STRING(ET61X251_MAX_DEVICES) " cameras this way."
+                 "\nFor example:"
+                 "\nvideo_nr=-1,2,-1 would assign minor number 2 to"
+                 "\nthe second registered camera and use auto for the first"
+                 "\none and for every other camera."
+                 "\n");
 
 static short force_munmap[] = {[0 ... ET61X251_MAX_DEVICES-1] =
-                               ET61X251_FORCE_MUNMAP};
+                               ET61X251_FORCE_MUNMAP};
 module_param_array(force_munmap, bool, NULL, 0444);
 MODULE_PARM_DESC(force_munmap,
-                 "\n<0|1[,...]> Force the application to unmap previously"
-                 "\nmapped buffer memory before calling any VIDIOC_S_CROP or"
-                 "\nVIDIOC_S_FMT ioctl's. Not all the applications support"
-                 "\nthis feature. This parameter is specific for each"
-                 "\ndetected camera."
-                 "\n 0 = do not force memory unmapping"
-                 "\n 1 = force memory unmapping (save memory)"
-                 "\nDefault value is "__MODULE_STRING(SN9C102_FORCE_MUNMAP)"."
-                 "\n");
+                 "\n<0|1[,...]> Force the application to unmap previously"
+                 "\nmapped buffer memory before calling any VIDIOC_S_CROP or"
+                 "\nVIDIOC_S_FMT ioctl's. Not all the applications support"
+                 "\nthis feature. This parameter is specific for each"
+                 "\ndetected camera."
+                 "\n 0 = do not force memory unmapping"
+                 "\n 1 = force memory unmapping (save memory)"
+                 "\nDefault value is "__MODULE_STRING(SN9C102_FORCE_MUNMAP)"."
+                 "\n");
 
 static unsigned int frame_timeout[] = {[0 ... ET61X251_MAX_DEVICES-1] =
-                                       ET61X251_FRAME_TIMEOUT};
+                                       ET61X251_FRAME_TIMEOUT};
 module_param_array(frame_timeout, uint, NULL, 0644);
 MODULE_PARM_DESC(frame_timeout,
-                 "\n<n[,...]> Timeout for a video frame in seconds."
-                 "\nThis parameter is specific for each detected camera."
-                 "\nDefault value is "
-                 __MODULE_STRING(ET61X251_FRAME_TIMEOUT)"."
-                 "\n");
+                 "\n<n[,...]> Timeout for a video frame in seconds."
+                 "\nThis parameter is specific for each detected camera."
+                 "\nDefault value is "
+                 __MODULE_STRING(ET61X251_FRAME_TIMEOUT)"."
+                 "\n");
 
 #ifdef ET61X251_DEBUG
 static unsigned short debug = ET61X251_DEBUG_LEVEL;
 module_param(debug, ushort, 0644);
 MODULE_PARM_DESC(debug,
-                 "\n<n> Debugging information level, from 0 to 3:"
-                 "\n0 = none (use carefully)"
-                 "\n1 = critical errors"
-                 "\n2 = significant informations"
-                 "\n3 = more verbose messages"
-                 "\nLevel 3 is useful for testing only, when only "
-                 "one device is used."
-                 "\nDefault value is "__MODULE_STRING(ET61X251_DEBUG_LEVEL)"."
-                 "\n");
+                 "\n<n> Debugging information level, from 0 to 3:"
+                 "\n0 = none (use carefully)"
+                 "\n1 = critical errors"
+                 "\n2 = significant informations"
+                 "\n3 = more verbose messages"
+                 "\nLevel 3 is useful for testing only, when only "
+                 "one device is used."
+                 "\nDefault value is "__MODULE_STRING(ET61X251_DEBUG_LEVEL)"."
+                 "\n");
 #endif
 
 /*****************************************************************************/
 
 static u32
 et61x251_request_buffers(struct et61x251_device* cam, u32 count,
-                         enum et61x251_io_method io)
+                         enum et61x251_io_method io)
 {
         struct v4l2_pix_format* p = &(cam->sensor.pix_format);
         struct v4l2_rect* r = &(cam->sensor.cropcap.bounds);
         const size_t imagesize = cam->module_param.force_munmap ||
-                                 io == IO_READ ?
-                                 (p->width * p->height * p->priv) / 8 :
-                                 (r->width * r->height * p->priv) / 8;
+                                 io == IO_READ ?
+                                 (p->width * p->height * p->priv) / 8 :
+                                 (r->width * r->height * p->priv) / 8;
         void* buff = NULL;
         u32 i;
 
@@ -216,7 +216,7 @@ int et61x251_write_reg(struct et61x251_device* cam, u8 value, u16 index)
         *buff = value;
 
         res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x00, 0x41,
-                              0, index, buff, 1, ET61X251_CTRL_TIMEOUT);
+                              0, index, buff, 1, ET61X251_CTRL_TIMEOUT);
         if (res < 0) {
                 DBG(3, "Failed to write a register (value 0x%02X, index "
                        "0x%02X, error %d)", value, index, res);
@@ -234,7 +234,7 @@ int et61x251_read_reg(struct et61x251_device* cam, u16 index)
         int res;
 
         res = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x00, 0xc1,
-                              0, index, buff, 1, ET61X251_CTRL_TIMEOUT);
+                              0, index, buff, 1, ET61X251_CTRL_TIMEOUT);
         if (res < 0)
                 DBG(3, "Failed to read a register (index 0x%02X, error %d)",
                     index, res);
@@ -269,7 +269,7 @@ et61x251_i2c_wait(struct et61x251_device* cam, struct et61x251_sensor* sensor)
 
 int
 et61x251_i2c_try_read(struct et61x251_device* cam,
-                      struct et61x251_sensor* sensor, u8 address)
+                      struct et61x251_sensor* sensor, u8 address)
 {
         struct usb_device* udev = cam->usbdev;
         u8* data = cam->control_buffer;
@@ -280,14 +280,14 @@ et61x251_i2c_try_read(struct et61x251_device* cam,
         data[2] = cam->sensor.rsta | 0x10;
         data[3] = !(et61x251_read_reg(cam, 0x8b) & 0x02);
         res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x00, 0x41,
-                              0, 0x88, data, 4, ET61X251_CTRL_TIMEOUT);
+                              0, 0x88, data, 4, ET61X251_CTRL_TIMEOUT);
         if (res < 0)
                 err += res;
 
         err += et61x251_i2c_wait(cam, sensor);
 
         res = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x00, 0xc1,
-                              0, 0x80, data, 8, ET61X251_CTRL_TIMEOUT);
+                              0, 0x80, data, 8, ET61X251_CTRL_TIMEOUT);
         if (res < 0)
                 err += res;
 
@@ -302,7 +302,7 @@ et61x251_i2c_try_read(struct et61x251_device* cam,
 
 int
 et61x251_i2c_try_write(struct et61x251_device* cam,
-                       struct et61x251_sensor* sensor, u8 address, u8 value)
+                       struct et61x251_sensor* sensor, u8 address, u8 value)
 {
         struct usb_device* udev = cam->usbdev;
         u8* data = cam->control_buffer;
@@ -312,13 +312,13 @@ et61x251_i2c_try_write(struct et61x251_device* cam,
         data[1] = cam->sensor.i2c_slave_id;
         data[2] = cam->sensor.rsta | 0x12;
         res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x00, 0x41,
-                              0, 0x88, data, 3, ET61X251_CTRL_TIMEOUT);
+                              0, 0x88, data, 3, ET61X251_CTRL_TIMEOUT);
         if (res < 0)
                 err += res;
 
         data[0] = value;
         res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x00, 0x41,
-                              0, 0x80, data, 1, ET61X251_CTRL_TIMEOUT);
+                              0, 0x80, data, 1, ET61X251_CTRL_TIMEOUT);
         if (res < 0)
                 err += res;
 
@@ -335,8 +335,8 @@ et61x251_i2c_try_write(struct et61x251_device* cam,
 
 int
 et61x251_i2c_raw_write(struct et61x251_device* cam, u8 n, u8 data1, u8 data2,
-                       u8 data3, u8 data4, u8 data5, u8 data6, u8 data7,
-                       u8 data8, u8 address)
+                       u8 data3, u8 data4, u8 data5, u8 data6, u8 data7,
+                       u8 data8, u8 address)
 {
         struct usb_device* udev = cam->usbdev;
         u8* data = cam->control_buffer;
@@ -350,7 +350,7 @@ et61x251_i2c_raw_write(struct et61x251_device* cam, u8 n, u8 data1, u8 data2,
         data[5] = data7;
         data[6] = data8;
         res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x00, 0x41,
-                              0, 0x81, data, n-1, ET61X251_CTRL_TIMEOUT);
+                              0, 0x81, data, n-1, ET61X251_CTRL_TIMEOUT);
         if (res < 0)
                 err += res;
 
@@ -358,14 +358,14 @@ et61x251_i2c_raw_write(struct et61x251_device* cam, u8 n, u8 data1, u8 data2,
         data[1] = cam->sensor.i2c_slave_id;
         data[2] = cam->sensor.rsta | 0x02 | (n << 4);
         res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x00, 0x41,
-                              0, 0x88, data, 3, ET61X251_CTRL_TIMEOUT);
+                              0, 0x88, data, 3, ET61X251_CTRL_TIMEOUT);
         if (res < 0)
                 err += res;
 
         /* Start writing through the serial interface */
         data[0] = data1;
         res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x00, 0x41,
-                              0, 0x80, data, 1, ET61X251_CTRL_TIMEOUT);
+                              0, 0x80, data, 1, ET61X251_CTRL_TIMEOUT);
         if (res < 0)
                 err += res;
 
@@ -432,11 +432,11 @@ static void et61x251_urb_complete(struct urb *urb, struct pt_regs* regs)
 
         if (!(*f))
                 (*f) = list_entry(cam->inqueue.next, struct et61x251_frame_t,
-                                  frame);
+                                  frame);
 
         imagesize = (cam->sensor.pix_format.width *
-                     cam->sensor.pix_format.height *
-                     cam->sensor.pix_format.priv) / 8;
+                     cam->sensor.pix_format.height *
+                     cam->sensor.pix_format.priv) / 8;
 
         for (i = 0; i < urb->number_of_packets; i++) {
                 unsigned int len, status;
@@ -476,7 +476,7 @@ start_of_frame:
                 if ((*f)->state == F_GRABBING) {
                         if (sof && (*f)->buf.bytesused) {
                                 if (cam->sensor.pix_format.pixelformat ==
-                                                         V4L2_PIX_FMT_ET61X251)
+                                                         V4L2_PIX_FMT_ET61X251)
                                         goto end_of_frame;
                                 else {
                                         DBG(3, "Not expected SOF detected "
@@ -508,8 +508,8 @@ end_of_frame:
                                 list_move_tail(&(*f)->frame, &cam->outqueue);
                                 if (!list_empty(&cam->inqueue))
                                         (*f) = list_entry(cam->inqueue.next,
-                                                       struct et61x251_frame_t,
-                                                          frame);
+                                                       struct et61x251_frame_t,
+                                                          frame);
                                 else
                                         (*f) = NULL;
                                 spin_unlock(&cam->queue_lock);
@@ -521,7 +521,7 @@ end_of_frame:
 
                                 if (sof &&
                                     cam->sensor.pix_format.pixelformat ==
-                                                         V4L2_PIX_FMT_ET61X251)
+                                                         V4L2_PIX_FMT_ET61X251)
                                         goto start_of_frame;
                         }
                 }
@@ -544,15 +544,15 @@ static int et61x251_start_transfer(struct et61x251_device* cam)
         struct usb_device *udev = cam->usbdev;
         struct urb* urb;
         const unsigned int wMaxPacketSize[] = {0, 256, 384, 512, 640, 768, 832,
-                                               864, 896, 920, 956, 980, 1000,
-                                               1022};
+                                               864, 896, 920, 956, 980, 1000,
+                                               1022};
         const unsigned int psz = wMaxPacketSize[ET61X251_ALTERNATE_SETTING];
         s8 i, j;
         int err = 0;
 
         for (i = 0; i < ET61X251_URBS; i++) {
                 cam->transfer_buffer[i] = kzalloc(ET61X251_ISO_PACKETS * psz,
-                                                  GFP_KERNEL);
+                                                  GFP_KERNEL);
                 if (!cam->transfer_buffer[i]) {
                         err = -ENOMEM;
                         DBG(1, "Not enough memory");
@@ -653,9 +653,9 @@ static int et61x251_stream_interrupt(struct et61x251_device* cam)
 
         cam->stream = STREAM_INTERRUPT;
         timeout = wait_event_timeout(cam->wait_stream,
-                                     (cam->stream == STREAM_OFF) ||
-                                     (cam->state & DEV_DISCONNECTED),
-                                     ET61X251_URB_TIMEOUT);
+                                     (cam->stream == STREAM_OFF) ||
+                                     (cam->state & DEV_DISCONNECTED),
+                                     ET61X251_URB_TIMEOUT);
         if (cam->state & DEV_DISCONNECTED)
                 return -ENODEV;
         else if (cam->stream != STREAM_OFF) {
@@ -699,7 +699,7 @@ static u8 et61x251_strtou8(const char* buff, size_t len, ssize_t* count)
 
 /*
    NOTE 1: being inside one of the following methods implies that the v4l
-           device exists for sure (see kobjects and reference counters)
+           device exists for sure (see kobjects and reference counters)
    NOTE 2: buffers are PAGE_SIZE long
 */
 
@@ -964,13 +964,13 @@ et61x251_store_i2c_val(struct class_device* cd, const char* buf, size_t len)
 
 
 static CLASS_DEVICE_ATTR(reg, S_IRUGO | S_IWUSR,
-                         et61x251_show_reg, et61x251_store_reg);
+                         et61x251_show_reg, et61x251_store_reg);
 static CLASS_DEVICE_ATTR(val, S_IRUGO | S_IWUSR,
-                         et61x251_show_val, et61x251_store_val);
+                         et61x251_show_val, et61x251_store_val);
 static CLASS_DEVICE_ATTR(i2c_reg, S_IRUGO | S_IWUSR,
-                         et61x251_show_i2c_reg, et61x251_store_i2c_reg);
+                         et61x251_show_i2c_reg, et61x251_store_i2c_reg);
 static CLASS_DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR,
-                         et61x251_show_i2c_val, et61x251_store_i2c_val);
+                         et61x251_show_i2c_val, et61x251_store_i2c_val);
 
 
 static void et61x251_create_sysfs(struct et61x251_device* cam)
@@ -990,7 +990,7 @@ static void et61x251_create_sysfs(struct et61x251_device* cam)
 
 static int
 et61x251_set_pix_format(struct et61x251_device* cam,
-                        struct v4l2_pix_format* pix)
+                        struct v4l2_pix_format* pix)
 {
         int r, err = 0;
 
@@ -1007,7 +1007,7 @@ et61x251_set_pix_format(struct et61x251_device* cam,
 
 static int
 et61x251_set_compression(struct et61x251_device* cam,
-                         struct v4l2_jpegcompression* compression)
+                         struct v4l2_jpegcompression* compression)
 {
         int r, err = 0;
 
@@ -1049,9 +1049,9 @@ et61x251_set_crop(struct et61x251_device* cam, struct v4l2_rect* rect)
 {
         struct et61x251_sensor* s = &cam->sensor;
         u16 fmw_sx = (u16)(rect->left - s->cropcap.bounds.left +
-                           s->active_pixel.left),
+                           s->active_pixel.left),
             fmw_sy = (u16)(rect->top - s->cropcap.bounds.top +
-                           s->active_pixel.top),
+                           s->active_pixel.top),
             fmw_length = (u16)(rect->width),
             fmw_height = (u16)(rect->height);
         int err = 0;
@@ -1061,8 +1061,8 @@ et61x251_set_crop(struct et61x251_device* cam, struct v4l2_rect* rect)
         err += et61x251_write_reg(cam, fmw_length & 0xff, 0x6b);
         err += et61x251_write_reg(cam, fmw_height & 0xff, 0x6c);
         err += et61x251_write_reg(cam, (fmw_sx >> 8) | ((fmw_sy & 0x300) >> 6)
-                                       | ((fmw_length & 0x300) >> 4)
-                                       | ((fmw_height & 0x300) >> 2), 0x6d);
+                                       | ((fmw_length & 0x300) >> 4)
+                                       | ((fmw_height & 0x300) >> 2), 0x6d);
         if (err)
                 return -EIO;
 
@@ -1203,8 +1203,8 @@ static int et61x251_open(struct inode* inode, struct file* filp)
                 }
                 mutex_unlock(&cam->dev_mutex);
                 err = wait_event_interruptible_exclusive(cam->open,
-                                                  cam->state & DEV_DISCONNECTED
-                                                         || !cam->users);
+                                                  cam->state & DEV_DISCONNECTED
+                                                         || !cam->users);
                 if (err) {
                         up_read(&et61x251_disconnect);
                         return err;
@@ -1277,7 +1277,7 @@ static int et61x251_release(struct inode* inode, struct file* filp)
 
 static ssize_t
 et61x251_read(struct file* filp, char __user * buf,
-              size_t count, loff_t* f_pos)
+              size_t count, loff_t* f_pos)
 {
         struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
         struct et61x251_frame_t* f, * i;
@@ -1310,7 +1310,7 @@ et61x251_read(struct file* filp, char __user * buf,
 
         if (cam->io == IO_NONE) {
                 if (!et61x251_request_buffers(cam, cam->nreadbuffers,
-                                              IO_READ)) {
+                                              IO_READ)) {
                         DBG(1, "read() failed, not enough memory");
                         mutex_unlock(&cam->fileop_mutex);
                         return -ENOMEM;
@@ -1336,12 +1336,12 @@ et61x251_read(struct file* filp, char __user * buf,
                         return -EAGAIN;
                 }
                 timeout = wait_event_interruptible_timeout
-                          ( cam->wait_frame,
-                            (!list_empty(&cam->outqueue)) ||
-                            (cam->state & DEV_DISCONNECTED) ||
-                            (cam->state & DEV_MISCONFIGURED),
-                            cam->module_param.frame_timeout *
-                            1000 * msecs_to_jiffies(1) );
+                          ( cam->wait_frame,
+                            (!list_empty(&cam->outqueue)) ||
+                            (cam->state & DEV_DISCONNECTED) ||
+                            (cam->state & DEV_MISCONFIGURED),
+                            cam->module_param.frame_timeout *
+                            1000 * msecs_to_jiffies(1) );
                 if (timeout < 0) {
                         mutex_unlock(&cam->fileop_mutex);
                         return timeout;
@@ -1408,7 +1408,7 @@ static unsigned int et61x251_poll(struct file *filp, poll_table *wait)
 
         if (cam->io == IO_NONE) {
                 if (!et61x251_request_buffers(cam, cam->nreadbuffers,
-                                              IO_READ)) {
+                                              IO_READ)) {
                         DBG(1, "poll() failed, not enough memory");
                         goto error;
                 }
@@ -1465,7 +1465,7 @@ static int et61x251_mmap(struct file* filp, struct vm_area_struct *vma)
 {
         struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
         unsigned long size = vma->vm_end - vma->vm_start,
-                      start = vma->vm_start;
+                      start = vma->vm_start;
         void *pos;
         u32 i;
 
@@ -1533,13 +1533,13 @@ et61x251_vidioc_querycap(struct et61x251_device* cam, void __user * arg)
                 .driver = "et61x251",
                 .version = ET61X251_MODULE_VERSION_CODE,
                 .capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |
-                                V4L2_CAP_STREAMING,
+                                V4L2_CAP_STREAMING,
         };
 
         strlcpy(cap.card, cam->v4ldev->name, sizeof(cap.card));
         if (usb_make_path(cam->usbdev, cap.bus_info, sizeof(cap.bus_info)) < 0)
                 strlcpy(cap.bus_info, cam->usbdev->dev.bus_id,
-                        sizeof(cap.bus_info));
+                        sizeof(cap.bus_info));
 
         if (copy_to_user(arg, &cap, sizeof(cap)))
                 return -EFAULT;
@@ -1871,7 +1871,7 @@ et61x251_vidioc_g_fmt(struct et61x251_device* cam, void __user * arg)
                 return -EINVAL;
 
         pfmt->bytesperline = (pfmt->pixelformat==V4L2_PIX_FMT_ET61X251)
-                             ? 0 : (pfmt->width * pfmt->priv) / 8;
+                             ? 0 : (pfmt->width * pfmt->priv) / 8;
         pfmt->sizeimage = pfmt->height * ((pfmt->width*pfmt->priv)/8);
         pfmt->field = V4L2_FIELD_NONE;
         memcpy(&(format.fmt.pix), pfmt, sizeof(*pfmt));
@@ -1885,7 +1885,7 @@ et61x251_vidioc_g_fmt(struct et61x251_device* cam, void __user * arg)
 
 static int
 et61x251_vidioc_try_s_fmt(struct et61x251_device* cam, unsigned int cmd,
-                          void __user * arg)
+                          void __user * arg)
 {
         struct et61x251_sensor* s = &cam->sensor;
         struct v4l2_format format;
@@ -1947,7 +1947,7 @@ et61x251_vidioc_try_s_fmt(struct et61x251_device* cam, unsigned int cmd,
         pix->priv = pfmt->priv; /* bpp */
         pix->colorspace = pfmt->colorspace;
         pix->bytesperline = (pix->pixelformat == V4L2_PIX_FMT_ET61X251)
-                            ? 0 : (pix->width * pix->priv) / 8;
+                            ? 0 : (pix->width * pix->priv) / 8;
         pix->sizeimage = pix->height * ((pix->width * pix->priv) / 8);
         pix->field = V4L2_FIELD_NONE;
 
@@ -2020,7 +2020,7 @@ static int
 et61x251_vidioc_g_jpegcomp(struct et61x251_device* cam, void __user * arg)
 {
         if (copy_to_user(arg, &cam->compression,
-                         sizeof(cam->compression)))
+                         sizeof(cam->compression)))
                 return -EFAULT;
 
         return 0;
@@ -2169,7 +2169,7 @@ et61x251_vidioc_qbuf(struct et61x251_device* cam, void __user * arg)
 
 static int
 et61x251_vidioc_dqbuf(struct et61x251_device* cam, struct file* filp,
-                      void __user * arg)
+                      void __user * arg)
 {
         struct v4l2_buffer b;
         struct et61x251_frame_t *f;
@@ -2188,12 +2188,12 @@ et61x251_vidioc_dqbuf(struct et61x251_device* cam, struct file* filp,
                 if (filp->f_flags & O_NONBLOCK)
                         return -EAGAIN;
                 timeout = wait_event_interruptible_timeout
-                          ( cam->wait_frame,
-                            (!list_empty(&cam->outqueue)) ||
-                            (cam->state & DEV_DISCONNECTED) ||
-                            (cam->state & DEV_MISCONFIGURED),
-                            cam->module_param.frame_timeout *
-                            1000 * msecs_to_jiffies(1) );
+                          ( cam->wait_frame,
+                            (!list_empty(&cam->outqueue)) ||
+                            (cam->state & DEV_DISCONNECTED) ||
+                            (cam->state & DEV_MISCONFIGURED),
+                            cam->module_param.frame_timeout *
+                            1000 * msecs_to_jiffies(1) );
                 if (timeout < 0)
                         return timeout;
                 if (cam->state & DEV_DISCONNECTED)
@@ -2317,7 +2317,7 @@ et61x251_vidioc_s_parm(struct et61x251_device* cam, void __user * arg)
 
 
 static int et61x251_ioctl_v4l2(struct inode* inode, struct file* filp,
-                               unsigned int cmd, void __user * arg)
+                               unsigned int cmd, void __user * arg)
 {
         struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
 
@@ -2411,7 +2411,7 @@ static int et61x251_ioctl_v4l2(struct inode* inode, struct file* filp,
 
 
 static int et61x251_ioctl(struct inode* inode, struct file* filp,
-                         unsigned int cmd, unsigned long arg)
+                         unsigned int cmd, unsigned long arg)
 {
         struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
         int err = 0;
@@ -2518,7 +2518,7 @@ et61x251_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         mutex_lock(&cam->dev_mutex);
 
         err = video_register_device(cam->v4ldev, VFL_TYPE_GRABBER,
-                                    video_nr[dev_nr]);
+                                    video_nr[dev_nr]);
         if (err) {
                 DBG(1, "V4L2 device registration failed");
                 if (err == -ENFILE && video_nr[dev_nr] == -1)
diff --git a/drivers/usb/media/et61x251_sensor.h b/drivers/media/video/et61x251/et61x251_sensor.h
index 56841ae8a2..65edd08dc3 100644
--- a/drivers/usb/media/et61x251_sensor.h
+++ b/drivers/media/video/et61x251/et61x251_sensor.h
@@ -47,7 +47,7 @@ et61x251_match_id(struct et61x251_device* cam, const struct usb_device_id *id);
 
 extern void
 et61x251_attach_sensor(struct et61x251_device* cam,
-                       struct et61x251_sensor* sensor);
+                       struct et61x251_sensor* sensor);
 
 /*****************************************************************************/
 
@@ -56,13 +56,13 @@ extern int et61x251_read_reg(struct et61x251_device*, u16 index);
 extern int et61x251_i2c_write(struct et61x251_device*, u8 address, u8 value);
 extern int et61x251_i2c_read(struct et61x251_device*, u8 address);
 extern int et61x251_i2c_try_write(struct et61x251_device*,
-                                  struct et61x251_sensor*, u8 address,
-                                  u8 value);
+                                  struct et61x251_sensor*, u8 address,
+                                  u8 value);
 extern int et61x251_i2c_try_read(struct et61x251_device*,
-                                 struct et61x251_sensor*, u8 address);
+                                 struct et61x251_sensor*, u8 address);
 extern int et61x251_i2c_raw_write(struct et61x251_device*, u8 n, u8 data1,
-                                  u8 data2, u8 data3, u8 data4, u8 data5,
-                                  u8 data6, u8 data7, u8 data8, u8 address);
+                                  u8 data2, u8 data3, u8 data4, u8 data5,
+                                  u8 data6, u8 data7, u8 data8, u8 address);
 
 /*****************************************************************************/
 
@@ -100,13 +100,13 @@ struct et61x251_sensor {
 
         int (*init)(struct et61x251_device* cam);
         int (*get_ctrl)(struct et61x251_device* cam,
-                        struct v4l2_control* ctrl);
+                        struct v4l2_control* ctrl);
         int (*set_ctrl)(struct et61x251_device* cam,
-                        const struct v4l2_control* ctrl);
+                        const struct v4l2_control* ctrl);
         int (*set_crop)(struct et61x251_device* cam,
-                        const struct v4l2_rect* rect);
+                        const struct v4l2_rect* rect);
         int (*set_pix_format)(struct et61x251_device* cam,
-                              const struct v4l2_pix_format* pix);
+                              const struct v4l2_pix_format* pix);
 
         /* Private */
         struct v4l2_queryctrl _qctrl[ET61X251_MAX_CTRLS];
diff --git a/drivers/usb/media/et61x251_tas5130d1b.c b/drivers/media/video/et61x251/et61x251_tas5130d1b.c
index 3998d76a30..a7d65b82b2 100644
--- a/drivers/usb/media/et61x251_tas5130d1b.c
+++ b/drivers/media/video/et61x251/et61x251_tas5130d1b.c
@@ -46,20 +46,20 @@ static int tas5130d1b_init(struct et61x251_device* cam)
 
 
 static int tas5130d1b_set_ctrl(struct et61x251_device* cam,
-                               const struct v4l2_control* ctrl)
+                               const struct v4l2_control* ctrl)
 {
         int err = 0;
 
         switch (ctrl->id) {
         case V4L2_CID_GAIN:
                 err += et61x251_i2c_raw_write(cam, 2, 0x20,
-                                              0xf6-ctrl->value, 0, 0, 0,
-                                              0, 0, 0, 0);
+                                              0xf6-ctrl->value, 0, 0, 0,
+                                              0, 0, 0, 0);
                 break;
         case V4L2_CID_EXPOSURE:
                 err += et61x251_i2c_raw_write(cam, 2, 0x40,
-                                              0x47-ctrl->value, 0, 0, 0,
-                                              0, 0, 0, 0);
+                                              0x47-ctrl->value, 0, 0, 0,
+                                              0, 0, 0, 0);
                 break;
         default:
                 return -EINVAL;
diff --git a/drivers/media/video/font.h b/drivers/media/video/font.h
new file mode 100644
index 0000000000..8b1fecc375
--- /dev/null
+++ b/drivers/media/video/font.h
@@ -0,0 +1,407 @@
+static unsigned char rom8x16_bits[] = {
+/* Character 0 (0x30):
+   ht=16, width=8
+   +--------+
+   |        |
+   |        |
+   | *****  |
+   |**   ** |
+   |**   ** |
+   |**  *** |
+   |** **** |
+   |**** ** |
+   |***  ** |
+   |**   ** |
+   |**   ** |
+   | *****  |
+   |        |
+   |        |
+   |        |
+   |        |
+   +--------+ */
+0x00,
+0x00,
+0x7c,
+0xc6,
+0xc6,
+0xce,
+0xde,
+0xf6,
+0xe6,
+0xc6,
+0xc6,
+0x7c,
+0x00,
+0x00,
+0x00,
+0x00,
+
+/* Character 1 (0x31):
+   ht=16, width=8
+   +--------+
+   |        |
+   |        |
+   |   **   |
+   | ****   |
+   |   **   |
+   |   **   |
+   |   **   |
+   |   **   |
+   |   **   |
+   |   **   |
+   |   **   |
+   | ****** |
+   |        |
+   |        |
+   |        |
+   |        |
+   +--------+ */
+0x00,
+0x00,
+0x18,
+0x78,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x7e,
+0x00,
+0x00,
+0x00,
+0x00,
+
+/* Character 2 (0x32):
+   ht=16, width=8
+   +--------+
+   |        |
+   |        |
+   | *****  |
+   |**   ** |
+   |**   ** |
+   |     ** |
+   |    **  |
+   |   **   |
+   |  **    |
+   | **     |
+   |**   ** |
+   |******* |
+   |        |
+   |        |
+   |        |
+   |        |
+   +--------+ */
+0x00,
+0x00,
+0x7c,
+0xc6,
+0xc6,
+0x06,
+0x0c,
+0x18,
+0x30,
+0x60,
+0xc6,
+0xfe,
+0x00,
+0x00,
+0x00,
+0x00,
+
+/* Character 3 (0x33):
+   ht=16, width=8
+   +--------+
+   |        |
+   |        |
+   | *****  |
+   |**   ** |
+   |     ** |
+   |     ** |
+   |  ****  |
+   |     ** |
+   |     ** |
+   |     ** |
+   |**   ** |
+   | *****  |
+   |        |
+   |        |
+   |        |
+   |        |
+   +--------+ */
+0x00,
+0x00,
+0x7c,
+0xc6,
+0x06,
+0x06,
+0x3c,
+0x06,
+0x06,
+0x06,
+0xc6,
+0x7c,
+0x00,
+0x00,
+0x00,
+0x00,
+
+/* Character 4 (0x34):
+   ht=16, width=8
+   +--------+
+   |        |
+   |        |
+   |    **  |
+   |   ***  |
+   |  ****  |
+   | ** **  |
+   |**  **  |
+   |**  **  |
+   |******* |
+   |    **  |
+   |    **  |
+   |   **** |
+   |        |
+   |        |
+   |        |
+   |        |
+   +--------+ */
+0x00,
+0x00,
+0x0c,
+0x1c,
+0x3c,
+0x6c,
+0xcc,
+0xcc,
+0xfe,
+0x0c,
+0x0c,
+0x1e,
+0x00,
+0x00,
+0x00,
+0x00,
+
+/* Character 5 (0x35):
+   ht=16, width=8
+   +--------+
+   |        |
+   |        |
+   |******* |
+   |**      |
+   |**      |
+   |**      |
+   |******  |
+   |     ** |
+   |     ** |
+   |     ** |
+   |**   ** |
+   | *****  |
+   |        |
+   |        |
+   |        |
+   |        |
+   +--------+ */
+0x00,
+0x00,
+0xfe,
+0xc0,
+0xc0,
+0xc0,
+0xfc,
+0x06,
+0x06,
+0x06,
+0xc6,
+0x7c,
+0x00,
+0x00,
+0x00,
+0x00,
+
+/* Character 6 (0x36):
+   ht=16, width=8
+   +--------+
+   |        |
+   |        |
+   | *****  |
+   |**   ** |
+   |**      |
+   |**      |
+   |******  |
+   |**   ** |
+   |**   ** |
+   |**   ** |
+   |**   ** |
+   | *****  |
+   |        |
+   |        |
+   |        |
+   |        |
+   +--------+ */
+0x00,
+0x00,
+0x7c,
+0xc6,
+0xc0,
+0xc0,
+0xfc,
+0xc6,
+0xc6,
+0xc6,
+0xc6,
+0x7c,
+0x00,
+0x00,
+0x00,
+0x00,
+
+/* Character 7 (0x37):
+   ht=16, width=8
+   +--------+
+   |        |
+   |        |
+   |******* |
+   |**   ** |
+   |     ** |
+   |    **  |
+   |   **   |
+   |  **    |
+   |  **    |
+   |  **    |
+   |  **    |
+   |  **    |
+   |        |
+   |        |
+   |        |
+   |        |
+   +--------+ */
+0x00,
+0x00,
+0xfe,
+0xc6,
+0x06,
+0x0c,
+0x18,
+0x30,
+0x30,
+0x30,
+0x30,
+0x30,
+0x00,
+0x00,
+0x00,
+0x00,
+
+/* Character 8 (0x38):
+   ht=16, width=8
+   +--------+
+   |        |
+   |        |
+   | *****  |
+   |**   ** |
+   |**   ** |
+   |**   ** |
+   | *****  |
+   |**   ** |
+   |**   ** |
+   |**   ** |
+   |**   ** |
+   | *****  |
+   |        |
+   |        |
+   |        |
+   |        |
+   +--------+ */
+0x00,
+0x00,
+0x7c,
+0xc6,
+0xc6,
+0xc6,
+0x7c,
+0xc6,
+0xc6,
+0xc6,
+0xc6,
+0x7c,
+0x00,
+0x00,
+0x00,
+0x00,
+
+/* Character 9 (0x39):
+   ht=16, width=8
+   +--------+
+   |        |
+   |        |
+   | *****  |
+   |**   ** |
+   |**   ** |
+   |**   ** |
+   |**   ** |
+   | ****** |
+   |     ** |
+   |     ** |
+   |**   ** |
+   | *****  |
+   |        |
+   |        |
+   |        |
+   |        |
+   +--------+ */
+0x00,
+0x00,
+0x7c,
+0xc6,
+0xc6,
+0xc6,
+0xc6,
+0x7e,
+0x06,
+0x06,
+0xc6,
+0x7c,
+0x00,
+0x00,
+0x00,
+0x00,
+/* Character : (0x3a):
+   ht=16, width=8
+   +--------+
+   |        |
+   |        |
+   |        |
+   |        |
+   |        |
+   |    **  |
+   |    **  |
+   |        |
+   |        |
+   |    **  |
+   |    **  |
+   |        |
+   |        |
+   |        |
+   |        |
+   |        |
+   +--------+ */
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x0c,
+0x0c,
+0x00,
+0x00,
+0x0c,
+0x0c,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+};
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c
index 11ea976576..c40e8ba9a2 100644
--- a/drivers/media/video/msp3400-driver.c
+++ b/drivers/media/video/msp3400-driver.c
@@ -53,10 +53,11 @@
 #include <linux/videodev.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
-#include <media/audiochip.h>
+#include <media/tvaudio.h>
+#include <media/msp3400.h>
 #include <linux/kthread.h>
 #include <linux/suspend.h>
-#include "msp3400.h"
+#include "msp3400-driver.h"
 
 /* ---------------------------------------------------------------------- */
 
@@ -245,31 +246,31 @@ int msp_write_dsp(struct i2c_client *client, int addr, int val)
  * ----------------------------------------------------------------------- */
 
 static int scarts[3][9] = {
-        /* MASK    IN1     IN2     IN1_DA  IN2_DA  IN3     IN4     MONO    MUTE   */
+       /* MASK   IN1     IN2     IN3     IN4     IN1_DA  IN2_DA  MONO    MUTE   */
         /* SCART DSP Input select */
-        { 0x0320, 0x0000, 0x0200, -1,     -1,     0x0300, 0x0020, 0x0100, 0x0320 },
+       { 0x0320, 0x0000, 0x0200, 0x0300, 0x0020, -1,     -1,     0x0100, 0x0320 },
         /* SCART1 Output select */
-        { 0x0c40, 0x0440, 0x0400, 0x0c00, 0x0040, 0x0000, 0x0840, 0x0800, 0x0c40 },
+       { 0x0c40, 0x0440, 0x0400, 0x0000, 0x0840, 0x0c00, 0x0040, 0x0800, 0x0c40 },
         /* SCART2 Output select */
-        { 0x3080, 0x1000, 0x1080, 0x0000, 0x0080, 0x2080, 0x3080, 0x2000, 0x3000 },
+       { 0x3080, 0x1000, 0x1080, 0x2080, 0x3080, 0x0000, 0x0080, 0x2000, 0x3000 },
 };
 
 static char *scart_names[] = {
-        "mask", "in1", "in2", "in1 da", "in2 da", "in3", "in4", "mono", "mute"
+       "in1", "in2", "in3", "in4", "in1 da", "in2 da", "mono", "mute"
 };
 
 void msp_set_scart(struct i2c_client *client, int in, int out)
 {
         struct msp_state *state = i2c_get_clientdata(client);
 
-        state->in_scart=in;
+        state->in_scart = in;
 
-        if (in >= 1 && in <= 8 && out >= 0 && out <= 2) {
-                if (-1 == scarts[out][in])
+        if (in >= 0 && in <= 7 && out >= 0 && out <= 2) {
+                if (-1 == scarts[out][in + 1])
                         return;
 
-                state->acb &= ~scarts[out][SCART_MASK];
-                state->acb |=  scarts[out][in];
+                state->acb &= ~scarts[out][0];
+                state->acb |=  scarts[out][in + 1];
         } else
                 state->acb = 0xf60; /* Mute Input and SCART 1 Output */
 
@@ -336,37 +337,6 @@ void msp_set_audio(struct i2c_client *client)
         msp_write_dsp(client, 0x0033, loudness);
 }
 
-int msp_modus(struct i2c_client *client)
-{
-        struct msp_state *state = i2c_get_clientdata(client);
-
-        if (state->radio) {
-                v4l_dbg(1, msp_debug, client, "video mode selected to Radio\n");
-                return 0x0003;
-        }
-
-        if (state->v4l2_std & V4L2_STD_PAL) {
-                v4l_dbg(1, msp_debug, client, "video mode selected to PAL\n");
-
-#if 1
-                /* experimental: not sure this works with all chip versions */
-                return 0x7003;
-#else
-                /* previous value, try this if it breaks ... */
-                return 0x1003;
-#endif
-        }
-        if (state->v4l2_std & V4L2_STD_NTSC) {
-                v4l_dbg(1, msp_debug, client, "video mode selected to NTSC\n");
-                return 0x2003;
-        }
-        if (state->v4l2_std & V4L2_STD_SECAM) {
-                v4l_dbg(1, msp_debug, client, "video mode selected to SECAM\n");
-                return 0x0003;
-        }
-        return 0x0003;
-}
-
 /* ------------------------------------------------------------------------ */
 
 
@@ -585,51 +555,11 @@ static int msp_set_ctrl(struct i2c_client *client, struct v4l2_control *ctrl)
 static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 {
         struct msp_state *state = i2c_get_clientdata(client);
-        u16 *sarg = arg;
-        int scart = 0;
 
         if (msp_debug >= 2)
                 v4l_i2c_print_ioctl(client, cmd);
 
         switch (cmd) {
-        case AUDC_SET_INPUT:
-                if (*sarg == state->input)
-                        break;
-                state->input = *sarg;
-                switch (*sarg) {
-                case AUDIO_RADIO:
-                        /* Hauppauge uses IN2 for the radio */
-                        state->mode = MSP_MODE_FM_RADIO;
-                        scart       = SCART_IN2;
-                        break;
-                case AUDIO_EXTERN_1:
-                        /* IN1 is often used for external input ... */
-                        state->mode = MSP_MODE_EXTERN;
-                        scart       = SCART_IN1;
-                        break;
-                case AUDIO_EXTERN_2:
-                        /* ... sometimes it is IN2 through ;) */
-                        state->mode = MSP_MODE_EXTERN;
-                        scart       = SCART_IN2;
-                        break;
-                case AUDIO_TUNER:
-                        state->mode = -1;
-                        break;
-                default:
-                        if (*sarg & AUDIO_MUTE)
-                                msp_set_scart(client, SCART_MUTE, 0);
-                        break;
-                }
-                if (scart) {
-                        state->rxsubchans = V4L2_TUNER_SUB_STEREO;
-                        msp_set_scart(client, scart, 0);
-                        msp_write_dsp(client, 0x000d, 0x1900);
-                        if (state->opmode != OPMODE_AUTOSELECT)
-                                msp_set_audmode(client);
-                }
-                msp_wake_thread(client);
-                break;
-
         case AUDC_SET_RADIO:
                 if (state->radio)
                         return 0;
@@ -692,6 +622,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
                 if (va->mode != 0 && state->radio == 0) {
                         state->audmode = msp_mode_v4l1_to_v4l2(va->mode);
+                        msp_set_audmode(client);
                 }
                 break;
         }
@@ -728,15 +659,6 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
                 break;
         }
 
-        /* msp34xx specific */
-        case MSP_SET_MATRIX:
-        {
-                struct msp_matrix *mspm = arg;
-
-                msp_set_scart(client, mspm->input, mspm->output);
-                break;
-        }
-
         /* --- v4l2 ioctls --- */
         case VIDIOC_S_STD:
         {
@@ -750,90 +672,34 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
                 return 0;
         }
 
-        case VIDIOC_ENUMINPUT:
-        {
-                struct v4l2_input *i = arg;
-
-                if (i->index != 0)
-                        return -EINVAL;
-
-                i->type = V4L2_INPUT_TYPE_TUNER;
-                switch (i->index) {
-                case AUDIO_RADIO:
-                        strcpy(i->name, "Radio");
-                        break;
-                case AUDIO_EXTERN_1:
-                        strcpy(i->name, "Extern 1");
-                        break;
-                case AUDIO_EXTERN_2:
-                        strcpy(i->name, "Extern 2");
-                        break;
-                case AUDIO_TUNER:
-                        strcpy(i->name, "Television");
-                        break;
-                default:
-                        return -EINVAL;
-                }
-                return 0;
-        }
-
-        case VIDIOC_G_AUDIO:
+        case VIDIOC_INT_G_AUDIO_ROUTING:
         {
-                struct v4l2_audio *a = arg;
+                struct v4l2_routing *rt = arg;
 
-                memset(a, 0, sizeof(*a));
-
-                switch (a->index) {
-                case AUDIO_RADIO:
-                        strcpy(a->name, "Radio");
-                        break;
-                case AUDIO_EXTERN_1:
-                        strcpy(a->name, "Extern 1");
-                        break;
-                case AUDIO_EXTERN_2:
-                        strcpy(a->name, "Extern 2");
-                        break;
-                case AUDIO_TUNER:
-                        strcpy(a->name, "Television");
-                        break;
-                default:
-                        return -EINVAL;
-                }
-
-                a->capability = V4L2_AUDCAP_STEREO;
-                a->mode = 0;  /* TODO: add support for AVL */
+                *rt = state->routing;
                 break;
         }
 
-        case VIDIOC_S_AUDIO:
+        case VIDIOC_INT_S_AUDIO_ROUTING:
         {
-                struct v4l2_audio *sarg = arg;
-
-                switch (sarg->index) {
-                case AUDIO_RADIO:
-                        /* Hauppauge uses IN2 for the radio */
-                        state->mode = MSP_MODE_FM_RADIO;
-                        scart       = SCART_IN2;
-                        break;
-                case AUDIO_EXTERN_1:
-                        /* IN1 is often used for external input ... */
-                        state->mode = MSP_MODE_EXTERN;
-                        scart       = SCART_IN1;
-                        break;
-                case AUDIO_EXTERN_2:
-                        /* ... sometimes it is IN2 through ;) */
-                        state->mode = MSP_MODE_EXTERN;
-                        scart       = SCART_IN2;
-                        break;
-                case AUDIO_TUNER:
-                        state->mode = -1;
-                        break;
-                }
-                if (scart) {
-                        state->rxsubchans = V4L2_TUNER_SUB_STEREO;
-                        msp_set_scart(client, scart, 0);
-                        msp_write_dsp(client, 0x000d, 0x1900);
+                struct v4l2_routing *rt = arg;
+                int tuner = (rt->input >> 3) & 1;
+                int sc_in = rt->input & 0x7;
+                int sc1_out = rt->output & 0xf;
+                int sc2_out = (rt->output >> 4) & 0xf;
+                u16 val;
+
+                state->routing = *rt;
+                if (state->opmode == OPMODE_AUTOSELECT) {
+                        val = msp_read_dem(client, 0x30) & ~0x100;
+                        msp_write_dem(client, 0x30, val | (tuner ? 0x100 : 0));
+                } else {
+                        val = msp_read_dem(client, 0xbb) & ~0x100;
+                        msp_write_dem(client, 0xbb, val | (tuner ? 0x100 : 0));
                 }
+                msp_set_scart(client, sc_in, 0);
+                msp_set_scart(client, sc1_out, 1);
+                msp_set_scart(client, sc2_out, 2);
                 msp_set_audmode(client);
                 msp_wake_thread(client);
                 break;
@@ -866,42 +732,6 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
                 break;
         }
 
-        case VIDIOC_G_AUDOUT:
-        {
-                struct v4l2_audioout *a = (struct v4l2_audioout *)arg;
-                int idx = a->index;
-
-                memset(a, 0, sizeof(*a));
-
-                switch (idx) {
-                case 0:
-                        strcpy(a->name, "Scart1 Out");
-                        break;
-                case 1:
-                        strcpy(a->name, "Scart2 Out");
-                        break;
-                case 2:
-                        strcpy(a->name, "I2S Out");
-                        break;
-                default:
-                        return -EINVAL;
-                }
-                break;
-        }
-
-        case VIDIOC_S_AUDOUT:
-        {
-                struct v4l2_audioout *a = (struct v4l2_audioout *)arg;
-
-                if (a->index < 0 || a->index > 2)
-                        return -EINVAL;
-
-                v4l_dbg(1, msp_debug, client, "Setting audio out on msp34xx to input %i\n", a->index);
-                msp_set_scart(client, state->in_scart, a->index + 1);
-
-                break;
-        }
-
         case VIDIOC_INT_I2S_CLOCK_FREQ:
         {
                 u32 *a = (u32 *)arg;
@@ -979,12 +809,16 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
                                 (state->rxsubchans & V4L2_TUNER_SUB_STEREO) ? "stereo" : "mono",
                                 (state->rxsubchans & V4L2_TUNER_SUB_LANG2) ? ", dual" : "");
                 } else {
-                        v4l_info(client, "Mode:     %s\n", p);
+                        if (state->opmode == OPMODE_AUTODETECT)
+                                v4l_info(client, "Mode:     %s\n", p);
                         v4l_info(client, "Standard: %s (%s%s)\n",
                                 msp_standard_std_name(state->std),
                                 (state->rxsubchans & V4L2_TUNER_SUB_STEREO) ? "stereo" : "mono",
                                 (state->rxsubchans & V4L2_TUNER_SUB_LANG2) ? ", dual" : "");
                 }
+                v4l_info(client, "Audmode:  0x%04x\n", state->audmode);
+                v4l_info(client, "Routing:  0x%08x (input) 0x%08x (output)\n",
+                                state->routing.input, state->routing.output);
                 v4l_info(client, "ACB:      0x%04x\n", state->acb);
                 break;
         }
@@ -1063,6 +897,9 @@ static int msp_attach(struct i2c_adapter *adapter, int address, int kind)
         state->muted = 0;
         state->i2s_mode = 0;
         init_waitqueue_head(&state->wq);
+        /* These are the reset input/output positions */
+        state->routing.input = MSP_INPUT_DEFAULT;
+        state->routing.output = MSP_OUTPUT_DEFAULT;
 
         state->rev1 = msp_read_dsp(client, 0x1e);
         if (state->rev1 != -1)
diff --git a/drivers/media/video/msp3400.h b/drivers/media/video/msp3400-driver.h
index 6fb5c8c994..1940748bb6 100644
--- a/drivers/media/video/msp3400.h
+++ b/drivers/media/video/msp3400-driver.h
@@ -1,8 +1,10 @@
 /*
  */
 
-#ifndef MSP3400_H
-#define MSP3400_H
+#ifndef MSP3400_DRIVER_H
+#define MSP3400_DRIVER_H
+
+#include <media/msp3400.h>
 
 /* ---------------------------------------------------------------------- */
 
@@ -20,15 +22,14 @@
 #define MSP_MODE_BTSC        8
 #define MSP_MODE_EXTERN      9
 
-#define SCART_MASK    0
-#define SCART_IN1     1
-#define SCART_IN2     2
-#define SCART_IN1_DA  3
-#define SCART_IN2_DA  4
-#define SCART_IN3     5
-#define SCART_IN4     6
-#define SCART_MONO    7
-#define SCART_MUTE    8
+#define SCART_IN1     0
+#define SCART_IN2     1
+#define SCART_IN3     2
+#define SCART_IN4     3
+#define SCART_IN1_DA  4
+#define SCART_IN2_DA  5
+#define SCART_MONO    6
+#define SCART_MUTE    7
 
 #define SCART_DSP_IN  0
 #define SCART1_OUT    1
@@ -73,7 +74,7 @@ struct msp_state {
         int i2s_mode;
         int main, second;       /* sound carrier */
         int input;
-        int source;             /* see msp34xxg_set_source */
+        struct v4l2_routing routing;
 
         /* v4l2 */
         int audmode;
@@ -99,17 +100,16 @@ int msp_reset(struct i2c_client *client);
 void msp_set_scart(struct i2c_client *client, int in, int out);
 void msp_set_mute(struct i2c_client *client);
 void msp_set_audio(struct i2c_client *client);
-int msp_modus(struct i2c_client *client);
 int msp_sleep(struct msp_state *state, int timeout);
 
 /* msp3400-kthreads.c */
 const char *msp_standard_std_name(int std);
 void msp_set_audmode(struct i2c_client *client);
-void msp_detect_stereo(struct i2c_client *client);
+int msp_detect_stereo(struct i2c_client *client);
 int msp3400c_thread(void *data);
 int msp3410d_thread(void *data);
 int msp34xxg_thread(void *data);
 void msp3400c_set_mode(struct i2c_client *client, int mode);
 void msp3400c_set_carrier(struct i2c_client *client, int cdo1, int cdo2);
 
-#endif /* MSP3400_H */
+#endif /* MSP3400_DRIVER_H */
diff --git a/drivers/media/video/msp3400-kthreads.c b/drivers/media/video/msp3400-kthreads.c
index 852ab6a115..c3984ea9ca 100644
--- a/drivers/media/video/msp3400-kthreads.c
+++ b/drivers/media/video/msp3400-kthreads.c
@@ -26,10 +26,10 @@
 #include <linux/videodev.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
-#include <media/audiochip.h>
+#include <media/msp3400.h>
 #include <linux/kthread.h>
 #include <linux/suspend.h>
-#include "msp3400.h"
+#include "msp3400-driver.h"
 
 /* this one uses the automatic sound standard detection of newer msp34xx
    chip versions */
@@ -45,11 +45,13 @@ static struct {
         { 0x0004, MSP_CARRIER(6.5), MSP_CARRIER(6.2578125), "6.5/6.25  D/K1 Dual FM-Stereo" },
         { 0x0005, MSP_CARRIER(6.5), MSP_CARRIER(6.7421875), "6.5/6.74  D/K2 Dual FM-Stereo" },
         { 0x0006, MSP_CARRIER(6.5), MSP_CARRIER(6.5), "6.5  D/K FM-Mono (HDEV3)" },
+        { 0x0007, MSP_CARRIER(6.5), MSP_CARRIER(5.7421875), "6.5/5.74  D/K3 Dual FM-Stereo" },
         { 0x0008, MSP_CARRIER(5.5), MSP_CARRIER(5.85), "5.5/5.85  B/G NICAM FM" },
         { 0x0009, MSP_CARRIER(6.5), MSP_CARRIER(5.85), "6.5/5.85  L NICAM AM" },
         { 0x000a, MSP_CARRIER(6.0), MSP_CARRIER(6.55), "6.0/6.55  I NICAM FM" },
         { 0x000b, MSP_CARRIER(6.5), MSP_CARRIER(5.85), "6.5/5.85  D/K NICAM FM" },
         { 0x000c, MSP_CARRIER(6.5), MSP_CARRIER(5.85), "6.5/5.85  D/K NICAM FM (HDEV2)" },
+        { 0x000d, MSP_CARRIER(6.5), MSP_CARRIER(5.85), "6.5/5.85  D/K NICAM FM (HDEV3)" },
         { 0x0020, MSP_CARRIER(4.5), MSP_CARRIER(4.5), "4.5  M BTSC-Stereo" },
         { 0x0021, MSP_CARRIER(4.5), MSP_CARRIER(4.5), "4.5  M BTSC-Mono + SAP" },
         { 0x0030, MSP_CARRIER(4.5), MSP_CARRIER(4.5), "4.5  M EIA-J Japan Stereo" },
@@ -185,13 +187,14 @@ void msp3400c_set_mode(struct i2c_client *client, int mode)
 {
         struct msp_state *state = i2c_get_clientdata(client);
         struct msp3400c_init_data_dem *data = &msp3400c_init_data[mode];
+        int tuner = (state->routing.input >> 3) & 1;
         int i;
 
         v4l_dbg(1, msp_debug, client, "set_mode: %d\n", mode);
         state->mode = mode;
         state->rxsubchans = V4L2_TUNER_SUB_MONO;
 
-        msp_write_dem(client, 0x00bb, data->ad_cv);
+        msp_write_dem(client, 0x00bb, data->ad_cv | (tuner ? 0x100 : 0));
 
         for (i = 5; i >= 0; i--)               /* fir 1 */
                 msp_write_dem(client, 0x0001, data->fir1[i]);
@@ -207,21 +210,22 @@ void msp3400c_set_mode(struct i2c_client *client, int mode)
         msp3400c_set_carrier(client, data->cdo1, data->cdo2);
 
         msp_set_source(client, data->dsp_src);
-        msp_write_dsp(client, 0x000e, data->dsp_matrix);
+        /* set prescales */
 
-        if (state->has_nicam) {
-                /* nicam prescale */
-                msp_write_dsp(client, 0x0010, 0x5a00); /* was: 0x3000 */
-        }
+        /* volume prescale for SCART (AM mono input) */
+        msp_write_dsp(client, 0x000d, 0x1900);
+        msp_write_dsp(client, 0x000e, data->dsp_matrix);
+        if (state->has_nicam) /* nicam prescale */
+                msp_write_dsp(client, 0x0010, 0x5a00);
 }
 
 /* Set audio mode. Note that the pre-'G' models do not support BTSC+SAP,
    nor do they support stereo BTSC. */
 static void msp3400c_set_audmode(struct i2c_client *client)
 {
-        static char *strmode[] = { "mono", "stereo", "lang2", "lang1" };
+        static char *strmode[] = { "mono", "stereo", "lang2", "lang1", "lang1+lang2" };
         struct msp_state *state = i2c_get_clientdata(client);
-        char *modestr = (state->audmode >= 0 && state->audmode < 4) ?
+        char *modestr = (state->audmode >= 0 && state->audmode < 5) ?
                 strmode[state->audmode] : "unknown";
         int src = 0;    /* channel source: FM/AM, nicam or SCART */
 
@@ -246,6 +250,7 @@ static void msp3400c_set_audmode(struct i2c_client *client)
                 case V4L2_TUNER_MODE_MONO:
                 case V4L2_TUNER_MODE_LANG1:
                 case V4L2_TUNER_MODE_LANG2:
+                case V4L2_TUNER_MODE_LANG1_LANG2:
                         msp_write_dsp(client, 0x000e, 0x3000);
                         break;
                 }
@@ -257,6 +262,7 @@ static void msp3400c_set_audmode(struct i2c_client *client)
                         msp3400c_set_carrier(client, MSP_CARRIER(6.5), MSP_CARRIER(6.5));
                         break;
                 case V4L2_TUNER_MODE_STEREO:
+                case V4L2_TUNER_MODE_LANG1_LANG2:
                         msp3400c_set_carrier(client, MSP_CARRIER(7.2), MSP_CARRIER(7.02));
                         break;
                 case V4L2_TUNER_MODE_LANG1:
@@ -271,7 +277,6 @@ static void msp3400c_set_audmode(struct i2c_client *client)
         case MSP_MODE_FM_NICAM2:
         case MSP_MODE_AM_NICAM:
                 v4l_dbg(1, msp_debug, client, "NICAM set_audmode: %s\n",modestr);
-                msp3400c_set_carrier(client, state->second, state->main);
                 if (state->nicam_on)
                         src = 0x0100;  /* NICAM */
                 break;
@@ -293,6 +298,7 @@ static void msp3400c_set_audmode(struct i2c_client *client)
         /* switch audio */
         switch (state->audmode) {
         case V4L2_TUNER_MODE_STEREO:
+        case V4L2_TUNER_MODE_LANG1_LANG2:
                 src |= 0x0020;
                 break;
         case V4L2_TUNER_MODE_MONO:
@@ -427,8 +433,8 @@ static void watch_stereo(struct i2c_client *client)
 {
         struct msp_state *state = i2c_get_clientdata(client);
 
-        if (msp3400c_detect_stereo(client)) {
-                msp3400c_set_audmode(client);
+        if (msp_detect_stereo(client)) {
+                msp_set_audmode(client);
         }
 
         if (msp_once)
@@ -464,7 +470,7 @@ int msp3400c_thread(void *data)
 
                 /* mute */
                 msp_set_mute(client);
-                msp3400c_set_mode(client, MSP_MODE_AM_DETECT /* +1 */ );
+                msp3400c_set_mode(client, MSP_MODE_AM_DETECT);
                 val1 = val2 = 0;
                 max1 = max2 = -1;
                 state->watch_stereo = 0;
@@ -572,8 +578,6 @@ int msp3400c_thread(void *data)
                                 state->second = msp3400c_carrier_detect_65[max2].cdo;
                                 msp3400c_set_mode(client, MSP_MODE_AM_NICAM);
                                 msp3400c_set_carrier(client, state->second, state->main);
-                                /* volume prescale for SCART (AM mono input) */
-                                msp_write_dsp(client, 0x000d, 0x1900);
                                 state->watch_stereo = 1;
                         } else if (max2 == 0 && state->has_nicam) {
                                 /* D/K NICAM */
@@ -651,7 +655,8 @@ int msp3410d_thread(void *data)
                 if (msp_sleep(state,200))
                         goto restart;
 
-                /* start autodetect */
+                /* start autodetect. Note: autodetect is not supported for
+                   NTSC-M and radio, hence we force the standard in those cases. */
                 if (state->radio)
                         std = 0x40;
                 else
@@ -695,23 +700,19 @@ int msp3410d_thread(void *data)
                         v4l_dbg(1, msp_debug, client, "autodetection failed,"
                                 " switching to backup standard: %s (0x%04x)\n",
                                 msp_stdlist[8].name ? msp_stdlist[8].name : "unknown",val);
-                        val = 0x0009;
+                        state->std = val = 0x0009;
                         msp_write_dem(client, 0x20, val);
                 }
 
-                /* set various prescales */
-                msp_write_dsp(client, 0x0d, 0x1900); /* scart */
-                msp_write_dsp(client, 0x0e, 0x2403); /* FM */
-                msp_write_dsp(client, 0x10, 0x5a00); /* nicam */
-
                 /* set stereo */
                 switch (val) {
                 case 0x0008: /* B/G NICAM */
                 case 0x000a: /* I NICAM */
-                        if (val == 0x0008)
-                                state->mode = MSP_MODE_FM_NICAM1;
-                        else
+                case 0x000b: /* D/K NICAM */
+                        if (val == 0x000a)
                                 state->mode = MSP_MODE_FM_NICAM2;
+                        else
+                                state->mode = MSP_MODE_FM_NICAM1;
                         /* just turn on stereo */
                         state->rxsubchans = V4L2_TUNER_SUB_STEREO;
                         state->nicam_on = 1;
@@ -739,6 +740,7 @@ int msp3410d_thread(void *data)
                         /* scart routing (this doesn't belong here I think) */
                         msp_set_scart(client,SCART_IN2,0);
                         break;
+                case 0x0002:
                 case 0x0003:
                 case 0x0004:
                 case 0x0005:
@@ -748,12 +750,19 @@ int msp3410d_thread(void *data)
                         break;
                 }
 
-                /* unmute, restore misc registers */
-                msp_set_audio(client);
-                msp_write_dsp(client, 0x13, state->acb);
+                /* set various prescales */
+                msp_write_dsp(client, 0x0d, 0x1900); /* scart */
+                msp_write_dsp(client, 0x0e, 0x3000); /* FM */
+                if (state->has_nicam)
+                        msp_write_dsp(client, 0x10, 0x5a00); /* nicam */
+
                 if (state->has_i2s_conf)
                         msp_write_dem(client, 0x40, state->i2s_mode);
 
+                /* unmute, restore misc registers */
+                msp_set_audio(client);
+
+                msp_write_dsp(client, 0x13, state->acb);
                 msp3400c_set_audmode(client);
 
                 /* monitor tv audio mode, the first time don't wait
@@ -772,97 +781,154 @@ int msp3410d_thread(void *data)
 
 /* ----------------------------------------------------------------------- */
 
-/* msp34xxG + (autoselect no-thread)                                       */
-/* this one uses both automatic standard detection and automatic sound     */
-/* select which are available in the newer G versions                      */
-/* struct msp: only norm, acb and source are really used in this mode      */
-
-/* set the same 'source' for the loudspeaker, scart and quasi-peak detector
- * the value for source is the same as bit 15:8 of DSP registers 0x08,
- * 0x0a and 0x0c: 0=mono, 1=stereo or A|B, 2=SCART, 3=stereo or A, 4=stereo or B
- *
- * this function replaces msp3400c_set_audmode
+/* msp34xxG + (autoselect no-thread)
+ * this one uses both automatic standard detection and automatic sound
+ * select which are available in the newer G versions
+ * struct msp: only norm, acb and source are really used in this mode
  */
-static void msp34xxg_set_source(struct i2c_client *client, int source)
+
+static int msp34xxg_modus(struct i2c_client *client)
 {
         struct msp_state *state = i2c_get_clientdata(client);
 
-        /* fix matrix mode to stereo and let the msp choose what
-         * to output according to 'source', as recommended
-         * for MONO (source==0) downmixing set bit[7:0] to 0x30
-         */
-        int value = (source & 0x07) << 8 | (source == 0 ? 0x30 : 0x20);
+        if (state->radio) {
+                v4l_dbg(1, msp_debug, client, "selected radio modus\n");
+                return 0x0001;
+        }
 
-        v4l_dbg(1, msp_debug, client, "set source to %d (0x%x)\n", source, value);
-        msp_set_source(client, value);
-        /*
-         * set identification threshold. Personally, I
-         * I set it to a higher value that the default
-         * of 0x190 to ignore noisy stereo signals.
-         * this needs tuning. (recommended range 0x00a0-0x03c0)
-         * 0x7f0 = forced mono mode
-         */
-        /* a2 threshold for stereo/bilingual */
-        msp_write_dem(client, 0x22, msp_stereo_thresh);
-        state->source = source;
+        if (state->v4l2_std & V4L2_STD_PAL) {
+                v4l_dbg(1, msp_debug, client, "selected PAL modus\n");
+                return 0x7001;
+        }
+        if (state->v4l2_std == V4L2_STD_NTSC_M_JP) {
+                v4l_dbg(1, msp_debug, client, "selected M (EIA-J) modus\n");
+                return 0x4001;
+        }
+        if (state->v4l2_std == V4L2_STD_NTSC_M_KR) {
+                v4l_dbg(1, msp_debug, client, "selected M (A2) modus\n");
+                return 0x0001;
+        }
+        if (state->v4l2_std & V4L2_STD_MN) {
+                v4l_dbg(1, msp_debug, client, "selected M (BTSC) modus\n");
+                return 0x2001;
+        }
+        if (state->v4l2_std & V4L2_STD_SECAM) {
+                v4l_dbg(1, msp_debug, client, "selected SECAM modus\n");
+                return 0x6001;
+        }
+        return 0x0001;
 }
 
-/* (re-)initialize the msp34xxg, according to the current norm in state->norm
- * return 0 if it worked, -1 if it failed
- */
-static int msp34xxg_reset(struct i2c_client *client)
+static void msp34xxg_set_source(struct i2c_client *client, u16 reg, int in)
+ {
+        struct msp_state *state = i2c_get_clientdata(client);
+        int source, matrix;
+
+        switch (state->audmode) {
+        case V4L2_TUNER_MODE_MONO:
+                source = 0; /* mono only */
+                matrix = 0x30;
+                break;
+        case V4L2_TUNER_MODE_LANG1:
+                source = 3; /* stereo or A */
+                matrix = 0x00;
+                break;
+        case V4L2_TUNER_MODE_LANG2:
+                source = 4; /* stereo or B */
+                matrix = 0x10;
+                break;
+        case V4L2_TUNER_MODE_STEREO:
+        case V4L2_TUNER_MODE_LANG1_LANG2:
+        default:
+                source = 1; /* stereo or A|B */
+                matrix = 0x20;
+                break;
+        }
+
+        if (in == MSP_DSP_OUT_TUNER)
+                source = (source << 8) | 0x20;
+        /* the msp34x2g puts the MAIN_AVC, MAIN and AUX sources in 12, 13, 14
+           instead of 11, 12, 13. So we add one for that msp version. */
+        else if (in >= MSP_DSP_OUT_MAIN_AVC && state->has_dolby_pro_logic)
+                source = ((in + 1) << 8) | matrix;
+        else
+                source = (in << 8) | matrix;
+
+        v4l_dbg(1, msp_debug, client, "set source to %d (0x%x) for output %02x\n",
+                        in, source, reg);
+        msp_write_dsp(client, reg, source);
+}
+
+static void msp34xxg_set_sources(struct i2c_client *client)
+{
+        struct msp_state *state = i2c_get_clientdata(client);
+        u32 in = state->routing.input;
+
+        msp34xxg_set_source(client, 0x0008, (in >> 4) & 0xf);
+        /* quasi-peak detector is set to same input as the loudspeaker (MAIN) */
+        msp34xxg_set_source(client, 0x000c, (in >> 4) & 0xf);
+        msp34xxg_set_source(client, 0x0009, (in >> 8) & 0xf);
+        msp34xxg_set_source(client, 0x000a, (in >> 12) & 0xf);
+        if (state->has_scart23_in_scart2_out)
+                msp34xxg_set_source(client, 0x0041, (in >> 16) & 0xf);
+        msp34xxg_set_source(client, 0x000b, (in >> 20) & 0xf);
+}
+
+/* (re-)initialize the msp34xxg */
+static void msp34xxg_reset(struct i2c_client *client)
 {
         struct msp_state *state = i2c_get_clientdata(client);
-        int modus, std;
+        int tuner = (state->routing.input >> 3) & 1;
+        int modus;
+
+        /* initialize std to 1 (autodetect) to signal that no standard is
+           selected yet. */
+        state->std = 1;
 
-        if (msp_reset(client))
-                return -1;
+        msp_reset(client);
 
         /* make sure that input/output is muted (paranoid mode) */
         /* ACB, mute DSP input, mute SCART 1 */
-        if (msp_write_dsp(client, 0x13, 0x0f20))
-                return -1;
+        msp_write_dsp(client, 0x13, 0x0f20);
 
         if (state->has_i2s_conf)
                 msp_write_dem(client, 0x40, state->i2s_mode);
 
         /* step-by-step initialisation, as described in the manual */
-        modus = msp_modus(client);
-        if (state->radio)
-                std = 0x40;
-        else
-                std = (state->v4l2_std & V4L2_STD_NTSC) ? 0x20 : 1;
-        modus &= ~0x03; /* STATUS_CHANGE = 0 */
-        modus |= 0x01;  /* AUTOMATIC_SOUND_DETECTION = 1 */
-        if (msp_write_dem(client, 0x30, modus))
-                return -1;
-        if (msp_write_dem(client, 0x20, std))
-                return -1;
+        modus = msp34xxg_modus(client);
+        modus |= tuner ? 0x100 : 0;
+        msp_write_dem(client, 0x30, modus);
 
         /* write the dsps that may have an influence on
            standard/audio autodetection right now */
-        msp34xxg_set_source(client, state->source);
-
-        /* AM/FM Prescale [15:8] 75khz deviation */
-        if (msp_write_dsp(client, 0x0e, 0x3000))
-                return -1;
+        msp34xxg_set_sources(client);
 
-        /* NICAM Prescale 9db gain (as recommended) */
-        if (msp_write_dsp(client, 0x10, 0x5a00))
-                return -1;
+        msp_write_dsp(client, 0x0d, 0x1900); /* scart */
+        msp_write_dsp(client, 0x0e, 0x3000); /* FM */
+        if (state->has_nicam)
+                msp_write_dsp(client, 0x10, 0x5a00); /* nicam */
 
-        return 0;
+        /* set identification threshold. Personally, I
+         * I set it to a higher value than the default
+         * of 0x190 to ignore noisy stereo signals.
+         * this needs tuning. (recommended range 0x00a0-0x03c0)
+         * 0x7f0 = forced mono mode
+         *
+         * a2 threshold for stereo/bilingual.
+         * Note: this register is part of the Manual/Compatibility mode.
+         * It is supported by all 'G'-family chips.
+         */
+        msp_write_dem(client, 0x22, msp_stereo_thresh);
 }
 
 int msp34xxg_thread(void *data)
 {
         struct i2c_client *client = data;
         struct msp_state *state = i2c_get_clientdata(client);
-        int val, std, i;
+        int val, i;
 
         v4l_dbg(1, msp_debug, client, "msp34xxg daemon started\n");
 
-        state->source = 1; /* default */
         for (;;) {
                 v4l_dbg(2, msp_debug, client, "msp34xxg thread: sleep\n");
                 msp_sleep(state, -1);
@@ -876,12 +942,14 @@ int msp34xxg_thread(void *data)
 
                 /* setup the chip*/
                 msp34xxg_reset(client);
-                std = msp_standard;
-                if (std != 0x01)
+                state->std = state->radio ? 0x40 : msp_standard;
+                if (state->std != 1)
                         goto unmute;
+                /* start autodetect */
+                msp_write_dem(client, 0x20, state->std);
 
                 /* watch autodetect */
-                v4l_dbg(1, msp_debug, client, "triggered autodetect, waiting for result\n");
+                v4l_dbg(1, msp_debug, client, "started autodetect, waiting for result\n");
                 for (i = 0; i < 10; i++) {
                         if (msp_sleep(state, 100))
                                 goto restart;
@@ -889,20 +957,19 @@ int msp34xxg_thread(void *data)
                         /* check results */
                         val = msp_read_dem(client, 0x7e);
                         if (val < 0x07ff) {
-                                std = val;
+                                state->std = val;
                                 break;
                         }
                         v4l_dbg(2, msp_debug, client, "detection still in progress\n");
                 }
-                if (std == 1) {
+                if (state->std == 1) {
                         v4l_dbg(1, msp_debug, client, "detection still in progress after 10 tries. giving up.\n");
                         continue;
                 }
 
         unmute:
-                state->std = std;
-                v4l_dbg(1, msp_debug, client, "current standard: %s (0x%04x)\n",
-                        msp_standard_std_name(std), std);
+                v4l_dbg(1, msp_debug, client, "detected standard: %s (0x%04x)\n",
+                        msp_standard_std_name(state->std), state->std);
 
                 /* unmute: dispatch sound to scart output, set scart volume */
                 msp_set_audio(client);
@@ -911,20 +978,33 @@ int msp34xxg_thread(void *data)
                 if (msp_write_dsp(client, 0x13, state->acb))
                         return -1;
 
-                if (state->has_i2s_conf)
-                        msp_write_dem(client, 0x40, state->i2s_mode);
+                /* the periodic stereo/SAP check is only relevant for
+                   the 0x20 standard (BTSC) */
+                if (state->std != 0x20)
+                        continue;
+
+                state->watch_stereo = 1;
+
+                /* monitor tv audio mode, the first time don't wait
+                   in order to get a quick stereo/SAP update */
+                watch_stereo(client);
+                while (state->watch_stereo) {
+                        watch_stereo(client);
+                        if (msp_sleep(state, 5000))
+                                goto restart;
+                }
         }
         v4l_dbg(1, msp_debug, client, "thread: exit\n");
         return 0;
 }
 
-static void msp34xxg_detect_stereo(struct i2c_client *client)
+static int msp34xxg_detect_stereo(struct i2c_client *client)
 {
         struct msp_state *state = i2c_get_clientdata(client);
-
         int status = msp_read_dem(client, 0x0200);
         int is_bilingual = status & 0x100;
         int is_stereo = status & 0x40;
+        int oldrx = state->rxsubchans;
 
         state->rxsubchans = 0;
         if (is_stereo)
@@ -932,42 +1012,31 @@ static void msp34xxg_detect_stereo(struct i2c_client *client)
         else
                 state->rxsubchans = V4L2_TUNER_SUB_MONO;
         if (is_bilingual) {
-                state->rxsubchans = V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
-                /* I'm supposed to check whether it's SAP or not
-                 * and set only LANG2/SAP in this case. Yet, the MSP
-                 * does a lot of work to hide this and handle everything
-                 * the same way. I don't want to work around it so unless
-                 * this is a problem, I'll handle SAP just like lang1/lang2.
-                 */
+                if (state->std == 0x20)
+                        state->rxsubchans |= V4L2_TUNER_SUB_SAP;
+                else
+                        state->rxsubchans = V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
         }
         v4l_dbg(1, msp_debug, client, "status=0x%x, stereo=%d, bilingual=%d -> rxsubchans=%d\n",
                 status, is_stereo, is_bilingual, state->rxsubchans);
+        return (oldrx != state->rxsubchans);
 }
 
 static void msp34xxg_set_audmode(struct i2c_client *client)
 {
         struct msp_state *state = i2c_get_clientdata(client);
-        int source;
 
-        switch (state->audmode) {
-        case V4L2_TUNER_MODE_MONO:
-                source = 0; /* mono only */
-                break;
-        case V4L2_TUNER_MODE_STEREO:
-                source = 1; /* stereo or A|B, see comment in msp34xxg_get_v4l2_stereo() */
-                /* problem: that could also mean 2 (scart input) */
-                break;
-        case V4L2_TUNER_MODE_LANG1:
-                source = 3; /* stereo or A */
-                break;
-        case V4L2_TUNER_MODE_LANG2:
-                source = 4; /* stereo or B */
-                break;
-        default:
-                source  = 1;
-                break;
+        if (state->std == 0x20) {
+               if ((state->rxsubchans & V4L2_TUNER_SUB_SAP) &&
+                   (state->audmode == V4L2_TUNER_MODE_STEREO ||
+                    state->audmode == V4L2_TUNER_MODE_LANG2)) {
+                        msp_write_dem(client, 0x20, 0x21);
+               } else {
+                        msp_write_dem(client, 0x20, 0x20);
+               }
         }
-        msp34xxg_set_source(client, source);
+
+        msp34xxg_set_sources(client);
 }
 
 void msp_set_audmode(struct i2c_client *client)
@@ -977,7 +1046,6 @@ void msp_set_audmode(struct i2c_client *client)
         switch (state->opmode) {
         case OPMODE_MANUAL:
         case OPMODE_AUTODETECT:
-                state->watch_stereo = 0;
                 msp3400c_set_audmode(client);
                 break;
         case OPMODE_AUTOSELECT:
@@ -986,18 +1054,17 @@ void msp_set_audmode(struct i2c_client *client)
         }
 }
 
-void msp_detect_stereo(struct i2c_client *client)
+int msp_detect_stereo(struct i2c_client *client)
 {
         struct msp_state *state  = i2c_get_clientdata(client);
 
         switch (state->opmode) {
         case OPMODE_MANUAL:
         case OPMODE_AUTODETECT:
-                msp3400c_detect_stereo(client);
-                break;
+                return msp3400c_detect_stereo(client);
         case OPMODE_AUTOSELECT:
-                msp34xxg_detect_stereo(client);
-                break;
+                return msp34xxg_detect_stereo(client);
         }
+        return 0;
 }
 
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index eb3b318674..b0aea4002d 100644
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/video/mxb.c
@@ -198,13 +198,13 @@ static int mxb_probe(struct saa7146_dev* dev)
         /* loop through all i2c-devices on the bus and look who is there */
         list_for_each(item,&mxb->i2c_adapter.clients) {
                 client = list_entry(item, struct i2c_client, list);
-                if( I2C_TEA6420_1 == client->addr )
+                if( I2C_ADDR_TEA6420_1 == client->addr )
                         mxb->tea6420_1 = client;
-                if( I2C_TEA6420_2 == client->addr )
+                if( I2C_ADDR_TEA6420_2 == client->addr )
                         mxb->tea6420_2 = client;
                 if( I2C_TEA6415C_2 == client->addr )
                         mxb->tea6415c = client;
-                if( I2C_TDA9840 == client->addr )
+                if( I2C_ADDR_TDA9840 == client->addr )
                         mxb->tda9840 = client;
                 if( I2C_SAA7111 == client->addr )
                         mxb->saa7111a = client;
@@ -790,6 +790,12 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
                                 DEB_D(("VIDIOC_S_TUNER: V4L2_TUNER_MODE_STEREO\n"));
                                 break;
                         }
+                        case V4L2_TUNER_MODE_LANG1_LANG2: {
+                                mxb->cur_mode = V4L2_TUNER_MODE_LANG1_LANG2;
+                                byte = TDA9840_SET_BOTH;
+                                DEB_D(("VIDIOC_S_TUNER: V4L2_TUNER_MODE_LANG1_LANG2\n"));
+                                break;
+                        }
                         case V4L2_TUNER_MODE_LANG1: {
                                 mxb->cur_mode = V4L2_TUNER_MODE_LANG1;
                                 byte = TDA9840_SET_LANG1;
diff --git a/drivers/usb/media/ov511.c b/drivers/media/video/ov511.c
index da44579d6f..fdc8e3f139 100644
--- a/drivers/usb/media/ov511.c
+++ b/drivers/media/video/ov511.c
@@ -15,7 +15,7 @@
  *
  * Based on the Linux CPiA driver written by Peter Pregler,
  * Scott J. Bertin and Johannes Erdfelt.
- * 
+ *
  * Please see the file: Documentation/usb/ov511.txt
  * and the website at:  http://alpha.dyndns.org/ov511
  * for more info.
@@ -433,7 +433,7 @@ reg_w_mask(struct usb_ov511 *ov,
         return (reg_w(ov, reg, newval));
 }
 
-/* 
+/*
  * Writes multiple (n) byte value to a single register. Only valid with certain
  * registers (0x30 and 0xc4 - 0xce).
  */
@@ -629,7 +629,7 @@ ov511_i2c_write_internal(struct usb_ov511 *ov,
                 /* Retry until idle */
                 do
                         rc = reg_r(ov, R511_I2C_CTL);
-                while (rc > 0 && ((rc&1) == 0)); 
+                while (rc > 0 && ((rc&1) == 0));
                 if (rc < 0)
                         break;
 
@@ -1752,7 +1752,7 @@ sensor_set_picture(struct usb_ov511 *ov, struct video_picture *p)
         ov->whiteness = p->whiteness;
 
         /* Don't return error if a setting is unsupported, or rest of settings
-         * will not be performed */
+         * will not be performed */
 
         rc = sensor_set_contrast(ov, p->contrast);
         if (FATAL_ERROR(rc))
@@ -1781,7 +1781,7 @@ sensor_get_picture(struct usb_ov511 *ov, struct video_picture *p)
         PDEBUG(4, "sensor_get_picture");
 
         /* Don't return error if a setting is unsupported, or rest of settings
-         * will not be performed */
+         * will not be performed */
 
         rc = sensor_get_contrast(ov, &(p->contrast));
         if (FATAL_ERROR(rc))
@@ -2251,7 +2251,7 @@ mode_init_ov_sensor_regs(struct usb_ov511 *ov, int width, int height,
 
         /******** Clock programming ********/
 
-        /* The OV6620 needs special handling. This prevents the 
+        /* The OV6620 needs special handling. This prevents the
          * severe banding that normally occurs */
         if (ov->sensor == SEN_OV6620 || ov->sensor == SEN_OV6630)
         {
@@ -2326,7 +2326,7 @@ set_ov_sensor_window(struct usb_ov511 *ov, int width, int height, int mode,
                      int sub_flag)
 {
         int ret;
-        int hwsbase, hwebase, vwsbase, vwebase, hwsize, vwsize; 
+        int hwsbase, hwebase, vwsbase, vwebase, hwsize, vwsize;
         int hoffset, voffset, hwscale = 0, vwscale = 0;
 
         /* The different sensor ICs handle setting up of window differently.
@@ -2575,7 +2575,7 @@ ov518_mode_init_regs(struct usb_ov511 *ov,
                 /* OV518 needs U and V swapped */
                 i2c_w_mask(ov, 0x15, 0x00, 0x01);
 
-                if (mode == VIDEO_PALETTE_GREY) {
+                if (mode == VIDEO_PALETTE_GREY) {
                         /* Set 16-bit input format (UV data are ignored) */
                         reg_w_mask(ov, 0x20, 0x00, 0x08);
 
@@ -2894,7 +2894,7 @@ make_8x8(unsigned char *pIn, unsigned char *pOut, int w)
  *           ...              ...                    ...
  *     56 57 ... 63   120 121 ... 127        248 249 ... 255
  *
- */ 
+ */
 static void
 yuv400raw_to_yuv400p(struct ov511_frame *frame,
                      unsigned char *pIn0, unsigned char *pOut0)
@@ -2923,7 +2923,7 @@ yuv400raw_to_yuv400p(struct ov511_frame *frame,
  *
  *      0  1 ...  7
  *      8  9 ... 15
- *           ...   
+ *           ...
  *     56 57 ... 63
  *
  * U and V are shipped at half resolution (1 U,V sample -> one 2x2 block).
@@ -3034,7 +3034,7 @@ decompress(struct usb_ov511 *ov, struct ov511_frame *frame,
  */
 static void
 deinterlace(struct ov511_frame *frame, int rawformat,
-            unsigned char *pIn0, unsigned char *pOut0)
+            unsigned char *pIn0, unsigned char *pOut0)
 {
         const int fieldheight = frame->rawheight / 2;
         const int fieldpix = fieldheight * frame->rawwidth;
@@ -3112,7 +3112,7 @@ ov51x_postprocess_grey(struct usb_ov511 *ov, struct ov511_frame *frame)
                                                      frame->tempdata);
 
                         deinterlace(frame, RAWFMT_YUV400, frame->tempdata,
-                                    frame->data);
+                                    frame->data);
                 } else {
                         if (frame->compressed)
                                 decompress(ov, frame, frame->rawdata,
@@ -3136,7 +3136,7 @@ ov51x_postprocess_yuv420(struct usb_ov511 *ov, struct ov511_frame *frame)
                                              frame->tempdata);
 
                 deinterlace(frame, RAWFMT_YUV420, frame->tempdata,
-                            frame->data);
+                            frame->data);
         } else {
                 if (frame->compressed)
                         decompress(ov, frame, frame->rawdata, frame->data);
@@ -3226,7 +3226,7 @@ ov511_move_data(struct usb_ov511 *ov, unsigned char *in, int n)
                 frame->rawwidth = ((int)(in[9]) + 1) * 8;
                 frame->rawheight = ((int)(in[10]) + 1) * 8;
 
-                PDEBUG(4, "Frame end, frame=%d, pnum=%d, w=%d, h=%d, recvd=%d",
+                PDEBUG(4, "Frame end, frame=%d, pnum=%d, w=%d, h=%d, recvd=%d",
                         ov->curframe, pnum, frame->rawwidth, frame->rawheight,
                         frame->bytes_recvd);
 
@@ -3527,10 +3527,10 @@ ov51x_isoc_irq(struct urb *urb, struct pt_regs *regs)
                 return;
         }
 
-        if (urb->status == -ENOENT || urb->status == -ECONNRESET) {
-                PDEBUG(4, "URB unlinked");
-                return;
-        }
+        if (urb->status == -ENOENT || urb->status == -ECONNRESET) {
+                PDEBUG(4, "URB unlinked");
+                return;
+        }
 
         if (urb->status != -EINPROGRESS && urb->status != 0) {
                 err("ERROR: urb->status=%d: %s", urb->status,
@@ -4627,8 +4627,8 @@ ov51x_v4l1_mmap(struct file *file, struct vm_area_struct *vma)
         PDEBUG(4, "mmap: %ld (%lX) bytes", size, size);
 
         if (size > (((OV511_NUMFRAMES
-                      * MAX_DATA_SIZE(ov->maxwidth, ov->maxheight)
-                      + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1))))
+                      * MAX_DATA_SIZE(ov->maxwidth, ov->maxheight)
+                      + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1))))
                 return -EINVAL;
 
         if (mutex_lock_interruptible(&ov->lock))
@@ -5062,7 +5062,7 @@ ov6xx0_configure(struct usb_ov511 *ov)
 }
 
 /* This initializes the KS0127 and KS0127B video decoders. */
-static int 
+static int
 ks0127_configure(struct usb_ov511 *ov)
 {
         int rc;
@@ -5193,7 +5193,7 @@ saa7111a_configure(struct usb_ov511 *ov)
                 return -1;
 
         /* Detect version of decoder. This must be done after writing the
-         * initial regs or the decoder will lock up. */
+         * initial regs or the decoder will lock up. */
         rc = i2c_r(ov, 0x00);
 
         if (rc < 0) {
@@ -5216,13 +5216,13 @@ saa7111a_configure(struct usb_ov511 *ov)
 }
 
 /* This initializes the OV511/OV511+ and the sensor */
-static int 
+static int
 ov511_configure(struct usb_ov511 *ov)
 {
         static struct ov511_regvals aRegvalsInit511[] = {
                 { OV511_REG_BUS, R51x_SYS_RESET,        0x7f },
-                { OV511_REG_BUS, R51x_SYS_INIT,         0x01 },
-                { OV511_REG_BUS, R51x_SYS_RESET,        0x7f },
+                { OV511_REG_BUS, R51x_SYS_INIT,         0x01 },
+                { OV511_REG_BUS, R51x_SYS_RESET,        0x7f },
                 { OV511_REG_BUS, R51x_SYS_INIT,         0x01 },
                 { OV511_REG_BUS, R51x_SYS_RESET,        0x3f },
                 { OV511_REG_BUS, R51x_SYS_INIT,         0x01 },
@@ -5269,7 +5269,7 @@ ov511_configure(struct usb_ov511 *ov)
                 err("Please notify " EMAIL " of the name,");
                 err("manufacturer, model, and this number of your camera.");
                 err("Also include the output of the detection process.");
-        } 
+        }
 
         if (ov->customid == 70)         /* USB Life TV (PAL/SECAM) */
                 ov->pal = 1;
@@ -5336,17 +5336,17 @@ ov511_configure(struct usb_ov511 *ov)
 
                                         if (i2c_w(ov, 0x10, 0x00) < 0) {
                                                 err("Can't determine sensor slave IDs");
-                                                goto error;
+                                                goto error;
                                         } else {
                                                 if (ks0127_configure(ov) < 0) {
                                                         err("Failed to configure KS0127");
-                                                        goto error;
+                                                        goto error;
                                                 }
                                         }
                                 } else {
                                         if (saa7111a_configure(ov) < 0) {
                                                 err("Failed to configure SAA7111A");
-                                                goto error;
+                                                goto error;
                                         }
                                 }
                         } else {
@@ -5356,13 +5356,13 @@ ov511_configure(struct usb_ov511 *ov)
                 } else {
                         if (ov6xx0_configure(ov) < 0) {
                                 err("Failed to configure OV6xx0");
-                                goto error;
+                                goto error;
                         }
                 }
         } else {
                 if (ov7xx0_configure(ov) < 0) {
                         err("Failed to configure OV7xx0");
-                        goto error;
+                        goto error;
                 }
         }
 
@@ -5381,12 +5381,12 @@ ov518_configure(struct usb_ov511 *ov)
         /* For 518 and 518+ */
         static struct ov511_regvals aRegvalsInit518[] = {
                 { OV511_REG_BUS, R51x_SYS_RESET,        0x40 },
-                { OV511_REG_BUS, R51x_SYS_INIT,         0xe1 },
-                { OV511_REG_BUS, R51x_SYS_RESET,        0x3e },
+                { OV511_REG_BUS, R51x_SYS_INIT,         0xe1 },
+                { OV511_REG_BUS, R51x_SYS_RESET,        0x3e },
                 { OV511_REG_BUS, R51x_SYS_INIT,         0xe1 },
                 { OV511_REG_BUS, R51x_SYS_RESET,        0x00 },
                 { OV511_REG_BUS, R51x_SYS_INIT,         0xe1 },
-                { OV511_REG_BUS, 0x46,                  0x00 }, 
+                { OV511_REG_BUS, 0x46,                  0x00 },
                 { OV511_REG_BUS, 0x5d,                  0x03 },
                 { OV511_DONE_BUS, 0x0, 0x00},
         };
@@ -5517,7 +5517,7 @@ ov518_configure(struct usb_ov511 *ov)
 
                         if (init_ov_sensor(ov) < 0) {
                                 err("Can't determine sensor slave IDs");
-                                goto error;
+                                goto error;
                         } else {
                                 err("Detected unsupported OV8xx0 sensor");
                                 goto error;
@@ -5525,13 +5525,13 @@ ov518_configure(struct usb_ov511 *ov)
                 } else {
                         if (ov6xx0_configure(ov) < 0) {
                                 err("Failed to configure OV6xx0");
-                                goto error;
+                                goto error;
                         }
                 }
         } else {
                 if (ov7xx0_configure(ov) < 0) {
                         err("Failed to configure OV7xx0");
-                        goto error;
+                        goto error;
                 }
         }
 
@@ -5564,28 +5564,28 @@ static ssize_t show_custom_id(struct class_device *cd, char *buf)
 {
         struct usb_ov511 *ov = cd_to_ov(cd);
         return sprintf(buf, "%d\n", ov->customid);
-} 
+}
 static CLASS_DEVICE_ATTR(custom_id, S_IRUGO, show_custom_id, NULL);
 
 static ssize_t show_model(struct class_device *cd, char *buf)
 {
         struct usb_ov511 *ov = cd_to_ov(cd);
         return sprintf(buf, "%s\n", ov->desc);
-} 
+}
 static CLASS_DEVICE_ATTR(model, S_IRUGO, show_model, NULL);
 
 static ssize_t show_bridge(struct class_device *cd, char *buf)
 {
         struct usb_ov511 *ov = cd_to_ov(cd);
         return sprintf(buf, "%s\n", symbolic(brglist, ov->bridge));
-} 
+}
 static CLASS_DEVICE_ATTR(bridge, S_IRUGO, show_bridge, NULL);
 
 static ssize_t show_sensor(struct class_device *cd, char *buf)
 {
         struct usb_ov511 *ov = cd_to_ov(cd);
         return sprintf(buf, "%s\n", symbolic(senlist, ov->sensor));
-} 
+}
 static CLASS_DEVICE_ATTR(sensor, S_IRUGO, show_sensor, NULL);
 
 static ssize_t show_brightness(struct class_device *cd, char *buf)
@@ -5597,7 +5597,7 @@ static ssize_t show_brightness(struct class_device *cd, char *buf)
                 return -ENODEV;
         sensor_get_brightness(ov, &x);
         return sprintf(buf, "%d\n", x >> 8);
-} 
+}
 static CLASS_DEVICE_ATTR(brightness, S_IRUGO, show_brightness, NULL);
 
 static ssize_t show_saturation(struct class_device *cd, char *buf)
@@ -5609,7 +5609,7 @@ static ssize_t show_saturation(struct class_device *cd, char *buf)
                 return -ENODEV;
         sensor_get_saturation(ov, &x);
         return sprintf(buf, "%d\n", x >> 8);
-} 
+}
 static CLASS_DEVICE_ATTR(saturation, S_IRUGO, show_saturation, NULL);
 
 static ssize_t show_contrast(struct class_device *cd, char *buf)
@@ -5621,7 +5621,7 @@ static ssize_t show_contrast(struct class_device *cd, char *buf)
                 return -ENODEV;
         sensor_get_contrast(ov, &x);
         return sprintf(buf, "%d\n", x >> 8);
-} 
+}
 static CLASS_DEVICE_ATTR(contrast, S_IRUGO, show_contrast, NULL);
 
 static ssize_t show_hue(struct class_device *cd, char *buf)
@@ -5633,7 +5633,7 @@ static ssize_t show_hue(struct class_device *cd, char *buf)
                 return -ENODEV;
         sensor_get_hue(ov, &x);
         return sprintf(buf, "%d\n", x >> 8);
-} 
+}
 static CLASS_DEVICE_ATTR(hue, S_IRUGO, show_hue, NULL);
 
 static ssize_t show_exposure(struct class_device *cd, char *buf)
@@ -5645,7 +5645,7 @@ static ssize_t show_exposure(struct class_device *cd, char *buf)
                 return -ENODEV;
         sensor_get_exposure(ov, &exp);
         return sprintf(buf, "%d\n", exp >> 8);
-} 
+}
 static CLASS_DEVICE_ATTR(exposure, S_IRUGO, show_exposure, NULL);
 
 static void ov_create_sysfs(struct video_device *vdev)
diff --git a/drivers/usb/media/ov511.h b/drivers/media/video/ov511.h
index bce9b36338..12b3d51e1c 100644
--- a/drivers/usb/media/ov511.h
+++ b/drivers/media/video/ov511.h
@@ -130,7 +130,7 @@
 #define R511_COMP_QVY           0x76
 #define R511_COMP_QVUV          0x77
 #define R511_COMP_EN            0x78
-#define R511_COMP_LUT_EN        0x79            
+#define R511_COMP_LUT_EN        0x79
 #define R511_COMP_LUT_BEGIN     0x80
 
 /* --------------------------------- */
@@ -459,14 +459,14 @@ struct usb_ov511 {
         int subh;               /* Pix Array subcapture height */
 
         int curframe;           /* Current receiving sbuf */
-        struct ov511_frame frame[OV511_NUMFRAMES];      
+        struct ov511_frame frame[OV511_NUMFRAMES];
 
         struct ov511_sbuf sbuf[OV511_NUMSBUF];
 
         wait_queue_head_t wq;   /* Processes waiting */
 
         int snap_enabled;       /* Snapshot mode enabled */
-        
+
         int bridge;             /* Type of bridge (BRG_*) */
         int bclass;             /* Class of bridge (BCL_*) */
         int sensor;             /* Type of image sensor chip (SEN_*) */
@@ -512,7 +512,7 @@ struct symbolic_list {
 /* Returns the name of the matching element in the symbolic_list array. The
  * end of the list must be marked with an element that has a NULL name.
  */
-static inline char * 
+static inline char *
 symbolic(struct symbolic_list list[], int num)
 {
         int i;
diff --git a/drivers/media/video/ovcamchip/Makefile b/drivers/media/video/ovcamchip/Makefile
index bca41ad93d..cba4cdf20f 100644
--- a/drivers/media/video/ovcamchip/Makefile
+++ b/drivers/media/video/ovcamchip/Makefile
@@ -1,4 +1,4 @@
 ovcamchip-objs     := ovcamchip_core.o ov6x20.o ov6x30.o ov7x10.o ov7x20.o \
-                      ov76be.o
+                      ov76be.o
 
 obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip.o
diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
index e76b53d590..3fe9fa04cd 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -266,17 +266,17 @@ static int ovcamchip_detect(struct i2c_client *c)
                 PDEBUG(3, "Testing for 0V6xx0");
                 c->addr = OV6xx0_SID;
                 if (init_camchip(c) < 0) {
-                        return -ENODEV;
+                        return -ENODEV;
                 } else {
                         if (ov6xx0_detect(c) < 0) {
                                 PERROR("Failed to init OV6xx0");
-                                return -EIO;
+                                return -EIO;
                         }
                 }
         } else {
                 if (ov7xx0_detect(c) < 0) {
                         PERROR("Failed to init OV7xx0");
-                        return -EIO;
+                        return -EIO;
                 }
         }
 
diff --git a/drivers/media/video/ovcamchip/ovcamchip_priv.h b/drivers/media/video/ovcamchip/ovcamchip_priv.h
index 575e612a55..1231335a9f 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_priv.h
+++ b/drivers/media/video/ovcamchip/ovcamchip_priv.h
@@ -82,6 +82,6 @@ extern int ov_write_regvals(struct i2c_client *c,
                             struct ovcamchip_regvals *rvals);
 
 extern int ov_write_mask(struct i2c_client *c, unsigned char reg,
-                         unsigned char value, unsigned char mask);
+                         unsigned char value, unsigned char mask);
 
 #endif
diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c
index 15fd85acab..d9e3cada52 100644
--- a/drivers/media/video/planb.c
+++ b/drivers/media/video/planb.c
@@ -1,4 +1,4 @@
-/* 
+/*
     planb - PlanB frame grabber driver
 
     PlanB is used in the 7x00/8x00 series of PowerMacintosh
@@ -584,7 +584,7 @@ finish:
         wake_up_interruptible(&pb->suspendq);
 }
 
-static void add_clip(struct planb *pb, struct video_clip *clip) 
+static void add_clip(struct planb *pb, struct video_clip *clip)
 {
         volatile unsigned char  *base;
         int     xc = clip->x, yc = clip->y;
@@ -758,7 +758,7 @@ static void cmd_buff(struct planb *pb)
                                                         PLANB_SET(CH_SYNC));
         tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->ch1.br_sel),
                                                         PLANB_SET(DMA_ABORT));
-        
+
         /* odd field data: */
         jump = virt_to_bus(c1 + nlines / 2);
         for (i=1; i < nlines; i += stepsize, c1++)
@@ -1247,7 +1247,7 @@ static volatile struct dbdma_cmd *setup_grab_cmd(int fr, struct planb *pb)
         tab_cmd_dbdma(c1, DBDMA_NOP | BR_IFCLR, virt_to_bus(c1-3)); c1++;
         tab_cmd_store(c1++, (unsigned)(&pb->planb_base_phys->ch1.br_sel),
                 PLANB_SET(DMA_ABORT));
-        
+
         /* odd field data: */
         jump_addr = c1 + TAB_FACTOR * nlines / 2;
         jump = virt_to_bus(jump_addr);
@@ -1383,7 +1383,7 @@ static int planb_open(struct video_device *dev, int mode)
         pb->user++;
 
         DEBUG("PlanB: device opened\n");
-        return 0;   
+        return 0;
 }
 
 static void planb_close(struct video_device *dev)
@@ -1424,9 +1424,9 @@ static long planb_write(struct video_device *v, const char *buf,
 static int planb_ioctl(struct video_device *dev, unsigned int cmd, void *arg)
 {
         struct planb *pb=(struct planb *)dev;
-        
+
         switch (cmd)
-        {       
+        {
                 case VIDIOCGCAP:
                 {
                         struct video_capability b;
@@ -1440,26 +1440,26 @@ static int planb_ioctl(struct video_device *dev, unsigned int cmd, void *arg)
                         b.channels = 2; /* composite & svhs */
                         b.audios = 0;
                         b.maxwidth = PLANB_MAXPIXELS;
-                        b.maxheight = PLANB_MAXLINES;
-                        b.minwidth = 32; /* wild guess */
-                        b.minheight = 32;
-                        if (copy_to_user(arg,&b,sizeof(b)))
-                                return -EFAULT;
+                        b.maxheight = PLANB_MAXLINES;
+                        b.minwidth = 32; /* wild guess */
+                        b.minheight = 32;
+                        if (copy_to_user(arg,&b,sizeof(b)))
+                                return -EFAULT;
                         return 0;
                 }
                 case VIDIOCSFBUF:
                 {
-                        struct video_buffer v;
+                        struct video_buffer v;
                         unsigned short bpp;
                         unsigned int fmt;
 
                         DEBUG("PlanB: IOCTL VIDIOCSFBUF\n");
 
-                        if (!capable(CAP_SYS_ADMIN)
+                        if (!capable(CAP_SYS_ADMIN)
                         || !capable(CAP_SYS_RAWIO))
-                                return -EPERM;
-                        if (copy_from_user(&v, arg,sizeof(v)))
-                                return -EFAULT;
+                                return -EPERM;
+                        if (copy_from_user(&v, arg,sizeof(v)))
+                                return -EFAULT;
                         planb_lock(pb);
                         switch(v.depth) {
                         case 8:
@@ -1478,7 +1478,7 @@ static int planb_ioctl(struct video_device *dev, unsigned int cmd, void *arg)
                                 break;
                         default:
                                 planb_unlock(pb);
-                                return -EINVAL;
+                                return -EINVAL;
                         }
                         if (bpp * v.width > v.bytesperline) {
                                 planb_unlock(pb);
@@ -1493,7 +1493,7 @@ static int planb_ioctl(struct video_device *dev, unsigned int cmd, void *arg)
                         pb->win.bpl = pb->win.bpp * pb->win.swidth;
                         pb->win.pad = v.bytesperline - pb->win.bpl;
 
-                        DEBUG("PlanB: Display at %p is %d by %d, bytedepth %d,"
+                        DEBUG("PlanB: Display at %p is %d by %d, bytedepth %d,"
                                 " bpl %d (+ %d)\n", v.base, v.width,v.height,
                                 pb->win.bpp, pb->win.bpl, pb->win.pad);
 
@@ -1504,11 +1504,11 @@ static int planb_ioctl(struct video_device *dev, unsigned int cmd, void *arg)
                                 resume_overlay(pb);
                         }
                         planb_unlock(pb);
-                        return 0;               
+                        return 0;
                 }
                 case VIDIOCGFBUF:
                 {
-                        struct video_buffer v;
+                        struct video_buffer v;
 
                         DEBUG("PlanB: IOCTL VIDIOCGFBUF\n");
 
@@ -1518,15 +1518,15 @@ static int planb_ioctl(struct video_device *dev, unsigned int cmd, void *arg)
                         v.depth = pb->win.depth;
                         v.bytesperline = pb->win.bpl + pb->win.pad;
                         if (copy_to_user(arg, &v, sizeof(v)))
-                                return -EFAULT;
+                                return -EFAULT;
                         return 0;
                 }
                 case VIDIOCCAPTURE:
                 {
                         int i;
 
-                        if(copy_from_user(&i, arg, sizeof(i)))
-                                return -EFAULT;
+                        if(copy_from_user(&i, arg, sizeof(i)))
+                                return -EFAULT;
                         if(i==0) {
                                 DEBUG("PlanB: IOCTL VIDIOCCAPTURE Stop\n");
 
@@ -1695,7 +1695,7 @@ static int planb_ioctl(struct video_device *dev, unsigned int cmd, void *arg)
                         struct video_window     vw;
                         struct video_clip       clip;
                         int                     i;
-                        
+
                         DEBUG("PlanB: IOCTL VIDIOCSWIN\n");
 
                         if(copy_from_user(&vw,arg,sizeof(vw)))
@@ -1749,7 +1749,7 @@ static int planb_ioctl(struct video_device *dev, unsigned int cmd, void *arg)
                                 return -EFAULT;
                         return 0;
                 }
-                case VIDIOCSYNC: {
+                case VIDIOCSYNC: {
                         int i;
 
                         IDEBUG("PlanB: IOCTL VIDIOCSYNC\n");
@@ -1759,42 +1759,42 @@ static int planb_ioctl(struct video_device *dev, unsigned int cmd, void *arg)
 
                         IDEBUG("PlanB: sync to frame %d\n", i);
 
-                        if(i > (MAX_GBUFFERS - 1) || i < 0)
-                                return -EINVAL;
+                        if(i > (MAX_GBUFFERS - 1) || i < 0)
+                                return -EINVAL;
 chk_grab:
-                        switch (pb->frame_stat[i]) {
-                        case GBUFFER_UNUSED:
-                                return -EINVAL;
+                        switch (pb->frame_stat[i]) {
+                        case GBUFFER_UNUSED:
+                                return -EINVAL;
                         case GBUFFER_GRABBING:
                                 IDEBUG("PlanB: waiting for grab"
                                                         " done (%d)\n", i);
-                                interruptible_sleep_on(&pb->capq);
+                                interruptible_sleep_on(&pb->capq);
                                 if(signal_pending(current))
                                         return -EINTR;
                                 goto chk_grab;
-                        case GBUFFER_DONE:
-                                pb->frame_stat[i] = GBUFFER_UNUSED;
-                                break;
-                        }
-                        return 0;
+                        case GBUFFER_DONE:
+                                pb->frame_stat[i] = GBUFFER_UNUSED;
+                                break;
+                        }
+                        return 0;
                 }
 
-                case VIDIOCMCAPTURE:
+                case VIDIOCMCAPTURE:
                 {
-                        struct video_mmap vm;
+                        struct video_mmap vm;
                         volatile unsigned int status;
 
                         IDEBUG("PlanB: IOCTL VIDIOCMCAPTURE\n");
 
                         if(copy_from_user((void *) &vm,(void *)arg,sizeof(vm)))
                                 return -EFAULT;
-                        status = pb->frame_stat[vm.frame];
-                        if (status != GBUFFER_UNUSED)
-                                return -EBUSY;
+                        status = pb->frame_stat[vm.frame];
+                        if (status != GBUFFER_UNUSED)
+                                return -EBUSY;
 
-                        return vgrab(pb, &vm);
+                        return vgrab(pb, &vm);
                 }
-                
+
                 case VIDIOCGMBUF:
                 {
                         int i;
@@ -1811,7 +1811,7 @@ chk_grab:
                                 return -EFAULT;
                         return 0;
                 }
-                
+
                 case PLANBIOCGSAAREGS:
                 {
                         struct planb_saa_regs preg;
@@ -1828,7 +1828,7 @@ chk_grab:
                                 return -EFAULT;
                         return 0;
                 }
-                
+
                 case PLANBIOCSSAAREGS:
                 {
                         struct planb_saa_regs preg;
@@ -1842,7 +1842,7 @@ chk_grab:
                         saa_set (preg.addr, preg.val, pb);
                         return 0;
                 }
-                
+
                 case PLANBIOCGSTAT:
                 {
                         struct planb_stat_regs pstat;
@@ -1859,7 +1859,7 @@ chk_grab:
                                 return -EFAULT;
                         return 0;
                 }
-                
+
                 case PLANBIOCSMODE: {
                         int v;
 
@@ -1985,10 +1985,10 @@ static int planb_mmap(struct vm_area_struct *vma, struct video_device *dev, cons
 {
         int i;
         struct planb *pb = (struct planb *)dev;
-        unsigned long start = (unsigned long)adr;
+        unsigned long start = (unsigned long)adr;
 
         if (size > MAX_GBUFFERS * PLANB_MAX_FBUF)
-                return -EINVAL;
+                return -EINVAL;
         if (!pb->rawbuf) {
                 int err;
                 if((err=grabbuf_alloc(pb)))
@@ -2091,10 +2091,10 @@ static int init_planb(struct planb *pb)
         /* clear interrupt mask */
         pb->intr_mask = PLANB_CLR_IRQ;
 
-        result = request_irq(pb->irq, planb_irq, 0, "PlanB", (void *)pb);
-        if (result < 0) {
-                if (result==-EINVAL)
-                        printk(KERN_ERR "PlanB: Bad irq number (%d) "
+        result = request_irq(pb->irq, planb_irq, 0, "PlanB", (void *)pb);
+        if (result < 0) {
+                if (result==-EINVAL)
+                        printk(KERN_ERR "PlanB: Bad irq number (%d) "
                                                 "or handler\n", (int)pb->irq);
                 else if (result==-EBUSY)
                         printk(KERN_ERR "PlanB: I don't know why, "
@@ -2102,7 +2102,7 @@ static int init_planb(struct planb *pb)
                 return result;
         }
         disable_irq(pb->irq);
-        
+
         /* Now add the template and register the device unit. */
         memcpy(&pb->video_dev,&planb_template,sizeof(planb_template));
 
@@ -2143,7 +2143,7 @@ static int init_planb(struct planb *pb)
 }
 
 /*
- *      Scan for a PlanB controller, request the irq and map the io memory 
+ *      Scan for a PlanB controller, request the irq and map the io memory
  */
 
 static int find_planb(void)
@@ -2156,7 +2156,7 @@ static int find_planb(void)
         struct pci_dev          *pdev;
         int rc;
 
-        if (_machine != _MACH_Pmac)
+        if (!machine_is(powermac))
                 return 0;
 
         planb_devices = find_devices("planb");
@@ -2171,9 +2171,9 @@ static int find_planb(void)
         pb = &planbs[0];
         planb_num = 1;
 
-        if (planb_devices->n_addrs != 1) {
-                printk (KERN_WARNING "PlanB: expecting 1 address for planb "
-                        "(got %d)", planb_devices->n_addrs);
+        if (planb_devices->n_addrs != 1) {
+                printk (KERN_WARNING "PlanB: expecting 1 address for planb "
+                        "(got %d)", planb_devices->n_addrs);
                 return 0;
         }
 
@@ -2236,7 +2236,7 @@ static int find_planb(void)
         pb->planb_base = planb_regs;
         pb->planb_base_phys = (struct planb_registers *)new_base;
         pb->irq = irq;
-        
+
         return planb_num;
 
 err_out_disable:
@@ -2251,7 +2251,7 @@ static void release_planb(void)
         int i;
         struct planb *pb;
 
-        for (i=0;i<planb_num; i++) 
+        for (i=0;i<planb_num; i++)
         {
                 pb=&planbs[i];
 
@@ -2278,7 +2278,7 @@ static void release_planb(void)
 static int __init init_planbs(void)
 {
         int i;
-  
+
         if (find_planb()<=0)
                 return -EIO;
 
@@ -2288,9 +2288,9 @@ static int __init init_planbs(void)
                                                         " with v4l\n", i);
                         release_planb();
                         return -EIO;
-                } 
+                }
                 printk(KERN_INFO "PlanB: registered device %d with v4l\n", i);
-        }  
+        }
         return 0;
 }
 
diff --git a/drivers/media/video/planb.h b/drivers/media/video/planb.h
index 79b6b56142..92823211d0 100644
--- a/drivers/media/video/planb.h
+++ b/drivers/media/video/planb.h
@@ -1,4 +1,4 @@
-/* 
+/*
     planb - PlanB frame grabber driver
 
     PlanB is used in the 7x00/8x00 series of PowerMacintosh
@@ -167,7 +167,7 @@ struct planb {
         struct  video_device video_dev;
         struct  video_picture picture;          /* Current picture params */
         struct  video_audio audio_dev;          /* Current audio params */
-  
+
         volatile struct planb_registers *planb_base;    /* virt base of planb */
         struct planb_registers *planb_base_phys;        /* phys base of planb */
         void    *priv_space;                    /* Org. alloc. mem for kfree */
@@ -209,7 +209,7 @@ struct planb {
         int gwidth[MAX_GBUFFERS], gheight[MAX_GBUFFERS];
         unsigned int gfmt[MAX_GBUFFERS];
         int gnorm_switch[MAX_GBUFFERS];
-        volatile unsigned int *frame_stat;
+        volatile unsigned int *frame_stat;
 #define GBUFFER_UNUSED       0x00U
 #define GBUFFER_GRABBING     0x01U
 #define GBUFFER_DONE         0x02U
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index 05ca55939e..09835ca098 100644
--- a/drivers/media/video/pms.c
+++ b/drivers/media/video/pms.c
@@ -12,10 +12,10 @@
  *      Most of this code is directly derived from his userspace driver.
  *      His driver works so send any reports to alan@redhat.com unless the
  *      userspace driver also doesn't work for you...
- *      
+ *
  *      Changes:
  *      08/07/2003        Daniele Bellucci <bellucda@tiscali.it>
- *                        - pms_capture: report back -EFAULT 
+ *                        - pms_capture: report back -EFAULT
  */
 
 #include <linux/module.h>
@@ -66,14 +66,14 @@ static int standard 		= 0;	/* 0 - auto 1 - ntsc 2 - pal 3 - secam */
 /*
  *      I/O ports and Shared Memory
  */
- 
+
 static int io_port              =       0x250;
 static int data_port            =       0x251;
 static int mem_base             =       0xC8000;
 static void __iomem *mem;
 static int video_nr             =       -1;
 
-        
+
 
 static inline void mvv_write(u8 index, u8 value)
 {
@@ -90,9 +90,9 @@ static int pms_i2c_stat(u8 slave)
 {
         int counter;
         int i;
-        
+
         outb(0x28, io_port);
-        
+
         counter=0;
         while((inb(data_port)&0x01)==0)
                 if(counter++==256)
@@ -101,9 +101,9 @@ static int pms_i2c_stat(u8 slave)
         while((inb(data_port)&0x01)!=0)
                 if(counter++==256)
                         break;
-                        
+
         outb(slave, io_port);
-        
+
         counter=0;
         while((inb(data_port)&0x01)==0)
                 if(counter++==256)
@@ -112,7 +112,7 @@ static int pms_i2c_stat(u8 slave)
         while((inb(data_port)&0x01)!=0)
                 if(counter++==256)
                         break;
-                        
+
         for(i=0;i<12;i++)
         {
                 char st=inb(data_port);
@@ -122,7 +122,7 @@ static int pms_i2c_stat(u8 slave)
                         break;
         }
         outb(0x29, io_port);
-        return inb(data_port);          
+        return inb(data_port);
 }
 
 static int pms_i2c_write(u16 slave, u16 sub, u16 data)
@@ -130,19 +130,19 @@ static int pms_i2c_write(u16 slave, u16 sub, u16 data)
         int skip=0;
         int count;
         int i;
-        
+
         for(i=0;i<i2c_count;i++)
         {
                 if((i2cinfo[i].slave==slave) &&
                    (i2cinfo[i].sub == sub))
                 {
-                        if(i2cinfo[i].data==data)
-                                skip=1;
-                        i2cinfo[i].data=data;
-                        i=i2c_count+1;
+                        if(i2cinfo[i].data==data)
+                                skip=1;
+                        i2cinfo[i].data=data;
+                        i=i2c_count+1;
                 }
         }
-        
+
         if(i==i2c_count && i2c_count<64)
         {
                 i2cinfo[i2c_count].slave=slave;
@@ -150,16 +150,16 @@ static int pms_i2c_write(u16 slave, u16 sub, u16 data)
                 i2cinfo[i2c_count].data=data;
                 i2c_count++;
         }
-        
+
         if(skip)
                 return 0;
-                
+
         mvv_write(0x29, sub);
         mvv_write(0x2A, data);
         mvv_write(0x28, slave);
-        
+
         outb(0x28, io_port);
-        
+
         count=0;
         while((inb(data_port)&1)==0)
                 if(count>255)
@@ -167,9 +167,9 @@ static int pms_i2c_write(u16 slave, u16 sub, u16 data)
         while((inb(data_port)&1)!=0)
                 if(count>255)
                         break;
-                        
+
         count=inb(data_port);
-        
+
         if(count&2)
                 return -1;
         return count;
@@ -189,8 +189,8 @@ static int pms_i2c_read(int slave, int sub)
 
 static void pms_i2c_andor(int slave, int sub, int and, int or)
 {
-        u8 tmp; 
-        
+        u8 tmp;
+
         tmp=pms_i2c_read(slave, sub);
         tmp = (tmp&and)|or;
         pms_i2c_write(slave, sub, tmp);
@@ -199,7 +199,7 @@ static void pms_i2c_andor(int slave, int sub, int and, int or)
 /*
  *      Control functions
  */
- 
+
 
 static void pms_videosource(short source)
 {
@@ -234,8 +234,8 @@ static void pms_colour(short colour)
                         break;
         }
 }
- 
- 
+
+
 static void pms_contrast(short contrast)
 {
         switch(decoder)
@@ -269,14 +269,14 @@ static void pms_format(short format)
 {
         int target;
         standard = format;
-        
+
         if(decoder==PHILIPS1)
                 target=0x42;
         else if(decoder==PHILIPS2)
                 target=0x8A;
         else
                 return;
-                                
+
         switch(format)
         {
                 case 0: /* Auto */
@@ -302,7 +302,7 @@ static void pms_format(short format)
 
 /*
  *      These features of the PMS card are not currently exposes. They
- *      could become a private v4l ioctl for PMSCONFIG or somesuch if 
+ *      could become a private v4l ioctl for PMSCONFIG or somesuch if
  *      people need it. We also don't yet use the PMS interrupt.
  */
 
@@ -324,7 +324,7 @@ static void pms_hstart(short start)
 /*
  *      Bandpass filters
  */
- 
+
 static void pms_bandpass(short pass)
 {
         if(decoder==PHILIPS2)
@@ -493,7 +493,7 @@ static void pms_vert(u8 deciden, u8 decinum)
 /*
  *      Turn 16bit ratios into best small ratio the chipset can grok
  */
- 
+
 static void pms_vertdeci(unsigned short decinum, unsigned short deciden)
 {
         /* Knock it down by /5 once */
@@ -546,7 +546,7 @@ static void pms_horzdeci(short decinum, short deciden)
                 decinum=512;
                 deciden=640;    /* 768 would be ideal */
         }
-        
+
         while(((decinum|deciden)&1)==0)
         {
                 decinum>>=1;
@@ -559,7 +559,7 @@ static void pms_horzdeci(short decinum, short deciden)
         }
         if(deciden==32)
                 deciden--;
-                
+
         mvv_write(0x24, 0x80|deciden);
         mvv_write(0x25, decinum);
 }
@@ -567,14 +567,14 @@ static void pms_horzdeci(short decinum, short deciden)
 static void pms_resolution(short width, short height)
 {
         int fg_height;
-        
+
         fg_height=height;
         if(fg_height>280)
                 fg_height=280;
-                
+
         mvv_write(0x18, fg_height);
         mvv_write(0x19, fg_height>>8);
-        
+
         if(standard==1)
         {
                 mvv_write(0x1A, 0xFC);
@@ -598,7 +598,7 @@ static void pms_resolution(short width, short height)
         mvv_write(0x42, 0x00);
         mvv_write(0x43, 0x00);
         mvv_write(0x44, MVVMEMORYWIDTH);
-        
+
         mvv_write(0x22, width+8);
         mvv_write(0x23, (width+8)>> 8);
 
@@ -618,7 +618,7 @@ static void pms_resolution(short width, short height)
 /*
  *      Set Input
  */
- 
+
 static void pms_vcrinput(short input)
 {
         if(decoder==PHILIPS2)
@@ -643,20 +643,20 @@ static int pms_capture(struct pms_device *dev, char __user *buf, int rgb555, int
         mvv_write(0x08,r8); /* capture rgb555/565, init DRAM, PC enable */
 
 /*      printf("%d %d %d %d %d %x %x\n",width,height,voff,nom,den,mvv_buf); */
-  
-        for (y = 0; y < dev->height; y++ ) 
+
+        for (y = 0; y < dev->height; y++ )
         {
                 writeb(0, mem);  /* synchronisiert neue Zeile */
-                
+
                 /*
                  *      This is in truth a fifo, be very careful as if you
                  *      forgot this odd things will occur 8)
                  */
-                 
+
                 memcpy_fromio(tmp, mem, dw+32); /* discard 16 word   */
                 cnt -= dev->height;
-                while (cnt <= 0) 
-                { 
+                while (cnt <= 0)
+                {
                         /*
                          *      Don't copy too far
                          */
@@ -666,7 +666,7 @@ static int pms_capture(struct pms_device *dev, char __user *buf, int rgb555, int
                         cnt += dev->height;
                         if (copy_to_user(buf, tmp+32, dt))
                                 return len ? len : -EFAULT;
-                        buf += dt;    
+                        buf += dt;
                         len += dt;
                 }
         }
@@ -683,7 +683,7 @@ static int pms_do_ioctl(struct inode *inode, struct file *file,
 {
         struct video_device *dev = video_devdata(file);
         struct pms_device *pd=(struct pms_device *)dev;
-        
+
         switch(cmd)
         {
                 case VIDIOCGCAP:
@@ -806,7 +806,7 @@ static int pms_do_ioctl(struct inode *inode, struct file *file,
                             ||(p->palette==VIDEO_PALETTE_RGB555 && p->depth==15)))
                                 return -EINVAL;
                         pd->picture= *p;
-                        
+
                         /*
                          *      Now load the card.
                          */
@@ -815,7 +815,7 @@ static int pms_do_ioctl(struct inode *inode, struct file *file,
                         pms_brightness(p->brightness>>8);
                         pms_hue(p->hue>>8);
                         pms_colour(p->colour>>8);
-                        pms_contrast(p->contrast>>8);   
+                        pms_contrast(p->contrast>>8);
                         mutex_unlock(&pd->lock);
                         return 0;
                 }
@@ -873,7 +873,7 @@ static ssize_t pms_read(struct file *file, char __user *buf,
         struct video_device *v = video_devdata(file);
         struct pms_device *pd=(struct pms_device *)v;
         int len;
-        
+
         mutex_lock(&pd->lock);
         len=pms_capture(pd, buf, (pd->picture.depth==16)?0:1,count);
         mutex_unlock(&pd->lock);
@@ -905,13 +905,13 @@ static struct pms_device pms_device;
 /*
  *      Probe for and initialise the Mediavision PMS
  */
- 
+
 static int init_mediavision(void)
 {
         int id;
         int idec, decst;
         int i;
-                
+
         unsigned char i2c_defs[]={
                 0x4C,0x30,0x00,0xE8,
                 0xB6,0xE2,0x00,0x00,
@@ -925,7 +925,7 @@ static int init_mediavision(void)
         mem = ioremap(mem_base, 0x800);
         if (!mem)
                 return -ENOMEM;
-        
+
         if (!request_region(0x9A01, 1, "Mediavision PMS config"))
         {
                 printk(KERN_WARNING "mediavision: unable to detect: 0x9A01 in use.\n");
@@ -941,18 +941,18 @@ static int init_mediavision(void)
         }
         outb(0xB8, 0x9A01);             /* Unlock */
         outb(io_port>>4, 0x9A01);       /* Set IO port */
-        
-        
+
+
         id=mvv_read(3);
         decst=pms_i2c_stat(0x43);
-        
+
         if(decst!=-1)
                 idec=2;
         else if(pms_i2c_stat(0xb9)!=-1)
                 idec=3;
         else if(pms_i2c_stat(0x8b)!=-1)
                 idec=1;
-        else 
+        else
                 idec=0;
 
         printk(KERN_INFO "PMS type is %d\n", idec);
@@ -966,11 +966,11 @@ static int init_mediavision(void)
         /*
          *      Ok we have a PMS of some sort
          */
-        
+
         mvv_write(0x04, mem_base>>12);  /* Set the memory area */
-        
+
         /* Ok now load the defaults */
-        
+
         for(i=0;i<0x19;i++)
         {
                 if(i2c_defs[i]==0xFF)
@@ -978,7 +978,7 @@ static int init_mediavision(void)
                 else
                         pms_i2c_write(0x8A, i, i2c_defs[i]);
         }
-        
+
         pms_i2c_write(0xB8,0x00,0x12);
         pms_i2c_write(0xB8,0x04,0x00);
         pms_i2c_write(0xB8,0x07,0x00);
@@ -987,18 +987,18 @@ static int init_mediavision(void)
         pms_i2c_write(0xB8,0x0A,0x00);
         pms_i2c_write(0xB8,0x0B,0x10);
         pms_i2c_write(0xB8,0x10,0x03);
-        
+
         mvv_write(0x01, 0x00);
         mvv_write(0x05, 0xA0);
         mvv_write(0x08, 0x25);
         mvv_write(0x09, 0x00);
-        mvv_write(0x0A, 0x20|MVVMEMORYWIDTH);   
-        
+        mvv_write(0x0A, 0x20|MVVMEMORYWIDTH);
+
         mvv_write(0x10, 0x02);
         mvv_write(0x1E, 0x0C);
         mvv_write(0x1F, 0x03);
         mvv_write(0x26, 0x06);
-        
+
         mvv_write(0x2B, 0x00);
         mvv_write(0x2C, 0x20);
         mvv_write(0x2D, 0x00);
@@ -1018,13 +1018,13 @@ static int init_mediavision(void)
 /*
  *      Initialization and module stuff
  */
- 
+
 static int __init init_pms_cards(void)
 {
         printk(KERN_INFO "Mediavision Pro Movie Studio driver 0.02\n");
-        
+
         data_port = io_port +1;
-        
+
         if(init_mediavision())
         {
                 printk(KERN_INFO "Board not found.\n");
diff --git a/drivers/usb/media/pwc/Makefile b/drivers/media/video/pwc/Makefile
index 2d93a77501..8326684f49 100644
--- a/drivers/usb/media/pwc/Makefile
+++ b/drivers/media/video/pwc/Makefile
@@ -15,6 +15,6 @@ default:
 endif
 
 clean:
-        rm -f *.[oas] .*.flags *.ko .*.cmd .*.d .*.tmp *.mod.c 
+        rm -f *.[oas] .*.flags *.ko .*.cmd .*.d .*.tmp *.mod.c
         rm -rf .tmp_versions
 
diff --git a/drivers/usb/media/pwc/philips.txt b/drivers/media/video/pwc/philips.txt
index 04a640d723..11f751a6bd 100644
--- a/drivers/usb/media/pwc/philips.txt
+++ b/drivers/media/video/pwc/philips.txt
@@ -47,17 +47,17 @@ don't know how to set it properly in the driver. The options are:
 size
    Can be one of 'sqcif', 'qsif', 'qcif', 'sif', 'cif' or
    'vga', for an image size of resp. 128x96, 160x120, 176x144,
-   320x240, 352x288 and 640x480 (of course, only for those cameras that 
+   320x240, 352x288 and 640x480 (of course, only for those cameras that
    support these resolutions).
 
 fps
    Specifies the desired framerate. Is an integer in the range of 4-30.
 
 fbufs
-   This paramter specifies the number of internal buffers to use for storing 
-   frames from the cam. This will help if the process that reads images from 
-   the cam is a bit slow or momentarely busy. However, on slow machines it 
-   only introduces lag, so choose carefully. The default is 3, which is 
+   This paramter specifies the number of internal buffers to use for storing
+   frames from the cam. This will help if the process that reads images from
+   the cam is a bit slow or momentarely busy. However, on slow machines it
+   only introduces lag, so choose carefully. The default is 3, which is
    reasonable. You can set it between 2 and 5.
 
 mbufs
@@ -65,9 +65,9 @@ mbufs
    buffers to reserve for mmap(), VIDIOCCGMBUF, VIDIOCMCAPTURE and friends.
    The default is 2, which is adequate for most applications (double
    buffering).
-      
+
    Should you experience a lot of 'Dumping frame...' messages during
-   grabbing with a tool that uses mmap(), you might want to increase if. 
+   grabbing with a tool that uses mmap(), you might want to increase if.
    However, it doesn't really buffer images, it just gives you a bit more
    slack when your program is behind. But you need a multi-threaded or
    forked program to really take advantage of these buffers.
@@ -88,15 +88,15 @@ power_save
 
 compression (only useful with the plugin)
    With this option you can control the compression factor that the camera
-   uses to squeeze the image through the USB bus. You can set the 
+   uses to squeeze the image through the USB bus. You can set the
    parameter between 0 and 3:
      0 = prefer uncompressed images; if the requested mode is not available
-         in an uncompressed format, the driver will silently switch to low
-         compression.
+         in an uncompressed format, the driver will silently switch to low
+         compression.
      1 = low compression.
      2 = medium compression.
      3 = high compression.
-      
+
    High compression takes less bandwidth of course, but it could also
    introduce some unwanted artefacts. The default is 2, medium compression.
    See the FAQ on the website for an overview of which modes require
@@ -112,7 +112,7 @@ leds
    this is let the LED blink while the camera is in use. This:
 
      leds=500,500
-      
+
    will blink the LED once every second. But with:
 
      leds=0,0
@@ -123,7 +123,7 @@ leds
    when the camera is not used anymore.
 
    This parameter works only with the ToUCam range of cameras (720, 730, 740,
-   750) and OEMs. For other cameras this command is silently ignored, and 
+   750) and OEMs. For other cameras this command is silently ignored, and
    the LED cannot be controlled.
 
    Finally: this parameters does not take effect UNTIL the first time you
@@ -144,35 +144,35 @@ dev_hint
    format:
 
       [type[.serialnumber]:]node
-      
+
    The square brackets mean that both the type and the serialnumber are
    optional, but a serialnumber cannot be specified without a type (which
    would be rather pointless). The serialnumber is separated from the type
    by a '.'; the node number by a ':'.
-   
+
    This somewhat cryptic syntax is best explained by a few examples:
 
      dev_hint=3,5              The first detected cam gets assigned
-                               /dev/video3, the second /dev/video5. Any
-                               other cameras will get the first free 
-                               available slot (see below).
+                               /dev/video3, the second /dev/video5. Any
+                               other cameras will get the first free
+                               available slot (see below).
 
      dev_hint=645:1,680:2      The PCA645 camera will get /dev/video1,
-                               and a PCVC680 /dev/video2.
-                               
-     dev_hint=645.0123:3,645.4567:0     The PCA645 camera with serialnumber 
-                                        0123 goes to /dev/video3, the same
-                                        camera model with the 4567 serial
-                                        gets /dev/video0.
+                               and a PCVC680 /dev/video2.
+
+     dev_hint=645.0123:3,645.4567:0     The PCA645 camera with serialnumber
+                                        0123 goes to /dev/video3, the same
+                                        camera model with the 4567 serial
+                                        gets /dev/video0.
 
-     dev_hint=750:1,4,5,6       The PCVC750 camera will get /dev/video1, the 
-                                next 3 Philips cams will use /dev/video4 
-                                through /dev/video6.
+     dev_hint=750:1,4,5,6       The PCVC750 camera will get /dev/video1, the
+                                next 3 Philips cams will use /dev/video4
+                                through /dev/video6.
 
    Some points worth knowing:
-   - Serialnumbers are case sensitive and must be written full, including 
+   - Serialnumbers are case sensitive and must be written full, including
      leading zeroes (it's treated as a string).
-   - If a device node is already occupied, registration will fail and 
+   - If a device node is already occupied, registration will fail and
      the webcam is not available.
    - You can have up to 64 video devices; be sure to make enough device
      nodes in /dev if you want to spread the numbers (this does not apply
@@ -186,13 +186,13 @@ trace
    kernel log at debug level.
 
    The trace variable is a bitmask; each bit represents a certain feature.
-   If you want to trace something, look up the bit value(s) in the table 
+   If you want to trace something, look up the bit value(s) in the table
    below, add the values together and supply that to the trace variable.
 
    Value  Value   Description                                      Default
    (dec)  (hex)
        1    0x1   Module initialization; this will log messages       On
-                  while loading and unloading the module
+                  while loading and unloading the module
 
        2    0x2   probe() and disconnect() traces                     On
 
@@ -203,7 +203,7 @@ trace
       16   0x10   Memory allocation of buffers, etc.                  Off
 
       32   0x20   Showing underflow, overflow and Dumping frame       On
-                  messages
+                  messages
 
       64   0x40   Show viewport and image sizes                       Off
 
@@ -217,7 +217,7 @@ trace
 
 
 Example:
-     
+
      # modprobe pwc size=cif fps=15 power_save=1
 
 The fbufs, mbufs and trace parameters are global and apply to all connected
diff --git a/drivers/usb/media/pwc/pwc-ctrl.c b/drivers/media/video/pwc/pwc-ctrl.c
index 0398b812e0..4ba549bfa0 100644
--- a/drivers/usb/media/pwc/pwc-ctrl.c
+++ b/drivers/media/video/pwc/pwc-ctrl.c
@@ -31,17 +31,17 @@
 
 /*
    Changes
-   2001/08/03  Alvarado   Added methods for changing white balance and 
-                          red/green gains
+   2001/08/03  Alvarado   Added methods for changing white balance and
+                          red/green gains
  */
 
 /* Control functions for the cam; brightness, contrast, video mode, etc. */
 
 #ifdef __KERNEL__
-#include <asm/uaccess.h> 
+#include <asm/uaccess.h>
 #endif
 #include <asm/errno.h>
- 
+
 #include "pwc.h"
 #include "pwc-ioctl.h"
 #include "pwc-uncompress.h"
@@ -116,13 +116,13 @@ static const char *size2name[PSZ_MAX] =
         "SIF",
         "CIF",
         "VGA",
-};  
+};
 
 /********/
 
-/* Entries for the Nala (645/646) camera; the Nala doesn't have compression 
+/* Entries for the Nala (645/646) camera; the Nala doesn't have compression
    preferences, so you either get compressed or non-compressed streams.
-   
+
    An alternate value of 0 means this mode is not available at all.
  */
 
@@ -205,13 +205,13 @@ static inline int set_video_mode_Nala(struct pwc_device *pdev, int size, int fra
         { /* closest match of framerate */
            0,  0,  0,  0,  4,  /*  0-4  */
            5,  5,  7,  7, 10,  /*  5-9  */
-          10, 10, 12, 12, 15,  /* 10-14 */
-          15, 15, 15, 20, 20,  /* 15-19 */
-          20, 20, 20, 24, 24,  /* 20-24 */
-          24, 24, 24, 24, 24,  /* 25-29 */
-          24                   /* 30    */
+          10, 10, 12, 12, 15,  /* 10-14 */
+          15, 15, 15, 20, 20,  /* 15-19 */
+          20, 20, 20, 24, 24,  /* 20-24 */
+          24, 24, 24, 24, 24,  /* 25-29 */
+          24                   /* 30    */
         };
-        int frames2table[31] = 
+        int frames2table[31] =
         { 0, 0, 0, 0, 0, /*  0-4  */
           1, 1, 1, 2, 2, /*  5-9  */
           3, 3, 4, 4, 4, /* 10-14 */
@@ -220,7 +220,7 @@ static inline int set_video_mode_Nala(struct pwc_device *pdev, int size, int fra
           7, 7, 7, 7, 7, /* 25-29 */
           7              /* 30    */
         };
-        
+
         if (size < 0 || size > PSZ_CIF || frames < 4 || frames > 25)
                 return -EINVAL;
         frames = frames2frames[frames];
@@ -232,7 +232,7 @@ static inline int set_video_mode_Nala(struct pwc_device *pdev, int size, int fra
         if (pEntry->compressed)
                 return -ENOENT; /* Not supported. */
 
-        memcpy(buf, pEntry->mode, 3);   
+        memcpy(buf, pEntry->mode, 3);
         ret = send_video_command(pdev->udev, pdev->vendpoint, buf, 3);
         if (ret < 0) {
                 Debug("Failed to send video command... %d\n", ret);
@@ -257,7 +257,7 @@ static inline int set_video_mode_Nala(struct pwc_device *pdev, int size, int fra
                break;
            }
         }
- 
+
         pdev->cmd_len = 3;
         memcpy(pdev->cmd_buf, buf, 3);
 
@@ -352,13 +352,13 @@ static inline int set_video_mode_Kiara(struct pwc_device *pdev, int size, int fr
         /* special case: VGA @ 5 fps and snapshot is raw bayer mode */
         if (size == PSZ_VGA && frames == 5 && snapshot)
         {
-                /* Only available in case the raw palette is selected or 
-                   we have the decompressor available. This mode is 
-                   only available in compressed form 
+                /* Only available in case the raw palette is selected or
+                   we have the decompressor available. This mode is
+                   only available in compressed form
                 */
                 if (pdev->vpalette == VIDEO_PALETTE_RAW)
                 {
-                        Info("Choosing VGA/5 BAYER mode (%d).\n", pdev->vpalette);
+                        Info("Choosing VGA/5 BAYER mode (%d).\n", pdev->vpalette);
                         pChoose = &RawEntry;
                 }
                 else
@@ -368,9 +368,9 @@ static inline int set_video_mode_Kiara(struct pwc_device *pdev, int size, int fr
         }
         else
         {
-                /* Find a supported framerate with progressively higher compression ratios
+                /* Find a supported framerate with progressively higher compression ratios
                    if the preferred ratio is not available.
-                   Skip this step when using RAW modes.
+                   Skip this step when using RAW modes.
                 */
                 while (compression <= 3) {
                         pChoose = &Kiara_table[size][fps][compression];
@@ -383,7 +383,7 @@ static inline int set_video_mode_Kiara(struct pwc_device *pdev, int size, int fr
                 return -ENOENT; /* Not supported. */
 
         Debug("Using alternate setting %d.\n", pChoose->alternate);
-        
+
         /* usb_control_msg won't take staticly allocated arrays as argument?? */
         memcpy(buf, pChoose->mode, 12);
         if (snapshot)
@@ -463,9 +463,9 @@ static void pwc_set_image_buffer_size(struct pwc_device *pdev)
  */
 int pwc_set_video_mode(struct pwc_device *pdev, int width, int height, int frames, int compression, int snapshot)
 {
-        int ret, size;
+        int ret, size;
 
-        Trace(TRACE_FLOW, "set_video_mode(%dx%d @ %d, palette %d).\n", width, height, frames, pdev->vpalette);
+        Trace(TRACE_FLOW, "set_video_mode(%dx%d @ %d, palette %d).\n", width, height, frames, pdev->vpalette);
         size = pwc_decode_size(pdev, width, height);
         if (size < 0) {
                 Debug("Could not find suitable size.\n");
@@ -473,7 +473,7 @@ int pwc_set_video_mode(struct pwc_device *pdev, int width, int height, int frame
         }
         Debug("decode_size = %d.\n", size);
 
-        ret = -EINVAL;
+        ret = -EINVAL;
         switch(pdev->type) {
         case 645:
         case 646:
@@ -485,7 +485,7 @@ int pwc_set_video_mode(struct pwc_device *pdev, int width, int height, int frame
         case 690:
                 ret = set_video_mode_Timon(pdev, size, frames, compression, snapshot);
                 break;
-        
+
         case 720:
         case 730:
         case 740:
@@ -517,7 +517,7 @@ int pwc_get_brightness(struct pwc_device *pdev)
         char buf;
         int ret;
 
-        ret = RecvControlMsg(GET_LUM_CTL, BRIGHTNESS_FORMATTER, 1);     
+        ret = RecvControlMsg(GET_LUM_CTL, BRIGHTNESS_FORMATTER, 1);
         if (ret < 0)
                 return ret;
         return buf << 9;
@@ -566,7 +566,7 @@ int pwc_get_gamma(struct pwc_device *pdev)
 {
         char buf;
         int ret;
-        
+
         ret = RecvControlMsg(GET_LUM_CTL, GAMMA_FORMATTER, 1);
         if (ret < 0)
                 return ret;
@@ -622,14 +622,14 @@ static inline int pwc_set_agc(struct pwc_device *pdev, int mode, int value)
 {
         char buf;
         int ret;
-        
+
         if (mode)
                 buf = 0x0; /* auto */
         else
                 buf = 0xff; /* fixed */
 
         ret = SendControlMsg(SET_LUM_CTL, AGC_MODE_FORMATTER, 1);
-        
+
         if (!mode && ret >= 0) {
                 if (value < 0)
                         value = 0;
@@ -647,7 +647,7 @@ static inline int pwc_get_agc(struct pwc_device *pdev, int *value)
 {
         unsigned char buf;
         int ret;
-        
+
         ret = RecvControlMsg(GET_LUM_CTL, AGC_MODE_FORMATTER, 1);
         if (ret < 0)
                 return ret;
@@ -658,7 +658,7 @@ static inline int pwc_get_agc(struct pwc_device *pdev, int *value)
                         return ret;
                 if (buf > 0x3F)
                         buf = 0x3F;
-                *value = (buf << 10);           
+                *value = (buf << 10);
         }
         else { /* auto */
                 ret = RecvControlMsg(GET_STATUS_CTL, READ_AGC_FORMATTER, 1);
@@ -683,7 +683,7 @@ static inline int pwc_set_shutter_speed(struct pwc_device *pdev, int mode, int v
                 buf[0] = 0x0;   /* auto */
         else
                 buf[0] = 0xff; /* fixed */
-        
+
         ret = SendControlMsg(SET_LUM_CTL, SHUTTER_MODE_FORMATTER, 1);
 
         if (!mode && ret >= 0) {
@@ -713,7 +713,7 @@ static inline int pwc_set_shutter_speed(struct pwc_device *pdev, int mode, int v
                 ret = SendControlMsg(SET_LUM_CTL, PRESET_SHUTTER_FORMATTER, 2);
         }
         return ret;
-}       
+}
 
 
 /* POWER */
@@ -765,22 +765,22 @@ static inline int pwc_restore_factory(struct pwc_device *pdev)
   * 02: fluorescent lighting
   * 03: manual
   * 04: auto
-  */ 
+  */
 static inline int pwc_set_awb(struct pwc_device *pdev, int mode)
 {
         char buf;
         int ret;
-        
+
         if (mode < 0)
             mode = 0;
-        
+
         if (mode > 4)
             mode = 4;
-        
+
         buf = mode & 0x07; /* just the lowest three bits */
-        
+
         ret = SendControlMsg(SET_CHROM_CTL, WB_MODE_FORMATTER, 1);
-        
+
         if (ret < 0)
                 return ret;
         return 0;
@@ -790,17 +790,17 @@ static inline int pwc_get_awb(struct pwc_device *pdev)
 {
         unsigned char buf;
         int ret;
-        
+
         ret = RecvControlMsg(GET_CHROM_CTL, WB_MODE_FORMATTER, 1);
 
-        if (ret < 0) 
+        if (ret < 0)
                 return ret;
         return buf;
 }
 
 static inline int pwc_set_red_gain(struct pwc_device *pdev, int value)
 {
-        unsigned char buf;
+        unsigned char buf;
 
         if (value < 0)
                 value = 0;
@@ -815,7 +815,7 @@ static inline int pwc_get_red_gain(struct pwc_device *pdev, int *value)
 {
         unsigned char buf;
         int ret;
-        
+
         ret = RecvControlMsg(GET_CHROM_CTL, PRESET_MANUAL_RED_GAIN_FORMATTER, 1);
         if (ret < 0)
             return ret;
@@ -841,7 +841,7 @@ static inline int pwc_get_blue_gain(struct pwc_device *pdev, int *value)
 {
         unsigned char buf;
         int ret;
-        
+
         ret = RecvControlMsg(GET_CHROM_CTL, PRESET_MANUAL_BLUE_GAIN_FORMATTER, 1);
         if (ret < 0)
             return ret;
@@ -851,14 +851,14 @@ static inline int pwc_get_blue_gain(struct pwc_device *pdev, int *value)
 
 
 /* The following two functions are different, since they only read the
-   internal red/blue gains, which may be different from the manual 
+   internal red/blue gains, which may be different from the manual
    gains set or read above.
- */   
+ */
 static inline int pwc_read_red_gain(struct pwc_device *pdev, int *value)
 {
         unsigned char buf;
         int ret;
-        
+
         ret = RecvControlMsg(GET_STATUS_CTL, READ_RED_GAIN_FORMATTER, 1);
         if (ret < 0)
                 return ret;
@@ -870,7 +870,7 @@ static inline int pwc_read_blue_gain(struct pwc_device *pdev, int *value)
 {
         unsigned char buf;
         int ret;
-        
+
         ret = RecvControlMsg(GET_STATUS_CTL, READ_BLUE_GAIN_FORMATTER, 1);
         if (ret < 0)
                 return ret;
@@ -882,7 +882,7 @@ static inline int pwc_read_blue_gain(struct pwc_device *pdev, int *value)
 static inline int pwc_set_wb_speed(struct pwc_device *pdev, int speed)
 {
         unsigned char buf;
-        
+
         /* useful range is 0x01..0x20 */
         buf = speed / 0x7f0;
         return SendControlMsg(SET_CHROM_CTL, AWB_CONTROL_SPEED_FORMATTER, 1);
@@ -892,7 +892,7 @@ static inline int pwc_get_wb_speed(struct pwc_device *pdev, int *value)
 {
         unsigned char buf;
         int ret;
-        
+
         ret = RecvControlMsg(GET_CHROM_CTL, AWB_CONTROL_SPEED_FORMATTER, 1);
         if (ret < 0)
                 return ret;
@@ -904,7 +904,7 @@ static inline int pwc_get_wb_speed(struct pwc_device *pdev, int *value)
 static inline int pwc_set_wb_delay(struct pwc_device *pdev, int delay)
 {
         unsigned char buf;
-        
+
         /* useful range is 0x01..0x3F */
         buf = (delay >> 10);
         return SendControlMsg(SET_CHROM_CTL, AWB_CONTROL_DELAY_FORMATTER, 1);
@@ -914,7 +914,7 @@ static inline int pwc_get_wb_delay(struct pwc_device *pdev, int *value)
 {
         unsigned char buf;
         int ret;
-        
+
         ret = RecvControlMsg(GET_CHROM_CTL, AWB_CONTROL_DELAY_FORMATTER, 1);
         if (ret < 0)
                 return ret;
@@ -950,7 +950,7 @@ static int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value)
 {
         unsigned char buf[2];
         int ret;
-        
+
         if (pdev->type < 730) {
                 *on_value = -1;
                 *off_value = -1;
@@ -969,7 +969,7 @@ static inline int pwc_set_contour(struct pwc_device *pdev, int contour)
 {
         unsigned char buf;
         int ret;
-        
+
         if (contour < 0)
                 buf = 0xff; /* auto contour on */
         else
@@ -977,16 +977,16 @@ static inline int pwc_set_contour(struct pwc_device *pdev, int contour)
         ret = SendControlMsg(SET_LUM_CTL, AUTO_CONTOUR_FORMATTER, 1);
         if (ret < 0)
                 return ret;
-        
+
         if (contour < 0)
                 return 0;
         if (contour > 0xffff)
                 contour = 0xffff;
-        
+
         buf = (contour >> 10); /* contour preset is [0..3f] */
         ret = SendControlMsg(SET_LUM_CTL, PRESET_CONTOUR_FORMATTER, 1);
-        if (ret < 0)    
-                return ret;     
+        if (ret < 0)
+                return ret;
         return 0;
 }
 
@@ -994,7 +994,7 @@ static inline int pwc_get_contour(struct pwc_device *pdev, int *contour)
 {
         unsigned char buf;
         int ret;
-        
+
         ret = RecvControlMsg(GET_LUM_CTL, AUTO_CONTOUR_FORMATTER, 1);
         if (ret < 0)
                 return ret;
@@ -1002,7 +1002,7 @@ static inline int pwc_get_contour(struct pwc_device *pdev, int *contour)
         if (buf == 0) {
                 /* auto mode off, query current preset value */
                 ret = RecvControlMsg(GET_LUM_CTL, PRESET_CONTOUR_FORMATTER, 1);
-                if (ret < 0)    
+                if (ret < 0)
                         return ret;
                 *contour = buf << 10;
         }
@@ -1015,7 +1015,7 @@ static inline int pwc_get_contour(struct pwc_device *pdev, int *contour)
 static inline int pwc_set_backlight(struct pwc_device *pdev, int backlight)
 {
         unsigned char buf;
-        
+
         if (backlight)
                 buf = 0xff;
         else
@@ -1027,7 +1027,7 @@ static inline int pwc_get_backlight(struct pwc_device *pdev, int *backlight)
 {
         int ret;
         unsigned char buf;
-        
+
         ret = RecvControlMsg(GET_LUM_CTL, BACK_LIGHT_COMPENSATION_FORMATTER, 1);
         if (ret < 0)
                 return ret;
@@ -1039,7 +1039,7 @@ static inline int pwc_get_backlight(struct pwc_device *pdev, int *backlight)
 static inline int pwc_set_flicker(struct pwc_device *pdev, int flicker)
 {
         unsigned char buf;
-        
+
         if (flicker)
                 buf = 0xff;
         else
@@ -1051,7 +1051,7 @@ static inline int pwc_get_flicker(struct pwc_device *pdev, int *flicker)
 {
         int ret;
         unsigned char buf;
-        
+
         ret = RecvControlMsg(GET_LUM_CTL, FLICKERLESS_MODE_FORMATTER, 1);
         if (ret < 0)
                 return ret;
@@ -1076,7 +1076,7 @@ static inline int pwc_get_dynamic_noise(struct pwc_device *pdev, int *noise)
 {
         int ret;
         unsigned char buf;
-        
+
         ret = RecvControlMsg(GET_LUM_CTL, DYNAMIC_NOISE_CONTROL_FORMATTER, 1);
         if (ret < 0)
                 return ret;
@@ -1087,7 +1087,7 @@ static inline int pwc_get_dynamic_noise(struct pwc_device *pdev, int *noise)
 static int pwc_mpt_reset(struct pwc_device *pdev, int flags)
 {
         unsigned char buf;
-        
+
         buf = flags & 0x03; // only lower two bits are currently used
         return SendControlMsg(SET_MPT_CTL, PT_RESET_CONTROL_FORMATTER, 1);
 }
@@ -1095,7 +1095,7 @@ static int pwc_mpt_reset(struct pwc_device *pdev, int flags)
 static inline int pwc_mpt_set_angle(struct pwc_device *pdev, int pan, int tilt)
 {
         unsigned char buf[4];
-        
+
         /* set new relative angle; angles are expressed in degrees * 100,
            but cam as .5 degree resolution, hence divide by 200. Also
            the angle must be multiplied by 64 before it's send to
@@ -1114,7 +1114,7 @@ static inline int pwc_mpt_get_status(struct pwc_device *pdev, struct pwc_mpt_sta
 {
         int ret;
         unsigned char buf[5];
-        
+
         ret = RecvControlMsg(GET_MPT_CTL, PT_STATUS_FORMATTER, 5);
         if (ret < 0)
                 return ret;
@@ -1129,14 +1129,14 @@ int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor)
 {
         unsigned char buf;
         int ret = -1, request;
-        
+
         if (pdev->type < 675)
                 request = SENSOR_TYPE_FORMATTER1;
         else if (pdev->type < 730)
                 return -1; /* The Vesta series doesn't have this call */
         else
                 request = SENSOR_TYPE_FORMATTER2;
-        
+
         ret = RecvControlMsg(GET_STATUS_CTL, request, 1);
         if (ret < 0)
                 return ret;
@@ -1163,23 +1163,23 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
                         ret = -EINVAL;
                 break;
         }
-        
+
         case VIDIOCPWCSUSER:
         {
                 if (pwc_save_user(pdev))
                         ret = -EINVAL;
                 break;
         }
-                
+
         case VIDIOCPWCFACTORY:
         {
                 if (pwc_restore_factory(pdev))
                         ret = -EINVAL;
                 break;
         }
-        
+
         case VIDIOCPWCSCQUAL:
-        {       
+        {
                 int *qual = arg;
 
                 if (*qual < 0 || *qual > 3)
@@ -1190,14 +1190,14 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
                         pdev->vcompression = *qual;
                 break;
         }
-        
+
         case VIDIOCPWCGCQUAL:
         {
                 int *qual = arg;
                 *qual = pdev->vcompression;
                 break;
         }
-        
+
         case VIDIOCPWCPROBE:
         {
                 struct pwc_probe *probe = arg;
@@ -1220,27 +1220,27 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
                         ret = -EINVAL;
                 break;
         }
-        
+
         case VIDIOCPWCGAGC:
         {
                 int *agc = arg;
-                
+
                 if (pwc_get_agc(pdev, agc))
                         ret = -EINVAL;
                 break;
         }
-        
+
         case VIDIOCPWCSSHUTTER:
         {
                 int *shutter_speed = arg;
                 ret = pwc_set_shutter_speed(pdev, *shutter_speed < 0 ? 1 : 0, *shutter_speed);
                 break;
         }
-        
-        case VIDIOCPWCSAWB:
+
+        case VIDIOCPWCSAWB:
         {
                 struct pwc_whitebalance *wb = arg;
-                
+
                 ret = pwc_set_awb(pdev, wb->mode);
                 if (ret >= 0 && wb->mode == PWC_WB_MANUAL) {
                         pwc_set_red_gain(pdev, wb->manual_red);
@@ -1270,18 +1270,18 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
                                 ret = pwc_read_red_gain(pdev, &wb->read_red);
                                 if (ret < 0)
                                         break;
-                                ret = pwc_read_blue_gain(pdev, &wb->read_blue);
-                                if (ret < 0)
-                                        break;
+                                ret = pwc_read_blue_gain(pdev, &wb->read_blue);
+                                if (ret < 0)
+                                        break;
                         }
                 }
                 break;
         }
-        
+
         case VIDIOCPWCSAWBSPEED:
         {
                 struct pwc_wb_speed *wbs = arg;
-                
+
                 if (wbs->control_speed > 0) {
                         ret = pwc_set_wb_speed(pdev, wbs->control_speed);
                 }
@@ -1290,11 +1290,11 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
                 }
                 break;
         }
-        
+
         case VIDIOCPWCGAWBSPEED:
         {
                 struct pwc_wb_speed *wbs = arg;
-                
+
                 ret = pwc_get_wb_speed(pdev, &wbs->control_speed);
                 if (ret < 0)
                         break;
@@ -1304,7 +1304,7 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
                 break;
         }
 
-        case VIDIOCPWCSLED:
+        case VIDIOCPWCSLED:
         {
                 struct pwc_leds *leds = arg;
                 ret = pwc_set_leds(pdev, leds->led_on, leds->led_off);
@@ -1325,14 +1325,14 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
                 ret = pwc_set_contour(pdev, *contour);
                 break;
         }
-                        
+
         case VIDIOCPWCGCONTOUR:
         {
                 int *contour = arg;
                 ret = pwc_get_contour(pdev, contour);
                 break;
         }
-        
+
         case VIDIOCPWCSBACKLIGHT:
         {
                 int *backlight = arg;
@@ -1346,7 +1346,7 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
                 ret = pwc_get_backlight(pdev, backlight);
                 break;
         }
-        
+
         case VIDIOCPWCSFLICKER:
         {
                 int *flicker = arg;
@@ -1360,14 +1360,14 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
                 ret = pwc_get_flicker(pdev, flicker);
                 break;
         }
-        
+
         case VIDIOCPWCSDYNNOISE:
         {
                 int *dynnoise = arg;
                 ret = pwc_set_dynamic_noise(pdev, *dynnoise);
                 break;
         }
-        
+
         case VIDIOCPWCGDYNNOISE:
         {
                 int *dynnoise = arg;
@@ -1381,61 +1381,61 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
                 size->width = pdev->image.x;
                 size->height = pdev->image.y;
                 break;
-        }
-        
-        case VIDIOCPWCMPTRESET:
-        {
-                if (pdev->features & FEATURE_MOTOR_PANTILT)
-                {
-                        int *flags = arg;
+        }
+
+        case VIDIOCPWCMPTRESET:
+        {
+                if (pdev->features & FEATURE_MOTOR_PANTILT)
+                {
+                        int *flags = arg;
 
                         ret = pwc_mpt_reset(pdev, *flags);
-                        if (ret >= 0)
-                        {
-                                pdev->pan_angle = 0;
-                                pdev->tilt_angle = 0;
-                        }
-                }
-                else
-                {
-                        ret = -ENXIO;
-                }
-                break;          
-        }
-        
-        case VIDIOCPWCMPTGRANGE:
-        {
-                if (pdev->features & FEATURE_MOTOR_PANTILT)
-                {
-                        struct pwc_mpt_range *range = arg;
-                        *range = pdev->angle_range;
-                }
-                else
-                {       
-                        ret = -ENXIO;
-                }
-                break;
-        }
-        
-        case VIDIOCPWCMPTSANGLE:
-        {
-                int new_pan, new_tilt;
-                
-                if (pdev->features & FEATURE_MOTOR_PANTILT)
-                {
-                        struct pwc_mpt_angles *angles = arg;
+                        if (ret >= 0)
+                        {
+                                pdev->pan_angle = 0;
+                                pdev->tilt_angle = 0;
+                        }
+                }
+                else
+                {
+                        ret = -ENXIO;
+                }
+                break;
+        }
+
+        case VIDIOCPWCMPTGRANGE:
+        {
+                if (pdev->features & FEATURE_MOTOR_PANTILT)
+                {
+                        struct pwc_mpt_range *range = arg;
+                        *range = pdev->angle_range;
+                }
+                else
+                {
+                        ret = -ENXIO;
+                }
+                break;
+        }
+
+        case VIDIOCPWCMPTSANGLE:
+        {
+                int new_pan, new_tilt;
+
+                if (pdev->features & FEATURE_MOTOR_PANTILT)
+                {
+                        struct pwc_mpt_angles *angles = arg;
                         /* The camera can only set relative angles, so
                            do some calculations when getting an absolute angle .
                          */
                         if (angles->absolute)
                         {
-                                new_pan  = angles->pan;
-                                new_tilt = angles->tilt;
-                        }
-                        else
-                        {
-                                new_pan  = pdev->pan_angle  + angles->pan;
-                                new_tilt = pdev->tilt_angle + angles->tilt;
+                                new_pan  = angles->pan;
+                                new_tilt = angles->tilt;
+                        }
+                        else
+                        {
+                                new_pan  = pdev->pan_angle  + angles->pan;
+                                new_tilt = pdev->tilt_angle + angles->tilt;
                         }
                         /* check absolute ranges */
                         if (new_pan  < pdev->angle_range.pan_min  ||
@@ -1463,53 +1463,53 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
                                         pdev->tilt_angle += new_tilt;
                                 }
                                 if (ret == -EPIPE) /* stall -> out of range */
-                                        ret = -ERANGE;                          
+                                        ret = -ERANGE;
                         }
-                }
-                else
-                {
-                        ret = -ENXIO;
-                }
-                break;
-        }
-
-        case VIDIOCPWCMPTGANGLE:
-        {
-                
-                if (pdev->features & FEATURE_MOTOR_PANTILT)
-                {
-                        struct pwc_mpt_angles *angles = arg;
-
-                        angles->absolute = 1;
-                        angles->pan  = pdev->pan_angle;
-                        angles->tilt = pdev->tilt_angle;
-                }
-                else
-                {
-                        ret = -ENXIO;
-                }
-                break;
-        }
- 
-        case VIDIOCPWCMPTSTATUS:
-        {
-                if (pdev->features & FEATURE_MOTOR_PANTILT)
-                {
-                        struct pwc_mpt_status *status = arg;
-                        ret = pwc_mpt_get_status(pdev, status);
-                }
-                else
-                {
-                        ret = -ENXIO;
-                }
-                break;
+                }
+                else
+                {
+                        ret = -ENXIO;
+                }
+                break;
+        }
+
+        case VIDIOCPWCMPTGANGLE:
+        {
+
+                if (pdev->features & FEATURE_MOTOR_PANTILT)
+                {
+                        struct pwc_mpt_angles *angles = arg;
+
+                        angles->absolute = 1;
+                        angles->pan  = pdev->pan_angle;
+                        angles->tilt = pdev->tilt_angle;
+                }
+                else
+                {
+                        ret = -ENXIO;
+                }
+                break;
+        }
+
+        case VIDIOCPWCMPTSTATUS:
+        {
+                if (pdev->features & FEATURE_MOTOR_PANTILT)
+                {
+                        struct pwc_mpt_status *status = arg;
+                        ret = pwc_mpt_get_status(pdev, status);
+                }
+                else
+                {
+                        ret = -ENXIO;
+                }
+                break;
         }
 
         case VIDIOCPWCGVIDCMD:
         {
                 struct pwc_video_command *cmd = arg;
-                
-                cmd->type = pdev->type;
+
+                cmd->type = pdev->type;
                 cmd->release = pdev->release;
                 cmd->command_len = pdev->cmd_len;
                 memcpy(&cmd->command_buf, pdev->cmd_buf, pdev->cmd_len);
@@ -1531,7 +1531,7 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
                 ret = -ENOIOCTLCMD;
                 break;
         }
-        
+
         if (ret > 0)
                 return 0;
         return ret;
diff --git a/drivers/usb/media/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 90eb260428..41418294a3 100644
--- a/drivers/usb/media/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -25,18 +25,18 @@
 
 */
 
-/*  
+/*
    This code forms the interface between the USB layers and the Philips
    specific stuff. Some adanved stuff of the driver falls under an
    NDA, signed between me and Philips B.V., Eindhoven, the Netherlands, and
-   is thus not distributed in source form. The binary pwcx.o module 
+   is thus not distributed in source form. The binary pwcx.o module
    contains the code that falls under the NDA.
-   
-   In case you're wondering: 'pwc' stands for "Philips WebCam", but 
+
+   In case you're wondering: 'pwc' stands for "Philips WebCam", but
    I really didn't want to type 'philips_web_cam' every time (I'm lazy as
    any Linux kernel hacker, but I don't like uncomprehensible abbreviations
    without explanation).
-   
+
    Oh yes, convention: to disctinguish between all the various pointers to
    device-structures, I use these names for the pointer variables:
    udev: struct usb_device *
@@ -170,14 +170,14 @@ static struct video_device pwc_template = {
 
 /* Okay, this is some magic that I worked out and the reasoning behind it...
 
-   The biggest problem with any USB device is of course: "what to do 
+   The biggest problem with any USB device is of course: "what to do
    when the user unplugs the device while it is in use by an application?"
    We have several options:
    1) Curse them with the 7 plagues when they do (requires divine intervention)
    2) Tell them not to (won't work: they'll do it anyway)
    3) Oops the kernel (this will have a negative effect on a user's uptime)
    4) Do something sensible.
-   
+
    Of course, we go for option 4.
 
    It happens that this device will be linked to two times, once from
@@ -185,15 +185,15 @@ static struct video_device pwc_template = {
    pointers. This is done when the device is probed() and all initialization
    succeeded. The pwc_device struct links back to both structures.
 
-   When a device is unplugged while in use it will be removed from the 
-   list of known USB devices; I also de-register it as a V4L device, but 
+   When a device is unplugged while in use it will be removed from the
+   list of known USB devices; I also de-register it as a V4L device, but
    unfortunately I can't free the memory since the struct is still in use
    by the file descriptor. This free-ing is then deferend until the first
    opportunity. Crude, but it works.
-   
+
    A small 'advantage' is that if a user unplugs the cam and plugs it back
    in, it should get assigned the same video device minor, but unfortunately
-   it's non-trivial to re-link the cam back to the video device... (that 
+   it's non-trivial to re-link the cam back to the video device... (that
    would surely be magic! :))
 */
 
@@ -203,14 +203,14 @@ static struct video_device pwc_template = {
 /* Here we want the physical address of the memory.
  * This is used when initializing the contents of the area.
  */
-static inline unsigned long kvirt_to_pa(unsigned long adr) 
+static inline unsigned long kvirt_to_pa(unsigned long adr)
 {
-        unsigned long kva, ret;
+        unsigned long kva, ret;
 
         kva = (unsigned long) page_address(vmalloc_to_page((void *)adr));
         kva |= adr & (PAGE_SIZE-1); /* restore the offset */
         ret = __pa(kva);
-        return ret;
+        return ret;
 }
 
 static void * rvmalloc(unsigned long size)
@@ -219,13 +219,13 @@ static void * rvmalloc(unsigned long size)
         unsigned long adr;
 
         size=PAGE_ALIGN(size);
-        mem=vmalloc_32(size);
-        if (mem) 
+        mem=vmalloc_32(size);
+        if (mem)
         {
                 memset(mem, 0, size); /* Clear the ram out, no junk to the user */
-                adr=(unsigned long) mem;
-                while (size > 0) 
-                {
+                adr=(unsigned long) mem;
+                while (size > 0)
+                {
                         SetPageReserved(vmalloc_to_page((void *)adr));
                         adr+=PAGE_SIZE;
                         size-=PAGE_SIZE;
@@ -236,13 +236,13 @@ static void * rvmalloc(unsigned long size)
 
 static void rvfree(void * mem, unsigned long size)
 {
-        unsigned long adr;
+        unsigned long adr;
 
-        if (mem) 
+        if (mem)
         {
-                adr=(unsigned long) mem;
-                while ((long) size > 0) 
-                {
+                adr=(unsigned long) mem;
+                while ((long) size > 0)
+                {
                         ClearPageReserved(vmalloc_to_page((void *)adr));
                         adr+=PAGE_SIZE;
                         size-=PAGE_SIZE;
@@ -263,13 +263,13 @@ static int pwc_allocate_buffers(struct pwc_device *pdev)
 
         if (pdev == NULL)
                 return -ENXIO;
-                
+
 #ifdef PWC_MAGIC
         if (pdev->magic != PWC_MAGIC) {
                 Err("allocate_buffers(): magic failed.\n");
                 return -ENXIO;
         }
-#endif  
+#endif
         /* Allocate Isochronous pipe buffers */
         for (i = 0; i < MAX_ISO_BUFS; i++) {
                 if (pdev->sbuf[i].data == NULL) {
@@ -308,7 +308,7 @@ static int pwc_allocate_buffers(struct pwc_device *pdev)
                         memset(kbuf, 128, PWC_FRAME_SIZE);
                 }
         }
-        
+
         /* Allocate decompressor table space */
         kbuf = NULL;
         switch (pdev->type)
@@ -320,7 +320,7 @@ static int pwc_allocate_buffers(struct pwc_device *pdev)
           case 730:
           case 740:
           case 750:
-#if 0     
+#if 0
             Trace(TRACE_MEMORY,"private_data(%zu)\n",sizeof(struct pwc_dec23_private));
             kbuf = kmalloc(sizeof(struct pwc_dec23_private), GFP_KERNEL);       /* Timon & Kiara */
             break;
@@ -329,11 +329,11 @@ static int pwc_allocate_buffers(struct pwc_device *pdev)
             /* TODO & FIXME */
             kbuf = kmalloc(sizeof(struct pwc_dec23_private), GFP_KERNEL);
             break;
-#endif   
+#endif
         ;
          }
         pdev->decompress_data = kbuf;
-        
+
         /* Allocate image buffer; double buffer for mmap() */
         kbuf = rvmalloc(default_mbufs * pdev->len_per_image);
         if (kbuf == NULL) {
@@ -348,7 +348,7 @@ static int pwc_allocate_buffers(struct pwc_device *pdev)
                 pdev->image_ptr[i] = NULL;
 
         kbuf = NULL;
-          
+
         Trace(TRACE_MEMORY, "<< pwc_allocate_buffers()\n");
         return 0;
 }
@@ -366,7 +366,7 @@ static void pwc_free_buffers(struct pwc_device *pdev)
                 Err("free_buffers(): magic failed.\n");
                 return;
         }
-#endif  
+#endif
 
         /* Release Iso-pipe buffers */
         for (i = 0; i < MAX_ISO_BUFS; i++)
@@ -403,17 +403,17 @@ static void pwc_free_buffers(struct pwc_device *pdev)
                 rvfree(pdev->image_data, default_mbufs * pdev->len_per_image);
         }
         pdev->image_data = NULL;
-        
+
         Trace(TRACE_MEMORY, "Leaving free_buffers().\n");
 }
 
-/* The frame & image buffer mess. 
+/* The frame & image buffer mess.
 
    Yes, this is a mess. Well, it used to be simple, but alas...  In this
    module, 3 buffers schemes are used to get the data from the USB bus to
    the user program. The first scheme involves the ISO buffers (called thus
    since they transport ISO data from the USB controller), and not really
-   interesting. Suffices to say the data from this buffer is quickly 
+   interesting. Suffices to say the data from this buffer is quickly
    gathered in an interrupt handler (pwc_isoc_handler) and placed into the
    frame buffer.
 
@@ -443,8 +443,8 @@ static void pwc_free_buffers(struct pwc_device *pdev)
    and a 'full' frame list:
      * Initially, all frame buffers but one are on the 'empty' list; the one
        remaining buffer is our initial fill frame.
-     * If a frame is needed for filling, we try to take it from the 'empty' 
-       list, unless that list is empty, in which case we take the buffer at 
+     * If a frame is needed for filling, we try to take it from the 'empty'
+       list, unless that list is empty, in which case we take the buffer at
        the head of the 'full' list.
      * When our fill buffer has been filled, it is appended to the 'full'
        list.
@@ -646,7 +646,7 @@ static void pwc_isoc_handler(struct urb *urb, struct pt_regs *regs)
                         case -ETIMEDOUT:        errmsg = "NAK (device does not respond)"; break;
                 }
                 Trace(TRACE_FLOW, "pwc_isoc_handler() called with status %d [%s].\n", urb->status, errmsg);
-                /* Give up after a number of contiguous errors on the USB bus. 
+                /* Give up after a number of contiguous errors on the USB bus.
                    Appearantly something is wrong so we simulate an unplug event.
                  */
                 if (++pdev->visoc_errors > MAX_ISOC_ERRORS)
@@ -673,8 +673,8 @@ static void pwc_isoc_handler(struct urb *urb, struct pt_regs *regs)
         pdev->visoc_errors = 0;
 
         /* vsync: 0 = don't copy data
-                  1 = sync-hunt
-                  2 = synched
+                  1 = sync-hunt
+                  2 = synched
          */
         /* Compact data */
         for (i = 0; i < urb->number_of_packets; i++) {
@@ -701,18 +701,18 @@ static void pwc_isoc_handler(struct urb *urb, struct pt_regs *regs)
                         } /* ..flen > 0 */
 
                         if (flen < pdev->vlast_packet_size) {
-                                /* Shorter packet... We probably have the end of an image-frame; 
+                                /* Shorter packet... We probably have the end of an image-frame;
                                    wake up read() process and let select()/poll() do something.
                                    Decompression is done in user time over there.
                                  */
                                 if (pdev->vsync == 2) {
-                                        /* The ToUCam Fun CMOS sensor causes the firmware to send 2 or 3 bogus 
-                                           frames on the USB wire after an exposure change. This conditition is 
+                                        /* The ToUCam Fun CMOS sensor causes the firmware to send 2 or 3 bogus
+                                           frames on the USB wire after an exposure change. This conditition is
                                            however detected  in the cam and a bit is set in the header.
                                          */
                                         if (pdev->type == 730) {
                                                 unsigned char *ptr = (unsigned char *)fbuf->data;
-                                                
+
                                                 if (ptr[1] == 1 && ptr[0] & 0x10) {
 #if PWC_DEBUG
                                                         Debug("Hyundai CMOS sensor bug. Dropping frame %d.\n", fbuf->sequence);
@@ -733,13 +733,13 @@ static void pwc_isoc_handler(struct urb *urb, struct pt_regs *regs)
                                                                 Info("Image is normal.\n");
                                                 }
                                                 pdev->vmirror = ptr[0] & 0x03;
-                                                /* Sometimes the trailer of the 730 is still sent as a 4 byte packet 
+                                                /* Sometimes the trailer of the 730 is still sent as a 4 byte packet
                                                    after a short frame; this condition is filtered out specifically. A 4 byte
                                                    frame doesn't make sense anyway.
-                                                   So we get either this sequence: 
-                                                        drop_bit set -> 4 byte frame -> short frame -> good frame
+                                                   So we get either this sequence:
+                                                        drop_bit set -> 4 byte frame -> short frame -> good frame
                                                    Or this one:
-                                                        drop_bit set -> short frame -> good frame
+                                                        drop_bit set -> short frame -> good frame
                                                    So we drop either 3 or 2 frames in all!
                                                  */
                                                 if (fbuf->filled == 4)
@@ -830,7 +830,7 @@ static int pwc_isoc_init(struct pwc_device *pdev)
         intf = usb_ifnum_to_if(udev, 0);
         if (intf)
                 idesc = usb_altnum_to_altsetting(intf, pdev->valternate);
-                
+
         if (!idesc)
                 return -EFAULT;
 
@@ -841,7 +841,7 @@ static int pwc_isoc_init(struct pwc_device *pdev)
                         pdev->vmax_packet_size = le16_to_cpu(idesc->endpoint[i].desc.wMaxPacketSize);
                         break;
                 }
-        
+
         if (pdev->vmax_packet_size < 0 || pdev->vmax_packet_size > ISO_MAX_FRAME_SIZE) {
                 Err("Failed to find packet size for video endpoint in current alternate setting.\n");
                 return -ENFILE; /* Odd error, that should be noticeable */
@@ -875,18 +875,18 @@ static int pwc_isoc_init(struct pwc_device *pdev)
                 return ret;
         }
 
-        /* init URB structure */        
+        /* init URB structure */
         for (i = 0; i < MAX_ISO_BUFS; i++) {
                 urb = pdev->sbuf[i].urb;
 
                 urb->interval = 1; // devik
                 urb->dev = udev;
-                urb->pipe = usb_rcvisocpipe(udev, pdev->vendpoint);
+                urb->pipe = usb_rcvisocpipe(udev, pdev->vendpoint);
                 urb->transfer_flags = URB_ISO_ASAP;
-                urb->transfer_buffer = pdev->sbuf[i].data;
-                urb->transfer_buffer_length = ISO_BUFFER_SIZE;
-                urb->complete = pwc_isoc_handler;
-                urb->context = pdev;
+                urb->transfer_buffer = pdev->sbuf[i].data;
+                urb->transfer_buffer_length = ISO_BUFFER_SIZE;
+                urb->complete = pwc_isoc_handler;
+                urb->context = pdev;
                 urb->start_frame = 0;
                 urb->number_of_packets = ISO_FRAMES_PER_DESC;
                 for (j = 0; j < ISO_FRAMES_PER_DESC; j++) {
@@ -935,7 +935,7 @@ static void pwc_isoc_cleanup(struct pwc_device *pdev)
         }
 
         /* Stop camera, but only if we are sure the camera is still there (unplug
-           is signalled by EPIPE) 
+           is signalled by EPIPE)
          */
         if (pdev->error_status && pdev->error_status != EPIPE) {
                 Trace(TRACE_OPEN, "Setting alternate interface 0.\n");
@@ -956,12 +956,12 @@ int pwc_try_video_mode(struct pwc_device *pdev, int width, int height, int new_f
         pwc_reset_buffers(pdev);
         /* Try to set video mode... */
         start = ret = pwc_set_video_mode(pdev, width, height, new_fps, new_compression, new_snapshot);
-        if (ret) { 
-                Trace(TRACE_FLOW, "pwc_set_video_mode attempt 1 failed.\n");
+        if (ret) {
+                Trace(TRACE_FLOW, "pwc_set_video_mode attempt 1 failed.\n");
                 /* That failed... restore old mode (we know that worked) */
                 start = pwc_set_video_mode(pdev, pdev->view.x, pdev->view.y, pdev->vframes, pdev->vcompression, pdev->vsnapshot);
                 if (start) {
-                        Trace(TRACE_FLOW, "pwc_set_video_mode attempt 2 failed.\n");
+                        Trace(TRACE_FLOW, "pwc_set_video_mode attempt 2 failed.\n");
                 }
         }
         if (start == 0)
@@ -987,18 +987,18 @@ static int pwc_video_open(struct inode *inode, struct file *file)
         struct pwc_device *pdev;
 
         Trace(TRACE_OPEN, ">> video_open called(vdev = 0x%p).\n", vdev);
-        
+
         pdev = (struct pwc_device *)vdev->priv;
         if (pdev == NULL)
                 BUG();
         if (pdev->vopen)
                 return -EBUSY;
-        
+
         down(&pdev->modlock);
         if (!pdev->usb_init) {
                 Trace(TRACE_OPEN, "Doing first time initialization.\n");
                 pdev->usb_init = 1;
-                
+
                 if (pwc_trace & TRACE_OPEN)
                 {
                         /* Query sensor type */
@@ -1036,7 +1036,7 @@ static int pwc_video_open(struct inode *inode, struct file *file)
         /* Set LED on/off time */
         if (pwc_set_leds(pdev, led_on, led_off) < 0)
                 Info("Failed to set LED on/off time.\n");
-        
+
         pwc_construct(pdev); /* set min/max sizes correct */
 
         /* So far, so good. Allocate memory. */
@@ -1046,7 +1046,7 @@ static int pwc_video_open(struct inode *inode, struct file *file)
                 up(&pdev->modlock);
                 return i;
         }
-        
+
         /* Reset buffers & parameters */
         pwc_reset_buffers(pdev);
         for (i = 0; i < default_mbufs; i++)
@@ -1081,7 +1081,7 @@ static int pwc_video_open(struct inode *inode, struct file *file)
                 up(&pdev->modlock);
                 return i;
         }
-        
+
         i = pwc_isoc_init(pdev);
         if (i) {
                 Trace(TRACE_OPEN, "Failed to init ISOC stuff = %d.\n", i);
@@ -1155,13 +1155,13 @@ static int pwc_video_close(struct inode *inode, struct file *file)
 /*
  *      FIXME: what about two parallel reads ????
  *      ANSWER: Not supported. You can't open the device more than once,
-                despite what the V4L1 interface says. First, I don't see
-                the need, second there's no mechanism of alerting the
-                2nd/3rd/... process of events like changing image size.
-                And I don't see the point of blocking that for the
-                2nd/3rd/... process.
-                In multi-threaded environments reading parallel from any
-                device is tricky anyhow.
+                despite what the V4L1 interface says. First, I don't see
+                the need, second there's no mechanism of alerting the
+                2nd/3rd/... process of events like changing image size.
+                And I don't see the point of blocking that for the
+                2nd/3rd/... process.
+                In multi-threaded environments reading parallel from any
+                device is tricky anyhow.
  */
 
 static ssize_t pwc_video_read(struct file *file, char __user * buf,
@@ -1171,7 +1171,7 @@ static ssize_t pwc_video_read(struct file *file, char __user * buf,
         struct pwc_device *pdev;
         int noblock = file->f_flags & O_NONBLOCK;
         DECLARE_WAITQUEUE(wait, current);
-        int bytes_to_read;
+        int bytes_to_read;
 
         Trace(TRACE_READ, "video_read(0x%p, %p, %zu) called.\n", vdev, buf, count);
         if (vdev == NULL)
@@ -1193,22 +1193,22 @@ static ssize_t pwc_video_read(struct file *file, char __user * buf,
                                 set_current_state(TASK_RUNNING);
                                 return -pdev->error_status ;
                         }
-                        if (noblock) {
-                                remove_wait_queue(&pdev->frameq, &wait);
-                                set_current_state(TASK_RUNNING);
-                                return -EWOULDBLOCK;
-                        }
-                        if (signal_pending(current)) {
-                                remove_wait_queue(&pdev->frameq, &wait);
-                                set_current_state(TASK_RUNNING);
-                                return -ERESTARTSYS;
-                        }
-                        schedule();
-                        set_current_state(TASK_INTERRUPTIBLE);
+                        if (noblock) {
+                                remove_wait_queue(&pdev->frameq, &wait);
+                                set_current_state(TASK_RUNNING);
+                                return -EWOULDBLOCK;
+                        }
+                        if (signal_pending(current)) {
+                                remove_wait_queue(&pdev->frameq, &wait);
+                                set_current_state(TASK_RUNNING);
+                                return -ERESTARTSYS;
+                        }
+                        schedule();
+                        set_current_state(TASK_INTERRUPTIBLE);
                 }
                 remove_wait_queue(&pdev->frameq, &wait);
                 set_current_state(TASK_RUNNING);
-                                                                                                                                                                                
+
                 /* Decompress and release frame */
                 if (pwc_handle_frame(pdev))
                         return -EFAULT;
@@ -1218,7 +1218,7 @@ static ssize_t pwc_video_read(struct file *file, char __user * buf,
         if (pdev->vpalette == VIDEO_PALETTE_RAW)
                 bytes_to_read = pdev->frame_size;
         else
-                bytes_to_read = pdev->view.size;
+                bytes_to_read = pdev->view.size;
 
         /* copy bytes to user space; we allow for partial reads */
         if (count + pdev->image_read_pos > bytes_to_read)
@@ -1348,11 +1348,11 @@ static int pwc_video_do_ioctl(struct inode *inode, struct file *file,
                         struct video_picture *p = arg;
                         /*
                          *      FIXME:  Suppose we are mid read
-                                ANSWER: No problem: the firmware of the camera
-                                        can handle brightness/contrast/etc
-                                        changes at _any_ time, and the palette
-                                        is used exactly once in the uncompress
-                                        routine.
+                                ANSWER: No problem: the firmware of the camera
+                                        can handle brightness/contrast/etc
+                                        changes at _any_ time, and the palette
+                                        is used exactly once in the uncompress
+                                        routine.
                          */
                         pwc_set_brightness(pdev, p->brightness);
                         pwc_set_contrast(pdev, p->contrast);
@@ -1373,21 +1373,21 @@ static int pwc_video_do_ioctl(struct inode *inode, struct file *file,
                         break;
                 }
 
-                /* Window/size parameters */            
+                /* Window/size parameters */
                 case VIDIOCGWIN:
                 {
                         struct video_window *vw = arg;
-                        
+
                         vw->x = 0;
                         vw->y = 0;
                         vw->width = pdev->view.x;
                         vw->height = pdev->view.y;
                         vw->chromakey = 0;
-                        vw->flags = (pdev->vframes << PWC_FPS_SHIFT) | 
-                                   (pdev->vsnapshot ? PWC_FPS_SNAPSHOT : 0);
+                        vw->flags = (pdev->vframes << PWC_FPS_SHIFT) |
+                                   (pdev->vsnapshot ? PWC_FPS_SNAPSHOT : 0);
                         break;
                 }
-                
+
                 case VIDIOCSWIN:
                 {
                         struct video_window *vw = arg;
@@ -1402,9 +1402,9 @@ static int pwc_video_do_ioctl(struct inode *inode, struct file *file,
                         ret = pwc_try_video_mode(pdev, vw->width, vw->height, fps, pdev->vcompression, snapshot);
                         if (ret)
                                 return ret;
-                        break;          
+                        break;
                 }
-                
+
                 /* We don't have overlay support (yet) */
                 case VIDIOCGFBUF:
                 {
@@ -1471,8 +1471,8 @@ static int pwc_video_do_ioctl(struct inode *inode, struct file *file,
                                 return -EBUSY;  /* buffer wasn't available. Bummer */
                         pdev->image_used[vm->frame] = 1;
 
-                        /* Okay, we're done here. In the SYNC call we wait until a 
-                           frame comes available, then expand image into the given 
+                        /* Okay, we're done here. In the SYNC call we wait until a
+                           frame comes available, then expand image into the given
                            buffer.
                            In contrast to the CPiA cam the Philips cams deliver a
                            constant stream, almost like a grabber card. Also,
@@ -1487,16 +1487,16 @@ static int pwc_video_do_ioctl(struct inode *inode, struct file *file,
                 {
                         /* The doc says: "Whenever a buffer is used it should
                            call VIDIOCSYNC to free this frame up and continue."
-                           
-                           The only odd thing about this whole procedure is 
+
+                           The only odd thing about this whole procedure is
                            that MCAPTURE flags the buffer as "in use", and
-                           SYNC immediately unmarks it, while it isn't 
+                           SYNC immediately unmarks it, while it isn't
                            after SYNC that you know that the buffer actually
                            got filled! So you better not start a CAPTURE in
-                           the same frame immediately (use double buffering). 
-                           This is not a problem for this cam, since it has 
-                           extra intermediate buffers, but a hardware 
-                           grabber card will then overwrite the buffer 
+                           the same frame immediately (use double buffering).
+                           This is not a problem for this cam, since it has
+                           extra intermediate buffers, but a hardware
+                           grabber card will then overwrite the buffer
                            you're working on.
                          */
                         int *mbuf = arg;
@@ -1512,10 +1512,10 @@ static int pwc_video_do_ioctl(struct inode *inode, struct file *file,
                                 return -EINVAL;
 
                         /* Add ourselves to the frame wait-queue.
-                           
+
                            FIXME: needs auditing for safety.
                            QUESTION: In what respect? I think that using the
-                                     frameq is safe now.
+                                     frameq is safe now.
                          */
                         add_wait_queue(&pdev->frameq, &wait);
                         while (pdev->full_frames == NULL) {
@@ -1524,21 +1524,21 @@ static int pwc_video_do_ioctl(struct inode *inode, struct file *file,
                                         set_current_state(TASK_RUNNING);
                                         return -pdev->error_status;
                                 }
-                        
-                                if (signal_pending(current)) {
-                                        remove_wait_queue(&pdev->frameq, &wait);
-                                        set_current_state(TASK_RUNNING);
-                                        return -ERESTARTSYS;
-                                }
-                                schedule();
-                                set_current_state(TASK_INTERRUPTIBLE);
+
+                                if (signal_pending(current)) {
+                                        remove_wait_queue(&pdev->frameq, &wait);
+                                        set_current_state(TASK_RUNNING);
+                                        return -ERESTARTSYS;
+                                }
+                                schedule();
+                                set_current_state(TASK_INTERRUPTIBLE);
                         }
                         remove_wait_queue(&pdev->frameq, &wait);
                         set_current_state(TASK_RUNNING);
-                                
-                        /* The frame is ready. Expand in the image buffer 
-                           requested by the user. I don't care if you 
-                           mmap() 5 buffers and request data in this order: 
+
+                        /* The frame is ready. Expand in the image buffer
+                           requested by the user. I don't care if you
+                           mmap() 5 buffers and request data in this order:
                            buffer 4 2 3 0 1 2 3 0 4 3 1 . . .
                            Grabber hardware may not be so forgiving.
                          */
@@ -1551,11 +1551,11 @@ static int pwc_video_do_ioctl(struct inode *inode, struct file *file,
                                 return -EFAULT;
                         break;
                 }
-                
+
                 case VIDIOCGAUDIO:
                 {
                         struct video_audio *v = arg;
-                        
+
                         strcpy(v->name, "Microphone");
                         v->audio = -1; /* unknown audio minor */
                         v->flags = 0;
@@ -1565,19 +1565,19 @@ static int pwc_video_do_ioctl(struct inode *inode, struct file *file,
                         v->treble = 0;
                         v->balance = 0x8000;
                         v->step = 1;
-                        break;  
+                        break;
                 }
-                
+
                 case VIDIOCSAUDIO:
                 {
                         /* Dummy: nothing can be set */
                         break;
                 }
-                
+
                 case VIDIOCGUNIT:
                 {
                         struct video_unit *vu = arg;
-                        
+
                         vu->video = pdev->vdev->minor & 0x3F;
                         vu->audio = -1; /* not known yet */
                         vu->vbi = -1;
@@ -1589,7 +1589,7 @@ static int pwc_video_do_ioctl(struct inode *inode, struct file *file,
                         return pwc_ioctl(pdev, cmd, arg);
         } /* ..switch */
         return 0;
-}       
+}
 
 static int pwc_video_ioctl(struct inode *inode, struct file *file,
                            unsigned int cmd, unsigned long arg)
@@ -1605,10 +1605,10 @@ static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma)
         unsigned long start = vma->vm_start;
         unsigned long size  = vma->vm_end-vma->vm_start;
         unsigned long page, pos;
-        
+
         Trace(TRACE_MEMORY, "mmap(0x%p, 0x%lx, %lu) called.\n", vdev, start, size);
         pdev = vdev->priv;
-        
+
         vma->vm_flags |= VM_IO;
 
         pos = (unsigned long)pdev->image_data;
@@ -1646,7 +1646,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
         char serial_number[30], *name;
 
         /* Check if we can handle this device */
-        Trace(TRACE_PROBE, "probe() called [%04X %04X], if %d\n", 
+        Trace(TRACE_PROBE, "probe() called [%04X %04X], if %d\n",
                 le16_to_cpu(udev->descriptor.idVendor),
                 le16_to_cpu(udev->descriptor.idProduct),
                 intf->altsetting->desc.bInterfaceNumber);
@@ -1770,11 +1770,11 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
                         name = "Logitech QuickCam (res.)";
                         type_id = 730; /* Assuming CMOS */
                         break;
-                default:
+                default:
                         return -ENODEV;
-                        break;
-                }
-        }
+                        break;
+                }
+        }
         else if (vendor_id == 0x055d) {
                 /* I don't know the difference between the C10 and the C30;
                    I suppose the difference is the sensor, but both cameras
@@ -1837,7 +1837,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
                         return -ENODEV;
                         break;
                 }
-        
+
         }
         else if (vendor_id == 0x0d81) {
                 switch(product_id) {
@@ -1856,7 +1856,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
                         break;
                 }
         }
-        else 
+        else
                 return -ENODEV; /* Not any of the know types; but the list keeps growing. */
 
         memset(serial_number, 0, 30);
@@ -1880,9 +1880,9 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
         if (vendor_id == 0x046D && product_id == 0x08B5)
         {
                 /* Logitech QuickCam Orbit
-                   The ranges have been determined experimentally; they may differ from cam to cam.
-                   Also, the exact ranges left-right and up-down are different for my cam
-                  */
+                   The ranges have been determined experimentally; they may differ from cam to cam.
+                   Also, the exact ranges left-right and up-down are different for my cam
+                  */
                 pdev->angle_range.pan_min  = -7000;
                 pdev->angle_range.pan_max  =  7000;
                 pdev->angle_range.tilt_min = -3000;
@@ -1939,7 +1939,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
         }
 
         /* occupy slot */
-        if (hint < MAX_DEV_HINTS) 
+        if (hint < MAX_DEV_HINTS)
                 device_hint[hint].pdev = pdev;
 
         Trace(TRACE_PROBE, "probe() function returning struct at 0x%p.\n", pdev);
@@ -1968,13 +1968,13 @@ static void usb_pwc_disconnect(struct usb_interface *intf)
                 Err("pwc_disconnect() Woops: pointer mismatch udev/pdev.\n");
                 goto disconnect_out;
         }
-#ifdef PWC_MAGIC        
+#ifdef PWC_MAGIC
         if (pdev->magic != PWC_MAGIC) {
                 Err("pwc_disconnect() Magic number failed. Consult your scrolls and try again.\n");
                 goto disconnect_out;
         }
 #endif
-        
+
         /* We got unplugged; this is signalled by an EPIPE error code */
         if (pdev->vopen) {
                 Info("Disconnected while webcam is in use!\n");
@@ -2017,8 +2017,8 @@ static int pwc_atoi(const char *s)
 }
 
 
-/* 
- * Initialization code & module stuff 
+/*
+ * Initialization code & module stuff
  */
 
 static char size[10];
@@ -2168,7 +2168,7 @@ static int __init usb_pwc_init(void)
                                 if (*dot != '\0') {
                                         /* There's a serial number as well */
                                         int k;
-                                        
+
                                         dot++;
                                         k = 0;
                                         while (*dot != ':' && k < 29) {
@@ -2178,18 +2178,18 @@ static int __init usb_pwc_init(void)
                                         device_hint[i].serial_number[k] = '\0';
                                 }
                         }
-#if PWC_DEBUG           
+#if PWC_DEBUG
                         Debug("device_hint[%d]:\n", i);
                         Debug("  type    : %d\n", device_hint[i].type);
                         Debug("  serial# : %s\n", device_hint[i].serial_number);
                         Debug("  node    : %d\n", device_hint[i].device_node);
-#endif                  
+#endif
                 }
                 else
                         device_hint[i].type = 0; /* not filled */
         } /* ..for MAX_DEV_HINTS */
 
-        Trace(TRACE_PROBE, "Registering driver at address 0x%p.\n", &pwc_driver);
+        Trace(TRACE_PROBE, "Registering driver at address 0x%p.\n", &pwc_driver);
         return usb_register(&pwc_driver);
 }
 
diff --git a/drivers/usb/media/pwc/pwc-ioctl.h b/drivers/media/video/pwc/pwc-ioctl.h
index 5f9cb08bc0..784bc72521 100644
--- a/drivers/usb/media/pwc/pwc-ioctl.h
+++ b/drivers/media/video/pwc/pwc-ioctl.h
@@ -33,10 +33,10 @@
 /*
    Changes
    2001/08/03  Alvarado   Added ioctl constants to access methods for
-                          changing white balance and red/blue gains
+                          changing white balance and red/blue gains
    2002/12/15  G. H. Fernandez-Toribio   VIDIOCGREALSIZE
    2003/12/13  Nemosft Unv. Some modifications to make interfacing to
-               PWCX easier
+               PWCX easier
  */
 
 /* These are private ioctl() commands, specific for the Philips webcams.
@@ -45,10 +45,10 @@
 
    The #define names are built up like follows:
    VIDIOC               VIDeo IOCtl prefix
-         PWC            Philps WebCam
-            G           optional: Get
-            S           optional: Set
-             ...        the function
+         PWC            Philps WebCam
+            G           optional: Get
+            S           optional: Set
+             ...        the function
  */
 
 
@@ -94,7 +94,7 @@ struct pwc_serial
 {
         char serial[30];        /* String with serial number. Contains terminating 0 */
 };
-        
+
 /* pwc_whitebalance.mode values */
 #define PWC_WB_INDOOR           0
 #define PWC_WB_OUTDOOR          1
@@ -102,14 +102,14 @@ struct pwc_serial
 #define PWC_WB_MANUAL           3
 #define PWC_WB_AUTO             4
 
-/* Used with VIDIOCPWC[SG]AWB (Auto White Balance). 
+/* Used with VIDIOCPWC[SG]AWB (Auto White Balance).
    Set mode to one of the PWC_WB_* values above.
-   *red and *blue are the respective gains of these colour components inside 
+   *red and *blue are the respective gains of these colour components inside
    the camera; range 0..65535
-   When 'mode' == PWC_WB_MANUAL, 'manual_red' and 'manual_blue' are set or read; 
+   When 'mode' == PWC_WB_MANUAL, 'manual_red' and 'manual_blue' are set or read;
    otherwise undefined.
    'read_red' and 'read_blue' are read-only.
-*/   
+*/
 struct pwc_whitebalance
 {
         int mode;
@@ -117,9 +117,9 @@ struct pwc_whitebalance
         int read_red, read_blue;        /* R/O */
 };
 
-/* 
+/*
    'control_speed' and 'control_delay' are used in automatic whitebalance mode,
-   and tell the camera how fast it should react to changes in lighting, and 
+   and tell the camera how fast it should react to changes in lighting, and
    with how much delay. Valid values are 0..65535.
 */
 struct pwc_wb_speed
@@ -148,11 +148,11 @@ struct pwc_imagesize
 #define PWC_MPT_TILT            0x02
 #define PWC_MPT_TIMEOUT         0x04 /* for status */
 
-/* Set angles; when absolute != 0, the angle is absolute and the 
+/* Set angles; when absolute != 0, the angle is absolute and the
    driver calculates the relative offset for you. This can only
    be used with VIDIOCPWCSANGLE; VIDIOCPWCGANGLE always returns
    absolute angles.
- */   
+ */
 struct pwc_mpt_angles
 {
         int absolute;           /* write-only */
@@ -179,14 +179,14 @@ struct pwc_mpt_status
 /* This is used for out-of-kernel decompression. With it, you can get
    all the necessary information to initialize and use the decompressor
    routines in standalone applications.
- */   
+ */
 struct pwc_video_command
 {
         int type;               /* camera type (645, 675, 730, etc.) */
         int release;            /* release number */
 
-        int size;               /* one of PSZ_* */
-        int alternate;
+        int size;               /* one of PSZ_* */
+        int alternate;
         int command_len;        /* length of USB video command */
         unsigned char command_buf[13];  /* Actual USB video command */
         int bandlength;         /* >0 = compressed */
@@ -264,7 +264,7 @@ struct pwc_video_command
 
   /* Flickerless mode; = 0 off, otherwise on */
 #define VIDIOCPWCSFLICKER       _IOW('v', 208, int)
-#define VIDIOCPWCGFLICKER       _IOR('v', 208, int)  
+#define VIDIOCPWCGFLICKER       _IOR('v', 208, int)
 
   /* Dynamic noise reduction; 0 off, 3 = high noise reduction */
 #define VIDIOCPWCSDYNNOISE      _IOW('v', 209, int)
@@ -273,7 +273,7 @@ struct pwc_video_command
  /* Real image size as used by the camera; tells you whether or not there's a gray border around the image */
 #define VIDIOCPWCGREALSIZE      _IOR('v', 210, struct pwc_imagesize)
 
- /* Motorized pan & tilt functions */ 
+ /* Motorized pan & tilt functions */
 #define VIDIOCPWCMPTRESET       _IOW('v', 211, int)
 #define VIDIOCPWCMPTGRANGE      _IOR('v', 211, struct pwc_mpt_range)
 #define VIDIOCPWCMPTSANGLE      _IOW('v', 212, struct pwc_mpt_angles)
diff --git a/drivers/media/video/pwc/pwc-kiara.c b/drivers/media/video/pwc/pwc-kiara.c
new file mode 100644
index 0000000000..4c96037f7b
--- /dev/null
+++ b/drivers/media/video/pwc/pwc-kiara.c
@@ -0,0 +1,318 @@
+/* Linux driver for Philips webcam
+   (C) 2004      Luc Saillard (luc@saillard.org)
+
+   NOTE: this version of pwc is an unofficial (modified) release of pwc & pcwx
+   driver and thus may have bugs that are not present in the original version.
+   Please send bug reports and support requests to <luc@saillard.org>.
+   The decompression routines have been implemented by reverse-engineering the
+   Nemosoft binary pwcx module. Caveat emptor.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+
+/* This tables contains entries for the 730/740/750 (Kiara) camera, with
+   4 different qualities (no compression, low, medium, high).
+   It lists the bandwidth requirements for said mode by its alternate interface
+   number. An alternate of 0 means that the mode is unavailable.
+
+   There are 6 * 4 * 4 entries:
+     6 different resolutions subqcif, qsif, qcif, sif, cif, vga
+     6 framerates: 5, 10, 15, 20, 25, 30
+     4 compression modi: none, low, medium, high
+
+   When an uncompressed mode is not available, the next available compressed mode
+   will be chosen (unless the decompressor is absent). Sometimes there are only
+   1 or 2 compressed modes available; in that case entries are duplicated.
+*/
+
+
+#include "pwc-kiara.h"
+#include "pwc-uncompress.h"
+
+const struct Kiara_table_entry Kiara_table[PSZ_MAX][6][4] =
+{
+   /* SQCIF */
+   {
+      /* 5 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+      /* 10 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+      /* 15 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+      /* 20 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+      /* 25 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+      /* 30 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+   },
+   /* QSIF */
+   {
+      /* 5 fps */
+      {
+         {1, 146,    0, {0x1D, 0xF4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x92, 0x00, 0x80}},
+         {1, 146,    0, {0x1D, 0xF4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x92, 0x00, 0x80}},
+         {1, 146,    0, {0x1D, 0xF4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x92, 0x00, 0x80}},
+         {1, 146,    0, {0x1D, 0xF4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x92, 0x00, 0x80}},
+      },
+      /* 10 fps */
+      {
+         {2, 291,    0, {0x1C, 0xF4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x23, 0x01, 0x80}},
+         {1, 192,  630, {0x14, 0xF4, 0x30, 0x13, 0xA9, 0x12, 0xE1, 0x17, 0x08, 0xC0, 0x00, 0x80}},
+         {1, 192,  630, {0x14, 0xF4, 0x30, 0x13, 0xA9, 0x12, 0xE1, 0x17, 0x08, 0xC0, 0x00, 0x80}},
+         {1, 192,  630, {0x14, 0xF4, 0x30, 0x13, 0xA9, 0x12, 0xE1, 0x17, 0x08, 0xC0, 0x00, 0x80}},
+      },
+      /* 15 fps */
+      {
+         {3, 437,    0, {0x1B, 0xF4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0xB5, 0x01, 0x80}},
+         {2, 292,  640, {0x13, 0xF4, 0x30, 0x13, 0xF7, 0x13, 0x2F, 0x13, 0x20, 0x24, 0x01, 0x80}},
+         {2, 292,  640, {0x13, 0xF4, 0x30, 0x13, 0xF7, 0x13, 0x2F, 0x13, 0x20, 0x24, 0x01, 0x80}},
+         {1, 192,  420, {0x13, 0xF4, 0x30, 0x0D, 0x1B, 0x0C, 0x53, 0x1E, 0x18, 0xC0, 0x00, 0x80}},
+      },
+      /* 20 fps */
+      {
+         {4, 589,    0, {0x1A, 0xF4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x4D, 0x02, 0x80}},
+         {3, 448,  730, {0x12, 0xF4, 0x30, 0x16, 0xC9, 0x16, 0x01, 0x0E, 0x18, 0xC0, 0x01, 0x80}},
+         {2, 292,  476, {0x12, 0xF4, 0x30, 0x0E, 0xD8, 0x0E, 0x10, 0x19, 0x18, 0x24, 0x01, 0x80}},
+         {1, 192,  312, {0x12, 0xF4, 0x50, 0x09, 0xB3, 0x08, 0xEB, 0x1E, 0x18, 0xC0, 0x00, 0x80}},
+      },
+      /* 25 fps */
+      {
+         {5, 703,    0, {0x19, 0xF4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0xBF, 0x02, 0x80}},
+         {3, 447,  610, {0x11, 0xF4, 0x30, 0x13, 0x0B, 0x12, 0x43, 0x14, 0x28, 0xBF, 0x01, 0x80}},
+         {2, 292,  398, {0x11, 0xF4, 0x50, 0x0C, 0x6C, 0x0B, 0xA4, 0x1E, 0x28, 0x24, 0x01, 0x80}},
+         {1, 193,  262, {0x11, 0xF4, 0x50, 0x08, 0x23, 0x07, 0x5B, 0x1E, 0x28, 0xC1, 0x00, 0x80}},
+      },
+      /* 30 fps */
+      {
+         {8, 874,    0, {0x18, 0xF4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x6A, 0x03, 0x80}},
+         {5, 704,  730, {0x10, 0xF4, 0x30, 0x16, 0xC9, 0x16, 0x01, 0x0E, 0x28, 0xC0, 0x02, 0x80}},
+         {3, 448,  492, {0x10, 0xF4, 0x30, 0x0F, 0x5D, 0x0E, 0x95, 0x15, 0x28, 0xC0, 0x01, 0x80}},
+         {2, 292,  320, {0x10, 0xF4, 0x50, 0x09, 0xFB, 0x09, 0x33, 0x1E, 0x28, 0x24, 0x01, 0x80}},
+      },
+   },
+   /* QCIF */
+   {
+      /* 5 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+      /* 10 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+      /* 15 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+      /* 20 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+      /* 25 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+      /* 30 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+   },
+   /* SIF */
+   {
+      /* 5 fps */
+      {
+         {4, 582,    0, {0x0D, 0xF4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x46, 0x02, 0x80}},
+         {3, 387, 1276, {0x05, 0xF4, 0x30, 0x27, 0xD8, 0x26, 0x48, 0x03, 0x10, 0x83, 0x01, 0x80}},
+         {2, 291,  960, {0x05, 0xF4, 0x30, 0x1D, 0xF2, 0x1C, 0x62, 0x04, 0x10, 0x23, 0x01, 0x80}},
+         {1, 191,  630, {0x05, 0xF4, 0x50, 0x13, 0xA9, 0x12, 0x19, 0x05, 0x18, 0xBF, 0x00, 0x80}},
+      },
+      /* 10 fps */
+      {
+         {0, },
+         {6, 775, 1278, {0x04, 0xF4, 0x30, 0x27, 0xE8, 0x26, 0x58, 0x05, 0x30, 0x07, 0x03, 0x80}},
+         {3, 447,  736, {0x04, 0xF4, 0x30, 0x16, 0xFB, 0x15, 0x6B, 0x05, 0x28, 0xBF, 0x01, 0x80}},
+         {2, 292,  480, {0x04, 0xF4, 0x70, 0x0E, 0xF9, 0x0D, 0x69, 0x09, 0x28, 0x24, 0x01, 0x80}},
+      },
+      /* 15 fps */
+      {
+         {0, },
+         {9, 955, 1050, {0x03, 0xF4, 0x30, 0x20, 0xCF, 0x1F, 0x3F, 0x06, 0x48, 0xBB, 0x03, 0x80}},
+         {4, 592,  650, {0x03, 0xF4, 0x30, 0x14, 0x44, 0x12, 0xB4, 0x08, 0x30, 0x50, 0x02, 0x80}},
+         {3, 448,  492, {0x03, 0xF4, 0x50, 0x0F, 0x52, 0x0D, 0xC2, 0x09, 0x38, 0xC0, 0x01, 0x80}},
+      },
+      /* 20 fps */
+      {
+         {0, },
+         {9, 958,  782, {0x02, 0xF4, 0x30, 0x18, 0x6A, 0x16, 0xDA, 0x0B, 0x58, 0xBE, 0x03, 0x80}},
+         {5, 703,  574, {0x02, 0xF4, 0x50, 0x11, 0xE7, 0x10, 0x57, 0x0B, 0x40, 0xBF, 0x02, 0x80}},
+         {3, 446,  364, {0x02, 0xF4, 0x90, 0x0B, 0x5C, 0x09, 0xCC, 0x0E, 0x38, 0xBE, 0x01, 0x80}},
+      },
+      /* 25 fps */
+      {
+         {0, },
+         {9, 958,  654, {0x01, 0xF4, 0x30, 0x14, 0x66, 0x12, 0xD6, 0x0B, 0x50, 0xBE, 0x03, 0x80}},
+         {6, 776,  530, {0x01, 0xF4, 0x50, 0x10, 0x8C, 0x0E, 0xFC, 0x0C, 0x48, 0x08, 0x03, 0x80}},
+         {4, 592,  404, {0x01, 0xF4, 0x70, 0x0C, 0x96, 0x0B, 0x06, 0x0B, 0x48, 0x50, 0x02, 0x80}},
+      },
+      /* 30 fps */
+      {
+         {0, },
+         {9, 957,  526, {0x00, 0xF4, 0x50, 0x10, 0x68, 0x0E, 0xD8, 0x0D, 0x58, 0xBD, 0x03, 0x80}},
+         {6, 775,  426, {0x00, 0xF4, 0x70, 0x0D, 0x48, 0x0B, 0xB8, 0x0F, 0x50, 0x07, 0x03, 0x80}},
+         {4, 590,  324, {0x00, 0x7A, 0x88, 0x0A, 0x1C, 0x08, 0xB4, 0x0E, 0x50, 0x4E, 0x02, 0x80}},
+      },
+   },
+   /* CIF */
+   {
+      /* 5 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+      /* 10 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+      /* 15 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+      /* 20 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+      /* 25 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+      /* 30 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+   },
+   /* VGA */
+   {
+      /* 5 fps */
+      {
+         {0, },
+         {6, 773, 1272, {0x25, 0xF4, 0x30, 0x27, 0xB6, 0x24, 0x96, 0x02, 0x30, 0x05, 0x03, 0x80}},
+         {4, 592,  976, {0x25, 0xF4, 0x50, 0x1E, 0x78, 0x1B, 0x58, 0x03, 0x30, 0x50, 0x02, 0x80}},
+         {3, 448,  738, {0x25, 0xF4, 0x90, 0x17, 0x0C, 0x13, 0xEC, 0x04, 0x30, 0xC0, 0x01, 0x80}},
+      },
+      /* 10 fps */
+      {
+         {0, },
+         {9, 956,  788, {0x24, 0xF4, 0x70, 0x18, 0x9C, 0x15, 0x7C, 0x03, 0x48, 0xBC, 0x03, 0x80}},
+         {6, 776,  640, {0x24, 0xF4, 0xB0, 0x13, 0xFC, 0x11, 0x2C, 0x04, 0x48, 0x08, 0x03, 0x80}},
+         {4, 592,  488, {0x24, 0x7A, 0xE8, 0x0F, 0x3C, 0x0C, 0x6C, 0x06, 0x48, 0x50, 0x02, 0x80}},
+      },
+      /* 15 fps */
+      {
+         {0, },
+         {9, 957,  526, {0x23, 0x7A, 0xE8, 0x10, 0x68, 0x0D, 0x98, 0x06, 0x58, 0xBD, 0x03, 0x80}},
+         {9, 957,  526, {0x23, 0x7A, 0xE8, 0x10, 0x68, 0x0D, 0x98, 0x06, 0x58, 0xBD, 0x03, 0x80}},
+         {8, 895,  492, {0x23, 0x7A, 0xE8, 0x0F, 0x5D, 0x0C, 0x8D, 0x06, 0x58, 0x7F, 0x03, 0x80}},
+      },
+      /* 20 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+      /* 25 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+      /* 30 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+   },
+};
+
diff --git a/drivers/usb/media/pwc/pwc-kiara.h b/drivers/media/video/pwc/pwc-kiara.h
index 12929abbb1..12929abbb1 100644
--- a/drivers/usb/media/pwc/pwc-kiara.h
+++ b/drivers/media/video/pwc/pwc-kiara.h
diff --git a/drivers/usb/media/pwc/pwc-misc.c b/drivers/media/video/pwc/pwc-misc.c
index b7a4bd3524..58fe797479 100644
--- a/drivers/usb/media/pwc/pwc-misc.c
+++ b/drivers/media/video/pwc/pwc-misc.c
@@ -1,4 +1,4 @@
-/* Linux driver for Philips webcam 
+/* Linux driver for Philips webcam
    Various miscellaneous functions and tables.
    (C) 1999-2003 Nemosoft Unv.
    (C) 2004      Luc Saillard (luc@saillard.org)
@@ -44,17 +44,17 @@ int pwc_decode_size(struct pwc_device *pdev, int width, int height)
         int i, find;
 
         /* Make sure we don't go beyond our max size.
-           NB: we have different limits for RAW and normal modes. In case
-           you don't have the decompressor loaded or use RAW mode, 
-           the maximum viewable size is smaller.
-        */
+           NB: we have different limits for RAW and normal modes. In case
+           you don't have the decompressor loaded or use RAW mode,
+           the maximum viewable size is smaller.
+        */
         if (pdev->vpalette == VIDEO_PALETTE_RAW)
         {
                 if (width > pdev->abs_max.x || height > pdev->abs_max.y)
                 {
                         Debug("VIDEO_PALETTE_RAW: going beyond abs_max.\n");
-                        return -1;
-                }
+                        return -1;
+                }
         }
         else
         {
@@ -88,8 +88,8 @@ void pwc_construct(struct pwc_device *pdev)
                 pdev->view_min.y =  96;
                 pdev->view_max.x = 352;
                 pdev->view_max.y = 288;
-                pdev->abs_max.x  = 352;
-                pdev->abs_max.y  = 288;
+                pdev->abs_max.x  = 352;
+                pdev->abs_max.y  = 288;
                 pdev->image_mask = 1 << PSZ_SQCIF | 1 << PSZ_QCIF | 1 << PSZ_CIF;
                 pdev->vcinterface = 2;
                 pdev->vendpoint = 4;
@@ -105,8 +105,8 @@ void pwc_construct(struct pwc_device *pdev)
                 pdev->view_max.x = 640;
                 pdev->view_max.y = 480;
                 pdev->image_mask = 1 << PSZ_SQCIF | 1 << PSZ_QSIF | 1 << PSZ_QCIF | 1 << PSZ_SIF | 1 << PSZ_CIF | 1 << PSZ_VGA;
-                pdev->abs_max.x = 640;
-                pdev->abs_max.y = 480;
+                pdev->abs_max.x = 640;
+                pdev->abs_max.y = 480;
                 pdev->vcinterface = 3;
                 pdev->vendpoint = 4;
                 pdev->frame_header_size = 0;
@@ -121,8 +121,8 @@ void pwc_construct(struct pwc_device *pdev)
                 pdev->view_max.x = 640;
                 pdev->view_max.y = 480;
                 pdev->image_mask = 1 << PSZ_QSIF | 1 << PSZ_SIF | 1 << PSZ_VGA;
-                pdev->abs_max.x = 640;
-                pdev->abs_max.y = 480;
+                pdev->abs_max.x = 640;
+                pdev->abs_max.y = 480;
                 pdev->vcinterface = 3;
                 pdev->vendpoint = 5;
                 pdev->frame_header_size = TOUCAM_HEADER_SIZE;
diff --git a/drivers/usb/media/pwc/pwc-nala.h b/drivers/media/video/pwc/pwc-nala.h
index e6c5cb69d0..168c73ef75 100644
--- a/drivers/usb/media/pwc/pwc-nala.h
+++ b/drivers/media/video/pwc/pwc-nala.h
@@ -54,7 +54,7 @@
       {0},
    },
    /* VGA */
-   {  
+   {
       {0},
       {0},
       {0},
diff --git a/drivers/media/video/pwc/pwc-timon.c b/drivers/media/video/pwc/pwc-timon.c
new file mode 100644
index 0000000000..175250d089
--- /dev/null
+++ b/drivers/media/video/pwc/pwc-timon.c
@@ -0,0 +1,316 @@
+/* Linux driver for Philips webcam
+   (C) 2004      Luc Saillard (luc@saillard.org)
+
+   NOTE: this version of pwc is an unofficial (modified) release of pwc & pcwx
+   driver and thus may have bugs that are not present in the original version.
+   Please send bug reports and support requests to <luc@saillard.org>.
+   The decompression routines have been implemented by reverse-engineering the
+   Nemosoft binary pwcx module. Caveat emptor.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+
+/* This tables contains entries for the 675/680/690 (Timon) camera, with
+   4 different qualities (no compression, low, medium, high).
+   It lists the bandwidth requirements for said mode by its alternate interface
+   number. An alternate of 0 means that the mode is unavailable.
+
+   There are 6 * 4 * 4 entries:
+     6 different resolutions subqcif, qsif, qcif, sif, cif, vga
+     6 framerates: 5, 10, 15, 20, 25, 30
+     4 compression modi: none, low, medium, high
+
+   When an uncompressed mode is not available, the next available compressed mode
+   will be chosen (unless the decompressor is absent). Sometimes there are only
+   1 or 2 compressed modes available; in that case entries are duplicated.
+*/
+
+#include "pwc-timon.h"
+
+const struct Timon_table_entry Timon_table[PSZ_MAX][6][4] =
+{
+   /* SQCIF */
+   {
+      /* 5 fps */
+      {
+         {1, 140,    0, {0x05, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x8C, 0xFC, 0x80, 0x02}},
+         {1, 140,    0, {0x05, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x8C, 0xFC, 0x80, 0x02}},
+         {1, 140,    0, {0x05, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x8C, 0xFC, 0x80, 0x02}},
+         {1, 140,    0, {0x05, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x8C, 0xFC, 0x80, 0x02}},
+      },
+      /* 10 fps */
+      {
+         {2, 280,    0, {0x04, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x18, 0xA9, 0x80, 0x02}},
+         {2, 280,    0, {0x04, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x18, 0xA9, 0x80, 0x02}},
+         {2, 280,    0, {0x04, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x18, 0xA9, 0x80, 0x02}},
+         {2, 280,    0, {0x04, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x18, 0xA9, 0x80, 0x02}},
+      },
+      /* 15 fps */
+      {
+         {3, 410,    0, {0x03, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x9A, 0x71, 0x80, 0x02}},
+         {3, 410,    0, {0x03, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x9A, 0x71, 0x80, 0x02}},
+         {3, 410,    0, {0x03, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x9A, 0x71, 0x80, 0x02}},
+         {3, 410,    0, {0x03, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x9A, 0x71, 0x80, 0x02}},
+      },
+      /* 20 fps */
+      {
+         {4, 559,    0, {0x02, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x2F, 0x56, 0x80, 0x02}},
+         {4, 559,    0, {0x02, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x2F, 0x56, 0x80, 0x02}},
+         {4, 559,    0, {0x02, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x2F, 0x56, 0x80, 0x02}},
+         {4, 559,    0, {0x02, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x2F, 0x56, 0x80, 0x02}},
+      },
+      /* 25 fps */
+      {
+         {5, 659,    0, {0x01, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x93, 0x46, 0x80, 0x02}},
+         {5, 659,    0, {0x01, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x93, 0x46, 0x80, 0x02}},
+         {5, 659,    0, {0x01, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x93, 0x46, 0x80, 0x02}},
+         {5, 659,    0, {0x01, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x93, 0x46, 0x80, 0x02}},
+      },
+      /* 30 fps */
+      {
+         {7, 838,    0, {0x00, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x46, 0x3B, 0x80, 0x02}},
+         {7, 838,    0, {0x00, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x46, 0x3B, 0x80, 0x02}},
+         {7, 838,    0, {0x00, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x46, 0x3B, 0x80, 0x02}},
+         {7, 838,    0, {0x00, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x46, 0x3B, 0x80, 0x02}},
+      },
+   },
+   /* QSIF */
+   {
+      /* 5 fps */
+      {
+         {1, 146,    0, {0x2D, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x92, 0xFC, 0xC0, 0x02}},
+         {1, 146,    0, {0x2D, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x92, 0xFC, 0xC0, 0x02}},
+         {1, 146,    0, {0x2D, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x92, 0xFC, 0xC0, 0x02}},
+         {1, 146,    0, {0x2D, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x92, 0xFC, 0xC0, 0x02}},
+      },
+      /* 10 fps */
+      {
+         {2, 291,    0, {0x2C, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x23, 0xA1, 0xC0, 0x02}},
+         {1, 191,  630, {0x2C, 0xF4, 0x05, 0x13, 0xA9, 0x12, 0xE1, 0x17, 0x08, 0xBF, 0xF4, 0xC0, 0x02}},
+         {1, 191,  630, {0x2C, 0xF4, 0x05, 0x13, 0xA9, 0x12, 0xE1, 0x17, 0x08, 0xBF, 0xF4, 0xC0, 0x02}},
+         {1, 191,  630, {0x2C, 0xF4, 0x05, 0x13, 0xA9, 0x12, 0xE1, 0x17, 0x08, 0xBF, 0xF4, 0xC0, 0x02}},
+      },
+      /* 15 fps */
+      {
+         {3, 437,    0, {0x2B, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0xB5, 0x6D, 0xC0, 0x02}},
+         {2, 291,  640, {0x2B, 0xF4, 0x05, 0x13, 0xF7, 0x13, 0x2F, 0x13, 0x08, 0x23, 0xA1, 0xC0, 0x02}},
+         {2, 291,  640, {0x2B, 0xF4, 0x05, 0x13, 0xF7, 0x13, 0x2F, 0x13, 0x08, 0x23, 0xA1, 0xC0, 0x02}},
+         {1, 191,  420, {0x2B, 0xF4, 0x0D, 0x0D, 0x1B, 0x0C, 0x53, 0x1E, 0x08, 0xBF, 0xF4, 0xC0, 0x02}},
+      },
+      /* 20 fps */
+      {
+         {4, 588,    0, {0x2A, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x4C, 0x52, 0xC0, 0x02}},
+         {3, 447,  730, {0x2A, 0xF4, 0x05, 0x16, 0xC9, 0x16, 0x01, 0x0E, 0x18, 0xBF, 0x69, 0xC0, 0x02}},
+         {2, 292,  476, {0x2A, 0xF4, 0x0D, 0x0E, 0xD8, 0x0E, 0x10, 0x19, 0x18, 0x24, 0xA1, 0xC0, 0x02}},
+         {1, 192,  312, {0x2A, 0xF4, 0x1D, 0x09, 0xB3, 0x08, 0xEB, 0x1E, 0x18, 0xC0, 0xF4, 0xC0, 0x02}},
+      },
+      /* 25 fps */
+      {
+         {5, 703,    0, {0x29, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0xBF, 0x42, 0xC0, 0x02}},
+         {3, 447,  610, {0x29, 0xF4, 0x05, 0x13, 0x0B, 0x12, 0x43, 0x14, 0x18, 0xBF, 0x69, 0xC0, 0x02}},
+         {2, 292,  398, {0x29, 0xF4, 0x0D, 0x0C, 0x6C, 0x0B, 0xA4, 0x1E, 0x18, 0x24, 0xA1, 0xC0, 0x02}},
+         {1, 192,  262, {0x29, 0xF4, 0x25, 0x08, 0x23, 0x07, 0x5B, 0x1E, 0x18, 0xC0, 0xF4, 0xC0, 0x02}},
+      },
+      /* 30 fps */
+      {
+         {8, 873,    0, {0x28, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x69, 0x37, 0xC0, 0x02}},
+         {5, 704,  774, {0x28, 0xF4, 0x05, 0x18, 0x21, 0x17, 0x59, 0x0F, 0x18, 0xC0, 0x42, 0xC0, 0x02}},
+         {3, 448,  492, {0x28, 0xF4, 0x05, 0x0F, 0x5D, 0x0E, 0x95, 0x15, 0x18, 0xC0, 0x69, 0xC0, 0x02}},
+         {2, 291,  320, {0x28, 0xF4, 0x1D, 0x09, 0xFB, 0x09, 0x33, 0x1E, 0x18, 0x23, 0xA1, 0xC0, 0x02}},
+      },
+   },
+   /* QCIF */
+   {
+      /* 5 fps */
+      {
+         {1, 193,    0, {0x0D, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0xC1, 0xF4, 0xC0, 0x02}},
+         {1, 193,    0, {0x0D, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0xC1, 0xF4, 0xC0, 0x02}},
+         {1, 193,    0, {0x0D, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0xC1, 0xF4, 0xC0, 0x02}},
+         {1, 193,    0, {0x0D, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0xC1, 0xF4, 0xC0, 0x02}},
+      },
+      /* 10 fps */
+      {
+         {3, 385,    0, {0x0C, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x81, 0x79, 0xC0, 0x02}},
+         {2, 291,  800, {0x0C, 0xF4, 0x05, 0x18, 0xF4, 0x18, 0x18, 0x11, 0x08, 0x23, 0xA1, 0xC0, 0x02}},
+         {2, 291,  800, {0x0C, 0xF4, 0x05, 0x18, 0xF4, 0x18, 0x18, 0x11, 0x08, 0x23, 0xA1, 0xC0, 0x02}},
+         {1, 194,  532, {0x0C, 0xF4, 0x05, 0x10, 0x9A, 0x0F, 0xBE, 0x1B, 0x08, 0xC2, 0xF0, 0xC0, 0x02}},
+      },
+      /* 15 fps */
+      {
+         {4, 577,    0, {0x0B, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x41, 0x52, 0xC0, 0x02}},
+         {3, 447,  818, {0x0B, 0xF4, 0x05, 0x19, 0x89, 0x18, 0xAD, 0x0F, 0x10, 0xBF, 0x69, 0xC0, 0x02}},
+         {2, 292,  534, {0x0B, 0xF4, 0x05, 0x10, 0xA3, 0x0F, 0xC7, 0x19, 0x10, 0x24, 0xA1, 0xC0, 0x02}},
+         {1, 195,  356, {0x0B, 0xF4, 0x15, 0x0B, 0x11, 0x0A, 0x35, 0x1E, 0x10, 0xC3, 0xF0, 0xC0, 0x02}},
+      },
+      /* 20 fps */
+      {
+         {6, 776,    0, {0x0A, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x08, 0x3F, 0xC0, 0x02}},
+         {4, 591,  804, {0x0A, 0xF4, 0x05, 0x19, 0x1E, 0x18, 0x42, 0x0F, 0x18, 0x4F, 0x4E, 0xC0, 0x02}},
+         {3, 447,  608, {0x0A, 0xF4, 0x05, 0x12, 0xFD, 0x12, 0x21, 0x15, 0x18, 0xBF, 0x69, 0xC0, 0x02}},
+         {2, 291,  396, {0x0A, 0xF4, 0x15, 0x0C, 0x5E, 0x0B, 0x82, 0x1E, 0x18, 0x23, 0xA1, 0xC0, 0x02}},
+      },
+      /* 25 fps */
+      {
+         {9, 928,    0, {0x09, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0xA0, 0x33, 0xC0, 0x02}},
+         {5, 703,  800, {0x09, 0xF4, 0x05, 0x18, 0xF4, 0x18, 0x18, 0x10, 0x18, 0xBF, 0x42, 0xC0, 0x02}},
+         {3, 447,  508, {0x09, 0xF4, 0x0D, 0x0F, 0xD2, 0x0E, 0xF6, 0x1B, 0x18, 0xBF, 0x69, 0xC0, 0x02}},
+         {2, 292,  332, {0x09, 0xF4, 0x1D, 0x0A, 0x5A, 0x09, 0x7E, 0x1E, 0x18, 0x24, 0xA1, 0xC0, 0x02}},
+      },
+      /* 30 fps */
+      {
+         {0, },
+         {9, 956,  876, {0x08, 0xF4, 0x05, 0x1B, 0x58, 0x1A, 0x7C, 0x0E, 0x20, 0xBC, 0x33, 0x10, 0x02}},
+         {4, 592,  542, {0x08, 0xF4, 0x05, 0x10, 0xE4, 0x10, 0x08, 0x17, 0x20, 0x50, 0x4E, 0x10, 0x02}},
+         {2, 291,  266, {0x08, 0xF4, 0x25, 0x08, 0x48, 0x07, 0x6C, 0x1E, 0x20, 0x23, 0xA1, 0x10, 0x02}},
+      },
+   },
+   /* SIF */
+   {
+      /* 5 fps */
+      {
+         {4, 582,    0, {0x35, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x46, 0x52, 0x60, 0x02}},
+         {3, 387, 1276, {0x35, 0xF4, 0x05, 0x27, 0xD8, 0x26, 0x48, 0x03, 0x10, 0x83, 0x79, 0x60, 0x02}},
+         {2, 291,  960, {0x35, 0xF4, 0x0D, 0x1D, 0xF2, 0x1C, 0x62, 0x04, 0x10, 0x23, 0xA1, 0x60, 0x02}},
+         {1, 191,  630, {0x35, 0xF4, 0x1D, 0x13, 0xA9, 0x12, 0x19, 0x05, 0x08, 0xBF, 0xF4, 0x60, 0x02}},
+      },
+      /* 10 fps */
+      {
+         {0, },
+         {6, 775, 1278, {0x34, 0xF4, 0x05, 0x27, 0xE8, 0x26, 0x58, 0x05, 0x30, 0x07, 0x3F, 0x10, 0x02}},
+         {3, 447,  736, {0x34, 0xF4, 0x15, 0x16, 0xFB, 0x15, 0x6B, 0x05, 0x18, 0xBF, 0x69, 0x10, 0x02}},
+         {2, 291,  480, {0x34, 0xF4, 0x2D, 0x0E, 0xF9, 0x0D, 0x69, 0x09, 0x18, 0x23, 0xA1, 0x10, 0x02}},
+      },
+      /* 15 fps */
+      {
+         {0, },
+         {9, 955, 1050, {0x33, 0xF4, 0x05, 0x20, 0xCF, 0x1F, 0x3F, 0x06, 0x48, 0xBB, 0x33, 0x10, 0x02}},
+         {4, 591,  650, {0x33, 0xF4, 0x15, 0x14, 0x44, 0x12, 0xB4, 0x08, 0x30, 0x4F, 0x4E, 0x10, 0x02}},
+         {3, 448,  492, {0x33, 0xF4, 0x25, 0x0F, 0x52, 0x0D, 0xC2, 0x09, 0x28, 0xC0, 0x69, 0x10, 0x02}},
+      },
+      /* 20 fps */
+      {
+         {0, },
+         {9, 958,  782, {0x32, 0xF4, 0x0D, 0x18, 0x6A, 0x16, 0xDA, 0x0B, 0x58, 0xBE, 0x33, 0xD0, 0x02}},
+         {5, 703,  574, {0x32, 0xF4, 0x1D, 0x11, 0xE7, 0x10, 0x57, 0x0B, 0x40, 0xBF, 0x42, 0xD0, 0x02}},
+         {3, 446,  364, {0x32, 0xF4, 0x3D, 0x0B, 0x5C, 0x09, 0xCC, 0x0E, 0x30, 0xBE, 0x69, 0xD0, 0x02}},
+      },
+      /* 25 fps */
+      {
+         {0, },
+         {9, 958,  654, {0x31, 0xF4, 0x15, 0x14, 0x66, 0x12, 0xD6, 0x0B, 0x50, 0xBE, 0x33, 0x90, 0x02}},
+         {6, 776,  530, {0x31, 0xF4, 0x25, 0x10, 0x8C, 0x0E, 0xFC, 0x0C, 0x48, 0x08, 0x3F, 0x90, 0x02}},
+         {4, 592,  404, {0x31, 0xF4, 0x35, 0x0C, 0x96, 0x0B, 0x06, 0x0B, 0x38, 0x50, 0x4E, 0x90, 0x02}},
+      },
+      /* 30 fps */
+      {
+         {0, },
+         {9, 957,  526, {0x30, 0xF4, 0x25, 0x10, 0x68, 0x0E, 0xD8, 0x0D, 0x58, 0xBD, 0x33, 0x60, 0x02}},
+         {6, 775,  426, {0x30, 0xF4, 0x35, 0x0D, 0x48, 0x0B, 0xB8, 0x0F, 0x50, 0x07, 0x3F, 0x60, 0x02}},
+         {4, 590,  324, {0x30, 0x7A, 0x4B, 0x0A, 0x1C, 0x08, 0xB4, 0x0E, 0x40, 0x4E, 0x52, 0x60, 0x02}},
+      },
+   },
+   /* CIF */
+   {
+      /* 5 fps */
+      {
+         {6, 771,    0, {0x15, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x3F, 0x80, 0x02}},
+         {4, 465, 1278, {0x15, 0xF4, 0x05, 0x27, 0xEE, 0x26, 0x36, 0x03, 0x18, 0xD1, 0x65, 0x80, 0x02}},
+         {2, 291,  800, {0x15, 0xF4, 0x15, 0x18, 0xF4, 0x17, 0x3C, 0x05, 0x18, 0x23, 0xA1, 0x80, 0x02}},
+         {1, 193,  528, {0x15, 0xF4, 0x2D, 0x10, 0x7E, 0x0E, 0xC6, 0x0A, 0x18, 0xC1, 0xF4, 0x80, 0x02}},
+      },
+      /* 10 fps */
+      {
+         {0, },
+         {9, 932, 1278, {0x14, 0xF4, 0x05, 0x27, 0xEE, 0x26, 0x36, 0x04, 0x30, 0xA4, 0x33, 0x10, 0x02}},
+         {4, 591,  812, {0x14, 0xF4, 0x15, 0x19, 0x56, 0x17, 0x9E, 0x06, 0x28, 0x4F, 0x4E, 0x10, 0x02}},
+         {2, 291,  400, {0x14, 0xF4, 0x3D, 0x0C, 0x7A, 0x0A, 0xC2, 0x0E, 0x28, 0x23, 0xA1, 0x10, 0x02}},
+      },
+      /* 15 fps */
+      {
+         {0, },
+         {9, 956,  876, {0x13, 0xF4, 0x0D, 0x1B, 0x58, 0x19, 0xA0, 0x05, 0x38, 0xBC, 0x33, 0x60, 0x02}},
+         {5, 703,  644, {0x13, 0xF4, 0x1D, 0x14, 0x1C, 0x12, 0x64, 0x08, 0x38, 0xBF, 0x42, 0x60, 0x02}},
+         {3, 448,  410, {0x13, 0xF4, 0x3D, 0x0C, 0xC4, 0x0B, 0x0C, 0x0E, 0x38, 0xC0, 0x69, 0x60, 0x02}},
+      },
+      /* 20 fps */
+      {
+         {0, },
+         {9, 956,  650, {0x12, 0xF4, 0x1D, 0x14, 0x4A, 0x12, 0x92, 0x09, 0x48, 0xBC, 0x33, 0x10, 0x03}},
+         {6, 776,  528, {0x12, 0xF4, 0x2D, 0x10, 0x7E, 0x0E, 0xC6, 0x0A, 0x40, 0x08, 0x3F, 0x10, 0x03}},
+         {4, 591,  402, {0x12, 0xF4, 0x3D, 0x0C, 0x8F, 0x0A, 0xD7, 0x0E, 0x40, 0x4F, 0x4E, 0x10, 0x03}},
+      },
+      /* 25 fps */
+      {
+         {0, },
+         {9, 956,  544, {0x11, 0xF4, 0x25, 0x10, 0xF4, 0x0F, 0x3C, 0x0A, 0x48, 0xBC, 0x33, 0xC0, 0x02}},
+         {7, 840,  478, {0x11, 0xF4, 0x2D, 0x0E, 0xEB, 0x0D, 0x33, 0x0B, 0x48, 0x48, 0x3B, 0xC0, 0x02}},
+         {5, 703,  400, {0x11, 0xF4, 0x3D, 0x0C, 0x7A, 0x0A, 0xC2, 0x0E, 0x48, 0xBF, 0x42, 0xC0, 0x02}},
+      },
+      /* 30 fps */
+      {
+         {0, },
+         {9, 956,  438, {0x10, 0xF4, 0x35, 0x0D, 0xAC, 0x0B, 0xF4, 0x0D, 0x50, 0xBC, 0x33, 0x10, 0x02}},
+         {7, 838,  384, {0x10, 0xF4, 0x45, 0x0B, 0xFD, 0x0A, 0x45, 0x0F, 0x50, 0x46, 0x3B, 0x10, 0x02}},
+         {6, 773,  354, {0x10, 0x7A, 0x4B, 0x0B, 0x0C, 0x09, 0x80, 0x10, 0x50, 0x05, 0x3F, 0x10, 0x02}},
+      },
+   },
+   /* VGA */
+   {
+      /* 5 fps */
+      {
+         {0, },
+         {6, 773, 1272, {0x1D, 0xF4, 0x15, 0x27, 0xB6, 0x24, 0x96, 0x02, 0x30, 0x05, 0x3F, 0x10, 0x02}},
+         {4, 592,  976, {0x1D, 0xF4, 0x25, 0x1E, 0x78, 0x1B, 0x58, 0x03, 0x30, 0x50, 0x4E, 0x10, 0x02}},
+         {3, 448,  738, {0x1D, 0xF4, 0x3D, 0x17, 0x0C, 0x13, 0xEC, 0x04, 0x30, 0xC0, 0x69, 0x10, 0x02}},
+      },
+      /* 10 fps */
+      {
+         {0, },
+         {9, 956,  788, {0x1C, 0xF4, 0x35, 0x18, 0x9C, 0x15, 0x7C, 0x03, 0x48, 0xBC, 0x33, 0x10, 0x02}},
+         {6, 776,  640, {0x1C, 0x7A, 0x53, 0x13, 0xFC, 0x11, 0x2C, 0x04, 0x48, 0x08, 0x3F, 0x10, 0x02}},
+         {4, 592,  488, {0x1C, 0x7A, 0x6B, 0x0F, 0x3C, 0x0C, 0x6C, 0x06, 0x48, 0x50, 0x4E, 0x10, 0x02}},
+      },
+      /* 15 fps */
+      {
+         {0, },
+         {9, 957,  526, {0x1B, 0x7A, 0x63, 0x10, 0x68, 0x0D, 0x98, 0x06, 0x58, 0xBD, 0x33, 0x80, 0x02}},
+         {9, 957,  526, {0x1B, 0x7A, 0x63, 0x10, 0x68, 0x0D, 0x98, 0x06, 0x58, 0xBD, 0x33, 0x80, 0x02}},
+         {8, 895,  492, {0x1B, 0x7A, 0x6B, 0x0F, 0x5D, 0x0C, 0x8D, 0x06, 0x58, 0x7F, 0x37, 0x80, 0x02}},
+      },
+      /* 20 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+      /* 25 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+      /* 30 fps */
+      {
+         {0, },
+         {0, },
+         {0, },
+         {0, },
+      },
+   },
+};
+
diff --git a/drivers/usb/media/pwc/pwc-timon.h b/drivers/media/video/pwc/pwc-timon.h
index a86b3782a0..a86b3782a0 100644
--- a/drivers/usb/media/pwc/pwc-timon.h
+++ b/drivers/media/video/pwc/pwc-timon.h
diff --git a/drivers/usb/media/pwc/pwc-uncompress.c b/drivers/media/video/pwc/pwc-uncompress.c
index ef4204eab6..b37a89a163 100644
--- a/drivers/usb/media/pwc/pwc-uncompress.c
+++ b/drivers/media/video/pwc/pwc-uncompress.c
@@ -109,9 +109,9 @@ int pwc_decompress(struct pwc_device *pdev)
                    in planar format immediately.
                  */
                 int flags;
-                
-                flags = PWCX_FLAG_PLANAR;
-                if (pdev->vsize == PSZ_VGA && pdev->vframes == 5 && pdev->vsnapshot)
+
+                flags = PWCX_FLAG_PLANAR;
+                if (pdev->vsize == PSZ_VGA && pdev->vframes == 5 && pdev->vsnapshot)
                  {
                    printk(KERN_ERR "pwc: Mode Bayer is not supported for now\n");
                    flags |= PWCX_FLAG_BAYER;
diff --git a/drivers/usb/media/pwc/pwc-uncompress.h b/drivers/media/video/pwc/pwc-uncompress.h
index d3b9250e4e..f75e1b6cbe 100644
--- a/drivers/usb/media/pwc/pwc-uncompress.h
+++ b/drivers/media/video/pwc/pwc-uncompress.h
@@ -24,7 +24,7 @@
 
 /* This file is the bridge between the kernel module and the plugin; it
    describes the structures and datatypes used in both modules. Any
-   significant change should be reflected by increasing the 
+   significant change should be reflected by increasing the
    pwc_decompressor_version major number.
  */
 #ifndef PWC_UNCOMPRESS_H
diff --git a/drivers/usb/media/pwc/pwc.h b/drivers/media/video/pwc/pwc.h
index 6dd76bb3df..1b0ee0ced0 100644
--- a/drivers/usb/media/pwc/pwc.h
+++ b/drivers/media/video/pwc/pwc.h
@@ -123,7 +123,7 @@ struct pwc_device
 #endif
    /* Pointer to our usb_device */
    struct usb_device *udev;
-   
+
    int type;                    /* type of cam (645, 646, 675, 680, 690, 720, 730, 740, 750) */
    int release;                 /* release number */
    int features;                /* feature bits */
@@ -149,7 +149,7 @@ struct pwc_device
    char vsnapshot;              /* snapshot mode */
    char vsync;                  /* used by isoc handler */
    char vmirror;                /* for ToUCaM series */
-   
+
    int cmd_len;
    unsigned char cmd_buf[13];
 
diff --git a/drivers/media/video/rds.h b/drivers/media/video/rds.h
deleted file mode 100644
index 0d30eb744e..0000000000
--- a/drivers/media/video/rds.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-
-    Types and defines needed for RDS. This is included by
-    saa6588.c and every driver (e.g. bttv-driver.c) that wants
-    to use the saa6588 module.
-
-    Instead of having a seperate rds.h, I'd prefer to include
-    this stuff in one of the already existing files like tuner.h
-
-    (c) 2005 by Hans J. Koch
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#ifndef _RDS_H
-#define _RDS_H
-
-struct rds_command {
-        unsigned int  block_count;
-        int           result;
-        unsigned char __user *buffer;
-        struct file   *instance;
-        poll_table    *event_list;
-};
-
-#define RDS_CMD_OPEN    _IOW('R',1,int)
-#define RDS_CMD_CLOSE   _IOW('R',2,int)
-#define RDS_CMD_READ    _IOR('R',3,int)
-#define RDS_CMD_POLL    _IOR('R',4,int)
-
-#endif
-
-
-
-
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index a9f3cf0b1e..531e9461cb 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -71,7 +71,7 @@
 #define NUM_BUFS 8
 #define IF_NAME "SAA5249"
 
-static const int disp_modes[8][3] = 
+static const int disp_modes[8][3] =
 {
         { 0x46, 0x03, 0x03 },   /* DISPOFF */
         { 0x46, 0xcc, 0xcc },   /* DISPNORM */
@@ -150,8 +150,8 @@ static int saa5249_attach(struct i2c_adapter *adap, int addr, int kind)
         client=kmalloc(sizeof(*client), GFP_KERNEL);
         if(client==NULL)
                 return -ENOMEM;
-        client_template.adapter = adap;
-        client_template.addr = addr;
+        client_template.adapter = adap;
+        client_template.addr = addr;
         memcpy(client, &client_template, sizeof(*client));
         t = kzalloc(sizeof(*t), GFP_KERNEL);
         if(t==NULL)
@@ -161,11 +161,11 @@ static int saa5249_attach(struct i2c_adapter *adap, int addr, int kind)
         }
         strlcpy(client->name, IF_NAME, I2C_NAME_SIZE);
         mutex_init(&t->lock);
-        
+
         /*
          *      Now create a video4linux device
          */
-         
+
         vd = kmalloc(sizeof(struct video_device), GFP_KERNEL);
         if(vd==NULL)
         {
@@ -175,8 +175,8 @@ static int saa5249_attach(struct i2c_adapter *adap, int addr, int kind)
         }
         i2c_set_clientdata(client, vd);
         memcpy(vd, &saa_template, sizeof(*vd));
-                
-        for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++) 
+
+        for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++)
         {
                 memset(t->vdau[pgbuf].pgbuf, ' ', sizeof(t->vdau[0].pgbuf));
                 memset(t->vdau[pgbuf].sregs, 0, sizeof(t->vdau[0].sregs));
@@ -186,9 +186,9 @@ static int saa5249_attach(struct i2c_adapter *adap, int addr, int kind)
                 t->vdau[pgbuf].stopped = TRUE;
                 t->is_searching[pgbuf] = FALSE;
         }
-        vd->priv=t;     
-         
-        
+        vd->priv=t;
+
+
         /*
          *      Register it
          */
@@ -208,7 +208,7 @@ static int saa5249_attach(struct i2c_adapter *adap, int addr, int kind)
 /*
  *      We do most of the hard work when we become a device on the i2c.
  */
- 
+
 static int saa5249_probe(struct i2c_adapter *adap)
 {
         if (adap->class & I2C_CLASS_TV_ANALOG)
@@ -229,7 +229,7 @@ static int saa5249_detach(struct i2c_client *client)
 
 /* new I2C driver support */
 
-static struct i2c_driver i2c_driver_videotext = 
+static struct i2c_driver i2c_driver_videotext =
 {
         .driver = {
                 .name   = IF_NAME,              /* name */
@@ -249,7 +249,7 @@ static struct i2c_client client_template = {
  *      delay may be longer.
  */
 
-static void jdelay(unsigned long delay) 
+static void jdelay(unsigned long delay)
 {
         sigset_t oldblocked = current->blocked;
 
@@ -269,14 +269,14 @@ static void jdelay(unsigned long delay)
 /*
  *      I2C interfaces
  */
- 
-static int i2c_sendbuf(struct saa5249_device *t, int reg, int count, u8 *data) 
+
+static int i2c_sendbuf(struct saa5249_device *t, int reg, int count, u8 *data)
 {
         char buf[64];
-        
+
         buf[0] = reg;
         memcpy(buf+1, data, count);
-        
+
         if(i2c_master_send(t->client, buf, count+1)==count+1)
                 return 0;
         return -1;
@@ -289,7 +289,7 @@ static int i2c_senddata(struct saa5249_device *t, ...)
         int ct=0;
         va_list argp;
         va_start(argp,t);
-        
+
         while((v=va_arg(argp,int))!=-1)
                 buf[ct++]=v;
         return i2c_sendbuf(t, buf[0], ct-1, buf+1);
@@ -301,7 +301,7 @@ static int i2c_senddata(struct saa5249_device *t, ...)
  * Returns -1 if I²C-device didn't send acknowledge, 0 otherwise
  */
 
-static int i2c_getdata(struct saa5249_device *t, int count, u8 *buf) 
+static int i2c_getdata(struct saa5249_device *t, int count, u8 *buf)
 {
         if(i2c_master_recv(t->client, buf, count)!=count)
                 return -1;
@@ -320,9 +320,9 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
         struct video_device *vd = video_devdata(file);
         struct saa5249_device *t=vd->priv;
 
-        switch(cmd) 
+        switch(cmd)
         {
-                case VTXIOCGETINFO: 
+                case VTXIOCGETINFO:
                 {
                         vtx_info_t *info = arg;
                         info->version_major = VTX_VER_MAJ;
@@ -332,10 +332,10 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
                         return 0;
                 }
 
-                case VTXIOCCLRPAGE: 
+                case VTXIOCCLRPAGE:
                 {
                         vtx_pagereq_t *req = arg;
-      
+
                         if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
                                 return -EINVAL;
                         memset(t->vdau[req->pgbuf].pgbuf, ' ', sizeof(t->vdau[0].pgbuf));
@@ -343,17 +343,17 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
                         return 0;
                 }
 
-                case VTXIOCCLRFOUND: 
+                case VTXIOCCLRFOUND:
                 {
                         vtx_pagereq_t *req = arg;
-      
+
                         if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
                                 return -EINVAL;
                         t->vdau[req->pgbuf].clrfound = TRUE;
                         return 0;
                 }
 
-                case VTXIOCPAGEREQ: 
+                case VTXIOCPAGEREQ:
                 {
                         vtx_pagereq_t *req = arg;
                         if (!(req->pagemask & PGMASK_PAGE))
@@ -381,7 +381,7 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
                         return 0;
                 }
 
-                case VTXIOCGETSTAT: 
+                case VTXIOCGETSTAT:
                 {
                         vtx_pagereq_t *req = arg;
                         u8 infobits[10];
@@ -390,7 +390,7 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
 
                         if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
                                 return -EINVAL;
-                        if (!t->vdau[req->pgbuf].stopped) 
+                        if (!t->vdau[req->pgbuf].stopped)
                         {
                                 if (i2c_senddata(t, 2, 0, -1) ||
                                         i2c_sendbuf(t, 3, sizeof(t->vdau[0].sregs), t->vdau[req->pgbuf].sregs) ||
@@ -403,7 +403,7 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
                                         return -EIO;
 
                                 if (!(infobits[8] & 0x10) && !(infobits[7] & 0xf0) &&   /* check FOUND-bit */
-                                        (memcmp(infobits, t->vdau[req->pgbuf].laststat, sizeof(infobits)) || 
+                                        (memcmp(infobits, t->vdau[req->pgbuf].laststat, sizeof(infobits)) ||
                                         time_after_eq(jiffies, t->vdau[req->pgbuf].expire)))
                                 {               /* check if new page arrived */
                                         if (i2c_senddata(t, 8, 0, 0, 0, -1) ||
@@ -411,7 +411,7 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
                                                 return -EIO;
                                         t->vdau[req->pgbuf].expire = jiffies + PGBUF_EXPIRE;
                                         memset(t->vdau[req->pgbuf].pgbuf + VTX_PAGESIZE, ' ', VTX_VIRTUALSIZE - VTX_PAGESIZE);
-                                        if (t->virtual_mode) 
+                                        if (t->virtual_mode)
                                         {
                                                 /* Packet X/24 */
                                                 if (i2c_senddata(t, 8, 0, 0x20, 0, -1) ||
@@ -459,9 +459,9 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
                         info.notfound = !!(infobits[8] & 0x10);
                         info.pblf = !!(infobits[9] & 0x20);
                         info.hamming = 0;
-                        for (a = 0; a <= 7; a++) 
+                        for (a = 0; a <= 7; a++)
                         {
-                                if (infobits[a] & 0xf0) 
+                                if (infobits[a] & 0xf0)
                                 {
                                         info.hamming = 1;
                                         break;
@@ -471,14 +471,14 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
                                 info.notfound = 1;
                         if(copy_to_user(req->buffer, &info, sizeof(vtx_pageinfo_t)))
                                 return -EFAULT;
-                        if (!info.hamming && !info.notfound) 
+                        if (!info.hamming && !info.notfound)
                         {
                                 t->is_searching[req->pgbuf] = FALSE;
                         }
                         return 0;
                 }
 
-                case VTXIOCGETPAGE: 
+                case VTXIOCGETPAGE:
                 {
                         vtx_pagereq_t *req = arg;
                         int start, end;
@@ -488,15 +488,15 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
                                 return -EINVAL;
                         if(copy_to_user(req->buffer, &t->vdau[req->pgbuf].pgbuf[req->start], req->end - req->start + 1))
                                 return -EFAULT;
-                                
-                         /* 
+
+                         /*
                           *     Always read the time directly from SAA5249
                           */
-                          
-                        if (req->start <= 39 && req->end >= 32) 
+
+                        if (req->start <= 39 && req->end >= 32)
                         {
                                 int len;
-                                char buf[16];  
+                                char buf[16];
                                 start = max(req->start, 32);
                                 end = min(req->end, 39);
                                 len=end-start+1;
@@ -507,7 +507,7 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
                                         return -EFAULT;
                         }
                         /* Insert the current header if DAU is still searching for a page */
-                        if (req->start <= 31 && req->end >= 7 && t->is_searching[req->pgbuf]) 
+                        if (req->start <= 31 && req->end >= 7 && t->is_searching[req->pgbuf])
                         {
                                 char buf[32];
                                 int len;
@@ -523,7 +523,7 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
                         return 0;
                 }
 
-                case VTXIOCSTOPDAU: 
+                case VTXIOCSTOPDAU:
                 {
                         vtx_pagereq_t *req = arg;
 
@@ -534,12 +534,12 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
                         return 0;
                 }
 
-                case VTXIOCPUTPAGE: 
-                case VTXIOCSETDISP: 
-                case VTXIOCPUTSTAT: 
+                case VTXIOCPUTPAGE:
+                case VTXIOCSETDISP:
+                case VTXIOCPUTSTAT:
                         return 0;
-                        
-                case VTXIOCCLRCACHE: 
+
+                case VTXIOCCLRCACHE:
                 {
                         if (i2c_senddata(t, 0, NUM_DAUS, 0, 8, -1) || i2c_senddata(t, 11,
                                 ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',
@@ -551,7 +551,7 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
                         return 0;
                 }
 
-                case VTXIOCSETVIRT: 
+                case VTXIOCSETVIRT:
                 {
                         /* The SAA5249 has virtual-row reception turned on always */
                         t->virtual_mode = (int)(long)arg;
@@ -612,14 +612,14 @@ static inline unsigned int vtx_fix_command(unsigned int cmd)
 /*
  *      Handle the locking
  */
- 
+
 static int saa5249_ioctl(struct inode *inode, struct file *file,
-                         unsigned int cmd, unsigned long arg) 
+                         unsigned int cmd, unsigned long arg)
 {
         struct video_device *vd = video_devdata(file);
         struct saa5249_device *t=vd->priv;
         int err;
-        
+
         cmd = vtx_fix_command(cmd);
         mutex_lock(&t->lock);
         err = video_usercopy(inode,file,cmd,arg,do_saa5249_ioctl);
@@ -627,7 +627,7 @@ static int saa5249_ioctl(struct inode *inode, struct file *file,
         return err;
 }
 
-static int saa5249_open(struct inode *inode, struct file *file) 
+static int saa5249_open(struct inode *inode, struct file *file)
 {
         struct video_device *vd = video_devdata(file);
         struct saa5249_device *t=vd->priv;
@@ -636,7 +636,7 @@ static int saa5249_open(struct inode *inode, struct file *file)
         err = video_exclusive_open(inode,file);
         if (err < 0)
                 return err;
-        
+
         if (t->client==NULL) {
                 err = -ENODEV;
                 goto fail;
@@ -647,13 +647,13 @@ static int saa5249_open(struct inode *inode, struct file *file)
                 i2c_senddata(t, 1, disp_modes[t->disp_mode][0], 0, -1) ||
                                                 /* Display TV-picture, no virtual rows */
                 i2c_senddata(t, 4, NUM_DAUS, disp_modes[t->disp_mode][1], disp_modes[t->disp_mode][2], 7, -1)) /* Set display to page 4 */
-        
+
         {
                 err = -EIO;
                 goto fail;
         }
 
-        for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++) 
+        for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++)
         {
                 memset(t->vdau[pgbuf].pgbuf, ' ', sizeof(t->vdau[0].pgbuf));
                 memset(t->vdau[pgbuf].sregs, 0, sizeof(t->vdau[0].sregs));
@@ -673,7 +673,7 @@ static int saa5249_open(struct inode *inode, struct file *file)
 
 
 
-static int saa5249_release(struct inode *inode, struct file *file) 
+static int saa5249_release(struct inode *inode, struct file *file)
 {
         struct video_device *vd = video_devdata(file);
         struct saa5249_device *t=vd->priv;
@@ -690,7 +690,7 @@ static int __init init_saa_5249 (void)
         return i2c_add_driver(&i2c_driver_videotext);
 }
 
-static void __exit cleanup_saa_5249 (void) 
+static void __exit cleanup_saa_5249 (void)
 {
         i2c_del_driver(&i2c_driver_videotext);
 }
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index d17395c4f5..a81285ca7d 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -32,7 +32,7 @@
 #include <asm/uaccess.h>
 
 
-#include "rds.h"
+#include <media/rds.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = {
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index e18ea26838..41d951db6e 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -139,7 +139,7 @@ saa7110_read (struct i2c_client *client)
 
 static int
 saa7110_selmux (struct i2c_client *client,
-                int                chan)
+                int                chan)
 {
         static const unsigned char modes[9][8] = {
                 /* mode 0 */
@@ -457,7 +457,7 @@ static unsigned short normal_i2c[] = {
 };
 
 static unsigned short ignore = I2C_CLIENT_END;
-                                                                                
+
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index f9ba0c943a..686fd47462 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * saa7111 - Philips SAA7111A video decoder driver version 0.0.3
  *
  * Copyright (C) 1998 Dave Perks <dperks@ibm.net>
@@ -482,7 +482,7 @@ saa7111_command (struct i2c_client *client,
 static unsigned short normal_i2c[] = { I2C_SAA7111 >> 1, I2C_CLIENT_END };
 
 static unsigned short ignore = I2C_CLIENT_END;
-                                                                                
+
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index 4a1f841d0c..90398ab825 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * saa7114 - Philips SAA7114H video decoder driver version 0.0.1
  *
  * Copyright (C) 2002 Maxim Yevtyushkin <max@linuxmedialabs.com>
@@ -300,7 +300,7 @@ static const unsigned char init[] = {
         0x55, 0xff,
         0x56, 0xff,
         0x57, 0xff,
-        0x58, 0x40,             // framing code 
+        0x58, 0x40,             // framing code
         0x59, 0x47,             // horizontal offset
         0x5a, 0x06,             // vertical offset
         0x5b, 0x83,             // field offset
@@ -345,7 +345,7 @@ static const unsigned char init[] = {
         0x82, 0x00,
         0x83, 0x00,
         0x84, 0xc5,
-        0x85, 0x0d,             // hsync and vsync ? 
+        0x85, 0x0d,             // hsync and vsync ?
         0x86, 0x40,
         0x87, 0x01,
         0x88, 0x00,
@@ -434,7 +434,7 @@ static const unsigned char init[] = {
         0xd9, 0x04,
         0xda, 0x00,             // horizontal luminance phase offset
         0xdb, 0x00,
-        0xdc, 0x00,             // horizontal chrominance scaling increment 
+        0xdc, 0x00,             // horizontal chrominance scaling increment
         0xdd, 0x02,
         0xde, 0x00,             // horizontal chrominance phase offset
         0xdf, 0x00,
@@ -754,7 +754,7 @@ saa7114_command (struct i2c_client *client,
                         saa7114_write(client, 0x87,
                                       decoder->reg[REG_ADDR(0x87)]);
                         saa7114_write(client, 0x88, 0xd8);      // sw reset scaler
-                        saa7114_write(client, 0x88, 0xf8);      // sw reset scaler release            
+                        saa7114_write(client, 0x88, 0xf8);      // sw reset scaler release
                         saa7114_write(client, 0x80, 0x36);
 
                 }
@@ -813,7 +813,7 @@ static unsigned short normal_i2c[] =
     { I2C_SAA7114 >> 1, I2C_SAA7114A >> 1, I2C_CLIENT_END };
 
 static unsigned short ignore = I2C_CLIENT_END;
-                                                                                
+
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index b184fd00b4..b050152826 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -40,7 +40,6 @@
 #include <linux/i2c.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
-#include <media/audiochip.h>
 #include <asm/div64.h>
 
 MODULE_DESCRIPTION("Philips SAA7113/SAA7114/SAA7115 video decoder driver");
diff --git a/drivers/media/video/saa7121.h b/drivers/media/video/saa7121.h
index 74e37d4052..66967ae374 100644
--- a/drivers/media/video/saa7121.h
+++ b/drivers/media/video/saa7121.h
@@ -64,7 +64,7 @@
 #define PAL_MSB_VERTICAL        0x40    /* 7c */
 
 /* Initialization Sequence */
-         
+
 static __u8 init7121ntsc[] = {
         0x26, 0x0,      0x27, 0x0,
         0x28, NTSC_BURST_START,         0x29, NTSC_BURST_END,
@@ -95,7 +95,7 @@ static __u8 init7121ntsc[] = {
         0x78, 0x0,      0x79, 0x0,      0x7a, NTSC_FIRST_ACTIVE,
         0x7b, NTSC_LAST_ACTIVE,         0x7c, NTSC_MSB_VERTICAL,
         0x7d, 0x0,      0x7e, 0x0,      0x7f, 0x0
-}; 
+};
 #define INIT7121LEN     (sizeof(init7121ntsc)/2)
 
 static __u8 init7121pal[] = {
@@ -128,5 +128,5 @@ static __u8 init7121pal[] = {
         0x78, 0x0,      0x79, 0x0,      0x7a, PAL_FIRST_ACTIVE,
         0x7b, PAL_LAST_ACTIVE,          0x7c, PAL_MSB_VERTICAL,
         0x7d, 0x0,      0x7e, 0x0,      0x7f, 0x0
-}; 
+};
 #endif
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index aca84d2f98..bb3e0ba946 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -507,7 +507,7 @@ static int snd_card_saa7134_hw_params(struct snd_pcm_substream * substream,
         /* release the old buffer */
         if (substream->runtime->dma_area) {
                 saa7134_pgtable_free(dev->pci, &dev->dmasound.pt);
-                videobuf_dma_pci_unmap(dev->pci, &dev->dmasound.dma);
+                videobuf_pci_dma_unmap(dev->pci, &dev->dmasound.dma);
                 dsp_buffer_free(dev);
                 substream->runtime->dma_area = NULL;
         }
@@ -523,12 +523,12 @@ static int snd_card_saa7134_hw_params(struct snd_pcm_substream * substream,
                 return err;
         }
 
-        if (0 != (err = videobuf_dma_pci_map(dev->pci, &dev->dmasound.dma))) {
+        if (0 != (err = videobuf_pci_dma_map(dev->pci, &dev->dmasound.dma))) {
                 dsp_buffer_free(dev);
                 return err;
         }
         if (0 != (err = saa7134_pgtable_alloc(dev->pci,&dev->dmasound.pt))) {
-                videobuf_dma_pci_unmap(dev->pci, &dev->dmasound.dma);
+                videobuf_pci_dma_unmap(dev->pci, &dev->dmasound.dma);
                 dsp_buffer_free(dev);
                 return err;
         }
@@ -537,7 +537,7 @@ static int snd_card_saa7134_hw_params(struct snd_pcm_substream * substream,
                                                 dev->dmasound.dma.sglen,
                                                 0))) {
                 saa7134_pgtable_free(dev->pci, &dev->dmasound.pt);
-                videobuf_dma_pci_unmap(dev->pci, &dev->dmasound.dma);
+                videobuf_pci_dma_unmap(dev->pci, &dev->dmasound.dma);
                 dsp_buffer_free(dev);
                 return err;
         }
@@ -571,7 +571,7 @@ static int snd_card_saa7134_hw_free(struct snd_pcm_substream * substream)
 
         if (substream->runtime->dma_area) {
                 saa7134_pgtable_free(dev->pci, &dev->dmasound.pt);
-                videobuf_dma_pci_unmap(dev->pci, &dev->dmasound.dma);
+                videobuf_pci_dma_unmap(dev->pci, &dev->dmasound.dma);
                 dsp_buffer_free(dev);
                 substream->runtime->dma_area = NULL;
         }
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 58e568d7d2..c98571c9d5 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -254,12 +254,12 @@ void saa7134_pgtable_free(struct pci_dev *pci, struct saa7134_pgtable *pt)
 
 /* ------------------------------------------------------------------ */
 
-void saa7134_dma_free(struct saa7134_dev *dev,struct saa7134_buf *buf)
+void saa7134_dma_free(struct videobuf_queue *q,struct saa7134_buf *buf)
 {
         BUG_ON(in_interrupt());
 
         videobuf_waiton(&buf->vb,0,0);
-        videobuf_dma_pci_unmap(dev->pci, &buf->vb.dma);
+        videobuf_dma_unmap(q, &buf->vb.dma);
         videobuf_dma_free(&buf->vb.dma);
         buf->vb.state = STATE_NEEDS_INIT;
 }
@@ -960,7 +960,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
         if (saa7134_no_overlay <= 0) {
                 saa7134_video_template.type |= VID_TYPE_OVERLAY;
         } else {
-                printk("bttv: Overlay support disabled.\n");
+                printk("%s: Overlay support disabled.\n",dev->name);
         }
         dev->video_dev = vdev_init(dev,&saa7134_video_template,"video");
         err = video_register_device(dev->video_dev,VFL_TYPE_GRABBER,
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c
index d79d05f887..7aa02b34e0 100644
--- a/drivers/media/video/saa7134/saa7134-oss.c
+++ b/drivers/media/video/saa7134/saa7134-oss.c
@@ -124,7 +124,7 @@ static int dsp_rec_start(struct saa7134_dev *dev)
         unsigned long flags;
 
         /* prepare buffer */
-        if (0 != (err = videobuf_dma_pci_map(dev->pci,&dev->dmasound.dma)))
+        if (0 != (err = videobuf_pci_dma_map(dev->pci,&dev->dmasound.dma)))
                 return err;
         if (0 != (err = saa7134_pgtable_alloc(dev->pci,&dev->dmasound.pt)))
                 goto fail1;
@@ -213,7 +213,7 @@ static int dsp_rec_start(struct saa7134_dev *dev)
  fail2:
         saa7134_pgtable_free(dev->pci,&dev->dmasound.pt);
  fail1:
-        videobuf_dma_pci_unmap(dev->pci,&dev->dmasound.dma);
+        videobuf_pci_dma_unmap(dev->pci,&dev->dmasound.dma);
         return err;
 }
 
@@ -231,7 +231,7 @@ static int dsp_rec_stop(struct saa7134_dev *dev)
 
         /* unlock buffer */
         saa7134_pgtable_free(dev->pci,&dev->dmasound.pt);
-        videobuf_dma_pci_unmap(dev->pci,&dev->dmasound.dma);
+        videobuf_pci_dma_unmap(dev->pci,&dev->dmasound.dma);
         return 0;
 }
 
diff --git a/drivers/media/video/saa7134/saa7134-ts.c b/drivers/media/video/saa7134/saa7134-ts.c
index 470903e2f5..60a90a2617 100644
--- a/drivers/media/video/saa7134/saa7134-ts.c
+++ b/drivers/media/video/saa7134/saa7134-ts.c
@@ -89,7 +89,7 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
                 return -EINVAL;
 
         if (buf->vb.size != size) {
-                saa7134_dma_free(dev,buf);
+                saa7134_dma_free(q,buf);
         }
 
         if (STATE_NEEDS_INIT == buf->vb.state) {
@@ -98,7 +98,7 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
                 buf->vb.size   = size;
                 buf->pt        = &dev->ts.pt_ts;
 
-                err = videobuf_iolock(dev->pci,&buf->vb,NULL);
+                err = videobuf_iolock(q,&buf->vb,NULL);
                 if (err)
                         goto oops;
                 err = saa7134_pgtable_build(dev->pci,buf->pt,
@@ -126,7 +126,7 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
         return 0;
 
  oops:
-        saa7134_dma_free(dev,buf);
+        saa7134_dma_free(q,buf);
         return err;
 }
 
@@ -152,10 +152,9 @@ static void buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
 
 static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
 {
-        struct saa7134_dev *dev = q->priv_data;
         struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);
 
-        saa7134_dma_free(dev,buf);
+        saa7134_dma_free(q,buf);
 }
 
 struct videobuf_queue_ops saa7134_ts_qops = {
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
index 3043233a8b..0db53d192b 100644
--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -482,12 +482,14 @@ static int tvaudio_setstereo(struct saa7134_dev *dev, struct saa7134_tvaudio *au
                 [ V4L2_TUNER_MODE_STEREO ] = "stereo",
                 [ V4L2_TUNER_MODE_LANG1  ] = "lang1",
                 [ V4L2_TUNER_MODE_LANG2  ] = "lang2",
+                [ V4L2_TUNER_MODE_LANG1_LANG2  ] = "lang1+lang2",
         };
         static u32 fm[] = {
                 [ V4L2_TUNER_MODE_MONO   ] = 0x00,  /* ch1  */
                 [ V4L2_TUNER_MODE_STEREO ] = 0x80,  /* auto */
                 [ V4L2_TUNER_MODE_LANG1  ] = 0x00,  /* ch1  */
                 [ V4L2_TUNER_MODE_LANG2  ] = 0x01,  /* ch2  */
+                [ V4L2_TUNER_MODE_LANG1_LANG2 ] = 0x80,  /* auto */
         };
         u32 reg;
 
diff --git a/drivers/media/video/saa7134/saa7134-vbi.c b/drivers/media/video/saa7134/saa7134-vbi.c
index f4aee0af80..f38366a470 100644
--- a/drivers/media/video/saa7134/saa7134-vbi.c
+++ b/drivers/media/video/saa7134/saa7134-vbi.c
@@ -135,7 +135,7 @@ static int buffer_prepare(struct videobuf_queue *q,
                 return -EINVAL;
 
         if (buf->vb.size != size)
-                saa7134_dma_free(dev,buf);
+                saa7134_dma_free(q,buf);
 
         if (STATE_NEEDS_INIT == buf->vb.state) {
                 buf->vb.width  = llength;
@@ -143,7 +143,7 @@ static int buffer_prepare(struct videobuf_queue *q,
                 buf->vb.size   = size;
                 buf->pt        = &fh->pt_vbi;
 
-                err = videobuf_iolock(dev->pci,&buf->vb,NULL);
+                err = videobuf_iolock(q,&buf->vb,NULL);
                 if (err)
                         goto oops;
                 err = saa7134_pgtable_build(dev->pci,buf->pt,
@@ -159,7 +159,7 @@ static int buffer_prepare(struct videobuf_queue *q,
         return 0;
 
  oops:
-        saa7134_dma_free(dev,buf);
+        saa7134_dma_free(q,buf);
         return err;
 }
 
@@ -190,11 +190,9 @@ static void buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
 
 static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
 {
-        struct saa7134_fh *fh   = q->priv_data;
-        struct saa7134_dev *dev = fh->dev;
         struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);
 
-        saa7134_dma_free(dev,buf);
+        saa7134_dma_free(q,buf);
 }
 
 struct videobuf_queue_ops saa7134_vbi_qops = {
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 57a11e71d9..aeef80f88a 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -993,7 +993,7 @@ static int buffer_prepare(struct videobuf_queue *q,
             buf->vb.size   != size       ||
             buf->vb.field  != field      ||
             buf->fmt       != fh->fmt) {
-                saa7134_dma_free(dev,buf);
+                saa7134_dma_free(q,buf);
         }
 
         if (STATE_NEEDS_INIT == buf->vb.state) {
@@ -1004,7 +1004,7 @@ static int buffer_prepare(struct videobuf_queue *q,
                 buf->fmt       = fh->fmt;
                 buf->pt        = &fh->pt_cap;
 
-                err = videobuf_iolock(dev->pci,&buf->vb,&dev->ovbuf);
+                err = videobuf_iolock(q,&buf->vb,&dev->ovbuf);
                 if (err)
                         goto oops;
                 err = saa7134_pgtable_build(dev->pci,buf->pt,
@@ -1019,7 +1019,7 @@ static int buffer_prepare(struct videobuf_queue *q,
         return 0;
 
  oops:
-        saa7134_dma_free(dev,buf);
+        saa7134_dma_free(q,buf);
         return err;
 }
 
@@ -1045,10 +1045,9 @@ static void buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
 
 static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
 {
-        struct saa7134_fh *fh = q->priv_data;
         struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);
 
-        saa7134_dma_free(fh->dev,buf);
+        saa7134_dma_free(q,buf);
 }
 
 static struct videobuf_queue_ops video_qops = {
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index ce1c2e0b06..31ba293854 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -34,7 +34,6 @@
 #include <asm/io.h>
 
 #include <media/tuner.h>
-#include <media/audiochip.h>
 #include <media/ir-common.h>
 #include <media/ir-kbd-i2c.h>
 #include <media/video-buf.h>
@@ -579,7 +578,7 @@ void saa7134_buffer_finish(struct saa7134_dev *dev, struct saa7134_dmaqueue *q,
                            unsigned int state);
 void saa7134_buffer_next(struct saa7134_dev *dev, struct saa7134_dmaqueue *q);
 void saa7134_buffer_timeout(unsigned long data);
-void saa7134_dma_free(struct saa7134_dev *dev,struct saa7134_buf *buf);
+void saa7134_dma_free(struct videobuf_queue *q,struct saa7134_buf *buf);
 
 int saa7134_set_dmabits(struct saa7134_dev *dev);
 
diff --git a/drivers/media/video/saa7146.h b/drivers/media/video/saa7146.h
index 756963f01b..2830b5e33a 100644
--- a/drivers/media/video/saa7146.h
+++ b/drivers/media/video/saa7146.h
@@ -1,7 +1,7 @@
-/*  
+/*
     saa7146.h - definitions philips saa7146 based cards
     Copyright (C) 1999 Nathan Laredo (laredo@gnu.org)
-    
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
@@ -27,7 +27,7 @@
 
 #include <linux/videodev.h>
 
-#ifndef O_NONCAP  
+#ifndef O_NONCAP
 #define O_NONCAP        O_TRUNC
 #endif
 
@@ -36,7 +36,7 @@
 
 #ifdef __KERNEL__
 
-struct saa7146_window 
+struct saa7146_window
 {
         int x, y;
         ushort width, height;
@@ -70,7 +70,7 @@ struct saa7146
         int irqstate;           /* irq routine is state driven */
         int writemode;
         int playmode;
-        unsigned int nr;
+        unsigned int nr;
         unsigned long irq;          /* IRQ used by SAA7146 card */
         unsigned short id;
         unsigned char revision;
diff --git a/drivers/media/video/saa7146reg.h b/drivers/media/video/saa7146reg.h
index 6cc910f50a..80ec2c146b 100644
--- a/drivers/media/video/saa7146reg.h
+++ b/drivers/media/video/saa7146reg.h
@@ -1,7 +1,7 @@
-/*  
+/*
     saa7146.h - definitions philips saa7146 based cards
     Copyright (C) 1999 Nathan Laredo (laredo@gnu.org)
-    
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index 9f99ee1303..9c30841085 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * saa7185 - Philips SAA7185B video encoder driver version 0.0.3
  *
  * Copyright (C) 1998 Dave Perks <dperks@ibm.net>
@@ -377,7 +377,7 @@ saa7185_command (struct i2c_client *client,
 static unsigned short normal_i2c[] = { I2C_SAA7185 >> 1, I2C_CLIENT_END };
 
 static unsigned short ignore = I2C_CLIENT_END;
-                                                                                
+
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
diff --git a/drivers/media/video/saa7196.h b/drivers/media/video/saa7196.h
index f92f21cfbc..cd4b6354a7 100644
--- a/drivers/media/video/saa7196.h
+++ b/drivers/media/video/saa7196.h
@@ -2,14 +2,14 @@
     Definitions for the Philips SAA7196 digital video decoder,
     scaler, and clock generator circuit (DESCpro), as used in
     the PlanB video input of the Powermac 7x00/8x00 series.
-  
+
     Copyright (C) 1998 Michel Lanners (mlan@cpu.lu)
 
     The register defines are shamelessly copied from the meteor
     driver out of NetBSD (with permission),
     and are copyrighted (c) 1995 Mark Tinguely and Jim Lowe
     (Thanks !)
-  
+
     Additional debugging and coding by Takashi Oe (toe@unlinfo.unl.edu)
 
     The default values used for PlanB are my mistakes.
diff --git a/drivers/usb/media/se401.c b/drivers/media/video/se401.c
index f03ea7f895..a846ebc78c 100644
--- a/drivers/usb/media/se401.c
+++ b/drivers/media/video/se401.c
@@ -4,7 +4,7 @@
  * Copyright (c) 2000 Jeroen B. Vreeken (pe1rxq@amsat.org)
  *
  * Still somewhat based on the Linux ov511 driver.
- * 
+ *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
  * Free Software Foundation; either version 2 of the License, or (at your
@@ -114,16 +114,16 @@ static int se401_sndctrl(int set, struct usb_se401 *se401, unsigned short req,
                          unsigned short value, unsigned char *cp, int size)
 {
         return usb_control_msg (
-                se401->dev,
-                set ? usb_sndctrlpipe(se401->dev, 0) : usb_rcvctrlpipe(se401->dev, 0),
-                req,
-                (set ? USB_DIR_OUT : USB_DIR_IN) | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                value,
-                0,
-                cp,
-                size,
-                1000
-        );
+                se401->dev,
+                set ? usb_sndctrlpipe(se401->dev, 0) : usb_rcvctrlpipe(se401->dev, 0),
+                req,
+                (set ? USB_DIR_OUT : USB_DIR_IN) | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                value,
+                0,
+                cp,
+                size,
+                1000
+        );
 }
 
 static int se401_set_feature(struct usb_se401 *se401, unsigned short selector,
@@ -140,30 +140,30 @@ static int se401_set_feature(struct usb_se401 *se401, unsigned short selector,
                 USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
                 param,
                 selector,
-                NULL,
-                0,
-                1000
-        );
+                NULL,
+                0,
+                1000
+        );
 }
 
-static unsigned short se401_get_feature(struct usb_se401 *se401, 
-                                        unsigned short selector)
+static unsigned short se401_get_feature(struct usb_se401 *se401,
+                                        unsigned short selector)
 {
         /* For 'set' the selecetor should be in index, not sure if the spec is
            wrong here to....
          */
         unsigned char cp[2];
-        usb_control_msg (
-                se401->dev,
-                usb_rcvctrlpipe(se401->dev, 0),
-                SE401_REQ_GET_EXT_FEATURE,
-                USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                0,
-                selector,
-                cp,
-                2,
-                1000
-        );
+        usb_control_msg (
+                se401->dev,
+                usb_rcvctrlpipe(se401->dev, 0),
+                SE401_REQ_GET_EXT_FEATURE,
+                USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                0,
+                selector,
+                cp,
+                2,
+                1000
+        );
         return cp[0]+cp[1]*256;
 }
 
@@ -183,14 +183,14 @@ static int se401_send_pict(struct usb_se401 *se401)
         se401_set_feature(se401, HV7131_REG_ARCG, se401->rgain);/* red color gain */
         se401_set_feature(se401, HV7131_REG_AGCG, se401->ggain);/* green color gain */
         se401_set_feature(se401, HV7131_REG_ABCG, se401->bgain);/* blue color gain */
-                
+
         return 0;
 }
 
 static void se401_set_exposure(struct usb_se401 *se401, int brightness)
 {
         int integration=brightness<<5;
-        
+
         if (flickerless==50) {
                 integration=integration-integration%106667;
         }
@@ -255,11 +255,11 @@ static void se401_auto_resetlevel(struct usb_se401 *se401)
         /* For some reason this normally read-only register doesn't get reset
            to zero after reading them just once...
          */
-        se401_get_feature(se401, HV7131_REG_HIREFNOH); 
+        se401_get_feature(se401, HV7131_REG_HIREFNOH);
         se401_get_feature(se401, HV7131_REG_HIREFNOL);
         se401_get_feature(se401, HV7131_REG_LOREFNOH);
         se401_get_feature(se401, HV7131_REG_LOREFNOL);
-        ahrc=256*se401_get_feature(se401, HV7131_REG_HIREFNOH) + 
+        ahrc=256*se401_get_feature(se401, HV7131_REG_HIREFNOH) +
             se401_get_feature(se401, HV7131_REG_HIREFNOL);
         alrc=256*se401_get_feature(se401, HV7131_REG_LOREFNOH) +
             se401_get_feature(se401, HV7131_REG_LOREFNOL);
@@ -287,12 +287,12 @@ static void se401_button_irq(struct urb *urb, struct pt_regs *regs)
 {
         struct usb_se401 *se401 = urb->context;
         int status;
-        
+
         if (!se401->dev) {
                 info("ohoh: device vapourished");
                 return;
         }
-        
+
         switch (urb->status) {
         case 0:
                 /* success */
@@ -368,7 +368,7 @@ static void se401_video_irq(struct urb *urb, struct pt_regs *regs)
                 if (se401->nullpackets > SE401_MAX_NULLPACKETS) {
                         if (waitqueue_active(&se401->wq)) {
                                 wake_up_interruptible(&se401->wq);
-                        }               
+                        }
                 }
         }
 
@@ -433,8 +433,8 @@ static int se401_start_stream(struct usb_se401 *se401)
         int err=0, i;
         se401->streaming=1;
 
-        se401_sndctrl(1, se401, SE401_REQ_CAMERA_POWER, 1, NULL, 0);
-        se401_sndctrl(1, se401, SE401_REQ_LED_CONTROL, 1, NULL, 0);
+        se401_sndctrl(1, se401, SE401_REQ_CAMERA_POWER, 1, NULL, 0);
+        se401_sndctrl(1, se401, SE401_REQ_LED_CONTROL, 1, NULL, 0);
 
         /* Set picture settings */
         se401_set_feature(se401, HV7131_REG_MODE_B, 0x05);/*windowed + pix intg */
@@ -571,7 +571,7 @@ static inline void decode_JangGu_integrate(struct usb_se401 *se401, int data)
         }
 
         /* First three are absolute, all others relative.
-         * Format is rgb from right to left (mirrorred image), 
+         * Format is rgb from right to left (mirrorred image),
          * we flip it to get bgr from left to right. */
         if (frame->curlinepix < 3) {
                 *(frame->curline-frame->curlinepix)=1+data*4;
@@ -703,7 +703,7 @@ static inline void decode_bayer (struct usb_se401 *se401, struct se401_scratch *
         int width=se401->cwidth;
         int blineoffset=0, bline;
         int linelength=width*3, i;
-        
+
 
         if (frame->curpix==0) {
                 if (frame->grabstate==FRAME_READY) {
@@ -831,7 +831,7 @@ static int se401_newframe(struct usb_se401 *se401, int framenr)
                         se401->nullpackets=0;
                         info("to many null length packets, restarting capture");
                         se401_stop_stream(se401);
-                        se401_start_stream(se401);                      
+                        se401_start_stream(se401);
                 } else {
                         if (se401->scratch[se401->scratch_use].state!=BUFFER_READY) {
                                 se401->frame[framenr].grabstate=FRAME_ERROR;
@@ -866,7 +866,7 @@ static void usb_se401_remove_disconnected (struct usb_se401 *se401)
 {
         int i;
 
-        se401->dev = NULL;
+        se401->dev = NULL;
 
         for (i=0; i<SE401_NUMSBUF; i++)
                 if (se401->urb[i]) {
@@ -882,9 +882,9 @@ static void usb_se401_remove_disconnected (struct usb_se401 *se401)
                 usb_kill_urb(se401->inturb);
                 usb_free_urb(se401->inturb);
         }
-        info("%s disconnected", se401->camera_name);
+        info("%s disconnected", se401->camera_name);
 
-        /* Free the memory */
+        /* Free the memory */
         kfree(se401->width);
         kfree(se401->height);
         kfree(se401);
@@ -910,7 +910,7 @@ static int se401_open(struct inode *inode, struct file *file)
         se401->fbuf = rvmalloc(se401->maxframesize * SE401_NUMFRAMES);
         if (se401->fbuf)
                 file->private_data = dev;
-        else 
+        else
                 err = -ENOMEM;
         se401->user = !err;
 
@@ -920,11 +920,11 @@ static int se401_open(struct inode *inode, struct file *file)
 static int se401_close(struct inode *inode, struct file *file)
 {
         struct video_device *dev = file->private_data;
-        struct usb_se401 *se401 = (struct usb_se401 *)dev;
+        struct usb_se401 *se401 = (struct usb_se401 *)dev;
         int i;
 
         rvfree(se401->fbuf, se401->maxframesize * SE401_NUMFRAMES);
-        if (se401->removed) {
+        if (se401->removed) {
                 usb_se401_remove_disconnected(se401);
                 info("device unregistered");
         } else {
@@ -942,12 +942,12 @@ static int se401_do_ioctl(struct inode *inode, struct file *file,
                           unsigned int cmd, void *arg)
 {
         struct video_device *vdev = file->private_data;
-        struct usb_se401 *se401 = (struct usb_se401 *)vdev;
+        struct usb_se401 *se401 = (struct usb_se401 *)vdev;
 
-        if (!se401->dev)
-                return -EIO;
+        if (!se401->dev)
+                return -EIO;
 
-        switch (cmd) {
+        switch (cmd) {
         case VIDIOCGCAP:
         {
                 struct video_capability *b = arg;
@@ -981,8 +981,8 @@ static int se401_do_ioctl(struct inode *inode, struct file *file,
                         return -EINVAL;
                 return 0;
         }
-        case VIDIOCGPICT:
-        {
+        case VIDIOCGPICT:
+        {
                 struct video_picture *p = arg;
 
                 se401_get_pict(se401, p);
@@ -1007,7 +1007,7 @@ static int se401_do_ioctl(struct inode *inode, struct file *file,
                 if (se401_set_size(se401, vw->width, vw->height))
                         return -EINVAL;
                 return 0;
-        }
+        }
         case VIDIOCGWIN:
         {
                 struct video_window *vw = arg;
@@ -1095,11 +1095,11 @@ static int se401_do_ioctl(struct inode *inode, struct file *file,
         case VIDIOCGAUDIO:
         case VIDIOCSAUDIO:
                 return -EINVAL;
-        default:
-                return -ENOIOCTLCMD;
-        } /* end switch */
+        default:
+                return -ENOIOCTLCMD;
+        } /* end switch */
 
-        return 0;
+        return 0;
 }
 
 static int se401_ioctl(struct inode *inode, struct file *file,
@@ -1142,7 +1142,7 @@ static ssize_t se401_read(struct file *file, char __user *buf,
 
         se401->frame[0].grabstate=FRAME_UNUSED;
         if (ret)
-                return ret;     
+                return ret;
         if (copy_to_user(buf, se401->frame[0].data, realcount))
                 return -EFAULT;
 
@@ -1183,24 +1183,24 @@ static int se401_mmap(struct file *file, struct vm_area_struct *vma)
         }
         mutex_unlock(&se401->lock);
 
-        return 0;
+        return 0;
 }
 
 static struct file_operations se401_fops = {
         .owner =        THIS_MODULE,
-        .open =         se401_open,
-        .release =      se401_close,
-        .read =         se401_read,
-        .mmap =         se401_mmap,
+        .open =         se401_open,
+        .release =      se401_close,
+        .read =         se401_read,
+        .mmap =         se401_mmap,
         .ioctl =        se401_ioctl,
         .compat_ioctl = v4l_compat_ioctl32,
         .llseek =       no_llseek,
 };
 static struct video_device se401_template = {
         .owner =        THIS_MODULE,
-        .name =         "se401 USB camera",
-        .type =         VID_TYPE_CAPTURE,
-        .hardware =     VID_HARDWARE_SE401,
+        .name =         "se401 USB camera",
+        .type =         VID_TYPE_CAPTURE,
+        .hardware =     VID_HARDWARE_SE401,
         .fops =         &se401_fops,
 };
 
@@ -1209,12 +1209,12 @@ static struct video_device se401_template = {
 /***************************/
 static int se401_init(struct usb_se401 *se401, int button)
 {
-        int i=0, rc;
-        unsigned char cp[0x40];
+        int i=0, rc;
+        unsigned char cp[0x40];
         char temp[200];
 
         /* led on */
-        se401_sndctrl(1, se401, SE401_REQ_LED_CONTROL, 1, NULL, 0);
+        se401_sndctrl(1, se401, SE401_REQ_LED_CONTROL, 1, NULL, 0);
 
         /* get camera descriptor */
         rc=se401_sndctrl(0, se401, SE401_REQ_GET_CAMERA_DESCRIPTOR, 0, cp, sizeof(cp));
@@ -1254,7 +1254,7 @@ static int se401_init(struct usb_se401 *se401, int button)
                 return 1;
         }
         /* set output mode (BAYER) */
-        se401_sndctrl(1, se401, SE401_REQ_SET_OUTPUT_MODE, SE401_FORMAT_BAYER, NULL, 0);
+        se401_sndctrl(1, se401, SE401_REQ_SET_OUTPUT_MODE, SE401_FORMAT_BAYER, NULL, 0);
 
         rc=se401_sndctrl(0, se401, SE401_REQ_GET_BRT, 0, cp, sizeof(cp));
         se401->brightness=cp[0]+cp[1]*256;
@@ -1292,71 +1292,71 @@ static int se401_init(struct usb_se401 *se401, int button)
         } else
                 se401->inturb=NULL;
 
-        /* Flash the led */
-        se401_sndctrl(1, se401, SE401_REQ_CAMERA_POWER, 1, NULL, 0);
-        se401_sndctrl(1, se401, SE401_REQ_LED_CONTROL, 1, NULL, 0);
-        se401_sndctrl(1, se401, SE401_REQ_CAMERA_POWER, 0, NULL, 0);
+        /* Flash the led */
+        se401_sndctrl(1, se401, SE401_REQ_CAMERA_POWER, 1, NULL, 0);
+        se401_sndctrl(1, se401, SE401_REQ_LED_CONTROL, 1, NULL, 0);
+        se401_sndctrl(1, se401, SE401_REQ_CAMERA_POWER, 0, NULL, 0);
         se401_sndctrl(1, se401, SE401_REQ_LED_CONTROL, 0, NULL, 0);
 
-        return 0;
+        return 0;
 }
 
 static int se401_probe(struct usb_interface *intf,
         const struct usb_device_id *id)
 {
         struct usb_device *dev = interface_to_usbdev(intf);
-        struct usb_interface_descriptor *interface;
-        struct usb_se401 *se401;
-        char *camera_name=NULL;
+        struct usb_interface_descriptor *interface;
+        struct usb_se401 *se401;
+        char *camera_name=NULL;
         int button=1;
 
-        /* We don't handle multi-config cameras */
-        if (dev->descriptor.bNumConfigurations != 1)
-                return -ENODEV;
+        /* We don't handle multi-config cameras */
+        if (dev->descriptor.bNumConfigurations != 1)
+                return -ENODEV;
 
-        interface = &intf->cur_altsetting->desc;
+        interface = &intf->cur_altsetting->desc;
 
-        /* Is it an se401? */
-        if (le16_to_cpu(dev->descriptor.idVendor) == 0x03e8 &&
-            le16_to_cpu(dev->descriptor.idProduct) == 0x0004) {
-                camera_name="Endpoints/Aox SE401";
-        } else if (le16_to_cpu(dev->descriptor.idVendor) == 0x0471 &&
-            le16_to_cpu(dev->descriptor.idProduct) == 0x030b) {
-                camera_name="Philips PCVC665K";
-        } else if (le16_to_cpu(dev->descriptor.idVendor) == 0x047d &&
+        /* Is it an se401? */
+        if (le16_to_cpu(dev->descriptor.idVendor) == 0x03e8 &&
+            le16_to_cpu(dev->descriptor.idProduct) == 0x0004) {
+                camera_name="Endpoints/Aox SE401";
+        } else if (le16_to_cpu(dev->descriptor.idVendor) == 0x0471 &&
+            le16_to_cpu(dev->descriptor.idProduct) == 0x030b) {
+                camera_name="Philips PCVC665K";
+        } else if (le16_to_cpu(dev->descriptor.idVendor) == 0x047d &&
             le16_to_cpu(dev->descriptor.idProduct) == 0x5001) {
                 camera_name="Kensington VideoCAM 67014";
-        } else if (le16_to_cpu(dev->descriptor.idVendor) == 0x047d &&
+        } else if (le16_to_cpu(dev->descriptor.idVendor) == 0x047d &&
             le16_to_cpu(dev->descriptor.idProduct) == 0x5002) {
                 camera_name="Kensington VideoCAM 6701(5/7)";
-        } else if (le16_to_cpu(dev->descriptor.idVendor) == 0x047d &&
+        } else if (le16_to_cpu(dev->descriptor.idVendor) == 0x047d &&
             le16_to_cpu(dev->descriptor.idProduct) == 0x5003) {
                 camera_name="Kensington VideoCAM 67016";
                 button=0;
         } else
                 return -ENODEV;
 
-        /* Checking vendor/product should be enough, but what the hell */
-        if (interface->bInterfaceClass != 0x00)
+        /* Checking vendor/product should be enough, but what the hell */
+        if (interface->bInterfaceClass != 0x00)
                 return -ENODEV;
-        if (interface->bInterfaceSubClass != 0x00)
+        if (interface->bInterfaceSubClass != 0x00)
                 return -ENODEV;
 
-        /* We found one */
-        info("SE401 camera found: %s", camera_name);
+        /* We found one */
+        info("SE401 camera found: %s", camera_name);
 
-        if ((se401 = kzalloc(sizeof(*se401), GFP_KERNEL)) == NULL) {
-                err("couldn't kmalloc se401 struct");
+        if ((se401 = kzalloc(sizeof(*se401), GFP_KERNEL)) == NULL) {
+                err("couldn't kmalloc se401 struct");
                 return -ENOMEM;
-        }
+        }
 
-        se401->dev = dev;
-        se401->iface = interface->bInterfaceNumber;
-        se401->camera_name = camera_name;
+        se401->dev = dev;
+        se401->iface = interface->bInterfaceNumber;
+        se401->camera_name = camera_name;
 
         info("firmware version: %02x", le16_to_cpu(dev->descriptor.bcdDevice) & 255);
 
-        if (se401_init(se401, button)) {
+        if (se401_init(se401, button)) {
                 kfree(se401);
                 return -EIO;
         }
@@ -1375,7 +1375,7 @@ static int se401_probe(struct usb_interface *intf,
         info("registered new video device: video%d", se401->vdev.minor);
 
         usb_set_intfdata (intf, se401);
-        return 0;
+        return 0;
 }
 
 static void se401_disconnect(struct usb_interface *intf)
@@ -1400,10 +1400,10 @@ static void se401_disconnect(struct usb_interface *intf)
 }
 
 static struct usb_driver se401_driver = {
-        .name           = "se401",
-        .id_table       = device_table,
+        .name           = "se401",
+        .id_table       = device_table,
         .probe          = se401_probe,
-        .disconnect     = se401_disconnect,
+        .disconnect     = se401_disconnect,
 };
 
 
diff --git a/drivers/usb/media/se401.h b/drivers/media/video/se401.h
index e88a40d4c8..a7a216bd44 100644
--- a/drivers/usb/media/se401.h
+++ b/drivers/media/video/se401.h
@@ -177,7 +177,7 @@ struct usb_se401 {
         int expose_m;
         int expose_l;
         int resetlevel;
-        
+
         int enhance;
 
         int format;
@@ -200,12 +200,12 @@ struct usb_se401 {
 
         struct urb *urb[SE401_NUMSBUF];
         struct urb *inturb;
-        
+
         int button;
         int buttonpressed;
 
         int curframe;           /* Current receiving frame */
-        struct se401_frame frame[SE401_NUMFRAMES];      
+        struct se401_frame frame[SE401_NUMFRAMES];
         int readcount;
         int framecount;
         int error;
diff --git a/drivers/media/video/sn9c102/Makefile b/drivers/media/video/sn9c102/Makefile
new file mode 100644
index 0000000000..536ad3098d
--- /dev/null
+++ b/drivers/media/video/sn9c102/Makefile
@@ -0,0 +1,7 @@
+sn9c102-objs    := sn9c102_core.o sn9c102_hv7131d.o sn9c102_mi0343.o \
+                   sn9c102_ov7630.o sn9c102_pas106b.o sn9c102_pas202bca.o \
+                   sn9c102_pas202bcb.o sn9c102_tas5110c1b.o \
+                   sn9c102_tas5130d1b.o
+
+obj-$(CONFIG_USB_SN9C102)       += sn9c102.o
+
diff --git a/drivers/usb/media/sn9c102.h b/drivers/media/video/sn9c102/sn9c102.h
index 1d70a62b9f..2c6ff396da 100644
--- a/drivers/usb/media/sn9c102.h
+++ b/drivers/media/video/sn9c102/sn9c102.h
@@ -164,7 +164,7 @@ sn9c102_match_id(struct sn9c102_device* cam, const struct usb_device_id *id)
 
 void
 sn9c102_attach_sensor(struct sn9c102_device* cam,
-                      struct sn9c102_sensor* sensor)
+                      struct sn9c102_sensor* sensor)
 {
         memcpy(&cam->sensor, sensor, sizeof(struct sn9c102_sensor));
 }
@@ -183,7 +183,7 @@ do {                                                                          \
                         dev_info(&cam->usbdev->dev, fmt "\n", ## args);       \
                 else if ((level) >= 3)                                        \
                         dev_info(&cam->usbdev->dev, "[%s:%d] " fmt "\n",      \
-                                 __FUNCTION__, __LINE__ , ## args);           \
+                                 __FUNCTION__, __LINE__ , ## args);           \
         }                                                                     \
 } while (0)
 #       define V4LDBG(level, name, cmd)                                       \
@@ -198,7 +198,7 @@ do {                                                                          \
                         pr_info("sn9c102: " fmt "\n", ## args);               \
                 else if ((level) == 3)                                        \
                         pr_debug("sn9c102: [%s:%d] " fmt "\n", __FUNCTION__,  \
-                                 __LINE__ , ## args);                         \
+                                 __LINE__ , ## args);                         \
         }                                                                     \
 } while (0)
 #else
@@ -210,7 +210,7 @@ do {                                                                          \
 #undef PDBG
 #define PDBG(fmt, args...)                                                    \
 dev_info(&cam->usbdev->dev, "[%s:%d] " fmt "\n",                              \
-         __FUNCTION__, __LINE__ , ## args)
+         __FUNCTION__, __LINE__ , ## args)
 
 #undef PDBGG
 #define PDBGG(fmt, args...) do {;} while(0) /* placeholder */
diff --git a/drivers/usb/media/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 4c6cc63957..ea4394dc94 100644
--- a/drivers/usb/media/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -62,53 +62,53 @@ MODULE_LICENSE(SN9C102_MODULE_LICENSE);
 static short video_nr[] = {[0 ... SN9C102_MAX_DEVICES-1] = -1};
 module_param_array(video_nr, short, NULL, 0444);
 MODULE_PARM_DESC(video_nr,
-                 "\n<-1|n[,...]> Specify V4L2 minor mode number."
-                 "\n -1 = use next available (default)"
-                 "\n  n = use minor number n (integer >= 0)"
-                 "\nYou can specify up to "__MODULE_STRING(SN9C102_MAX_DEVICES)
-                 " cameras this way."
-                 "\nFor example:"
-                 "\nvideo_nr=-1,2,-1 would assign minor number 2 to"
-                 "\nthe second camera and use auto for the first"
-                 "\none and for every other camera."
-                 "\n");
-
-static short force_munmap[] = {[0 ... SN9C102_MAX_DEVICES-1] = 
-                               SN9C102_FORCE_MUNMAP};
+                 "\n<-1|n[,...]> Specify V4L2 minor mode number."
+                 "\n -1 = use next available (default)"
+                 "\n  n = use minor number n (integer >= 0)"
+                 "\nYou can specify up to "__MODULE_STRING(SN9C102_MAX_DEVICES)
+                 " cameras this way."
+                 "\nFor example:"
+                 "\nvideo_nr=-1,2,-1 would assign minor number 2 to"
+                 "\nthe second camera and use auto for the first"
+                 "\none and for every other camera."
+                 "\n");
+
+static short force_munmap[] = {[0 ... SN9C102_MAX_DEVICES-1] =
+                               SN9C102_FORCE_MUNMAP};
 module_param_array(force_munmap, bool, NULL, 0444);
 MODULE_PARM_DESC(force_munmap,
-                 "\n<0|1[,...]> Force the application to unmap previously"
-                 "\nmapped buffer memory before calling any VIDIOC_S_CROP or"
-                 "\nVIDIOC_S_FMT ioctl's. Not all the applications support"
-                 "\nthis feature. This parameter is specific for each"
-                 "\ndetected camera."
-                 "\n 0 = do not force memory unmapping"
-                 "\n 1 = force memory unmapping (save memory)"
-                 "\nDefault value is "__MODULE_STRING(SN9C102_FORCE_MUNMAP)"."
-                 "\n");
+                 "\n<0|1[,...]> Force the application to unmap previously"
+                 "\nmapped buffer memory before calling any VIDIOC_S_CROP or"
+                 "\nVIDIOC_S_FMT ioctl's. Not all the applications support"
+                 "\nthis feature. This parameter is specific for each"
+                 "\ndetected camera."
+                 "\n 0 = do not force memory unmapping"
+                 "\n 1 = force memory unmapping (save memory)"
+                 "\nDefault value is "__MODULE_STRING(SN9C102_FORCE_MUNMAP)"."
+                 "\n");
 
 static unsigned int frame_timeout[] = {[0 ... SN9C102_MAX_DEVICES-1] =
-                                       SN9C102_FRAME_TIMEOUT};
+                                       SN9C102_FRAME_TIMEOUT};
 module_param_array(frame_timeout, uint, NULL, 0644);
 MODULE_PARM_DESC(frame_timeout,
-                 "\n<n[,...]> Timeout for a video frame in seconds."
-                 "\nThis parameter is specific for each detected camera."
-                 "\nDefault value is "__MODULE_STRING(SN9C102_FRAME_TIMEOUT)"."
-                 "\n");
+                 "\n<n[,...]> Timeout for a video frame in seconds."
+                 "\nThis parameter is specific for each detected camera."
+                 "\nDefault value is "__MODULE_STRING(SN9C102_FRAME_TIMEOUT)"."
+                 "\n");
 
 #ifdef SN9C102_DEBUG
 static unsigned short debug = SN9C102_DEBUG_LEVEL;
 module_param(debug, ushort, 0644);
 MODULE_PARM_DESC(debug,
-                 "\n<n> Debugging information level, from 0 to 3:"
-                 "\n0 = none (use carefully)"
-                 "\n1 = critical errors"
-                 "\n2 = significant informations"
-                 "\n3 = more verbose messages"
-                 "\nLevel 3 is useful for testing only, when only "
-                 "one device is used."
-                 "\nDefault value is "__MODULE_STRING(SN9C102_DEBUG_LEVEL)"."
-                 "\n");
+                 "\n<n> Debugging information level, from 0 to 3:"
+                 "\n0 = none (use carefully)"
+                 "\n1 = critical errors"
+                 "\n2 = significant informations"
+                 "\n3 = more verbose messages"
+                 "\nLevel 3 is useful for testing only, when only "
+                 "one device is used."
+                 "\nDefault value is "__MODULE_STRING(SN9C102_DEBUG_LEVEL)"."
+                 "\n");
 #endif
 
 /*****************************************************************************/
@@ -131,16 +131,16 @@ static sn9c102_eof_header_t sn9c102_eof_header[] = {
 
 /*****************************************************************************/
 
-static u32 
-sn9c102_request_buffers(struct sn9c102_device* cam, u32 count, 
-                        enum sn9c102_io_method io)
+static u32
+sn9c102_request_buffers(struct sn9c102_device* cam, u32 count,
+                        enum sn9c102_io_method io)
 {
         struct v4l2_pix_format* p = &(cam->sensor.pix_format);
         struct v4l2_rect* r = &(cam->sensor.cropcap.bounds);
         const size_t imagesize = cam->module_param.force_munmap ||
-                                 io == IO_READ ?
-                                 (p->width * p->height * p->priv) / 8 :
-                                 (r->width * r->height * p->priv) / 8;
+                                 io == IO_READ ?
+                                 (p->width * p->height * p->priv) / 8 :
+                                 (r->width * r->height * p->priv) / 8;
         void* buff = NULL;
         u32 i;
 
@@ -232,8 +232,8 @@ int sn9c102_write_regs(struct sn9c102_device* cam, u8* buff, u16 index)
                 return -1;
 
         res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x08, 0x41,
-                              index, 0, buff, sizeof(buff),
-                              SN9C102_CTRL_TIMEOUT*sizeof(buff));
+                              index, 0, buff, sizeof(buff),
+                              SN9C102_CTRL_TIMEOUT*sizeof(buff));
         if (res < 0) {
                 DBG(3, "Failed to write registers (index 0x%02X, error %d)",
                     index, res);
@@ -259,7 +259,7 @@ int sn9c102_write_reg(struct sn9c102_device* cam, u8 value, u16 index)
         *buff = value;
 
         res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x08, 0x41,
-                              index, 0, buff, 1, SN9C102_CTRL_TIMEOUT);
+                              index, 0, buff, 1, SN9C102_CTRL_TIMEOUT);
         if (res < 0) {
                 DBG(3, "Failed to write a register (value 0x%02X, index "
                        "0x%02X, error %d)", value, index, res);
@@ -280,7 +280,7 @@ static int sn9c102_read_reg(struct sn9c102_device* cam, u16 index)
         int res;
 
         res = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x00, 0xc1,
-                              index, 0, buff, 1, SN9C102_CTRL_TIMEOUT);
+                              index, 0, buff, 1, SN9C102_CTRL_TIMEOUT);
         if (res < 0)
                 DBG(3, "Failed to read a register (index 0x%02X, error %d)",
                     index, res);
@@ -319,8 +319,8 @@ sn9c102_i2c_wait(struct sn9c102_device* cam, struct sn9c102_sensor* sensor)
 
 
 static int
-sn9c102_i2c_detect_read_error(struct sn9c102_device* cam, 
-                              struct sn9c102_sensor* sensor)
+sn9c102_i2c_detect_read_error(struct sn9c102_device* cam,
+                              struct sn9c102_sensor* sensor)
 {
         int r;
         r = sn9c102_read_reg(cam, 0x08);
@@ -329,8 +329,8 @@ sn9c102_i2c_detect_read_error(struct sn9c102_device* cam,
 
 
 static int
-sn9c102_i2c_detect_write_error(struct sn9c102_device* cam, 
-                               struct sn9c102_sensor* sensor)
+sn9c102_i2c_detect_write_error(struct sn9c102_device* cam,
+                               struct sn9c102_sensor* sensor)
 {
         int r;
         r = sn9c102_read_reg(cam, 0x08);
@@ -338,10 +338,10 @@ sn9c102_i2c_detect_write_error(struct sn9c102_device* cam,
 }
 
 
-int 
+int
 sn9c102_i2c_try_raw_read(struct sn9c102_device* cam,
-                         struct sn9c102_sensor* sensor, u8 data0, u8 data1,
-                         u8 n, u8 buffer[])
+                         struct sn9c102_sensor* sensor, u8 data0, u8 data1,
+                         u8 n, u8 buffer[])
 {
         struct usb_device* udev = cam->usbdev;
         u8* data = cam->control_buffer;
@@ -349,12 +349,12 @@ sn9c102_i2c_try_raw_read(struct sn9c102_device* cam,
 
         /* Write cycle */
         data[0] = ((sensor->interface == SN9C102_I2C_2WIRES) ? 0x80 : 0) |
-                  ((sensor->frequency & SN9C102_I2C_400KHZ) ? 0x01 : 0) | 0x10;
+                  ((sensor->frequency & SN9C102_I2C_400KHZ) ? 0x01 : 0) | 0x10;
         data[1] = data0; /* I2C slave id */
         data[2] = data1; /* address */
         data[7] = 0x10;
         res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x08, 0x41,
-                              0x08, 0, data, 8, SN9C102_CTRL_TIMEOUT);
+                              0x08, 0, data, 8, SN9C102_CTRL_TIMEOUT);
         if (res < 0)
                 err += res;
 
@@ -362,12 +362,12 @@ sn9c102_i2c_try_raw_read(struct sn9c102_device* cam,
 
         /* Read cycle - n bytes */
         data[0] = ((sensor->interface == SN9C102_I2C_2WIRES) ? 0x80 : 0) |
-                  ((sensor->frequency & SN9C102_I2C_400KHZ) ? 0x01 : 0) |
-                  (n << 4) | 0x02;
+                  ((sensor->frequency & SN9C102_I2C_400KHZ) ? 0x01 : 0) |
+                  (n << 4) | 0x02;
         data[1] = data0;
         data[7] = 0x10;
         res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x08, 0x41,
-                              0x08, 0, data, 8, SN9C102_CTRL_TIMEOUT);
+                              0x08, 0, data, 8, SN9C102_CTRL_TIMEOUT);
         if (res < 0)
                 err += res;
 
@@ -375,7 +375,7 @@ sn9c102_i2c_try_raw_read(struct sn9c102_device* cam,
 
         /* The first read byte will be placed in data[4] */
         res = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x00, 0xc1,
-                              0x0a, 0, data, 5, SN9C102_CTRL_TIMEOUT);
+                              0x0a, 0, data, 5, SN9C102_CTRL_TIMEOUT);
         if (res < 0)
                 err += res;
 
@@ -396,10 +396,10 @@ sn9c102_i2c_try_raw_read(struct sn9c102_device* cam,
 }
 
 
-int 
+int
 sn9c102_i2c_try_raw_write(struct sn9c102_device* cam,
-                          struct sn9c102_sensor* sensor, u8 n, u8 data0,
-                          u8 data1, u8 data2, u8 data3, u8 data4, u8 data5)
+                          struct sn9c102_sensor* sensor, u8 n, u8 data0,
+                          u8 data1, u8 data2, u8 data3, u8 data4, u8 data5)
 {
         struct usb_device* udev = cam->usbdev;
         u8* data = cam->control_buffer;
@@ -407,8 +407,8 @@ sn9c102_i2c_try_raw_write(struct sn9c102_device* cam,
 
         /* Write cycle. It usually is address + value */
         data[0] = ((sensor->interface == SN9C102_I2C_2WIRES) ? 0x80 : 0) |
-                  ((sensor->frequency & SN9C102_I2C_400KHZ) ? 0x01 : 0)
-                  | ((n - 1) << 4);
+                  ((sensor->frequency & SN9C102_I2C_400KHZ) ? 0x01 : 0)
+                  | ((n - 1) << 4);
         data[1] = data0;
         data[2] = data1;
         data[3] = data2;
@@ -417,7 +417,7 @@ sn9c102_i2c_try_raw_write(struct sn9c102_device* cam,
         data[6] = data5;
         data[7] = 0x14;
         res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x08, 0x41,
-                              0x08, 0, data, 8, SN9C102_CTRL_TIMEOUT);
+                              0x08, 0, data, 8, SN9C102_CTRL_TIMEOUT);
         if (res < 0)
                 err += res;
 
@@ -437,20 +437,20 @@ sn9c102_i2c_try_raw_write(struct sn9c102_device* cam,
 
 int
 sn9c102_i2c_try_read(struct sn9c102_device* cam,
-                     struct sn9c102_sensor* sensor, u8 address)
+                     struct sn9c102_sensor* sensor, u8 address)
 {
         return sn9c102_i2c_try_raw_read(cam, sensor, sensor->i2c_slave_id,
-                                        address, 1, NULL);
+                                        address, 1, NULL);
 }
 
 
 int
 sn9c102_i2c_try_write(struct sn9c102_device* cam,
-                      struct sn9c102_sensor* sensor, u8 address, u8 value)
+                      struct sn9c102_sensor* sensor, u8 address, u8 value)
 {
-        return sn9c102_i2c_try_raw_write(cam, sensor, 3, 
-                                         sensor->i2c_slave_id, address,
-                                         value, 0, 0, 0);
+        return sn9c102_i2c_try_raw_write(cam, sensor, 3,
+                                         sensor->i2c_slave_id, address,
+                                         value, 0, 0, 0);
 }
 
 
@@ -484,7 +484,7 @@ sn9c102_find_sof_header(struct sn9c102_device* cam, void* mem, size_t len)
                 n = sizeof(sn9c103_sof_header) / soflen;
         }
 
-        for (i = 0; (len >= soflen) && (i <= len - soflen); i++)
+        for (i = 0; (len >= soflen) && (i <= len - soflen); i++)
                 for (j = 0; j < n; j++)
                         /* The invariable part of the header is 6 bytes long */
                         if ((cam->bridge != BRIDGE_SN9C103 &&
@@ -552,15 +552,15 @@ static void sn9c102_urb_complete(struct urb *urb, struct pt_regs* regs)
 
         if (!(*f))
                 (*f) = list_entry(cam->inqueue.next, struct sn9c102_frame_t,
-                                  frame);
+                                  frame);
 
         imagesize = (cam->sensor.pix_format.width *
-                     cam->sensor.pix_format.height *
-                     cam->sensor.pix_format.priv) / 8;
+                     cam->sensor.pix_format.height *
+                     cam->sensor.pix_format.priv) / 8;
 
         soflen = (cam->bridge) == BRIDGE_SN9C103 ?
-                                  sizeof(sn9c103_sof_header_t) :
-                                  sizeof(sn9c102_sof_header_t);
+                                  sizeof(sn9c103_sof_header_t) :
+                                  sizeof(sn9c102_sof_header_t);
 
         for (i = 0; i < urb->number_of_packets; i++) {
                 unsigned int img, len, status;
@@ -611,19 +611,19 @@ end_of_frame:
 
                                 if ((*f)->buf.bytesused == imagesize ||
                                     (cam->sensor.pix_format.pixelformat ==
-                                                V4L2_PIX_FMT_SN9C10X && eof)) {
+                                                V4L2_PIX_FMT_SN9C10X && eof)) {
                                         u32 b;
                                         b = (*f)->buf.bytesused;
                                         (*f)->state = F_DONE;
                                         (*f)->buf.sequence= ++cam->frame_count;
                                         spin_lock(&cam->queue_lock);
                                         list_move_tail(&(*f)->frame,
-                                                       &cam->outqueue);
+                                                       &cam->outqueue);
                                         if (!list_empty(&cam->inqueue))
                                                 (*f) = list_entry(
-                                                        cam->inqueue.next,
-                                                        struct sn9c102_frame_t,
-                                                        frame );
+                                                        cam->inqueue.next,
+                                                        struct sn9c102_frame_t,
+                                                        frame );
                                         else
                                                 (*f) = NULL;
                                         spin_unlock(&cam->queue_lock);
@@ -638,7 +638,7 @@ end_of_frame:
                                 } else if (eof) {
                                         (*f)->state = F_ERROR;
                                         DBG(3, "Not expected EOF after %lu "
-                                               "bytes of image data", 
+                                               "bytes of image data",
                                             (unsigned long)
                                             ((*f)->buf.bytesused));
                                 }
@@ -676,7 +676,7 @@ start_of_frame:
                                         goto end_of_frame;
                                 } else {
                                         DBG(3, "SOF before expected EOF after "
-                                               "%lu bytes of image data", 
+                                               "%lu bytes of image data",
                                             (unsigned long)
                                             ((*f)->buf.bytesused));
                                         goto start_of_frame;
@@ -702,18 +702,18 @@ static int sn9c102_start_transfer(struct sn9c102_device* cam)
         struct usb_device *udev = cam->usbdev;
         struct urb* urb;
         const unsigned int sn9c102_wMaxPacketSize[] = {0, 128, 256, 384, 512,
-                                                       680, 800, 900, 1023};
+                                                       680, 800, 900, 1023};
         const unsigned int sn9c103_wMaxPacketSize[] = {0, 128, 256, 384, 512,
-                                                       680, 800, 900, 1003};
+                                                       680, 800, 900, 1003};
         const unsigned int psz = (cam->bridge == BRIDGE_SN9C103) ?
-                            sn9c103_wMaxPacketSize[SN9C102_ALTERNATE_SETTING] :
-                            sn9c102_wMaxPacketSize[SN9C102_ALTERNATE_SETTING];
+                            sn9c103_wMaxPacketSize[SN9C102_ALTERNATE_SETTING] :
+                            sn9c102_wMaxPacketSize[SN9C102_ALTERNATE_SETTING];
         s8 i, j;
         int err = 0;
 
         for (i = 0; i < SN9C102_URBS; i++) {
                 cam->transfer_buffer[i] = kzalloc(SN9C102_ISO_PACKETS * psz,
-                                                  GFP_KERNEL);
+                                                  GFP_KERNEL);
                 if (!cam->transfer_buffer[i]) {
                         err = -ENOMEM;
                         DBG(1, "Not enough memory");
@@ -815,9 +815,9 @@ static int sn9c102_stream_interrupt(struct sn9c102_device* cam)
 
         cam->stream = STREAM_INTERRUPT;
         timeout = wait_event_timeout(cam->wait_stream,
-                                     (cam->stream == STREAM_OFF) ||
-                                     (cam->state & DEV_DISCONNECTED),
-                                     SN9C102_URB_TIMEOUT);
+                                     (cam->stream == STREAM_OFF) ||
+                                     (cam->state & DEV_DISCONNECTED),
+                                     SN9C102_URB_TIMEOUT);
         if (cam->state & DEV_DISCONNECTED)
                 return -ENODEV;
         else if (cam->stream != STREAM_OFF) {
@@ -861,7 +861,7 @@ static u8 sn9c102_strtou8(const char* buff, size_t len, ssize_t* count)
 
 /*
    NOTE 1: being inside one of the following methods implies that the v4l
-           device exists for sure (see kobjects and reference counters)
+           device exists for sure (see kobjects and reference counters)
    NOTE 2: buffers are PAGE_SIZE long
 */
 
@@ -884,10 +884,10 @@ static ssize_t sn9c102_show_reg(struct class_device* cd, char* buf)
         mutex_unlock(&sn9c102_sysfs_lock);
 
         return count;
-} 
+}
 
 
-static ssize_t 
+static ssize_t
 sn9c102_store_reg(struct class_device* cd, const char* buf, size_t len)
 {
         struct sn9c102_device* cam;
@@ -947,7 +947,7 @@ static ssize_t sn9c102_show_val(struct class_device* cd, char* buf)
         mutex_unlock(&sn9c102_sysfs_lock);
 
         return count;
-} 
+}
 
 
 static ssize_t
@@ -1013,7 +1013,7 @@ static ssize_t sn9c102_show_i2c_reg(struct class_device* cd, char* buf)
 }
 
 
-static ssize_t 
+static ssize_t
 sn9c102_store_i2c_reg(struct class_device* cd, const char* buf, size_t len)
 {
         struct sn9c102_device* cam;
@@ -1078,7 +1078,7 @@ static ssize_t sn9c102_show_i2c_val(struct class_device* cd, char* buf)
         mutex_unlock(&sn9c102_sysfs_lock);
 
         return count;
-} 
+}
 
 
 static ssize_t
@@ -1222,22 +1222,22 @@ static ssize_t sn9c102_show_frame_header(struct class_device* cd, char* buf)
         DBG(3, "Frame header, read bytes: %zd", count);
 
         return count;
-} 
+}
 
 
 static CLASS_DEVICE_ATTR(reg, S_IRUGO | S_IWUSR,
-                         sn9c102_show_reg, sn9c102_store_reg);
+                         sn9c102_show_reg, sn9c102_store_reg);
 static CLASS_DEVICE_ATTR(val, S_IRUGO | S_IWUSR,
-                         sn9c102_show_val, sn9c102_store_val);
+                         sn9c102_show_val, sn9c102_store_val);
 static CLASS_DEVICE_ATTR(i2c_reg, S_IRUGO | S_IWUSR,
-                         sn9c102_show_i2c_reg, sn9c102_store_i2c_reg);
+                         sn9c102_show_i2c_reg, sn9c102_store_i2c_reg);
 static CLASS_DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR,
-                         sn9c102_show_i2c_val, sn9c102_store_i2c_val);
+                         sn9c102_show_i2c_val, sn9c102_store_i2c_val);
 static CLASS_DEVICE_ATTR(green, S_IWUGO, NULL, sn9c102_store_green);
 static CLASS_DEVICE_ATTR(blue, S_IWUGO, NULL, sn9c102_store_blue);
 static CLASS_DEVICE_ATTR(red, S_IWUGO, NULL, sn9c102_store_red);
 static CLASS_DEVICE_ATTR(frame_header, S_IRUGO,
-                         sn9c102_show_frame_header, NULL);
+                         sn9c102_show_frame_header, NULL);
 
 
 static void sn9c102_create_sysfs(struct sn9c102_device* cam)
@@ -1278,7 +1278,7 @@ sn9c102_set_pix_format(struct sn9c102_device* cam, struct v4l2_pix_format* pix)
 
 static int
 sn9c102_set_compression(struct sn9c102_device* cam,
-                        struct v4l2_jpegcompression* compression)
+                        struct v4l2_jpegcompression* compression)
 {
         int err = 0;
 
@@ -1469,8 +1469,8 @@ static int sn9c102_open(struct inode* inode, struct file* filp)
                 }
                 mutex_unlock(&cam->dev_mutex);
                 err = wait_event_interruptible_exclusive(cam->open,
-                                                  cam->state & DEV_DISCONNECTED
-                                                         || !cam->users);
+                                                  cam->state & DEV_DISCONNECTED
+                                                         || !cam->users);
                 if (err) {
                         up_read(&sn9c102_disconnect);
                         return err;
@@ -1600,12 +1600,12 @@ sn9c102_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
                         return -EAGAIN;
                 }
                 timeout = wait_event_interruptible_timeout
-                          ( cam->wait_frame,
-                            (!list_empty(&cam->outqueue)) ||
-                            (cam->state & DEV_DISCONNECTED) ||
-                            (cam->state & DEV_MISCONFIGURED),
-                            cam->module_param.frame_timeout *
-                            1000 * msecs_to_jiffies(1) );
+                          ( cam->wait_frame,
+                            (!list_empty(&cam->outqueue)) ||
+                            (cam->state & DEV_DISCONNECTED) ||
+                            (cam->state & DEV_MISCONFIGURED),
+                            cam->module_param.frame_timeout *
+                            1000 * msecs_to_jiffies(1) );
                 if (timeout < 0) {
                         mutex_unlock(&cam->fileop_mutex);
                         return timeout;
@@ -1672,7 +1672,7 @@ static unsigned int sn9c102_poll(struct file *filp, poll_table *wait)
 
         if (cam->io == IO_NONE) {
                 if (!sn9c102_request_buffers(cam, cam->nreadbuffers,
-                                             IO_READ)) {
+                                             IO_READ)) {
                         DBG(1, "poll() failed, not enough memory");
                         goto error;
                 }
@@ -1729,7 +1729,7 @@ static int sn9c102_mmap(struct file* filp, struct vm_area_struct *vma)
 {
         struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
         unsigned long size = vma->vm_end - vma->vm_start,
-                      start = vma->vm_start;
+                      start = vma->vm_start;
         void *pos;
         u32 i;
 
@@ -1797,13 +1797,13 @@ sn9c102_vidioc_querycap(struct sn9c102_device* cam, void __user * arg)
                 .driver = "sn9c102",
                 .version = SN9C102_MODULE_VERSION_CODE,
                 .capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |
-                                V4L2_CAP_STREAMING,
+                                V4L2_CAP_STREAMING,
         };
 
         strlcpy(cap.card, cam->v4ldev->name, sizeof(cap.card));
         if (usb_make_path(cam->usbdev, cap.bus_info, sizeof(cap.bus_info)) < 0)
                 strlcpy(cap.bus_info, cam->usbdev->dev.bus_id,
-                        sizeof(cap.bus_info));
+                        sizeof(cap.bus_info));
 
         if (copy_to_user(arg, &cap, sizeof(cap)))
                 return -EFAULT;
@@ -2138,7 +2138,7 @@ sn9c102_vidioc_g_fmt(struct sn9c102_device* cam, void __user * arg)
                 return -EINVAL;
 
         pfmt->bytesperline = (pfmt->pixelformat==V4L2_PIX_FMT_SN9C10X)
-                             ? 0 : (pfmt->width * pfmt->priv) / 8;
+                             ? 0 : (pfmt->width * pfmt->priv) / 8;
         pfmt->sizeimage = pfmt->height * ((pfmt->width*pfmt->priv)/8);
         pfmt->field = V4L2_FIELD_NONE;
         memcpy(&(format.fmt.pix), pfmt, sizeof(*pfmt));
@@ -2152,7 +2152,7 @@ sn9c102_vidioc_g_fmt(struct sn9c102_device* cam, void __user * arg)
 
 static int
 sn9c102_vidioc_try_s_fmt(struct sn9c102_device* cam, unsigned int cmd,
-                         void __user * arg)
+                         void __user * arg)
 {
         struct sn9c102_sensor* s = &cam->sensor;
         struct v4l2_format format;
@@ -2214,7 +2214,7 @@ sn9c102_vidioc_try_s_fmt(struct sn9c102_device* cam, unsigned int cmd,
         pix->priv = pfmt->priv; /* bpp */
         pix->colorspace = pfmt->colorspace;
         pix->bytesperline = (pix->pixelformat == V4L2_PIX_FMT_SN9C10X)
-                            ? 0 : (pix->width * pix->priv) / 8;
+                            ? 0 : (pix->width * pix->priv) / 8;
         pix->sizeimage = pix->height * ((pix->width * pix->priv) / 8);
         pix->field = V4L2_FIELD_NONE;
 
@@ -2287,7 +2287,7 @@ static int
 sn9c102_vidioc_g_jpegcomp(struct sn9c102_device* cam, void __user * arg)
 {
         if (copy_to_user(arg, &cam->compression,
-                         sizeof(cam->compression)))
+                         sizeof(cam->compression)))
                 return -EFAULT;
 
         return 0;
@@ -2436,7 +2436,7 @@ sn9c102_vidioc_qbuf(struct sn9c102_device* cam, void __user * arg)
 
 static int
 sn9c102_vidioc_dqbuf(struct sn9c102_device* cam, struct file* filp,
-                     void __user * arg)
+                     void __user * arg)
 {
         struct v4l2_buffer b;
         struct sn9c102_frame_t *f;
@@ -2455,12 +2455,12 @@ sn9c102_vidioc_dqbuf(struct sn9c102_device* cam, struct file* filp,
                 if (filp->f_flags & O_NONBLOCK)
                         return -EAGAIN;
                 timeout = wait_event_interruptible_timeout
-                          ( cam->wait_frame,
-                            (!list_empty(&cam->outqueue)) ||
-                            (cam->state & DEV_DISCONNECTED) ||
-                            (cam->state & DEV_MISCONFIGURED),
-                            cam->module_param.frame_timeout *
-                            1000 * msecs_to_jiffies(1) );
+                          ( cam->wait_frame,
+                            (!list_empty(&cam->outqueue)) ||
+                            (cam->state & DEV_DISCONNECTED) ||
+                            (cam->state & DEV_MISCONFIGURED),
+                            cam->module_param.frame_timeout *
+                            1000 * msecs_to_jiffies(1) );
                 if (timeout < 0)
                         return timeout;
                 if (cam->state & DEV_DISCONNECTED)
@@ -2584,7 +2584,7 @@ sn9c102_vidioc_s_parm(struct sn9c102_device* cam, void __user * arg)
 
 
 static int sn9c102_ioctl_v4l2(struct inode* inode, struct file* filp,
-                              unsigned int cmd, void __user * arg)
+                              unsigned int cmd, void __user * arg)
 {
         struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
 
@@ -2678,7 +2678,7 @@ static int sn9c102_ioctl_v4l2(struct inode* inode, struct file* filp,
 
 
 static int sn9c102_ioctl(struct inode* inode, struct file* filp,
-                         unsigned int cmd, unsigned long arg)
+                         unsigned int cmd, unsigned long arg)
 {
         struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
         int err = 0;
@@ -2761,7 +2761,7 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         }
 
         cam->bridge = (id->idProduct & 0xffc0) == 0x6080 ?
-                      BRIDGE_SN9C103 : BRIDGE_SN9C102;
+                      BRIDGE_SN9C103 : BRIDGE_SN9C102;
         switch (cam->bridge) {
         case BRIDGE_SN9C101:
         case BRIDGE_SN9C102:
@@ -2807,7 +2807,7 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         mutex_lock(&cam->dev_mutex);
 
         err = video_register_device(cam->v4ldev, VFL_TYPE_GRABBER,
-                                    video_nr[dev_nr]);
+                                    video_nr[dev_nr]);
         if (err) {
                 DBG(1, "V4L2 device registration failed");
                 if (err == -ENFILE && video_nr[dev_nr] == -1)
diff --git a/drivers/usb/media/sn9c102_hv7131d.c b/drivers/media/video/sn9c102/sn9c102_hv7131d.c
index 46c12ec3ca..c4117bf64b 100644
--- a/drivers/usb/media/sn9c102_hv7131d.c
+++ b/drivers/media/video/sn9c102/sn9c102_hv7131d.c
@@ -44,8 +44,8 @@ static int hv7131d_init(struct sn9c102_device* cam)
 }
 
 
-static int hv7131d_get_ctrl(struct sn9c102_device* cam, 
-                            struct v4l2_control* ctrl)
+static int hv7131d_get_ctrl(struct sn9c102_device* cam,
+                            struct v4l2_control* ctrl)
 {
         switch (ctrl->id) {
         case V4L2_CID_EXPOSURE:
@@ -88,8 +88,8 @@ static int hv7131d_get_ctrl(struct sn9c102_device* cam,
 }
 
 
-static int hv7131d_set_ctrl(struct sn9c102_device* cam, 
-                            const struct v4l2_control* ctrl)
+static int hv7131d_set_ctrl(struct sn9c102_device* cam,
+                            const struct v4l2_control* ctrl)
 {
         int err = 0;
 
@@ -121,8 +121,8 @@ static int hv7131d_set_ctrl(struct sn9c102_device* cam,
 }
 
 
-static int hv7131d_set_crop(struct sn9c102_device* cam, 
-                            const struct v4l2_rect* rect)
+static int hv7131d_set_crop(struct sn9c102_device* cam,
+                            const struct v4l2_rect* rect)
 {
         struct sn9c102_sensor* s = &hv7131d;
         int err = 0;
@@ -136,8 +136,8 @@ static int hv7131d_set_crop(struct sn9c102_device* cam,
 }
 
 
-static int hv7131d_set_pix_format(struct sn9c102_device* cam, 
-                                  const struct v4l2_pix_format* pix)
+static int hv7131d_set_pix_format(struct sn9c102_device* cam,
+                                  const struct v4l2_pix_format* pix)
 {
         int err = 0;
 
diff --git a/drivers/usb/media/sn9c102_mi0343.c b/drivers/media/video/sn9c102/sn9c102_mi0343.c
index d9aa7a6109..4169ea4a2e 100644
--- a/drivers/usb/media/sn9c102_mi0343.c
+++ b/drivers/media/video/sn9c102/sn9c102_mi0343.c
@@ -39,64 +39,64 @@ static int mi0343_init(struct sn9c102_device* cam)
         err += sn9c102_write_reg(cam, 0xa0, 0x19);
 
         err += sn9c102_i2c_try_raw_write(cam, &mi0343, 4, mi0343.i2c_slave_id,
-                                         0x0d, 0x00, 0x01, 0, 0);
+                                         0x0d, 0x00, 0x01, 0, 0);
         err += sn9c102_i2c_try_raw_write(cam, &mi0343, 4, mi0343.i2c_slave_id,
-                                         0x0d, 0x00, 0x00, 0, 0);
+                                         0x0d, 0x00, 0x00, 0, 0);
         err += sn9c102_i2c_try_raw_write(cam, &mi0343, 4, mi0343.i2c_slave_id,
-                                         0x03, 0x01, 0xe1, 0, 0);
+                                         0x03, 0x01, 0xe1, 0, 0);
         err += sn9c102_i2c_try_raw_write(cam, &mi0343, 4, mi0343.i2c_slave_id,
-                                         0x04, 0x02, 0x81, 0, 0);
+                                         0x04, 0x02, 0x81, 0, 0);
         err += sn9c102_i2c_try_raw_write(cam, &mi0343, 4, mi0343.i2c_slave_id,
-                                         0x05, 0x00, 0x17, 0, 0);
+                                         0x05, 0x00, 0x17, 0, 0);
         err += sn9c102_i2c_try_raw_write(cam, &mi0343, 4, mi0343.i2c_slave_id,
-                                         0x06, 0x00, 0x11, 0, 0);
+                                         0x06, 0x00, 0x11, 0, 0);
         err += sn9c102_i2c_try_raw_write(cam, &mi0343, 4, mi0343.i2c_slave_id,
-                                         0x62, 0x04, 0x9a, 0, 0);
+                                         0x62, 0x04, 0x9a, 0, 0);
 
         return err;
 }
 
 
-static int mi0343_get_ctrl(struct sn9c102_device* cam, 
-                           struct v4l2_control* ctrl)
+static int mi0343_get_ctrl(struct sn9c102_device* cam,
+                           struct v4l2_control* ctrl)
 {
         switch (ctrl->id) {
         case V4L2_CID_EXPOSURE:
                 if (sn9c102_i2c_try_raw_read(cam, &mi0343, mi0343.i2c_slave_id,
-                                             0x09, 2+1, mi0343_i2c_data) < 0)
+                                             0x09, 2+1, mi0343_i2c_data) < 0)
                         return -EIO;
                 ctrl->value = mi0343_i2c_data[2];
                 return 0;
         case V4L2_CID_GAIN:
                 if (sn9c102_i2c_try_raw_read(cam, &mi0343, mi0343.i2c_slave_id,
-                                             0x35, 2+1, mi0343_i2c_data) < 0)
+                                             0x35, 2+1, mi0343_i2c_data) < 0)
                         return -EIO;
                 break;
         case V4L2_CID_HFLIP:
                 if (sn9c102_i2c_try_raw_read(cam, &mi0343, mi0343.i2c_slave_id,
-                                             0x20, 2+1, mi0343_i2c_data) < 0)
+                                             0x20, 2+1, mi0343_i2c_data) < 0)
                         return -EIO;
                 ctrl->value = mi0343_i2c_data[3] & 0x20 ? 1 : 0;
                 return 0;
         case V4L2_CID_VFLIP:
                 if (sn9c102_i2c_try_raw_read(cam, &mi0343, mi0343.i2c_slave_id,
-                                             0x20, 2+1, mi0343_i2c_data) < 0)
+                                             0x20, 2+1, mi0343_i2c_data) < 0)
                         return -EIO;
                 ctrl->value = mi0343_i2c_data[3] & 0x80 ? 1 : 0;
                 return 0;
         case V4L2_CID_RED_BALANCE:
                 if (sn9c102_i2c_try_raw_read(cam, &mi0343, mi0343.i2c_slave_id,
-                                             0x2d, 2+1, mi0343_i2c_data) < 0)
+                                             0x2d, 2+1, mi0343_i2c_data) < 0)
                         return -EIO;
                 break;
         case V4L2_CID_BLUE_BALANCE:
                 if (sn9c102_i2c_try_raw_read(cam, &mi0343, mi0343.i2c_slave_id,
-                                             0x2c, 2+1, mi0343_i2c_data) < 0)
+                                             0x2c, 2+1, mi0343_i2c_data) < 0)
                         return -EIO;
                 break;
         case SN9C102_V4L2_CID_GREEN_BALANCE:
                 if (sn9c102_i2c_try_raw_read(cam, &mi0343, mi0343.i2c_slave_id,
-                                             0x2e, 2+1, mi0343_i2c_data) < 0)
+                                             0x2e, 2+1, mi0343_i2c_data) < 0)
                         return -EIO;
                 break;
         default:
@@ -121,8 +121,8 @@ static int mi0343_get_ctrl(struct sn9c102_device* cam,
 }
 
 
-static int mi0343_set_ctrl(struct sn9c102_device* cam, 
-                           const struct v4l2_control* ctrl)
+static int mi0343_set_ctrl(struct sn9c102_device* cam,
+                           const struct v4l2_control* ctrl)
 {
         u16 reg = 0;
         int err = 0;
@@ -144,51 +144,51 @@ static int mi0343_set_ctrl(struct sn9c102_device* cam,
         switch (ctrl->id) {
         case V4L2_CID_EXPOSURE:
                 err += sn9c102_i2c_try_raw_write(cam, &mi0343, 4,
-                                                 mi0343.i2c_slave_id,
-                                                 0x09, ctrl->value, 0x00,
-                                                 0, 0);
+                                                 mi0343.i2c_slave_id,
+                                                 0x09, ctrl->value, 0x00,
+                                                 0, 0);
                 break;
         case V4L2_CID_GAIN:
                 err += sn9c102_i2c_try_raw_write(cam, &mi0343, 4,
-                                                 mi0343.i2c_slave_id,
-                                                 0x35, reg >> 8, reg & 0xff,
-                                                 0, 0);
+                                                 mi0343.i2c_slave_id,
+                                                 0x35, reg >> 8, reg & 0xff,
+                                                 0, 0);
                 break;
         case V4L2_CID_HFLIP:
                 err += sn9c102_i2c_try_raw_write(cam, &mi0343, 4,
-                                                 mi0343.i2c_slave_id,
-                                                 0x20, ctrl->value ? 0x40:0x00,
-                                                 ctrl->value ? 0x20:0x00,
-                                                 0, 0);
+                                                 mi0343.i2c_slave_id,
+                                                 0x20, ctrl->value ? 0x40:0x00,
+                                                 ctrl->value ? 0x20:0x00,
+                                                 0, 0);
                 break;
         case V4L2_CID_VFLIP:
                 err += sn9c102_i2c_try_raw_write(cam, &mi0343, 4,
-                                                 mi0343.i2c_slave_id,
-                                                 0x20, ctrl->value ? 0x80:0x00,
-                                                 ctrl->value ? 0x80:0x00,
-                                                 0, 0);
+                                                 mi0343.i2c_slave_id,
+                                                 0x20, ctrl->value ? 0x80:0x00,
+                                                 ctrl->value ? 0x80:0x00,
+                                                 0, 0);
                 break;
         case V4L2_CID_RED_BALANCE:
                 err += sn9c102_i2c_try_raw_write(cam, &mi0343, 4,
-                                                 mi0343.i2c_slave_id,
-                                                 0x2d, reg >> 8, reg & 0xff,
-                                                 0, 0);
+                                                 mi0343.i2c_slave_id,
+                                                 0x2d, reg >> 8, reg & 0xff,
+                                                 0, 0);
                 break;
         case V4L2_CID_BLUE_BALANCE:
                 err += sn9c102_i2c_try_raw_write(cam, &mi0343, 4,
-                                                 mi0343.i2c_slave_id,
-                                                 0x2c, reg >> 8, reg & 0xff,
-                                                 0, 0);
+                                                 mi0343.i2c_slave_id,
+                                                 0x2c, reg >> 8, reg & 0xff,
+                                                 0, 0);
                 break;
         case SN9C102_V4L2_CID_GREEN_BALANCE:
                 err += sn9c102_i2c_try_raw_write(cam, &mi0343, 4,
-                                                 mi0343.i2c_slave_id,
-                                                 0x2b, reg >> 8, reg & 0xff,
-                                                 0, 0);
+                                                 mi0343.i2c_slave_id,
+                                                 0x2b, reg >> 8, reg & 0xff,
+                                                 0, 0);
                 err += sn9c102_i2c_try_raw_write(cam, &mi0343, 4,
-                                                 mi0343.i2c_slave_id,
-                                                 0x2e, reg >> 8, reg & 0xff,
-                                                 0, 0);
+                                                 mi0343.i2c_slave_id,
+                                                 0x2e, reg >> 8, reg & 0xff,
+                                                 0, 0);
                 break;
         default:
                 return -EINVAL;
@@ -198,8 +198,8 @@ static int mi0343_set_ctrl(struct sn9c102_device* cam,
 }
 
 
-static int mi0343_set_crop(struct sn9c102_device* cam, 
-                            const struct v4l2_rect* rect)
+static int mi0343_set_crop(struct sn9c102_device* cam,
+                            const struct v4l2_rect* rect)
 {
         struct sn9c102_sensor* s = &mi0343;
         int err = 0;
@@ -213,20 +213,20 @@ static int mi0343_set_crop(struct sn9c102_device* cam,
 }
 
 
-static int mi0343_set_pix_format(struct sn9c102_device* cam, 
-                                 const struct v4l2_pix_format* pix)
+static int mi0343_set_pix_format(struct sn9c102_device* cam,
+                                 const struct v4l2_pix_format* pix)
 {
         int err = 0;
 
         if (pix->pixelformat == V4L2_PIX_FMT_SN9C10X) {
                 err += sn9c102_i2c_try_raw_write(cam, &mi0343, 4,
-                                                 mi0343.i2c_slave_id,
-                                                 0x0a, 0x00, 0x03, 0, 0);
+                                                 mi0343.i2c_slave_id,
+                                                 0x0a, 0x00, 0x03, 0, 0);
                 err += sn9c102_write_reg(cam, 0x20, 0x19);
         } else {
                 err += sn9c102_i2c_try_raw_write(cam, &mi0343, 4,
-                                                 mi0343.i2c_slave_id,
-                                                 0x0a, 0x00, 0x05, 0, 0);
+                                                 mi0343.i2c_slave_id,
+                                                 0x0a, 0x00, 0x05, 0, 0);
                 err += sn9c102_write_reg(cam, 0xa0, 0x19);
         }
 
@@ -351,7 +351,7 @@ int sn9c102_probe_mi0343(struct sn9c102_device* cam)
                 return -EIO;
 
         if (sn9c102_i2c_try_raw_read(cam, &mi0343, mi0343.i2c_slave_id, 0x00,
-                                     2, mi0343_i2c_data) < 0)
+                                     2, mi0343_i2c_data) < 0)
                 return -EIO;
 
         if (mi0343_i2c_data[4] != 0x32 && mi0343_i2c_data[3] != 0xe3)
diff --git a/drivers/usb/media/sn9c102_ov7630.c b/drivers/media/video/sn9c102/sn9c102_ov7630.c
index 42852b7cb0..3da0420217 100644
--- a/drivers/usb/media/sn9c102_ov7630.c
+++ b/drivers/media/video/sn9c102/sn9c102_ov7630.c
@@ -69,7 +69,7 @@ static int ov7630_init(struct sn9c102_device* cam)
 
 
 static int ov7630_set_ctrl(struct sn9c102_device* cam,
-                           const struct v4l2_control* ctrl)
+                           const struct v4l2_control* ctrl)
 {
         int err = 0;
 
@@ -89,8 +89,8 @@ static int ov7630_set_ctrl(struct sn9c102_device* cam,
                 break;
         case V4L2_CID_CONTRAST:
                 err += ctrl->value ? sn9c102_i2c_write(cam, 0x05,
-                                                       (ctrl->value-1) | 0x20)
-                                   : sn9c102_i2c_write(cam, 0x05, 0x00);
+                                                       (ctrl->value-1) | 0x20)
+                                   : sn9c102_i2c_write(cam, 0x05, 0x00);
                 break;
         case V4L2_CID_BRIGHTNESS:
                 err += sn9c102_i2c_write(cam, 0x06, ctrl->value);
@@ -100,8 +100,8 @@ static int ov7630_set_ctrl(struct sn9c102_device* cam,
                 break;
         case V4L2_CID_HUE:
                 err += ctrl->value ? sn9c102_i2c_write(cam, 0x04,
-                                                       (ctrl->value-1) | 0x20)
-                                   : sn9c102_i2c_write(cam, 0x04, 0x00);
+                                                       (ctrl->value-1) | 0x20)
+                                   : sn9c102_i2c_write(cam, 0x04, 0x00);
                 break;
         case V4L2_CID_DO_WHITE_BALANCE:
                 err += sn9c102_i2c_write(cam, 0x0c, ctrl->value);
@@ -139,7 +139,7 @@ static int ov7630_set_ctrl(struct sn9c102_device* cam,
 
 
 static int ov7630_set_crop(struct sn9c102_device* cam,
-                           const struct v4l2_rect* rect)
+                           const struct v4l2_rect* rect)
 {
         struct sn9c102_sensor* s = &ov7630;
         int err = 0;
@@ -152,7 +152,7 @@ static int ov7630_set_crop(struct sn9c102_device* cam,
 
 
 static int ov7630_set_pix_format(struct sn9c102_device* cam,
-                                 const struct v4l2_pix_format* pix)
+                                 const struct v4l2_pix_format* pix)
 {
         int err = 0;
 
diff --git a/drivers/usb/media/sn9c102_pas106b.c b/drivers/media/video/sn9c102/sn9c102_pas106b.c
index b1dee78abe..9915944235 100644
--- a/drivers/usb/media/sn9c102_pas106b.c
+++ b/drivers/media/video/sn9c102/sn9c102_pas106b.c
@@ -53,8 +53,8 @@ static int pas106b_init(struct sn9c102_device* cam)
 }
 
 
-static int pas106b_get_ctrl(struct sn9c102_device* cam, 
-                            struct v4l2_control* ctrl)
+static int pas106b_get_ctrl(struct sn9c102_device* cam,
+                            struct v4l2_control* ctrl)
 {
         switch (ctrl->id) {
         case V4L2_CID_EXPOSURE:
@@ -102,8 +102,8 @@ static int pas106b_get_ctrl(struct sn9c102_device* cam,
 }
 
 
-static int pas106b_set_ctrl(struct sn9c102_device* cam, 
-                            const struct v4l2_control* ctrl)
+static int pas106b_set_ctrl(struct sn9c102_device* cam,
+                            const struct v4l2_control* ctrl)
 {
         int err = 0;
 
@@ -140,8 +140,8 @@ static int pas106b_set_ctrl(struct sn9c102_device* cam,
 }
 
 
-static int pas106b_set_crop(struct sn9c102_device* cam, 
-                            const struct v4l2_rect* rect)
+static int pas106b_set_crop(struct sn9c102_device* cam,
+                            const struct v4l2_rect* rect)
 {
         struct sn9c102_sensor* s = &pas106b;
         int err = 0;
@@ -155,8 +155,8 @@ static int pas106b_set_crop(struct sn9c102_device* cam,
 }
 
 
-static int pas106b_set_pix_format(struct sn9c102_device* cam, 
-                                  const struct v4l2_pix_format* pix)
+static int pas106b_set_pix_format(struct sn9c102_device* cam,
+                                  const struct v4l2_pix_format* pix)
 {
         int err = 0;
 
diff --git a/drivers/usb/media/sn9c102_pas202bca.c b/drivers/media/video/sn9c102/sn9c102_pas202bca.c
index 3453237055..c8f1ae2152 100644
--- a/drivers/usb/media/sn9c102_pas202bca.c
+++ b/drivers/media/video/sn9c102/sn9c102_pas202bca.c
@@ -54,7 +54,7 @@ static int pas202bca_init(struct sn9c102_device* cam)
 
 
 static int pas202bca_set_pix_format(struct sn9c102_device* cam,
-                                    const struct v4l2_pix_format* pix)
+                                    const struct v4l2_pix_format* pix)
 {
         int err = 0;
 
@@ -68,7 +68,7 @@ static int pas202bca_set_pix_format(struct sn9c102_device* cam,
 
 
 static int pas202bca_set_ctrl(struct sn9c102_device* cam,
-                              const struct v4l2_control* ctrl)
+                              const struct v4l2_control* ctrl)
 {
         int err = 0;
 
@@ -102,7 +102,7 @@ static int pas202bca_set_ctrl(struct sn9c102_device* cam,
 
 
 static int pas202bca_set_crop(struct sn9c102_device* cam,
-                              const struct v4l2_rect* rect)
+                              const struct v4l2_rect* rect)
 {
         struct sn9c102_sensor* s = &pas202bca;
         int err = 0;
diff --git a/drivers/usb/media/sn9c102_pas202bcb.c b/drivers/media/video/sn9c102/sn9c102_pas202bcb.c
index d068616ab3..e3c1178e33 100644
--- a/drivers/usb/media/sn9c102_pas202bcb.c
+++ b/drivers/media/video/sn9c102/sn9c102_pas202bcb.c
@@ -58,8 +58,8 @@ static int pas202bcb_init(struct sn9c102_device* cam)
 }
 
 
-static int pas202bcb_get_ctrl(struct sn9c102_device* cam, 
-                              struct v4l2_control* ctrl)
+static int pas202bcb_get_ctrl(struct sn9c102_device* cam,
+                              struct v4l2_control* ctrl)
 {
         switch (ctrl->id) {
         case V4L2_CID_EXPOSURE:
@@ -101,8 +101,8 @@ static int pas202bcb_get_ctrl(struct sn9c102_device* cam,
 }
 
 
-static int pas202bcb_set_pix_format(struct sn9c102_device* cam, 
-                                    const struct v4l2_pix_format* pix)
+static int pas202bcb_set_pix_format(struct sn9c102_device* cam,
+                                    const struct v4l2_pix_format* pix)
 {
         int err = 0;
 
@@ -115,8 +115,8 @@ static int pas202bcb_set_pix_format(struct sn9c102_device* cam,
 }
 
 
-static int pas202bcb_set_ctrl(struct sn9c102_device* cam, 
-                              const struct v4l2_control* ctrl)
+static int pas202bcb_set_ctrl(struct sn9c102_device* cam,
+                              const struct v4l2_control* ctrl)
 {
         int err = 0;
 
@@ -149,8 +149,8 @@ static int pas202bcb_set_ctrl(struct sn9c102_device* cam,
 }
 
 
-static int pas202bcb_set_crop(struct sn9c102_device* cam, 
-                              const struct v4l2_rect* rect)
+static int pas202bcb_set_crop(struct sn9c102_device* cam,
+                              const struct v4l2_rect* rect)
 {
         struct sn9c102_sensor* s = &pas202bcb;
         int err = 0;
@@ -167,7 +167,7 @@ static int pas202bcb_set_crop(struct sn9c102_device* cam,
 static struct sn9c102_sensor pas202bcb = {
         .name = "PAS202BCB",
         .maintainer = "Carlos Eduardo Medaglia Dyonisio "
-                      "<medaglia@undl.org.br>",
+                      "<medaglia@undl.org.br>",
         .sysfs_ops = SN9C102_I2C_READ | SN9C102_I2C_WRITE,
         .frequency = SN9C102_I2C_400KHZ | SN9C102_I2C_100KHZ,
         .interface = SN9C102_I2C_2WIRES,
diff --git a/drivers/usb/media/sn9c102_sensor.h b/drivers/media/video/sn9c102/sn9c102_sensor.h
index 2afd9e9d09..2a874ee6f9 100644
--- a/drivers/usb/media/sn9c102_sensor.h
+++ b/drivers/media/video/sn9c102/sn9c102_sensor.h
@@ -58,7 +58,7 @@ struct sn9c102_sensor;
    Probing functions: on success, you must attach the sensor to the camera
    by calling sn9c102_attach_sensor() provided below.
    To enable the I2C communication, you might need to perform a really basic
-   initialization of the SN9C10X chip by using the write function declared 
+   initialization of the SN9C10X chip by using the write function declared
    ahead.
    Functions must return 0 on success, the appropriate error otherwise.
 */
@@ -73,7 +73,7 @@ extern int sn9c102_probe_tas5130d1b(struct sn9c102_device* cam);
 
 /*
    Add the above entries to this table. Be sure to add the entry in the right
-   place, since, on failure, the next probing routine is called according to 
+   place, since, on failure, the next probing routine is called according to
    the order of the list below, from top to bottom.
 */
 #define SN9C102_SENSOR_TABLE                                                  \
@@ -94,9 +94,9 @@ extern struct sn9c102_device*
 sn9c102_match_id(struct sn9c102_device* cam, const struct usb_device_id *id);
 
 /* Attach a probed sensor to the camera. */
-extern void 
+extern void
 sn9c102_attach_sensor(struct sn9c102_device* cam,
-                      struct sn9c102_sensor* sensor);
+                      struct sn9c102_sensor* sensor);
 
 /*
    Each SN9C10x camera has proper PID/VID identifiers.
@@ -105,7 +105,7 @@ sn9c102_attach_sensor(struct sn9c102_device* cam,
 */
 #define SN9C102_USB_DEVICE(vend, prod, intclass)                              \
         .match_flags = USB_DEVICE_ID_MATCH_DEVICE |                           \
-                       USB_DEVICE_ID_MATCH_INT_CLASS,                         \
+                       USB_DEVICE_ID_MATCH_INT_CLASS,                         \
         .idVendor = (vend),                                                   \
         .idProduct = (prod),                                                  \
         .bInterfaceClass = (intclass)
@@ -162,19 +162,19 @@ static const struct usb_device_id sn9c102_id_table[] = {                      \
    Read/write routines: they always return -1 on error, 0 or the read value
    otherwise. NOTE that a real read operation is not supported by the SN9C10X
    chip for some of its registers. To work around this problem, a pseudo-read
-   call is provided instead: it returns the last successfully written value 
+   call is provided instead: it returns the last successfully written value
    on the register (0 if it has never been written), the usual -1 on error.
 */
 
 /* The "try" I2C I/O versions are used when probing the sensor */
 extern int sn9c102_i2c_try_write(struct sn9c102_device*,struct sn9c102_sensor*,
-                                 u8 address, u8 value);
+                                 u8 address, u8 value);
 extern int sn9c102_i2c_try_read(struct sn9c102_device*,struct sn9c102_sensor*,
-                                u8 address);
+                                u8 address);
 
 /*
    These must be used if and only if the sensor doesn't implement the standard
-   I2C protocol. There are a number of good reasons why you must use the 
+   I2C protocol. There are a number of good reasons why you must use the
    single-byte versions of these functions: do not abuse. The first function
    writes n bytes, from data0 to datan, to registers 0x09 - 0x09+n of SN9C10X
    chip. The second one programs the registers 0x09 and 0x10 with data0 and
@@ -184,12 +184,12 @@ extern int sn9c102_i2c_try_read(struct sn9c102_device*,struct sn9c102_sensor*,
    byte.
 */
 extern int sn9c102_i2c_try_raw_write(struct sn9c102_device* cam,
-                                     struct sn9c102_sensor* sensor, u8 n, 
-                                     u8 data0, u8 data1, u8 data2, u8 data3,
-                                     u8 data4, u8 data5);
+                                     struct sn9c102_sensor* sensor, u8 n,
+                                     u8 data0, u8 data1, u8 data2, u8 data3,
+                                     u8 data4, u8 data5);
 extern int sn9c102_i2c_try_raw_read(struct sn9c102_device* cam,
-                                    struct sn9c102_sensor* sensor, u8 data0,
-                                    u8 data1, u8 n, u8 buffer[]);
+                                    struct sn9c102_sensor* sensor, u8 data0,
+                                    u8 data1, u8 n, u8 buffer[]);
 
 /* To be used after the sensor struct has been attached to the camera struct */
 extern int sn9c102_i2c_write(struct sn9c102_device*, u8 address, u8 value);
@@ -252,17 +252,17 @@ struct sn9c102_sensor {
 
         /*
            NOTE: Where not noted,most of the functions below are not mandatory.
-                 Set to null if you do not implement them. If implemented,
-                 they must return 0 on success, the proper error otherwise.
+                 Set to null if you do not implement them. If implemented,
+                 they must return 0 on success, the proper error otherwise.
         */
 
         int (*init)(struct sn9c102_device* cam);
         /*
-           This function will be called after the sensor has been attached. 
+           This function will be called after the sensor has been attached.
            It should be used to initialize the sensor only, but may also
            configure part of the SN9C10X chip if necessary. You don't need to
            setup picture settings like brightness, contrast, etc.. here, if
-           the corrisponding controls are implemented (see below), since 
+           the corrisponding controls are implemented (see below), since
            they are adjusted in the core driver by calling the set_ctrl()
            method after init(), where the arguments are the default values
            specified in the v4l2_queryctrl list of supported controls;
@@ -273,13 +273,13 @@ struct sn9c102_sensor {
 
         struct v4l2_queryctrl qctrl[SN9C102_MAX_CTRLS];
         /*
-           Optional list of default controls, defined as indicated in the 
+           Optional list of default controls, defined as indicated in the
            V4L2 API. Menu type controls are not handled by this interface.
         */
 
         int (*get_ctrl)(struct sn9c102_device* cam, struct v4l2_control* ctrl);
         int (*set_ctrl)(struct sn9c102_device* cam,
-                        const struct v4l2_control* ctrl);
+                        const struct v4l2_control* ctrl);
         /*
            You must implement at least the set_ctrl method if you have defined
            the list above. The returned value must follow the V4L2
@@ -306,7 +306,7 @@ struct sn9c102_sensor {
            specified in the cropcap substructures 'bounds' and 'defrect'.
            By default, the source rectangle should cover the largest possible
            area. Again, it is not always true that the largest source rectangle
-           can cover the entire active window, although it is a rare case for 
+           can cover the entire active window, although it is a rare case for
            the hardware we have. The bounds of the source rectangle _must_ be
            multiple of 16 and must use the same coordinate system as indicated
            before; their centers shall align initially.
@@ -317,13 +317,13 @@ struct sn9c102_sensor {
            defined the correct default bounds in the structures.
            See the V4L2 API for further details.
            NOTE: once you have defined the bounds of the active window
-                 (struct cropcap.bounds) you must not change them.anymore.
+                 (struct cropcap.bounds) you must not change them.anymore.
            Only 'bounds' and 'defrect' fields are mandatory, other fields
            will be ignored.
         */
 
         int (*set_crop)(struct sn9c102_device* cam,
-                        const struct v4l2_rect* rect);
+                        const struct v4l2_rect* rect);
         /*
            To be called on VIDIOC_C_SETCROP. The core module always calls a
            default routine which configures the appropriate SN9C10X regs (also
@@ -332,12 +332,12 @@ struct sn9c102_sensor {
            case you override the default function, you always have to program
            the chip to match those values; on error return the corresponding
            error code without rolling back.
-           NOTE: in case, you must program the SN9C10X chip to get rid of 
-                 blank pixels or blank lines at the _start_ of each line or
-                 frame after each HSYNC or VSYNC, so that the image starts with
-                 real RGB data (see regs 0x12, 0x13) (having set H_SIZE and,
-                 V_SIZE you don't have to care about blank pixels or blank
-                 lines at the end of each line or frame).
+           NOTE: in case, you must program the SN9C10X chip to get rid of
+                 blank pixels or blank lines at the _start_ of each line or
+                 frame after each HSYNC or VSYNC, so that the image starts with
+                 real RGB data (see regs 0x12, 0x13) (having set H_SIZE and,
+                 V_SIZE you don't have to care about blank pixels or blank
+                 lines at the end of each line or frame).
         */
 
         struct v4l2_pix_format pix_format;
@@ -349,17 +349,17 @@ struct sn9c102_sensor {
            number of bits per pixel for uncompressed video, 8 or 9 (despite the
            current value of 'pixelformat').
            NOTE 1: both 'width' and 'height' _must_ be either 1/1 or 1/2 or 1/4
-                   of cropcap.defrect.width and cropcap.defrect.height. I
-                   suggest 1/1.
+                   of cropcap.defrect.width and cropcap.defrect.height. I
+                   suggest 1/1.
            NOTE 2: The initial compression quality is defined by the first bit
-                   of reg 0x17 during the initialization of the image sensor.
+                   of reg 0x17 during the initialization of the image sensor.
            NOTE 3: as said above, you have to program the SN9C10X chip to get
-                   rid of any blank pixels, so that the output of the sensor
-                   matches the RGB bayer sequence (i.e. BGBGBG...GRGRGR).
+                   rid of any blank pixels, so that the output of the sensor
+                   matches the RGB bayer sequence (i.e. BGBGBG...GRGRGR).
         */
 
         int (*set_pix_format)(struct sn9c102_device* cam,
-                              const struct v4l2_pix_format* pix);
+                              const struct v4l2_pix_format* pix);
         /*
            To be called on VIDIOC_S_FMT, when switching from the SBGGR8 to
            SN9C10X pixel format or viceversa. On error return the corresponding
diff --git a/drivers/usb/media/sn9c102_tas5110c1b.c b/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c
index 2e08c552f4..294eb02fbd 100644
--- a/drivers/usb/media/sn9c102_tas5110c1b.c
+++ b/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c
@@ -44,8 +44,8 @@ static int tas5110c1b_init(struct sn9c102_device* cam)
 }
 
 
-static int tas5110c1b_set_ctrl(struct sn9c102_device* cam, 
-                               const struct v4l2_control* ctrl)
+static int tas5110c1b_set_ctrl(struct sn9c102_device* cam,
+                               const struct v4l2_control* ctrl)
 {
         int err = 0;
 
@@ -61,8 +61,8 @@ static int tas5110c1b_set_ctrl(struct sn9c102_device* cam,
 }
 
 
-static int tas5110c1b_set_crop(struct sn9c102_device* cam, 
-                               const struct v4l2_rect* rect)
+static int tas5110c1b_set_crop(struct sn9c102_device* cam,
+                               const struct v4l2_rect* rect)
 {
         struct sn9c102_sensor* s = &tas5110c1b;
         int err = 0;
@@ -81,8 +81,8 @@ static int tas5110c1b_set_crop(struct sn9c102_device* cam,
 }
 
 
-static int tas5110c1b_set_pix_format(struct sn9c102_device* cam, 
-                                     const struct v4l2_pix_format* pix)
+static int tas5110c1b_set_pix_format(struct sn9c102_device* cam,
+                                     const struct v4l2_pix_format* pix)
 {
         int err = 0;
 
diff --git a/drivers/usb/media/sn9c102_tas5130d1b.c b/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c
index c7b339740b..9ecb09032b 100644
--- a/drivers/usb/media/sn9c102_tas5130d1b.c
+++ b/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c
@@ -42,8 +42,8 @@ static int tas5130d1b_init(struct sn9c102_device* cam)
 }
 
 
-static int tas5130d1b_set_ctrl(struct sn9c102_device* cam, 
-                               const struct v4l2_control* ctrl)
+static int tas5130d1b_set_ctrl(struct sn9c102_device* cam,
+                               const struct v4l2_control* ctrl)
 {
         int err = 0;
 
@@ -62,8 +62,8 @@ static int tas5130d1b_set_ctrl(struct sn9c102_device* cam,
 }
 
 
-static int tas5130d1b_set_crop(struct sn9c102_device* cam, 
-                               const struct v4l2_rect* rect)
+static int tas5130d1b_set_crop(struct sn9c102_device* cam,
+                               const struct v4l2_rect* rect)
 {
         struct sn9c102_sensor* s = &tas5130d1b;
         u8 h_start = (u8)(rect->left - s->cropcap.bounds.left) + 104,
@@ -82,8 +82,8 @@ static int tas5130d1b_set_crop(struct sn9c102_device* cam,
 }
 
 
-static int tas5130d1b_set_pix_format(struct sn9c102_device* cam, 
-                                     const struct v4l2_pix_format* pix)
+static int tas5130d1b_set_pix_format(struct sn9c102_device* cam,
+                                     const struct v4l2_pix_format* pix)
 {
         int err = 0;
 
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c
index 9d769264a3..07476c7117 100644
--- a/drivers/media/video/stradis.c
+++ b/drivers/media/video/stradis.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * stradis.c - stradis 4:2:2 mpeg decoder driver
  *
  * Stradis 4:2:2 MPEG-2 Decoder Driver
@@ -1191,9 +1191,9 @@ static void saa7146_set_winsize(struct saa7146 *saa)
 }
 
 /* clip_draw_rectangle(cm,x,y,w,h) -- handle clipping an area
- * bitmap is fixed width, 128 bytes (1024 pixels represented) 
- * arranged most-sigificant-bit-left in 32-bit words 
- * based on saa7146 clipping hardware, it swaps bytes if LE 
+ * bitmap is fixed width, 128 bytes (1024 pixels represented)
+ * arranged most-sigificant-bit-left in 32-bit words
+ * based on saa7146 clipping hardware, it swaps bytes if LE
  * much of this makes up for egcs brain damage -- so if you
  * are wondering "why did he do this?" it is because the C
  * was adjusted to generate the optimal asm output without
@@ -1259,7 +1259,7 @@ static void make_clip_tab(struct saa7146 *saa, struct video_clip *cr, int ncr)
                         clip_draw_rectangle(clipmap, cr[i].x, cr[i].y,
                                 cr[i].width, cr[i].height);
         }
-        /* clip against viewing window AND screen 
+        /* clip against viewing window AND screen
            so we do not have to rely on the user program
          */
         clip_draw_rectangle(clipmap, (saa->win.x + width > saa->win.swidth) ?
diff --git a/drivers/usb/media/stv680.c b/drivers/media/video/stv680.c
index 9636da2074..b38bda83a7 100644
--- a/drivers/usb/media/stv680.c
+++ b/drivers/media/video/stv680.c
@@ -1,16 +1,16 @@
 /*
  *  STV0680 USB Camera Driver, by Kevin Sisson (kjsisson@bellsouth.net)
- *  
- * Thanks to STMicroelectronics for information on the usb commands, and 
- * to Steve Miller at STM for his help and encouragement while I was 
+ *
+ * Thanks to STMicroelectronics for information on the usb commands, and
+ * to Steve Miller at STM for his help and encouragement while I was
  * writing this driver.
  *
- * This driver is based heavily on the 
+ * This driver is based heavily on the
  * Endpoints (formerly known as AOX) se401 USB Camera Driver
  * Copyright (c) 2000 Jeroen B. Vreeken (pe1rxq@amsat.org)
  *
  * Still somewhat based on the Linux ov511 driver.
- * 
+ *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
  * Free Software Foundation; either version 2 of the License, or (at your
@@ -25,18 +25,18 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * History: 
- * ver 0.1 October, 2001. Initial attempt. 
+ * History:
+ * ver 0.1 October, 2001. Initial attempt.
  *
  * ver 0.2 November, 2001. Fixed asbility to resize, added brightness
  *                         function, made more stable (?)
  *
- * ver 0.21 Nov, 2001.     Added gamma correction and white balance, 
- *                         due to Alexander Schwartz. Still trying to 
+ * ver 0.21 Nov, 2001.     Added gamma correction and white balance,
+ *                         due to Alexander Schwartz. Still trying to
  *                         improve stablility. Moved stuff into stv680.h
  *
- * ver 0.22 Nov, 2001.     Added sharpen function (by Michael Sweet, 
- *                         mike@easysw.com) from GIMP, also used in pencam. 
+ * ver 0.22 Nov, 2001.     Added sharpen function (by Michael Sweet,
+ *                         mike@easysw.com) from GIMP, also used in pencam.
  *                         Simple, fast, good integer math routine.
  *
  * ver 0.23 Dec, 2001 (gkh)
@@ -44,11 +44,11 @@
  *                         Lindent, and did other minor tweaks to get
  *                         things to work properly with 2.5.1
  *
- * ver 0.24 Jan, 2002 (kjs) 
+ * ver 0.24 Jan, 2002 (kjs)
  *                         Fixed the problem with webcam crashing after
- *                         two pictures. Changed the way pic is halved to 
- *                         improve quality. Got rid of green line around 
- *                         frame. Fix brightness reset when changing size 
+ *                         two pictures. Changed the way pic is halved to
+ *                         improve quality. Got rid of green line around
+ *                         frame. Fix brightness reset when changing size
  *                         bug. Adjusted gamma filters slightly.
  *
  * ver 0.25 Jan, 2002 (kjs)
@@ -484,7 +484,7 @@ exit:
                 PDEBUG (1, "STV(i): swapRGB is (forced) ON");
         else if (swapRGB_on == -1)
                 PDEBUG (1, "STV(i): swapRGB is (forced) OFF");
-        
+
         if (stv_set_video_mode (stv680) < 0) {
                 PDEBUG (0, "STV(e): Could not set video mode in stv_init");
                 return -1;
@@ -570,7 +570,7 @@ static int stv680_set_pict (struct usb_stv *stv680, struct video_picture *p)
         if (stv680->brightness != p->brightness) {
                 stv680->chgbright = 1;
                 stv680->brightness = p->brightness;
-        } 
+        }
 
         stv680->whiteness = p->whiteness;       /* greyscale */
         stv680->colour = p->colour;
@@ -612,7 +612,7 @@ static void stv680_video_irq (struct urb *urb, struct pt_regs *regs)
 
                 case BUFFER_UNUSED:
                         memcpy (stv680->scratch[stv680->scratch_next].data,
-                                (unsigned char *) urb->transfer_buffer, length);
+                                (unsigned char *) urb->transfer_buffer, length);
                         stv680->scratch[stv680->scratch_next].state = BUFFER_READY;
                         stv680->scratch[stv680->scratch_next].length = length;
                         if (waitqueue_active (&stv680->wq)) {
@@ -752,7 +752,7 @@ static int stv680_set_size (struct usb_stv *stv680, int width, int height)
                 PDEBUG (1, "STV(e): request for non-supported size: request: v.width = %i, v.height = %i  actual: stv.width = %i, stv.height = %i", width, height, stv680->vwidth, stv680->vheight);
                 return 1;
         }
-        
+
         /* Stop a current stream and start it again at the new size */
         if (wasstreaming)
                 stv680_stop_stream (stv680);
@@ -773,7 +773,7 @@ static int stv680_set_size (struct usb_stv *stv680, int width, int height)
 
 /*
  * STV0680 Vision Camera Chipset Driver
- * Copyright (C) 2000 Adam Harrison <adam@antispin.org> 
+ * Copyright (C) 2000 Adam Harrison <adam@antispin.org>
 */
 
 #define RED 0
@@ -842,7 +842,7 @@ static void bayer_unshuffle (struct usb_stv *stv680, struct stv680_scratch *buff
                                 colour = 2;
                                 break;
                         }
-                        i = (y * vw + x) * 3;   
+                        i = (y * vw + x) * 3;
                         *(output + i + colour) = (unsigned char) p;
                 }               /* for x */
 
@@ -850,9 +850,9 @@ static void bayer_unshuffle (struct usb_stv *stv680, struct stv680_scratch *buff
 
         /****** gamma correction plus hardcoded white balance */
         /* Thanks to Alexander Schwartx <alexander.schwartx@gmx.net> for this code.
-           Correction values red[], green[], blue[], are generated by 
-           (pow(i/256.0, GAMMA)*255.0)*white balanceRGB where GAMMA=0.55, 1<i<255. 
-           White balance (RGB)= 1.0, 1.17, 1.48. Values are calculated as double float and 
+           Correction values red[], green[], blue[], are generated by
+           (pow(i/256.0, GAMMA)*255.0)*white balanceRGB where GAMMA=0.55, 1<i<255.
+           White balance (RGB)= 1.0, 1.17, 1.48. Values are calculated as double float and
            converted to unsigned char. Values are in stv680.h  */
 
         for (y = 0; y < vh; y++) {
diff --git a/drivers/usb/media/stv680.h b/drivers/media/video/stv680.h
index ea46e0001e..a08f1b08a4 100644
--- a/drivers/usb/media/stv680.h
+++ b/drivers/media/video/stv680.h
@@ -9,12 +9,12 @@
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
- * 
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- * 
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -152,76 +152,76 @@ struct usb_stv {
 
 
 static const unsigned char red[256] = {
-        0, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 
-        18, 18, 18, 18, 18, 18, 18, 25, 30, 35, 38, 42, 
-        44, 47, 50, 53, 54, 57, 59, 61, 63, 65, 67, 69, 
-        71, 71, 73, 75, 77, 78, 80, 81, 82, 84, 85, 87, 
-        88, 89, 90, 91, 93, 94, 95, 97, 98, 98, 99, 101, 
-        102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 
-        114, 115, 116, 116, 117, 118, 119, 120, 121, 122, 123, 124, 
-        125, 125, 126, 127, 128, 129, 129, 130, 131, 132, 133, 134, 
-        134, 135, 135, 136, 137, 138, 139, 140, 140, 141, 142, 143, 
-        143, 143, 144, 145, 146, 147, 147, 148, 149, 150, 150, 151, 
-        152, 152, 152, 153, 154, 154, 155, 156, 157, 157, 158, 159, 
-        159, 160, 161, 161, 161, 162, 163, 163, 164, 165, 165, 166, 
-        167, 167, 168, 168, 169, 170, 170, 170, 171, 171, 172, 173, 
-        173, 174, 174, 175, 176, 176, 177, 178, 178, 179, 179, 179, 
-        180, 180, 181, 181, 182, 183, 183, 184, 184, 185, 185, 186, 
-        187, 187, 188, 188, 188, 188, 189, 190, 190, 191, 191, 192, 
-        192, 193, 193, 194, 195, 195, 196, 196, 197, 197, 197, 197, 
-        198, 198, 199, 199, 200, 201, 201, 202, 202, 203, 203, 204, 
-        204, 205, 205, 206, 206, 206, 206, 207, 207, 208, 208, 209, 
-        209, 210, 210, 211, 211, 212, 212, 213, 213, 214, 214, 215, 
-        215, 215, 215, 216, 216, 217, 217, 218, 218, 218, 219, 219, 
-        220, 220, 221, 221 
-}; 
+        0, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+        18, 18, 18, 18, 18, 18, 18, 25, 30, 35, 38, 42,
+        44, 47, 50, 53, 54, 57, 59, 61, 63, 65, 67, 69,
+        71, 71, 73, 75, 77, 78, 80, 81, 82, 84, 85, 87,
+        88, 89, 90, 91, 93, 94, 95, 97, 98, 98, 99, 101,
+        102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
+        114, 115, 116, 116, 117, 118, 119, 120, 121, 122, 123, 124,
+        125, 125, 126, 127, 128, 129, 129, 130, 131, 132, 133, 134,
+        134, 135, 135, 136, 137, 138, 139, 140, 140, 141, 142, 143,
+        143, 143, 144, 145, 146, 147, 147, 148, 149, 150, 150, 151,
+        152, 152, 152, 153, 154, 154, 155, 156, 157, 157, 158, 159,
+        159, 160, 161, 161, 161, 162, 163, 163, 164, 165, 165, 166,
+        167, 167, 168, 168, 169, 170, 170, 170, 171, 171, 172, 173,
+        173, 174, 174, 175, 176, 176, 177, 178, 178, 179, 179, 179,
+        180, 180, 181, 181, 182, 183, 183, 184, 184, 185, 185, 186,
+        187, 187, 188, 188, 188, 188, 189, 190, 190, 191, 191, 192,
+        192, 193, 193, 194, 195, 195, 196, 196, 197, 197, 197, 197,
+        198, 198, 199, 199, 200, 201, 201, 202, 202, 203, 203, 204,
+        204, 205, 205, 206, 206, 206, 206, 207, 207, 208, 208, 209,
+        209, 210, 210, 211, 211, 212, 212, 213, 213, 214, 214, 215,
+        215, 215, 215, 216, 216, 217, 217, 218, 218, 218, 219, 219,
+        220, 220, 221, 221
+};
 
 static const unsigned char green[256] = {
-        0, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 
-        21, 21, 21, 21, 21, 21, 21, 28, 34, 39, 43, 47, 
-        50, 53, 56, 59, 61, 64, 66, 68, 71, 73, 75, 77, 
-        79, 80, 82, 84, 86, 87, 89, 91, 92, 94, 95, 97, 
-        98, 100, 101, 102, 104, 105, 106, 108, 109, 110, 111, 113, 
-        114, 115, 116, 117, 118, 120, 121, 122, 123, 124, 125, 126, 
-        127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 
-        139, 140, 141, 142, 143, 144, 144, 145, 146, 147, 148, 149, 
-        150, 151, 151, 152, 153, 154, 155, 156, 156, 157, 158, 159, 
-        160, 160, 161, 162, 163, 164, 164, 165, 166, 167, 167, 168, 
-        169, 170, 170, 171, 172, 172, 173, 174, 175, 175, 176, 177, 
-        177, 178, 179, 179, 180, 181, 182, 182, 183, 184, 184, 185, 
-        186, 186, 187, 187, 188, 189, 189, 190, 191, 191, 192, 193, 
-        193, 194, 194, 195, 196, 196, 197, 198, 198, 199, 199, 200, 
-        201, 201, 202, 202, 203, 204, 204, 205, 205, 206, 206, 207, 
-        208, 208, 209, 209, 210, 210, 211, 212, 212, 213, 213, 214, 
-        214, 215, 215, 216, 217, 217, 218, 218, 219, 219, 220, 220, 
-        221, 221, 222, 222, 223, 224, 224, 225, 225, 226, 226, 227, 
-        227, 228, 228, 229, 229, 230, 230, 231, 231, 232, 232, 233, 
-        233, 234, 234, 235, 235, 236, 236, 237, 237, 238, 238, 239, 
-        239, 240, 240, 241, 241, 242, 242, 243, 243, 243, 244, 244, 
-        245, 245, 246, 246 
-}; 
+        0, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+        21, 21, 21, 21, 21, 21, 21, 28, 34, 39, 43, 47,
+        50, 53, 56, 59, 61, 64, 66, 68, 71, 73, 75, 77,
+        79, 80, 82, 84, 86, 87, 89, 91, 92, 94, 95, 97,
+        98, 100, 101, 102, 104, 105, 106, 108, 109, 110, 111, 113,
+        114, 115, 116, 117, 118, 120, 121, 122, 123, 124, 125, 126,
+        127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+        139, 140, 141, 142, 143, 144, 144, 145, 146, 147, 148, 149,
+        150, 151, 151, 152, 153, 154, 155, 156, 156, 157, 158, 159,
+        160, 160, 161, 162, 163, 164, 164, 165, 166, 167, 167, 168,
+        169, 170, 170, 171, 172, 172, 173, 174, 175, 175, 176, 177,
+        177, 178, 179, 179, 180, 181, 182, 182, 183, 184, 184, 185,
+        186, 186, 187, 187, 188, 189, 189, 190, 191, 191, 192, 193,
+        193, 194, 194, 195, 196, 196, 197, 198, 198, 199, 199, 200,
+        201, 201, 202, 202, 203, 204, 204, 205, 205, 206, 206, 207,
+        208, 208, 209, 209, 210, 210, 211, 212, 212, 213, 213, 214,
+        214, 215, 215, 216, 217, 217, 218, 218, 219, 219, 220, 220,
+        221, 221, 222, 222, 223, 224, 224, 225, 225, 226, 226, 227,
+        227, 228, 228, 229, 229, 230, 230, 231, 231, 232, 232, 233,
+        233, 234, 234, 235, 235, 236, 236, 237, 237, 238, 238, 239,
+        239, 240, 240, 241, 241, 242, 242, 243, 243, 243, 244, 244,
+        245, 245, 246, 246
+};
 
 static const unsigned char blue[256] = {
-        0, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 
-        23, 23, 23, 23, 23, 23, 23, 30, 37, 42, 47, 51, 
-        55, 58, 61, 64, 67, 70, 72, 74, 78, 80, 82, 84, 
-        86, 88, 90, 92, 94, 95, 97, 100, 101, 103, 104, 106, 
-        107, 110, 111, 112, 114, 115, 116, 118, 119, 121, 122, 124, 
-        125, 126, 127, 128, 129, 132, 133, 134, 135, 136, 137, 138, 
-        139, 140, 141, 143, 144, 145, 146, 147, 148, 149, 150, 151, 
-        152, 154, 155, 156, 157, 158, 158, 159, 160, 161, 162, 163, 
-        165, 166, 166, 167, 168, 169, 170, 171, 171, 172, 173, 174, 
-        176, 176, 177, 178, 179, 180, 180, 181, 182, 183, 183, 184, 
-        185, 187, 187, 188, 189, 189, 190, 191, 192, 192, 193, 194, 
-        194, 195, 196, 196, 198, 199, 200, 200, 201, 202, 202, 203, 
-        204, 204, 205, 205, 206, 207, 207, 209, 210, 210, 211, 212, 
-        212, 213, 213, 214, 215, 215, 216, 217, 217, 218, 218, 220, 
-        221, 221, 222, 222, 223, 224, 224, 225, 225, 226, 226, 227, 
-        228, 228, 229, 229, 231, 231, 232, 233, 233, 234, 234, 235, 
-        235, 236, 236, 237, 238, 238, 239, 239, 240, 240, 242, 242, 
-        243, 243, 244, 244, 245, 246, 246, 247, 247, 248, 248, 249, 
-        249, 250, 250, 251, 251, 253, 253, 254, 254, 255, 255, 255, 
-        255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 
-        255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 
-        255, 255, 255, 255 
-}; 
+        0, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+        23, 23, 23, 23, 23, 23, 23, 30, 37, 42, 47, 51,
+        55, 58, 61, 64, 67, 70, 72, 74, 78, 80, 82, 84,
+        86, 88, 90, 92, 94, 95, 97, 100, 101, 103, 104, 106,
+        107, 110, 111, 112, 114, 115, 116, 118, 119, 121, 122, 124,
+        125, 126, 127, 128, 129, 132, 133, 134, 135, 136, 137, 138,
+        139, 140, 141, 143, 144, 145, 146, 147, 148, 149, 150, 151,
+        152, 154, 155, 156, 157, 158, 158, 159, 160, 161, 162, 163,
+        165, 166, 166, 167, 168, 169, 170, 171, 171, 172, 173, 174,
+        176, 176, 177, 178, 179, 180, 180, 181, 182, 183, 183, 184,
+        185, 187, 187, 188, 189, 189, 190, 191, 192, 192, 193, 194,
+        194, 195, 196, 196, 198, 199, 200, 200, 201, 202, 202, 203,
+        204, 204, 205, 205, 206, 207, 207, 209, 210, 210, 211, 212,
+        212, 213, 213, 214, 215, 215, 216, 217, 217, 218, 218, 220,
+        221, 221, 222, 222, 223, 224, 224, 225, 225, 226, 226, 227,
+        228, 228, 229, 229, 231, 231, 232, 233, 233, 234, 234, 235,
+        235, 236, 236, 237, 238, 238, 239, 239, 240, 240, 242, 242,
+        243, 243, 244, 244, 245, 246, 246, 247, 247, 248, 248, 249,
+        249, 250, 250, 251, 251, 253, 253, 254, 254, 255, 255, 255,
+        255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+        255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+        255, 255, 255, 255
+};
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index fc3d5824ef..78e043ac9e 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -48,9 +48,8 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 
-#include "bttv.h"
-#include <media/audiochip.h>
 #include <media/v4l2-common.h>
+#include <media/i2c-addr.h>
 
 #ifndef VIDEO_AUDIO_BALANCE
 # define VIDEO_AUDIO_BALANCE 32
@@ -71,7 +70,7 @@ module_param(maxvol, int, S_IRUGO | S_IWUSR);
 
 /* Address to scan (I2C address of this chip) */
 static unsigned short normal_i2c[] = {
-        I2C_TDA7432 >> 1,
+        I2C_ADDR_TDA7432 >> 1,
         I2C_CLIENT_END,
 };
 I2C_CLIENT_INSMOD;
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index 0243700f58..ef494febb5 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -35,7 +35,7 @@ static int debug = 0;		/* insmod parameter */
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 #define dprintk(args...) \
-            do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __FUNCTION__, __LINE__); printk(args); } } while (0)
+            do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __FUNCTION__, __LINE__); printk(args); } } while (0)
 
 #define SWITCH          0x00
 #define LEVEL_ADJUST    0x02
@@ -43,7 +43,7 @@ MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 #define TEST            0x04
 
 /* addresses to scan, found only at 0x42 (7-Bit) */
-static unsigned short normal_i2c[] = { I2C_TDA9840, I2C_CLIENT_END };
+static unsigned short normal_i2c[] = { I2C_ADDR_TDA9840, I2C_CLIENT_END };
 
 /* magic definition of all other variables and things */
 I2C_CLIENT_INSMOD;
diff --git a/drivers/media/video/tda9840.h b/drivers/media/video/tda9840.h
index 28021053bd..7da8432cdc 100644
--- a/drivers/media/video/tda9840.h
+++ b/drivers/media/video/tda9840.h
@@ -1,7 +1,7 @@
 #ifndef __INCLUDED_TDA9840__
 #define __INCLUDED_TDA9840__
 
-#define I2C_TDA9840             0x42
+#define I2C_ADDR_TDA9840                0x42
 
 #define TDA9840_DETECT          _IOR('v',1,int)
 /* return values for TDA9840_DETCT */
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index ef98c49822..103ccb9192 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -30,24 +30,22 @@
 #include <linux/i2c-algo-bit.h>
 #include <linux/init.h>
 
-#include "bttv.h"
-#include <media/audiochip.h>
+
+#include <media/i2c-addr.h>
 
 static int debug; /* insmod parameter */
 module_param(debug, int, S_IRUGO | S_IWUSR);
 MODULE_LICENSE("GPL");
 
-
 /* Addresses to scan */
 static unsigned short normal_i2c[] =  {
-    I2C_TDA9875 >> 1,
+    I2C_ADDR_TDA9875 >> 1,
     I2C_CLIENT_END
 };
 I2C_CLIENT_INSMOD;
 
 /* This is a superset of the TDA9875 */
 struct tda9875 {
-        int mode;
         int rvol, lvol;
         int bass, treble;
         struct i2c_client c;
@@ -197,7 +195,6 @@ static void do_tda9875_init(struct i2c_client *client)
 
         tda9875_write(client, TDA9875_MUT, 0xcc );   /* General mute  */
 
-        t->mode=AUDIO_UNMUTE;
         t->lvol=t->rvol =0;     /* 0dB */
         t->bass=0;                      /* 0dB */
         t->treble=0;            /* 0dB */
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index 774ed0dbc5..523df0b8cc 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -37,7 +37,7 @@ static int debug = 0;		/* insmod parameter */
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 #define dprintk(args...) \
-            do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __FUNCTION__, __LINE__); printk(args); } } while (0)
+            do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __FUNCTION__, __LINE__); printk(args); } } while (0)
 
 #define TEA6415C_NUM_INPUTS     8
 #define TEA6415C_NUM_OUTPUTS    6
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index ad7d2872cf..e0ff811fab 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -37,10 +37,10 @@ static int debug = 0;		/* insmod parameter */
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 #define dprintk(args...) \
-            do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __FUNCTION__, __LINE__); printk(args); } } while (0)
+            do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __FUNCTION__, __LINE__); printk(args); } } while (0)
 
 /* addresses to scan, found only at 0x4c and/or 0x4d (7-Bit) */
-static unsigned short normal_i2c[] = { I2C_TEA6420_1, I2C_TEA6420_2, I2C_CLIENT_END };
+static unsigned short normal_i2c[] = { I2C_ADDR_TEA6420_1, I2C_ADDR_TEA6420_2, I2C_CLIENT_END };
 
 /* magic definition of all other variables and things */
 I2C_CLIENT_INSMOD;
diff --git a/drivers/media/video/tea6420.h b/drivers/media/video/tea6420.h
index ea664df15a..5ef7c18e0c 100644
--- a/drivers/media/video/tea6420.h
+++ b/drivers/media/video/tea6420.h
@@ -2,8 +2,8 @@
 #define __INCLUDED_TEA6420__
 
 /* possible addresses */
-#define I2C_TEA6420_1           0x4c
-#define I2C_TEA6420_2           0x4d
+#define I2C_ADDR_TEA6420_1              0x4c
+#define I2C_ADDR_TEA6420_2              0x4d
 
 struct tea6420_multiplex
 {
diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
index c4a78e7a5a..74ab48c09c 100644
--- a/drivers/media/video/tuner-3036.c
+++ b/drivers/media/video/tuner-3036.c
@@ -5,7 +5,7 @@
  *
  * The SAB3036 is just about different enough from the chips that
  * tuner.c copes with to make it not worth the effort to crowbar
- * the support into that file.  So instead we have a separate driver. 
+ * the support into that file.  So instead we have a separate driver.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -56,15 +56,15 @@ tuner_getstatus (struct i2c_client *c)
 
 #define TUNER_FL        0x80
 
-static int 
+static int
 tuner_islocked (struct i2c_client *c)
 {
-        return (tuner_getstatus(c) & TUNER_FL);
+        return (tuner_getstatus(c) & TUNER_FL);
 }
 
 /* ---------------------------------------------------------------------- */
 
-static void 
+static void
 set_tv_freq(struct i2c_client *c, int freq)
 {
         u16 div = ((freq * 20) / 16);
@@ -73,26 +73,26 @@ set_tv_freq(struct i2c_client *c, int freq)
 
         if (debug)
                 printk(KERN_DEBUG "tuner: setting frequency %dMHz, divisor %x\n", freq / 16, div);
-        
+
         /* Select high tuning current */
         buffer[0] = 0x29;
         buffer[1] = 0x3e;
 
         if (i2c_master_send(c, buffer, 2) != 2)
                 printk("tuner: i2c i/o error 1\n");
-        
+
         buffer[0] = 0x80 | ((div>>8) & 0x7f);
         buffer[1] = div & 0xff;
 
         if (i2c_master_send(c, buffer, 2) != 2)
                 printk("tuner: i2c i/o error 2\n");
-        
+
         while (!tuner_islocked(c) && time_before(jiffies, give_up))
                 schedule();
-               
+
         if (!tuner_islocked(c))
                 printk(KERN_WARNING "tuner: failed to achieve PLL lock\n");
-        
+
         /* Select low tuning current and engage AFC */
         buffer[0] = 0x29;
         buffer[1] = 0xb2;
@@ -106,7 +106,7 @@ set_tv_freq(struct i2c_client *c, int freq)
 
 /* ---------------------------------------------------------------------- */
 
-static int 
+static int
 tuner_attach(struct i2c_adapter *adap, int addr, int kind)
 {
         static unsigned char buffer[] = { 0x29, 0x32, 0x2a, 0, 0x2b, 0 };
@@ -116,18 +116,18 @@ tuner_attach(struct i2c_adapter *adap, int addr, int kind)
         if (this_adap > 0)
                 return -1;
         this_adap++;
-        
-        client_template.adapter = adap;
-        client_template.addr = addr;
+
+        client_template.adapter = adap;
+        client_template.addr = addr;
 
         client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == NULL)
-                return -ENOMEM;
-        memcpy(client, &client_template, sizeof(struct i2c_client));
+        if (client == NULL)
+                return -ENOMEM;
+        memcpy(client, &client_template, sizeof(struct i2c_client));
 
         printk("tuner: SAB3036 found, status %02x\n", tuner_getstatus(client));
 
-        i2c_attach_client(client);
+        i2c_attach_client(client);
 
         if (i2c_master_send(client, buffer, 2) != 2)
                 printk("tuner: i2c i/o error 1\n");
@@ -138,30 +138,30 @@ tuner_attach(struct i2c_adapter *adap, int addr, int kind)
         return 0;
 }
 
-static int 
+static int
 tuner_detach(struct i2c_client *c)
 {
         return 0;
 }
 
-static int 
+static int
 tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
 {
         int *iarg = (int*)arg;
 
-        switch (cmd) 
+        switch (cmd)
         {
                 case VIDIOCSFREQ:
                         set_tv_freq(client, *iarg);
                         break;
-            
+
                 default:
                         return -EINVAL;
         }
         return 0;
 }
 
-static int 
+static int
 tuner_probe(struct i2c_adapter *adap)
 {
         this_adap = 0;
@@ -172,8 +172,8 @@ tuner_probe(struct i2c_adapter *adap)
 
 /* ----------------------------------------------------------------------- */
 
-static struct i2c_driver 
-i2c_driver_tuner = 
+static struct i2c_driver
+i2c_driver_tuner =
 {
         .driver = {
                 .name   =       "sab3036",
@@ -186,7 +186,7 @@ i2c_driver_tuner =
 
 static struct i2c_client client_template =
 {
-        .driver         = &i2c_driver_tuner,
+        .driver         = &i2c_driver_tuner,
         .name           = "SAB3036",
 };
 
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 32e1849441..df195c9053 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -21,7 +21,6 @@
 
 #include <media/tuner.h>
 #include <media/v4l2-common.h>
-#include <media/audiochip.h>
 
 #define UNSET (-1U)
 
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 4efb01bb44..356bff455a 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -30,10 +30,10 @@
 #include <linux/init.h>
 #include <linux/smp_lock.h>
 
-#include <media/audiochip.h>
+#include <media/tvaudio.h>
 #include <media/v4l2-common.h>
 
-#include "tvaudio.h"
+#include <media/i2c-addr.h>
 
 /* ---------------------------------------------------------------------- */
 /* insmod args                                                            */
@@ -102,7 +102,7 @@ struct CHIPDESC {
 
         /* input switch register + values for v4l inputs */
         int  inputreg;
-        int  inputmap[8];
+        int  inputmap[4];
         int  inputmute;
         int  inputmask;
 };
@@ -119,9 +119,10 @@ struct CHIPSTATE {
         audiocmd   shadow;
 
         /* current settings */
-        __u16 left,right,treble,bass,mode;
+        __u16 left,right,treble,bass,muted,mode;
         int prevmode;
         int radio;
+        int input;
 
         /* thread */
         pid_t                tpid;
@@ -137,14 +138,14 @@ struct CHIPSTATE {
 /* i2c addresses                                                          */
 
 static unsigned short normal_i2c[] = {
-        I2C_TDA8425   >> 1,
-        I2C_TEA6300   >> 1,
-        I2C_TEA6420   >> 1,
-        I2C_TDA9840   >> 1,
-        I2C_TDA985x_L >> 1,
-        I2C_TDA985x_H >> 1,
-        I2C_TDA9874   >> 1,
-        I2C_PIC16C54  >> 1,
+        I2C_ADDR_TDA8425   >> 1,
+        I2C_ADDR_TEA6300   >> 1,
+        I2C_ADDR_TEA6420   >> 1,
+        I2C_ADDR_TDA9840   >> 1,
+        I2C_ADDR_TDA985x_L >> 1,
+        I2C_ADDR_TDA985x_H >> 1,
+        I2C_ADDR_TDA9874   >> 1,
+        I2C_ADDR_PIC16C54  >> 1,
         I2C_CLIENT_END };
 I2C_CLIENT_INSMOD;
 
@@ -1101,9 +1102,8 @@ static int tda8425_shift12(int val) { return (val >> 12) | 0xf0; }
 static int tda8425_initialize(struct CHIPSTATE *chip)
 {
         struct CHIPDESC *desc = chiplist + chip->type;
-        int inputmap[8] = { /* tuner    */ TDA8425_S1_CH2, /* radio  */ TDA8425_S1_CH1,
-                            /* extern   */ TDA8425_S1_CH1, /* intern */ TDA8425_S1_OFF,
-                            /* off      */ TDA8425_S1_OFF, /* on     */ TDA8425_S1_CH2};
+        int inputmap[4] = { /* tuner    */ TDA8425_S1_CH2, /* radio  */ TDA8425_S1_CH1,
+                            /* extern   */ TDA8425_S1_CH1, /* intern */ TDA8425_S1_OFF};
 
         if (chip->c.adapter->id == I2C_HW_B_RIVA) {
                 memcpy (desc->inputmap, inputmap, sizeof (inputmap));
@@ -1269,8 +1269,8 @@ static struct CHIPDESC chiplist[] = {
                 .name       = "tda9840",
                 .id         = I2C_DRIVERID_TDA9840,
                 .insmodopt  = &tda9840,
-                .addr_lo    = I2C_TDA9840 >> 1,
-                .addr_hi    = I2C_TDA9840 >> 1,
+                .addr_lo    = I2C_ADDR_TDA9840 >> 1,
+                .addr_hi    = I2C_ADDR_TDA9840 >> 1,
                 .registers  = 5,
 
                 .checkit    = tda9840_checkit,
@@ -1286,8 +1286,8 @@ static struct CHIPDESC chiplist[] = {
                 .id         = I2C_DRIVERID_TDA9873,
                 .checkit    = tda9873_checkit,
                 .insmodopt  = &tda9873,
-                .addr_lo    = I2C_TDA985x_L >> 1,
-                .addr_hi    = I2C_TDA985x_H >> 1,
+                .addr_lo    = I2C_ADDR_TDA985x_L >> 1,
+                .addr_hi    = I2C_ADDR_TDA985x_H >> 1,
                 .registers  = 3,
                 .flags      = CHIP_HAS_INPUTSEL,
 
@@ -1298,7 +1298,7 @@ static struct CHIPDESC chiplist[] = {
                 .init       = { 4, { TDA9873_SW, 0xa4, 0x06, 0x03 } },
                 .inputreg   = TDA9873_SW,
                 .inputmute  = TDA9873_MUTE | TDA9873_AUTOMUTE,
-                .inputmap   = {0xa0, 0xa2, 0xa0, 0xa0, 0xc0},
+                .inputmap   = {0xa0, 0xa2, 0xa0, 0xa0},
                 .inputmask  = TDA9873_INP_MASK|TDA9873_MUTE|TDA9873_AUTOMUTE,
 
         },
@@ -1308,8 +1308,8 @@ static struct CHIPDESC chiplist[] = {
                 .checkit    = tda9874a_checkit,
                 .initialize = tda9874a_initialize,
                 .insmodopt  = &tda9874a,
-                .addr_lo    = I2C_TDA9874 >> 1,
-                .addr_hi    = I2C_TDA9874 >> 1,
+                .addr_lo    = I2C_ADDR_TDA9874 >> 1,
+                .addr_hi    = I2C_ADDR_TDA9874 >> 1,
 
                 .getmode    = tda9874a_getmode,
                 .setmode    = tda9874a_setmode,
@@ -1319,8 +1319,8 @@ static struct CHIPDESC chiplist[] = {
                 .name       = "tda9850",
                 .id         = I2C_DRIVERID_TDA9850,
                 .insmodopt  = &tda9850,
-                .addr_lo    = I2C_TDA985x_L >> 1,
-                .addr_hi    = I2C_TDA985x_H >> 1,
+                .addr_lo    = I2C_ADDR_TDA985x_L >> 1,
+                .addr_hi    = I2C_ADDR_TDA985x_H >> 1,
                 .registers  = 11,
 
                 .getmode    = tda985x_getmode,
@@ -1332,8 +1332,8 @@ static struct CHIPDESC chiplist[] = {
                 .name       = "tda9855",
                 .id         = I2C_DRIVERID_TDA9855,
                 .insmodopt  = &tda9855,
-                .addr_lo    = I2C_TDA985x_L >> 1,
-                .addr_hi    = I2C_TDA985x_H >> 1,
+                .addr_lo    = I2C_ADDR_TDA985x_L >> 1,
+                .addr_hi    = I2C_ADDR_TDA985x_H >> 1,
                 .registers  = 11,
                 .flags      = CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE,
 
@@ -1357,8 +1357,8 @@ static struct CHIPDESC chiplist[] = {
                 .name       = "tea6300",
                 .id         = I2C_DRIVERID_TEA6300,
                 .insmodopt  = &tea6300,
-                .addr_lo    = I2C_TEA6300 >> 1,
-                .addr_hi    = I2C_TEA6300 >> 1,
+                .addr_lo    = I2C_ADDR_TEA6300 >> 1,
+                .addr_hi    = I2C_ADDR_TEA6300 >> 1,
                 .registers  = 6,
                 .flags      = CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE | CHIP_HAS_INPUTSEL,
 
@@ -1379,8 +1379,8 @@ static struct CHIPDESC chiplist[] = {
                 .id         = I2C_DRIVERID_TEA6300,
                 .initialize = tea6320_initialize,
                 .insmodopt  = &tea6320,
-                .addr_lo    = I2C_TEA6300 >> 1,
-                .addr_hi    = I2C_TEA6300 >> 1,
+                .addr_lo    = I2C_ADDR_TEA6300 >> 1,
+                .addr_hi    = I2C_ADDR_TEA6300 >> 1,
                 .registers  = 8,
                 .flags      = CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE | CHIP_HAS_INPUTSEL,
 
@@ -1400,8 +1400,8 @@ static struct CHIPDESC chiplist[] = {
                 .name       = "tea6420",
                 .id         = I2C_DRIVERID_TEA6420,
                 .insmodopt  = &tea6420,
-                .addr_lo    = I2C_TEA6420 >> 1,
-                .addr_hi    = I2C_TEA6420 >> 1,
+                .addr_lo    = I2C_ADDR_TEA6420 >> 1,
+                .addr_hi    = I2C_ADDR_TEA6420 >> 1,
                 .registers  = 1,
                 .flags      = CHIP_HAS_INPUTSEL,
 
@@ -1413,8 +1413,8 @@ static struct CHIPDESC chiplist[] = {
                 .name       = "tda8425",
                 .id         = I2C_DRIVERID_TDA8425,
                 .insmodopt  = &tda8425,
-                .addr_lo    = I2C_TDA8425 >> 1,
-                .addr_hi    = I2C_TDA8425 >> 1,
+                .addr_lo    = I2C_ADDR_TDA8425 >> 1,
+                .addr_hi    = I2C_ADDR_TDA8425 >> 1,
                 .registers  = 9,
                 .flags      = CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE | CHIP_HAS_INPUTSEL,
 
@@ -1437,8 +1437,8 @@ static struct CHIPDESC chiplist[] = {
                 .name       = "pic16c54 (PV951)",
                 .id         = I2C_DRIVERID_PIC16C54_PV9,
                 .insmodopt  = &pic16c54,
-                .addr_lo    = I2C_PIC16C54 >> 1,
-                .addr_hi    = I2C_PIC16C54>> 1,
+                .addr_lo    = I2C_ADDR_PIC16C54 >> 1,
+                .addr_hi    = I2C_ADDR_PIC16C54>> 1,
                 .registers  = 2,
                 .flags      = CHIP_HAS_INPUTSEL,
 
@@ -1446,8 +1446,7 @@ static struct CHIPDESC chiplist[] = {
                 .inputmap   = {PIC16C54_MISC_SND_NOTMUTE|PIC16C54_MISC_SWITCH_TUNER,
                              PIC16C54_MISC_SND_NOTMUTE|PIC16C54_MISC_SWITCH_LINE,
                              PIC16C54_MISC_SND_NOTMUTE|PIC16C54_MISC_SWITCH_LINE,
-                             PIC16C54_MISC_SND_MUTE,PIC16C54_MISC_SND_MUTE,
-                             PIC16C54_MISC_SND_NOTMUTE},
+                             PIC16C54_MISC_SND_MUTE},
                 .inputmute  = PIC16C54_MISC_SND_MUTE,
         },
         {
@@ -1456,8 +1455,8 @@ static struct CHIPDESC chiplist[] = {
                 /*.id         = I2C_DRIVERID_TA8874Z, */
                 .checkit    = ta8874z_checkit,
                 .insmodopt  = &ta8874z,
-                .addr_lo    = I2C_TDA9840 >> 1,
-                .addr_hi    = I2C_TDA9840 >> 1,
+                .addr_lo    = I2C_ADDR_TDA9840 >> 1,
+                .addr_hi    = I2C_ADDR_TDA9840 >> 1,
                 .registers  = 2,
 
                 .getmode    = ta8874z_getmode,
@@ -1583,28 +1582,40 @@ static int chip_detach(struct i2c_client *client)
         return 0;
 }
 
+static int tvaudio_set_ctrl(struct CHIPSTATE *chip, struct v4l2_control *ctrl)
+{
+        struct CHIPDESC *desc = chiplist + chip->type;
+
+        switch (ctrl->id) {
+        case V4L2_CID_AUDIO_MUTE:
+                if (ctrl->value < 0 || ctrl->value >= 2)
+                        return -ERANGE;
+                chip->muted = ctrl->value;
+                if (chip->muted)
+                        chip_write_masked(chip,desc->inputreg,desc->inputmute,desc->inputmask);
+                else
+                        chip_write_masked(chip,desc->inputreg,
+                                        desc->inputmap[chip->input],desc->inputmask);
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+
 /* ---------------------------------------------------------------------- */
 /* video4linux interface                                                  */
 
 static int chip_command(struct i2c_client *client,
                         unsigned int cmd, void *arg)
 {
-        __u16 *sarg = arg;
         struct CHIPSTATE *chip = i2c_get_clientdata(client);
         struct CHIPDESC  *desc = chiplist + chip->type;
 
         v4l_dbg(1, debug, &chip->c, "%s: chip_command 0x%x\n", chip->c.name, cmd);
 
         switch (cmd) {
-        case AUDC_SET_INPUT:
-                if (desc->flags & CHIP_HAS_INPUTSEL) {
-                        if (*sarg & 0x80)
-                                chip_write_masked(chip,desc->inputreg,desc->inputmute,desc->inputmask);
-                        else
-                                chip_write_masked(chip,desc->inputreg,desc->inputmap[*sarg],desc->inputmask);
-                }
-                break;
-
         case AUDC_SET_RADIO:
                 chip->radio = 1;
                 chip->watch_stereo = 0;
@@ -1668,6 +1679,48 @@ static int chip_command(struct i2c_client *client,
                 break;
         }
 
+        case VIDIOC_S_CTRL:
+                return tvaudio_set_ctrl(chip, arg);
+
+        case VIDIOC_INT_G_AUDIO_ROUTING:
+        {
+                struct v4l2_routing *rt = arg;
+
+                rt->input = chip->input;
+                rt->output = 0;
+                break;
+        }
+
+        case VIDIOC_INT_S_AUDIO_ROUTING:
+        {
+                struct v4l2_routing *rt = arg;
+
+                if (!(desc->flags & CHIP_HAS_INPUTSEL) || rt->input >= 4)
+                                return -EINVAL;
+                /* There are four inputs: tuner, radio, extern and intern. */
+                chip->input = rt->input;
+                if (chip->muted)
+                        break;
+                chip_write_masked(chip, desc->inputreg,
+                                desc->inputmap[chip->input], desc->inputmask);
+                break;
+        }
+
+        case VIDIOC_S_AUDIO:
+        {
+                struct v4l2_audio *sarg = arg;
+
+                if (!(desc->flags & CHIP_HAS_INPUTSEL) || sarg->index >= 4)
+                                return -EINVAL;
+                /* There are four inputs: tuner, radio, extern and intern. */
+                chip->input = sarg->index;
+                if (chip->muted)
+                        break;
+                chip_write_masked(chip, desc->inputreg,
+                                desc->inputmap[chip->input], desc->inputmask);
+                break;
+        }
+
         case VIDIOC_S_TUNER:
         {
                 struct v4l2_tuner *vt = arg;
@@ -1680,6 +1733,7 @@ static int chip_command(struct i2c_client *client,
                         mode = VIDEO_SOUND_MONO;
                         break;
                 case V4L2_TUNER_MODE_STEREO:
+                case V4L2_TUNER_MODE_LANG1_LANG2:
                         mode = VIDEO_SOUND_STEREO;
                         break;
                 case V4L2_TUNER_MODE_LANG1:
diff --git a/drivers/media/video/tvaudio.h b/drivers/media/video/tvaudio.h
deleted file mode 100644
index af7e116af9..0000000000
--- a/drivers/media/video/tvaudio.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * i2c bus addresses for the chips supported by tvaudio.c
- */
-
-#define I2C_TDA8425        0x82
-#define I2C_TDA9840        0x84 /* also used by TA8874Z */
-#define I2C_TDA985x_L      0xb4 /* also used by 9873 */
-#define I2C_TDA985x_H      0xb6
-#define I2C_TDA9874        0xb0 /* also used by 9875 */
-
-#define I2C_TEA6300        0x80 /* also used by 6320 */
-#define I2C_TEA6420        0x98
-
-#define I2C_PIC16C54       0x96 /* PV951 */
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 582551b096..e0d2ff83fc 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -248,32 +248,32 @@ audioIC[] =
         {AUDIO_CHIP_MSP34XX,  "MSP3410D"},
         {AUDIO_CHIP_MSP34XX,  "MSP3415"},
         {AUDIO_CHIP_MSP34XX,  "MSP3430"},
-        {AUDIO_CHIP_UNKNOWN,  "MSP3438"},
+        {AUDIO_CHIP_MSP34XX,  "MSP3438"},
         {AUDIO_CHIP_UNKNOWN,  "CS5331"},
         /* 10-14 */
         {AUDIO_CHIP_MSP34XX,  "MSP3435"},
         {AUDIO_CHIP_MSP34XX,  "MSP3440"},
         {AUDIO_CHIP_MSP34XX,  "MSP3445"},
-        {AUDIO_CHIP_UNKNOWN,  "MSP3411"},
-        {AUDIO_CHIP_UNKNOWN,  "MSP3416"},
+        {AUDIO_CHIP_MSP34XX,  "MSP3411"},
+        {AUDIO_CHIP_MSP34XX,  "MSP3416"},
         /* 15-19 */
         {AUDIO_CHIP_MSP34XX,  "MSP3425"},
-        {AUDIO_CHIP_UNKNOWN,  "MSP3451"},
-        {AUDIO_CHIP_UNKNOWN,  "MSP3418"},
+        {AUDIO_CHIP_MSP34XX,  "MSP3451"},
+        {AUDIO_CHIP_MSP34XX,  "MSP3418"},
         {AUDIO_CHIP_UNKNOWN,  "Type 0x12"},
         {AUDIO_CHIP_UNKNOWN,  "OKI7716"},
         /* 20-24 */
-        {AUDIO_CHIP_UNKNOWN,  "MSP4410"},
-        {AUDIO_CHIP_UNKNOWN,  "MSP4420"},
-        {AUDIO_CHIP_UNKNOWN,  "MSP4440"},
-        {AUDIO_CHIP_UNKNOWN,  "MSP4450"},
-        {AUDIO_CHIP_UNKNOWN,  "MSP4408"},
+        {AUDIO_CHIP_MSP34XX,  "MSP4410"},
+        {AUDIO_CHIP_MSP34XX,  "MSP4420"},
+        {AUDIO_CHIP_MSP34XX,  "MSP4440"},
+        {AUDIO_CHIP_MSP34XX,  "MSP4450"},
+        {AUDIO_CHIP_MSP34XX,  "MSP4408"},
         /* 25-29 */
-        {AUDIO_CHIP_UNKNOWN,  "MSP4418"},
-        {AUDIO_CHIP_UNKNOWN,  "MSP4428"},
-        {AUDIO_CHIP_UNKNOWN,  "MSP4448"},
-        {AUDIO_CHIP_UNKNOWN,  "MSP4458"},
-        {AUDIO_CHIP_UNKNOWN,  "Type 0x1d"},
+        {AUDIO_CHIP_MSP34XX,  "MSP4418"},
+        {AUDIO_CHIP_MSP34XX,  "MSP4428"},
+        {AUDIO_CHIP_MSP34XX,  "MSP4448"},
+        {AUDIO_CHIP_MSP34XX,  "MSP4458"},
+        {AUDIO_CHIP_MSP34XX,  "Type 0x1d"},
         /* 30-34 */
         {AUDIO_CHIP_INTERNAL, "CX880"},
         {AUDIO_CHIP_INTERNAL, "CX881"},
diff --git a/drivers/media/video/usbvideo/Makefile b/drivers/media/video/usbvideo/Makefile
new file mode 100644
index 0000000000..ed410a5ee8
--- /dev/null
+++ b/drivers/media/video/usbvideo/Makefile
@@ -0,0 +1,4 @@
+obj-$(CONFIG_USB_IBMCAM)        += ibmcam.o usbvideo.o ultracam.o
+obj-$(CONFIG_USB_KONICAWC)      += konicawc.o usbvideo.o
+obj-$(CONFIG_USB_VICAM)         += vicam.o usbvideo.o
+
diff --git a/drivers/usb/media/ibmcam.c b/drivers/media/video/usbvideo/ibmcam.c
index a42c222941..76f771b6a3 100644
--- a/drivers/usb/media/ibmcam.c
+++ b/drivers/media/video/usbvideo/ibmcam.c
@@ -1300,11 +1300,11 @@ static void ibmcam_model2_Packet1(struct uvd *uvd, unsigned short v1, unsigned s
 /*
  * ibmcam_model3_Packet1()
  *
- * 00_0078_012d 
+ * 00_0078_012d
  * 00_0097_012f
- * 00_d141_0124 
+ * 00_d141_0124
  * 00_0096_0127
- * 00_fea8_0124 
+ * 00_fea8_0124
 */
 static void ibmcam_model3_Packet1(struct uvd *uvd, unsigned short v1, unsigned short v2)
 {
@@ -2687,7 +2687,7 @@ static void ibmcam_model4_setup_after_video_if(struct uvd *uvd)
                 ibmcam_veio(uvd, 0, 0x0004, 0x0127);
                 ibmcam_veio(uvd, 0, 0xfea8, 0x0124);
                 ibmcam_veio(uvd, 0, 0x00c0, 0x010c);
-                break; 
+                break;
         }
         usb_clear_halt(uvd->dev, usb_rcvisocpipe(uvd->dev, uvd->video_endp));
 }
@@ -3238,7 +3238,7 @@ static void ibmcam_model3_setup_after_video_if(struct uvd *uvd)
                 {0, 0x0062, 0x0107},
                 {0, 0x0003, 0x0111},
         };
-#define NUM_INIT_DATA 
+#define NUM_INIT_DATA
 
         unsigned short compression = 0; /* 0=none, 7=best frame rate  */
         int f_rate; /* 0=Fastest 7=slowest */
diff --git a/drivers/usb/media/konicawc.c b/drivers/media/video/usbvideo/konicawc.c
index e2ede58351..c11f5d46b1 100644
--- a/drivers/usb/media/konicawc.c
+++ b/drivers/media/video/usbvideo/konicawc.c
@@ -36,7 +36,7 @@
 enum ctrl_req {
         SetWhitebal     = 0x01,
         SetBrightness   = 0x02,
-        SetSharpness    = 0x03,
+        SetSharpness    = 0x03,
         SetContrast     = 0x04,
         SetSaturation   = 0x05,
 };
@@ -47,7 +47,7 @@ enum frame_sizes {
         SIZE_160X136    = 1,
         SIZE_176X144    = 2,
         SIZE_320X240    = 3,
-        
+
 };
 
 #define MAX_FRAME_SIZE  SIZE_320X240
@@ -69,7 +69,7 @@ static const int debug = 0;
 /* Some default values for initial camera settings,
    can be set by modprobe */
 
-static int size;        
+static int size;
 static int speed = 6;           /* Speed (fps) 0 (slowest) to 6 (fastest) */
 static int brightness = MAX_BRIGHTNESS/2;
 static int contrast =   MAX_CONTRAST/2;
@@ -132,24 +132,24 @@ struct konicawc {
 
 static int konicawc_ctrl_msg(struct uvd *uvd, u8 dir, u8 request, u16 value, u16 index, void *buf, int len)
 {
-        int retval = usb_control_msg(uvd->dev,
+        int retval = usb_control_msg(uvd->dev,
                 dir ? usb_rcvctrlpipe(uvd->dev, 0) : usb_sndctrlpipe(uvd->dev, 0),
                     request, 0x40 | dir, value, index, buf, len, 1000);
-        return retval < 0 ? retval : 0;
+        return retval < 0 ? retval : 0;
 }
 
 
 static inline void konicawc_camera_on(struct uvd *uvd)
 {
-        DEBUG(0, "camera on");
-        konicawc_set_misc(uvd, 0x2, 1, 0x0b);
+        DEBUG(0, "camera on");
+        konicawc_set_misc(uvd, 0x2, 1, 0x0b);
 }
 
 
 static inline void konicawc_camera_off(struct uvd *uvd)
 {
-        DEBUG(0, "camera off");
-        konicawc_set_misc(uvd, 0x2, 0, 0x0b);
+        DEBUG(0, "camera off");
+        konicawc_set_misc(uvd, 0x2, 0, 0x0b);
 }
 
 
@@ -317,7 +317,7 @@ static int konicawc_compress_iso(struct uvd *uvd, struct urb *dataurb, struct ur
                         button = !!(sts & 0x40);
                         sts &= ~0x40;
                 }
-                
+
                 /* work out the button status, but don't do
                    anything with it for now */
 
@@ -331,7 +331,7 @@ static int konicawc_compress_iso(struct uvd *uvd, struct urb *dataurb, struct ur
                         discard++;
                         continue;
                 }
-                
+
                 if((sts > 0x01) && (sts < 0x80)) {
                         info("unknown status %2.2x", sts);
                         bad++;
@@ -350,7 +350,7 @@ static int konicawc_compress_iso(struct uvd *uvd, struct urb *dataurb, struct ur
                                 DEBUG(2, "found initial image");
                                 cam->lastframe = -1;
                         }
-                                
+
                         marker[3] = sts & 0x7F;
                         RingQueue_Enqueue(&uvd->dp, marker, 4);
                         totlen += 4;
@@ -367,16 +367,16 @@ static int konicawc_compress_iso(struct uvd *uvd, struct urb *dataurb, struct ur
 
 static void resubmit_urb(struct uvd *uvd, struct urb *urb)
 {
-        int i, ret;
-        for (i = 0; i < FRAMES_PER_DESC; i++) {
-                urb->iso_frame_desc[i].status = 0;
-        }
-        urb->dev = uvd->dev;
-        urb->status = 0;
+        int i, ret;
+        for (i = 0; i < FRAMES_PER_DESC; i++) {
+                urb->iso_frame_desc[i].status = 0;
+        }
+        urb->dev = uvd->dev;
+        urb->status = 0;
         ret = usb_submit_urb(urb, GFP_ATOMIC);
         DEBUG(3, "submitting urb of length %d", urb->transfer_buffer_length);
-        if(ret)
-                err("usb_submit_urb error (%d)", ret);
+        if(ret)
+                err("usb_submit_urb error (%d)", ret);
 
 }
 
@@ -490,7 +490,7 @@ static int konicawc_start_data(struct uvd *uvd)
         }
 
         cam->last_data_urb = NULL;
-        
+
         /* Submit all URBs */
         for (i=0; i < USBVIDEO_NUMSBUF; i++) {
                 errFlag = usb_submit_urb(cam->sts_urb[i], GFP_KERNEL);
@@ -539,7 +539,7 @@ static void konicawc_stop_data(struct uvd *uvd)
 
 
 static void konicawc_process_isoc(struct uvd *uvd, struct usbvideo_frame *frame)
-{       
+{
         struct konicawc *cam = (struct konicawc *)uvd->user_data;
         int maxline = cam->maxline;
         int yplanesz = cam->yplanesz;
@@ -583,13 +583,13 @@ static void konicawc_process_isoc(struct uvd *uvd, struct usbvideo_frame *frame)
 
         if(frame->scanstate == ScanState_Scanning)
                 return;
-                
+
         /* Try to move data from queue into frame buffer
          * We get data in blocks of 384 bytes made up of:
          * 256 Y, 64 U, 64 V.
          * This needs to be written out as a Y plane, a U plane and a V plane.
          */
-                
+
         while ( frame->curline < maxline && (RingQueue_GetLength(&uvd->dp) >= 384)) {
                 /* Y */
                 RingQueue_Dequeue(&uvd->dp, frame->data + (frame->curline * 256), 256);
diff --git a/drivers/usb/media/ultracam.c b/drivers/media/video/usbvideo/ultracam.c
index 75ff755224..10c58b4a2e 100644
--- a/drivers/usb/media/ultracam.c
+++ b/drivers/media/video/usbvideo/ultracam.c
@@ -23,7 +23,7 @@
 typedef struct {
         int initialized;        /* Had we already sent init sequence? */
         int camera_model;       /* What type of IBM camera we got? */
-        int has_hdr;
+        int has_hdr;
 } ultracam_t;
 #define ULTRACAM_T(uvd) ((ultracam_t *)((uvd)->user_data))
 
diff --git a/drivers/usb/media/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
index 0b51fae720..13b37c8c0d 100644
--- a/drivers/usb/media/usbvideo.c
+++ b/drivers/media/video/usbvideo/usbvideo.c
@@ -574,7 +574,7 @@ void usbvideo_TestPattern(struct uvd *uvd, int fullframe, int pmode)
                         } else {
                                 /* Just the blue screen */
                         }
-                                
+
                         *f++ = cb;
                         *f++ = cg;
                         *f++ = cr;
@@ -1243,7 +1243,7 @@ static int usbvideo_v4l_close(struct inode *inode, struct file *file)
 
 #if USBVIDEO_REPORT_STATS
         usbvideo_ReportStatistics(uvd);
-#endif    
+#endif
 
         uvd->user--;
         if (uvd->remove_pending) {
@@ -1290,7 +1290,7 @@ static int usbvideo_v4l_do_ioctl(struct inode *inode, struct file *file,
                         return 0;
                 }
                 case VIDIOCSCHAN:
-                {       
+                {
                         struct video_channel *v = arg;
                         if (v->channel != 0)
                                 return -EINVAL;
@@ -1347,7 +1347,7 @@ static int usbvideo_v4l_do_ioctl(struct inode *inode, struct file *file,
                         vw->chromakey = 0;
                         if (VALID_CALLBACK(uvd, getFPS))
                                 vw->flags = GET_CALLBACK(uvd, getFPS)(uvd);
-                        else 
+                        else
                                 vw->flags = 10; /* FIXME: do better! */
                         return 0;
                 }
@@ -1359,7 +1359,7 @@ static int usbvideo_v4l_do_ioctl(struct inode *inode, struct file *file,
                         memset(vm, 0, sizeof(*vm));
                         vm->size = uvd->max_frame_size * USBVIDEO_NUMFRAMES;
                         vm->frames = USBVIDEO_NUMFRAMES;
-                        for(i = 0; i < USBVIDEO_NUMFRAMES; i++) 
+                        for(i = 0; i < USBVIDEO_NUMFRAMES; i++)
                           vm->offsets[i] = i * uvd->max_frame_size;
 
                         return 0;
@@ -1425,7 +1425,7 @@ static int usbvideo_v4l_do_ioctl(struct inode *inode, struct file *file,
 
                         if (*frameNum < 0 || *frameNum >= USBVIDEO_NUMFRAMES)
                                 return -EINVAL;
-                                
+
                         if (uvd->debug >= 1)
                                 info("VIDIOCSYNC: syncing to frame %d.", *frameNum);
                         if (uvd->flags & FLAGS_NO_DECODING)
@@ -1454,8 +1454,8 @@ static int usbvideo_v4l_do_ioctl(struct inode *inode, struct file *file,
                         struct video_buffer *vb = arg;
 
                         memset(vb, 0, sizeof(*vb));
-                        return 0;
-                }
+                        return 0;
+                }
                 case VIDIOCKEY:
                         return 0;
 
@@ -1704,7 +1704,7 @@ static void usbvideo_IsocIrq(struct urb *urb, struct pt_regs *regs)
                         info("Not streaming, but interrupt!");
                 return;
         }
-        
+
         uvd->stats.urb_count++;
         if (urb->actual_length <= 0)
                 goto urb_done_with;
@@ -1763,7 +1763,7 @@ static int usbvideo_StartDataPump(struct uvd *uvd)
         }
         if (VALID_CALLBACK(uvd, videoStart))
                 GET_CALLBACK(uvd, videoStart)(uvd);
-        else 
+        else
                 err("%s: videoStart not set", __FUNCTION__);
 
         /* We double buffer the Iso lists */
@@ -1830,7 +1830,7 @@ static void usbvideo_StopDataPump(struct uvd *uvd)
                 /* Invoke minidriver's magic to stop the camera */
                 if (VALID_CALLBACK(uvd, videoStop))
                         GET_CALLBACK(uvd, videoStop)(uvd);
-                else 
+                else
                         err("%s: videoStop not set", __FUNCTION__);
 
                 /* Set packet size to 0 */
@@ -1963,14 +1963,14 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)
                 info("%s($%p,%d.)", __FUNCTION__, uvd, frameNum);
 
         switch (frame->frameState) {
-        case FrameState_Unused:
+        case FrameState_Unused:
                 if (uvd->debug >= 2)
                         info("%s: FrameState_Unused", __FUNCTION__);
                 return -EINVAL;
-        case FrameState_Ready:
-        case FrameState_Grabbing:
-        case FrameState_Error:
-        {
+        case FrameState_Ready:
+        case FrameState_Grabbing:
+        case FrameState_Error:
+        {
                 int ntries, signalPending;
         redo:
                 if (!CAMERA_IS_OPERATIONAL(uvd)) {
@@ -1978,7 +1978,7 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)
                                 info("%s: Camera is not operational (1)", __FUNCTION__);
                         return -EIO;
                 }
-                ntries = 0; 
+                ntries = 0;
                 do {
                         RingQueue_InterruptibleSleepOn(&uvd->dp);
                         signalPending = signal_pending(current);
@@ -2010,7 +2010,7 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)
                                         usbvideo_CollectRawData(uvd, frame);
                                 else if (VALID_CALLBACK(uvd, processData))
                                         GET_CALLBACK(uvd, processData)(uvd, frame);
-                                else 
+                                else
                                         err("%s: processData not set", __FUNCTION__);
                         }
                 } while (frame->frameState == FrameState_Grabbing);
@@ -2027,8 +2027,8 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)
                         goto redo;
                 }
                 /* Note that we fall through to meet our destiny below */
-        }
-        case FrameState_Done:
+        }
+        case FrameState_Done:
                 /*
                  * Do all necessary postprocessing of data prepared in
                  * "interrupt" code and the collecting code above. The
@@ -2157,7 +2157,7 @@ EXPORT_SYMBOL(usbvideo_DeinterlaceFrame);
  * History:
  * 09-Feb-2001  Created.
  */
-static void usbvideo_SoftwareContrastAdjustment(struct uvd *uvd, 
+static void usbvideo_SoftwareContrastAdjustment(struct uvd *uvd,
                                                 struct usbvideo_frame *frame)
 {
         int i, j, v4l_linesize;
diff --git a/drivers/usb/media/usbvideo.h b/drivers/media/video/usbvideo/usbvideo.h
index 135433c268..3cbf4fc499 100644
--- a/drivers/usb/media/usbvideo.h
+++ b/drivers/media/video/usbvideo/usbvideo.h
@@ -189,11 +189,11 @@ struct usbvideo_frame {
 
 /* Statistics that can be overlaid on screen */
 struct usbvideo_statistics {
-        unsigned long frame_num;        /* Sequential number of the frame */
-        unsigned long urb_count;        /* How many URBs we received so far */
-        unsigned long urb_length;       /* Length of last URB */
-        unsigned long data_count;       /* How many bytes we received */
-        unsigned long header_count;     /* How many frame headers we found */
+        unsigned long frame_num;        /* Sequential number of the frame */
+        unsigned long urb_count;        /* How many URBs we received so far */
+        unsigned long urb_length;       /* Length of last URB */
+        unsigned long data_count;       /* How many bytes we received */
+        unsigned long header_count;     /* How many frame headers we found */
         unsigned long iso_skip_count;   /* How many empty ISO packets received */
         unsigned long iso_err_count;    /* How many bad ISO packets received */
 };
diff --git a/drivers/usb/media/vicam.c b/drivers/media/video/usbvideo/vicam.c
index 1d06e53ec7..90d48e8510 100644
--- a/drivers/usb/media/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -69,10 +69,10 @@
 #define VICAM_HEADER_SIZE       64
 
 #define clamp( x, l, h )        max_t( __typeof__( x ),         \
-                                       ( l ),                   \
-                                       min_t( __typeof__( x ),  \
-                                              ( h ),            \
-                                              ( x ) ) )
+                                       ( l ),                   \
+                                       min_t( __typeof__( x ),  \
+                                              ( h ),            \
+                                              ( x ) ) )
 
 /* Not sure what all the bytes in these char
  * arrays do, but they're necessary to make
@@ -357,7 +357,7 @@ static unsigned char setup5[] = {
  * Not sure why these are not yet non-statics which I can reference through
  * usbvideo.h the same as it is in 2.4.20.  I bet this will get fixed sometime
  * in the future.
- * 
+ *
 */
 static void *rvmalloc(unsigned long size)
 {
@@ -603,12 +603,12 @@ vicam_ioctl(struct inode *inode, struct file *file, unsigned int ioctlnr, unsign
         case VIDIOCSPICT:
                 {
                         struct video_picture vp;
-                        
+
                         if (copy_from_user(&vp, user_arg, sizeof(vp))) {
                                 retval = -EFAULT;
                                 break;
                         }
-                        
+
                         DBG("VIDIOCSPICT depth = %d, pal = %d\n", vp.depth,
                             vp.palette);
 
@@ -655,7 +655,7 @@ vicam_ioctl(struct inode *inode, struct file *file, unsigned int ioctlnr, unsign
                         }
 
                         DBG("VIDIOCSWIN %d x %d\n", vw.width, vw.height);
-                        
+
                         if ( vw.width != 320 || vw.height != 240 )
                                 retval = -EFAULT;
 
@@ -809,12 +809,12 @@ vicam_open(struct inode *inode, struct file *file)
         cam->needsDummyRead = 1;
         cam->open_count++;
 
-        file->private_data = cam;       
-        
+        file->private_data = cam;
+
         return 0;
 }
 
-static int 
+static int
 vicam_close(struct inode *inode, struct file *file)
 {
         struct vicam_camera *cam = file->private_data;
@@ -1187,7 +1187,7 @@ vicam_create_proc_entry(struct vicam_camera *cam)
 
         if ( !cam->proc_dir )
                 return; // FIXME: We should probably return an error here
-        
+
         ent = create_proc_entry("shutter", S_IFREG | S_IRUGO | S_IWUSR,
                                 cam->proc_dir);
         if (ent) {
@@ -1282,7 +1282,7 @@ vicam_probe( struct usb_interface *intf, const struct usb_device_id *id)
         const struct usb_host_interface *interface;
         const struct usb_endpoint_descriptor *endpoint;
         struct vicam_camera *cam;
-        
+
         printk(KERN_INFO "ViCam based webcam connected\n");
 
         interface = intf->cur_altsetting;
@@ -1331,7 +1331,7 @@ vicam_probe( struct usb_interface *intf, const struct usb_device_id *id)
         printk(KERN_INFO "ViCam webcam driver now controlling video device %d\n",cam->vdev.minor);
 
         usb_set_intfdata (intf, cam);
-        
+
         return 0;
 }
 
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index 95a6e47c99..11a97f30b8 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -312,8 +312,6 @@ static const char *v4l2_int_ioctls[] = {
         [_IOC_NR(DECODER_DUMP)]                = "DECODER_DUMP",
 #endif
         [_IOC_NR(AUDC_SET_RADIO)]              = "AUDC_SET_RADIO",
-        [_IOC_NR(AUDC_SET_INPUT)]              = "AUDC_SET_INPUT",
-        [_IOC_NR(MSP_SET_MATRIX)]              = "MSP_SET_MATRIX",
 
         [_IOC_NR(TUNER_SET_TYPE_ADDR)]         = "TUNER_SET_TYPE_ADDR",
         [_IOC_NR(TUNER_SET_STANDBY)]           = "TUNER_SET_STANDBY",
@@ -419,7 +417,6 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
         case TUNER_SET_TYPE_ADDR:
         case TUNER_SET_STANDBY:
         case TDA9887_SET_CONFIG:
-        case AUDC_SET_INPUT:
         case VIDIOC_OVERLAY_OLD:
         case VIDIOC_STREAMOFF:
         case VIDIOC_G_OUTPUT:
@@ -433,12 +430,6 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
                 printk ("%s: value=%d\n", s, *p);
                 break;
         }
-        case MSP_SET_MATRIX:
-        {
-                struct msp_matrix *p=arg;
-                printk ("%s: input=%d, output=%d\n", s, p->input, p->output);
-                break;
-        }
         case VIDIOC_G_AUDIO:
         case VIDIOC_S_AUDIO:
         case VIDIOC_ENUMAUDIO:
@@ -467,7 +458,7 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
                 struct v4l2_buffer *p=arg;
                 struct v4l2_timecode *tc=&p->timecode;
                 printk ("%s: %02ld:%02d:%02d.%08ld index=%d, type=%s, "
-                        "bytesused=%d, flags=0x%08d, "
+                        "bytesused=%d, flags=0x%08x, "
                         "field=%0d, sequence=%d, memory=%s, offset/userptr=0x%08lx\n",
                                 s,
                                 (p->timestamp.tv_sec/3600),
@@ -481,16 +472,16 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
                                 prt_names(p->memory,v4l2_memory_names),
                                 p->m.userptr);
                 printk ("%s: timecode= %02d:%02d:%02d type=%d, "
-                        "flags=0x%08d, frames=%d, userbits=0x%08x",
+                        "flags=0x%08x, frames=%d, userbits=0x%p\n",
                                 s,tc->hours,tc->minutes,tc->seconds,
-                                tc->type, tc->flags, tc->frames, (__u32) tc->userbits);
+                                tc->type, tc->flags, tc->frames, tc->userbits);
                 break;
         }
         case VIDIOC_QUERYCAP:
         {
                 struct v4l2_capability *p=arg;
-                printk ("%s: driver=%s, card=%s, bus=%s, version=%d, "
-                        "capabilities=%d\n", s,
+                printk ("%s: driver=%s, card=%s, bus=%s, version=0x%08x, "
+                        "capabilities=0x%08x\n", s,
                                 p->driver,p->card,p->bus_info,
                                 p->version,
                                 p->capabilities);
@@ -574,9 +565,10 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
         {
                 struct v4l2_input *p=arg;
                 printk ("%s: index=%d, name=%s, type=%d, audioset=%d, "
-                        "tuner=%d, std=%lld, status=%d\n", s,
+                        "tuner=%d, std=%Ld, status=%d\n", s,
                                 p->index,p->name,p->type,p->audioset,
-                                p->tuner,p->std,
+                                p->tuner,
+                                (unsigned long long)p->std,
                                 p->status);
                 break;
         }
@@ -620,9 +612,10 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
         {
                 struct v4l2_output *p=arg;
                 printk ("%s: index=%d, name=%s,type=%d, audioset=%d, "
-                        "modulator=%d, std=%lld\n",
+                        "modulator=%d, std=%Ld\n",
                                 s,p->index,p->name,p->type,p->audioset,
-                                p->modulator,p->std);
+                                p->modulator,
+                                (unsigned long long)p->std);
                 break;
         }
         case VIDIOC_QUERYCTRL:
@@ -665,7 +658,7 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
         case VIDIOC_INT_G_VIDEO_ROUTING:
         {
                 struct v4l2_routing  *p=arg;
-                printk ("%s: input=%d, output=%d\n", s, p->input, p->output);
+                printk ("%s: input=0x%x, output=0x%x\n", s, p->input, p->output);
                 break;
         }
         case VIDIOC_G_SLICED_VBI_CAP:
@@ -686,8 +679,9 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
         case VIDIOC_ENUMSTD:
         {
                 struct v4l2_standard *p=arg;
-                printk ("%s: index=%d, id=%lld, name=%s, fps=%d/%d, framelines=%d\n", s,
-                                p->index, p->id, p->name,
+                printk ("%s: index=%d, id=%Ld, name=%s, fps=%d/%d, "
+                        "framelines=%d\n", s, p->index,
+                                (unsigned long long)p->id, p->name,
                                 p->frameperiod.numerator,
                                 p->frameperiod.denominator,
                                 p->framelines);
@@ -907,7 +901,7 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
         {
                 v4l2_std_id *p=arg;
 
-                printk ("%s: value=%llu\n", s, *p);
+                printk ("%s: value=%Lu\n", s, (unsigned long long)*p);
                 break;
         }
         }
diff --git a/drivers/media/video/video-buf.c b/drivers/media/video/video-buf.c
index 87e937581d..d2ca0f08d0 100644
--- a/drivers/media/video/video-buf.c
+++ b/drivers/media/video/video-buf.c
@@ -1,15 +1,20 @@
 /*
  *
  * generic helper functions for video4linux capture buffers, to handle
- * memory management and PCI DMA.  Right now bttv + saa7134 use it.
+ * memory management and PCI DMA.
+ * Right now, bttv, saa7134, saa7146 and cx88 use it.
  *
  * The functions expect the hardware being able to scatter gatter
  * (i.e. the buffers are not linear in physical memory, but fragmented
  * into PAGE_SIZE chunks).  They also assume the driver does not need
- * to touch the video data (thus it is probably not useful for USB 1.1
- * as data often must be uncompressed by the drivers).
+ * to touch the video data.
+ *
+ * device specific map/unmap/sync stuff now are mapped as operations
+ * to allow its usage by USB and virtual devices.
  *
  * (c) 2001-2004 Gerd Knorr <kraxel@bytesex.org> [SUSE Labs]
+ * (c) 2006 Mauro Carvalho Chehab <mchehab@infradead.org>
+ * (c) 2006 Ted Walther and John Sokol
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -167,6 +172,9 @@ int videobuf_dma_init_kernel(struct videobuf_dmabuf *dma, int direction,
                 dprintk(1,"vmalloc_32(%d pages) failed\n",nr_pages);
                 return -ENOMEM;
         }
+        dprintk(1,"vmalloc is at addr 0x%08lx, size=%d\n",
+                                (unsigned long)dma->vmalloc,
+                                nr_pages << PAGE_SHIFT);
         memset(dma->vmalloc,0,nr_pages << PAGE_SHIFT);
         dma->nr_pages = nr_pages;
         return 0;
@@ -186,8 +194,10 @@ int videobuf_dma_init_overlay(struct videobuf_dmabuf *dma, int direction,
         return 0;
 }
 
-int videobuf_dma_pci_map(struct pci_dev *dev, struct videobuf_dmabuf *dma)
+int videobuf_dma_map(struct videobuf_queue* q,struct videobuf_dmabuf *dma)
 {
+        void                   *dev=q->dev;
+
         MAGIC_CHECK(dma->magic,MAGIC_DMABUF);
         BUG_ON(0 == dma->nr_pages);
 
@@ -197,7 +207,7 @@ int videobuf_dma_pci_map(struct pci_dev *dev, struct videobuf_dmabuf *dma)
         }
         if (dma->vmalloc) {
                 dma->sglist = videobuf_vmalloc_to_sg
-                        (dma->vmalloc,dma->nr_pages);
+                                                (dma->vmalloc,dma->nr_pages);
         }
         if (dma->bus_addr) {
                 dma->sglist = kmalloc(sizeof(struct scatterlist), GFP_KERNEL);
@@ -212,13 +222,14 @@ int videobuf_dma_pci_map(struct pci_dev *dev, struct videobuf_dmabuf *dma)
                 dprintk(1,"scatterlist is NULL\n");
                 return -ENOMEM;
         }
-
         if (!dma->bus_addr) {
-                dma->sglen = pci_map_sg(dev,dma->sglist,dma->nr_pages,
-                                        dma->direction);
+                if (q->ops->vb_map_sg) {
+                        dma->sglen = q->ops->vb_map_sg(dev,dma->sglist,
+                                        dma->nr_pages, dma->direction);
+                }
                 if (0 == dma->sglen) {
                         printk(KERN_WARNING
-                               "%s: pci_map_sg failed\n",__FUNCTION__);
+                               "%s: videobuf_map_sg failed\n",__FUNCTION__);
                         kfree(dma->sglist);
                         dma->sglist = NULL;
                         dma->sglen = 0;
@@ -228,24 +239,31 @@ int videobuf_dma_pci_map(struct pci_dev *dev, struct videobuf_dmabuf *dma)
         return 0;
 }
 
-int videobuf_dma_pci_sync(struct pci_dev *dev, struct videobuf_dmabuf *dma)
+int videobuf_dma_sync(struct videobuf_queue* q,struct videobuf_dmabuf *dma)
 {
+        void                   *dev=q->dev;
+
         MAGIC_CHECK(dma->magic,MAGIC_DMABUF);
         BUG_ON(!dma->sglen);
 
-        if (!dma->bus_addr)
-                pci_dma_sync_sg_for_cpu(dev,dma->sglist,dma->nr_pages,dma->direction);
+        if (!dma->bus_addr && q->ops->vb_dma_sync_sg)
+                q->ops->vb_dma_sync_sg(dev,dma->sglist,dma->nr_pages,
+                                                        dma->direction);
+
         return 0;
 }
 
-int videobuf_dma_pci_unmap(struct pci_dev *dev, struct videobuf_dmabuf *dma)
+int videobuf_dma_unmap(struct videobuf_queue* q,struct videobuf_dmabuf *dma)
 {
+        void                   *dev=q->dev;
+
         MAGIC_CHECK(dma->magic,MAGIC_DMABUF);
         if (!dma->sglen)
                 return 0;
 
-        if (!dma->bus_addr)
-                pci_unmap_sg(dev,dma->sglist,dma->nr_pages,dma->direction);
+        if (!dma->bus_addr && q->ops->vb_unmap_sg)
+                        q->ops->vb_unmap_sg(dev,dma->sglist,dma->nr_pages,
+                                                        dma->direction);
         kfree(dma->sglist);
         dma->sglist = NULL;
         dma->sglen = 0;
@@ -318,7 +336,7 @@ int videobuf_waiton(struct videobuf_buffer *vb, int non_blocking, int intr)
 }
 
 int
-videobuf_iolock(struct pci_dev *pci, struct videobuf_buffer *vb,
+videobuf_iolock(struct videobuf_queue* q, struct videobuf_buffer *vb,
                 struct v4l2_framebuffer *fbuf)
 {
         int err,pages;
@@ -357,7 +375,7 @@ videobuf_iolock(struct pci_dev *pci, struct videobuf_buffer *vb,
         default:
                 BUG();
         }
-        err = videobuf_dma_pci_map(pci,&vb->dma);
+        err = videobuf_dma_map(q,&vb->dma);
         if (0 != err)
                 return err;
 
@@ -366,9 +384,41 @@ videobuf_iolock(struct pci_dev *pci, struct videobuf_buffer *vb,
 
 /* --------------------------------------------------------------------- */
 
+void videobuf_queue_pci(struct videobuf_queue* q)
+{
+        /* If not specified, defaults to PCI map sg */
+        if (!q->ops->vb_map_sg)
+                q->ops->vb_map_sg=(vb_map_sg_t *)pci_map_sg;
+
+        if (!q->ops->vb_dma_sync_sg)
+                q->ops->vb_dma_sync_sg=(vb_map_sg_t *)pci_dma_sync_sg_for_cpu;
+        if (!q->ops->vb_unmap_sg)
+                q->ops->vb_unmap_sg=(vb_map_sg_t *)pci_unmap_sg;
+}
+
+int videobuf_pci_dma_map(struct pci_dev *pci,struct videobuf_dmabuf *dma)
+{
+        struct videobuf_queue q;
+
+        q.dev=pci;
+        q.ops->vb_map_sg=(vb_map_sg_t *)pci_unmap_sg;
+
+        return (videobuf_dma_unmap(&q,dma));
+}
+
+int videobuf_pci_dma_unmap(struct pci_dev *pci,struct videobuf_dmabuf *dma)
+{
+        struct videobuf_queue q;
+
+        q.dev=pci;
+        q.ops->vb_map_sg=(vb_map_sg_t *)pci_unmap_sg;
+
+        return (videobuf_dma_unmap(&q,dma));
+}
+
 void videobuf_queue_init(struct videobuf_queue* q,
                          struct videobuf_queue_ops *ops,
-                         struct pci_dev *pci,
+                         void *dev,
                          spinlock_t *irqlock,
                          enum v4l2_buf_type type,
                          enum v4l2_field field,
@@ -377,13 +427,15 @@ void videobuf_queue_init(struct videobuf_queue* q,
 {
         memset(q,0,sizeof(*q));
         q->irqlock = irqlock;
-        q->pci     = pci;
+        q->dev     = dev;
         q->type    = type;
         q->field   = field;
         q->msize   = msize;
         q->ops     = ops;
         q->priv_data = priv;
 
+        videobuf_queue_pci(q);
+
         mutex_init(&q->lock);
         INIT_LIST_HEAD(&q->stream);
 }
@@ -431,7 +483,8 @@ videobuf_queue_cancel(struct videobuf_queue *q)
         int i;
 
         /* remove queued buffers from list */
-        spin_lock_irqsave(q->irqlock,flags);
+        if (q->irqlock)
+                spin_lock_irqsave(q->irqlock,flags);
         for (i = 0; i < VIDEO_MAX_FRAME; i++) {
                 if (NULL == q->bufs[i])
                         continue;
@@ -440,7 +493,8 @@ videobuf_queue_cancel(struct videobuf_queue *q)
                         q->bufs[i]->state = STATE_ERROR;
                 }
         }
-        spin_unlock_irqrestore(q->irqlock,flags);
+        if (q->irqlock)
+                spin_unlock_irqrestore(q->irqlock,flags);
 
         /* free all buffers + clear queue */
         for (i = 0; i < VIDEO_MAX_FRAME; i++) {
@@ -534,19 +588,29 @@ videobuf_reqbufs(struct videobuf_queue *q,
         unsigned int size,count;
         int retval;
 
-        if (req->type != q->type)
+        if (req->type != q->type) {
+                dprintk(1,"reqbufs: queue type invalid\n");
                 return -EINVAL;
-        if (req->count < 1)
+        }
+        if (req->count < 1) {
+                dprintk(1,"reqbufs: count invalid (%d)\n",req->count);
                 return -EINVAL;
+        }
         if (req->memory != V4L2_MEMORY_MMAP     &&
             req->memory != V4L2_MEMORY_USERPTR  &&
-            req->memory != V4L2_MEMORY_OVERLAY)
+            req->memory != V4L2_MEMORY_OVERLAY) {
+                dprintk(1,"reqbufs: memory type invalid\n");
                 return -EINVAL;
+        }
 
-        if (q->streaming)
+        if (q->streaming) {
+                dprintk(1,"reqbufs: streaming already exists\n");
                 return -EBUSY;
-        if (!list_empty(&q->stream))
+        }
+        if (!list_empty(&q->stream)) {
+                dprintk(1,"reqbufs: stream running\n");
                 return -EBUSY;
+        }
 
         mutex_lock(&q->lock);
         count = req->count;
@@ -559,8 +623,10 @@ videobuf_reqbufs(struct videobuf_queue *q,
                 count, size, (count*size)>>PAGE_SHIFT);
 
         retval = videobuf_mmap_setup(q,count,size,req->memory);
-        if (retval < 0)
+        if (retval < 0) {
+                dprintk(1,"reqbufs: mmap setup returned %d\n",retval);
                 goto done;
+        }
 
         req->count = count;
 
@@ -572,12 +638,18 @@ videobuf_reqbufs(struct videobuf_queue *q,
 int
 videobuf_querybuf(struct videobuf_queue *q, struct v4l2_buffer *b)
 {
-        if (unlikely(b->type != q->type))
+        if (unlikely(b->type != q->type)) {
+                dprintk(1,"querybuf: Wrong type.\n");
                 return -EINVAL;
-        if (unlikely(b->index < 0 || b->index >= VIDEO_MAX_FRAME))
+        }
+        if (unlikely(b->index < 0 || b->index >= VIDEO_MAX_FRAME)) {
+                dprintk(1,"querybuf: index out of range.\n");
                 return -EINVAL;
-        if (unlikely(NULL == q->bufs[b->index]))
+        }
+        if (unlikely(NULL == q->bufs[b->index])) {
+                dprintk(1,"querybuf: buffer is null.\n");
                 return -EINVAL;
+        }
         videobuf_status(b,q->bufs[b->index],q->type);
         return 0;
 }
@@ -593,26 +665,40 @@ videobuf_qbuf(struct videobuf_queue *q,
 
         mutex_lock(&q->lock);
         retval = -EBUSY;
-        if (q->reading)
+        if (q->reading) {
+                dprintk(1,"qbuf: Reading running...\n");
                 goto done;
+        }
         retval = -EINVAL;
-        if (b->type != q->type)
+        if (b->type != q->type) {
+                dprintk(1,"qbuf: Wrong type.\n");
                 goto done;
-        if (b->index < 0 || b->index >= VIDEO_MAX_FRAME)
+        }
+        if (b->index < 0 || b->index >= VIDEO_MAX_FRAME) {
+                dprintk(1,"qbuf: index out of range.\n");
                 goto done;
+        }
         buf = q->bufs[b->index];
-        if (NULL == buf)
+        if (NULL == buf) {
+                dprintk(1,"qbuf: buffer is null.\n");
                 goto done;
+        }
         MAGIC_CHECK(buf->magic,MAGIC_BUFFER);
-        if (buf->memory != b->memory)
+        if (buf->memory != b->memory) {
+                dprintk(1,"qbuf: memory type is wrong.\n");
                 goto done;
+        }
         if (buf->state == STATE_QUEUED ||
-            buf->state == STATE_ACTIVE)
+            buf->state == STATE_ACTIVE) {
+                dprintk(1,"qbuf: buffer is already queued or active.\n");
                 goto done;
+        }
 
         if (b->flags & V4L2_BUF_FLAG_INPUT) {
-                if (b->input >= q->inputs)
+                if (b->input >= q->inputs) {
+                        dprintk(1,"qbuf: wrong input.\n");
                         goto done;
+                }
                 buf->input = b->input;
         } else {
                 buf->input = UNSET;
@@ -620,12 +706,16 @@ videobuf_qbuf(struct videobuf_queue *q,
 
         switch (b->memory) {
         case V4L2_MEMORY_MMAP:
-                if (0 == buf->baddr)
+                if (0 == buf->baddr) {
+                        dprintk(1,"qbuf: mmap requested but buffer addr is zero!\n");
                         goto done;
+                }
                 break;
         case V4L2_MEMORY_USERPTR:
-                if (b->length < buf->bsize)
+                if (b->length < buf->bsize) {
+                        dprintk(1,"qbuf: buffer length is not enough\n");
                         goto done;
+                }
                 if (STATE_NEEDS_INIT != buf->state && buf->baddr != b->m.userptr)
                         q->ops->buf_release(q,buf);
                 buf->baddr = b->m.userptr;
@@ -634,20 +724,27 @@ videobuf_qbuf(struct videobuf_queue *q,
                 buf->boff = b->m.offset;
                 break;
         default:
+                dprintk(1,"qbuf: wrong memory type\n");
                 goto done;
         }
 
+        dprintk(1,"qbuf: requesting next field\n");
         field = videobuf_next_field(q);
         retval = q->ops->buf_prepare(q,buf,field);
-        if (0 != retval)
+        if (0 != retval) {
+                dprintk(1,"qbuf: buffer_prepare returned %d\n",retval);
                 goto done;
+        }
 
         list_add_tail(&buf->stream,&q->stream);
         if (q->streaming) {
-                spin_lock_irqsave(q->irqlock,flags);
+                if (q->irqlock)
+                        spin_lock_irqsave(q->irqlock,flags);
                 q->ops->buf_queue(q,buf);
-                spin_unlock_irqrestore(q->irqlock,flags);
+                if (q->irqlock)
+                        spin_unlock_irqrestore(q->irqlock,flags);
         }
+        dprintk(1,"qbuf: succeded\n");
         retval = 0;
 
  done:
@@ -664,26 +761,39 @@ videobuf_dqbuf(struct videobuf_queue *q,
 
         mutex_lock(&q->lock);
         retval = -EBUSY;
-        if (q->reading)
+        if (q->reading) {
+                dprintk(1,"dqbuf: Reading running...\n");
                 goto done;
+        }
         retval = -EINVAL;
-        if (b->type != q->type)
+        if (b->type != q->type) {
+                dprintk(1,"dqbuf: Wrong type.\n");
                 goto done;
-        if (list_empty(&q->stream))
+        }
+        if (list_empty(&q->stream)) {
+                dprintk(1,"dqbuf: stream running\n");
                 goto done;
+        }
         buf = list_entry(q->stream.next, struct videobuf_buffer, stream);
         retval = videobuf_waiton(buf, nonblocking, 1);
-        if (retval < 0)
+        if (retval < 0) {
+                dprintk(1,"dqbuf: waiton returned %d\n",retval);
                 goto done;
+        }
         switch (buf->state) {
         case STATE_ERROR:
+                dprintk(1,"dqbuf: state is error\n");
                 retval = -EIO;
-                /* fall through */
+                videobuf_dma_sync(q,&buf->dma);
+                buf->state = STATE_IDLE;
+                break;
         case STATE_DONE:
-                videobuf_dma_pci_sync(q->pci,&buf->dma);
+                dprintk(1,"dqbuf: state is done\n");
+                videobuf_dma_sync(q,&buf->dma);
                 buf->state = STATE_IDLE;
                 break;
         default:
+                dprintk(1,"dqbuf: state invalid\n");
                 retval = -EINVAL;
                 goto done;
         }
@@ -711,13 +821,15 @@ int videobuf_streamon(struct videobuf_queue *q)
         if (q->streaming)
                 goto done;
         q->streaming = 1;
-        spin_lock_irqsave(q->irqlock,flags);
+        if (q->irqlock)
+                spin_lock_irqsave(q->irqlock,flags);
         list_for_each(list,&q->stream) {
                 buf = list_entry(list, struct videobuf_buffer, stream);
                 if (buf->state == STATE_PREPARED)
                         q->ops->buf_queue(q,buf);
         }
-        spin_unlock_irqrestore(q->irqlock,flags);
+        if (q->irqlock)
+                spin_unlock_irqrestore(q->irqlock,flags);
 
  done:
         mutex_unlock(&q->lock);
@@ -762,12 +874,14 @@ videobuf_read_zerocopy(struct videobuf_queue *q, char __user *data,
                 goto done;
 
         /* start capture & wait */
-        spin_lock_irqsave(q->irqlock,flags);
+        if (q->irqlock)
+                spin_lock_irqsave(q->irqlock,flags);
         q->ops->buf_queue(q,q->read_buf);
-        spin_unlock_irqrestore(q->irqlock,flags);
+        if (q->irqlock)
+                spin_unlock_irqrestore(q->irqlock,flags);
         retval = videobuf_waiton(q->read_buf,0,0);
         if (0 == retval) {
-                videobuf_dma_pci_sync(q->pci,&q->read_buf->dma);
+                videobuf_dma_sync(q,&q->read_buf->dma);
                 if (STATE_ERROR == q->read_buf->state)
                         retval = -EIO;
                 else
@@ -809,6 +923,7 @@ ssize_t videobuf_read_one(struct videobuf_queue *q,
                 /* need to capture a new frame */
                 retval = -ENOMEM;
                 q->read_buf = videobuf_alloc(q->msize);
+                dprintk(1,"video alloc=0x%08x\n",(unsigned int) q->read_buf);
                 if (NULL == q->read_buf)
                         goto done;
                 q->read_buf->memory = V4L2_MEMORY_USERPTR;
@@ -820,9 +935,11 @@ ssize_t videobuf_read_one(struct videobuf_queue *q,
                         q->read_buf = NULL;
                         goto done;
                 }
-                spin_lock_irqsave(q->irqlock,flags);
+                if (q->irqlock)
+                        spin_lock_irqsave(q->irqlock,flags);
                 q->ops->buf_queue(q,q->read_buf);
-                spin_unlock_irqrestore(q->irqlock,flags);
+                if (q->irqlock)
+                        spin_unlock_irqrestore(q->irqlock,flags);
                 q->read_off = 0;
         }
 
@@ -830,7 +947,7 @@ ssize_t videobuf_read_one(struct videobuf_queue *q,
         retval = videobuf_waiton(q->read_buf, nonblocking, 1);
         if (0 != retval)
                 goto done;
-        videobuf_dma_pci_sync(q->pci,&q->read_buf->dma);
+        videobuf_dma_sync(q,&q->read_buf->dma);
 
         if (STATE_ERROR == q->read_buf->state) {
                 /* catch I/O errors */
@@ -887,10 +1004,12 @@ int videobuf_read_start(struct videobuf_queue *q)
                         return err;
                 list_add_tail(&q->bufs[i]->stream, &q->stream);
         }
-        spin_lock_irqsave(q->irqlock,flags);
+        if (q->irqlock)
+                spin_lock_irqsave(q->irqlock,flags);
         for (i = 0; i < count; i++)
                 q->ops->buf_queue(q,q->bufs[i]);
-        spin_unlock_irqrestore(q->irqlock,flags);
+        if (q->irqlock)
+                spin_unlock_irqrestore(q->irqlock,flags);
         q->reading = 1;
         return 0;
 }
@@ -985,9 +1104,11 @@ ssize_t videobuf_read_stream(struct videobuf_queue *q,
                 if (q->read_off == q->read_buf->size) {
                         list_add_tail(&q->read_buf->stream,
                                       &q->stream);
-                        spin_lock_irqsave(q->irqlock,flags);
+                        if (q->irqlock)
+                                spin_lock_irqsave(q->irqlock,flags);
                         q->ops->buf_queue(q,q->read_buf);
-                        spin_unlock_irqrestore(q->irqlock,flags);
+                        if (q->irqlock)
+                                spin_unlock_irqrestore(q->irqlock,flags);
                         q->read_buf = NULL;
                 }
                 if (retval < 0)
@@ -1249,11 +1370,14 @@ EXPORT_SYMBOL_GPL(videobuf_dma_init);
 EXPORT_SYMBOL_GPL(videobuf_dma_init_user);
 EXPORT_SYMBOL_GPL(videobuf_dma_init_kernel);
 EXPORT_SYMBOL_GPL(videobuf_dma_init_overlay);
-EXPORT_SYMBOL_GPL(videobuf_dma_pci_map);
-EXPORT_SYMBOL_GPL(videobuf_dma_pci_sync);
-EXPORT_SYMBOL_GPL(videobuf_dma_pci_unmap);
+EXPORT_SYMBOL_GPL(videobuf_dma_map);
+EXPORT_SYMBOL_GPL(videobuf_dma_sync);
+EXPORT_SYMBOL_GPL(videobuf_dma_unmap);
 EXPORT_SYMBOL_GPL(videobuf_dma_free);
 
+EXPORT_SYMBOL_GPL(videobuf_pci_dma_map);
+EXPORT_SYMBOL_GPL(videobuf_pci_dma_unmap);
+
 EXPORT_SYMBOL_GPL(videobuf_alloc);
 EXPORT_SYMBOL_GPL(videobuf_waiton);
 EXPORT_SYMBOL_GPL(videobuf_iolock);
diff --git a/drivers/media/video/videocodec.h b/drivers/media/video/videocodec.h
index b1239ac7f3..8c233720b6 100644
--- a/drivers/media/video/videocodec.h
+++ b/drivers/media/video/videocodec.h
@@ -57,7 +57,7 @@
    therfor they may not be initialized.
 
    The other fuctions are just for convenience, as they are for sure used by
-   most/all of the codecs. The last ones may be ommited, too. 
+   most/all of the codecs. The last ones may be ommited, too.
 
    See the structure declaration below for more information and which data has
    to be set up for the master and the slave.
@@ -75,52 +75,52 @@
 /* ========================================== */
 
 /*
-   ==== master setup ==== 
+   ==== master setup ====
    name -> name of the device structure for reference and debugging
    master_data ->  data ref. for the master (e.g. the zr36055,57,67)
    readreg -> ref. to read-fn from register (setup by master, used by slave)
    writereg -> ref. to write-fn to register (setup by master, used by slave)
-               this two functions do the lowlevel I/O job
+               this two functions do the lowlevel I/O job
 
-   ==== slave functionality setup ==== 
-   slave_data -> data ref. for the slave (e.g. the zr36050,60) 
+   ==== slave functionality setup ====
+   slave_data -> data ref. for the slave (e.g. the zr36050,60)
    check -> fn-ref. checks availability of an device, returns -EIO on failure or
-            the type on success
-            this makes espcecially sense if a driver module supports more than
-            one codec which may be quite similar to access, nevertheless it
-            is good for a first functionality check 
+            the type on success
+            this makes espcecially sense if a driver module supports more than
+            one codec which may be quite similar to access, nevertheless it
+            is good for a first functionality check
 
-   -- main functions you always need for compression/decompression -- 
+   -- main functions you always need for compression/decompression --
 
    set_mode -> this fn-ref. resets the entire codec, and sets up the mode
-               with the last defined norm/size (or device default if not
-               available) - it returns 0 if the mode is possible 
+               with the last defined norm/size (or device default if not
+               available) - it returns 0 if the mode is possible
    set_size -> this fn-ref. sets the norm and image size for
-               compression/decompression (returns 0 on success) 
-               the norm param is defined in videodev.h (VIDEO_MODE_*) 
+               compression/decompression (returns 0 on success)
+               the norm param is defined in videodev.h (VIDEO_MODE_*)
 
    additional setup may be available, too - but the codec should work with
-   some default values even without this 
+   some default values even without this
 
-   set_data -> sets device-specific data (tables, quality etc.) 
-   get_data -> query device-specific data (tables, quality etc.) 
+   set_data -> sets device-specific data (tables, quality etc.)
+   get_data -> query device-specific data (tables, quality etc.)
 
-   if the device delivers interrupts, they may be setup/handled here 
-   setup_interrupt -> codec irq setup (not needed for 36050/60) 
-   handle_interrupt -> codec irq handling (not needed for 36050/60) 
+   if the device delivers interrupts, they may be setup/handled here
+   setup_interrupt -> codec irq setup (not needed for 36050/60)
+   handle_interrupt -> codec irq handling (not needed for 36050/60)
 
-   if the device delivers pictures, they may be handled here 
-   put_image -> puts image data to the codec (not needed for 36050/60) 
-   get_image -> gets image data from the codec (not needed for 36050/60) 
-                the calls include frame numbers and flags (even/odd/...) 
-                if needed and a flag which allows blocking until its ready 
+   if the device delivers pictures, they may be handled here
+   put_image -> puts image data to the codec (not needed for 36050/60)
+   get_image -> gets image data from the codec (not needed for 36050/60)
+                the calls include frame numbers and flags (even/odd/...)
+                if needed and a flag which allows blocking until its ready
 */
 
 /* ============== */
 /* user interface */
 /* ============== */
 
-/* 
+/*
    Currently there is only a information display planned, as the layer
    is not visible for the user space at all.
 
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 75e3d41382..5f87dd5f1d 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -97,7 +97,7 @@ static int video_open(struct inode *inode, struct file *file)
         unsigned int minor = iminor(inode);
         int err = 0;
         struct video_device *vfl;
-        struct file_operations *old_fops;
+        const struct file_operations *old_fops;
 
         if(minor>=VIDEO_NUM_DEVICES)
                 return -ENODEV;
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 0229819d0a..a8c101494c 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -1555,12 +1555,12 @@ static void vino_update_line_size(struct vino_channel_settings *vcs)
         unsigned int w = vcs->clipping.right - vcs->clipping.left;
         unsigned int d = vcs->decimation;
         unsigned int bpp = vino_data_formats[vcs->data_format].bpp;
-        unsigned int lsize;
+        unsigned int lsize;
 
         dprintk("update_line_size(): before: w = %d, d = %d, "
                 "line_size = %d\n", w, d, vcs->line_size);
 
-        /* line size must be multiple of 8 bytes */
+        /* line size must be multiple of 8 bytes */
         lsize = (bpp * (w / d)) & ~7;
         w = (lsize / bpp) * d;
 
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
new file mode 100644
index 0000000000..5e813404d0
--- /dev/null
+++ b/drivers/media/video/vivi.c
@@ -0,0 +1,1454 @@
+/*
+ * Virtual Video driver - This code emulates a real video device with v4l2 api
+ *
+ * Copyright (c) 2006 by:
+ *      Mauro Carvalho Chehab <mchehab--a.t--infradead.org>
+ *      Ted Walther <ted--a.t--enumera.com>
+ *      John Sokol <sokol--a.t--videotechnology.com>
+ *      http://v4l.videotechnology.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the BSD Licence, GNU General Public License
+ * as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version
+ */
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/mm.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/pci.h>
+#include <linux/random.h>
+#include <linux/version.h>
+#include <linux/videodev2.h>
+#include <linux/interrupt.h>
+#include <media/video-buf.h>
+#include <media/v4l2-common.h>
+#include <linux/kthread.h>
+#include <linux/highmem.h>
+
+/* Wake up at about 30 fps */
+#define WAKE_NUMERATOR 30
+#define WAKE_DENOMINATOR 1001
+#define BUFFER_TIMEOUT     msecs_to_jiffies(500)  /* 0.5 seconds */
+
+/* These timers are for 1 fps - used only for testing */
+//#define WAKE_DENOMINATOR 30 /* hack for testing purposes */
+//#define BUFFER_TIMEOUT     msecs_to_jiffies(5000)  /* 5 seconds */
+
+#include "font.h"
+
+#ifndef kzalloc
+#define kzalloc(size, flags)                            \
+({                                                      \
+        void *__ret = kmalloc(size, flags);             \
+        if (__ret)                                      \
+                memset(__ret, 0, size);                 \
+        __ret;                                          \
+})
+#endif
+
+MODULE_DESCRIPTION("Video Technology Magazine Virtual Video Capture Board");
+MODULE_AUTHOR("Mauro Carvalho Chehab, Ted Walther and John Sokol");
+MODULE_LICENSE("Dual BSD/GPL");
+
+#define VIVI_MAJOR_VERSION 0
+#define VIVI_MINOR_VERSION 4
+#define VIVI_RELEASE 0
+#define VIVI_VERSION KERNEL_VERSION(VIVI_MAJOR_VERSION, VIVI_MINOR_VERSION, VIVI_RELEASE)
+
+static int video_nr = -1;        /* /dev/videoN, -1 for autodetect */
+module_param(video_nr, int, 0);
+
+static int debug = 0;
+module_param(debug, int, 0);
+
+static unsigned int vid_limit = 16;
+module_param(vid_limit,int,0644);
+MODULE_PARM_DESC(vid_limit,"capture memory limit in megabytes");
+
+/* supported controls */
+static struct v4l2_queryctrl vivi_qctrl[] = {
+        {
+                .id            = V4L2_CID_AUDIO_VOLUME,
+                .name          = "Volume",
+                .minimum       = 0,
+                .maximum       = 65535,
+                .step          = 65535/100,
+                .default_value = 65535,
+                .flags         = 0,
+                .type          = V4L2_CTRL_TYPE_INTEGER,
+        },{
+                .id            = V4L2_CID_BRIGHTNESS,
+                .type          = V4L2_CTRL_TYPE_INTEGER,
+                .name          = "Brightness",
+                .minimum       = 0,
+                .maximum       = 255,
+                .step          = 1,
+                .default_value = 127,
+                .flags         = 0,
+        }, {
+                .id            = V4L2_CID_CONTRAST,
+                .type          = V4L2_CTRL_TYPE_INTEGER,
+                .name          = "Contrast",
+                .minimum       = 0,
+                .maximum       = 255,
+                .step          = 0x1,
+                .default_value = 0x10,
+                .flags         = 0,
+        }, {
+                .id            = V4L2_CID_SATURATION,
+                .type          = V4L2_CTRL_TYPE_INTEGER,
+                .name          = "Saturation",
+                .minimum       = 0,
+                .maximum       = 255,
+                .step          = 0x1,
+                .default_value = 127,
+                .flags         = 0,
+        }, {
+                .id            = V4L2_CID_HUE,
+                .type          = V4L2_CTRL_TYPE_INTEGER,
+                .name          = "Hue",
+                .minimum       = -128,
+                .maximum       = 127,
+                .step          = 0x1,
+                .default_value = 0,
+                .flags         = 0,
+        }
+};
+
+static int qctl_regs[ARRAY_SIZE(vivi_qctrl)];
+
+#define dprintk(level,fmt, arg...)                           \
+        do {                                                 \
+                if (debug >= (level))                        \
+                        printk(KERN_DEBUG "vivi: " fmt , ## arg);    \
+        } while (0)
+
+/* ------------------------------------------------------------------
+        Basic structures
+   ------------------------------------------------------------------*/
+
+struct vivi_fmt {
+        char  *name;
+        u32   fourcc;          /* v4l2 format id */
+        int   depth;
+};
+
+static struct vivi_fmt format = {
+        .name     = "4:2:2, packed, YUYV",
+        .fourcc   = V4L2_PIX_FMT_YUYV,
+        .depth    = 16,
+};
+
+struct sg_to_addr {
+        int pos;
+        struct scatterlist *sg;
+};
+
+/* buffer for one video frame */
+struct vivi_buffer {
+        /* common v4l buffer stuff -- must be first */
+        struct videobuf_buffer vb;
+
+        struct vivi_fmt        *fmt;
+
+        struct sg_to_addr      *to_addr;
+};
+
+struct vivi_dmaqueue {
+        struct list_head       active;
+        struct list_head       queued;
+        struct timer_list      timeout;
+
+        /* thread for generating video stream*/
+        struct task_struct         *kthread;
+        wait_queue_head_t          wq;
+        /* Counters to control fps rate */
+        int                        frame;
+        int                        ini_jiffies;
+};
+
+static LIST_HEAD(vivi_devlist);
+
+struct vivi_dev {
+        struct list_head           vivi_devlist;
+
+        struct semaphore           lock;
+
+        int                        users;
+
+        /* various device info */
+        unsigned int               resources;
+        struct video_device        video_dev;
+
+        struct vivi_dmaqueue       vidq;
+
+        /* Several counters */
+        int                        h,m,s,us,jiffies;
+        char                       timestr[13];
+};
+
+struct vivi_fh {
+        struct vivi_dev            *dev;
+
+        /* video capture */
+        struct vivi_fmt            *fmt;
+        unsigned int               width,height;
+        struct videobuf_queue      vb_vidq;
+
+        enum v4l2_buf_type         type;
+};
+
+/* ------------------------------------------------------------------
+        DMA and thread functions
+   ------------------------------------------------------------------*/
+
+/* Bars and Colors should match positions */
+
+enum colors {
+        WHITE,
+        AMBAR,
+        CYAN,
+        GREEN,
+        MAGENTA,
+        RED,
+        BLUE
+};
+
+static u8 bars[8][3] = {
+        /* R   G   B */
+        {204,204,204},  /* white */
+        {208,208,  0},  /* ambar */
+        {  0,206,206},  /* cyan */
+        {  0,239,  0},  /* green */
+        {239,  0,239},  /* magenta */
+        {205,  0,  0},  /* red */
+        {  0,  0,255},  /* blue */
+        {  0,  0,  0}
+};
+
+#define TO_Y(r,g,b) (((16829*r +33039*g +6416*b  + 32768)>>16)+16)
+/* RGB to  V(Cr) Color transform */
+#define TO_V(r,g,b) (((28784*r -24103*g -4681*b  + 32768)>>16)+128)
+/* RGB to  U(Cb) Color transform */
+#define TO_U(r,g,b) (((-9714*r -19070*g +28784*b + 32768)>>16)+128)
+
+#define TSTAMP_MIN_Y 24
+#define TSTAMP_MAX_Y TSTAMP_MIN_Y+15
+#define TSTAMP_MIN_X 64
+
+void prep_to_addr(struct sg_to_addr to_addr[],struct videobuf_buffer *vb)
+{
+        int i, pos=0;
+
+        for (i=0;i<vb->dma.nr_pages;i++) {
+                to_addr[i].sg=&vb->dma.sglist[i];
+                to_addr[i].pos=pos;
+                pos += vb->dma.sglist[i].length;
+        }
+}
+
+inline int get_addr_pos(int pos, int pages, struct sg_to_addr to_addr[])
+{
+        int p1=0,p2=pages-1,p3=pages/2;
+
+        /* Sanity test */
+        BUG_ON (pos>=to_addr[p2].pos+to_addr[p2].sg->length);
+
+        while (p1+1<p2) {
+                if (pos < to_addr[p3].pos) {
+                        p2=p3;
+                } else {
+                        p1=p3;
+                }
+                p3=(p1+p2)/2;
+        }
+        if (pos >= to_addr[p2].pos)
+                p1=p2;
+
+        return (p1);
+}
+
+void gen_line(struct sg_to_addr to_addr[],int inipos,int pages,int wmax,
+                                        int hmax, int line, char *timestr)
+{
+        int  w,i,j,pos=inipos,pgpos,oldpg,y;
+        char *p,*s,*basep;
+        struct page *pg;
+        u8   chr,r,g,b,color;
+
+        /* Get first addr pointed to pixel position */
+        oldpg=get_addr_pos(pos,pages,to_addr);
+        pg=pfn_to_page(to_addr[oldpg].sg->dma_address >> PAGE_SHIFT);
+        basep = kmap_atomic(pg, KM_BOUNCE_READ)+to_addr[oldpg].sg->offset;
+
+        /* We will just duplicate the second pixel at the packet */
+        wmax/=2;
+
+        /* Generate a standard color bar pattern */
+        for (w=0;w<wmax;w++) {
+                r=bars[w*7/wmax][0];
+                g=bars[w*7/wmax][1];
+                b=bars[w*7/wmax][2];
+
+                for (color=0;color<4;color++) {
+                        pgpos=get_addr_pos(pos,pages,to_addr);
+                        if (pgpos!=oldpg) {
+                                pg=pfn_to_page(to_addr[pgpos].sg->dma_address >> PAGE_SHIFT);
+                                kunmap_atomic(basep, KM_BOUNCE_READ);
+                                basep= kmap_atomic(pg, KM_BOUNCE_READ)+to_addr[pgpos].sg->offset;
+                                oldpg=pgpos;
+                        }
+                        p=basep+pos-to_addr[pgpos].pos;
+
+                        switch (color) {
+                                case 0:
+                                case 2:
+                                        *p=TO_Y(r,g,b);         /* Luminance */
+                                        break;
+                                case 1:
+                                        *p=TO_U(r,g,b);         /* Cb */
+                                        break;
+                                case 3:
+                                        *p=TO_V(r,g,b);         /* Cr */
+                                        break;
+                        }
+                        pos++;
+                }
+        }
+
+        /* Checks if it is possible to show timestamp */
+        if (TSTAMP_MAX_Y>=hmax)
+                goto end;
+        if (TSTAMP_MIN_X+strlen(timestr)>=wmax)
+                goto end;
+
+        /* Print stream time */
+        if (line>=TSTAMP_MIN_Y && line<=TSTAMP_MAX_Y) {
+                j=TSTAMP_MIN_X;
+                for (s=timestr;*s;s++) {
+                        chr=rom8x16_bits[(*s-0x30)*16+line-TSTAMP_MIN_Y];
+                        for (i=0;i<7;i++) {
+                                if (chr&1<<(7-i)) { /* Font color*/
+                                        r=bars[BLUE][0];
+                                        g=bars[BLUE][1];
+                                        b=bars[BLUE][2];
+                                        r=g=b=0;
+                                        g=198;
+                                } else { /* Background color */
+                                        r=bars[WHITE][0];
+                                        g=bars[WHITE][1];
+                                        b=bars[WHITE][2];
+                                        r=g=b=0;
+                                }
+
+                                pos=inipos+j*2;
+                                for (color=0;color<4;color++) {
+                                        pgpos=get_addr_pos(pos,pages,to_addr);
+                                        if (pgpos!=oldpg) {
+                                                pg=pfn_to_page(to_addr[pgpos].
+                                                                sg->dma_address
+                                                                >> PAGE_SHIFT);
+                                                kunmap_atomic(basep,
+                                                                KM_BOUNCE_READ);
+                                                basep= kmap_atomic(pg,
+                                                        KM_BOUNCE_READ)+
+                                                        to_addr[pgpos].sg->offset;
+                                                oldpg=pgpos;
+                                        }
+                                        p=basep+pos-to_addr[pgpos].pos;
+
+                                        y=TO_Y(r,g,b);
+
+                                        switch (color) {
+                                                case 0:
+                                                case 2:
+                                                        *p=TO_Y(r,g,b);         /* Luminance */
+                                                        break;
+                                                case 1:
+                                                        *p=TO_U(r,g,b);         /* Cb */
+                                                        break;
+                                                case 3:
+                                                        *p=TO_V(r,g,b);         /* Cr */
+                                                        break;
+                                        }
+                                        pos++;
+                                }
+                                j++;
+                        }
+                }
+        }
+
+
+end:
+        kunmap_atomic(basep, KM_BOUNCE_READ);
+}
+static void vivi_fillbuff(struct vivi_dev *dev,struct vivi_buffer *buf)
+{
+        int h,pos=0;
+        int hmax  = buf->vb.height;
+        int wmax  = buf->vb.width;
+        struct videobuf_buffer *vb=&buf->vb;
+        struct sg_to_addr *to_addr=buf->to_addr;
+        struct timeval ts;
+
+        /* Test if DMA mapping is ready */
+        if (!vb->dma.sglist[0].dma_address)
+                return;
+
+        prep_to_addr(to_addr,vb);
+
+        /* Check if there is enough memory */
+        BUG_ON(buf->vb.dma.nr_pages << PAGE_SHIFT < (buf->vb.width*buf->vb.height)*2);
+
+        for (h=0;h<hmax;h++) {
+                gen_line(to_addr,pos,vb->dma.nr_pages,wmax,hmax,h,dev->timestr);
+                pos += wmax*2;
+        }
+
+        /* Updates stream time */
+
+        dev->us+=jiffies_to_usecs(jiffies-dev->jiffies);
+        dev->jiffies=jiffies;
+        if (dev->us>=1000000) {
+                dev->us-=1000000;
+                dev->s++;
+                if (dev->s>=60) {
+                        dev->s-=60;
+                        dev->m++;
+                        if (dev->m>60) {
+                                dev->m-=60;
+                                dev->h++;
+                                if (dev->h>24)
+                                        dev->h-=24;
+                        }
+                }
+        }
+        sprintf(dev->timestr,"%02d:%02d:%02d:%03d",
+                        dev->h,dev->m,dev->s,(dev->us+500)/1000);
+
+        dprintk(2,"vivifill at %s: Buffer 0x%08lx size= %d\n",dev->timestr,
+                        (unsigned long)buf->vb.dma.vmalloc,pos);
+
+        /* Advice that buffer was filled */
+        buf->vb.state = STATE_DONE;
+        buf->vb.field_count++;
+        do_gettimeofday(&ts);
+        buf->vb.ts = ts;
+
+        list_del(&buf->vb.queue);
+        wake_up(&buf->vb.done);
+}
+
+static int restart_video_queue(struct vivi_dmaqueue *dma_q);
+
+static void vivi_thread_tick(struct vivi_dmaqueue  *dma_q)
+{
+        struct vivi_buffer    *buf;
+        struct vivi_dev *dev= container_of(dma_q,struct vivi_dev,vidq);
+
+        int bc;
+
+        /* Announces videobuf that all went ok */
+        for (bc = 0;; bc++) {
+                if (list_empty(&dma_q->active)) {
+                        dprintk(1,"No active queue to serve\n");
+                        break;
+                }
+
+                buf = list_entry(dma_q->active.next,
+                                 struct vivi_buffer, vb.queue);
+
+                /* Nobody is waiting something to be done, just return */
+                if (!waitqueue_active(&buf->vb.done)) {
+                        mod_timer(&dma_q->timeout, jiffies+BUFFER_TIMEOUT);
+                        return;
+                }
+
+                do_gettimeofday(&buf->vb.ts);
+                dprintk(2,"[%p/%d] wakeup\n",buf,buf->vb.i);
+
+                /* Fill buffer */
+                vivi_fillbuff(dev,buf);
+        }
+        if (list_empty(&dma_q->active)) {
+                del_timer(&dma_q->timeout);
+        } else {
+                mod_timer(&dma_q->timeout, jiffies+BUFFER_TIMEOUT);
+        }
+        if (bc != 1)
+                dprintk(1,"%s: %d buffers handled (should be 1)\n",__FUNCTION__,bc);
+}
+
+void vivi_sleep(struct vivi_dmaqueue  *dma_q)
+{
+        int timeout;
+        DECLARE_WAITQUEUE(wait, current);
+
+        dprintk(1,"%s dma_q=0x%08lx\n",__FUNCTION__,(unsigned long)dma_q);
+
+        add_wait_queue(&dma_q->wq, &wait);
+        if (!kthread_should_stop()) {
+                dma_q->frame++;
+
+                /* Calculate time to wake up */
+                timeout=dma_q->ini_jiffies+msecs_to_jiffies((dma_q->frame*WAKE_NUMERATOR*1000)/WAKE_DENOMINATOR)-jiffies;
+
+                if (timeout <= 0) {
+                        int old=dma_q->frame;
+                        dma_q->frame=(jiffies_to_msecs(jiffies-dma_q->ini_jiffies)*WAKE_DENOMINATOR)/(WAKE_NUMERATOR*1000)+1;
+
+                        timeout=dma_q->ini_jiffies+msecs_to_jiffies((dma_q->frame*WAKE_NUMERATOR*1000)/WAKE_DENOMINATOR)-jiffies;
+
+                        dprintk(1,"underrun, losed %d frames. "
+                                  "Now, frame is %d. Waking on %d jiffies\n",
+                                        dma_q->frame-old,dma_q->frame,timeout);
+                } else
+                        dprintk(1,"will sleep for %i jiffies\n",timeout);
+
+                vivi_thread_tick(dma_q);
+
+                schedule_timeout_interruptible (timeout);
+        }
+
+        remove_wait_queue(&dma_q->wq, &wait);
+        try_to_freeze();
+}
+
+int vivi_thread(void *data)
+{
+        struct vivi_dmaqueue  *dma_q=data;
+
+        dprintk(1,"thread started\n");
+
+        for (;;) {
+                vivi_sleep(dma_q);
+
+                if (kthread_should_stop())
+                        break;
+        }
+        dprintk(1, "thread: exit\n");
+        return 0;
+}
+
+int vivi_start_thread(struct vivi_dmaqueue  *dma_q)
+{
+        dma_q->frame=0;
+        dma_q->ini_jiffies=jiffies;
+
+        dprintk(1,"%s\n",__FUNCTION__);
+        init_waitqueue_head(&dma_q->wq);
+
+        dma_q->kthread = kthread_run(vivi_thread, dma_q, "vivi");
+
+        if (dma_q->kthread == NULL) {
+                printk(KERN_ERR "vivi: kernel_thread() failed\n");
+                return -EINVAL;
+        }
+        dprintk(1,"returning from %s\n",__FUNCTION__);
+        return 0;
+}
+
+void vivi_stop_thread(struct vivi_dmaqueue  *dma_q)
+{
+        dprintk(1,"%s\n",__FUNCTION__);
+        /* shutdown control thread */
+        if (dma_q->kthread) {
+                kthread_stop(dma_q->kthread);
+                dma_q->kthread=NULL;
+        }
+}
+
+static int restart_video_queue(struct vivi_dmaqueue *dma_q)
+{
+        struct vivi_buffer *buf, *prev;
+        struct list_head *item;
+
+        dprintk(1,"%s dma_q=0x%08lx\n",__FUNCTION__,(unsigned long)dma_q);
+
+        if (!list_empty(&dma_q->active)) {
+                buf = list_entry(dma_q->active.next, struct vivi_buffer, vb.queue);
+                dprintk(2,"restart_queue [%p/%d]: restart dma\n",
+                        buf, buf->vb.i);
+
+                dprintk(1,"Restarting video dma\n");
+                vivi_stop_thread(dma_q);
+//              vivi_start_thread(dma_q);
+
+                /* cancel all outstanding capture / vbi requests */
+                list_for_each(item,&dma_q->active) {
+                        buf = list_entry(item, struct vivi_buffer, vb.queue);
+
+                        list_del(&buf->vb.queue);
+                        buf->vb.state = STATE_ERROR;
+                        wake_up(&buf->vb.done);
+                }
+                mod_timer(&dma_q->timeout, jiffies+BUFFER_TIMEOUT);
+
+                return 0;
+        }
+
+        prev = NULL;
+        for (;;) {
+                if (list_empty(&dma_q->queued))
+                        return 0;
+                buf = list_entry(dma_q->queued.next, struct vivi_buffer, vb.queue);
+                if (NULL == prev) {
+                        list_del(&buf->vb.queue);
+                        list_add_tail(&buf->vb.queue,&dma_q->active);
+
+                        dprintk(1,"Restarting video dma\n");
+                        vivi_stop_thread(dma_q);
+                        vivi_start_thread(dma_q);
+
+                        buf->vb.state = STATE_ACTIVE;
+                        mod_timer(&dma_q->timeout, jiffies+BUFFER_TIMEOUT);
+                        dprintk(2,"[%p/%d] restart_queue - first active\n",
+                                buf,buf->vb.i);
+
+                } else if (prev->vb.width  == buf->vb.width  &&
+                           prev->vb.height == buf->vb.height &&
+                           prev->fmt       == buf->fmt) {
+                        list_del(&buf->vb.queue);
+                        list_add_tail(&buf->vb.queue,&dma_q->active);
+                        buf->vb.state = STATE_ACTIVE;
+                        dprintk(2,"[%p/%d] restart_queue - move to active\n",
+                                buf,buf->vb.i);
+                } else {
+                        return 0;
+                }
+                prev = buf;
+        }
+}
+
+static void vivi_vid_timeout(unsigned long data)
+{
+        struct vivi_dev      *dev  = (struct vivi_dev*)data;
+        struct vivi_dmaqueue *vidq = &dev->vidq;
+        struct vivi_buffer   *buf;
+
+        while (!list_empty(&vidq->active)) {
+                buf = list_entry(vidq->active.next, struct vivi_buffer, vb.queue);
+                list_del(&buf->vb.queue);
+                buf->vb.state = STATE_ERROR;
+                wake_up(&buf->vb.done);
+                printk("vivi/0: [%p/%d] timeout\n", buf, buf->vb.i);
+        }
+
+        restart_video_queue(vidq);
+}
+
+/* ------------------------------------------------------------------
+        Videobuf operations
+   ------------------------------------------------------------------*/
+static int
+buffer_setup(struct videobuf_queue *vq, unsigned int *count, unsigned int *size)
+{
+        struct vivi_fh *fh = vq->priv_data;
+
+        *size = fh->width*fh->height*2;
+
+        if (0 == *count)
+                *count = 32;
+        while (*size * *count > vid_limit * 1024 * 1024)
+                (*count)--;
+        return 0;
+}
+
+void
+free_buffer(struct videobuf_queue *vq, struct vivi_buffer *buf)
+{
+        dprintk(1,"%s\n",__FUNCTION__);
+
+        if (in_interrupt())
+                BUG();
+
+        /*FIXME: Maybe a spinlock is required here */
+        kfree(buf->to_addr);
+        buf->to_addr=NULL;
+
+        videobuf_waiton(&buf->vb,0,0);
+        videobuf_dma_unmap(vq, &buf->vb.dma);
+        videobuf_dma_free(&buf->vb.dma);
+        buf->vb.state = STATE_NEEDS_INIT;
+}
+
+#define norm_maxw() 1024
+#define norm_maxh() 768
+static int
+buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
+                                                enum v4l2_field field)
+{
+        struct vivi_fh     *fh  = vq->priv_data;
+        struct vivi_buffer *buf = container_of(vb,struct vivi_buffer,vb);
+        int rc, init_buffer = 0;
+
+//      dprintk(1,"%s, field=%d\n",__FUNCTION__,field);
+
+        BUG_ON(NULL == fh->fmt);
+        if (fh->width  < 48 || fh->width  > norm_maxw() ||
+            fh->height < 32 || fh->height > norm_maxh())
+                return -EINVAL;
+        buf->vb.size = fh->width*fh->height*2;
+        if (0 != buf->vb.baddr  &&  buf->vb.bsize < buf->vb.size)
+                return -EINVAL;
+
+        if (buf->fmt       != fh->fmt    ||
+            buf->vb.width  != fh->width  ||
+            buf->vb.height != fh->height ||
+        buf->vb.field  != field) {
+                buf->fmt       = fh->fmt;
+                buf->vb.width  = fh->width;
+                buf->vb.height = fh->height;
+                buf->vb.field  = field;
+                init_buffer = 1;
+        }
+
+        if (STATE_NEEDS_INIT == buf->vb.state) {
+                if (0 != (rc = videobuf_iolock(vq,&buf->vb,NULL)))
+                        goto fail;
+        }
+
+        buf->vb.state = STATE_PREPARED;
+
+        if (NULL == (buf->to_addr = kmalloc(sizeof(*buf->to_addr) * vb->dma.nr_pages,GFP_KERNEL))) {
+                rc=-ENOMEM;
+                goto fail;
+        }
+
+        return 0;
+
+fail:
+        free_buffer(vq,buf);
+        return rc;
+}
+
+static void
+buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+{
+        struct vivi_buffer    *buf     = container_of(vb,struct vivi_buffer,vb);
+        struct vivi_fh        *fh      = vq->priv_data;
+        struct vivi_dev       *dev     = fh->dev;
+        struct vivi_dmaqueue  *vidq    = &dev->vidq;
+        struct vivi_buffer    *prev;
+
+        if (!list_empty(&vidq->queued)) {
+                dprintk(1,"adding vb queue=0x%08lx\n",(unsigned long)&buf->vb.queue);
+                list_add_tail(&buf->vb.queue,&vidq->queued);
+                buf->vb.state = STATE_QUEUED;
+                dprintk(2,"[%p/%d] buffer_queue - append to queued\n",
+                        buf, buf->vb.i);
+        } else if (list_empty(&vidq->active)) {
+                list_add_tail(&buf->vb.queue,&vidq->active);
+
+                buf->vb.state = STATE_ACTIVE;
+                mod_timer(&vidq->timeout, jiffies+BUFFER_TIMEOUT);
+                dprintk(2,"[%p/%d] buffer_queue - first active\n",
+                        buf, buf->vb.i);
+
+                vivi_start_thread(vidq);
+        } else {
+                prev = list_entry(vidq->active.prev, struct vivi_buffer, vb.queue);
+                if (prev->vb.width  == buf->vb.width  &&
+                    prev->vb.height == buf->vb.height &&
+                    prev->fmt       == buf->fmt) {
+                        list_add_tail(&buf->vb.queue,&vidq->active);
+                        buf->vb.state = STATE_ACTIVE;
+                        dprintk(2,"[%p/%d] buffer_queue - append to active\n",
+                                buf, buf->vb.i);
+
+                } else {
+                        list_add_tail(&buf->vb.queue,&vidq->queued);
+                        buf->vb.state = STATE_QUEUED;
+                        dprintk(2,"[%p/%d] buffer_queue - first queued\n",
+                                buf, buf->vb.i);
+                }
+        }
+}
+
+static void buffer_release(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+{
+        struct vivi_buffer   *buf  = container_of(vb,struct vivi_buffer,vb);
+        struct vivi_fh       *fh   = vq->priv_data;
+        struct vivi_dev      *dev  = (struct vivi_dev*)fh->dev;
+        struct vivi_dmaqueue *vidq = &dev->vidq;
+
+        dprintk(1,"%s\n",__FUNCTION__);
+
+        vivi_stop_thread(vidq);
+
+        free_buffer(vq,buf);
+}
+
+int vivi_map_sg (void *dev, struct scatterlist *sg, int nents,
+           int direction)
+{
+        int i;
+
+        dprintk(1,"%s, number of pages=%d\n",__FUNCTION__,nents);
+        BUG_ON(direction == DMA_NONE);
+
+        for (i = 0; i < nents; i++ ) {
+                BUG_ON(!sg[i].page);
+
+                sg[i].dma_address = page_to_phys(sg[i].page) + sg[i].offset;
+        }
+
+        return nents;
+}
+
+int vivi_unmap_sg(void *dev,struct scatterlist *sglist,int nr_pages,
+                                        int direction)
+{
+        dprintk(1,"%s\n",__FUNCTION__);
+        return 0;
+}
+
+int vivi_dma_sync_sg(void *dev,struct scatterlist *sglist,int nr_pages,
+                                        int direction)
+{
+//      dprintk(1,"%s\n",__FUNCTION__);
+
+//      flush_write_buffers();
+        return 0;
+}
+
+static struct videobuf_queue_ops vivi_video_qops = {
+        .buf_setup      = buffer_setup,
+        .buf_prepare    = buffer_prepare,
+        .buf_queue      = buffer_queue,
+        .buf_release    = buffer_release,
+
+        /* Non-pci handling routines */
+        .vb_map_sg      = vivi_map_sg,
+        .vb_dma_sync_sg = vivi_dma_sync_sg,
+        .vb_unmap_sg    = vivi_unmap_sg,
+};
+
+/* ------------------------------------------------------------------
+        IOCTL handling
+   ------------------------------------------------------------------*/
+
+static int vivi_try_fmt(struct vivi_dev *dev, struct vivi_fh *fh,
+                        struct v4l2_format *f)
+{
+        struct vivi_fmt *fmt;
+        enum v4l2_field field;
+        unsigned int maxw, maxh;
+
+        if (format.fourcc != f->fmt.pix.pixelformat) {
+                dprintk(1,"Fourcc format invalid.\n");
+                return -EINVAL;
+        }
+        fmt=&format;
+
+        field = f->fmt.pix.field;
+
+        if (field == V4L2_FIELD_ANY) {
+//              field=V4L2_FIELD_INTERLACED;
+                field=V4L2_FIELD_SEQ_TB;
+        } else if (V4L2_FIELD_INTERLACED != field) {
+                dprintk(1,"Field type invalid.\n");
+                return -EINVAL;
+        }
+
+        maxw  = norm_maxw();
+        maxh  = norm_maxh();
+
+        f->fmt.pix.field = field;
+        if (f->fmt.pix.height < 32)
+                f->fmt.pix.height = 32;
+        if (f->fmt.pix.height > maxh)
+                f->fmt.pix.height = maxh;
+        if (f->fmt.pix.width < 48)
+                f->fmt.pix.width = 48;
+        if (f->fmt.pix.width > maxw)
+                f->fmt.pix.width = maxw;
+        f->fmt.pix.width &= ~0x03;
+        f->fmt.pix.bytesperline =
+                (f->fmt.pix.width * fmt->depth) >> 3;
+        f->fmt.pix.sizeimage =
+                f->fmt.pix.height * f->fmt.pix.bytesperline;
+
+        return 0;
+}
+
+static int res_get(struct vivi_dev *dev, struct vivi_fh *fh)
+{
+        /* is it free? */
+        down(&dev->lock);
+        if (dev->resources) {
+                /* no, someone else uses it */
+                up(&dev->lock);
+                return 0;
+        }
+        /* it's free, grab it */
+        dev->resources =1;
+        dprintk(1,"res: get\n");
+        up(&dev->lock);
+        return 1;
+}
+
+static inline int res_locked(struct vivi_dev *dev)
+{
+        return (dev->resources);
+}
+
+static void res_free(struct vivi_dev *dev, struct vivi_fh *fh)
+{
+        down(&dev->lock);
+        dev->resources = 0;
+        dprintk(1,"res: put\n");
+        up(&dev->lock);
+}
+
+static int vivi_do_ioctl(struct inode *inode, struct file *file, unsigned int cmd, void *arg)
+{
+        struct vivi_fh  *fh     = file->private_data;
+        struct vivi_dev *dev    = fh->dev;
+        int ret=0;
+
+        if (debug) {
+                if (_IOC_DIR(cmd) & _IOC_WRITE)
+                        v4l_printk_ioctl_arg("vivi(w)",cmd, arg);
+                else if (!_IOC_DIR(cmd) & _IOC_READ) {
+                        v4l_print_ioctl("vivi", cmd);
+                }
+        }
+
+        switch(cmd) {
+        /* --- capabilities ------------------------------------------ */
+        case VIDIOC_QUERYCAP:
+        {
+                struct v4l2_capability *cap = (struct v4l2_capability*)arg;
+
+                memset(cap, 0, sizeof(*cap));
+
+                strcpy(cap->driver, "vivi");
+                strcpy(cap->card, "vivi");
+                cap->version = VIVI_VERSION;
+                cap->capabilities =
+                                        V4L2_CAP_VIDEO_CAPTURE |
+                                        V4L2_CAP_STREAMING     |
+                                        V4L2_CAP_READWRITE;
+                break;
+        }
+        /* --- capture ioctls ---------------------------------------- */
+        case VIDIOC_ENUM_FMT:
+        {
+                struct v4l2_fmtdesc *f = arg;
+                enum v4l2_buf_type type;
+                unsigned int index;
+
+                index = f->index;
+                type  = f->type;
+
+                if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                        ret=-EINVAL;
+                        break;
+                }
+
+                switch (type) {
+                case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+                        if (index > 0){
+                                ret=-EINVAL;
+                                break;
+                        }
+                        memset(f,0,sizeof(*f));
+
+                        f->index = index;
+                        f->type  = type;
+                        strlcpy(f->description,format.name,sizeof(f->description));
+                        f->pixelformat = format.fourcc;
+                        break;
+                default:
+                        ret=-EINVAL;
+                }
+                break;
+        }
+        case VIDIOC_G_FMT:
+        {
+                struct v4l2_format *f = (struct v4l2_format *)arg;
+
+                if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                        ret=-EINVAL;
+                        break;
+                }
+
+                memset(&f->fmt.pix,0,sizeof(f->fmt.pix));
+                f->fmt.pix.width        = fh->width;
+                f->fmt.pix.height       = fh->height;
+                f->fmt.pix.field        = fh->vb_vidq.field;
+                f->fmt.pix.pixelformat  = fh->fmt->fourcc;
+                f->fmt.pix.bytesperline =
+                        (f->fmt.pix.width * fh->fmt->depth) >> 3;
+                f->fmt.pix.sizeimage =
+                        f->fmt.pix.height * f->fmt.pix.bytesperline;
+                break;
+        }
+        case VIDIOC_S_FMT:
+        {
+                struct v4l2_format *f = arg;
+
+                if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                        dprintk(1,"Only capture supported.\n");
+                        ret=-EINVAL;
+                        break;
+                }
+
+                ret = vivi_try_fmt(dev,fh,f);
+                if (ret < 0)
+                        break;
+
+                fh->fmt           = &format;
+                fh->width         = f->fmt.pix.width;
+                fh->height        = f->fmt.pix.height;
+                fh->vb_vidq.field = f->fmt.pix.field;
+                fh->type          = f->type;
+
+                break;
+        }
+        case VIDIOC_TRY_FMT:
+        {
+                struct v4l2_format *f = arg;
+                if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                        ret=-EINVAL;
+                        break;
+                }
+
+                ret=vivi_try_fmt(dev,fh,f);
+                break;
+        }
+        case VIDIOC_REQBUFS:
+                if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                        ret=-EINVAL;
+                        break;
+                }
+                ret=videobuf_reqbufs(&fh->vb_vidq, arg);
+                break;
+        case VIDIOC_QUERYBUF:
+                if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                        ret=-EINVAL;
+                        break;
+                }
+                ret=videobuf_querybuf(&fh->vb_vidq, arg);
+                break;
+        case VIDIOC_QBUF:
+                if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                        ret=-EINVAL;
+                        break;
+                }
+                ret=videobuf_qbuf(&fh->vb_vidq, arg);
+                break;
+        case VIDIOC_DQBUF:
+                if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                        ret=-EINVAL;
+                        break;
+                }
+                ret=videobuf_dqbuf(&fh->vb_vidq, arg,
+                                        file->f_flags & O_NONBLOCK);
+                break;
+#ifdef HAVE_V4L1
+        /* --- streaming capture ------------------------------------- */
+        case VIDIOCGMBUF:
+        {
+                struct video_mbuf *mbuf = arg;
+                struct videobuf_queue *q=&fh->vb_vidq;
+                struct v4l2_requestbuffers req;
+                unsigned int i;
+
+                memset(&req,0,sizeof(req));
+                req.type   = q->type;
+                req.count  = 8;
+                req.memory = V4L2_MEMORY_MMAP;
+                ret = videobuf_reqbufs(q,&req);
+                if (ret < 0)
+                        break;
+                memset(mbuf,0,sizeof(*mbuf));
+                mbuf->frames = req.count;
+                mbuf->size   = 0;
+                for (i = 0; i < mbuf->frames; i++) {
+                        mbuf->offsets[i]  = q->bufs[i]->boff;
+                        mbuf->size       += q->bufs[i]->bsize;
+                }
+                break;
+        }
+#endif
+        case VIDIOC_STREAMON:
+        {
+                if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                        return -EINVAL;
+                if (!res_get(dev,fh))
+                        return -EBUSY;
+                ret=videobuf_streamon(&fh->vb_vidq);
+                break;
+        }
+        case VIDIOC_STREAMOFF:
+        {
+                if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                        ret=-EINVAL;
+                        break;
+                }
+                ret = videobuf_streamoff(&fh->vb_vidq);
+                if (ret < 0)
+                        break;
+                res_free(dev,fh);
+                break;
+        }
+        /* ---------- tv norms ---------- */
+        case VIDIOC_ENUMSTD:
+        {
+                struct v4l2_standard *e = arg;
+
+                if (e->index>0) {
+                        ret=-EINVAL;
+                        break;
+                }
+                ret = v4l2_video_std_construct(e, V4L2_STD_NTSC_M, "NTSC-M");
+
+                /* Allows vivi to use different fps from video std */
+                e->frameperiod.numerator = WAKE_NUMERATOR;
+                e->frameperiod.denominator = WAKE_DENOMINATOR;
+
+                break;
+        }
+        case VIDIOC_G_STD:
+        {
+                v4l2_std_id *id = arg;
+
+                *id = V4L2_STD_NTSC_M;
+                break;
+        }
+        case VIDIOC_S_STD:
+        {
+                break;
+        }
+        /* ------ input switching ---------- */
+        case VIDIOC_ENUMINPUT:
+        { /* only one input in this sample driver */
+                struct v4l2_input *inp = arg;
+
+                if (inp->index != 0) {
+                        ret=-EINVAL;
+                        break;
+                }
+                memset(inp, 0, sizeof(*inp));
+
+                inp->index = 0;
+                inp->type = V4L2_INPUT_TYPE_CAMERA;
+                inp->std = V4L2_STD_NTSC_M;
+                strcpy(inp->name,"Camera");
+                break;
+        }
+        case VIDIOC_G_INPUT:
+        {
+                unsigned int *i = arg;
+
+                *i = 0;
+                break;
+        }
+        case VIDIOC_S_INPUT:
+        {
+                unsigned int *i = arg;
+
+                if (*i > 0)
+                        ret=-EINVAL;
+                break;
+        }
+
+        /* --- controls ---------------------------------------------- */
+        case VIDIOC_QUERYCTRL:
+        {
+                struct v4l2_queryctrl *qc = arg;
+                int i;
+
+                for (i = 0; i < ARRAY_SIZE(vivi_qctrl); i++)
+                        if (qc->id && qc->id == vivi_qctrl[i].id) {
+                                memcpy(qc, &(vivi_qctrl[i]),
+                                        sizeof(*qc));
+                                break;
+                        }
+
+                ret=-EINVAL;
+                break;
+        }
+        case VIDIOC_G_CTRL:
+        {
+                struct v4l2_control *ctrl = arg;
+                int i;
+
+                for (i = 0; i < ARRAY_SIZE(vivi_qctrl); i++)
+                        if (ctrl->id == vivi_qctrl[i].id) {
+                                ctrl->value=qctl_regs[i];
+                                break;
+                        }
+
+                ret=-EINVAL;
+                break;
+        }
+        case VIDIOC_S_CTRL:
+        {
+                struct v4l2_control *ctrl = arg;
+                int i;
+                for (i = 0; i < ARRAY_SIZE(vivi_qctrl); i++)
+                        if (ctrl->id == vivi_qctrl[i].id) {
+                                if (ctrl->value <
+                                        vivi_qctrl[i].minimum
+                                        || ctrl->value >
+                                        vivi_qctrl[i].maximum) {
+                                                ret=-ERANGE;
+                                                break;
+                                        }
+                                qctl_regs[i]=ctrl->value;
+                                break;
+                        }
+                ret=-EINVAL;
+                break;
+        }
+        default:
+                ret=v4l_compat_translate_ioctl(inode,file,cmd,arg,vivi_do_ioctl);
+        }
+
+        if (debug) {
+                if (ret<0) {
+                        v4l_print_ioctl("vivi(err)", cmd);
+                        dprintk(1,"errcode=%d\n",ret);
+                } else if (_IOC_DIR(cmd) & _IOC_READ)
+                        v4l_printk_ioctl_arg("vivi(r)",cmd, arg);
+        }
+
+        return ret;
+}
+
+static int vivi_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+{
+        return video_usercopy(inode, file, cmd, arg, vivi_do_ioctl);
+}
+
+/* ------------------------------------------------------------------
+        File operations for the device
+   ------------------------------------------------------------------*/
+
+#define line_buf_size(norm) (norm_maxw(norm)*(format.depth+7)/8)
+
+static int vivi_open(struct inode *inode, struct file *file)
+{
+        int minor = iminor(inode);
+        struct vivi_dev *h,*dev = NULL;
+        struct vivi_fh *fh;
+        struct list_head *list;
+        enum v4l2_buf_type type = 0;
+        int i;
+
+        printk(KERN_DEBUG "vivi: open called (minor=%d)\n",minor);
+
+        list_for_each(list,&vivi_devlist) {
+                h = list_entry(list, struct vivi_dev, vivi_devlist);
+                if (h->video_dev.minor == minor) {
+                        dev  = h;
+                        type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                }
+        }
+        if (NULL == dev)
+                return -ENODEV;
+
+
+        /* If more than one user, mutex should be added */
+        dev->users++;
+
+        dprintk(1,"open minor=%d type=%s users=%d\n",
+                                minor,v4l2_type_names[type],dev->users);
+
+        /* allocate + initialize per filehandle data */
+        fh = kzalloc(sizeof(*fh),GFP_KERNEL);
+        if (NULL == fh) {
+                dev->users--;
+                return -ENOMEM;
+        }
+
+        file->private_data = fh;
+        fh->dev      = dev;
+        fh->type     = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        fh->fmt      = &format;
+        fh->width    = 640;
+        fh->height   = 480;
+
+        /* Put all controls at a sane state */
+        for (i = 0; i < ARRAY_SIZE(vivi_qctrl); i++)
+                qctl_regs[i] =vivi_qctrl[i].default_value;
+
+        dprintk(1,"Open: fh=0x%08lx, dev=0x%08lx, dev->vidq=0x%08lx\n",
+                (unsigned long)fh,(unsigned long)dev,(unsigned long)&dev->vidq);
+        dprintk(1,"Open: list_empty queued=%d\n",list_empty(&dev->vidq.queued));
+        dprintk(1,"Open: list_empty active=%d\n",list_empty(&dev->vidq.active));
+
+        /* Resets frame counters */
+        dev->h=0;
+        dev->m=0;
+        dev->s=0;
+        dev->us=0;
+        dev->jiffies=jiffies;
+        sprintf(dev->timestr,"%02d:%02d:%02d:%03d",
+                        dev->h,dev->m,dev->s,(dev->us+500)/1000);
+
+        videobuf_queue_init(&fh->vb_vidq, &vivi_video_qops,
+                        NULL, NULL,
+                        fh->type,
+                        V4L2_FIELD_INTERLACED,
+                        sizeof(struct vivi_buffer),fh);
+
+        return 0;
+}
+
+static ssize_t
+vivi_read(struct file *file, char __user *data, size_t count, loff_t *ppos)
+{
+        struct vivi_fh *fh = file->private_data;
+
+        if (fh->type==V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                if (res_locked(fh->dev))
+                        return -EBUSY;
+                return videobuf_read_one(&fh->vb_vidq, data, count, ppos,
+                                        file->f_flags & O_NONBLOCK);
+        }
+        return 0;
+}
+
+static unsigned int
+vivi_poll(struct file *file, struct poll_table_struct *wait)
+{
+        struct vivi_fh *fh = file->private_data;
+        struct vivi_buffer *buf;
+
+        dprintk(1,"%s\n",__FUNCTION__);
+
+        if (V4L2_BUF_TYPE_VIDEO_CAPTURE != fh->type)
+                return POLLERR;
+
+        if (res_get(fh->dev,fh)) {
+                dprintk(1,"poll: mmap interface\n");
+                /* streaming capture */
+                if (list_empty(&fh->vb_vidq.stream))
+                        return POLLERR;
+                buf = list_entry(fh->vb_vidq.stream.next,struct vivi_buffer,vb.stream);
+        } else {
+                dprintk(1,"poll: read() interface\n");
+                /* read() capture */
+                buf = (struct vivi_buffer*)fh->vb_vidq.read_buf;
+                if (NULL == buf)
+                        return POLLERR;
+        }
+        poll_wait(file, &buf->vb.done, wait);
+        if (buf->vb.state == STATE_DONE ||
+            buf->vb.state == STATE_ERROR)
+                return POLLIN|POLLRDNORM;
+        return 0;
+}
+
+static int vivi_release(struct inode *inode, struct file *file)
+{
+        struct vivi_fh  *fh     = file->private_data;
+        struct vivi_dev *dev    = fh->dev;
+        struct vivi_dmaqueue *vidq = &dev->vidq;
+
+        int minor = iminor(inode);
+
+        vivi_stop_thread(vidq);
+        videobuf_mmap_free(&fh->vb_vidq);
+
+        kfree (fh);
+
+        dev->users--;
+
+        printk(KERN_DEBUG "vivi: close called (minor=%d, users=%d)\n",minor,dev->users);
+
+        return 0;
+}
+
+static int
+vivi_mmap(struct file *file, struct vm_area_struct * vma)
+{
+        struct vivi_fh *fh = file->private_data;
+        int ret;
+
+        dprintk (1,"mmap called, vma=0x%08lx\n",(unsigned long)vma);
+
+        ret=videobuf_mmap_mapper(&fh->vb_vidq, vma);
+
+        dprintk (1,"vma start=0x%08lx, size=%ld, ret=%d\n",
+                (unsigned long)vma->vm_start,
+                (unsigned long)vma->vm_end-(unsigned long)vma->vm_start,
+                ret);
+
+        return ret;
+}
+
+static struct file_operations vivi_fops = {
+        .owner          = THIS_MODULE,
+        .open           = vivi_open,
+        .release        = vivi_release,
+        .read           = vivi_read,
+        .poll           = vivi_poll,
+        .ioctl          = vivi_ioctl,
+        .mmap           = vivi_mmap,
+        .llseek         = no_llseek,
+};
+
+static struct video_device vivi = {
+        .name           = "VTM Virtual Video Capture Board",
+        .type           = VID_TYPE_CAPTURE,
+        .hardware       = 0,
+        .fops           = &vivi_fops,
+        .minor          = -1,
+//      .release        = video_device_release,
+};
+/* ------------------------------------------------------------------
+        Initialization and module stuff
+   ------------------------------------------------------------------*/
+
+static int __init vivi_init(void)
+{
+        int ret;
+        struct vivi_dev *dev;
+
+        dev = kzalloc(sizeof(*dev),GFP_KERNEL);
+        if (NULL == dev)
+                return -ENOMEM;
+        list_add_tail(&dev->vivi_devlist,&vivi_devlist);
+
+        /* init video dma queues */
+        INIT_LIST_HEAD(&dev->vidq.active);
+        INIT_LIST_HEAD(&dev->vidq.queued);
+
+        /* initialize locks */
+        init_MUTEX(&dev->lock);
+
+        dev->vidq.timeout.function = vivi_vid_timeout;
+        dev->vidq.timeout.data     = (unsigned long)dev;
+        init_timer(&dev->vidq.timeout);
+
+        ret = video_register_device(&vivi, VFL_TYPE_GRABBER, video_nr);
+        printk(KERN_INFO "Video Technology Magazine Virtual Video Capture Board (Load status: %d)\n", ret);
+        return ret;
+}
+
+static void __exit vivi_exit(void)
+{
+        struct vivi_dev *h;
+        struct list_head *list;
+
+        list_for_each(list,&vivi_devlist) {
+                h = list_entry(list, struct vivi_dev, vivi_devlist);
+                kfree (h);
+        }
+        video_unregister_device(&vivi);
+}
+
+module_init(vivi_init);
+module_exit(vivi_exit);
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 4cd5799674..40b205b914 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * vpx3220a, vpx3216b & vpx3214c video decoder driver version 0.0.1
  *
  * Copyright (C) 2001 Laurent Pinchart <lpinchart@freegates.be>
@@ -176,8 +176,8 @@ vpx3220_write_block (struct i2c_client *client,
 
 static int
 vpx3220_write_fp_block (struct i2c_client *client,
-                        const u16         *data,
-                        unsigned int       len)
+                        const u16         *data,
+                        unsigned int       len)
 {
         u8 reg;
         int ret = 0;
@@ -316,7 +316,7 @@ vpx3220_command (struct i2c_client *client,
                 vpx3220_write_fp_block(client, init_fp,
                                        sizeof(init_fp) >> 1);
                 switch (decoder->norm) {
-                        
+
                 case VIDEO_MODE_NTSC:
                         vpx3220_write_fp_block(client, init_ntsc,
                                                sizeof(init_ntsc) >> 1);
@@ -324,7 +324,7 @@ vpx3220_command (struct i2c_client *client,
 
                 case VIDEO_MODE_PAL:
                         vpx3220_write_fp_block(client, init_pal,
-                                               sizeof(init_pal) >> 1);
+                                               sizeof(init_pal) >> 1);
                         break;
                 case VIDEO_MODE_SECAM:
                         vpx3220_write_fp_block(client, init_secam,
@@ -332,10 +332,10 @@ vpx3220_command (struct i2c_client *client,
                         break;
                 default:
                         vpx3220_write_fp_block(client, init_pal,
-                                               sizeof(init_pal) >> 1);
+                                               sizeof(init_pal) >> 1);
                         break;
                 }
-        }               
+        }
                 break;
 
         case DECODER_DUMP:
@@ -411,7 +411,7 @@ vpx3220_command (struct i2c_client *client,
 
                 /* Here we back up the input selection because it gets
                    overwritten when we fill the registers with the
-                   choosen video norm */
+                   choosen video norm */
                 temp_input = vpx3220_fp_read(client, 0xf2);
 
                 dprintk(1, KERN_DEBUG "%s: DECODER_SET_NORM %d\n",
@@ -578,7 +578,7 @@ static unsigned short normal_i2c[] =
 };
 
 static unsigned short ignore = I2C_CLIENT_END;
-                                                                                
+
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
@@ -661,7 +661,7 @@ vpx3220_detect_client (struct i2c_adapter *adapter,
                         break;
                 default:
                         dprintk(1,
-                                KERN_INFO 
+                                KERN_INFO
                                 "%s: Wrong part number (0x%04x)\n",
                                 __func__, pn);
                         kfree(client);
diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c
index b7b0afffd2..80ef8a1b8f 100644
--- a/drivers/media/video/w9966.c
+++ b/drivers/media/video/w9966.c
@@ -26,7 +26,7 @@
         Does any other model using the w9966 interface chip exist ?
 
         Todo:
-        
+
         *Add a working EPP mode, since DMA ECP read isn't implemented
         in the parport drivers. (That's why it's so sloow)
 
@@ -47,9 +47,9 @@
         *Probably some bugs that I don't know of
 
         Please support me by sending feedback!
-        
+
         Changes:
-        
+
         Alan Cox:       Removed RGB mode for kernel merge, added THIS_MODULE
                         and owner support for newer module locks
 */
@@ -204,7 +204,7 @@ static struct video_device w9966_template = {
  */
 
 
-// Set camera phase flags, so we know what to uninit when terminating 
+// Set camera phase flags, so we know what to uninit when terminating
 static inline void w9966_setState(struct w9966_dev* cam, int mask, int val)
 {
         cam->dev_state = (cam->dev_state & ~mask) ^ val;
@@ -233,7 +233,7 @@ static inline void w9966_pdev_release(struct w9966_dev* cam)
         parport_release(cam->pdev);
         w9966_setState(cam, W9966_STATE_CLAIMED, 0);
 }
- 
+
 // Read register from W9966 interface-chip
 // Expects a claimed pdev
 // -1 on error, else register data (byte)
@@ -242,7 +242,7 @@ static int w9966_rReg(struct w9966_dev* cam, int reg)
         // ECP, read, regtransfer, REG, REG, REG, REG, REG
         const unsigned char addr = 0x80 | (reg & 0x1f);
         unsigned char val;
-        
+
         if (parport_negotiate(cam->pport, cam->ppmode | IEEE1284_ADDR) != 0)
                 return -1;
         if (parport_write(cam->pport, &addr, 1) != 1)
@@ -263,7 +263,7 @@ static int w9966_wReg(struct w9966_dev* cam, int reg, int data)
         // ECP, write, regtransfer, REG, REG, REG, REG, REG
         const unsigned char addr = 0xc0 | (reg & 0x1f);
         const unsigned char val = data;
-        
+
         if (parport_negotiate(cam->pport, cam->ppmode | IEEE1284_ADDR) != 0)
                 return -1;
         if (parport_write(cam->pport, &addr, 1) != 1)
@@ -284,7 +284,7 @@ static int w9966_init(struct w9966_dev* cam, struct parport* port)
 {
         if (cam->dev_state != 0)
                 return -1;
-        
+
         cam->pport = port;
         cam->brightness = 128;
         cam->contrast = 64;
@@ -302,7 +302,7 @@ static int w9966_init(struct w9966_dev* cam, struct parport* port)
                         cam->ppmode = IEEE1284_MODE_EPP;
                 else
                         cam->ppmode = IEEE1284_MODE_ECP;
-                break;  
+                break;
         case 1:         // hw- or sw-ecp
                 cam->ppmode = IEEE1284_MODE_ECP;
                 break;
@@ -310,7 +310,7 @@ static int w9966_init(struct w9966_dev* cam, struct parport* port)
                 cam->ppmode = IEEE1284_MODE_EPP;
         break;
         }
-        
+
 // Tell the parport driver that we exists
         cam->pdev = parport_register_device(port, "w9966", NULL, NULL, NULL, 0, NULL);
         if (cam->pdev == NULL) {
@@ -320,7 +320,7 @@ static int w9966_init(struct w9966_dev* cam, struct parport* port)
         w9966_setState(cam, W9966_STATE_PDEV, W9966_STATE_PDEV);
 
         w9966_pdev_claim(cam);
-        
+
 // Setup a default capture mode
         if (w9966_setup(cam, 0, 0, 1023, 1023, 200, 160) != 0) {
                 DPRINTF("w9966_setup() failed.\n");
@@ -333,11 +333,11 @@ static int w9966_init(struct w9966_dev* cam, struct parport* port)
         memcpy(&cam->vdev, &w9966_template, sizeof(struct video_device));
         cam->vdev.priv = cam;
 
-        if (video_register_device(&cam->vdev, VFL_TYPE_GRABBER, video_nr) == -1)                 
+        if (video_register_device(&cam->vdev, VFL_TYPE_GRABBER, video_nr) == -1)
                 return -1;
-        
+
         w9966_setState(cam, W9966_STATE_VDEV, W9966_STATE_VDEV);
-        
+
         // All ok
         printk(
                 "w9966cf: Found and initialized a webcam on %s.\n",
@@ -391,7 +391,7 @@ static int w9966_findlen(int near, int size, int maxlen)
                 // Only continue as long as we keep getting better values
                 if (err > besterr)
                         break;
-                
+
                 besterr = err;
                 bestlen = len;
         }
@@ -399,7 +399,7 @@ static int w9966_findlen(int near, int size, int maxlen)
         return bestlen;
 }
 
-// Modify capture window (if necessary) 
+// Modify capture window (if necessary)
 // and calculate downscaling
 // Return -1 on error
 static int w9966_calcscale(int size, int min, int max, int* beg, int* end, unsigned char* factor)
@@ -407,7 +407,7 @@ static int w9966_calcscale(int size, int min, int max, int* beg, int* end, unsig
         int maxlen = max - min;
         int len = *end - *beg + 1;
         int newlen = w9966_findlen(len, size, maxlen);
-        int err = newlen - len; 
+        int err = newlen - len;
 
         // Check for bad format
         if (newlen > maxlen || newlen < size)
@@ -452,8 +452,8 @@ static int w9966_setup(struct w9966_dev* cam, int x1, int y1, int x2, int y2, in
                 0x48, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x71, 0xe7, 0x00, 0x00, 0xc0
         };
-        
-        
+
+
         if (w*h*2 > W9966_SRAMSIZE)
         {
                 DPRINTF("capture window exceeds SRAM size!.\n");
@@ -469,9 +469,9 @@ static int w9966_setup(struct w9966_dev* cam, int x1, int y1, int x2, int y2, in
         cam->width = w;
         cam->height = h;
 
-        enh_s = 0;      
+        enh_s = 0;
         enh_e = w*h*2;
-        
+
 // Modify capture window if necessary and calculate downscaling
         if (
                 w9966_calcscale(w, W9966_WND_MIN_X, W9966_WND_MAX_X, &x1, &x2, &scale_x) != 0 ||
@@ -482,14 +482,14 @@ static int w9966_setup(struct w9966_dev* cam, int x1, int y1, int x2, int y2, in
                 "%dx%d, x: %d<->%d, y: %d<->%d, sx: %d/64, sy: %d/64.\n",
                 w, h, x1, x2, y1, y2, scale_x&~0x80, scale_y&~0x80
         );
-        
+
 // Setup registers
         regs[0x00] = 0x00;                      // Set normal operation
         regs[0x01] = 0x18;                      // Capture mode
         regs[0x02] = scale_y;                   // V-scaling
         regs[0x03] = scale_x;                   // H-scaling
-        
-        // Capture window       
+
+        // Capture window
         regs[0x04] = (x1 & 0x0ff);              // X-start (8 low bits)
         regs[0x05] = (x1 & 0x300)>>8;           // X-start (2 high bits)
         regs[0x06] = (y1 & 0x0ff);              // Y-start (8 low bits)
@@ -499,7 +499,7 @@ static int w9966_setup(struct w9966_dev* cam, int x1, int y1, int x2, int y2, in
         regs[0x0a] = (y2 & 0x0ff);              // Y-end (8 low bits)
 
         regs[0x0c] = W9966_SRAMID;              // SRAM-banks (1x 128kb)
-        
+
         // Enhancement layer
         regs[0x0d] = (enh_s& 0x000ff);          // Enh. start (0-7)
         regs[0x0e] = (enh_s& 0x0ff00)>>8;       // Enh. start (8-15)
@@ -515,7 +515,7 @@ static int w9966_setup(struct w9966_dev* cam, int x1, int y1, int x2, int y2, in
         regs[0x19] = 0xff;                      // I/O port direction control
         regs[0x1a] = 0xff;                      // I/O port data register
         regs[0x1b] = 0x10;                      // ???
-        
+
         // SAA7111 chip settings
         saa7111_regs[0x0a] = cam->brightness;
         saa7111_regs[0x0b] = cam->contrast;
@@ -551,7 +551,7 @@ static inline void w9966_i2c_setsda(struct w9966_dev* cam, int state)
                 cam->i2c_state |= W9966_I2C_W_DATA;
         else
                 cam->i2c_state &= ~W9966_I2C_W_DATA;
-        
+
         w9966_wReg(cam, 0x18, cam->i2c_state);
         udelay(5);
 }
@@ -577,7 +577,7 @@ static inline int w9966_i2c_setscl(struct w9966_dev* cam, int state)
 
         w9966_wReg(cam, 0x18, cam->i2c_state);
         udelay(5);
-        
+
         // we go to high, we also expect the peripheral to ack.
         if (state) {
                 timeout = jiffies + 100;
@@ -607,16 +607,16 @@ static int w9966_i2c_wbyte(struct w9966_dev* cam, int data)
                 w9966_i2c_setsda(cam, (data >> i) & 0x01);
 
                 if (w9966_i2c_setscl(cam, 1) == -1)
-                        return -1;                      
+                        return -1;
                 w9966_i2c_setscl(cam, 0);
         }
 
         w9966_i2c_setsda(cam, 1);
-        
+
         if (w9966_i2c_setscl(cam, 1) == -1)
                 return -1;
         w9966_i2c_setscl(cam, 0);
-        
+
         return 0;
 }
 
@@ -626,8 +626,8 @@ static int w9966_i2c_wbyte(struct w9966_dev* cam, int data)
 static int w9966_i2c_rbyte(struct w9966_dev* cam)
 {
         unsigned char data = 0x00;
-        int i;  
-        
+        int i;
+
         w9966_i2c_setsda(cam, 1);
 
         for (i = 0; i < 8; i++)
@@ -637,7 +637,7 @@ static int w9966_i2c_rbyte(struct w9966_dev* cam)
                 data = data << 1;
                 if (w9966_i2c_getsda(cam))
                         data |= 0x01;
-                
+
                 w9966_i2c_setscl(cam, 0);
         }
         return data;
@@ -673,11 +673,11 @@ static int w9966_rReg_i2c(struct w9966_dev* cam, int reg)
                 return -1;
 
         w9966_i2c_setsda(cam, 0);
-        
+
         if (w9966_i2c_setscl(cam, 1) == -1)
                 return -1;
         w9966_i2c_setsda(cam, 1);
-        
+
         return data;
 }
 #endif
@@ -699,7 +699,7 @@ static int w9966_wReg_i2c(struct w9966_dev* cam, int reg, int data)
         w9966_i2c_setsda(cam, 0);
         if (w9966_i2c_setscl(cam, 1) == -1)
                 return -1;
-                
+
         w9966_i2c_setsda(cam, 1);
 
         return 0;
@@ -714,7 +714,7 @@ static int w9966_v4l_do_ioctl(struct inode *inode, struct file *file,
 {
         struct video_device *vdev = video_devdata(file);
         struct w9966_dev *cam = vdev->priv;
-        
+
         switch(cmd)
         {
         case VIDIOCGCAP:
@@ -790,14 +790,14 @@ static int w9966_v4l_do_ioctl(struct inode *inode, struct file *file,
                 struct video_picture *vpic = arg;
                 if (vpic->depth != 16 || vpic->palette != VIDEO_PALETTE_YUV422)
                         return -EINVAL;
-                        
+
                 cam->brightness = vpic->brightness >> 8;
                 cam->hue = (vpic->hue >> 8) - 128;
                 cam->color = vpic->colour >> 9;
                 cam->contrast = vpic->contrast >> 9;
 
                 w9966_pdev_claim(cam);
-                
+
                 if (
                         w9966_wReg_i2c(cam, 0x0a, cam->brightness) == -1 ||
                         w9966_wReg_i2c(cam, 0x0b, cam->contrast) == -1 ||
@@ -807,7 +807,7 @@ static int w9966_v4l_do_ioctl(struct inode *inode, struct file *file,
                         w9966_pdev_release(cam);
                         return -EIO;
                 }
-                
+
                 w9966_pdev_release(cam);
                 return 0;
         }
@@ -815,13 +815,13 @@ static int w9966_v4l_do_ioctl(struct inode *inode, struct file *file,
         {
                 int ret;
                 struct video_window *vwin = arg;
-                
+
                 if (vwin->flags != 0)
                         return -EINVAL;
                 if (vwin->clipcount != 0)
                         return -EINVAL;
                 if (vwin->width < 2 || vwin->width > W9966_WND_MAX_W)
-                        return -EINVAL;         
+                        return -EINVAL;
                 if (vwin->height < 1 || vwin->height > W9966_WND_MAX_H)
                         return -EINVAL;
 
@@ -829,12 +829,12 @@ static int w9966_v4l_do_ioctl(struct inode *inode, struct file *file,
                 w9966_pdev_claim(cam);
                 ret = w9966_setup(cam, 0, 0, 1023, 1023, vwin->width, vwin->height);
                 w9966_pdev_release(cam);
-                
+
                 if (ret != 0) {
                         DPRINTF("VIDIOCSWIN: w9966_setup() failed.\n");
                         return -EIO;
                 }
-                
+
                 return 0;
         }
         case VIDIOCGWIN:
@@ -846,7 +846,7 @@ static int w9966_v4l_do_ioctl(struct inode *inode, struct file *file,
                 return 0;
         }
         // Unimplemented
-        case VIDIOCCAPTURE:     
+        case VIDIOCCAPTURE:
         case VIDIOCGFBUF:
         case VIDIOCSFBUF:
         case VIDIOCKEY:
@@ -877,17 +877,17 @@ static ssize_t w9966_v4l_read(struct file *file, char  __user *buf,
         unsigned char __user *dest = (unsigned char __user *)buf;
         unsigned long dleft = count;
         unsigned char *tbuf;
-        
+
         // Why would anyone want more than this??
         if (count > cam->width * cam->height * 2)
                 return -EINVAL;
-        
+
         w9966_pdev_claim(cam);
         w9966_wReg(cam, 0x00, 0x02);    // Reset ECP-FIFO buffer
         w9966_wReg(cam, 0x00, 0x00);    // Return to normal operation
         w9966_wReg(cam, 0x01, 0x98);    // Enable capture
 
-        // write special capture-addr and negotiate into data transfer  
+        // write special capture-addr and negotiate into data transfer
         if (
                 (parport_negotiate(cam->pport, cam->ppmode|IEEE1284_ADDR) != 0  )||
                 (parport_write(cam->pport, &addr, 1) != 1                                               )||
@@ -906,7 +906,7 @@ static ssize_t w9966_v4l_read(struct file *file, char  __user *buf,
         while(dleft > 0)
         {
                 unsigned long tsize = (dleft > W9966_RBUFFER) ? W9966_RBUFFER : dleft;
-        
+
                 if (parport_read(cam->pport, tbuf, tsize) < tsize) {
                         count = -EFAULT;
                         goto out;
@@ -933,7 +933,7 @@ out:
 static void w9966_attach(struct parport *port)
 {
         int i;
-        
+
         for (i = 0; i < W9966_MAXCAMS; i++)
         {
                 if (w9966_cams[i].dev_state != 0)       // Cam is already assigned
diff --git a/drivers/usb/media/w9968cf.c b/drivers/media/video/w9968cf.c
index b57dec3782..20f211b55a 100644
--- a/drivers/usb/media/w9968cf.c
+++ b/drivers/media/video/w9968cf.c
@@ -71,39 +71,39 @@ MODULE_SUPPORTED_DEVICE("Video");
 static int ovmod_load = W9968CF_OVMOD_LOAD;
 static unsigned short simcams = W9968CF_SIMCAMS;
 static short video_nr[]={[0 ... W9968CF_MAX_DEVICES-1] = -1}; /*-1=first free*/
-static unsigned int packet_size[] = {[0 ... W9968CF_MAX_DEVICES-1] = 
-                                     W9968CF_PACKET_SIZE};
-static unsigned short max_buffers[] = {[0 ... W9968CF_MAX_DEVICES-1] = 
-                                       W9968CF_BUFFERS};
-static int double_buffer[] = {[0 ... W9968CF_MAX_DEVICES-1] = 
-                              W9968CF_DOUBLE_BUFFER};
+static unsigned int packet_size[] = {[0 ... W9968CF_MAX_DEVICES-1] =
+                                     W9968CF_PACKET_SIZE};
+static unsigned short max_buffers[] = {[0 ... W9968CF_MAX_DEVICES-1] =
+                                       W9968CF_BUFFERS};
+static int double_buffer[] = {[0 ... W9968CF_MAX_DEVICES-1] =
+                              W9968CF_DOUBLE_BUFFER};
 static int clamping[] = {[0 ... W9968CF_MAX_DEVICES-1] = W9968CF_CLAMPING};
-static unsigned short filter_type[]= {[0 ... W9968CF_MAX_DEVICES-1] = 
-                                      W9968CF_FILTER_TYPE};
+static unsigned short filter_type[]= {[0 ... W9968CF_MAX_DEVICES-1] =
+                                      W9968CF_FILTER_TYPE};
 static int largeview[]= {[0 ... W9968CF_MAX_DEVICES-1] = W9968CF_LARGEVIEW};
-static unsigned short decompression[] = {[0 ... W9968CF_MAX_DEVICES-1] = 
-                                         W9968CF_DECOMPRESSION};
+static unsigned short decompression[] = {[0 ... W9968CF_MAX_DEVICES-1] =
+                                         W9968CF_DECOMPRESSION};
 static int upscaling[]= {[0 ... W9968CF_MAX_DEVICES-1] = W9968CF_UPSCALING};
 static unsigned short force_palette[] = {[0 ... W9968CF_MAX_DEVICES-1] = 0};
 static int force_rgb[] = {[0 ... W9968CF_MAX_DEVICES-1] = W9968CF_FORCE_RGB};
 static int autobright[] = {[0 ... W9968CF_MAX_DEVICES-1] = W9968CF_AUTOBRIGHT};
 static int autoexp[] = {[0 ... W9968CF_MAX_DEVICES-1] = W9968CF_AUTOEXP};
-static unsigned short lightfreq[] = {[0 ... W9968CF_MAX_DEVICES-1] = 
-                                     W9968CF_LIGHTFREQ};
+static unsigned short lightfreq[] = {[0 ... W9968CF_MAX_DEVICES-1] =
+                                     W9968CF_LIGHTFREQ};
 static int bandingfilter[] = {[0 ... W9968CF_MAX_DEVICES-1]=
-                              W9968CF_BANDINGFILTER};
+                              W9968CF_BANDINGFILTER};
 static short clockdiv[] = {[0 ... W9968CF_MAX_DEVICES-1] = W9968CF_CLOCKDIV};
 static int backlight[] = {[0 ... W9968CF_MAX_DEVICES-1] = W9968CF_BACKLIGHT};
 static int mirror[] = {[0 ... W9968CF_MAX_DEVICES-1] = W9968CF_MIRROR};
 static int monochrome[] = {[0 ... W9968CF_MAX_DEVICES-1]=W9968CF_MONOCHROME};
-static unsigned int brightness[] = {[0 ... W9968CF_MAX_DEVICES-1] = 
-                                    W9968CF_BRIGHTNESS};
+static unsigned int brightness[] = {[0 ... W9968CF_MAX_DEVICES-1] =
+                                    W9968CF_BRIGHTNESS};
 static unsigned int hue[] = {[0 ... W9968CF_MAX_DEVICES-1] = W9968CF_HUE};
 static unsigned int colour[]={[0 ... W9968CF_MAX_DEVICES-1] = W9968CF_COLOUR};
-static unsigned int contrast[] = {[0 ... W9968CF_MAX_DEVICES-1] = 
-                                  W9968CF_CONTRAST};
-static unsigned int whiteness[] = {[0 ... W9968CF_MAX_DEVICES-1] = 
-                                   W9968CF_WHITENESS};
+static unsigned int contrast[] = {[0 ... W9968CF_MAX_DEVICES-1] =
+                                  W9968CF_CONTRAST};
+static unsigned int whiteness[] = {[0 ... W9968CF_MAX_DEVICES-1] =
+                                   W9968CF_WHITENESS};
 #ifdef W9968CF_DEBUG
 static unsigned short debug = W9968CF_DEBUG_LEVEL;
 static int specific_debug = W9968CF_SPECIFIC_DEBUG;
@@ -145,251 +145,251 @@ module_param(specific_debug, bool, 0644);
 #endif
 
 #ifdef CONFIG_KMOD
-MODULE_PARM_DESC(ovmod_load, 
-                 "\n<0|1> Automatic 'ovcamchip' module loading."
-                 "\n0 disabled, 1 enabled."
-                 "\nIf enabled,'insmod' searches for the required 'ovcamchip'"
-                 "\nmodule in the system, according to its configuration, and"
-                 "\nattempts to load that module automatically. This action is"
-                 "\nperformed once as soon as the 'w9968cf' module is loaded"
-                 "\ninto memory."
-                 "\nDefault value is "__MODULE_STRING(W9968CF_OVMOD_LOAD)"."
-                 "\n");
+MODULE_PARM_DESC(ovmod_load,
+                 "\n<0|1> Automatic 'ovcamchip' module loading."
+                 "\n0 disabled, 1 enabled."
+                 "\nIf enabled,'insmod' searches for the required 'ovcamchip'"
+                 "\nmodule in the system, according to its configuration, and"
+                 "\nattempts to load that module automatically. This action is"
+                 "\nperformed once as soon as the 'w9968cf' module is loaded"
+                 "\ninto memory."
+                 "\nDefault value is "__MODULE_STRING(W9968CF_OVMOD_LOAD)"."
+                 "\n");
 #endif
-MODULE_PARM_DESC(simcams, 
-                 "\n<n> Number of cameras allowed to stream simultaneously."
-                 "\nn may vary from 0 to "
-                 __MODULE_STRING(W9968CF_MAX_DEVICES)"."
-                 "\nDefault value is "__MODULE_STRING(W9968CF_SIMCAMS)"."
-                 "\n");
+MODULE_PARM_DESC(simcams,
+                 "\n<n> Number of cameras allowed to stream simultaneously."
+                 "\nn may vary from 0 to "
+                 __MODULE_STRING(W9968CF_MAX_DEVICES)"."
+                 "\nDefault value is "__MODULE_STRING(W9968CF_SIMCAMS)"."
+                 "\n");
 MODULE_PARM_DESC(video_nr,
-                 "\n<-1|n[,...]> Specify V4L minor mode number."
-                 "\n -1 = use next available (default)"
-                 "\n  n = use minor number n (integer >= 0)"
-                 "\nYou can specify up to "__MODULE_STRING(W9968CF_MAX_DEVICES)
-                 " cameras this way."
-                 "\nFor example:"
-                 "\nvideo_nr=-1,2,-1 would assign minor number 2 to"
-                 "\nthe second camera and use auto for the first"
-                 "\none and for every other camera."
-                 "\n");
+                 "\n<-1|n[,...]> Specify V4L minor mode number."
+                 "\n -1 = use next available (default)"
+                 "\n  n = use minor number n (integer >= 0)"
+                 "\nYou can specify up to "__MODULE_STRING(W9968CF_MAX_DEVICES)
+                 " cameras this way."
+                 "\nFor example:"
+                 "\nvideo_nr=-1,2,-1 would assign minor number 2 to"
+                 "\nthe second camera and use auto for the first"
+                 "\none and for every other camera."
+                 "\n");
 MODULE_PARM_DESC(packet_size,
-                 "\n<n[,...]> Specify the maximum data payload"
-                 "\nsize in bytes for alternate settings, for each device."
-                 "\nn is scaled between 63 and 1023 "
-                 "(default is "__MODULE_STRING(W9968CF_PACKET_SIZE)")."
-                 "\n");
+                 "\n<n[,...]> Specify the maximum data payload"
+                 "\nsize in bytes for alternate settings, for each device."
+                 "\nn is scaled between 63 and 1023 "
+                 "(default is "__MODULE_STRING(W9968CF_PACKET_SIZE)")."
+                 "\n");
 MODULE_PARM_DESC(max_buffers,
-                 "\n<n[,...]> For advanced users."
-                 "\nSpecify the maximum number of video frame buffers"
-                 "\nto allocate for each device, from 2 to "
-                 __MODULE_STRING(W9968CF_MAX_BUFFERS)
-                 ". (default is "__MODULE_STRING(W9968CF_BUFFERS)")."
-                 "\n");
-MODULE_PARM_DESC(double_buffer, 
-                 "\n<0|1[,...]> "
-                 "Hardware double buffering: 0 disabled, 1 enabled."
-                 "\nIt should be enabled if you want smooth video output: if"
-                 "\nyou obtain out of sync. video, disable it, or try to"
-                 "\ndecrease the 'clockdiv' module parameter value."
-                 "\nDefault value is "__MODULE_STRING(W9968CF_DOUBLE_BUFFER)
-                 " for every device."
-                 "\n");
-MODULE_PARM_DESC(clamping, 
-                 "\n<0|1[,...]> Video data clamping: 0 disabled, 1 enabled."
-                 "\nDefault value is "__MODULE_STRING(W9968CF_CLAMPING)
-                 " for every device."
-                 "\n");
-MODULE_PARM_DESC(filter_type, 
-                 "\n<0|1|2[,...]> Video filter type."
-                 "\n0 none, 1 (1-2-1) 3-tap filter, "
-                 "2 (2-3-6-3-2) 5-tap filter."
-                 "\nDefault value is "__MODULE_STRING(W9968CF_FILTER_TYPE)
-                 " for every device."
-                 "\nThe filter is used to reduce noise and aliasing artifacts"
-                 "\nproduced by the CCD or CMOS image sensor, and the scaling"
-                 " process."
-                 "\n");
-MODULE_PARM_DESC(largeview, 
-                 "\n<0|1[,...]> Large view: 0 disabled, 1 enabled."
-                 "\nDefault value is "__MODULE_STRING(W9968CF_LARGEVIEW)
-                 " for every device."
-                 "\n");
-MODULE_PARM_DESC(upscaling, 
-                 "\n<0|1[,...]> Software scaling (for non-compressed video):"
-                 "\n0 disabled, 1 enabled."
-                 "\nDisable it if you have a slow CPU or you don't have"
-                 " enough memory."
-                 "\nDefault value is "__MODULE_STRING(W9968CF_UPSCALING)
-                 " for every device."
-                 "\nIf 'w9968cf-vpp' is not present, this parameter is"
-                 " set to 0."
-                 "\n");
+                 "\n<n[,...]> For advanced users."
+                 "\nSpecify the maximum number of video frame buffers"
+                 "\nto allocate for each device, from 2 to "
+                 __MODULE_STRING(W9968CF_MAX_BUFFERS)
+                 ". (default is "__MODULE_STRING(W9968CF_BUFFERS)")."
+                 "\n");
+MODULE_PARM_DESC(double_buffer,
+                 "\n<0|1[,...]> "
+                 "Hardware double buffering: 0 disabled, 1 enabled."
+                 "\nIt should be enabled if you want smooth video output: if"
+                 "\nyou obtain out of sync. video, disable it, or try to"
+                 "\ndecrease the 'clockdiv' module parameter value."
+                 "\nDefault value is "__MODULE_STRING(W9968CF_DOUBLE_BUFFER)
+                 " for every device."
+                 "\n");
+MODULE_PARM_DESC(clamping,
+                 "\n<0|1[,...]> Video data clamping: 0 disabled, 1 enabled."
+                 "\nDefault value is "__MODULE_STRING(W9968CF_CLAMPING)
+                 " for every device."
+                 "\n");
+MODULE_PARM_DESC(filter_type,
+                 "\n<0|1|2[,...]> Video filter type."
+                 "\n0 none, 1 (1-2-1) 3-tap filter, "
+                 "2 (2-3-6-3-2) 5-tap filter."
+                 "\nDefault value is "__MODULE_STRING(W9968CF_FILTER_TYPE)
+                 " for every device."
+                 "\nThe filter is used to reduce noise and aliasing artifacts"
+                 "\nproduced by the CCD or CMOS image sensor, and the scaling"
+                 " process."
+                 "\n");
+MODULE_PARM_DESC(largeview,
+                 "\n<0|1[,...]> Large view: 0 disabled, 1 enabled."
+                 "\nDefault value is "__MODULE_STRING(W9968CF_LARGEVIEW)
+                 " for every device."
+                 "\n");
+MODULE_PARM_DESC(upscaling,
+                 "\n<0|1[,...]> Software scaling (for non-compressed video):"
+                 "\n0 disabled, 1 enabled."
+                 "\nDisable it if you have a slow CPU or you don't have"
+                 " enough memory."
+                 "\nDefault value is "__MODULE_STRING(W9968CF_UPSCALING)
+                 " for every device."
+                 "\nIf 'w9968cf-vpp' is not present, this parameter is"
+                 " set to 0."
+                 "\n");
 MODULE_PARM_DESC(decompression,
-                 "\n<0|1|2[,...]> Software video decompression:"
-                 "\n- 0 disables decompression (doesn't allow formats needing"
-                 " decompression)"
-                 "\n- 1 forces decompression (allows formats needing"
-                 " decompression only);"
-                 "\n- 2 allows any permitted formats."
-                 "\nFormats supporting compressed video are YUV422P and"
-                 " YUV420P/YUV420 "
-                 "\nin any resolutions where both width and height are "
-                 "a multiple of 16."
-                 "\nDefault value is "__MODULE_STRING(W9968CF_DECOMPRESSION)
-                 " for every device."
-                 "\nIf 'w9968cf-vpp' is not present, forcing decompression is "
-                 "\nnot allowed; in this case this parameter is set to 2."
-                 "\n");
+                 "\n<0|1|2[,...]> Software video decompression:"
+                 "\n- 0 disables decompression (doesn't allow formats needing"
+                 " decompression)"
+                 "\n- 1 forces decompression (allows formats needing"
+                 " decompression only);"
+                 "\n- 2 allows any permitted formats."
+                 "\nFormats supporting compressed video are YUV422P and"
+                 " YUV420P/YUV420 "
+                 "\nin any resolutions where both width and height are "
+                 "a multiple of 16."
+                 "\nDefault value is "__MODULE_STRING(W9968CF_DECOMPRESSION)
+                 " for every device."
+                 "\nIf 'w9968cf-vpp' is not present, forcing decompression is "
+                 "\nnot allowed; in this case this parameter is set to 2."
+                 "\n");
 MODULE_PARM_DESC(force_palette,
-                 "\n<0"
-                 "|" __MODULE_STRING(VIDEO_PALETTE_UYVY)
-                 "|" __MODULE_STRING(VIDEO_PALETTE_YUV420)
-                 "|" __MODULE_STRING(VIDEO_PALETTE_YUV422P)
-                 "|" __MODULE_STRING(VIDEO_PALETTE_YUV420P)
-                 "|" __MODULE_STRING(VIDEO_PALETTE_YUYV)
-                 "|" __MODULE_STRING(VIDEO_PALETTE_YUV422)
-                 "|" __MODULE_STRING(VIDEO_PALETTE_GREY)
-                 "|" __MODULE_STRING(VIDEO_PALETTE_RGB555)
-                 "|" __MODULE_STRING(VIDEO_PALETTE_RGB565)
-                 "|" __MODULE_STRING(VIDEO_PALETTE_RGB24)
-                 "|" __MODULE_STRING(VIDEO_PALETTE_RGB32)
-                 "[,...]>"
-                 " Force picture palette."
-                 "\nIn order:"
-                 "\n- 0 allows any of the following formats:"
-                 "\n- UYVY    16 bpp - Original video, compression disabled"
-                 "\n- YUV420  12 bpp - Original video, compression enabled"
-                 "\n- YUV422P 16 bpp - Original video, compression enabled"
-                 "\n- YUV420P 12 bpp - Original video, compression enabled"
-                 "\n- YUVY    16 bpp - Software conversion from UYVY"
-                 "\n- YUV422  16 bpp - Software conversion from UYVY"
-                 "\n- GREY     8 bpp - Software conversion from UYVY"
-                 "\n- RGB555  16 bpp - Software conversion from UYVY"
-                 "\n- RGB565  16 bpp - Software conversion from UYVY"
-                 "\n- RGB24   24 bpp - Software conversion from UYVY"
-                 "\n- RGB32   32 bpp - Software conversion from UYVY"
-                 "\nWhen not 0, this parameter will override 'decompression'."
-                 "\nDefault value is 0 for every device."
-                 "\nInitial palette is "
-                 __MODULE_STRING(W9968CF_PALETTE_DECOMP_ON)"."
-                 "\nIf 'w9968cf-vpp' is not present, this parameter is"
-                 " set to 9 (UYVY)."
-                 "\n");
-MODULE_PARM_DESC(force_rgb, 
-                 "\n<0|1[,...]> Read RGB video data instead of BGR:"
-                 "\n 1 = use RGB component ordering."
-                 "\n 0 = use BGR component ordering."
-                 "\nThis parameter has effect when using RGBX palettes only."
-                 "\nDefault value is "__MODULE_STRING(W9968CF_FORCE_RGB)
-                 " for every device."
-                 "\n");
+                 "\n<0"
+                 "|" __MODULE_STRING(VIDEO_PALETTE_UYVY)
+                 "|" __MODULE_STRING(VIDEO_PALETTE_YUV420)
+                 "|" __MODULE_STRING(VIDEO_PALETTE_YUV422P)
+                 "|" __MODULE_STRING(VIDEO_PALETTE_YUV420P)
+                 "|" __MODULE_STRING(VIDEO_PALETTE_YUYV)
+                 "|" __MODULE_STRING(VIDEO_PALETTE_YUV422)
+                 "|" __MODULE_STRING(VIDEO_PALETTE_GREY)
+                 "|" __MODULE_STRING(VIDEO_PALETTE_RGB555)
+                 "|" __MODULE_STRING(VIDEO_PALETTE_RGB565)
+                 "|" __MODULE_STRING(VIDEO_PALETTE_RGB24)
+                 "|" __MODULE_STRING(VIDEO_PALETTE_RGB32)
+                 "[,...]>"
+                 " Force picture palette."
+                 "\nIn order:"
+                 "\n- 0 allows any of the following formats:"
+                 "\n- UYVY    16 bpp - Original video, compression disabled"
+                 "\n- YUV420  12 bpp - Original video, compression enabled"
+                 "\n- YUV422P 16 bpp - Original video, compression enabled"
+                 "\n- YUV420P 12 bpp - Original video, compression enabled"
+                 "\n- YUVY    16 bpp - Software conversion from UYVY"
+                 "\n- YUV422  16 bpp - Software conversion from UYVY"
+                 "\n- GREY     8 bpp - Software conversion from UYVY"
+                 "\n- RGB555  16 bpp - Software conversion from UYVY"
+                 "\n- RGB565  16 bpp - Software conversion from UYVY"
+                 "\n- RGB24   24 bpp - Software conversion from UYVY"
+                 "\n- RGB32   32 bpp - Software conversion from UYVY"
+                 "\nWhen not 0, this parameter will override 'decompression'."
+                 "\nDefault value is 0 for every device."
+                 "\nInitial palette is "
+                 __MODULE_STRING(W9968CF_PALETTE_DECOMP_ON)"."
+                 "\nIf 'w9968cf-vpp' is not present, this parameter is"
+                 " set to 9 (UYVY)."
+                 "\n");
+MODULE_PARM_DESC(force_rgb,
+                 "\n<0|1[,...]> Read RGB video data instead of BGR:"
+                 "\n 1 = use RGB component ordering."
+                 "\n 0 = use BGR component ordering."
+                 "\nThis parameter has effect when using RGBX palettes only."
+                 "\nDefault value is "__MODULE_STRING(W9968CF_FORCE_RGB)
+                 " for every device."
+                 "\n");
 MODULE_PARM_DESC(autobright,
-                 "\n<0|1[,...]> Image sensor automatically changes brightness:"
-                 "\n 0 = no, 1 = yes"
-                 "\nDefault value is "__MODULE_STRING(W9968CF_AUTOBRIGHT)
-                 " for every device."
-                 "\n");
+                 "\n<0|1[,...]> Image sensor automatically changes brightness:"
+                 "\n 0 = no, 1 = yes"
+                 "\nDefault value is "__MODULE_STRING(W9968CF_AUTOBRIGHT)
+                 " for every device."
+                 "\n");
 MODULE_PARM_DESC(autoexp,
-                 "\n<0|1[,...]> Image sensor automatically changes exposure:"
-                 "\n 0 = no, 1 = yes"
-                 "\nDefault value is "__MODULE_STRING(W9968CF_AUTOEXP)
-                 " for every device."
-                 "\n");
+                 "\n<0|1[,...]> Image sensor automatically changes exposure:"
+                 "\n 0 = no, 1 = yes"
+                 "\nDefault value is "__MODULE_STRING(W9968CF_AUTOEXP)
+                 " for every device."
+                 "\n");
 MODULE_PARM_DESC(lightfreq,
-                 "\n<50|60[,...]> Light frequency in Hz:"
-                 "\n 50 for European and Asian lighting,"
-                 " 60 for American lighting."
-                 "\nDefault value is "__MODULE_STRING(W9968CF_LIGHTFREQ)
-                 " for every device."
-                 "\n");
+                 "\n<50|60[,...]> Light frequency in Hz:"
+                 "\n 50 for European and Asian lighting,"
+                 " 60 for American lighting."
+                 "\nDefault value is "__MODULE_STRING(W9968CF_LIGHTFREQ)
+                 " for every device."
+                 "\n");
 MODULE_PARM_DESC(bandingfilter,
-                 "\n<0|1[,...]> Banding filter to reduce effects of"
-                 " fluorescent lighting:"
-                 "\n 0 disabled, 1 enabled."
-                 "\nThis filter tries to reduce the pattern of horizontal"
-                 "\nlight/dark bands caused by some (usually fluorescent)"
-                 " lighting."
-                 "\nDefault value is "__MODULE_STRING(W9968CF_BANDINGFILTER)
-                 " for every device."
-                 "\n");
+                 "\n<0|1[,...]> Banding filter to reduce effects of"
+                 " fluorescent lighting:"
+                 "\n 0 disabled, 1 enabled."
+                 "\nThis filter tries to reduce the pattern of horizontal"
+                 "\nlight/dark bands caused by some (usually fluorescent)"
+                 " lighting."
+                 "\nDefault value is "__MODULE_STRING(W9968CF_BANDINGFILTER)
+                 " for every device."
+                 "\n");
 MODULE_PARM_DESC(clockdiv,
-                 "\n<-1|n[,...]> "
-                 "Force pixel clock divisor to a specific value (for experts):"
-                 "\n  n may vary from 0 to 127."
-                 "\n -1 for automatic value."
-                 "\nSee also the 'double_buffer' module parameter."
-                 "\nDefault value is "__MODULE_STRING(W9968CF_CLOCKDIV)
-                 " for every device."
-                 "\n");
+                 "\n<-1|n[,...]> "
+                 "Force pixel clock divisor to a specific value (for experts):"
+                 "\n  n may vary from 0 to 127."
+                 "\n -1 for automatic value."
+                 "\nSee also the 'double_buffer' module parameter."
+                 "\nDefault value is "__MODULE_STRING(W9968CF_CLOCKDIV)
+                 " for every device."
+                 "\n");
 MODULE_PARM_DESC(backlight,
-                 "\n<0|1[,...]> Objects are lit from behind:"
-                 "\n 0 = no, 1 = yes"
-                 "\nDefault value is "__MODULE_STRING(W9968CF_BACKLIGHT)
-                 " for every device."
-                 "\n");
+                 "\n<0|1[,...]> Objects are lit from behind:"
+                 "\n 0 = no, 1 = yes"
+                 "\nDefault value is "__MODULE_STRING(W9968CF_BACKLIGHT)
+                 " for every device."
+                 "\n");
 MODULE_PARM_DESC(mirror,
-                 "\n<0|1[,...]> Reverse image horizontally:"
-                 "\n 0 = no, 1 = yes"
-                 "\nDefault value is "__MODULE_STRING(W9968CF_MIRROR)
-                 " for every device."
-                 "\n");
+                 "\n<0|1[,...]> Reverse image horizontally:"
+                 "\n 0 = no, 1 = yes"
+                 "\nDefault value is "__MODULE_STRING(W9968CF_MIRROR)
+                 " for every device."
+                 "\n");
 MODULE_PARM_DESC(monochrome,
-                 "\n<0|1[,...]> Use image sensor as monochrome sensor:"
-                 "\n 0 = no, 1 = yes"
-                 "\nNot all the sensors support monochrome color."
-                 "\nDefault value is "__MODULE_STRING(W9968CF_MONOCHROME)
-                 " for every device."
-                 "\n");
-MODULE_PARM_DESC(brightness, 
-                 "\n<n[,...]> Set picture brightness (0-65535)."
-                 "\nDefault value is "__MODULE_STRING(W9968CF_BRIGHTNESS)
-                 " for every device."
-                 "\nThis parameter has no effect if 'autobright' is enabled."
-                 "\n");
-MODULE_PARM_DESC(hue, 
-                 "\n<n[,...]> Set picture hue (0-65535)."
-                 "\nDefault value is "__MODULE_STRING(W9968CF_HUE)
-                 " for every device."
-                 "\n");
-MODULE_PARM_DESC(colour, 
-                 "\n<n[,...]> Set picture saturation (0-65535)."
-                 "\nDefault value is "__MODULE_STRING(W9968CF_COLOUR)
-                 " for every device."
-                 "\n");
-MODULE_PARM_DESC(contrast, 
-                 "\n<n[,...]> Set picture contrast (0-65535)."
-                 "\nDefault value is "__MODULE_STRING(W9968CF_CONTRAST)
-                 " for every device."
-                 "\n");
-MODULE_PARM_DESC(whiteness, 
-                 "\n<n[,...]> Set picture whiteness (0-65535)."
-                 "\nDefault value is "__MODULE_STRING(W9968CF_WHITENESS)
-                 " for every device."
-                 "\n");
+                 "\n<0|1[,...]> Use image sensor as monochrome sensor:"
+                 "\n 0 = no, 1 = yes"
+                 "\nNot all the sensors support monochrome color."
+                 "\nDefault value is "__MODULE_STRING(W9968CF_MONOCHROME)
+                 " for every device."
+                 "\n");
+MODULE_PARM_DESC(brightness,
+                 "\n<n[,...]> Set picture brightness (0-65535)."
+                 "\nDefault value is "__MODULE_STRING(W9968CF_BRIGHTNESS)
+                 " for every device."
+                 "\nThis parameter has no effect if 'autobright' is enabled."
+                 "\n");
+MODULE_PARM_DESC(hue,
+                 "\n<n[,...]> Set picture hue (0-65535)."
+                 "\nDefault value is "__MODULE_STRING(W9968CF_HUE)
+                 " for every device."
+                 "\n");
+MODULE_PARM_DESC(colour,
+                 "\n<n[,...]> Set picture saturation (0-65535)."
+                 "\nDefault value is "__MODULE_STRING(W9968CF_COLOUR)
+                 " for every device."
+                 "\n");
+MODULE_PARM_DESC(contrast,
+                 "\n<n[,...]> Set picture contrast (0-65535)."
+                 "\nDefault value is "__MODULE_STRING(W9968CF_CONTRAST)
+                 " for every device."
+                 "\n");
+MODULE_PARM_DESC(whiteness,
+                 "\n<n[,...]> Set picture whiteness (0-65535)."
+                 "\nDefault value is "__MODULE_STRING(W9968CF_WHITENESS)
+                 " for every device."
+                 "\n");
 #ifdef W9968CF_DEBUG
 MODULE_PARM_DESC(debug,
-                 "\n<n> Debugging information level, from 0 to 6:"
-                 "\n0 = none (use carefully)"
-                 "\n1 = critical errors"
-                 "\n2 = significant informations"
-                 "\n3 = configuration or general messages"
-                 "\n4 = warnings"
-                 "\n5 = called functions"
-                 "\n6 = function internals"
-                 "\nLevel 5 and 6 are useful for testing only, when only "
-                 "one device is used."
-                 "\nDefault value is "__MODULE_STRING(W9968CF_DEBUG_LEVEL)"."
-                 "\n");
+                 "\n<n> Debugging information level, from 0 to 6:"
+                 "\n0 = none (use carefully)"
+                 "\n1 = critical errors"
+                 "\n2 = significant informations"
+                 "\n3 = configuration or general messages"
+                 "\n4 = warnings"
+                 "\n5 = called functions"
+                 "\n6 = function internals"
+                 "\nLevel 5 and 6 are useful for testing only, when only "
+                 "one device is used."
+                 "\nDefault value is "__MODULE_STRING(W9968CF_DEBUG_LEVEL)"."
+                 "\n");
 MODULE_PARM_DESC(specific_debug,
-                 "\n<0|1> Enable or disable specific debugging messages:"
-                 "\n0 = print messages concerning every level"
-                 " <= 'debug' level."
-                 "\n1 = print messages concerning the level"
-                 " indicated by 'debug'."
-                 "\nDefault value is "
-                 __MODULE_STRING(W9968CF_SPECIFIC_DEBUG)"."
-                 "\n");
+                 "\n<0|1> Enable or disable specific debugging messages:"
+                 "\n0 = print messages concerning every level"
+                 " <= 'debug' level."
+                 "\n1 = print messages concerning the level"
+                 " indicated by 'debug'."
+                 "\nDefault value is "
+                 __MODULE_STRING(W9968CF_SPECIFIC_DEBUG)"."
+                 "\n");
 #endif /* W9968CF_DEBUG */
 
 
@@ -406,7 +406,7 @@ static int w9968cf_mmap(struct file*, struct vm_area_struct*);
 static int w9968cf_ioctl(struct inode*, struct file*, unsigned, unsigned long);
 static ssize_t w9968cf_read(struct file*, char __user *, size_t, loff_t*);
 static int w9968cf_v4l_ioctl(struct inode*, struct file*, unsigned int,
-                             void __user *);
+                             void __user *);
 
 /* USB-specific */
 static int w9968cf_start_transfer(struct w9968cf_device*);
@@ -428,25 +428,25 @@ static int w9968cf_smbus_write_ack(struct w9968cf_device*);
 static int w9968cf_smbus_read_ack(struct w9968cf_device*);
 static int w9968cf_smbus_refresh_bus(struct w9968cf_device*);
 static int w9968cf_i2c_adap_read_byte(struct w9968cf_device* cam,
-                                      u16 address, u8* value);
-static int w9968cf_i2c_adap_read_byte_data(struct w9968cf_device*, u16 address, 
-                                           u8 subaddress, u8* value);
+                                      u16 address, u8* value);
+static int w9968cf_i2c_adap_read_byte_data(struct w9968cf_device*, u16 address,
+                                           u8 subaddress, u8* value);
 static int w9968cf_i2c_adap_write_byte(struct w9968cf_device*,
-                                       u16 address, u8 subaddress);
+                                       u16 address, u8 subaddress);
 static int w9968cf_i2c_adap_fastwrite_byte_data(struct w9968cf_device*,
-                                                u16 address, u8 subaddress,
-                                                u8 value);
+                                                u16 address, u8 subaddress,
+                                                u8 value);
 
 /* I2C interface to kernel */
 static int w9968cf_i2c_init(struct w9968cf_device*);
-static int w9968cf_i2c_smbus_xfer(struct i2c_adapter*, u16 addr, 
-                                  unsigned short flags, char read_write, 
-                                  u8 command, int size, union i2c_smbus_data*);
+static int w9968cf_i2c_smbus_xfer(struct i2c_adapter*, u16 addr,
+                                  unsigned short flags, char read_write,
+                                  u8 command, int size, union i2c_smbus_data*);
 static u32 w9968cf_i2c_func(struct i2c_adapter*);
 static int w9968cf_i2c_attach_inform(struct i2c_client*);
 static int w9968cf_i2c_detach_inform(struct i2c_client*);
 static int w9968cf_i2c_control(struct i2c_adapter*, unsigned int cmd,
-                               unsigned long arg);
+                               unsigned long arg);
 
 /* Memory management */
 static void* rvmalloc(unsigned long size);
@@ -458,17 +458,17 @@ static int  w9968cf_allocate_memory(struct w9968cf_device*);
 static int w9968cf_sensor_set_control(struct w9968cf_device*,int cid,int val);
 static int w9968cf_sensor_get_control(struct w9968cf_device*,int cid,int *val);
 static int w9968cf_sensor_cmd(struct w9968cf_device*,
-                              unsigned int cmd, void *arg);
+                              unsigned int cmd, void *arg);
 static int w9968cf_sensor_init(struct w9968cf_device*);
 static int w9968cf_sensor_update_settings(struct w9968cf_device*);
 static int w9968cf_sensor_get_picture(struct w9968cf_device*);
-static int w9968cf_sensor_update_picture(struct w9968cf_device*, 
-                                         struct video_picture pict);
+static int w9968cf_sensor_update_picture(struct w9968cf_device*,
+                                         struct video_picture pict);
 
 /* Other helper functions */
 static void w9968cf_configure_camera(struct w9968cf_device*,struct usb_device*,
-                                     enum w9968cf_model_id, 
-                                     const unsigned short dev_nr);
+                                     enum w9968cf_model_id,
+                                     const unsigned short dev_nr);
 static void w9968cf_adjust_configuration(struct w9968cf_device*);
 static int w9968cf_turn_on_led(struct w9968cf_device*);
 static int w9968cf_init_chip(struct w9968cf_device*);
@@ -477,8 +477,8 @@ static inline u16 w9968cf_valid_depth(u16 palette);
 static inline u8 w9968cf_need_decompression(u16 palette);
 static int w9968cf_set_picture(struct w9968cf_device*, struct video_picture);
 static int w9968cf_set_window(struct w9968cf_device*, struct video_window);
-static int w9968cf_postprocess_frame(struct w9968cf_device*, 
-                                     struct w9968cf_frame_t*);
+static int w9968cf_postprocess_frame(struct w9968cf_device*,
+                                     struct w9968cf_frame_t*);
 static int w9968cf_adjust_window_size(struct w9968cf_device*, u16* w, u16* h);
 static void w9968cf_init_framelist(struct w9968cf_device*);
 static void w9968cf_push_frame(struct w9968cf_device*, u8 f_num);
@@ -497,11 +497,11 @@ struct w9968cf_symbolic_list {
         const char *name;
 };
 
-/*-------------------------------------------------------------------------- 
+/*--------------------------------------------------------------------------
   Returns the name of the matching element in the symbolic_list array. The
   end of the list must be marked with an element that has a NULL name.
   --------------------------------------------------------------------------*/
-static inline const char * 
+static inline const char *
 symbolic(struct w9968cf_symbolic_list list[], const int num)
 {
         int i;
@@ -568,7 +568,7 @@ static struct w9968cf_symbolic_list v4l1_plist[] = {
 static struct w9968cf_symbolic_list decoder_errlist[] = {
         { W9968CF_DEC_ERR_CORRUPTED_DATA, "Corrupted data" },
         { W9968CF_DEC_ERR_BUF_OVERFLOW,   "Buffer overflow" },
-        { W9968CF_DEC_ERR_NO_SOI,         "SOI marker not found" },     
+        { W9968CF_DEC_ERR_NO_SOI,         "SOI marker not found" },
         { W9968CF_DEC_ERR_NO_SOF0,        "SOF0 marker not found" },
         { W9968CF_DEC_ERR_NO_SOS,         "SOS marker not found" },
         { W9968CF_DEC_ERR_NO_EOI,         "EOI marker not found" },
@@ -695,7 +695,7 @@ static int w9968cf_allocate_memory(struct w9968cf_device* cam)
         bpp = (w9968cf_vpp) ? 4 : 2;
         if (cam->upscaling)
                 vpp_bufsize = max(W9968CF_MAX_WIDTH*W9968CF_MAX_HEIGHT*bpp,
-                                  cam->maxwidth*cam->maxheight*bpp);
+                                  cam->maxwidth*cam->maxheight*bpp);
         else
                 vpp_bufsize = cam->maxwidth*cam->maxheight*bpp;
 
@@ -704,7 +704,7 @@ static int w9968cf_allocate_memory(struct w9968cf_device* cam)
                 if (!(cam->transfer_buffer[i] =
                       kzalloc(W9968CF_ISO_PACKETS*p_size, GFP_KERNEL))) {
                         DBG(1, "Couldn't allocate memory for the isochronous "
-                               "transfer buffers (%u bytes)", 
+                               "transfer buffers (%u bytes)",
                             p_size * W9968CF_ISO_PACKETS)
                         return -ENOMEM;
                 }
@@ -780,7 +780,7 @@ static int w9968cf_allocate_memory(struct w9968cf_device* cam)
   of the next video frame; if an error is encountered in a packet, the entire
   video frame is discarded and grabbed again.
   If there are no requested frames in the FIFO list, packets are collected into
-  a temporary buffer. 
+  a temporary buffer.
   --------------------------------------------------------------------------*/
 static void w9968cf_urb_complete(struct urb *urb, struct pt_regs *regs)
 {
@@ -799,7 +799,7 @@ static void w9968cf_urb_complete(struct urb *urb, struct pt_regs *regs)
         /* "(*f)" will be used instead of "cam->frame_current" */
         f = &cam->frame_current;
 
-        /* If a frame has been requested and we are grabbing into  
+        /* If a frame has been requested and we are grabbing into
            the temporary frame, we'll switch to that requested frame */
         if ((*f) == &cam->frame_tmp && *cam->requested_frame) {
                 if (cam->frame_tmp.status == F_GRABBING) {
@@ -808,7 +808,7 @@ static void w9968cf_urb_complete(struct urb *urb, struct pt_regs *regs)
                         (*f)->length = cam->frame_tmp.length;
                         memcpy((*f)->buffer, cam->frame_tmp.buffer,
                                (*f)->length);
-                        DBG(6, "Switched from temp. frame to frame #%d", 
+                        DBG(6, "Switched from temp. frame to frame #%d",
                             (*f)->number)
                 }
         }
@@ -850,7 +850,7 @@ static void w9968cf_urb_complete(struct urb *urb, struct pt_regs *regs)
 
                         if (cam->vpp_flag & VPP_DECOMPRESSION) {
                                 err = w9968cf_vpp->check_headers((*f)->buffer,
-                                                                 (*f)->length);
+                                                                 (*f)->length);
                                 if (err) {
                                         DBG(4, "Skip corrupted frame: %s",
                                             symbolic(decoder_errlist, err))
@@ -975,7 +975,7 @@ static int w9968cf_start_transfer(struct w9968cf_device* cam)
         cam->frame_current = &cam->frame_tmp;
 
         if (!(cam->vpp_flag & VPP_DECOMPRESSION))
-                DBG(5, "Isochronous transfer size: %lu bytes/frame", 
+                DBG(5, "Isochronous transfer size: %lu bytes/frame",
                     (unsigned long)t_size*2)
 
         DBG(5, "Starting the isochronous transfer...")
@@ -992,7 +992,7 @@ static int w9968cf_start_transfer(struct w9968cf_device* cam)
                                 usb_free_urb(cam->urb[j]);
                         }
                         DBG(1, "Couldn't send a transfer request to the "
-                               "USB core (error #%d, %s)", err, 
+                               "USB core (error #%d, %s)", err,
                             symbolic(urb_errlist, err))
                         return err;
                 }
@@ -1016,7 +1016,7 @@ static int w9968cf_stop_transfer(struct w9968cf_device* cam)
         if (!cam->streaming)
                 return 0;
 
-        /* This avoids race conditions with usb_submit_urb() 
+        /* This avoids race conditions with usb_submit_urb()
            in the URB completition handler */
         spin_lock_irqsave(&cam->urb_lock, lock_flags);
         cam->streaming = 0;
@@ -1050,7 +1050,7 @@ exit:
 
 
 /*--------------------------------------------------------------------------
-  Write a W9968CF register. 
+  Write a W9968CF register.
   Return 0 on success, -1 otherwise.
   --------------------------------------------------------------------------*/
 static int w9968cf_write_reg(struct w9968cf_device* cam, u16 value, u16 index)
@@ -1059,8 +1059,8 @@ static int w9968cf_write_reg(struct w9968cf_device* cam, u16 value, u16 index)
         int res;
 
         res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0,
-                              USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,
-                              value, index, NULL, 0, W9968CF_USB_CTRL_TIMEOUT);
+                              USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,
+                              value, index, NULL, 0, W9968CF_USB_CTRL_TIMEOUT);
 
         if (res < 0)
                 DBG(4, "Failed to write a register "
@@ -1072,7 +1072,7 @@ static int w9968cf_write_reg(struct w9968cf_device* cam, u16 value, u16 index)
 
 
 /*--------------------------------------------------------------------------
-  Read a W9968CF register. 
+  Read a W9968CF register.
   Return the register value on success, -1 otherwise.
   --------------------------------------------------------------------------*/
 static int w9968cf_read_reg(struct w9968cf_device* cam, u16 index)
@@ -1082,8 +1082,8 @@ static int w9968cf_read_reg(struct w9968cf_device* cam, u16 index)
         int res;
 
         res = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 1,
-                              USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                              0, index, buff, 2, W9968CF_USB_CTRL_TIMEOUT);
+                              USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                              0, index, buff, 2, W9968CF_USB_CTRL_TIMEOUT);
 
         if (res < 0)
                 DBG(4, "Failed to read a register "
@@ -1107,8 +1107,8 @@ static int w9968cf_write_fsb(struct w9968cf_device* cam, u16* data)
         value = *data++;
 
         res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0,
-                              USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,
-                              value, 0x06, data, 6, W9968CF_USB_CTRL_TIMEOUT);
+                              USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,
+                              value, 0x06, data, 6, W9968CF_USB_CTRL_TIMEOUT);
 
         if (res < 0)
                 DBG(4, "Failed to write the FSB registers "
@@ -1287,9 +1287,9 @@ static int w9968cf_smbus_refresh_bus(struct w9968cf_device* cam)
 
 
 /* SMBus protocol: S Addr Wr [A] Subaddr [A] Value [A] P */
-static int 
-w9968cf_i2c_adap_fastwrite_byte_data(struct w9968cf_device* cam, 
-                                     u16 address, u8 subaddress,u8 value)
+static int
+w9968cf_i2c_adap_fastwrite_byte_data(struct w9968cf_device* cam,
+                                     u16 address, u8 subaddress,u8 value)
 {
         u16* data = cam->data_buffer;
         int err = 0;
@@ -1348,7 +1348,7 @@ w9968cf_i2c_adap_fastwrite_byte_data(struct w9968cf_device* cam,
                        "value 0x%02X", address, subaddress, value)
         else
                 DBG(5, "I2C write byte data failed, addr.0x%04X, "
-                       "subaddr.0x%02X, value 0x%02X", 
+                       "subaddr.0x%02X, value 0x%02X",
                     address, subaddress, value)
 
         return err;
@@ -1356,10 +1356,10 @@ w9968cf_i2c_adap_fastwrite_byte_data(struct w9968cf_device* cam,
 
 
 /* SMBus protocol: S Addr Wr [A] Subaddr [A] P S Addr+1 Rd [A] [Value] NA P */
-static int 
-w9968cf_i2c_adap_read_byte_data(struct w9968cf_device* cam, 
-                                u16 address, u8 subaddress, 
-                                u8* value)
+static int
+w9968cf_i2c_adap_read_byte_data(struct w9968cf_device* cam,
+                                u16 address, u8 subaddress,
+                                u8* value)
 {
         int err = 0;
 
@@ -1384,7 +1384,7 @@ w9968cf_i2c_adap_read_byte_data(struct w9968cf_device* cam,
 
         if (!err)
                 DBG(5, "I2C read byte data done, addr.0x%04X, "
-                       "subaddr.0x%02X, value 0x%02X", 
+                       "subaddr.0x%02X, value 0x%02X",
                     address, subaddress, *value)
         else
                 DBG(5, "I2C read byte data failed, addr.0x%04X, "
@@ -1396,9 +1396,9 @@ w9968cf_i2c_adap_read_byte_data(struct w9968cf_device* cam,
 
 
 /* SMBus protocol: S Addr+1 Rd [A] [Value] NA P */
-static int 
+static int
 w9968cf_i2c_adap_read_byte(struct w9968cf_device* cam,
-                           u16 address, u8* value)
+                           u16 address, u8* value)
 {
         int err = 0;
 
@@ -1411,7 +1411,7 @@ w9968cf_i2c_adap_read_byte(struct w9968cf_device* cam,
         err += w9968cf_smbus_read_byte(cam, value);
         err += w9968cf_smbus_write_ack(cam);
         err += w9968cf_smbus_stop(cam);
- 
+
         /* Serial data disable */
         err += w9968cf_write_sb(cam, 0x0000);
 
@@ -1427,9 +1427,9 @@ w9968cf_i2c_adap_read_byte(struct w9968cf_device* cam,
 
 
 /* SMBus protocol: S Addr Wr [A] Value [A] P */
-static int 
+static int
 w9968cf_i2c_adap_write_byte(struct w9968cf_device* cam,
-                            u16 address, u8 value)
+                            u16 address, u8 value)
 {
         DBG(4, "i2c_write_byte() is an unsupported transfer mode")
         return -EINVAL;
@@ -1442,13 +1442,13 @@ w9968cf_i2c_adap_write_byte(struct w9968cf_device* cam,
  ****************************************************************************/
 
 static int
-w9968cf_i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr, 
-                       unsigned short flags, char read_write, u8 command,
-                       int size, union i2c_smbus_data *data)
+w9968cf_i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr,
+                       unsigned short flags, char read_write, u8 command,
+                       int size, union i2c_smbus_data *data)
 {
         struct w9968cf_device* cam = i2c_get_adapdata(adapter);
         u8 i;
-        int err = 0; 
+        int err = 0;
 
         switch (addr) {
                 case OV6xx0_SID:
@@ -1464,20 +1464,20 @@ w9968cf_i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr,
                 addr <<= 1;
 
                 if (read_write == I2C_SMBUS_WRITE)
-                        err = w9968cf_i2c_adap_write_byte(cam, addr, command);
-                else if (read_write == I2C_SMBUS_READ) 
+                        err = w9968cf_i2c_adap_write_byte(cam, addr, command);
+                else if (read_write == I2C_SMBUS_READ)
                         err = w9968cf_i2c_adap_read_byte(cam,addr,&data->byte);
 
         } else if (size == I2C_SMBUS_BYTE_DATA) {
                 addr <<= 1;
 
                 if (read_write == I2C_SMBUS_WRITE)
-                        err = w9968cf_i2c_adap_fastwrite_byte_data(cam, addr,
-                                                          command, data->byte);
+                        err = w9968cf_i2c_adap_fastwrite_byte_data(cam, addr,
+                                                          command, data->byte);
                 else if (read_write == I2C_SMBUS_READ) {
                         for (i = 1; i <= W9968CF_I2C_RW_RETRIES; i++) {
                                 err = w9968cf_i2c_adap_read_byte_data(cam,addr,
-                                                         command, &data->byte);
+                                                         command, &data->byte);
                                 if (err) {
                                         if (w9968cf_smbus_refresh_bus(cam)) {
                                                 err = -EIO;
@@ -1520,7 +1520,7 @@ static int w9968cf_i2c_attach_inform(struct i2c_client* client)
                         return err;
                 }
         } else {
-                DBG(4, "Rejected client [%s] with driver [%s]", 
+                DBG(4, "Rejected client [%s] with driver [%s]",
                     client->name, client->driver->driver.name)
                 return -EINVAL;
         }
@@ -1545,9 +1545,9 @@ static int w9968cf_i2c_detach_inform(struct i2c_client* client)
 }
 
 
-static int 
+static int
 w9968cf_i2c_control(struct i2c_adapter* adapter, unsigned int cmd,
-                    unsigned long arg)
+                    unsigned long arg)
 {
         return 0;
 }
@@ -1625,12 +1625,12 @@ static int w9968cf_turn_on_led(struct w9968cf_device* cam)
 static int w9968cf_init_chip(struct w9968cf_device* cam)
 {
         unsigned long hw_bufsize = cam->maxwidth*cam->maxheight*2,
-                      y0 = 0x0000,
-                      u0 = y0 + hw_bufsize/2,
-                      v0 = u0 + hw_bufsize/4,
-                      y1 = v0 + hw_bufsize/4,
-                      u1 = y1 + hw_bufsize/2,
-                      v1 = u1 + hw_bufsize/4;
+                      y0 = 0x0000,
+                      u0 = y0 + hw_bufsize/2,
+                      v0 = u0 + hw_bufsize/4,
+                      y1 = v0 + hw_bufsize/4,
+                      u1 = y1 + hw_bufsize/2,
+                      v1 = u1 + hw_bufsize/4;
         int err = 0;
 
         err += w9968cf_write_reg(cam, 0xff00, 0x00); /* power off */
@@ -1762,7 +1762,7 @@ w9968cf_set_picture(struct w9968cf_device* cam, struct video_picture pict)
                         cam->vpp_flag = VPP_SWAP_YUV_BYTES;
                         hw_palette = VIDEO_PALETTE_UYVY;
                         break;
-                /* Original video is used instead of RGBX palettes. 
+                /* Original video is used instead of RGBX palettes.
                    Software conversion later. */
                 case VIDEO_PALETTE_GREY:
                 case VIDEO_PALETTE_RGB555:
@@ -1777,7 +1777,7 @@ w9968cf_set_picture(struct w9968cf_device* cam, struct video_picture pict)
         }
 
         /* NOTE: due to memory issues, it is better to disable the hardware
-                 double buffering during compression */
+                 double buffering during compression */
         if (cam->double_buffer && !(cam->vpp_flag & VPP_DECOMPRESSION))
                 reg_v |= 0x0080;
 
@@ -1832,8 +1832,8 @@ w9968cf_set_window(struct w9968cf_device* cam, struct video_window win)
         #define __UNSC(x) ((x) >> 10)
 
         /* Make sure we are using a supported resolution */
-        if ((err = w9968cf_adjust_window_size(cam, (u16*)&win.width, 
-                                              (u16*)&win.height)))
+        if ((err = w9968cf_adjust_window_size(cam, (u16*)&win.width,
+                                              (u16*)&win.height)))
                 goto error;
 
         /* Scaling factors */
@@ -1962,7 +1962,7 @@ w9968cf_set_window(struct w9968cf_device* cam, struct video_window win)
         /* Settings changed, so we clear the frame buffers */
         memset(cam->frame[0].buffer, 0, cam->nbuffers*cam->frame[0].size);
 
-        DBG(4, "The capture area is %dx%d, Offset (x,y)=(%u,%u)", 
+        DBG(4, "The capture area is %dx%d, Offset (x,y)=(%u,%u)",
             win.width, win.height, win.x, win.y)
 
         PDBGG("x=%u ,y=%u, w=%u, h=%u, ax=%u, ay=%u, s_win.x=%u, s_win.y=%u, "
@@ -1978,11 +1978,11 @@ error:
 }
 
 
-/*-------------------------------------------------------------------------- 
+/*--------------------------------------------------------------------------
   Adjust the asked values for window width and height.
   Return 0 on success, -1 otherwise.
   --------------------------------------------------------------------------*/
-static int 
+static int
 w9968cf_adjust_window_size(struct w9968cf_device* cam, u16* width, u16* height)
 {
         u16 maxw, maxh;
@@ -1992,10 +1992,10 @@ w9968cf_adjust_window_size(struct w9968cf_device* cam, u16* width, u16* height)
 
         maxw = cam->upscaling && !(cam->vpp_flag & VPP_DECOMPRESSION) &&
                w9968cf_vpp ? max((u16)W9968CF_MAX_WIDTH, cam->maxwidth)
-                           : cam->maxwidth;
+                           : cam->maxwidth;
         maxh = cam->upscaling && !(cam->vpp_flag & VPP_DECOMPRESSION) &&
                w9968cf_vpp ? max((u16)W9968CF_MAX_HEIGHT, cam->maxheight)
-                           : cam->maxheight;
+                           : cam->maxheight;
 
         if (*width > maxw)
                 *width = maxw;
@@ -2054,7 +2054,7 @@ static void w9968cf_push_frame(struct w9968cf_device* cam, u8 f_num)
   Read, store and remove the first pointer in the FIFO list of requested
   frames. This function is called in interrupt context.
   --------------------------------------------------------------------------*/
-static void 
+static void
 w9968cf_pop_frame(struct w9968cf_device* cam, struct w9968cf_frame_t** framep)
 {
         u8 i;
@@ -2078,9 +2078,9 @@ w9968cf_pop_frame(struct w9968cf_device* cam, struct w9968cf_frame_t** framep)
   High-level video post-processing routine on grabbed frames.
   Return 0 on success, a negative number otherwise.
   --------------------------------------------------------------------------*/
-static int 
-w9968cf_postprocess_frame(struct w9968cf_device* cam, 
-                          struct w9968cf_frame_t* fr)
+static int
+w9968cf_postprocess_frame(struct w9968cf_device* cam,
+                          struct w9968cf_frame_t* fr)
 {
         void *pIn = fr->buffer, *pOut = cam->frame_vpp.buffer, *tmp;
         u16 w = cam->window.width,
@@ -2127,7 +2127,7 @@ w9968cf_postprocess_frame(struct w9968cf_device* cam,
                 w9968cf_vpp->uyvy_to_rgbx(pIn, fr->length, pOut, fmt, rgb);
                 fr->length = (w*h*d)/8;
                 _PSWAP(pIn, pOut)
-                DBG(6, "UYVY-16bit to %s conversion done", 
+                DBG(6, "UYVY-16bit to %s conversion done",
                     symbolic(v4l1_plist, fmt))
         }
 
@@ -2143,7 +2143,7 @@ w9968cf_postprocess_frame(struct w9968cf_device* cam,
  * Image sensor control routines                                            *
  ****************************************************************************/
 
-static int 
+static int
 w9968cf_sensor_set_control(struct w9968cf_device* cam, int cid, int val)
 {
         struct ovcamchip_control ctl;
@@ -2158,7 +2158,7 @@ w9968cf_sensor_set_control(struct w9968cf_device* cam, int cid, int val)
 }
 
 
-static int 
+static int
 w9968cf_sensor_get_control(struct w9968cf_device* cam, int cid, int* val)
 {
         struct ovcamchip_control ctl;
@@ -2198,38 +2198,38 @@ static int w9968cf_sensor_update_settings(struct w9968cf_device* cam)
         int err = 0;
 
         /* Auto brightness */
-        err = w9968cf_sensor_set_control(cam, OVCAMCHIP_CID_AUTOBRIGHT, 
-                                         cam->auto_brt);
+        err = w9968cf_sensor_set_control(cam, OVCAMCHIP_CID_AUTOBRIGHT,
+                                         cam->auto_brt);
         if (err)
                 return err;
 
         /* Auto exposure */
-        err = w9968cf_sensor_set_control(cam, OVCAMCHIP_CID_AUTOEXP, 
-                                         cam->auto_exp);
+        err = w9968cf_sensor_set_control(cam, OVCAMCHIP_CID_AUTOEXP,
+                                         cam->auto_exp);
         if (err)
                 return err;
 
         /* Banding filter */
-        err = w9968cf_sensor_set_control(cam, OVCAMCHIP_CID_BANDFILT, 
-                                         cam->bandfilt);
+        err = w9968cf_sensor_set_control(cam, OVCAMCHIP_CID_BANDFILT,
+                                         cam->bandfilt);
         if (err)
                 return err;
 
         /* Light frequency */
         err = w9968cf_sensor_set_control(cam, OVCAMCHIP_CID_FREQ,
-                                         cam->lightfreq);
+                                         cam->lightfreq);
         if (err)
                 return err;
 
         /* Back light */
         err = w9968cf_sensor_set_control(cam, OVCAMCHIP_CID_BACKLIGHT,
-                                         cam->backlight);
+                                         cam->backlight);
         if (err)
                 return err;
 
         /* Mirror */
         err = w9968cf_sensor_set_control(cam, OVCAMCHIP_CID_MIRROR,
-                                         cam->mirror);
+                                         cam->mirror);
         if (err)
                 return err;
 
@@ -2281,15 +2281,15 @@ static int w9968cf_sensor_get_picture(struct w9968cf_device* cam)
   Returns: 0 on success, a negative number otherwise.
   --------------------------------------------------------------------------*/
 static int
-w9968cf_sensor_update_picture(struct w9968cf_device* cam, 
-                              struct video_picture pict)
+w9968cf_sensor_update_picture(struct w9968cf_device* cam,
+                              struct video_picture pict)
 {
         int err = 0;
 
         if ((!cam->sensor_initialized)
             || pict.contrast != cam->picture.contrast) {
                 err = w9968cf_sensor_set_control(cam, OVCAMCHIP_CID_CONT,
-                                                 pict.contrast);
+                                                 pict.contrast);
                 if (err)
                         goto fail;
                 DBG(4, "Contrast changed from %u to %u",
@@ -2297,10 +2297,10 @@ w9968cf_sensor_update_picture(struct w9968cf_device* cam,
                 cam->picture.contrast = pict.contrast;
         }
 
-        if (((!cam->sensor_initialized) || 
+        if (((!cam->sensor_initialized) ||
             pict.brightness != cam->picture.brightness) && (!cam->auto_brt)) {
-                err = w9968cf_sensor_set_control(cam, OVCAMCHIP_CID_BRIGHT, 
-                                                 pict.brightness);
+                err = w9968cf_sensor_set_control(cam, OVCAMCHIP_CID_BRIGHT,
+                                                 pict.brightness);
                 if (err)
                         goto fail;
                 DBG(4, "Brightness changed from %u to %u",
@@ -2309,8 +2309,8 @@ w9968cf_sensor_update_picture(struct w9968cf_device* cam,
         }
 
         if ((!cam->sensor_initialized) || pict.colour != cam->picture.colour) {
-                err = w9968cf_sensor_set_control(cam, OVCAMCHIP_CID_SAT, 
-                                                 pict.colour);
+                err = w9968cf_sensor_set_control(cam, OVCAMCHIP_CID_SAT,
+                                                 pict.colour);
                 if (err)
                         goto fail;
                 DBG(4, "Colour changed from %u to %u",
@@ -2319,8 +2319,8 @@ w9968cf_sensor_update_picture(struct w9968cf_device* cam,
         }
 
         if ((!cam->sensor_initialized) || pict.hue != cam->picture.hue) {
-                err = w9968cf_sensor_set_control(cam, OVCAMCHIP_CID_HUE, 
-                                                 pict.hue);
+                err = w9968cf_sensor_set_control(cam, OVCAMCHIP_CID_HUE,
+                                                 pict.hue);
                 if (err)
                         goto fail;
                 DBG(4, "Hue changed from %u to %u",
@@ -2349,12 +2349,12 @@ static int w9968cf_sensor_init(struct w9968cf_device* cam)
 {
         int err = 0;
 
-        if ((err = w9968cf_sensor_cmd(cam, OVCAMCHIP_CMD_INITIALIZE, 
-                                      &cam->monochrome)))
+        if ((err = w9968cf_sensor_cmd(cam, OVCAMCHIP_CMD_INITIALIZE,
+                                      &cam->monochrome)))
                 goto error;
 
-        if ((err = w9968cf_sensor_cmd(cam, OVCAMCHIP_CMD_Q_SUBTYPE, 
-                                      &cam->sensor)))
+        if ((err = w9968cf_sensor_cmd(cam, OVCAMCHIP_CMD_Q_SUBTYPE,
+                                      &cam->sensor)))
                 goto error;
 
         /* NOTE: Make sure width and height are a multiple of 16 */
@@ -2416,14 +2416,14 @@ error:
 
 /*--------------------------------------------------------------------------
   Fill some basic fields in the main device data structure.
-  This function is called once on w9968cf_usb_probe() for each recognized 
+  This function is called once on w9968cf_usb_probe() for each recognized
   camera.
   --------------------------------------------------------------------------*/
 static void
 w9968cf_configure_camera(struct w9968cf_device* cam,
-                         struct usb_device* udev,
-                         enum w9968cf_model_id mod_id,
-                         const unsigned short dev_nr)
+                         struct usb_device* udev,
+                         enum w9968cf_model_id mod_id,
+                         const unsigned short dev_nr)
 {
         mutex_init(&cam->fileop_mutex);
         init_waitqueue_head(&cam->open);
@@ -2444,60 +2444,60 @@ w9968cf_configure_camera(struct w9968cf_device* cam,
              packet_size[dev_nr] < wMaxPacketSize[cam->altsetting-1];
              cam->altsetting++);
 
-        cam->max_buffers = (max_buffers[dev_nr] < 2 || 
-                            max_buffers[dev_nr] > W9968CF_MAX_BUFFERS)
-                           ? W9968CF_BUFFERS : (u8)max_buffers[dev_nr];
+        cam->max_buffers = (max_buffers[dev_nr] < 2 ||
+                            max_buffers[dev_nr] > W9968CF_MAX_BUFFERS)
+                           ? W9968CF_BUFFERS : (u8)max_buffers[dev_nr];
 
-        cam->double_buffer = (double_buffer[dev_nr] == 0 || 
-                              double_buffer[dev_nr] == 1)
-                             ? (u8)double_buffer[dev_nr]:W9968CF_DOUBLE_BUFFER;
+        cam->double_buffer = (double_buffer[dev_nr] == 0 ||
+                              double_buffer[dev_nr] == 1)
+                             ? (u8)double_buffer[dev_nr]:W9968CF_DOUBLE_BUFFER;
 
         cam->clamping = (clamping[dev_nr] == 0 || clamping[dev_nr] == 1)
-                        ? (u8)clamping[dev_nr] : W9968CF_CLAMPING;
-        
+                        ? (u8)clamping[dev_nr] : W9968CF_CLAMPING;
+
         cam->filter_type = (filter_type[dev_nr] == 0 ||
-                            filter_type[dev_nr] == 1 ||
-                            filter_type[dev_nr] == 2)
-                           ? (u8)filter_type[dev_nr] : W9968CF_FILTER_TYPE;
+                            filter_type[dev_nr] == 1 ||
+                            filter_type[dev_nr] == 2)
+                           ? (u8)filter_type[dev_nr] : W9968CF_FILTER_TYPE;
 
         cam->capture = 1;
 
         cam->largeview = (largeview[dev_nr] == 0 || largeview[dev_nr] == 1)
-                         ? (u8)largeview[dev_nr] : W9968CF_LARGEVIEW;
+                         ? (u8)largeview[dev_nr] : W9968CF_LARGEVIEW;
 
-        cam->decompression = (decompression[dev_nr] == 0 || 
-                              decompression[dev_nr] == 1 ||
-                              decompression[dev_nr] == 2)
-                             ? (u8)decompression[dev_nr]:W9968CF_DECOMPRESSION;
+        cam->decompression = (decompression[dev_nr] == 0 ||
+                              decompression[dev_nr] == 1 ||
+                              decompression[dev_nr] == 2)
+                             ? (u8)decompression[dev_nr]:W9968CF_DECOMPRESSION;
 
-        cam->upscaling = (upscaling[dev_nr] == 0 || 
-                          upscaling[dev_nr] == 1)
-                         ? (u8)upscaling[dev_nr] : W9968CF_UPSCALING;
+        cam->upscaling = (upscaling[dev_nr] == 0 ||
+                          upscaling[dev_nr] == 1)
+                         ? (u8)upscaling[dev_nr] : W9968CF_UPSCALING;
 
         cam->auto_brt = (autobright[dev_nr] == 0 || autobright[dev_nr] == 1)
-                        ? (u8)autobright[dev_nr] : W9968CF_AUTOBRIGHT;
+                        ? (u8)autobright[dev_nr] : W9968CF_AUTOBRIGHT;
 
         cam->auto_exp = (autoexp[dev_nr] == 0 || autoexp[dev_nr] == 1)
-                        ? (u8)autoexp[dev_nr] : W9968CF_AUTOEXP;
+                        ? (u8)autoexp[dev_nr] : W9968CF_AUTOEXP;
 
         cam->lightfreq = (lightfreq[dev_nr] == 50 || lightfreq[dev_nr] == 60)
-                         ? (u8)lightfreq[dev_nr] : W9968CF_LIGHTFREQ;
+                         ? (u8)lightfreq[dev_nr] : W9968CF_LIGHTFREQ;
 
-        cam->bandfilt = (bandingfilter[dev_nr] == 0 || 
-                         bandingfilter[dev_nr] == 1)
-                        ? (u8)bandingfilter[dev_nr] : W9968CF_BANDINGFILTER;
+        cam->bandfilt = (bandingfilter[dev_nr] == 0 ||
+                         bandingfilter[dev_nr] == 1)
+                        ? (u8)bandingfilter[dev_nr] : W9968CF_BANDINGFILTER;
 
         cam->backlight = (backlight[dev_nr] == 0 || backlight[dev_nr] == 1)
-                         ? (u8)backlight[dev_nr] : W9968CF_BACKLIGHT;
+                         ? (u8)backlight[dev_nr] : W9968CF_BACKLIGHT;
 
         cam->clockdiv = (clockdiv[dev_nr] == -1 || clockdiv[dev_nr] >= 0)
-                        ? (s8)clockdiv[dev_nr] : W9968CF_CLOCKDIV;
+                        ? (s8)clockdiv[dev_nr] : W9968CF_CLOCKDIV;
 
         cam->mirror = (mirror[dev_nr] == 0 || mirror[dev_nr] == 1)
-                      ? (u8)mirror[dev_nr] : W9968CF_MIRROR;
+                      ? (u8)mirror[dev_nr] : W9968CF_MIRROR;
 
         cam->monochrome = (monochrome[dev_nr] == 0 || monochrome[dev_nr] == 1)
-                          ? monochrome[dev_nr] : W9968CF_MONOCHROME;
+                          ? monochrome[dev_nr] : W9968CF_MONOCHROME;
 
         cam->picture.brightness = (u16)brightness[dev_nr];
         cam->picture.hue = (u16)hue[dev_nr];
@@ -2519,7 +2519,7 @@ w9968cf_configure_camera(struct w9968cf_device* cam,
         cam->picture.depth = w9968cf_valid_depth(cam->picture.palette);
 
         cam->force_rgb = (force_rgb[dev_nr] == 0 || force_rgb[dev_nr] == 1)
-                         ? (u8)force_rgb[dev_nr] : W9968CF_FORCE_RGB;
+                         ? (u8)force_rgb[dev_nr] : W9968CF_FORCE_RGB;
 
         cam->window.x = 0;
         cam->window.y = 0;
@@ -2531,16 +2531,16 @@ w9968cf_configure_camera(struct w9968cf_device* cam,
 
         DBG(3, "%s configured with settings #%u:",
             symbolic(camlist, cam->id), dev_nr)
-        
+
         DBG(3, "- Data packet size for USB isochrnous transfer: %u bytes",
             wMaxPacketSize[cam->altsetting-1])
-        
+
         DBG(3, "- Number of requested video frame buffers: %u",
             cam->max_buffers)
 
         if (cam->double_buffer)
                 DBG(3, "- Hardware double buffering enabled")
-        else 
+        else
                 DBG(3, "- Hardware double buffering disabled")
 
         if (cam->filter_type == 0)
@@ -2648,7 +2648,7 @@ static void w9968cf_adjust_configuration(struct w9968cf_device* cam)
 
 /*--------------------------------------------------------------------------
   Release the resources used by the driver.
-  This function is called on disconnect 
+  This function is called on disconnect
   (or on close if deallocation has been deferred)
   --------------------------------------------------------------------------*/
 static void w9968cf_release_resources(struct w9968cf_device* cam)
@@ -2706,8 +2706,8 @@ static int w9968cf_open(struct inode* inode, struct file* filp)
                 }
                 mutex_unlock(&cam->dev_mutex);
                 err = wait_event_interruptible_exclusive(cam->open,
-                                                         cam->disconnected ||
-                                                         !cam->users);
+                                                         cam->disconnected ||
+                                                         !cam->users);
                 if (err) {
                         up_read(&w9968cf_disconnect);
                         return err;
@@ -2820,9 +2820,9 @@ w9968cf_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
                 w9968cf_push_frame(cam, 1);
 
         err = wait_event_interruptible(cam->wait_queue,
-                                       cam->frame[0].status == F_READY ||
-                                       cam->frame[1].status == F_READY ||
-                                       cam->disconnected);
+                                       cam->frame[0].status == F_READY ||
+                                       cam->frame[1].status == F_READY ||
+                                       cam->disconnected);
         if (err) {
                 mutex_unlock(&cam->fileop_mutex);
                 return err;
@@ -2859,12 +2859,12 @@ w9968cf_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
 static int w9968cf_mmap(struct file* filp, struct vm_area_struct *vma)
 {
         struct w9968cf_device* cam = (struct w9968cf_device*)
-                                     video_get_drvdata(video_devdata(filp));
+                                     video_get_drvdata(video_devdata(filp));
         unsigned long vsize = vma->vm_end - vma->vm_start,
-                      psize = cam->nbuffers * cam->frame[0].size,
-                      start = vma->vm_start,
-                      pos = (unsigned long)cam->frame[0].buffer,
-                      page;
+                      psize = cam->nbuffers * cam->frame[0].size,
+                      start = vma->vm_start,
+                      pos = (unsigned long)cam->frame[0].buffer,
+                      page;
 
         if (cam->disconnected) {
                 DBG(2, "Device not present")
@@ -2898,7 +2898,7 @@ static int w9968cf_mmap(struct file* filp, struct vm_area_struct *vma)
 
 static int
 w9968cf_ioctl(struct inode* inode, struct file* filp,
-              unsigned int cmd, unsigned long arg)
+              unsigned int cmd, unsigned long arg)
 {
         struct w9968cf_device* cam;
         int err;
@@ -2928,21 +2928,21 @@ w9968cf_ioctl(struct inode* inode, struct file* filp,
 
 
 static int w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
-                             unsigned int cmd, void __user * arg)
+                             unsigned int cmd, void __user * arg)
 {
         struct w9968cf_device* cam;
         const char* v4l1_ioctls[] = {
-                "?", "CGAP", "GCHAN", "SCHAN", "GTUNER", "STUNER", 
+                "?", "CGAP", "GCHAN", "SCHAN", "GTUNER", "STUNER",
                 "GPICT", "SPICT", "CCAPTURE", "GWIN", "SWIN", "GFBUF",
                 "SFBUF", "KEY", "GFREQ", "SFREQ", "GAUDIO", "SAUDIO",
                 "SYNC", "MCAPTURE", "GMBUF", "GUNIT", "GCAPTURE", "SCAPTURE",
-                "SPLAYMODE", "SWRITEMODE", "GPLAYINFO", "SMICROCODE", 
-                "GVBIFMT", "SVBIFMT" 
+                "SPLAYMODE", "SWRITEMODE", "GPLAYINFO", "SMICROCODE",
+                "GVBIFMT", "SVBIFMT"
         };
 
         #define V4L1_IOCTL(cmd) \
-                ((_IOC_NR((cmd)) < ARRAY_SIZE(v4l1_ioctls)) ? \
-                v4l1_ioctls[_IOC_NR((cmd))] : "?")
+                ((_IOC_NR((cmd)) < ARRAY_SIZE(v4l1_ioctls)) ? \
+                v4l1_ioctls[_IOC_NR((cmd))] : "?")
 
         cam = (struct w9968cf_device*)video_get_drvdata(video_devdata(filp));
 
@@ -2957,14 +2957,14 @@ static int w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
                         .minwidth = cam->minwidth,
                         .minheight = cam->minheight,
                 };
-                sprintf(cap.name, "W996[87]CF USB Camera #%d", 
-                        cam->v4ldev->minor);
+                sprintf(cap.name, "W996[87]CF USB Camera #%d",
+                        cam->v4ldev->minor);
                 cap.maxwidth = (cam->upscaling && w9968cf_vpp)
-                               ? max((u16)W9968CF_MAX_WIDTH, cam->maxwidth) 
-                                 : cam->maxwidth;
+                               ? max((u16)W9968CF_MAX_WIDTH, cam->maxwidth)
+                                 : cam->maxwidth;
                 cap.maxheight = (cam->upscaling && w9968cf_vpp)
-                                ? max((u16)W9968CF_MAX_HEIGHT, cam->maxheight)
-                                  : cam->maxheight;
+                                ? max((u16)W9968CF_MAX_HEIGHT, cam->maxheight)
+                                  : cam->maxheight;
 
                 if (copy_to_user(arg, &cap, sizeof(cap)))
                         return -EFAULT;
@@ -3029,7 +3029,7 @@ static int w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
                 if (copy_from_user(&pict, arg, sizeof(pict)))
                         return -EFAULT;
 
-                if ( (cam->force_palette || !w9968cf_vpp) 
+                if ( (cam->force_palette || !w9968cf_vpp)
                      && pict.palette != cam->picture.palette ) {
                         DBG(4, "Palette %s rejected: only %s is allowed",
                             symbolic(v4l1_plist, pict.palette),
@@ -3046,24 +3046,24 @@ static int w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
                 if (!cam->force_palette) {
                    if (cam->decompression == 0) {
                       if (w9968cf_need_decompression(pict.palette)) {
-                         DBG(4, "Decompression disabled: palette %s is not "
-                                "allowed. VIDIOCSPICT failed",
-                             symbolic(v4l1_plist, pict.palette))
-                         return -EINVAL;
+                         DBG(4, "Decompression disabled: palette %s is not "
+                                "allowed. VIDIOCSPICT failed",
+                             symbolic(v4l1_plist, pict.palette))
+                         return -EINVAL;
                       }
                    } else if (cam->decompression == 1) {
                       if (!w9968cf_need_decompression(pict.palette)) {
-                         DBG(4, "Decompression forced: palette %s is not "
-                                "allowed. VIDIOCSPICT failed",
-                             symbolic(v4l1_plist, pict.palette))
-                         return -EINVAL;
+                         DBG(4, "Decompression forced: palette %s is not "
+                                "allowed. VIDIOCSPICT failed",
+                             symbolic(v4l1_plist, pict.palette))
+                         return -EINVAL;
                       }
                    }
                 }
 
                 if (pict.depth != w9968cf_valid_depth(pict.palette)) {
                         DBG(4, "Requested depth %u bpp is not valid for %s "
-                               "palette: ignored and changed to %u bpp", 
+                               "palette: ignored and changed to %u bpp",
                             pict.depth, symbolic(v4l1_plist, pict.palette),
                             w9968cf_valid_depth(pict.palette))
                         pict.depth = w9968cf_valid_depth(pict.palette);
@@ -3074,9 +3074,9 @@ static int w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
                            || cam->frame_current->queued) {
                                 err = wait_event_interruptible
                                       ( cam->wait_queue,
-                                        cam->disconnected ||
-                                        (!*cam->requested_frame &&
-                                         !cam->frame_current->queued) );
+                                        cam->disconnected ||
+                                        (!*cam->requested_frame &&
+                                         !cam->frame_current->queued) );
                                 if (err)
                                         return err;
                                 if (cam->disconnected)
@@ -3116,7 +3116,7 @@ static int w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
                         return -EINVAL;
 
                 if ((err = w9968cf_adjust_window_size(cam, (u16*)&win.width,
-                                                      (u16*)&win.height))) {
+                                                      (u16*)&win.height))) {
                         DBG(4, "Resolution not supported (%ux%u). "
                                "VIDIOCSWIN failed", win.width, win.height)
                         return err;
@@ -3130,9 +3130,9 @@ static int w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
                            || cam->frame_current->queued) {
                                 err = wait_event_interruptible
                                       ( cam->wait_queue,
-                                        cam->disconnected ||
-                                        (!*cam->requested_frame &&
-                                         !cam->frame_current->queued) );
+                                        cam->disconnected ||
+                                        (!*cam->requested_frame &&
+                                         !cam->frame_current->queued) );
                                 if (err)
                                         return err;
                                 if (cam->disconnected)
@@ -3175,7 +3175,7 @@ static int w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
                 mbuf.frames = cam->nbuffers;
                 for (i = 0; i < cam->nbuffers; i++)
                         mbuf.offsets[i] = (unsigned long)cam->frame[i].buffer -
-                                          (unsigned long)cam->frame[0].buffer;
+                                          (unsigned long)cam->frame[0].buffer;
 
                 if (copy_to_user(arg, &mbuf, sizeof(mbuf)))
                         return -EFAULT;
@@ -3194,7 +3194,7 @@ static int w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
                         return -EFAULT;
 
                 DBG(6, "VIDIOCMCAPTURE called: frame #%u, format=%s, %dx%d",
-                    mmap.frame, symbolic(v4l1_plist, mmap.format), 
+                    mmap.frame, symbolic(v4l1_plist, mmap.format),
                     mmap.width, mmap.height)
 
                 if (mmap.frame >= cam->nbuffers) {
@@ -3203,7 +3203,7 @@ static int w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
                         return -EINVAL;
                 }
 
-                if (mmap.format!=cam->picture.palette && 
+                if (mmap.format!=cam->picture.palette &&
                     (cam->force_palette || !w9968cf_vpp)) {
                         DBG(4, "Palette %s rejected: only %s is allowed",
                             symbolic(v4l1_plist, mmap.format),
@@ -3213,7 +3213,7 @@ static int w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
 
                 if (!w9968cf_valid_palette(mmap.format)) {
                         DBG(4, "Palette %s not supported. "
-                               "VIDIOCMCAPTURE failed", 
+                               "VIDIOCMCAPTURE failed",
                             symbolic(v4l1_plist, mmap.format))
                         return -EINVAL;
                 }
@@ -3221,23 +3221,23 @@ static int w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
                 if (!cam->force_palette) {
                    if (cam->decompression == 0) {
                       if (w9968cf_need_decompression(mmap.format)) {
-                         DBG(4, "Decompression disabled: palette %s is not "
-                                "allowed. VIDIOCSPICT failed",
-                             symbolic(v4l1_plist, mmap.format))
-                         return -EINVAL;
+                         DBG(4, "Decompression disabled: palette %s is not "
+                                "allowed. VIDIOCSPICT failed",
+                             symbolic(v4l1_plist, mmap.format))
+                         return -EINVAL;
                       }
                    } else if (cam->decompression == 1) {
                       if (!w9968cf_need_decompression(mmap.format)) {
-                         DBG(4, "Decompression forced: palette %s is not "
-                                "allowed. VIDIOCSPICT failed",
-                             symbolic(v4l1_plist, mmap.format))
-                         return -EINVAL;
+                         DBG(4, "Decompression forced: palette %s is not "
+                                "allowed. VIDIOCSPICT failed",
+                             symbolic(v4l1_plist, mmap.format))
+                         return -EINVAL;
                       }
                    }
                 }
 
-                if ((err = w9968cf_adjust_window_size(cam, (u16*)&mmap.width, 
-                                                      (u16*)&mmap.height))) {
+                if ((err = w9968cf_adjust_window_size(cam, (u16*)&mmap.width,
+                                                      (u16*)&mmap.height))) {
                         DBG(4, "Resolution not supported (%dx%d). "
                                "VIDIOCMCAPTURE failed",
                             mmap.width, mmap.height)
@@ -3258,12 +3258,12 @@ static int w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
                                 DBG(6, "VIDIOCMCAPTURE. Change settings for "
                                        "frame #%u: %dx%d, format %s. Wait...",
                                     mmap.frame, mmap.width, mmap.height,
-                                    symbolic(v4l1_plist, mmap.format))
+                                    symbolic(v4l1_plist, mmap.format))
                                 err = wait_event_interruptible
                                       ( cam->wait_queue,
-                                        cam->disconnected ||
-                                        (!*cam->requested_frame &&
-                                         !cam->frame_current->queued) );
+                                        cam->disconnected ||
+                                        (!*cam->requested_frame &&
+                                         !cam->frame_current->queued) );
                                 if (err)
                                         return err;
                                 if (cam->disconnected)
@@ -3280,7 +3280,7 @@ static int w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
                                 goto ioctl_fail;
 
                         /* This before set_window */
-                        if (w9968cf_set_picture(cam, pict)) 
+                        if (w9968cf_set_picture(cam, pict))
                                 goto ioctl_fail;
 
                         if (w9968cf_set_window(cam, win))
@@ -3292,10 +3292,10 @@ static int w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
                 } else  if (fr->queued) {
 
                         DBG(6, "Wait until frame #%u is free", mmap.frame)
-                        
-                        err = wait_event_interruptible(cam->wait_queue, 
-                                                       cam->disconnected ||
-                                                       (!fr->queued));
+
+                        err = wait_event_interruptible(cam->wait_queue,
+                                                       cam->disconnected ||
+                                                       (!fr->queued));
                         if (err)
                                 return err;
                         if (cam->disconnected)
@@ -3335,9 +3335,9 @@ static int w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
                         }
                 case F_ERROR:
                 case F_GRABBING:
-                        err = wait_event_interruptible(cam->wait_queue, 
-                                                       (fr->status == F_READY)
-                                                       || cam->disconnected);
+                        err = wait_event_interruptible(cam->wait_queue,
+                                                       (fr->status == F_READY)
+                                                       || cam->disconnected);
                         if (err)
                                 return err;
                         if (cam->disconnected)
@@ -3439,7 +3439,7 @@ static int w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
                 DBG(4, "Unsupported V4L1 IOCtl: VIDIOC%s "
                        "(type 0x%01X, "
                        "n. 0x%01X, "
-                       "dir. 0x%01X, " 
+                       "dir. 0x%01X, "
                        "size 0x%02X)",
                     V4L1_IOCTL(cmd),
                     _IOC_TYPE(cmd),_IOC_NR(cmd),_IOC_DIR(cmd),_IOC_SIZE(cmd))
@@ -3499,13 +3499,13 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
             le16_to_cpu(udev->descriptor.idProduct) == winbond_id_table[0].idProduct)
                 mod_id = W9968CF_MOD_CLVBWGP; /* see camlist[] table */
         else if (le16_to_cpu(udev->descriptor.idVendor)  == winbond_id_table[1].idVendor &&
-                 le16_to_cpu(udev->descriptor.idProduct) == winbond_id_table[1].idProduct)
+                 le16_to_cpu(udev->descriptor.idProduct) == winbond_id_table[1].idProduct)
                 mod_id = W9968CF_MOD_GENERIC; /* see camlist[] table */
         else
                 return -ENODEV;
 
         cam = (struct w9968cf_device*)
-                  kzalloc(sizeof(struct w9968cf_device), GFP_KERNEL);
+                  kzalloc(sizeof(struct w9968cf_device), GFP_KERNEL);
         if (!cam)
                 return -ENOMEM;
 
@@ -3569,7 +3569,7 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         cam->v4ldev->dev = &cam->dev;
 
         err = video_register_device(cam->v4ldev, VFL_TYPE_GRABBER,
-                                    video_nr[dev_nr]);
+                                    video_nr[dev_nr]);
         if (err) {
                 DBG(1, "V4L device registration failed")
                 if (err == -ENFILE && video_nr[dev_nr] == -1)
@@ -3611,7 +3611,7 @@ fail: /* Free unused memory */
 
 static void w9968cf_usb_disconnect(struct usb_interface* intf)
 {
-        struct w9968cf_device* cam = 
+        struct w9968cf_device* cam =
            (struct w9968cf_device*)usb_get_intfdata(intf);
 
         down_write(&w9968cf_disconnect);
diff --git a/drivers/usb/media/w9968cf.h b/drivers/media/video/w9968cf.h
index a87be719a2..2836b45ec2 100644
--- a/drivers/usb/media/w9968cf.h
+++ b/drivers/media/video/w9968cf.h
@@ -61,7 +61,7 @@
 
 /* Maximum data payload sizes in bytes for alternate settings */
 static const u16 wMaxPacketSize[] = {1023, 959, 895, 831, 767, 703, 639, 575,
-                                      511, 447, 383, 319, 255, 191, 127,  63};
+                                      511, 447, 383, 319, 255, 191, 127,  63};
 #define W9968CF_PACKET_SIZE      1023 /* according to wMaxPacketSizes[] */
 #define W9968CF_MIN_PACKET_SIZE  63 /* minimum value */
 #define W9968CF_ISO_PACKETS      5 /* n.of packets for isochronous transfers */
@@ -134,7 +134,7 @@ static const struct w9968cf_format w9968cf_formatlist[] = {
  ****************************************************************************/
 
 #define W9968CF_MODULE_NAME     "V4L driver for W996[87]CF JPEG USB " \
-                                "Dual Mode Camera Chip"
+                                "Dual Mode Camera Chip"
 #define W9968CF_MODULE_VERSION  "1:1.33-basic"
 #define W9968CF_MODULE_AUTHOR   "(C) 2002-2004 Luca Risolia"
 #define W9968CF_AUTHOR_EMAIL    "<luca.risolia@studio.unibo.it>"
@@ -270,9 +270,9 @@ struct w9968cf_device {
 
         /* Locks */
         struct mutex dev_mutex,    /* for probe, disconnect,open and close */
-                         fileop_mutex; /* for read and ioctl */
+                         fileop_mutex; /* for read and ioctl */
         spinlock_t urb_lock,   /* for submit_urb() and unlink_urb() */
-                   flist_lock; /* for requested frame list accesses */
+                   flist_lock; /* for requested frame list accesses */
         wait_queue_head_t open, wait_queue;
 
         char command[16]; /* name of the program holding the device */
@@ -299,7 +299,7 @@ struct w9968cf_device {
                         dev_warn(&cam->dev, fmt "\n", ## args);               \
                 else if ((level) >= 5)                                        \
                         dev_info(&cam->dev, "[%s:%d] " fmt "\n",              \
-                                 __FUNCTION__, __LINE__ , ## args);           \
+                                 __FUNCTION__, __LINE__ , ## args);           \
         }                                                                     \
 }
 /* For generic kernel (not device specific) messages */
@@ -311,7 +311,7 @@ struct w9968cf_device {
                         pr_info("w9968cf: " fmt "\n", ## args);               \
                 else if ((level) >= 5)                                        \
                         pr_debug("w9968cf: [%s:%d] " fmt "\n", __FUNCTION__,  \
-                                 __LINE__ , ## args);                         \
+                                 __LINE__ , ## args);                         \
         }                                                                     \
 }
 #else
diff --git a/drivers/usb/media/w9968cf_decoder.h b/drivers/media/video/w9968cf_decoder.h
index 31faccbe8f..59decbfc54 100644
--- a/drivers/usb/media/w9968cf_decoder.h
+++ b/drivers/media/video/w9968cf_decoder.h
@@ -78,9 +78,9 @@ static const unsigned char UV_QUANTABLE[64] = {
 #define W9968CF_DEC_ERR_NO_EOI          -6
 
 extern void w9968cf_init_decoder(void);
-extern int w9968cf_check_headers(const unsigned char* Pin, 
-                                 const unsigned long BUF_SIZE);
-extern int w9968cf_decode(const char* Pin, const unsigned long BUF_SIZE, 
-                          const unsigned W, const unsigned H, char* Pout);
+extern int w9968cf_check_headers(const unsigned char* Pin,
+                                 const unsigned long BUF_SIZE);
+extern int w9968cf_decode(const char* Pin, const unsigned long BUF_SIZE,
+                          const unsigned W, const unsigned H, char* Pout);
 
 #endif /* _W9968CF_DECODER_H_ */
diff --git a/drivers/usb/media/w9968cf_vpp.h b/drivers/media/video/w9968cf_vpp.h
index f3b91b7826..88c9b6c0cc 100644
--- a/drivers/usb/media/w9968cf_vpp.h
+++ b/drivers/media/video/w9968cf_vpp.h
@@ -29,7 +29,7 @@ struct w9968cf_vpp_t {
         struct module* owner;
         int (*check_headers)(const unsigned char*, const unsigned long);
         int (*decode)(const char*, const unsigned long, const unsigned,
-                      const unsigned, char*);
+                      const unsigned, char*);
         void (*swap_yuvbytes)(void*, unsigned long);
         void (*uyvy_to_rgbx)(u8*, unsigned long, u8*, u16, u8);
         void (*scale_up)(u8*, u8*, u16, u16, u16, u16, u16);
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c
index 8cb64f8a8a..d81a88bbe4 100644
--- a/drivers/media/video/wm8775.c
+++ b/drivers/media/video/wm8775.c
@@ -79,21 +79,26 @@ static int wm8775_command(struct i2c_client *client, unsigned int cmd,
                           void *arg)
 {
         struct wm8775_state *state = i2c_get_clientdata(client);
-        struct v4l2_audio *input = arg;
+        struct v4l2_routing *route = arg;
         struct v4l2_control *ctrl = arg;
 
         switch (cmd) {
-        case VIDIOC_S_AUDIO:
+        case VIDIOC_INT_G_AUDIO_ROUTING:
+                route->input = state->input;
+                route->output = 0;
+                break;
+
+        case VIDIOC_INT_S_AUDIO_ROUTING:
                 /* There are 4 inputs and one output. Zero or more inputs
                    are multiplexed together to the output. Hence there are
                    16 combinations.
                    If only one input is active (the normal case) then the
                    input values 1, 2, 4 or 8 should be used. */
-                if (input->index > 15) {
-                        v4l_err(client, "Invalid input %d.\n", input->index);
+                if (route->input > 15) {
+                        v4l_err(client, "Invalid input %d.\n", route->input);
                         return -EINVAL;
                 }
-                state->input = input->index;
+                state->input = route->input;
                 if (state->muted)
                         break;
                 wm8775_write(client, R21, 0x0c0);
@@ -102,11 +107,6 @@ static int wm8775_command(struct i2c_client *client, unsigned int cmd,
                 wm8775_write(client, R21, 0x100 + state->input);
                 break;
 
-        case VIDIOC_G_AUDIO:
-                memset(input, 0, sizeof(*input));
-                input->index = state->input;
-                break;
-
         case VIDIOC_G_CTRL:
                 if (ctrl->id != V4L2_CID_AUDIO_MUTE)
                         return -EINVAL;
diff --git a/drivers/media/video/zc0301/Makefile b/drivers/media/video/zc0301/Makefile
new file mode 100644
index 0000000000..d749199d8f
--- /dev/null
+++ b/drivers/media/video/zc0301/Makefile
@@ -0,0 +1,3 @@
+zc0301-objs     := zc0301_core.o zc0301_pas202bcb.o
+
+obj-$(CONFIG_USB_ZC0301)        += zc0301.o
diff --git a/drivers/usb/media/zc0301.h b/drivers/media/video/zc0301/zc0301.h
index 8e0655140e..b9c93b8c16 100644
--- a/drivers/usb/media/zc0301.h
+++ b/drivers/media/video/zc0301/zc0301.h
@@ -157,7 +157,7 @@ do {                                                                          \
                         dev_info(&cam->usbdev->dev, fmt "\n", ## args);       \
                 else if ((level) >= 3)                                        \
                         dev_info(&cam->usbdev->dev, "[%s:%d] " fmt "\n",      \
-                                 __FUNCTION__, __LINE__ , ## args);           \
+                                 __FUNCTION__, __LINE__ , ## args);           \
         }                                                                     \
 } while (0)
 #       define KDBG(level, fmt, args...)                                      \
@@ -167,7 +167,7 @@ do {                                                                          \
                         pr_info("zc0301: " fmt "\n", ## args);                \
                 else if ((level) == 3)                                        \
                         pr_debug("zc0301: [%s:%d] " fmt "\n", __FUNCTION__,   \
-                                 __LINE__ , ## args);                         \
+                                 __LINE__ , ## args);                         \
         }                                                                     \
 } while (0)
 #       define V4LDBG(level, name, cmd)                                       \
@@ -184,7 +184,7 @@ do {                                                                          \
 #undef PDBG
 #define PDBG(fmt, args...)                                                    \
 dev_info(&cam->usbdev->dev, "[%s:%d] " fmt "\n",                              \
-         __FUNCTION__, __LINE__ , ## args)
+         __FUNCTION__, __LINE__ , ## args)
 
 #undef PDBGG
 #define PDBGG(fmt, args...) do {;} while(0) /* placeholder */
diff --git a/drivers/usb/media/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c
index 4036c6268b..0fad39754f 100644
--- a/drivers/usb/media/zc0301_core.c
+++ b/drivers/media/video/zc0301/zc0301_core.c
@@ -48,7 +48,7 @@
 /*****************************************************************************/
 
 #define ZC0301_MODULE_NAME    "V4L2 driver for ZC0301 "                       \
-                              "Image Processor and Control Chip"
+                              "Image Processor and Control Chip"
 #define ZC0301_MODULE_AUTHOR  "(C) 2006 Luca Risolia"
 #define ZC0301_AUTHOR_EMAIL   "<luca.risolia@studio.unibo.it>"
 #define ZC0301_MODULE_LICENSE "GPL"
@@ -67,67 +67,67 @@ MODULE_LICENSE(ZC0301_MODULE_LICENSE);
 static short video_nr[] = {[0 ... ZC0301_MAX_DEVICES-1] = -1};
 module_param_array(video_nr, short, NULL, 0444);
 MODULE_PARM_DESC(video_nr,
-                 "\n<-1|n[,...]> Specify V4L2 minor mode number."
-                 "\n -1 = use next available (default)"
-                 "\n  n = use minor number n (integer >= 0)"
-                 "\nYou can specify up to "
-                 __MODULE_STRING(ZC0301_MAX_DEVICES) " cameras this way."
-                 "\nFor example:"
-                 "\nvideo_nr=-1,2,-1 would assign minor number 2 to"
-                 "\nthe second registered camera and use auto for the first"
-                 "\none and for every other camera."
-                 "\n");
+                 "\n<-1|n[,...]> Specify V4L2 minor mode number."
+                 "\n -1 = use next available (default)"
+                 "\n  n = use minor number n (integer >= 0)"
+                 "\nYou can specify up to "
+                 __MODULE_STRING(ZC0301_MAX_DEVICES) " cameras this way."
+                 "\nFor example:"
+                 "\nvideo_nr=-1,2,-1 would assign minor number 2 to"
+                 "\nthe second registered camera and use auto for the first"
+                 "\none and for every other camera."
+                 "\n");
 
 static short force_munmap[] = {[0 ... ZC0301_MAX_DEVICES-1] =
-                               ZC0301_FORCE_MUNMAP};
+                               ZC0301_FORCE_MUNMAP};
 module_param_array(force_munmap, bool, NULL, 0444);
 MODULE_PARM_DESC(force_munmap,
-                 "\n<0|1[,...]> Force the application to unmap previously"
-                 "\nmapped buffer memory before calling any VIDIOC_S_CROP or"
-                 "\nVIDIOC_S_FMT ioctl's. Not all the applications support"
-                 "\nthis feature. This parameter is specific for each"
-                 "\ndetected camera."
-                 "\n 0 = do not force memory unmapping"
-                 "\n 1 = force memory unmapping (save memory)"
-                 "\nDefault value is "__MODULE_STRING(SN9C102_FORCE_MUNMAP)"."
-                 "\n");
+                 "\n<0|1[,...]> Force the application to unmap previously"
+                 "\nmapped buffer memory before calling any VIDIOC_S_CROP or"
+                 "\nVIDIOC_S_FMT ioctl's. Not all the applications support"
+                 "\nthis feature. This parameter is specific for each"
+                 "\ndetected camera."
+                 "\n 0 = do not force memory unmapping"
+                 "\n 1 = force memory unmapping (save memory)"
+                 "\nDefault value is "__MODULE_STRING(SN9C102_FORCE_MUNMAP)"."
+                 "\n");
 
 static unsigned int frame_timeout[] = {[0 ... ZC0301_MAX_DEVICES-1] =
-                                       ZC0301_FRAME_TIMEOUT};
+                                       ZC0301_FRAME_TIMEOUT};
 module_param_array(frame_timeout, uint, NULL, 0644);
 MODULE_PARM_DESC(frame_timeout,
-                 "\n<n[,...]> Timeout for a video frame in seconds."
-                 "\nThis parameter is specific for each detected camera."
-                 "\nDefault value is "__MODULE_STRING(ZC0301_FRAME_TIMEOUT)"."
-                 "\n");
+                 "\n<n[,...]> Timeout for a video frame in seconds."
+                 "\nThis parameter is specific for each detected camera."
+                 "\nDefault value is "__MODULE_STRING(ZC0301_FRAME_TIMEOUT)"."
+                 "\n");
 
 #ifdef ZC0301_DEBUG
 static unsigned short debug = ZC0301_DEBUG_LEVEL;
 module_param(debug, ushort, 0644);
 MODULE_PARM_DESC(debug,
-                 "\n<n> Debugging information level, from 0 to 3:"
-                 "\n0 = none (use carefully)"
-                 "\n1 = critical errors"
-                 "\n2 = significant informations"
-                 "\n3 = more verbose messages"
-                 "\nLevel 3 is useful for testing only, when only "
-                 "one device is used."
-                 "\nDefault value is "__MODULE_STRING(ZC0301_DEBUG_LEVEL)"."
-                 "\n");
+                 "\n<n> Debugging information level, from 0 to 3:"
+                 "\n0 = none (use carefully)"
+                 "\n1 = critical errors"
+                 "\n2 = significant informations"
+                 "\n3 = more verbose messages"
+                 "\nLevel 3 is useful for testing only, when only "
+                 "one device is used."
+                 "\nDefault value is "__MODULE_STRING(ZC0301_DEBUG_LEVEL)"."
+                 "\n");
 #endif
 
 /*****************************************************************************/
 
 static u32
 zc0301_request_buffers(struct zc0301_device* cam, u32 count,
-                       enum zc0301_io_method io)
+                       enum zc0301_io_method io)
 {
         struct v4l2_pix_format* p = &(cam->sensor.pix_format);
         struct v4l2_rect* r = &(cam->sensor.cropcap.bounds);
         const size_t imagesize = cam->module_param.force_munmap ||
-                                 io == IO_READ ?
-                                 (p->width * p->height * p->priv) / 8 :
-                                 (r->width * r->height * p->priv) / 8;
+                                 io == IO_READ ?
+                                 (p->width * p->height * p->priv) / 8 :
+                                 (r->width * r->height * p->priv) / 8;
         void* buff = NULL;
         u32 i;
 
@@ -216,7 +216,7 @@ int zc0301_write_reg(struct zc0301_device* cam, u16 index, u16 value)
         int res;
 
         res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0xa0, 0x40,
-                              value, index, NULL, 0, ZC0301_CTRL_TIMEOUT);
+                              value, index, NULL, 0, ZC0301_CTRL_TIMEOUT);
         if (res < 0) {
                 DBG(3, "Failed to write a register (index 0x%04X, "
                        "value 0x%02X, error %d)",index, value, res);
@@ -234,7 +234,7 @@ int zc0301_read_reg(struct zc0301_device* cam, u16 index)
         int res;
 
         res = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0xa1, 0xc0,
-                              0x0001, index, buff, 1, ZC0301_CTRL_TIMEOUT);
+                              0x0001, index, buff, 1, ZC0301_CTRL_TIMEOUT);
         if (res < 0)
                 DBG(3, "Failed to read a register (index 0x%04X, error %d)",
                     index, res);
@@ -337,11 +337,11 @@ static void zc0301_urb_complete(struct urb *urb, struct pt_regs* regs)
 
         if (!(*f))
                 (*f) = list_entry(cam->inqueue.next, struct zc0301_frame_t,
-                                  frame);
+                                  frame);
 
         imagesize = (cam->sensor.pix_format.width *
-                     cam->sensor.pix_format.height *
-                     cam->sensor.pix_format.priv) / 8;
+                     cam->sensor.pix_format.height *
+                     cam->sensor.pix_format.priv) / 8;
 
         for (i = 0; i < urb->number_of_packets; i++) {
                 unsigned int len, status;
@@ -395,8 +395,8 @@ end_of_frame:
                                 list_move_tail(&(*f)->frame, &cam->outqueue);
                                 if (!list_empty(&cam->inqueue))
                                         (*f) = list_entry(cam->inqueue.next,
-                                                       struct zc0301_frame_t,
-                                                          frame);
+                                                       struct zc0301_frame_t,
+                                                          frame);
                                 else
                                         (*f) = NULL;
                                 spin_unlock(&cam->queue_lock);
@@ -429,14 +429,14 @@ static int zc0301_start_transfer(struct zc0301_device* cam)
         struct usb_device *udev = cam->usbdev;
         struct urb* urb;
         const unsigned int wMaxPacketSize[] = {0, 128, 192, 256, 384,
-                                               512, 768, 1023};
+                                               512, 768, 1023};
         const unsigned int psz = wMaxPacketSize[ZC0301_ALTERNATE_SETTING];
         s8 i, j;
         int err = 0;
 
         for (i = 0; i < ZC0301_URBS; i++) {
                 cam->transfer_buffer[i] = kzalloc(ZC0301_ISO_PACKETS * psz,
-                                                  GFP_KERNEL);
+                                                  GFP_KERNEL);
                 if (!cam->transfer_buffer[i]) {
                         err = -ENOMEM;
                         DBG(1, "Not enough memory");
@@ -528,9 +528,9 @@ static int zc0301_stream_interrupt(struct zc0301_device* cam)
 
         cam->stream = STREAM_INTERRUPT;
         timeout = wait_event_timeout(cam->wait_stream,
-                                     (cam->stream == STREAM_OFF) ||
-                                     (cam->state & DEV_DISCONNECTED),
-                                     ZC0301_URB_TIMEOUT);
+                                     (cam->stream == STREAM_OFF) ||
+                                     (cam->state & DEV_DISCONNECTED),
+                                     ZC0301_URB_TIMEOUT);
         if (cam->state & DEV_DISCONNECTED)
                 return -ENODEV;
         else if (cam->stream != STREAM_OFF) {
@@ -548,7 +548,7 @@ static int zc0301_stream_interrupt(struct zc0301_device* cam)
 
 static int
 zc0301_set_compression(struct zc0301_device* cam,
-                       struct v4l2_jpegcompression* compression)
+                       struct v4l2_jpegcompression* compression)
 {
         int r, err = 0;
 
@@ -670,8 +670,8 @@ static int zc0301_open(struct inode* inode, struct file* filp)
                 }
                 mutex_unlock(&cam->dev_mutex);
                 err = wait_event_interruptible_exclusive(cam->open,
-                                                  cam->state & DEV_DISCONNECTED
-                                                         || !cam->users);
+                                                  cam->state & DEV_DISCONNECTED
+                                                         || !cam->users);
                 if (err) {
                         up_read(&zc0301_disconnect);
                         return err;
@@ -802,12 +802,12 @@ zc0301_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
                         return -EAGAIN;
                 }
                 timeout = wait_event_interruptible_timeout
-                          ( cam->wait_frame,
-                            (!list_empty(&cam->outqueue)) ||
-                            (cam->state & DEV_DISCONNECTED) ||
-                            (cam->state & DEV_MISCONFIGURED),
-                            cam->module_param.frame_timeout *
-                            1000 * msecs_to_jiffies(1) );
+                          ( cam->wait_frame,
+                            (!list_empty(&cam->outqueue)) ||
+                            (cam->state & DEV_DISCONNECTED) ||
+                            (cam->state & DEV_MISCONFIGURED),
+                            cam->module_param.frame_timeout *
+                            1000 * msecs_to_jiffies(1) );
                 if (timeout < 0) {
                         mutex_unlock(&cam->fileop_mutex);
                         return timeout;
@@ -930,7 +930,7 @@ static int zc0301_mmap(struct file* filp, struct vm_area_struct *vma)
 {
         struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));
         unsigned long size = vma->vm_end - vma->vm_start,
-                      start = vma->vm_start;
+                      start = vma->vm_start;
         void *pos;
         u32 i;
 
@@ -998,13 +998,13 @@ zc0301_vidioc_querycap(struct zc0301_device* cam, void __user * arg)
                 .driver = "zc0301",
                 .version = ZC0301_MODULE_VERSION_CODE,
                 .capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |
-                                V4L2_CAP_STREAMING,
+                                V4L2_CAP_STREAMING,
         };
 
         strlcpy(cap.card, cam->v4ldev->name, sizeof(cap.card));
         if (usb_make_path(cam->usbdev, cap.bus_info, sizeof(cap.bus_info)) < 0)
                 strlcpy(cap.bus_info, cam->usbdev->dev.bus_id,
-                        sizeof(cap.bus_info));
+                        sizeof(cap.bus_info));
 
         if (copy_to_user(arg, &cap, sizeof(cap)))
                 return -EFAULT;
@@ -1337,7 +1337,7 @@ zc0301_vidioc_g_fmt(struct zc0301_device* cam, void __user * arg)
 
 static int
 zc0301_vidioc_try_s_fmt(struct zc0301_device* cam, unsigned int cmd,
-                        void __user * arg)
+                        void __user * arg)
 {
         struct zc0301_sensor* s = &cam->sensor;
         struct v4l2_format format;
@@ -1600,7 +1600,7 @@ zc0301_vidioc_qbuf(struct zc0301_device* cam, void __user * arg)
 
 static int
 zc0301_vidioc_dqbuf(struct zc0301_device* cam, struct file* filp,
-                    void __user * arg)
+                    void __user * arg)
 {
         struct v4l2_buffer b;
         struct zc0301_frame_t *f;
@@ -1619,12 +1619,12 @@ zc0301_vidioc_dqbuf(struct zc0301_device* cam, struct file* filp,
                 if (filp->f_flags & O_NONBLOCK)
                         return -EAGAIN;
                 timeout = wait_event_interruptible_timeout
-                          ( cam->wait_frame,
-                            (!list_empty(&cam->outqueue)) ||
-                            (cam->state & DEV_DISCONNECTED) ||
-                            (cam->state & DEV_MISCONFIGURED),
-                            cam->module_param.frame_timeout *
-                            1000 * msecs_to_jiffies(1) );
+                          ( cam->wait_frame,
+                            (!list_empty(&cam->outqueue)) ||
+                            (cam->state & DEV_DISCONNECTED) ||
+                            (cam->state & DEV_MISCONFIGURED),
+                            cam->module_param.frame_timeout *
+                            1000 * msecs_to_jiffies(1) );
                 if (timeout < 0)
                         return timeout;
                 if (cam->state & DEV_DISCONNECTED)
@@ -1748,7 +1748,7 @@ zc0301_vidioc_s_parm(struct zc0301_device* cam, void __user * arg)
 
 
 static int zc0301_ioctl_v4l2(struct inode* inode, struct file* filp,
-                             unsigned int cmd, void __user * arg)
+                             unsigned int cmd, void __user * arg)
 {
         struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));
 
@@ -1842,7 +1842,7 @@ static int zc0301_ioctl_v4l2(struct inode* inode, struct file* filp,
 
 
 static int zc0301_ioctl(struct inode* inode, struct file* filp,
-                        unsigned int cmd, unsigned long arg)
+                        unsigned int cmd, unsigned long arg)
 {
         struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));
         int err = 0;
@@ -1948,7 +1948,7 @@ zc0301_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         mutex_lock(&cam->dev_mutex);
 
         err = video_register_device(cam->v4ldev, VFL_TYPE_GRABBER,
-                                    video_nr[dev_nr]);
+                                    video_nr[dev_nr]);
         if (err) {
                 DBG(1, "V4L2 device registration failed");
                 if (err == -ENFILE && video_nr[dev_nr] == -1)
diff --git a/drivers/usb/media/zc0301_pas202bcb.c b/drivers/media/video/zc0301/zc0301_pas202bcb.c
index 9d282a22c1..eaadf02520 100644
--- a/drivers/usb/media/zc0301_pas202bcb.c
+++ b/drivers/media/video/zc0301/zc0301_pas202bcb.c
@@ -24,10 +24,10 @@
 
 /*
    NOTE: Sensor controls are disabled for now, becouse changing them while
-         streaming sometimes results in out-of-sync video frames. We'll use
-         the default initialization, until we know how to stop and start video
-         in the chip. However, the image quality still looks good under various
-         light conditions.
+         streaming sometimes results in out-of-sync video frames. We'll use
+         the default initialization, until we know how to stop and start video
+         in the chip. However, the image quality still looks good under various
+         light conditions.
 */
 
 #include <linux/delay.h>
@@ -165,7 +165,7 @@ static int pas202bcb_init(struct zc0301_device* cam)
 
 
 static int pas202bcb_get_ctrl(struct zc0301_device* cam,
-                              struct v4l2_control* ctrl)
+                              struct v4l2_control* ctrl)
 {
         switch (ctrl->id) {
         case V4L2_CID_EXPOSURE:
@@ -208,7 +208,7 @@ static int pas202bcb_get_ctrl(struct zc0301_device* cam,
 
 
 static int pas202bcb_set_ctrl(struct zc0301_device* cam,
-                              const struct v4l2_control* ctrl)
+                              const struct v4l2_control* ctrl)
 {
         int err = 0;
 
diff --git a/drivers/usb/media/zc0301_sensor.h b/drivers/media/video/zc0301/zc0301_sensor.h
index cf0965a81d..1f95c28b10 100644
--- a/drivers/usb/media/zc0301_sensor.h
+++ b/drivers/media/video/zc0301/zc0301_sensor.h
@@ -51,7 +51,7 @@ zc0301_attach_sensor(struct zc0301_device* cam, struct zc0301_sensor* sensor);
 
 #define ZC0301_USB_DEVICE(vend, prod, intclass)                               \
         .match_flags = USB_DEVICE_ID_MATCH_DEVICE |                           \
-                       USB_DEVICE_ID_MATCH_INT_CLASS,                         \
+                       USB_DEVICE_ID_MATCH_INT_CLASS,                         \
         .idVendor = (vend),                                                   \
         .idProduct = (prod),                                                  \
         .bInterfaceClass = (intclass)
@@ -92,7 +92,7 @@ struct zc0301_sensor {
         int (*init)(struct zc0301_device*);
         int (*get_ctrl)(struct zc0301_device*, struct v4l2_control* ctrl);
         int (*set_ctrl)(struct zc0301_device*,
-                        const struct v4l2_control* ctrl);
+                        const struct v4l2_control* ctrl);
         int (*set_crop)(struct zc0301_device*, const struct v4l2_rect* rect);
 
         /* Private */
diff --git a/drivers/media/video/zoran.h b/drivers/media/video/zoran.h
index ad04a12949..0166f555a5 100644
--- a/drivers/media/video/zoran.h
+++ b/drivers/media/video/zoran.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * zoran - Iomega Buz driver
  *
  * Copyright (C) 1999 Rainer Johanni <Rainer@Johanni.de>
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c
index b22dbb6d18..0a85c9e7fb 100644
--- a/drivers/media/video/zoran_card.c
+++ b/drivers/media/video/zoran_card.c
@@ -4,7 +4,7 @@
  * Media Labs LML33/LML33R10.
  *
  * This part handles card-specific data and detection
- * 
+ *
  * Copyright (C) 2000 Serguei Miridonov <mirsev@cicese.mx>
  *
  * Currently maintained by:
diff --git a/drivers/media/video/zoran_card.h b/drivers/media/video/zoran_card.h
index e5b6acd3ee..ad997c30be 100644
--- a/drivers/media/video/zoran_card.h
+++ b/drivers/media/video/zoran_card.h
@@ -4,7 +4,7 @@
  * Media Labs LML33/LML33R10.
  *
  * This part handles card-specific data and detection
- * 
+ *
  * Copyright (C) 2000 Serguei Miridonov <mirsev@cicese.mx>
  *
  * Currently maintained by:
diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran_device.c
index 4e15afdec4..c690b2ee88 100644
--- a/drivers/media/video/zoran_device.c
+++ b/drivers/media/video/zoran_device.c
@@ -4,7 +4,7 @@
  * Media Labs LML33/LML33R10.
  *
  * This part handles device access (PCI/I2C/codec/...)
- * 
+ *
  * Copyright (C) 2000 Serguei Miridonov <mirsev@cicese.mx>
  *
  * Currently maintained by:
@@ -492,7 +492,7 @@ zr36057_set_vfe (struct zoran              *zr,
         /* (Ronald) don't write this if overlay_mask = NULL */
         if (zr->overlay_mask) {
                 /* Write overlay clipping mask data, but don't enable overlay clipping */
-                /* RJ: since this makes only sense on the screen, we use 
+                /* RJ: since this makes only sense on the screen, we use
                  * zr->overlay_settings.width instead of video_width */
 
                 mask_line_size = (BUZ_MAX_WIDTH + 31) / 32;
@@ -819,12 +819,12 @@ zr36057_set_jpg (struct zoran          *zr,
         if (zr->card.vfe_pol.hsync_pol)
                 btor(ZR36057_VFEHCR_HSPol, ZR36057_VFEHCR);
         else
-                btand(~ZR36057_VFEHCR_HSPol, ZR36057_VFEHCR);           
+                btand(~ZR36057_VFEHCR_HSPol, ZR36057_VFEHCR);
         reg = ((tvn->HSyncStart) << ZR36057_HSP_HsyncStart) |
               (tvn->Wt << ZR36057_HSP_LineTot);
         btwrite(reg, ZR36057_HSP);
         reg = ((zr->jpg_settings.img_x +
-                tvn->HStart + 4) << ZR36057_FHAP_NAX) |
+                tvn->HStart + 4) << ZR36057_FHAP_NAX) |
               (zr->jpg_settings.img_width << ZR36057_FHAP_PAX);
         btwrite(reg, ZR36057_FHAP);
 
@@ -1272,15 +1272,15 @@ error_handler (struct zoran *zr,
         if (zr->JPEG_error != 1) {
                 /*
                  * First entry: error just happened during normal operation
-                 * 
+                 *
                  * In BUZ_MODE_MOTION_COMPRESS:
-                 * 
+                 *
                  * Possible glitch in TV signal. In this case we should
                  * stop the codec and wait for good quality signal before
                  * restarting it to avoid further problems
-                 * 
+                 *
                  * In BUZ_MODE_MOTION_DECOMPRESS:
-                 * 
+                 *
                  * Bad JPEG frame: we have to mark it as processed (codec crashed
                  * and was not able to do it itself), and to remove it from queue.
                  */
diff --git a/drivers/media/video/zoran_device.h b/drivers/media/video/zoran_device.h
index f315203d71..f19705cbdb 100644
--- a/drivers/media/video/zoran_device.h
+++ b/drivers/media/video/zoran_device.h
@@ -4,7 +4,7 @@
  * Media Labs LML33/LML33R10.
  *
  * This part handles card-specific data and detection
- * 
+ *
  * Copyright (C) 2000 Serguei Miridonov <mirsev@cicese.mx>
  *
  * Currently maintained by:
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index b2c6e01e39..b5a576a37f 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -94,7 +94,7 @@
                                 V4L2_CAP_VIDEO_CAPTURE |\
                                 V4L2_CAP_VIDEO_OUTPUT |\
                                 V4L2_CAP_VIDEO_OVERLAY \
-                              )
+                              )
 #endif
 
 #include <asm/byteorder.h>
@@ -165,7 +165,7 @@ const struct zoran_format zoran_formats[] = {
 #endif
                 .depth = 16,
                 .flags = ZORAN_FORMAT_CAPTURE |
-                         ZORAN_FORMAT_OVERLAY,
+                         ZORAN_FORMAT_OVERLAY,
         }, {
                 .name = "Hardware-encoded Motion-JPEG",
                 .palette = -1,
@@ -670,7 +670,7 @@ jpg_fbuffer_free (struct file *file)
                                                                        j]))));
                                 free_page((unsigned long)
                                           bus_to_virt
-                                                  (le32_to_cpu
+                                                  (le32_to_cpu
                                                    (fh->jpg_buffers.
                                                       buffer[i].
                                                       frag_tab[2 * j])));
@@ -1871,7 +1871,7 @@ zoran_v4l2_buffer_status (struct file        *file,
 
 static int
 zoran_set_norm (struct zoran *zr,
-                int           norm) /* VIDEO_MODE_* */
+                int           norm) /* VIDEO_MODE_* */
 {
         int norm_encoder, on;
 
@@ -2006,9 +2006,9 @@ zoran_set_input (struct zoran *zr,
 
 static int
 zoran_do_ioctl (struct inode *inode,
-                struct file  *file,
-                unsigned int  cmd,
-                void         *arg)
+                struct file  *file,
+                unsigned int  cmd,
+                void         *arg)
 {
         struct zoran_fh *fh = file->private_data;
         struct zoran *zr = fh->zr;
@@ -2095,7 +2095,7 @@ zoran_do_ioctl (struct inode *inode,
                 break;
 
                 /* RJ: the documentation at http://roadrunner.swansea.linux.org.uk/v4lapi.shtml says:
-                 * 
+                 *
                  * * "The VIDIOCSCHAN ioctl takes an integer argument and switches the capture to this input."
                  * *                                 ^^^^^^^
                  * * The famos BTTV driver has it implemented with a struct video_channel argument
diff --git a/drivers/media/video/zoran_procfs.c b/drivers/media/video/zoran_procfs.c
index f0d9b13c3c..a00fae9022 100644
--- a/drivers/media/video/zoran_procfs.c
+++ b/drivers/media/video/zoran_procfs.c
@@ -4,7 +4,7 @@
  * Media Labs LML33/LML33R10.
  *
  * This part handles the procFS entries (/proc/ZORAN[%d])
- * 
+ *
  * Copyright (C) 2000 Serguei Miridonov <mirsev@cicese.mx>
  *
  * Currently maintained by:
diff --git a/drivers/media/video/zoran_procfs.h b/drivers/media/video/zoran_procfs.h
index 8904fc9595..f2d5b1ba44 100644
--- a/drivers/media/video/zoran_procfs.h
+++ b/drivers/media/video/zoran_procfs.h
@@ -4,7 +4,7 @@
  * Media Labs LML33/LML33R10.
  *
  * This part handles card-specific data and detection
- * 
+ *
  * Copyright (C) 2000 Serguei Miridonov <mirsev@cicese.mx>
  *
  * Currently maintained by:
diff --git a/drivers/media/video/zr36016.c b/drivers/media/video/zr36016.c
index 10130ef67e..62f77584fb 100644
--- a/drivers/media/video/zr36016.c
+++ b/drivers/media/video/zr36016.c
@@ -34,7 +34,7 @@
 #include <linux/types.h>
 #include <linux/wait.h>
 
-/* includes for structures and defines regarding video 
+/* includes for structures and defines regarding video
    #include<linux/videodev.h> */
 
 /* I/O commands, error codes */
@@ -143,8 +143,8 @@ zr36016_readi (struct zr36016 *ptr,
 
 static void
 zr36016_writei (struct zr36016 *ptr,
-                u16             reg,
-                u8              value)
+                u16             reg,
+                u8              value)
 {
         dprintk(4, "%s: writing indirect 0x%02x to 0x%04x\n", ptr->name,
                 value, reg);
@@ -192,7 +192,7 @@ zr36016_basic_test (struct zr36016 *ptr)
                 dprintk(1, "\n");
         }
         // for testing just write 0, then the default value to a register and read
-        // it back in both cases 
+        // it back in both cases
         zr36016_writei(ptr, ZR016I_PAX_LO, 0x00);
         if (zr36016_readi(ptr, ZR016I_PAX_LO) != 0x0) {
                 dprintk(1,
@@ -232,17 +232,17 @@ zr36016_basic_test (struct zr36016 *ptr)
 static int zr36016_pushit (struct zr36016 *ptr,
                            u16             startreg,
                            u16             len,
-                           const char     *data)
+                           const char     *data)
 {
-        int i=0;
+        int i=0;
 
-        dprintk(4, "%s: write data block to 0x%04x (len=%d)\n",
+        dprintk(4, "%s: write data block to 0x%04x (len=%d)\n",
                 ptr->name, startreg,len);
-        while (i<len) {
-                zr36016_writei(ptr, startreg++,  data[i++]);
-        }
+        while (i<len) {
+                zr36016_writei(ptr, startreg++,  data[i++]);
+        }
 
-        return i;
+        return i;
 }
 #endif
 
diff --git a/drivers/media/video/zr36050.c b/drivers/media/video/zr36050.c
index 6699725be6..a6bbd12563 100644
--- a/drivers/media/video/zr36050.c
+++ b/drivers/media/video/zr36050.c
@@ -34,7 +34,7 @@
 #include <linux/types.h>
 #include <linux/wait.h>
 
-/* includes for structures and defines regarding video 
+/* includes for structures and defines regarding video
    #include<linux/videodev.h> */
 
 /* I/O commands, error codes */
@@ -171,7 +171,7 @@ zr36050_wait_end (struct zr36050 *ptr)
 /* =========================================================================
    Local helper function:
 
-   basic test of "connectivity", writes/reads to/from memory the SOF marker 
+   basic test of "connectivity", writes/reads to/from memory the SOF marker
    ========================================================================= */
 
 static int
@@ -218,9 +218,9 @@ zr36050_basic_test (struct zr36050 *ptr)
 
 static int
 zr36050_pushit (struct zr36050 *ptr,
-                u16             startreg,
-                u16             len,
-                const char     *data)
+                u16             startreg,
+                u16             len,
+                const char     *data)
 {
         int i = 0;
 
@@ -345,7 +345,7 @@ static const char zr36050_decimation_v[8] = { 1, 1, 1, 0, 0, 0, 0, 0 };
 /* ------------------------------------------------------------------------- */
 
 /* SOF (start of frame) segment depends on width, height and sampling ratio
-                         of each color component */
+                         of each color component */
 
 static int
 zr36050_set_sof (struct zr36050 *ptr)
@@ -376,8 +376,8 @@ zr36050_set_sof (struct zr36050 *ptr)
 
 /* ------------------------------------------------------------------------- */
 
-/* SOS (start of scan) segment depends on the used scan components 
-                        of each color component */
+/* SOS (start of scan) segment depends on the used scan components
+                        of each color component */
 
 static int
 zr36050_set_sos (struct zr36050 *ptr)
diff --git a/drivers/media/video/zr36057.h b/drivers/media/video/zr36057.h
index 159abfa034..54c9362aa9 100644
--- a/drivers/media/video/zr36057.h
+++ b/drivers/media/video/zr36057.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * zr36057.h - zr36057 register offsets
  *
  * Copyright (C) 1998 Dave Perks <dperks@ibm.net>
@@ -27,14 +27,14 @@
 #define ZR36057_VFEHCR          0x000   /* Video Front End, Horizontal Configuration Register */
 #define ZR36057_VFEHCR_HSPol            (1<<30)
 #define ZR36057_VFEHCR_HStart           10
-#define ZR36057_VFEHCR_HEnd             0
-#define ZR36057_VFEHCR_Hmask            0x3ff
+#define ZR36057_VFEHCR_HEnd             0
+#define ZR36057_VFEHCR_Hmask            0x3ff
 
 #define ZR36057_VFEVCR          0x004   /* Video Front End, Vertical Configuration Register */
 #define ZR36057_VFEVCR_VSPol            (1<<30)
 #define ZR36057_VFEVCR_VStart           10
-#define ZR36057_VFEVCR_VEnd             0
-#define ZR36057_VFEVCR_Vmask            0x3ff
+#define ZR36057_VFEVCR_VEnd             0
+#define ZR36057_VFEVCR_Vmask            0x3ff
 
 #define ZR36057_VFESPFR         0x008   /* Video Front End, Scaler and Pixel Format Register */
 #define ZR36057_VFESPFR_ExtFl           (1<<26)
diff --git a/drivers/media/video/zr36060.c b/drivers/media/video/zr36060.c
index d8dd003a7a..97c8f9b9dc 100644
--- a/drivers/media/video/zr36060.c
+++ b/drivers/media/video/zr36060.c
@@ -34,7 +34,7 @@
 #include <linux/types.h>
 #include <linux/wait.h>
 
-/* includes for structures and defines regarding video 
+/* includes for structures and defines regarding video
    #include<linux/videodev.h> */
 
 /* I/O commands, error codes */
@@ -173,7 +173,7 @@ zr36060_wait_end (struct zr36060 *ptr)
 /* =========================================================================
    Local helper function:
 
-   basic test of "connectivity", writes/reads to/from memory the SOF marker 
+   basic test of "connectivity", writes/reads to/from memory the SOF marker
    ========================================================================= */
 
 static int
@@ -208,9 +208,9 @@ zr36060_basic_test (struct zr36060 *ptr)
 
 static int
 zr36060_pushit (struct zr36060 *ptr,
-                u16             startreg,
-                u16             len,
-                const char     *data)
+                u16             startreg,
+                u16             len,
+                const char     *data)
 {
         int i = 0;
 
@@ -335,7 +335,7 @@ static const char zr36060_decimation_v[8] = { 1, 1, 1, 0, 0, 0, 0, 0 };
 /* ------------------------------------------------------------------------- */
 
 /* SOF (start of frame) segment depends on width, height and sampling ratio
-                         of each color component */
+                         of each color component */
 
 static int
 zr36060_set_sof (struct zr36060 *ptr)
@@ -367,8 +367,8 @@ zr36060_set_sof (struct zr36060 *ptr)
 
 /* ------------------------------------------------------------------------- */
 
-/* SOS (start of scan) segment depends on the used scan components 
-                        of each color component */
+/* SOS (start of scan) segment depends on the used scan components
+                        of each color component */
 
 static int
 zr36060_set_sos (struct zr36060 *ptr)
@@ -385,7 +385,7 @@ zr36060_set_sos (struct zr36060 *ptr)
         for (i = 0; i < NO_OF_COMPONENTS; i++) {
                 sos_data[5 + (i * 2)] = i;      // index
                 sos_data[6 + (i * 2)] = (zr36060_td[i] << 4) |
-                                        zr36060_ta[i]; // AC/DC tbl.sel.
+                                        zr36060_ta[i]; // AC/DC tbl.sel.
         }
         sos_data[2 + 1 + (2 * NO_OF_COMPONENTS) + 2] = 00;      // scan start
         sos_data[2 + 1 + (2 * NO_OF_COMPONENTS) + 3] = 0x3f;
@@ -999,7 +999,7 @@ zr36060_cleanup_module (void)
                 dprintk(1,
                         "zr36060: something's wrong - %d codecs left somehow.\n",
                         zr36060_codecs);
-        } 
+        }
 
         /* however, we can't just stay alive */
         videocodec_unregister(&zr36060_codec);
diff --git a/drivers/media/video/zr36120.c b/drivers/media/video/zr36120.c
index d4c633b8a7..6ac3b67400 100644
--- a/drivers/media/video/zr36120.c
+++ b/drivers/media/video/zr36120.c
@@ -70,10 +70,10 @@ MODULE_AUTHOR("Pauline Middelink <middelin@polyware.nl>");
 MODULE_DESCRIPTION("Zoran ZR36120 based framegrabber");
 MODULE_LICENSE("GPL");
 
-MODULE_PARM(triton1,"i");
-MODULE_PARM(cardtype,"1-" __MODULE_STRING(ZORAN_MAX) "i");
-MODULE_PARM(video_nr,"i");
-MODULE_PARM(vbi_nr,"i");
+module_param(triton1, uint, 0);
+module_param_array(cardtype, uint, NULL, 0);
+module_param(video_nr, int, 0);
+module_param(vbi_nr, int, 0);
 
 static int zoran_cards;
 static struct zoran zorans[ZORAN_MAX];
@@ -316,7 +316,7 @@ DEBUG(printk(CARD_DEBUG "%p added to queue\n",CARD,item));
                                 item->status = FBUFFER_BUSY;
                                 if (!lastitem)
                                         ztv->workqueue = item;
-                                else 
+                                else
                                         lastitem->next = item;
                                 lastitem = item;
                         }
@@ -516,7 +516,7 @@ DEBUG(printk(KERN_DEBUG "       %d: clip(%d,%d,%d,%d)\n", i,vp->x,vp->y,vp->widt
         zraor((ztv->vidInterlace*ystep)<<0,~ZORAN_OCR_MASKSTRIDE,ZORAN_OCR);
 }
 
-struct tvnorm 
+struct tvnorm
 {
         u16 Wt, Wa, Ht, Ha, HStart, VStart;
 };
@@ -660,7 +660,7 @@ DEBUG(printk(KERN_DEBUG "       Y: scale=0, start=%d, end=%d\n", Hstart, Hend));
                 int HorDcm = 64-X;
                 int hcrop1 = 2*(Wa-We)/4;
                 /*
-                 * BUGFIX: Juha Nurmela <junki@qn-lpr2-165.quicknet.inet.fi> 
+                 * BUGFIX: Juha Nurmela <junki@qn-lpr2-165.quicknet.inet.fi>
                  * found the solution to the color phase shift.
                  * See ChangeLog for the full explanation)
                  */
@@ -812,12 +812,12 @@ void zoran_close(struct video_device* dev)
 
         zoran_common_close(ztv);
 
-        /*
-         *      This is sucky but right now I can't find a good way to
-         *      be sure its safe to free the buffer. We wait 5-6 fields
-         *      which is more than sufficient to be sure.
-         */
-        msleep(100);                    /* Wait 1/10th of a second */
+        /*
+         *      This is sucky but right now I can't find a good way to
+         *      be sure its safe to free the buffer. We wait 5-6 fields
+         *      which is more than sufficient to be sure.
+         */
+        msleep(100);                    /* Wait 1/10th of a second */
 
         /* free the allocated framebuffer */
         bfree(ztv->fbuffer, ZORAN_MAX_FBUFSIZE);
@@ -1436,7 +1436,7 @@ int zoran_ioctl(struct video_device* dev, unsigned int cmd, void *arg)
 
          /* Why isn't this in the API?
           * And why doesn't it take a buffer number?
-         case BTTV_FIELDNR: 
+         case BTTV_FIELDNR:
          {
                 unsigned long v = ztv->lastfieldnr;
                 if (copy_to_user(arg,&v,sizeof(v)))
@@ -1557,12 +1557,12 @@ void vbi_close(struct video_device *dev)
 
         zoran_common_close(ztv);
 
-        /*
-         *      This is sucky but right now I can't find a good way to
-         *      be sure its safe to free the buffer. We wait 5-6 fields
-         *      which is more than sufficient to be sure.
-         */
-        msleep(100);                    /* Wait 1/10th of a second */
+        /*
+         *      This is sucky but right now I can't find a good way to
+         *      be sure its safe to free the buffer. We wait 5-6 fields
+         *      which is more than sufficient to be sure.
+         */
+        msleep(100);                    /* Wait 1/10th of a second */
 
         for (item=ztv->readinfo; item!=ztv->readinfo+ZORAN_VBI_BUFFERS; item++)
         {
@@ -1620,7 +1620,7 @@ long vbi_read(struct video_device* dev, char* buf, unsigned long count, int nonb
                         write_unlock_irq(&ztv->lock);
                         return -EWOULDBLOCK;
                 }
-                
+
                 /* mark the unused buffer as wanted */
                 unused->status = FBUFFER_BUSY;
                 unused->next = 0;
@@ -1671,7 +1671,7 @@ long vbi_read(struct video_device* dev, char* buf, unsigned long count, int nonb
         if (count == 2*19*2048) {
                 /*
                  * Extreme HACK, old VBI programs expect 2048 points
-                 * of data, and we only got 864 orso. Double each 
+                 * of data, and we only got 864 orso. Double each
                  * datapoint and clear the rest of the line.
                  * This way we have appear to have a
                  * sample_frequency of 29.5 Mc.
@@ -1956,7 +1956,7 @@ int __init init_zoran(int card)
                 zrand(~ZORAN_VDC_TRICOM, ZORAN_VDC);
 
         /* external FL determines TOP frame */
-        zror(ZORAN_VFEC_EXTFL, ZORAN_VFEC); 
+        zror(ZORAN_VFEC_EXTFL, ZORAN_VFEC);
 
         /* set HSpol */
         if (ztv->card->hsync_pos)
@@ -2012,7 +2012,7 @@ void release_zoran(int max)
         struct zoran *ztv;
         int i;
 
-        for (i=0;i<max; i++) 
+        for (i=0;i<max; i++)
         {
                 ztv = &zorans[i];
 
@@ -2029,7 +2029,7 @@ void release_zoran(int max)
 
                 /* free it */
                 free_irq(ztv->dev->irq,ztv);
- 
+
                 /* unregister i2c_bus */
                 i2c_unregister_bus((&ztv->i2c));
 
@@ -2050,7 +2050,7 @@ void __exit zr36120_exit(void)
 int __init zr36120_init(void)
 {
         int     card;
- 
+
         handle_chipset();
         zoran_cards = find_zoran();
         if (zoran_cards<0)
@@ -2063,7 +2063,7 @@ int __init zr36120_init(void)
                         /* only release the zorans we have registered */
                         release_zoran(card);
                         return -EIO;
-                } 
+                }
         }
         return 0;
 }
diff --git a/drivers/media/video/zr36120.h b/drivers/media/video/zr36120.h
index 571f8e84b5..a71e485b0f 100644
--- a/drivers/media/video/zr36120.h
+++ b/drivers/media/video/zr36120.h
@@ -1,4 +1,4 @@
-/* 
+/*
     zr36120.h - Zoran 36120/36125 based framegrabbers
 
     Copyright (C) 1998-1999 Pauline Middelink (middelin@polyware.nl)
@@ -89,7 +89,7 @@ struct vidinfo {
         ulong*  overlay;        /* kernel addr of overlay mask          */
 };
 
-struct zoran 
+struct zoran
 {
         struct video_device video_dev;
 #define CARD_DEBUG      KERN_DEBUG "%s(%lu): "
@@ -106,7 +106,7 @@ struct zoran
         uint            norm;           /* 0=PAL, 1=NTSC, 2=SECAM       */
         uint            tuner_freq;     /* Current freq in kHz          */
         struct video_picture picture;   /* Current picture params       */
-  
+
         /* videocard details */
         uint            swidth;         /* screen width                 */
         uint            sheight;        /* screen height                */
diff --git a/drivers/message/i2o/debug.c b/drivers/message/i2o/debug.c
index 40d4ea898d..5a6cca8e8c 100644
--- a/drivers/message/i2o/debug.c
+++ b/drivers/message/i2o/debug.c
@@ -419,58 +419,53 @@ void i2o_dump_hrt(struct i2o_controller *c)
                 d = (u8 *) (rows + 2);
                 state = p[1] << 8 | p[0];
 
-                printk(KERN_DEBUG "TID %04X:[", state & 0xFFF);
+                printk("TID %04X:[", state & 0xFFF);
                 state >>= 12;
                 if (state & (1 << 0))
-                        printk(KERN_DEBUG "H"); /* Hidden */
+                        printk("H");    /* Hidden */
                 if (state & (1 << 2)) {
-                        printk(KERN_DEBUG "P"); /* Present */
+                        printk("P");    /* Present */
                         if (state & (1 << 1))
-                                printk(KERN_DEBUG "C"); /* Controlled */
+                                printk("C");    /* Controlled */
                 }
                 if (state > 9)
-                        printk(KERN_DEBUG "*"); /* Hard */
+                        printk("*");    /* Hard */
 
-                printk(KERN_DEBUG "]:");
+                printk("]:");
 
                 switch (p[3] & 0xFFFF) {
                 case 0:
                         /* Adapter private bus - easy */
-                        printk(KERN_DEBUG
-                               "Local bus %d: I/O at 0x%04X Mem 0x%08X", p[2],
+                        printk("Local bus %d: I/O at 0x%04X Mem 0x%08X", p[2],
                                d[1] << 8 | d[0], *(u32 *) (d + 4));
                         break;
                 case 1:
                         /* ISA bus */
-                        printk(KERN_DEBUG
-                               "ISA %d: CSN %d I/O at 0x%04X Mem 0x%08X", p[2],
+                        printk("ISA %d: CSN %d I/O at 0x%04X Mem 0x%08X", p[2],
                                d[2], d[1] << 8 | d[0], *(u32 *) (d + 4));
                         break;
 
                 case 2: /* EISA bus */
-                        printk(KERN_DEBUG
-                               "EISA %d: Slot %d I/O at 0x%04X Mem 0x%08X",
+                        printk("EISA %d: Slot %d I/O at 0x%04X Mem 0x%08X",
                                p[2], d[3], d[1] << 8 | d[0], *(u32 *) (d + 4));
                         break;
 
                 case 3: /* MCA bus */
-                        printk(KERN_DEBUG
-                               "MCA %d: Slot %d I/O at 0x%04X Mem 0x%08X", p[2],
+                        printk("MCA %d: Slot %d I/O at 0x%04X Mem 0x%08X", p[2],
                                d[3], d[1] << 8 | d[0], *(u32 *) (d + 4));
                         break;
 
                 case 4: /* PCI bus */
-                        printk(KERN_DEBUG
-                               "PCI %d: Bus %d Device %d Function %d", p[2],
+                        printk("PCI %d: Bus %d Device %d Function %d", p[2],
                                d[2], d[1], d[0]);
                         break;
 
                 case 0x80:      /* Other */
                 default:
-                        printk(KERN_DEBUG "Unsupported bus type.");
+                        printk("Unsupported bus type.");
                         break;
                 }
-                printk(KERN_DEBUG "\n");
+                printk("\n");
                 rows += length;
         }
 }
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index b09fb63071..7d4c549778 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -1179,10 +1179,9 @@ static int __init i2o_block_init(void)
                 goto exit;
         }
 
-        i2o_blk_req_pool.pool = mempool_create(I2O_BLOCK_REQ_MEMPOOL_SIZE,
-                                               mempool_alloc_slab,
-                                               mempool_free_slab,
-                                               i2o_blk_req_pool.slab);
+        i2o_blk_req_pool.pool =
+                mempool_create_slab_pool(I2O_BLOCK_REQ_MEMPOOL_SIZE,
+                                         i2o_blk_req_pool.slab);
         if (!i2o_blk_req_pool.pool) {
                 osm_err("can't init request mempool\n");
                 rc = -ENOMEM;
diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
index 2a0c42b8cd..3d2e76eea9 100644
--- a/drivers/message/i2o/i2o_proc.c
+++ b/drivers/message/i2o/i2o_proc.c
@@ -56,7 +56,7 @@
 typedef struct _i2o_proc_entry_t {
         char *name;             /* entry name */
         mode_t mode;            /* mode */
-        struct file_operations *fops;   /* open function */
+        const struct file_operations *fops;     /* open function */
 } i2o_proc_entry;
 
 /* global I2O /proc/i2o entry */
diff --git a/drivers/misc/ibmasm/heartbeat.c b/drivers/misc/ibmasm/heartbeat.c
index f295401fac..7fd7a43e38 100644
--- a/drivers/misc/ibmasm/heartbeat.c
+++ b/drivers/misc/ibmasm/heartbeat.c
@@ -52,12 +52,13 @@ static struct notifier_block panic_notifier = { panic_happened, NULL, 1 };
 
 void ibmasm_register_panic_notifier(void)
 {
-        notifier_chain_register(&panic_notifier_list, &panic_notifier);
+        atomic_notifier_chain_register(&panic_notifier_list, &panic_notifier);
 }
 
 void ibmasm_unregister_panic_notifier(void)
 {
-        notifier_chain_unregister(&panic_notifier_list, &panic_notifier);
+        atomic_notifier_chain_unregister(&panic_notifier_list,
+                        &panic_notifier);
 }
 
 
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c
index 5c550fcac2..26a230b6ff 100644
--- a/drivers/misc/ibmasm/ibmasmfs.c
+++ b/drivers/misc/ibmasm/ibmasmfs.c
@@ -101,7 +101,7 @@ static struct super_operations ibmasmfs_s_ops = {
         .drop_inode     = generic_delete_inode,
 };
 
-static struct file_operations *ibmasmfs_dir_ops = &simple_dir_operations;
+static const struct file_operations *ibmasmfs_dir_ops = &simple_dir_operations;
 
 static struct file_system_type ibmasmfs_type = {
         .owner          = THIS_MODULE,
diff --git a/drivers/mmc/au1xmmc.c b/drivers/mmc/au1xmmc.c
index 8d84b045bc..85e89c77bd 100644
--- a/drivers/mmc/au1xmmc.c
+++ b/drivers/mmc/au1xmmc.c
@@ -87,7 +87,7 @@ struct au1xmmc_host *au1xmmc_hosts[AU1XMMC_CONTROLLER_COUNT];
 static int dma = 1;
 
 #ifdef MODULE
-MODULE_PARM(dma, "i");
+module_param(dma, bool, 0);
 MODULE_PARM_DESC(dma, "Use DMA engine for data transfers (0 = disabled)");
 #endif
 
diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig
index 205bb70833..0f6bb2e625 100644
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
@@ -25,9 +25,8 @@ config MTD_JEDECPROBE
           compatible with the Common Flash Interface, but will use the common
           CFI-targetted flash drivers for any chips which are identified which
           are in fact compatible in all but the probe method. This actually
-          covers most AMD/Fujitsu-compatible chips, and will shortly cover also
-          non-CFI Intel chips (that code is in MTD CVS and should shortly be sent
-          for inclusion in Linus' tree)
+          covers most AMD/Fujitsu-compatible chips and also non-CFI
+          Intel chips.
 
 config MTD_GEN_PROBE
         tristate
diff --git a/drivers/mtd/maps/dilnetpc.c b/drivers/mtd/maps/dilnetpc.c
index b51c757817..efb2216926 100644
--- a/drivers/mtd/maps/dilnetpc.c
+++ b/drivers/mtd/maps/dilnetpc.c
@@ -218,8 +218,8 @@ static void dnp_set_vpp(struct map_info *not_used, int on)
         {
                 if(--vpp_counter == 0)
                         setcsc(CSC_RBWR, getcsc(CSC_RBWR) | 0x4);
-                else if(vpp_counter < 0)
-                        BUG();
+                else
+                        BUG_ON(vpp_counter < 0);
         }
         spin_unlock_irq(&dnpc_spin);
 }
@@ -240,8 +240,8 @@ static void adnp_set_vpp(struct map_info *not_used, int on)
         {
                 if(--vpp_counter == 0)
                         setcsc(CSC_RBWR, getcsc(CSC_RBWR) | 0x8);
-                else if(vpp_counter < 0)
-                        BUG();
+                else
+                        BUG_ON(vpp_counter < 0);
         }
         spin_unlock_irq(&dnpc_spin);
 }
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index f0f8916da7..f988c817e1 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -28,7 +28,7 @@
 
 #ifdef CONFIG_MTD_DEBUG
 static int debug = CONFIG_MTD_DEBUG_VERBOSE;
-MODULE_PARM(debug, "i");
+module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, "Set Debug Level 0=quiet, 5=noisy");
 #undef DEBUG
 #define DEBUG(n, format, arg...) \
@@ -89,17 +89,17 @@ static int mem_type;
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Simon Evans <spse@secret.org.uk>");
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_PARM(bankwidth, "i");
+module_param(bankwidth, int, 0);
 MODULE_PARM_DESC(bankwidth, "Set bankwidth (1=8 bit, 2=16 bit, default=2)");
-MODULE_PARM(mem_speed, "i");
+module_param(mem_speed, int, 0);
 MODULE_PARM_DESC(mem_speed, "Set memory access speed in ns");
-MODULE_PARM(force_size, "i");
+module_param(force_size, int, 0);
 MODULE_PARM_DESC(force_size, "Force size of card in MiB (1-64)");
-MODULE_PARM(setvpp, "i");
+module_param(setvpp, int, 0);
 MODULE_PARM_DESC(setvpp, "Set Vpp (0=Never, 1=On writes, 2=Always on, default=0)");
-MODULE_PARM(vpp, "i");
+module_param(vpp, int, 0);
 MODULE_PARM_DESC(vpp, "Vpp value in 1/10ths eg 33=3.3V 120=12V (Dangerous)");
-MODULE_PARM(mem_type, "i");
+module_param(mem_type, int, 0);
 MODULE_PARM_DESC(mem_type, "Set Memory type (0=Flash, 1=RAM, 2=ROM, default=0)");
 
 
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index 7f3ff500b6..840dd66ce2 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -450,8 +450,7 @@ int deregister_mtd_blktrans(struct mtd_blktrans_ops *tr)
 
         kfree(tr->blkcore_priv);
 
-        if (!list_empty(&tr->devs))
-                BUG();
+        BUG_ON(!list_empty(&tr->devs));
         return 0;
 }
 
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index b1bf8c411d..9af840364a 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -477,8 +477,7 @@ static int concat_erase(struct mtd_info *mtd, struct erase_info *instr)
         }
 
         /* must never happen since size limit has been verified above */
-        if (i >= concat->num_subdev)
-                BUG();
+        BUG_ON(i >= concat->num_subdev);
 
         /* now do the erase: */
         err = 0;
@@ -500,8 +499,7 @@ static int concat_erase(struct mtd_info *mtd, struct erase_info *instr)
                 if ((err = concat_dev_erase(subdev, erase))) {
                         /* sanity check: should never happen since
                          * block alignment has been checked above */
-                        if (err == -EINVAL)
-                                BUG();
+                        BUG_ON(err == -EINVAL);
                         if (erase->fail_addr != 0xffffffff)
                                 instr->fail_addr = erase->fail_addr + offset;
                         break;
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 5d11a06ecb..70f63891b1 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -196,8 +196,6 @@
 
 
 #define DRV_NAME        "3c59x"
-#define DRV_VERSION     "LK1.1.19"
-#define DRV_RELDATE     "10 Nov 2002"
 
 
 
@@ -275,10 +273,8 @@ static char version[] __devinitdata =
 DRV_NAME ": Donald Becker and others. www.scyld.com/network/vortex.html\n";
 
 MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
-MODULE_DESCRIPTION("3Com 3c59x/3c9xx ethernet driver "
-                                        DRV_VERSION " " DRV_RELDATE);
+MODULE_DESCRIPTION("3Com 3c59x/3c9xx ethernet driver ");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(DRV_VERSION);
 
 
 /* Operational parameter that usually are not changed. */
@@ -904,7 +900,6 @@ static void acpi_set_WOL(struct net_device *dev);
 static struct ethtool_ops vortex_ethtool_ops;
 static void set_8021q_mode(struct net_device *dev, int enable);
 
-
 /* This driver uses 'options' to pass the media type, full-duplex flag, etc. */
 /* Option count limit only -- unlimited interfaces are supported. */
 #define MAX_UNITS 8
@@ -919,8 +914,6 @@ static int global_full_duplex = -1;
 static int global_enable_wol = -1;
 static int global_use_mmio = -1;
 
-/* #define dev_alloc_skb dev_alloc_skb_debug */
-
 /* Variables to work-around the Compaq PCI BIOS32 problem. */
 static int compaq_ioaddr, compaq_irq, compaq_device_id = 0x5900;
 static struct net_device *compaq_net_device;
@@ -976,7 +969,7 @@ static void poll_vortex(struct net_device *dev)
 
 #ifdef CONFIG_PM
 
-static int vortex_suspend (struct pci_dev *pdev, pm_message_t state)
+static int vortex_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
 
@@ -994,7 +987,7 @@ static int vortex_suspend (struct pci_dev *pdev, pm_message_t state)
         return 0;
 }
 
-static int vortex_resume (struct pci_dev *pdev)
+static int vortex_resume(struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
         struct vortex_private *vp = netdev_priv(dev);
@@ -1027,8 +1020,8 @@ static struct eisa_device_id vortex_eisa_ids[] = {
         { "" }
 };
 
-static int vortex_eisa_probe (struct device *device);
-static int vortex_eisa_remove (struct device *device);
+static int vortex_eisa_probe(struct device *device);
+static int vortex_eisa_remove(struct device *device);
 
 static struct eisa_driver vortex_eisa_driver = {
         .id_table = vortex_eisa_ids,
@@ -1039,12 +1032,12 @@ static struct eisa_driver vortex_eisa_driver = {
         }
 };
 
-static int vortex_eisa_probe (struct device *device)
+static int vortex_eisa_probe(struct device *device)
 {
         void __iomem *ioaddr;
         struct eisa_device *edev;
 
-        edev = to_eisa_device (device);
+        edev = to_eisa_device(device);
 
         if (!request_region(edev->base_addr, VORTEX_TOTAL_SIZE, DRV_NAME))
                 return -EBUSY;
@@ -1053,7 +1046,7 @@ static int vortex_eisa_probe (struct device *device)
 
         if (vortex_probe1(device, ioaddr, ioread16(ioaddr + 0xC88) >> 12,
                                           edev->id.driver_data, vortex_cards_found)) {
-                release_region (edev->base_addr, VORTEX_TOTAL_SIZE);
+                release_region(edev->base_addr, VORTEX_TOTAL_SIZE);
                 return -ENODEV;
         }
 
@@ -1062,15 +1055,15 @@ static int vortex_eisa_probe (struct device *device)
         return 0;
 }
 
-static int vortex_eisa_remove (struct device *device)
+static int vortex_eisa_remove(struct device *device)
 {
         struct eisa_device *edev;
         struct net_device *dev;
         struct vortex_private *vp;
         void __iomem *ioaddr;
 
-        edev = to_eisa_device (device);
-        dev = eisa_get_drvdata (edev);
+        edev = to_eisa_device(device);
+        dev = eisa_get_drvdata(edev);
 
         if (!dev) {
                 printk("vortex_eisa_remove called for Compaq device!\n");
@@ -1080,30 +1073,34 @@ static int vortex_eisa_remove (struct device *device)
         vp = netdev_priv(dev);
         ioaddr = vp->ioaddr;
         
-        unregister_netdev (dev);
-        iowrite16 (TotalReset|0x14, ioaddr + EL3_CMD);
-        release_region (dev->base_addr, VORTEX_TOTAL_SIZE);
+        unregister_netdev(dev);
+        iowrite16(TotalReset|0x14, ioaddr + EL3_CMD);
+        release_region(dev->base_addr, VORTEX_TOTAL_SIZE);
 
-        free_netdev (dev);
+        free_netdev(dev);
         return 0;
 }
 #endif
 
 /* returns count found (>= 0), or negative on error */
-static int __init vortex_eisa_init (void)
+static int __init vortex_eisa_init(void)
 {
         int eisa_found = 0;
         int orig_cards_found = vortex_cards_found;
 
 #ifdef CONFIG_EISA
-        if (eisa_driver_register (&vortex_eisa_driver) >= 0) {
-                        /* Because of the way EISA bus is probed, we cannot assume
-                         * any device have been found when we exit from
-                         * eisa_driver_register (the bus root driver may not be
-                         * initialized yet). So we blindly assume something was
-                         * found, and let the sysfs magic happend... */
-                        
-                        eisa_found = 1;
+        int err;
+
+        err = eisa_driver_register (&vortex_eisa_driver);
+        if (!err) {
+                /*
+                 * Because of the way EISA bus is probed, we cannot assume
+                 * any device have been found when we exit from
+                 * eisa_driver_register (the bus root driver may not be
+                 * initialized yet). So we blindly assume something was
+                 * found, and let the sysfs magic happend...
+                 */
+                eisa_found = 1;
         }
 #endif
         
@@ -1117,7 +1114,7 @@ static int __init vortex_eisa_init (void)
 }
 
 /* returns count (>= 0), or negative on error */
-static int __devinit vortex_init_one (struct pci_dev *pdev,
+static int __devinit vortex_init_one(struct pci_dev *pdev,
                                       const struct pci_device_id *ent)
 {
         int rc, unit, pci_bar;
@@ -1125,7 +1122,7 @@ static int __devinit vortex_init_one (struct pci_dev *pdev,
         void __iomem *ioaddr;
 
         /* wake up and enable device */         
-        rc = pci_enable_device (pdev);
+        rc = pci_enable_device(pdev);
         if (rc < 0)
                 goto out;
 
@@ -1147,7 +1144,7 @@ static int __devinit vortex_init_one (struct pci_dev *pdev,
         rc = vortex_probe1(&pdev->dev, ioaddr, pdev->irq,
                            ent->driver_data, unit);
         if (rc < 0) {
-                pci_disable_device (pdev);
+                pci_disable_device(pdev);
                 goto out;
         }
 
@@ -1232,7 +1229,7 @@ static int __devinit vortex_probe1(struct device *gendev,
         if (print_info)
                 printk (KERN_INFO "See Documentation/networking/vortex.txt\n");
 
-        printk(KERN_INFO "%s: 3Com %s %s at %p. Vers " DRV_VERSION "\n",
+        printk(KERN_INFO "%s: 3Com %s %s at %p.\n",
                print_name,
                pdev ? "PCI" : "EISA",
                vci->name,
@@ -1262,7 +1259,7 @@ static int __devinit vortex_probe1(struct device *gendev,
 
                 /* enable bus-mastering if necessary */         
                 if (vci->flags & PCI_USES_MASTER)
-                        pci_set_master (pdev);
+                        pci_set_master(pdev);
 
                 if (vci->drv_flags & IS_VORTEX) {
                         u8 pci_latency;
@@ -1306,7 +1303,7 @@ static int __devinit vortex_probe1(struct device *gendev,
         if (pdev)
                 pci_set_drvdata(pdev, dev);
         if (edev)
-                eisa_set_drvdata (edev, dev);
+                eisa_set_drvdata(edev, dev);
 
         vp->media_override = 7;
         if (option >= 0) {
@@ -1331,7 +1328,7 @@ static int __devinit vortex_probe1(struct device *gendev,
                         vp->enable_wol = 1;
         }
 
-        vp->force_fd = vp->full_duplex;
+        vp->mii.force_media = vp->full_duplex;
         vp->options = option;
         /* Read the station address from the EEPROM. */
         EL3WINDOW(0);
@@ -1621,6 +1618,46 @@ issue_and_wait(struct net_device *dev, int cmd)
 }
 
 static void
+vortex_set_duplex(struct net_device *dev)
+{
+        struct vortex_private *vp = netdev_priv(dev);
+        void __iomem *ioaddr = vp->ioaddr;
+
+        printk(KERN_INFO "%s:  setting %s-duplex.\n",
+                dev->name, (vp->full_duplex) ? "full" : "half");
+
+        EL3WINDOW(3);
+        /* Set the full-duplex bit. */
+        iowrite16(((vp->info1 & 0x8000) || vp->full_duplex ? 0x20 : 0) |
+                        (vp->large_frames ? 0x40 : 0) |
+                        ((vp->full_duplex && vp->flow_ctrl && vp->partner_flow_ctrl) ?
+                                        0x100 : 0),
+                        ioaddr + Wn3_MAC_Ctrl);
+
+        issue_and_wait(dev, TxReset);
+        /*
+         * Don't reset the PHY - that upsets autonegotiation during DHCP operations.
+         */
+        issue_and_wait(dev, RxReset|0x04);
+}
+
+static void vortex_check_media(struct net_device *dev, unsigned int init)
+{
+        struct vortex_private *vp = netdev_priv(dev);
+        unsigned int ok_to_print = 0;
+
+        if (vortex_debug > 3)
+                ok_to_print = 1;
+
+        if (mii_check_media(&vp->mii, ok_to_print, init)) {
+                vp->full_duplex = vp->mii.full_duplex;
+                vortex_set_duplex(dev);
+        } else if (init) {
+                vortex_set_duplex(dev);
+        }
+}
+
+static void
 vortex_up(struct net_device *dev)
 {
         struct vortex_private *vp = netdev_priv(dev);
@@ -1680,53 +1717,20 @@ vortex_up(struct net_device *dev)
                 printk(KERN_DEBUG "%s: Initial media type %s.\n",
                            dev->name, media_tbl[dev->if_port].name);
 
-        vp->full_duplex = vp->force_fd;
+        vp->full_duplex = vp->mii.force_media;
         config = BFINS(config, dev->if_port, 20, 4);
         if (vortex_debug > 6)
                 printk(KERN_DEBUG "vortex_up(): writing 0x%x to InternalConfig\n", config);
         iowrite32(config, ioaddr + Wn3_Config);
 
+        netif_carrier_off(dev);
         if (dev->if_port == XCVR_MII || dev->if_port == XCVR_NWAY) {
-                int mii_reg1, mii_reg5;
                 EL3WINDOW(4);
-                /* Read BMSR (reg1) only to clear old status. */
-                mii_reg1 = mdio_read(dev, vp->phys[0], MII_BMSR);
-                mii_reg5 = mdio_read(dev, vp->phys[0], MII_LPA);
-                if (mii_reg5 == 0xffff  ||  mii_reg5 == 0x0000) {
-                        netif_carrier_off(dev); /* No MII device or no link partner report */
-                } else {
-                        mii_reg5 &= vp->advertising;
-                        if ((mii_reg5 & 0x0100) != 0    /* 100baseTx-FD */
-                                 || (mii_reg5 & 0x00C0) == 0x0040) /* 10T-FD, but not 100-HD */
-                        vp->full_duplex = 1;
-                        netif_carrier_on(dev);
-                }
-                vp->partner_flow_ctrl = ((mii_reg5 & 0x0400) != 0);
-                if (vortex_debug > 1)
-                        printk(KERN_INFO "%s: MII #%d status %4.4x, link partner capability %4.4x,"
-                                   " info1 %04x, setting %s-duplex.\n",
-                                        dev->name, vp->phys[0],
-                                        mii_reg1, mii_reg5,
-                                        vp->info1, ((vp->info1 & 0x8000) || vp->full_duplex) ? "full" : "half");
-                EL3WINDOW(3);
-        }
-
-        /* Set the full-duplex bit. */
-        iowrite16(      ((vp->info1 & 0x8000) || vp->full_duplex ? 0x20 : 0) |
-                        (vp->large_frames ? 0x40 : 0) |
-                        ((vp->full_duplex && vp->flow_ctrl && vp->partner_flow_ctrl) ? 0x100 : 0),
-                        ioaddr + Wn3_MAC_Ctrl);
-
-        if (vortex_debug > 1) {
-                printk(KERN_DEBUG "%s: vortex_up() InternalConfig %8.8x.\n",
-                        dev->name, config);
+                vortex_check_media(dev, 1);
         }
+        else
+                vortex_set_duplex(dev);
 
-        issue_and_wait(dev, TxReset);
-        /*
-         * Don't reset the PHY - that upsets autonegotiation during DHCP operations.
-         */
-        issue_and_wait(dev, RxReset|0x04);
 
         iowrite16(SetStatusEnb | 0x00, ioaddr + EL3_CMD);
 
@@ -1801,7 +1805,6 @@ vortex_up(struct net_device *dev)
         set_8021q_mode(dev, 1);
         iowrite16(StatsEnable, ioaddr + EL3_CMD); /* Turn on statistics. */
 
-//      issue_and_wait(dev, SetTxStart|0x07ff);
         iowrite16(RxEnable, ioaddr + EL3_CMD); /* Enable the receiver. */
         iowrite16(TxEnable, ioaddr + EL3_CMD); /* Enable transmitter. */
         /* Allow status bits to be seen. */
@@ -1888,7 +1891,7 @@ vortex_timer(unsigned long data)
         void __iomem *ioaddr = vp->ioaddr;
         int next_tick = 60*HZ;
         int ok = 0;
-        int media_status, mii_status, old_window;
+        int media_status, old_window;
 
         if (vortex_debug > 2) {
                 printk(KERN_DEBUG "%s: Media selection timer tick happened, %s.\n",
@@ -1896,8 +1899,6 @@ vortex_timer(unsigned long data)
                 printk(KERN_DEBUG "dev->watchdog_timeo=%d\n", dev->watchdog_timeo);
         }
 
-        if (vp->medialock)
-                goto leave_media_alone;
         disable_irq(dev->irq);
         old_window = ioread16(ioaddr + EL3_CMD) >> 13;
         EL3WINDOW(4);
@@ -1920,44 +1921,9 @@ vortex_timer(unsigned long data)
                 break;
         case XCVR_MII: case XCVR_NWAY:
                 {
-                        spin_lock_bh(&vp->lock);
-                        mii_status = mdio_read(dev, vp->phys[0], MII_BMSR);
-                        if (!(mii_status & BMSR_LSTATUS)) {
-                                /* Re-read to get actual link status */
-                                mii_status = mdio_read(dev, vp->phys[0], MII_BMSR);
-                        }
                         ok = 1;
-                        if (vortex_debug > 2)
-                                printk(KERN_DEBUG "%s: MII transceiver has status %4.4x.\n",
-                                        dev->name, mii_status);
-                        if (mii_status & BMSR_LSTATUS) {
-                                int mii_reg5 = mdio_read(dev, vp->phys[0], MII_LPA);
-                                if (! vp->force_fd  &&  mii_reg5 != 0xffff) {
-                                        int duplex;
-
-                                        mii_reg5 &= vp->advertising;
-                                        duplex = (mii_reg5&0x0100) || (mii_reg5 & 0x01C0) == 0x0040;
-                                        if (vp->full_duplex != duplex) {
-                                                vp->full_duplex = duplex;
-                                                printk(KERN_INFO "%s: Setting %s-duplex based on MII "
-                                                        "#%d link partner capability of %4.4x.\n",
-                                                        dev->name, vp->full_duplex ? "full" : "half",
-                                                        vp->phys[0], mii_reg5);
-                                                /* Set the full-duplex bit. */
-                                                EL3WINDOW(3);
-                                                iowrite16(      (vp->full_duplex ? 0x20 : 0) |
-                                                                (vp->large_frames ? 0x40 : 0) |
-                                                                ((vp->full_duplex && vp->flow_ctrl && vp->partner_flow_ctrl) ? 0x100 : 0),
-                                                                ioaddr + Wn3_MAC_Ctrl);
-                                                if (vortex_debug > 1)
-                                                        printk(KERN_DEBUG "Setting duplex in Wn3_MAC_Ctrl\n");
-                                                /* AKPM: bug: should reset Tx and Rx after setting Duplex.  Page 180 */
-                                        }
-                                }
-                                netif_carrier_on(dev);
-                        } else {
-                                netif_carrier_off(dev);
-                        }
+                        spin_lock_bh(&vp->lock);
+                        vortex_check_media(dev, 0);
                         spin_unlock_bh(&vp->lock);
                 }
                 break;
@@ -1967,7 +1933,14 @@ vortex_timer(unsigned long data)
                                  dev->name, media_tbl[dev->if_port].name, media_status);
                 ok = 1;
         }
-        if ( ! ok) {
+
+        if (!netif_carrier_ok(dev))
+                next_tick = 5*HZ;
+
+        if (vp->medialock)
+                goto leave_media_alone;
+
+        if (!ok) {
                 unsigned int config;
 
                 do {
@@ -2000,14 +1973,14 @@ vortex_timer(unsigned long data)
                         printk(KERN_DEBUG "wrote 0x%08x to Wn3_Config\n", config);
                 /* AKPM: FIXME: Should reset Rx & Tx here.  P60 of 3c90xc.pdf */
         }
-        EL3WINDOW(old_window);
-        enable_irq(dev->irq);
 
 leave_media_alone:
         if (vortex_debug > 2)
           printk(KERN_DEBUG "%s: Media selection timer finished, %s.\n",
                          dev->name, media_tbl[dev->if_port].name);
 
+        EL3WINDOW(old_window);
+        enable_irq(dev->irq);
         mod_timer(&vp->timer, RUN_AT(next_tick));
         if (vp->deferred)
                 iowrite16(FakeIntr, ioaddr + EL3_CMD);
@@ -2202,7 +2175,7 @@ vortex_start_xmit(struct sk_buff *skb, struct net_device *dev)
         if (vp->bus_master) {
                 /* Set the bus-master controller to transfer the packet. */
                 int len = (skb->len + 3) & ~3;
-                iowrite32(      vp->tx_skb_dma = pci_map_single(VORTEX_PCI(vp), skb->data, len, PCI_DMA_TODEVICE),
+                iowrite32(vp->tx_skb_dma = pci_map_single(VORTEX_PCI(vp), skb->data, len, PCI_DMA_TODEVICE),
                                 ioaddr + Wn7_MasterAddr);
                 iowrite16(len, ioaddr + Wn7_MasterLen);
                 vp->tx_skb = skb;
@@ -2979,20 +2952,6 @@ static int vortex_nway_reset(struct net_device *dev)
         return rc;
 }
 
-static u32 vortex_get_link(struct net_device *dev)
-{
-        struct vortex_private *vp = netdev_priv(dev);
-        void __iomem *ioaddr = vp->ioaddr;
-        unsigned long flags;
-        int rc;
-
-        spin_lock_irqsave(&vp->lock, flags);
-        EL3WINDOW(4);
-        rc = mii_link_ok(&vp->mii);
-        spin_unlock_irqrestore(&vp->lock, flags);
-        return rc;
-}
-
 static int vortex_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct vortex_private *vp = netdev_priv(dev);
@@ -3073,7 +3032,6 @@ static void vortex_get_drvinfo(struct net_device *dev,
         struct vortex_private *vp = netdev_priv(dev);
 
         strcpy(info->driver, DRV_NAME);
-        strcpy(info->version, DRV_VERSION);
         if (VORTEX_PCI(vp)) {
                 strcpy(info->bus_info, pci_name(VORTEX_PCI(vp)));
         } else {
@@ -3094,9 +3052,9 @@ static struct ethtool_ops vortex_ethtool_ops = {
         .get_stats_count        = vortex_get_stats_count,
         .get_settings           = vortex_get_settings,
         .set_settings           = vortex_set_settings,
-        .get_link               = vortex_get_link,
+        .get_link               = ethtool_op_get_link,
         .nway_reset             = vortex_nway_reset,
-        .get_perm_addr                  = ethtool_op_get_perm_addr,
+        .get_perm_addr          = ethtool_op_get_perm_addr,
 };
 
 #ifdef CONFIG_PCI
@@ -3297,7 +3255,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int val
         }
         return;
 }
-
+
 /* ACPI: Advanced Configuration and Power Interface. */
 /* Set Wake-On-LAN mode and put the board into D3 (power-down) state. */
 static void acpi_set_WOL(struct net_device *dev)
@@ -3321,7 +3279,7 @@ static void acpi_set_WOL(struct net_device *dev)
 }
 
 
-static void __devexit vortex_remove_one (struct pci_dev *pdev)
+static void __devexit vortex_remove_one(struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
         struct vortex_private *vp;
@@ -3377,7 +3335,7 @@ static int vortex_have_pci;
 static int vortex_have_eisa;
 
 
-static int __init vortex_init (void)
+static int __init vortex_init(void)
 {
         int pci_rc, eisa_rc;
 
@@ -3393,14 +3351,14 @@ static int __init vortex_init (void)
 }
 
 
-static void __exit vortex_eisa_cleanup (void)
+static void __exit vortex_eisa_cleanup(void)
 {
         struct vortex_private *vp;
         void __iomem *ioaddr;
 
 #ifdef CONFIG_EISA
         /* Take care of the EISA devices */
-        eisa_driver_unregister (&vortex_eisa_driver);
+        eisa_driver_unregister(&vortex_eisa_driver);
 #endif
         
         if (compaq_net_device) {
@@ -3408,33 +3366,24 @@ static void __exit vortex_eisa_cleanup (void)
                 ioaddr = ioport_map(compaq_net_device->base_addr,
                                     VORTEX_TOTAL_SIZE);
 
-                unregister_netdev (compaq_net_device);
-                iowrite16 (TotalReset, ioaddr + EL3_CMD);
+                unregister_netdev(compaq_net_device);
+                iowrite16(TotalReset, ioaddr + EL3_CMD);
                 release_region(compaq_net_device->base_addr,
                                VORTEX_TOTAL_SIZE);
 
-                free_netdev (compaq_net_device);
+                free_netdev(compaq_net_device);
         }
 }
 
 
-static void __exit vortex_cleanup (void)
+static void __exit vortex_cleanup(void)
 {
         if (vortex_have_pci)
-                pci_unregister_driver (&vortex_driver);
+                pci_unregister_driver(&vortex_driver);
         if (vortex_have_eisa)
-                vortex_eisa_cleanup ();
+                vortex_eisa_cleanup();
 }
 
 
 module_init(vortex_init);
 module_exit(vortex_cleanup);
-
-
-/*
- * Local variables:
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index 8e538a6d7d..79bb56b8dc 100644
--- a/drivers/net/a2065.c
+++ b/drivers/net/a2065.c
@@ -829,7 +829,7 @@ static void __devexit a2065_remove_one(struct zorro_dev *z)
 
 static int __init a2065_init_module(void)
 {
-        return zorro_module_init(&a2065_driver);
+        return zorro_register_driver(&a2065_driver);
 }
 
 static void __exit a2065_cleanup_module(void)
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index 9fe93acfc8..d1b6b1f794 100644
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -864,7 +864,7 @@ static void __devexit ariadne_remove_one(struct zorro_dev *z)
 
 static int __init ariadne_init_module(void)
 {
-    return zorro_module_init(&ariadne_driver);
+    return zorro_register_driver(&ariadne_driver);
 }
 
 static void __exit ariadne_cleanup_module(void)
diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig
index 625184b65e..77fe20dbea 100644
--- a/drivers/net/arm/Kconfig
+++ b/drivers/net/arm/Kconfig
@@ -31,3 +31,11 @@ config ARM_ETHERH
         help
           If you have an Acorn system with one of these network cards, you
           should say Y to this option if you wish to use it with Linux.
+
+config ARM_AT91_ETHER
+        tristate "AT91RM9200 Ethernet support"
+        depends on NET_ETHERNET && ARM && ARCH_AT91RM9200
+        select MII
+        help
+          If you wish to compile a kernel for the AT91RM9200 and enable
+          ethernet support, then you should always answer Y to this.
diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile
index bc263edf06..42c95b79c2 100644
--- a/drivers/net/arm/Makefile
+++ b/drivers/net/arm/Makefile
@@ -7,3 +7,4 @@ obj-$(CONFIG_ARM_AM79C961A)	+= am79c961a.o
 obj-$(CONFIG_ARM_ETHERH)        += etherh.o
 obj-$(CONFIG_ARM_ETHER3)        += ether3.o
 obj-$(CONFIG_ARM_ETHER1)        += ether1.o
+obj-$(CONFIG_ARM_AT91_ETHER)    += at91_ether.o
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
new file mode 100644
index 0000000000..5503dc8a66
--- /dev/null
+++ b/drivers/net/arm/at91_ether.c
@@ -0,0 +1,1110 @@
+/*
+ * Ethernet driver for the Atmel AT91RM9200 (Thunder)
+ *
+ *  Copyright (C) 2003 SAN People (Pty) Ltd
+ *
+ * Based on an earlier Atmel EMAC macrocell driver by Atmel and Lineo Inc.
+ * Initial version by Rick Bronson 01/11/2003
+ *
+ * Intel LXT971A PHY support by Christopher Bahns & David Knickerbocker
+ *   (Polaroid Corporation)
+ *
+ * Realtek RTL8201(B)L PHY support by Roman Avramenko <roman@imsystems.ru>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/config.h>
+#include <linux/mii.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <linux/dma-mapping.h>
+#include <linux/ethtool.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+
+#include <asm/io.h>
+#include <asm/uaccess.h>
+#include <asm/mach-types.h>
+
+#include <asm/arch/at91rm9200_emac.h>
+#include <asm/arch/gpio.h>
+#include <asm/arch/board.h>
+
+#include "at91_ether.h"
+
+#define DRV_NAME        "at91_ether"
+#define DRV_VERSION     "1.0"
+
+static struct net_device *at91_dev;
+static struct clk *ether_clk;
+
+/* ..................................................................... */
+
+/*
+ * Read from a EMAC register.
+ */
+static inline unsigned long at91_emac_read(unsigned int reg)
+{
+        void __iomem *emac_base = (void __iomem *)AT91_VA_BASE_EMAC;
+
+        return __raw_readl(emac_base + reg);
+}
+
+/*
+ * Write to a EMAC register.
+ */
+static inline void at91_emac_write(unsigned int reg, unsigned long value)
+{
+        void __iomem *emac_base = (void __iomem *)AT91_VA_BASE_EMAC;
+
+        __raw_writel(value, emac_base + reg);
+}
+
+/* ........................... PHY INTERFACE ........................... */
+
+/*
+ * Enable the MDIO bit in MAC control register
+ * When not called from an interrupt-handler, access to the PHY must be
+ *  protected by a spinlock.
+ */
+static void enable_mdi(void)
+{
+        unsigned long ctl;
+
+        ctl = at91_emac_read(AT91_EMAC_CTL);
+        at91_emac_write(AT91_EMAC_CTL, ctl | AT91_EMAC_MPE);    /* enable management port */
+}
+
+/*
+ * Disable the MDIO bit in the MAC control register
+ */
+static void disable_mdi(void)
+{
+        unsigned long ctl;
+
+        ctl = at91_emac_read(AT91_EMAC_CTL);
+        at91_emac_write(AT91_EMAC_CTL, ctl & ~AT91_EMAC_MPE);   /* disable management port */
+}
+
+/*
+ * Wait until the PHY operation is complete.
+ */
+static inline void at91_phy_wait(void) {
+        unsigned long timeout = jiffies + 2;
+
+        while (!(at91_emac_read(AT91_EMAC_SR) & AT91_EMAC_SR_IDLE)) {
+                if (time_after(jiffies, timeout)) {
+                        printk("at91_ether: MIO timeout\n");
+                        break;
+                }
+                cpu_relax();
+        }
+}
+
+/*
+ * Write value to the a PHY register
+ * Note: MDI interface is assumed to already have been enabled.
+ */
+static void write_phy(unsigned char phy_addr, unsigned char address, unsigned int value)
+{
+        at91_emac_write(AT91_EMAC_MAN, AT91_EMAC_MAN_802_3 | AT91_EMAC_RW_W
+                | ((phy_addr & 0x1f) << 23) | (address << 18) | (value & AT91_EMAC_DATA));
+
+        /* Wait until IDLE bit in Network Status register is cleared */
+        at91_phy_wait();
+}
+
+/*
+ * Read value stored in a PHY register.
+ * Note: MDI interface is assumed to already have been enabled.
+ */
+static void read_phy(unsigned char phy_addr, unsigned char address, unsigned int *value)
+{
+        at91_emac_write(AT91_EMAC_MAN, AT91_EMAC_MAN_802_3 | AT91_EMAC_RW_R
+                | ((phy_addr & 0x1f) << 23) | (address << 18));
+
+        /* Wait until IDLE bit in Network Status register is cleared */
+        at91_phy_wait();
+
+        *value = at91_emac_read(AT91_EMAC_MAN) & AT91_EMAC_DATA;
+}
+
+/* ........................... PHY MANAGEMENT .......................... */
+
+/*
+ * Access the PHY to determine the current link speed and mode, and update the
+ * MAC accordingly.
+ * If no link or auto-negotiation is busy, then no changes are made.
+ */
+static void update_linkspeed(struct net_device *dev)
+{
+        struct at91_private *lp = (struct at91_private *) dev->priv;
+        unsigned int bmsr, bmcr, lpa, mac_cfg;
+        unsigned int speed, duplex;
+
+        if (!mii_link_ok(&lp->mii)) {           /* no link */
+                netif_carrier_off(dev);
+                printk(KERN_INFO "%s: Link down.\n", dev->name);
+                return;
+        }
+
+        /* Link up, or auto-negotiation still in progress */
+        read_phy(lp->phy_address, MII_BMSR, &bmsr);
+        read_phy(lp->phy_address, MII_BMCR, &bmcr);
+        if (bmcr & BMCR_ANENABLE) {                             /* AutoNegotiation is enabled */
+                if (!(bmsr & BMSR_ANEGCOMPLETE))
+                        return;                 /* Do nothing - another interrupt generated when negotiation complete */
+
+                read_phy(lp->phy_address, MII_LPA, &lpa);
+                if ((lpa & LPA_100FULL) || (lpa & LPA_100HALF)) speed = SPEED_100;
+                else speed = SPEED_10;
+                if ((lpa & LPA_100FULL) || (lpa & LPA_10FULL)) duplex = DUPLEX_FULL;
+                else duplex = DUPLEX_HALF;
+        } else {
+                speed = (bmcr & BMCR_SPEED100) ? SPEED_100 : SPEED_10;
+                duplex = (bmcr & BMCR_FULLDPLX) ? DUPLEX_FULL : DUPLEX_HALF;
+        }
+
+        /* Update the MAC */
+        mac_cfg = at91_emac_read(AT91_EMAC_CFG) & ~(AT91_EMAC_SPD | AT91_EMAC_FD);
+        if (speed == SPEED_100) {
+                if (duplex == DUPLEX_FULL)              /* 100 Full Duplex */
+                        mac_cfg |= AT91_EMAC_SPD | AT91_EMAC_FD;
+                else                                    /* 100 Half Duplex */
+                        mac_cfg |= AT91_EMAC_SPD;
+        } else {
+                if (duplex == DUPLEX_FULL)              /* 10 Full Duplex */
+                        mac_cfg |= AT91_EMAC_FD;
+                else {}                                 /* 10 Half Duplex */
+        }
+        at91_emac_write(AT91_EMAC_CFG, mac_cfg);
+
+        printk(KERN_INFO "%s: Link now %i-%s\n", dev->name, speed, (duplex == DUPLEX_FULL) ? "FullDuplex" : "HalfDuplex");
+        netif_carrier_on(dev);
+}
+
+/*
+ * Handle interrupts from the PHY
+ */
+static irqreturn_t at91ether_phy_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct net_device *dev = (struct net_device *) dev_id;
+        struct at91_private *lp = (struct at91_private *) dev->priv;
+        unsigned int phy;
+
+        /*
+         * This hander is triggered on both edges, but the PHY chips expect
+         * level-triggering.  We therefore have to check if the PHY actually has
+         * an IRQ pending.
+         */
+        enable_mdi();
+        if ((lp->phy_type == MII_DM9161_ID) || (lp->phy_type == MII_DM9161A_ID)) {
+                read_phy(lp->phy_address, MII_DSINTR_REG, &phy);        /* ack interrupt in Davicom PHY */
+                if (!(phy & (1 << 0)))
+                        goto done;
+        }
+        else if (lp->phy_type == MII_LXT971A_ID) {
+                read_phy(lp->phy_address, MII_ISINTS_REG, &phy);        /* ack interrupt in Intel PHY */
+                if (!(phy & (1 << 2)))
+                        goto done;
+        }
+        else if (lp->phy_type == MII_BCM5221_ID) {
+                read_phy(lp->phy_address, MII_BCMINTR_REG, &phy);       /* ack interrupt in Broadcom PHY */
+                if (!(phy & (1 << 0)))
+                        goto done;
+        }
+        else if (lp->phy_type == MII_KS8721_ID) {
+                read_phy(lp->phy_address, MII_TPISTATUS, &phy);         /* ack interrupt in Micrel PHY */
+                if (!(phy & ((1 << 2) | 1)))
+                        goto done;
+        }
+
+        update_linkspeed(dev);
+
+done:
+        disable_mdi();
+
+        return IRQ_HANDLED;
+}
+
+/*
+ * Initialize and enable the PHY interrupt for link-state changes
+ */
+static void enable_phyirq(struct net_device *dev)
+{
+        struct at91_private *lp = (struct at91_private *) dev->priv;
+        unsigned int dsintr, irq_number;
+        int status;
+
+        if (lp->phy_type == MII_RTL8201_ID)     /* RTL8201 does not have an interrupt */
+                return;
+        if (lp->phy_type == MII_DP83847_ID)     /* DP83847 does not have an interrupt */
+                return;
+        if (lp->phy_type == MII_AC101L_ID)      /* AC101L interrupt not supported yet */
+                return;
+
+        irq_number = lp->board_data.phy_irq_pin;
+        status = request_irq(irq_number, at91ether_phy_interrupt, 0, dev->name, dev);
+        if (status) {
+                printk(KERN_ERR "at91_ether: PHY IRQ %d request failed - status %d!\n", irq_number, status);
+                return;
+        }
+
+        spin_lock_irq(&lp->lock);
+        enable_mdi();
+
+        if ((lp->phy_type == MII_DM9161_ID) || (lp->phy_type == MII_DM9161A_ID)) {      /* for Davicom PHY */
+                read_phy(lp->phy_address, MII_DSINTR_REG, &dsintr);
+                dsintr = dsintr & ~0xf00;               /* clear bits 8..11 */
+                write_phy(lp->phy_address, MII_DSINTR_REG, dsintr);
+        }
+        else if (lp->phy_type == MII_LXT971A_ID) {      /* for Intel PHY */
+                read_phy(lp->phy_address, MII_ISINTE_REG, &dsintr);
+                dsintr = dsintr | 0xf2;                 /* set bits 1, 4..7 */
+                write_phy(lp->phy_address, MII_ISINTE_REG, dsintr);
+        }
+        else if (lp->phy_type == MII_BCM5221_ID) {      /* for Broadcom PHY */
+                dsintr = (1 << 15) | ( 1 << 14);
+                write_phy(lp->phy_address, MII_BCMINTR_REG, dsintr);
+        }
+        else if (lp->phy_type == MII_KS8721_ID) {       /* for Micrel PHY */
+                dsintr = (1 << 10) | ( 1 << 8);
+                write_phy(lp->phy_address, MII_TPISTATUS, dsintr);
+        }
+
+        disable_mdi();
+        spin_unlock_irq(&lp->lock);
+}
+
+/*
+ * Disable the PHY interrupt
+ */
+static void disable_phyirq(struct net_device *dev)
+{
+        struct at91_private *lp = (struct at91_private *) dev->priv;
+        unsigned int dsintr;
+        unsigned int irq_number;
+
+        if (lp->phy_type == MII_RTL8201_ID)     /* RTL8201 does not have an interrupt */
+                return;
+        if (lp->phy_type == MII_DP83847_ID)     /* DP83847 does not have an interrupt */
+                return;
+        if (lp->phy_type == MII_AC101L_ID)      /* AC101L interrupt not supported yet */
+                return;
+
+        spin_lock_irq(&lp->lock);
+        enable_mdi();
+
+        if ((lp->phy_type == MII_DM9161_ID) || (lp->phy_type == MII_DM9161A_ID)) {      /* for Davicom PHY */
+                read_phy(lp->phy_address, MII_DSINTR_REG, &dsintr);
+                dsintr = dsintr | 0xf00;                        /* set bits 8..11 */
+                write_phy(lp->phy_address, MII_DSINTR_REG, dsintr);
+        }
+        else if (lp->phy_type == MII_LXT971A_ID) {      /* for Intel PHY */
+                read_phy(lp->phy_address, MII_ISINTE_REG, &dsintr);
+                dsintr = dsintr & ~0xf2;                        /* clear bits 1, 4..7 */
+                write_phy(lp->phy_address, MII_ISINTE_REG, dsintr);
+        }
+        else if (lp->phy_type == MII_BCM5221_ID) {      /* for Broadcom PHY */
+                read_phy(lp->phy_address, MII_BCMINTR_REG, &dsintr);
+                dsintr = ~(1 << 14);
+                write_phy(lp->phy_address, MII_BCMINTR_REG, dsintr);
+        }
+        else if (lp->phy_type == MII_KS8721_ID) {       /* for Micrel PHY */
+                read_phy(lp->phy_address, MII_TPISTATUS, &dsintr);
+                dsintr = ~((1 << 10) | (1 << 8));
+                write_phy(lp->phy_address, MII_TPISTATUS, dsintr);
+        }
+
+        disable_mdi();
+        spin_unlock_irq(&lp->lock);
+
+        irq_number = lp->board_data.phy_irq_pin;
+        free_irq(irq_number, dev);                      /* Free interrupt handler */
+}
+
+/*
+ * Perform a software reset of the PHY.
+ */
+#if 0
+static void reset_phy(struct net_device *dev)
+{
+        struct at91_private *lp = (struct at91_private *) dev->priv;
+        unsigned int bmcr;
+
+        spin_lock_irq(&lp->lock);
+        enable_mdi();
+
+        /* Perform PHY reset */
+        write_phy(lp->phy_address, MII_BMCR, BMCR_RESET);
+
+        /* Wait until PHY reset is complete */
+        do {
+                read_phy(lp->phy_address, MII_BMCR, &bmcr);
+        } while (!(bmcr && BMCR_RESET));
+
+        disable_mdi();
+        spin_unlock_irq(&lp->lock);
+}
+#endif
+
+/* ......................... ADDRESS MANAGEMENT ........................ */
+
+/*
+ * NOTE: Your bootloader must always set the MAC address correctly before
+ * booting into Linux.
+ *
+ * - It must always set the MAC address after reset, even if it doesn't
+ *   happen to access the Ethernet while it's booting.  Some versions of
+ *   U-Boot on the AT91RM9200-DK do not do this.
+ *
+ * - Likewise it must store the addresses in the correct byte order.
+ *   MicroMonitor (uMon) on the CSB337 does this incorrectly (and
+ *   continues to do so, for bug-compatibility).
+ */
+
+static short __init unpack_mac_address(struct net_device *dev, unsigned int hi, unsigned int lo)
+{
+        char addr[6];
+
+        if (machine_is_csb337()) {
+                addr[5] = (lo & 0xff);                  /* The CSB337 bootloader stores the MAC the wrong-way around */
+                addr[4] = (lo & 0xff00) >> 8;
+                addr[3] = (lo & 0xff0000) >> 16;
+                addr[2] = (lo & 0xff000000) >> 24;
+                addr[1] = (hi & 0xff);
+                addr[0] = (hi & 0xff00) >> 8;
+        }
+        else {
+                addr[0] = (lo & 0xff);
+                addr[1] = (lo & 0xff00) >> 8;
+                addr[2] = (lo & 0xff0000) >> 16;
+                addr[3] = (lo & 0xff000000) >> 24;
+                addr[4] = (hi & 0xff);
+                addr[5] = (hi & 0xff00) >> 8;
+        }
+
+        if (is_valid_ether_addr(addr)) {
+                memcpy(dev->dev_addr, &addr, 6);
+                return 1;
+        }
+        return 0;
+}
+
+/*
+ * Set the ethernet MAC address in dev->dev_addr
+ */
+static void __init get_mac_address(struct net_device *dev)
+{
+        /* Check Specific-Address 1 */
+        if (unpack_mac_address(dev, at91_emac_read(AT91_EMAC_SA1H), at91_emac_read(AT91_EMAC_SA1L)))
+                return;
+        /* Check Specific-Address 2 */
+        if (unpack_mac_address(dev, at91_emac_read(AT91_EMAC_SA2H), at91_emac_read(AT91_EMAC_SA2L)))
+                return;
+        /* Check Specific-Address 3 */
+        if (unpack_mac_address(dev, at91_emac_read(AT91_EMAC_SA3H), at91_emac_read(AT91_EMAC_SA3L)))
+                return;
+        /* Check Specific-Address 4 */
+        if (unpack_mac_address(dev, at91_emac_read(AT91_EMAC_SA4H), at91_emac_read(AT91_EMAC_SA4L)))
+                return;
+
+        printk(KERN_ERR "at91_ether: Your bootloader did not configure a MAC address.\n");
+}
+
+/*
+ * Program the hardware MAC address from dev->dev_addr.
+ */
+static void update_mac_address(struct net_device *dev)
+{
+        at91_emac_write(AT91_EMAC_SA1L, (dev->dev_addr[3] << 24) | (dev->dev_addr[2] << 16) | (dev->dev_addr[1] << 8) | (dev->dev_addr[0]));
+        at91_emac_write(AT91_EMAC_SA1H, (dev->dev_addr[5] << 8) | (dev->dev_addr[4]));
+
+        at91_emac_write(AT91_EMAC_SA2L, 0);
+        at91_emac_write(AT91_EMAC_SA2H, 0);
+}
+
+/*
+ * Store the new hardware address in dev->dev_addr, and update the MAC.
+ */
+static int set_mac_address(struct net_device *dev, void* addr)
+{
+        struct sockaddr *address = addr;
+
+        if (!is_valid_ether_addr(address->sa_data))
+                return -EADDRNOTAVAIL;
+
+        memcpy(dev->dev_addr, address->sa_data, dev->addr_len);
+        update_mac_address(dev);
+
+        printk("%s: Setting MAC address to %02x:%02x:%02x:%02x:%02x:%02x\n", dev->name,
+                dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
+                dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+
+        return 0;
+}
+
+static int inline hash_bit_value(int bitnr, __u8 *addr)
+{
+        if (addr[bitnr / 8] & (1 << (bitnr % 8)))
+                return 1;
+        return 0;
+}
+
+/*
+ * The hash address register is 64 bits long and takes up two locations in the memory map.
+ * The least significant bits are stored in EMAC_HSL and the most significant
+ * bits in EMAC_HSH.
+ *
+ * The unicast hash enable and the multicast hash enable bits in the network configuration
+ *  register enable the reception of hash matched frames. The destination address is
+ *  reduced to a 6 bit index into the 64 bit hash register using the following hash function.
+ * The hash function is an exclusive or of every sixth bit of the destination address.
+ *   hash_index[5] = da[5] ^ da[11] ^ da[17] ^ da[23] ^ da[29] ^ da[35] ^ da[41] ^ da[47]
+ *   hash_index[4] = da[4] ^ da[10] ^ da[16] ^ da[22] ^ da[28] ^ da[34] ^ da[40] ^ da[46]
+ *   hash_index[3] = da[3] ^ da[09] ^ da[15] ^ da[21] ^ da[27] ^ da[33] ^ da[39] ^ da[45]
+ *   hash_index[2] = da[2] ^ da[08] ^ da[14] ^ da[20] ^ da[26] ^ da[32] ^ da[38] ^ da[44]
+ *   hash_index[1] = da[1] ^ da[07] ^ da[13] ^ da[19] ^ da[25] ^ da[31] ^ da[37] ^ da[43]
+ *   hash_index[0] = da[0] ^ da[06] ^ da[12] ^ da[18] ^ da[24] ^ da[30] ^ da[36] ^ da[42]
+ * da[0] represents the least significant bit of the first byte received, that is, the multicast/
+ *  unicast indicator, and da[47] represents the most significant bit of the last byte
+ *  received.
+ * If the hash index points to a bit that is set in the hash register then the frame will be
+ *  matched according to whether the frame is multicast or unicast.
+ * A multicast match will be signalled if the multicast hash enable bit is set, da[0] is 1 and
+ *  the hash index points to a bit set in the hash register.
+ * A unicast match will be signalled if the unicast hash enable bit is set, da[0] is 0 and the
+ *  hash index points to a bit set in the hash register.
+ * To receive all multicast frames, the hash register should be set with all ones and the
+ *  multicast hash enable bit should be set in the network configuration register.
+ */
+
+/*
+ * Return the hash index value for the specified address.
+ */
+static int hash_get_index(__u8 *addr)
+{
+        int i, j, bitval;
+        int hash_index = 0;
+
+        for (j = 0; j < 6; j++) {
+                for (i = 0, bitval = 0; i < 8; i++)
+                        bitval ^= hash_bit_value(i*6 + j, addr);
+
+                hash_index |= (bitval << j);
+        }
+
+        return hash_index;
+}
+
+/*
+ * Add multicast addresses to the internal multicast-hash table.
+ */
+static void at91ether_sethashtable(struct net_device *dev)
+{
+        struct dev_mc_list *curr;
+        unsigned long mc_filter[2];
+        unsigned int i, bitnr;
+
+        mc_filter[0] = mc_filter[1] = 0;
+
+        curr = dev->mc_list;
+        for (i = 0; i < dev->mc_count; i++, curr = curr->next) {
+                if (!curr) break;       /* unexpected end of list */
+
+                bitnr = hash_get_index(curr->dmi_addr);
+                mc_filter[bitnr >> 5] |= 1 << (bitnr & 31);
+        }
+
+        at91_emac_write(AT91_EMAC_HSH, mc_filter[0]);
+        at91_emac_write(AT91_EMAC_HSL, mc_filter[1]);
+}
+
+/*
+ * Enable/Disable promiscuous and multicast modes.
+ */
+static void at91ether_set_rx_mode(struct net_device *dev)
+{
+        unsigned long cfg;
+
+        cfg = at91_emac_read(AT91_EMAC_CFG);
+
+        if (dev->flags & IFF_PROMISC)                   /* Enable promiscuous mode */
+                cfg |= AT91_EMAC_CAF;
+        else if (dev->flags & (~IFF_PROMISC))           /* Disable promiscuous mode */
+                cfg &= ~AT91_EMAC_CAF;
+
+        if (dev->flags & IFF_ALLMULTI) {                /* Enable all multicast mode */
+                at91_emac_write(AT91_EMAC_HSH, -1);
+                at91_emac_write(AT91_EMAC_HSL, -1);
+                cfg |= AT91_EMAC_MTI;
+        } else if (dev->mc_count > 0) {                 /* Enable specific multicasts */
+                at91ether_sethashtable(dev);
+                cfg |= AT91_EMAC_MTI;
+        } else if (dev->flags & (~IFF_ALLMULTI)) {      /* Disable all multicast mode */
+                at91_emac_write(AT91_EMAC_HSH, 0);
+                at91_emac_write(AT91_EMAC_HSL, 0);
+                cfg &= ~AT91_EMAC_MTI;
+        }
+
+        at91_emac_write(AT91_EMAC_CFG, cfg);
+}
+
+
+/* ......................... ETHTOOL SUPPORT ........................... */
+
+
+static int mdio_read(struct net_device *dev, int phy_id, int location)
+{
+        unsigned int value;
+
+        read_phy(phy_id, location, &value);
+        return value;
+}
+
+static void mdio_write(struct net_device *dev, int phy_id, int location, int value)
+{
+        write_phy(phy_id, location, value);
+}
+
+static int at91ether_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+        struct at91_private *lp = (struct at91_private *) dev->priv;
+        int ret;
+
+        spin_lock_irq(&lp->lock);
+        enable_mdi();
+
+        ret = mii_ethtool_gset(&lp->mii, cmd);
+
+        disable_mdi();
+        spin_unlock_irq(&lp->lock);
+
+        if (lp->phy_media == PORT_FIBRE) {              /* override media type since mii.c doesn't know */
+                cmd->supported = SUPPORTED_FIBRE;
+                cmd->port = PORT_FIBRE;
+        }
+
+        return ret;
+}
+
+static int at91ether_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+        struct at91_private *lp = (struct at91_private *) dev->priv;
+        int ret;
+
+        spin_lock_irq(&lp->lock);
+        enable_mdi();
+
+        ret = mii_ethtool_sset(&lp->mii, cmd);
+
+        disable_mdi();
+        spin_unlock_irq(&lp->lock);
+
+        return ret;
+}
+
+static int at91ether_nwayreset(struct net_device *dev)
+{
+        struct at91_private *lp = (struct at91_private *) dev->priv;
+        int ret;
+
+        spin_lock_irq(&lp->lock);
+        enable_mdi();
+
+        ret = mii_nway_restart(&lp->mii);
+
+        disable_mdi();
+        spin_unlock_irq(&lp->lock);
+
+        return ret;
+}
+
+static void at91ether_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
+{
+        strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
+        strlcpy(info->version, DRV_VERSION, sizeof(info->version));
+        strlcpy(info->bus_info, dev->class_dev.dev->bus_id, sizeof(info->bus_info));
+}
+
+static struct ethtool_ops at91ether_ethtool_ops = {
+        .get_settings   = at91ether_get_settings,
+        .set_settings   = at91ether_set_settings,
+        .get_drvinfo    = at91ether_get_drvinfo,
+        .nway_reset     = at91ether_nwayreset,
+        .get_link       = ethtool_op_get_link,
+};
+
+
+/* ................................ MAC ................................ */
+
+/*
+ * Initialize and start the Receiver and Transmit subsystems
+ */
+static void at91ether_start(struct net_device *dev)
+{
+        struct at91_private *lp = (struct at91_private *) dev->priv;
+        struct recv_desc_bufs *dlist, *dlist_phys;
+        int i;
+        unsigned long ctl;
+
+        dlist = lp->dlist;
+        dlist_phys = lp->dlist_phys;
+
+        for (i = 0; i < MAX_RX_DESCR; i++) {
+                dlist->descriptors[i].addr = (unsigned int) &dlist_phys->recv_buf[i][0];
+                dlist->descriptors[i].size = 0;
+        }
+
+        /* Set the Wrap bit on the last descriptor */
+        dlist->descriptors[i-1].addr |= EMAC_DESC_WRAP;
+
+        /* Reset buffer index */
+        lp->rxBuffIndex = 0;
+
+        /* Program address of descriptor list in Rx Buffer Queue register */
+        at91_emac_write(AT91_EMAC_RBQP, (unsigned long) dlist_phys);
+
+        /* Enable Receive and Transmit */
+        ctl = at91_emac_read(AT91_EMAC_CTL);
+        at91_emac_write(AT91_EMAC_CTL, ctl | AT91_EMAC_RE | AT91_EMAC_TE);
+}
+
+/*
+ * Open the ethernet interface
+ */
+static int at91ether_open(struct net_device *dev)
+{
+        struct at91_private *lp = (struct at91_private *) dev->priv;
+        unsigned long ctl;
+
+        if (!is_valid_ether_addr(dev->dev_addr))
+                return -EADDRNOTAVAIL;
+
+        clk_enable(ether_clk);                  /* Re-enable Peripheral clock */
+
+        /* Clear internal statistics */
+        ctl = at91_emac_read(AT91_EMAC_CTL);
+        at91_emac_write(AT91_EMAC_CTL, ctl | AT91_EMAC_CSR);
+
+        /* Update the MAC address (incase user has changed it) */
+        update_mac_address(dev);
+
+        /* Enable PHY interrupt */
+        enable_phyirq(dev);
+
+        /* Enable MAC interrupts */
+        at91_emac_write(AT91_EMAC_IER, AT91_EMAC_RCOM | AT91_EMAC_RBNA
+                                | AT91_EMAC_TUND | AT91_EMAC_RTRY | AT91_EMAC_TCOM
+                                | AT91_EMAC_ROVR | AT91_EMAC_ABT);
+
+        /* Determine current link speed */
+        spin_lock_irq(&lp->lock);
+        enable_mdi();
+        update_linkspeed(dev);
+        disable_mdi();
+        spin_unlock_irq(&lp->lock);
+
+        at91ether_start(dev);
+        netif_start_queue(dev);
+        return 0;
+}
+
+/*
+ * Close the interface
+ */
+static int at91ether_close(struct net_device *dev)
+{
+        unsigned long ctl;
+
+        /* Disable Receiver and Transmitter */
+        ctl = at91_emac_read(AT91_EMAC_CTL);
+        at91_emac_write(AT91_EMAC_CTL, ctl & ~(AT91_EMAC_TE | AT91_EMAC_RE));
+
+        /* Disable PHY interrupt */
+        disable_phyirq(dev);
+
+        /* Disable MAC interrupts */
+        at91_emac_write(AT91_EMAC_IDR, AT91_EMAC_RCOM | AT91_EMAC_RBNA
+                                | AT91_EMAC_TUND | AT91_EMAC_RTRY | AT91_EMAC_TCOM
+                                | AT91_EMAC_ROVR | AT91_EMAC_ABT);
+
+        netif_stop_queue(dev);
+
+        clk_disable(ether_clk);                 /* Disable Peripheral clock */
+
+        return 0;
+}
+
+/*
+ * Transmit packet.
+ */
+static int at91ether_tx(struct sk_buff *skb, struct net_device *dev)
+{
+        struct at91_private *lp = (struct at91_private *) dev->priv;
+
+        if (at91_emac_read(AT91_EMAC_TSR) & AT91_EMAC_TSR_BNQ) {
+                netif_stop_queue(dev);
+
+                /* Store packet information (to free when Tx completed) */
+                lp->skb = skb;
+                lp->skb_length = skb->len;
+                lp->skb_physaddr = dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE);
+                lp->stats.tx_bytes += skb->len;
+
+                /* Set address of the data in the Transmit Address register */
+                at91_emac_write(AT91_EMAC_TAR, lp->skb_physaddr);
+                /* Set length of the packet in the Transmit Control register */
+                at91_emac_write(AT91_EMAC_TCR, skb->len);
+
+                dev->trans_start = jiffies;
+        } else {
+                printk(KERN_ERR "at91_ether.c: at91ether_tx() called, but device is busy!\n");
+                return 1;       /* if we return anything but zero, dev.c:1055 calls kfree_skb(skb)
+                                on this skb, he also reports -ENETDOWN and printk's, so either
+                                we free and return(0) or don't free and return 1 */
+        }
+
+        return 0;
+}
+
+/*
+ * Update the current statistics from the internal statistics registers.
+ */
+static struct net_device_stats *at91ether_stats(struct net_device *dev)
+{
+        struct at91_private *lp = (struct at91_private *) dev->priv;
+        int ale, lenerr, seqe, lcol, ecol;
+
+        if (netif_running(dev)) {
+                lp->stats.rx_packets += at91_emac_read(AT91_EMAC_OK);           /* Good frames received */
+                ale = at91_emac_read(AT91_EMAC_ALE);
+                lp->stats.rx_frame_errors += ale;                               /* Alignment errors */
+                lenerr = at91_emac_read(AT91_EMAC_ELR) + at91_emac_read(AT91_EMAC_USF);
+                lp->stats.rx_length_errors += lenerr;                           /* Excessive Length or Undersize Frame error */
+                seqe = at91_emac_read(AT91_EMAC_SEQE);
+                lp->stats.rx_crc_errors += seqe;                                /* CRC error */
+                lp->stats.rx_fifo_errors += at91_emac_read(AT91_EMAC_DRFC);     /* Receive buffer not available */
+                lp->stats.rx_errors += (ale + lenerr + seqe
+                        + at91_emac_read(AT91_EMAC_CDE) + at91_emac_read(AT91_EMAC_RJB));
+
+                lp->stats.tx_packets += at91_emac_read(AT91_EMAC_FRA);          /* Frames successfully transmitted */
+                lp->stats.tx_fifo_errors += at91_emac_read(AT91_EMAC_TUE);      /* Transmit FIFO underruns */
+                lp->stats.tx_carrier_errors += at91_emac_read(AT91_EMAC_CSE);   /* Carrier Sense errors */
+                lp->stats.tx_heartbeat_errors += at91_emac_read(AT91_EMAC_SQEE);/* Heartbeat error */
+
+                lcol = at91_emac_read(AT91_EMAC_LCOL);
+                ecol = at91_emac_read(AT91_EMAC_ECOL);
+                lp->stats.tx_window_errors += lcol;                     /* Late collisions */
+                lp->stats.tx_aborted_errors += ecol;                    /* 16 collisions */
+
+                lp->stats.collisions += (at91_emac_read(AT91_EMAC_SCOL) + at91_emac_read(AT91_EMAC_MCOL) + lcol + ecol);
+        }
+        return &lp->stats;
+}
+
+/*
+ * Extract received frame from buffer descriptors and sent to upper layers.
+ * (Called from interrupt context)
+ */
+static void at91ether_rx(struct net_device *dev)
+{
+        struct at91_private *lp = (struct at91_private *) dev->priv;
+        struct recv_desc_bufs *dlist;
+        unsigned char *p_recv;
+        struct sk_buff *skb;
+        unsigned int pktlen;
+
+        dlist = lp->dlist;
+        while (dlist->descriptors[lp->rxBuffIndex].addr & EMAC_DESC_DONE) {
+                p_recv = dlist->recv_buf[lp->rxBuffIndex];
+                pktlen = dlist->descriptors[lp->rxBuffIndex].size & 0x7ff;      /* Length of frame including FCS */
+                skb = alloc_skb(pktlen + 2, GFP_ATOMIC);
+                if (skb != NULL) {
+                        skb_reserve(skb, 2);
+                        memcpy(skb_put(skb, pktlen), p_recv, pktlen);
+
+                        skb->dev = dev;
+                        skb->protocol = eth_type_trans(skb, dev);
+                        skb->len = pktlen;
+                        dev->last_rx = jiffies;
+                        lp->stats.rx_bytes += pktlen;
+                        netif_rx(skb);
+                }
+                else {
+                        lp->stats.rx_dropped += 1;
+                        printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n", dev->name);
+                }
+
+                if (dlist->descriptors[lp->rxBuffIndex].size & EMAC_MULTICAST)
+                        lp->stats.multicast++;
+
+                dlist->descriptors[lp->rxBuffIndex].addr &= ~EMAC_DESC_DONE;    /* reset ownership bit */
+                if (lp->rxBuffIndex == MAX_RX_DESCR-1)                          /* wrap after last buffer */
+                        lp->rxBuffIndex = 0;
+                else
+                        lp->rxBuffIndex++;
+        }
+}
+
+/*
+ * MAC interrupt handler
+ */
+static irqreturn_t at91ether_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct net_device *dev = (struct net_device *) dev_id;
+        struct at91_private *lp = (struct at91_private *) dev->priv;
+        unsigned long intstatus, ctl;
+
+        /* MAC Interrupt Status register indicates what interrupts are pending.
+           It is automatically cleared once read. */
+        intstatus = at91_emac_read(AT91_EMAC_ISR);
+
+        if (intstatus & AT91_EMAC_RCOM)         /* Receive complete */
+                at91ether_rx(dev);
+
+        if (intstatus & AT91_EMAC_TCOM) {               /* Transmit complete */
+                /* The TCOM bit is set even if the transmission failed. */
+                if (intstatus & (AT91_EMAC_TUND | AT91_EMAC_RTRY))
+                        lp->stats.tx_errors += 1;
+
+                if (lp->skb) {
+                        dev_kfree_skb_irq(lp->skb);
+                        lp->skb = NULL;
+                        dma_unmap_single(NULL, lp->skb_physaddr, lp->skb_length, DMA_TO_DEVICE);
+                }
+                netif_wake_queue(dev);
+        }
+
+        /* Work-around for Errata #11 */
+        if (intstatus & AT91_EMAC_RBNA) {
+                ctl = at91_emac_read(AT91_EMAC_CTL);
+                at91_emac_write(AT91_EMAC_CTL, ctl & ~AT91_EMAC_RE);
+                at91_emac_write(AT91_EMAC_CTL, ctl | AT91_EMAC_RE);
+        }
+
+        if (intstatus & AT91_EMAC_ROVR)
+                printk("%s: ROVR error\n", dev->name);
+
+        return IRQ_HANDLED;
+}
+
+/*
+ * Initialize the ethernet interface
+ */
+static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_address, struct platform_device *pdev)
+{
+        struct at91_eth_data *board_data = pdev->dev.platform_data;
+        struct net_device *dev;
+        struct at91_private *lp;
+        unsigned int val;
+        int res;
+
+        if (at91_dev)                   /* already initialized */
+                return 0;
+
+        dev = alloc_etherdev(sizeof(struct at91_private));
+        if (!dev)
+                return -ENOMEM;
+
+        dev->base_addr = AT91_VA_BASE_EMAC;
+        dev->irq = AT91_ID_EMAC;
+        SET_MODULE_OWNER(dev);
+
+        /* Install the interrupt handler */
+        if (request_irq(dev->irq, at91ether_interrupt, 0, dev->name, dev)) {
+                free_netdev(dev);
+                return -EBUSY;
+        }
+
+        /* Allocate memory for DMA Receive descriptors */
+        lp = (struct at91_private *)dev->priv;
+        lp->dlist = (struct recv_desc_bufs *) dma_alloc_coherent(NULL, sizeof(struct recv_desc_bufs), (dma_addr_t *) &lp->dlist_phys, GFP_KERNEL);
+        if (lp->dlist == NULL) {
+                free_irq(dev->irq, dev);
+                free_netdev(dev);
+                return -ENOMEM;
+        }
+        lp->board_data = *board_data;
+        platform_set_drvdata(pdev, dev);
+
+        spin_lock_init(&lp->lock);
+
+        ether_setup(dev);
+        dev->open = at91ether_open;
+        dev->stop = at91ether_close;
+        dev->hard_start_xmit = at91ether_tx;
+        dev->get_stats = at91ether_stats;
+        dev->set_multicast_list = at91ether_set_rx_mode;
+        dev->set_mac_address = set_mac_address;
+        dev->ethtool_ops = &at91ether_ethtool_ops;
+
+        SET_NETDEV_DEV(dev, &pdev->dev);
+
+        get_mac_address(dev);           /* Get ethernet address and store it in dev->dev_addr */
+        update_mac_address(dev);        /* Program ethernet address into MAC */
+
+        at91_emac_write(AT91_EMAC_CTL, 0);
+
+        if (lp->board_data.is_rmii)
+                at91_emac_write(AT91_EMAC_CFG, AT91_EMAC_CLK_DIV32 | AT91_EMAC_BIG | AT91_EMAC_RMII);
+        else
+                at91_emac_write(AT91_EMAC_CFG, AT91_EMAC_CLK_DIV32 | AT91_EMAC_BIG);
+
+        /* Perform PHY-specific initialization */
+        spin_lock_irq(&lp->lock);
+        enable_mdi();
+        if ((phy_type == MII_DM9161_ID) || (lp->phy_type == MII_DM9161A_ID)) {
+                read_phy(phy_address, MII_DSCR_REG, &val);
+                if ((val & (1 << 10)) == 0)                     /* DSCR bit 10 is 0 -- fiber mode */
+                        lp->phy_media = PORT_FIBRE;
+        } else if (machine_is_csb337()) {
+                /* mix link activity status into LED2 link state */
+                write_phy(phy_address, MII_LEDCTRL_REG, 0x0d22);
+        }
+        disable_mdi();
+        spin_unlock_irq(&lp->lock);
+
+        lp->mii.dev = dev;              /* Support for ethtool */
+        lp->mii.mdio_read = mdio_read;
+        lp->mii.mdio_write = mdio_write;
+
+        lp->phy_type = phy_type;        /* Type of PHY connected */
+        lp->phy_address = phy_address;  /* MDI address of PHY */
+
+        /* Register the network interface */
+        res = register_netdev(dev);
+        if (res) {
+                free_irq(dev->irq, dev);
+                free_netdev(dev);
+                dma_free_coherent(NULL, sizeof(struct recv_desc_bufs), lp->dlist, (dma_addr_t)lp->dlist_phys);
+                return res;
+        }
+        at91_dev = dev;
+
+        /* Determine current link speed */
+        spin_lock_irq(&lp->lock);
+        enable_mdi();
+        update_linkspeed(dev);
+        disable_mdi();
+        spin_unlock_irq(&lp->lock);
+        netif_carrier_off(dev);         /* will be enabled in open() */
+
+        /* Display ethernet banner */
+        printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%02x:%02x:%02x:%02x:%02x:%02x)\n",
+                dev->name, (uint) dev->base_addr, dev->irq,
+                at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_SPD ? "100-" : "10-",
+                at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_FD ? "FullDuplex" : "HalfDuplex",
+                dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
+                dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+        if ((phy_type == MII_DM9161_ID) || (lp->phy_type == MII_DM9161A_ID))
+                printk(KERN_INFO "%s: Davicom 9196 PHY %s\n", dev->name, (lp->phy_media == PORT_FIBRE) ? "(Fiber)" : "(Copper)");
+        else if (phy_type == MII_LXT971A_ID)
+                printk(KERN_INFO "%s: Intel LXT971A PHY\n", dev->name);
+        else if (phy_type == MII_RTL8201_ID)
+                printk(KERN_INFO "%s: Realtek RTL8201(B)L PHY\n", dev->name);
+        else if (phy_type == MII_BCM5221_ID)
+                printk(KERN_INFO "%s: Broadcom BCM5221 PHY\n", dev->name);
+        else if (phy_type == MII_DP83847_ID)
+                printk(KERN_INFO "%s: National Semiconductor DP83847 PHY\n", dev->name);
+        else if (phy_type == MII_AC101L_ID)
+                printk(KERN_INFO "%s: Altima AC101L PHY\n", dev->name);
+        else if (phy_type == MII_KS8721_ID)
+                printk(KERN_INFO "%s: Micrel KS8721 PHY\n", dev->name);
+
+        return 0;
+}
+
+/*
+ * Detect MAC and PHY and perform initialization
+ */
+static int __init at91ether_probe(struct platform_device *pdev)
+{
+        unsigned int phyid1, phyid2;
+        int detected = -1;
+        unsigned long phy_id;
+        unsigned short phy_address = 0;
+
+        ether_clk = clk_get(&pdev->dev, "ether_clk");
+        if (!ether_clk) {
+                printk(KERN_ERR "at91_ether: no clock defined\n");
+                return -ENODEV;
+        }
+        clk_enable(ether_clk);                                  /* Enable Peripheral clock */
+
+        while ((detected != 0) && (phy_address < 32)) {
+                /* Read the PHY ID registers */
+                enable_mdi();
+                read_phy(phy_address, MII_PHYSID1, &phyid1);
+                read_phy(phy_address, MII_PHYSID2, &phyid2);
+                disable_mdi();
+
+                phy_id = (phyid1 << 16) | (phyid2 & 0xfff0);
+                switch (phy_id) {
+                        case MII_DM9161_ID:             /* Davicom 9161: PHY_ID1 = 0x181, PHY_ID2 = B881 */
+                        case MII_DM9161A_ID:            /* Davicom 9161A: PHY_ID1 = 0x181, PHY_ID2 = B8A0 */
+                        case MII_LXT971A_ID:            /* Intel LXT971A: PHY_ID1 = 0x13, PHY_ID2 = 78E0 */
+                        case MII_RTL8201_ID:            /* Realtek RTL8201: PHY_ID1 = 0, PHY_ID2 = 0x8201 */
+                        case MII_BCM5221_ID:            /* Broadcom BCM5221: PHY_ID1 = 0x40, PHY_ID2 = 0x61e0 */
+                        case MII_DP83847_ID:            /* National Semiconductor DP83847:  */
+                        case MII_AC101L_ID:             /* Altima AC101L: PHY_ID1 = 0x22, PHY_ID2 = 0x5520 */
+                        case MII_KS8721_ID:             /* Micrel KS8721: PHY_ID1 = 0x22, PHY_ID2 = 0x1610 */
+                                detected = at91ether_setup(phy_id, phy_address, pdev);
+                                break;
+                }
+
+                phy_address++;
+        }
+
+        clk_disable(ether_clk);                                 /* Disable Peripheral clock */
+
+        return detected;
+}
+
+static int __devexit at91ether_remove(struct platform_device *pdev)
+{
+        struct at91_private *lp = (struct at91_private *) at91_dev->priv;
+
+        unregister_netdev(at91_dev);
+        free_irq(at91_dev->irq, at91_dev);
+        dma_free_coherent(NULL, sizeof(struct recv_desc_bufs), lp->dlist, (dma_addr_t)lp->dlist_phys);
+        clk_put(ether_clk);
+
+        free_netdev(at91_dev);
+        at91_dev = NULL;
+        return 0;
+}
+
+static struct platform_driver at91ether_driver = {
+        .probe          = at91ether_probe,
+        .remove         = __devexit_p(at91ether_remove),
+        /* FIXME:  support suspend and resume */
+        .driver         = {
+                .name   = DRV_NAME,
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init at91ether_init(void)
+{
+        return platform_driver_register(&at91ether_driver);
+}
+
+static void __exit at91ether_exit(void)
+{
+        platform_driver_unregister(&at91ether_driver);
+}
+
+module_init(at91ether_init)
+module_exit(at91ether_exit)
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("AT91RM9200 EMAC Ethernet driver");
+MODULE_AUTHOR("Andrew Victor");
diff --git a/drivers/net/arm/at91_ether.h b/drivers/net/arm/at91_ether.h
new file mode 100644
index 0000000000..9885735c9c
--- /dev/null
+++ b/drivers/net/arm/at91_ether.h
@@ -0,0 +1,101 @@
+/*
+ * Ethernet driver for the Atmel AT91RM9200 (Thunder)
+ *
+ *  Copyright (C) SAN People (Pty) Ltd
+ *
+ * Based on an earlier Atmel EMAC macrocell driver by Atmel and Lineo Inc.
+ * Initial version by Rick Bronson.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#ifndef AT91_ETHERNET
+#define AT91_ETHERNET
+
+
+/* Davicom 9161 PHY */
+#define MII_DM9161_ID   0x0181b880
+#define MII_DM9161A_ID  0x0181b8a0
+
+/* Davicom specific registers */
+#define MII_DSCR_REG    16
+#define MII_DSCSR_REG   17
+#define MII_DSINTR_REG  21
+
+/* Intel LXT971A PHY */
+#define MII_LXT971A_ID  0x001378E0
+
+/* Intel specific registers */
+#define MII_ISINTE_REG  18
+#define MII_ISINTS_REG  19
+#define MII_LEDCTRL_REG 20
+
+/* Realtek RTL8201 PHY */
+#define MII_RTL8201_ID  0x00008200
+
+/* Broadcom BCM5221 PHY */
+#define MII_BCM5221_ID  0x004061e0
+
+/* Broadcom specific registers */
+#define MII_BCMINTR_REG 26
+
+/* National Semiconductor DP83847 */
+#define MII_DP83847_ID  0x20005c30
+
+/* Altima AC101L PHY */
+#define MII_AC101L_ID   0x00225520
+
+/* Micrel KS8721 PHY */
+#define MII_KS8721_ID   0x00221610
+
+/* ........................................................................ */
+
+#define MAX_RBUFF_SZ    0x600           /* 1518 rounded up */
+#define MAX_RX_DESCR    9               /* max number of receive buffers */
+
+#define EMAC_DESC_DONE  0x00000001      /* bit for if DMA is done */
+#define EMAC_DESC_WRAP  0x00000002      /* bit for wrap */
+
+#define EMAC_BROADCAST  0x80000000      /* broadcast address */
+#define EMAC_MULTICAST  0x40000000      /* multicast address */
+#define EMAC_UNICAST    0x20000000      /* unicast address */
+
+struct rbf_t
+{
+        unsigned int addr;
+        unsigned long size;
+};
+
+struct recv_desc_bufs
+{
+        struct rbf_t descriptors[MAX_RX_DESCR];         /* must be on sizeof (rbf_t) boundary */
+        char recv_buf[MAX_RX_DESCR][MAX_RBUFF_SZ];      /* must be on long boundary */
+};
+
+struct at91_private
+{
+        struct net_device_stats stats;
+        struct mii_if_info mii;                 /* ethtool support */
+        struct at91_eth_data board_data;        /* board-specific configuration */
+
+        /* PHY */
+        unsigned long phy_type;                 /* type of PHY (PHY_ID) */
+        spinlock_t lock;                        /* lock for MDI interface */
+        short phy_media;                        /* media interface type */
+        unsigned short phy_address;             /* 5-bit MDI address of PHY (0..31) */
+
+        /* Transmit */
+        struct sk_buff *skb;                    /* holds skb until xmit interrupt completes */
+        dma_addr_t skb_physaddr;                /* phys addr from pci_map_single */
+        int skb_length;                         /* saved skb length for pci_unmap_single */
+
+        /* Receive */
+        int rxBuffIndex;                        /* index into receive descriptor list */
+        struct recv_desc_bufs *dlist;           /* descriptor list address */
+        struct recv_desc_bufs *dlist_phys;      /* descriptor list physical address */
+};
+
+#endif
diff --git a/drivers/net/atari_bionet.c b/drivers/net/atari_bionet.c
index 0095384ff4..5e5f80b99b 100644
--- a/drivers/net/atari_bionet.c
+++ b/drivers/net/atari_bionet.c
@@ -123,7 +123,7 @@ static char version[] =
  * Global variable 'bionet_debug'. Can be set at load time by 'insmod'
  */
 unsigned int bionet_debug = NET_DEBUG;
-MODULE_PARM(bionet_debug, "i");
+module_param(bionet_debug, int, 0);
 MODULE_PARM_DESC(bionet_debug, "bionet debug level (0-2)");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/net/atari_pamsnet.c b/drivers/net/atari_pamsnet.c
index 8b997809f9..d6039e62d8 100644
--- a/drivers/net/atari_pamsnet.c
+++ b/drivers/net/atari_pamsnet.c
@@ -119,7 +119,7 @@ static char *version =
  * Global variable 'pamsnet_debug'. Can be set at load time by 'insmod'
  */
 unsigned int pamsnet_debug = NET_DEBUG;
-MODULE_PARM(pamsnet_debug, "i");
+module_param(pamsnet_debug, int, 0);
 MODULE_PARM_DESC(pamsnet_debug, "pamsnet debug enable (0-1)");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index e01b6a78ec..442b2cbeb5 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -78,7 +78,7 @@ static int lance_debug = LANCE_DEBUG;
 #else
 static int lance_debug = 1;
 #endif
-MODULE_PARM(lance_debug, "i");
+module_param(lance_debug, int, 0);
 MODULE_PARM_DESC(lance_debug, "atarilance debug level (0-3)");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 2d0ac169a8..f13a539dc1 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3159,7 +3159,7 @@ static int bond_slave_netdev_event(unsigned long event, struct net_device *slave
  * bond_netdev_event: handle netdev notifier chain events.
  *
  * This function receives events for the netdev chain.  The caller (an
- * ioctl handler calling notifier_call_chain) holds the necessary
+ * ioctl handler calling blocking_notifier_call_chain) holds the necessary
  * locks for us to safely manipulate the slave devices (RTNL lock,
  * dev_probe_lock).
  */
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 8f1573e658..ac48f75435 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -192,12 +192,15 @@
 static char version[] __devinitdata =
         DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
 
+static int cassini_debug = -1;  /* -1 == use CAS_DEF_MSG_ENABLE as value */
+static int link_mode;
+
 MODULE_AUTHOR("Adrian Sun (asun@darksunrising.com)");
 MODULE_DESCRIPTION("Sun Cassini(+) ethernet driver");
 MODULE_LICENSE("GPL");
-MODULE_PARM(cassini_debug, "i");
+module_param(cassini_debug, int, 0);
 MODULE_PARM_DESC(cassini_debug, "Cassini bitmapped debugging message enable value");
-MODULE_PARM(link_mode, "i");
+module_param(link_mode, int, 0);
 MODULE_PARM_DESC(link_mode, "default link mode");
 
 /*
@@ -209,7 +212,7 @@ MODULE_PARM_DESC(link_mode, "default link mode");
  * Value in seconds, for user input.
  */
 static int linkdown_timeout = DEFAULT_LINKDOWN_TIMEOUT;
-MODULE_PARM(linkdown_timeout, "i");
+module_param(linkdown_timeout, int, 0);
 MODULE_PARM_DESC(linkdown_timeout,
 "min reset interval in sec. for PCS linkdown issue; disabled if not positive");
 
@@ -221,8 +224,6 @@ MODULE_PARM_DESC(linkdown_timeout,
 static int link_transition_timeout;
 
 
-static int cassini_debug = -1;  /* -1 == use CAS_DEF_MSG_ENABLE as value */
-static int link_mode;
 
 static u16 link_modes[] __devinitdata = {
         BMCR_ANENABLE,                   /* 0 : autoneg */
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c
index 349ebe783e..7fe2638ae0 100644
--- a/drivers/net/chelsio/cxgb2.c
+++ b/drivers/net/chelsio/cxgb2.c
@@ -124,7 +124,7 @@ MODULE_LICENSE("GPL");
 
 static int dflt_msg_enable = DFLT_MSG_ENABLE;
 
-MODULE_PARM(dflt_msg_enable, "i");
+module_param(dflt_msg_enable, int, 0);
 MODULE_PARM_DESC(dflt_msg_enable, "Chelsio T1 message enable bitmap");
 
 
diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c
index 32d13166c6..e175d48766 100644
--- a/drivers/net/dgrs.c
+++ b/drivers/net/dgrs.c
@@ -1551,7 +1551,7 @@ MODULE_PARM_DESC(nicmode, "Digi RightSwitch operating mode (1: switch, 2: multi-
 static int __init dgrs_init_module (void)
 {
         int     i;
-        int     cardcount = 0;
+        int     err;
 
         /*
          *      Command line variable overrides
@@ -1593,13 +1593,13 @@ static int __init dgrs_init_module (void)
          *      Find and configure all the cards
          */
 #ifdef CONFIG_EISA
-        cardcount = eisa_driver_register(&dgrs_eisa_driver);
-        if (cardcount < 0)
-                return cardcount;
+        err = eisa_driver_register(&dgrs_eisa_driver);
+        if (err)
+                return err;
 #endif
-        cardcount = pci_register_driver(&dgrs_pci_driver);
-        if (cardcount)
-                return cardcount;
+        err = pci_register_driver(&dgrs_pci_driver);
+        if (err)
+                return err;
         return 0;
 }
 
diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c
index b4f3a9f8a5..7e43380971 100644
--- a/drivers/net/fec_8xx/fec_main.c
+++ b/drivers/net/fec_8xx/fec_main.c
@@ -55,11 +55,11 @@ MODULE_AUTHOR("Pantelis Antoniou <panto@intracom.gr>");
 MODULE_DESCRIPTION("Motorola 8xx FEC ethernet driver");
 MODULE_LICENSE("GPL");
 
-MODULE_PARM(fec_8xx_debug, "i");
+int fec_8xx_debug = -1;         /* -1 == use FEC_8XX_DEF_MSG_ENABLE as value */
+module_param(fec_8xx_debug, int, 0);
 MODULE_PARM_DESC(fec_8xx_debug,
                  "FEC 8xx bitmapped debugging message enable value");
 
-int fec_8xx_debug = -1;         /* -1 == use FEC_8XX_DEF_MSG_ENABLE as value */
 
 /*************************************************/
 
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index e7fc28b07e..7627a75f4f 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -134,6 +134,7 @@
 #include <linux/random.h>
 #include <linux/init.h>
 #include <linux/if_vlan.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/irq.h>
 #include <asm/io.h>
@@ -2932,7 +2933,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
         if (id->driver_data & DEV_HAS_HIGH_DMA) {
                 /* packet format 3: supports 40-bit addressing */
                 np->desc_ver = DESC_VER_3;
-                if (pci_set_dma_mask(pci_dev, 0x0000007fffffffffULL)) {
+                if (pci_set_dma_mask(pci_dev, DMA_39BIT_MASK)) {
                         printk(KERN_INFO "forcedeth: 64-bit DMA failed, using 32-bit addressing for device %s.\n",
                                         pci_name(pci_dev));
                 } else {
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index f5d49a1106..196298f33d 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -58,11 +58,11 @@ MODULE_DESCRIPTION("Freescale Ethernet Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_MODULE_VERSION);
 
-MODULE_PARM(fs_enet_debug, "i");
+int fs_enet_debug = -1;         /* -1 == use FS_ENET_DEF_MSG_ENABLE as value */
+module_param(fs_enet_debug, int, 0);
 MODULE_PARM_DESC(fs_enet_debug,
                  "Freescale bitmapped debugging message enable value");
 
-int fs_enet_debug = -1;         /* -1 == use FS_ENET_DEF_MSG_ENABLE as value */
 
 static void fs_set_multicast_list(struct net_device *dev)
 {
diff --git a/drivers/net/gt96100eth.c b/drivers/net/gt96100eth.c
index 5958a63147..2d24354046 100644
--- a/drivers/net/gt96100eth.c
+++ b/drivers/net/gt96100eth.c
@@ -114,8 +114,8 @@ static int max_interrupt_work = 32;
 
 static char mac0[18] = "00.02.03.04.05.06";
 static char mac1[18] = "00.01.02.03.04.05";
-MODULE_PARM(mac0, "c18");
-MODULE_PARM(mac1, "c18");
+module_param_string(mac0, mac0, 18, 0);
+module_param_string(mac1, mac0, 18, 0);
 MODULE_PARM_DESC(mac0, "MAC address for GT96100 ethernet port 0");
 MODULE_PARM_DESC(mac1, "MAC address for GT96100 ethernet port 1");
 
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index c8dc40214a..79a8fbcf5f 100644
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -280,7 +280,7 @@ static unsigned long rand;
 
 MODULE_AUTHOR("Klaus Kudielka");
 MODULE_DESCRIPTION("Driver for high-speed SCC boards");
-MODULE_PARM(io, "1-" __MODULE_STRING(MAX_NUM_DEVS) "i");
+module_param_array(io, int, NULL, 0);
 MODULE_LICENSE("GPL");
 
 static void __exit dmascc_exit(void)
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index dc5e9d59de..d81a8e1eeb 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -1012,7 +1012,7 @@ static void __exit mkiss_exit_driver(void)
 
 MODULE_AUTHOR("Ralf Baechle DL5RB <ralf@linux-mips.org>");
 MODULE_DESCRIPTION("KISS driver for AX.25 over TTYs");
-MODULE_PARM(crc_force, "i");
+module_param(crc_force, int, 0);
 MODULE_PARM_DESC(crc_force, "crc [0 = auto | 1 = none | 2 = flexnet | 3 = smack]");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_LDISC(N_AX25);
diff --git a/drivers/net/hplance.c b/drivers/net/hplance.c
index d8410634bc..6856934646 100644
--- a/drivers/net/hplance.c
+++ b/drivers/net/hplance.c
@@ -217,7 +217,7 @@ static int hplance_close(struct net_device *dev)
 
 int __init hplance_init_module(void)
 {
-        return dio_module_init(&hplance_driver);
+        return dio_register_driver(&hplance_driver);
 }
 
 void __exit hplance_cleanup_module(void)
diff --git a/drivers/net/hydra.c b/drivers/net/hydra.c
index 6e0ca7340a..d9fb8e74e6 100644
--- a/drivers/net/hydra.c
+++ b/drivers/net/hydra.c
@@ -242,7 +242,7 @@ static void __devexit hydra_remove_one(struct zorro_dev *z)
 
 static int __init hydra_init_module(void)
 {
-    return zorro_module_init(&hydra_driver);
+    return zorro_register_driver(&hydra_driver);
 }
 
 static void __exit hydra_cleanup_module(void)
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 9b8295ee06..ae71ed57c1 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -44,6 +44,7 @@
 #include <linux/ip.h>
 #include <linux/tcp.h>
 #include <linux/udp.h>
+#include <linux/dma-mapping.h>
 
 #ifdef CONFIG_SERIAL_8250
 #include <linux/serial_core.h>
@@ -1195,17 +1196,17 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         int err, pci_using_dac;
 
         /* Configure DMA attributes. */
-        err = pci_set_dma_mask(pdev, 0xffffffffffffffffULL);
+        err = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
         if (!err) {
                 pci_using_dac = 1;
-                err = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL);
+                err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
                 if (err < 0) {
                         printk(KERN_ERR "%s: Unable to obtain 64 bit DMA "
                                "for consistent allocations\n", pci_name(pdev));
                         goto out;
                 }
         } else {
-                err = pci_set_dma_mask(pdev, 0xffffffffULL);
+                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
                 if (err) {
                         printk(KERN_ERR "%s: No usable DMA configuration, "
                                "aborting.\n", pci_name(pdev));
diff --git a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c
index 6070195b87..98fa5319e5 100644
--- a/drivers/net/irda/irport.c
+++ b/drivers/net/irda/irport.c
@@ -1118,9 +1118,9 @@ static void __exit irport_cleanup(void)
         }
 }
 
-MODULE_PARM(io, "1-4i");
+module_param_array(io, int, NULL, 0);
 MODULE_PARM_DESC(io, "Base I/O addresses");
-MODULE_PARM(irq, "1-4i");
+module_param_array(irq, int, NULL, 0);
 MODULE_PARM_DESC(irq, "IRQ lines");
 
 MODULE_AUTHOR("Dag Brattli <dagb@cs.uit.no>");
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index 83141a3ff5..cc7ff8f00e 100644
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -207,7 +207,7 @@ static int __init nsc_ircc_init(void)
         /* Register with PnP subsystem to detect disable ports */
         ret = pnp_register_driver(&nsc_ircc_pnp_driver);
 
-        if (ret >= 0)
+        if (!ret)
                 pnp_registered = 1;
 
         ret = -ENODEV;
@@ -812,7 +812,7 @@ static int nsc_ircc_init_39x(nsc_chip_t *chip, chipio_t *info)
         int cfg_base = info->cfg_base;
         int enabled;
 
-        /* User is shure about his config... accept it. */
+        /* User is sure about his config... accept it. */
         IRDA_DEBUG(2, "%s(): nsc_ircc_init_39x (user settings): "
                    "io=0x%04x, irq=%d, dma=%d\n", 
                    __FUNCTION__, info->fir_base, info->irq, info->dma);
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c
index f7b7238d83..957888de3d 100644
--- a/drivers/net/lasi_82596.c
+++ b/drivers/net/lasi_82596.c
@@ -177,7 +177,7 @@ static int i596_debug = (DEB_SERIOUS|DEB_PROBE);
 MODULE_AUTHOR("Richard Hirst");
 MODULE_DESCRIPTION("i82596 driver");
 MODULE_LICENSE("GPL");
-MODULE_PARM(i596_debug, "i");
+module_param(i596_debug, int, 0);
 MODULE_PARM_DESC(i596_debug, "lasi_82596 debug mask");
 
 /* Copy frames shorter than rx_copybreak, otherwise pass on up in
@@ -1520,9 +1520,9 @@ static void set_multicast_list(struct net_device *dev)
         }
 }
 
-MODULE_PARM(debug, "i");
-MODULE_PARM_DESC(debug, "lasi_82596 debug mask");
 static int debug = -1;
+module_param(debug, int, 0);
+MODULE_PARM_DESC(debug, "lasi_82596 debug mask");
 
 static int num_drivers;
 static struct net_device *netdevs[MAX_DRIVERS];
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 0c13795dca..b79d6e8d30 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -172,7 +172,7 @@ static struct net_device_stats *get_stats(struct net_device *dev)
 
         memset(stats, 0, sizeof(struct net_device_stats));
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 struct net_device_stats *lb_stats;
 
                 lb_stats = &per_cpu(loopback_stats, i);
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c
index f65b0db111..cd3c9a5a98 100644
--- a/drivers/net/mac89x0.c
+++ b/drivers/net/mac89x0.c
@@ -629,7 +629,7 @@ static int set_mac_address(struct net_device *dev, void *addr)
 static struct net_device *dev_cs89x0;
 static int debug;
 
-MODULE_PARM(debug, "i");
+module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, "CS89[02]0 debug level (0-5)");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/net/mace.c b/drivers/net/mace.c
index 2a5add257b..77792b2860 100644
--- a/drivers/net/mace.c
+++ b/drivers/net/mace.c
@@ -1042,7 +1042,7 @@ static void __exit mace_cleanup(void)
 
 MODULE_AUTHOR("Paul Mackerras");
 MODULE_DESCRIPTION("PowerMac MACE driver.");
-MODULE_PARM(port_aaui, "i");
+module_param(port_aaui, int, 0);
 MODULE_PARM_DESC(port_aaui, "MACE uses AAUI port (0-1)");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index e23655f504..d644bf3a93 100644
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -62,7 +62,7 @@ MODULE_DESCRIPTION("SGI O2 Builtin Fast Ethernet driver");
 
 #ifdef HAVE_TX_TIMEOUT
 static int timeout = TX_TIMEOUT;
-MODULE_PARM(timeout, "i");
+module_param(timeout, int, 0);
 #endif
 
 /*
diff --git a/drivers/net/ne-h8300.c b/drivers/net/ne-h8300.c
index aaebd28a19..7ea3d596ac 100644
--- a/drivers/net/ne-h8300.c
+++ b/drivers/net/ne-h8300.c
@@ -601,9 +601,9 @@ static int io[MAX_NE_CARDS];
 static int irq[MAX_NE_CARDS];
 static int bad[MAX_NE_CARDS];   /* 0xbad = bad sig or no reset ack */
 
-MODULE_PARM(io, "1-" __MODULE_STRING(MAX_NE_CARDS) "i");
-MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_NE_CARDS) "i");
-MODULE_PARM(bad, "1-" __MODULE_STRING(MAX_NE_CARDS) "i");
+module_param_array(io, int, NULL, 0);
+module_param_array(irq, int, NULL, 0);
+module_param_array(bad, int, NULL, 0);
 MODULE_PARM_DESC(io, "I/O base address(es)");
 MODULE_PARM_DESC(irq, "IRQ number(s)");
 MODULE_DESCRIPTION("H8/300 NE2000 Ethernet driver");
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index e3ebb5803b..d11821dd86 100644
--- a/drivers/net/ne2k-pci.c
+++ b/drivers/net/ne2k-pci.c
@@ -117,7 +117,7 @@ enum ne2k_pci_chipsets {
 };
 
 
-static const struct {
+static struct {
         char *name;
         int flags;
 } pci_clone_list[] __devinitdata = {
diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c
index 2ab01a5d1d..a68bf474f6 100644
--- a/drivers/net/ni5010.c
+++ b/drivers/net/ni5010.c
@@ -766,8 +766,8 @@ static void ni5010_show_registers(struct net_device *dev)
 #ifdef MODULE
 static struct net_device *dev_ni5010;
 
-MODULE_PARM(io, "i");
-MODULE_PARM(irq, "i");
+module_param(io, int, 0);
+module_param(irq, int, 0);
 MODULE_PARM_DESC(io, "ni5010 I/O base address");
 MODULE_PARM_DESC(irq, "ni5010 IRQ number");
 
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 0fede50abd..8e9b1a537d 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -1828,10 +1828,10 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
         int using_dac = 0;
 
         /* See if we can set the dma mask early on; failure is fatal. */
-        if (sizeof(dma_addr_t) == 8 && 
-                !pci_set_dma_mask(pci_dev, 0xffffffffffffffffULL)) {
+        if (sizeof(dma_addr_t) == 8 &&
+                !pci_set_dma_mask(pci_dev, DMA_64BIT_MASK)) {
                 using_dac = 1;
-        } else if (!pci_set_dma_mask(pci_dev, 0xffffffff)) {
+        } else if (!pci_set_dma_mask(pci_dev, DMA_32BIT_MASK)) {
                 using_dac = 0;
         } else {
                 printk(KERN_WARNING "ns83820.c: pci_set_dma_mask failed!\n");
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 253440a980..b82191d2be 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -1693,7 +1693,7 @@ static irqreturn_t sis900_interrupt(int irq, void *dev_instance, struct pt_regs
  *
  *      Process receive interrupt events, 
  *      put buffer to higher layer and refill buffer pool
- *      Note: This fucntion is called by interrupt handler, 
+ *      Note: This function is called by interrupt handler,
  *      don't do "too much" work here
  */
 
@@ -1840,7 +1840,7 @@ static int sis900_rx(struct net_device *net_dev)
  *
  *      Check for error condition and free socket buffer etc 
  *      schedule for more transmission as needed
- *      Note: This fucntion is called by interrupt handler, 
+ *      Note: This function is called by interrupt handler,
  *      don't do "too much" work here
  */
 
@@ -2283,7 +2283,7 @@ static void set_rx_mode(struct net_device *net_dev)
         int i, table_entries;
         u32 rx_mode;
 
-        /* 635 Hash Table entires = 256(2^16) */
+        /* 635 Hash Table entries = 256(2^16) */
         if((sis_priv->chipset_rev >= SIS635A_900_REV) ||
                         (sis_priv->chipset_rev == SIS900B_900_REV))
                 table_entries = 16;
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c
index 01bdb23340..d4c0002b43 100644
--- a/drivers/net/sun3lance.c
+++ b/drivers/net/sun3lance.c
@@ -71,7 +71,7 @@ static int lance_debug = LANCE_DEBUG;
 #else
 static int lance_debug = 1;
 #endif
-MODULE_PARM(lance_debug, "i");
+module_param(lance_debug, int, 0);
 MODULE_PARM_DESC(lance_debug, "SUN3 Lance debug level (0-3)");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index b5473325bf..964c096448 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -69,8 +69,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.54"
-#define DRV_MODULE_RELDATE      "Mar 23, 2006"
+#define DRV_MODULE_VERSION      "3.55"
+#define DRV_MODULE_RELDATE      "Mar 27, 2006"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -497,21 +497,20 @@ static void tg3_write_mem(struct tg3 *tp, u32 off, u32 val)
         unsigned long flags;
 
         spin_lock_irqsave(&tp->indirect_lock, flags);
-        pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, off);
-        pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_DATA, val);
+        if (tp->write32 != tg3_write_indirect_reg32) {
+                tw32_f(TG3PCI_MEM_WIN_BASE_ADDR, off);
+                tw32_f(TG3PCI_MEM_WIN_DATA, val);
 
-        /* Always leave this as zero. */
-        pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
-        spin_unlock_irqrestore(&tp->indirect_lock, flags);
-}
+                /* Always leave this as zero. */
+                tw32_f(TG3PCI_MEM_WIN_BASE_ADDR, 0);
+        } else {
+                pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, off);
+                pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_DATA, val);
 
-static void tg3_write_mem_fast(struct tg3 *tp, u32 off, u32 val)
-{
-        /* If no workaround is needed, write to mem space directly */
-        if (tp->write32 != tg3_write_indirect_reg32)
-                tw32(NIC_SRAM_WIN_BASE + off, val);
-        else
-                tg3_write_mem(tp, off, val);
+                /* Always leave this as zero. */
+                pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
+        }
+        spin_unlock_irqrestore(&tp->indirect_lock, flags);
 }
 
 static void tg3_read_mem(struct tg3 *tp, u32 off, u32 *val)
@@ -519,11 +518,19 @@ static void tg3_read_mem(struct tg3 *tp, u32 off, u32 *val)
         unsigned long flags;
 
         spin_lock_irqsave(&tp->indirect_lock, flags);
-        pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, off);
-        pci_read_config_dword(tp->pdev, TG3PCI_MEM_WIN_DATA, val);
+        if (tp->write32 != tg3_write_indirect_reg32) {
+                tw32_f(TG3PCI_MEM_WIN_BASE_ADDR, off);
+                *val = tr32(TG3PCI_MEM_WIN_DATA);
 
-        /* Always leave this as zero. */
-        pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
+                /* Always leave this as zero. */
+                tw32_f(TG3PCI_MEM_WIN_BASE_ADDR, 0);
+        } else {
+                pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, off);
+                pci_read_config_dword(tp->pdev, TG3PCI_MEM_WIN_DATA, val);
+
+                /* Always leave this as zero. */
+                pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
+        }
         spin_unlock_irqrestore(&tp->indirect_lock, flags);
 }
 
@@ -1367,12 +1374,12 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
                 }
         }
 
+        tg3_write_sig_post_reset(tp, RESET_KIND_SHUTDOWN);
+
         /* Finally, set the new power state. */
         pci_write_config_word(tp->pdev, pm + PCI_PM_CTRL, power_control);
         udelay(100);    /* Delay after power state change */
 
-        tg3_write_sig_post_reset(tp, RESET_KIND_SHUTDOWN);
-
         return 0;
 }
 
@@ -3600,7 +3607,7 @@ static inline int tg3_40bit_overflow_test(struct tg3 *tp, dma_addr_t mapping,
                                           int len)
 {
 #if defined(CONFIG_HIGHMEM) && (BITS_PER_LONG == 64)
-        if (tp->tg3_flags2 & TG3_FLG2_5780_CLASS)
+        if (tp->tg3_flags & TG3_FLAG_40BIT_DMA_BUG)
                 return (((u64) mapping + len) > DMA_40BIT_MASK);
         return 0;
 #else
@@ -6461,6 +6468,9 @@ static void tg3_timer(unsigned long __opaque)
 {
         struct tg3 *tp = (struct tg3 *) __opaque;
 
+        if (tp->irq_sync)
+                goto restart_timer;
+
         spin_lock(&tp->lock);
 
         if (!(tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)) {
@@ -6537,11 +6547,11 @@ static void tg3_timer(unsigned long __opaque)
                 if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {
                         u32 val;
 
-                        tg3_write_mem_fast(tp, NIC_SRAM_FW_CMD_MBOX,
-                                           FWCMD_NICDRV_ALIVE2);
-                        tg3_write_mem_fast(tp, NIC_SRAM_FW_CMD_LEN_MBOX, 4);
+                        tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX,
+                                      FWCMD_NICDRV_ALIVE2);
+                        tg3_write_mem(tp, NIC_SRAM_FW_CMD_LEN_MBOX, 4);
                         /* 5 seconds timeout */
-                        tg3_write_mem_fast(tp, NIC_SRAM_FW_CMD_DATA_MBOX, 5);
+                        tg3_write_mem(tp, NIC_SRAM_FW_CMD_DATA_MBOX, 5);
                         val = tr32(GRC_RX_CPU_EVENT);
                         val |= (1 << 14);
                         tw32(GRC_RX_CPU_EVENT, val);
@@ -6551,6 +6561,7 @@ static void tg3_timer(unsigned long __opaque)
 
         spin_unlock(&tp->lock);
 
+restart_timer:
         tp->timer.expires = jiffies + tp->timer_offset;
         add_timer(&tp->timer);
 }
@@ -8399,8 +8410,11 @@ static int tg3_run_loopback(struct tg3 *tp, int loopback_mode)
                 }
                 mac_mode = (tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK) |
                            MAC_MODE_LINK_POLARITY | MAC_MODE_PORT_MODE_GMII;
-                if ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5401)
+                if ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5401) {
                         mac_mode &= ~MAC_MODE_LINK_POLARITY;
+                        tg3_writephy(tp, MII_TG3_EXT_CTRL,
+                                     MII_TG3_EXT_CTRL_LNK3_LED_MODE);
+                }
                 tw32(MAC_MODE, mac_mode);
         }
         else
@@ -10531,6 +10545,7 @@ static int __devinit tg3_get_device_address(struct tg3 *tp)
 {
         struct net_device *dev = tp->dev;
         u32 hi, lo, mac_offset;
+        int addr_ok = 0;
 
 #ifdef CONFIG_SPARC64
         if (!tg3_get_macaddr_sparc(tp))
@@ -10560,29 +10575,34 @@ static int __devinit tg3_get_device_address(struct tg3 *tp)
                 dev->dev_addr[3] = (lo >> 16) & 0xff;
                 dev->dev_addr[4] = (lo >>  8) & 0xff;
                 dev->dev_addr[5] = (lo >>  0) & 0xff;
-        }
-        /* Next, try NVRAM. */
-        else if (!(tp->tg3_flags & TG3_FLG2_SUN_570X) &&
-                 !tg3_nvram_read(tp, mac_offset + 0, &hi) &&
-                 !tg3_nvram_read(tp, mac_offset + 4, &lo)) {
-                dev->dev_addr[0] = ((hi >> 16) & 0xff);
-                dev->dev_addr[1] = ((hi >> 24) & 0xff);
-                dev->dev_addr[2] = ((lo >>  0) & 0xff);
-                dev->dev_addr[3] = ((lo >>  8) & 0xff);
-                dev->dev_addr[4] = ((lo >> 16) & 0xff);
-                dev->dev_addr[5] = ((lo >> 24) & 0xff);
-        }
-        /* Finally just fetch it out of the MAC control regs. */
-        else {
-                hi = tr32(MAC_ADDR_0_HIGH);
-                lo = tr32(MAC_ADDR_0_LOW);
 
-                dev->dev_addr[5] = lo & 0xff;
-                dev->dev_addr[4] = (lo >> 8) & 0xff;
-                dev->dev_addr[3] = (lo >> 16) & 0xff;
-                dev->dev_addr[2] = (lo >> 24) & 0xff;
-                dev->dev_addr[1] = hi & 0xff;
-                dev->dev_addr[0] = (hi >> 8) & 0xff;
+                /* Some old bootcode may report a 0 MAC address in SRAM */
+                addr_ok = is_valid_ether_addr(&dev->dev_addr[0]);
+        }
+        if (!addr_ok) {
+                /* Next, try NVRAM. */
+                if (!(tp->tg3_flags & TG3_FLG2_SUN_570X) &&
+                    !tg3_nvram_read(tp, mac_offset + 0, &hi) &&
+                    !tg3_nvram_read(tp, mac_offset + 4, &lo)) {
+                        dev->dev_addr[0] = ((hi >> 16) & 0xff);
+                        dev->dev_addr[1] = ((hi >> 24) & 0xff);
+                        dev->dev_addr[2] = ((lo >>  0) & 0xff);
+                        dev->dev_addr[3] = ((lo >>  8) & 0xff);
+                        dev->dev_addr[4] = ((lo >> 16) & 0xff);
+                        dev->dev_addr[5] = ((lo >> 24) & 0xff);
+                }
+                /* Finally just fetch it out of the MAC control regs. */
+                else {
+                        hi = tr32(MAC_ADDR_0_HIGH);
+                        lo = tr32(MAC_ADDR_0_LOW);
+
+                        dev->dev_addr[5] = lo & 0xff;
+                        dev->dev_addr[4] = (lo >> 8) & 0xff;
+                        dev->dev_addr[3] = (lo >> 16) & 0xff;
+                        dev->dev_addr[2] = (lo >> 24) & 0xff;
+                        dev->dev_addr[1] = hi & 0xff;
+                        dev->dev_addr[0] = (hi >> 8) & 0xff;
+                }
         }
 
         if (!is_valid_ether_addr(&dev->dev_addr[0])) {
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index ee48bfd673..f560941020 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -513,7 +513,7 @@ struct mii_phy {
     u_char  *rst;           /* Start of reset sequence in SROM           */
     u_int mc;               /* Media Capabilities                        */
     u_int ana;              /* NWay Advertisement                        */
-    u_int fdx;              /* Full DupleX capabilites for each media    */
+    u_int fdx;              /* Full DupleX capabilities for each media   */
     u_int ttm;              /* Transmit Threshold Mode for each media    */
     u_int mci;              /* 21142 MII Connector Interrupt info        */
 };
@@ -4160,7 +4160,7 @@ get_hw_addr(struct net_device *dev)
     ** If the address starts with 00 a0, we have to bit-reverse
     ** each byte of the address.
     */
-    if ( (_machine & _MACH_Pmac) &&
+    if ( machine_is(powermac) &&
          (dev->dev_addr[0] == 0) &&
          (dev->dev_addr[1] == 0xa0) )
     {
diff --git a/drivers/net/tulip/pnic2.c b/drivers/net/tulip/pnic2.c
index 55f4a9a631..ab985023fc 100644
--- a/drivers/net/tulip/pnic2.c
+++ b/drivers/net/tulip/pnic2.c
@@ -199,7 +199,7 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)
                        /* negotiation ended successfully */
 
                        /* get the link partners reply and mask out all but
-                        * bits 24-21 which show the partners capabilites
+                        * bits 24-21 which show the partners capabilities
                         * and match those to what we advertised
                         *
                         * then begin to interpret the results of the negotiation.
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index cde35dd879..c1ce87a5f8 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -208,7 +208,7 @@ static const struct typhoon_card_info typhoon_card_info[] __devinitdata = {
 };
 
 /* Notes on the new subsystem numbering scheme:
- * bits 0-1 indicate crypto capabilites: (0) variable, (1) DES, or (2) 3DES
+ * bits 0-1 indicate crypto capabilities: (0) variable, (1) DES, or (2) 3DES
  * bit 4 indicates if this card has secured firmware (we don't support it)
  * bit 8 indicates if this is a (0) copper or (1) fiber card
  * bits 12-16 indicate card type: (0) client and (1) server
@@ -788,7 +788,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)
         /* we have two rings to choose from, but we only use txLo for now
          * If we start using the Hi ring as well, we'll need to update
          * typhoon_stop_runtime(), typhoon_interrupt(), typhoon_num_free_tx(),
-         * and TXHI_ENTIRES to match, as well as update the TSO code below
+         * and TXHI_ENTRIES to match, as well as update the TSO code below
          * to get the right DMA address
          */
         txRing = &tp->txLoRing;
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 1ff5de076d..4505540e3c 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -105,6 +105,7 @@
 #include <linux/delay.h>
 #include <net/syncppp.h>
 #include <linux/hdlc.h>
+#include <linux/mutex.h>
 
 /* Version */
 static const char version[] = "$Id: dscc4.c,v 1.173 2003/09/20 23:55:34 romieu Exp $ for Linux\n";
@@ -112,7 +113,7 @@ static int debug;
 static int quartz;
 
 #ifdef CONFIG_DSCC4_PCI_RST
-static DECLARE_MUTEX(dscc4_sem);
+static DEFINE_MUTEX(dscc4_mutex);
 static u32 dscc4_pci_config_store[16];
 #endif
 
@@ -1018,7 +1019,7 @@ static void dscc4_pci_reset(struct pci_dev *pdev, void __iomem *ioaddr)
 {
         int i;
 
-        down(&dscc4_sem);
+        mutex_lock(&dscc4_mutex);
         for (i = 0; i < 16; i++)
                 pci_read_config_dword(pdev, i << 2, dscc4_pci_config_store + i);
 
@@ -1039,7 +1040,7 @@ static void dscc4_pci_reset(struct pci_dev *pdev, void __iomem *ioaddr)
 
         for (i = 0; i < 16; i++)
                 pci_write_config_dword(pdev, i << 2, dscc4_pci_config_store[i]);
-        up(&dscc4_sem);
+        mutex_unlock(&dscc4_mutex);
 }
 #else
 #define dscc4_pci_reset(pdev,ioaddr)    do {} while (0)
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index 9d3b51c3ef..29a756dd97 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -577,8 +577,8 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
            We set both dma_mask and consistent_dma_mask to 28 bits
            and pray pci_alloc_consistent() will use this info. It should
            work on most platforms */
-        if (pci_set_consistent_dma_mask(pdev, 0x0FFFFFFF) ||
-            pci_set_dma_mask(pdev, 0x0FFFFFFF)) {
+        if (pci_set_consistent_dma_mask(pdev, DMA_28BIT_MASK) ||
+            pci_set_dma_mask(pdev, DMA_28BIT_MASK)) {
                 printk(KERN_ERR "wanXL: No usable DMA configuration\n");
                 return -EIO;
         }
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 6a1033ec06..fd17aa8491 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -27,6 +27,7 @@ config NET_RADIO
 
 config NET_WIRELESS_RTNETLINK
         bool "Wireless Extension API over RtNetlink"
+        depends on NET_RADIO
         ---help---
           Support the Wireless Extension API over the RtNetlink socket
           in addition to the traditional ioctl interface (selected above).
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index 6fd0bf7368..8dfdfbd596 100644
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -3858,7 +3858,7 @@ static int orinoco_ioctl_setscan(struct net_device *dev,
         unsigned long flags;
 
         /* Note : you may have realised that, as this is a SET operation,
-         * this is priviledged and therefore a normal user can't
+         * this is privileged and therefore a normal user can't
          * perform scanning.
          * This is not an error, while the device perform scanning,
          * traffic doesn't flow, so it's a perfect DoS...
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index e5bb9f5ae4..989599ad33 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -747,7 +747,7 @@ prism54_get_essid(struct net_device *ndev, struct iw_request_info *info,
 
         if (essid->length) {
                 dwrq->flags = 1;        /* set ESSID to ON for Wireless Extensions */
-                /* if it is to big, trunk it */
+                /* if it is too big, trunk it */
                 dwrq->length = min((u8)IW_ESSID_MAX_SIZE, essid->length);
         } else {
                 dwrq->flags = 0;
diff --git a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/prism54/islpci_hotplug.c
index b41d666fea..bfa0cc319a 100644
--- a/drivers/net/wireless/prism54/islpci_hotplug.c
+++ b/drivers/net/wireless/prism54/islpci_hotplug.c
@@ -22,6 +22,7 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/init.h> /* For __init, __exit */
+#include <linux/dma-mapping.h>
 
 #include "prismcompat.h"
 #include "islpci_dev.h"
@@ -124,7 +125,7 @@ prism54_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         }
 
         /* enable PCI DMA */
-        if (pci_set_dma_mask(pdev, 0xffffffff)) {
+        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
                 printk(KERN_ERR "%s: 32-bit PCI DMA not supported", DRV_NAME);
                 goto do_pci_disable_device;
         }
diff --git a/drivers/net/zorro8390.c b/drivers/net/zorro8390.c
index 7610216035..8037e5806d 100644
--- a/drivers/net/zorro8390.c
+++ b/drivers/net/zorro8390.c
@@ -426,7 +426,7 @@ static void __devexit zorro8390_remove_one(struct zorro_dev *z)
 
 static int __init zorro8390_init_module(void)
 {
-    return zorro_module_init(&zorro8390_driver);
+    return zorro_register_driver(&zorro8390_driver);
 }
 
 static void __exit zorro8390_cleanup_module(void)
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index 330d3869b4..fc4bc9b94c 100644
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -217,11 +217,10 @@ static void oprofile_end_trace(struct oprofile_cpu_buffer * cpu_buf)
         cpu_buf->tracing = 0;
 }
 
-void oprofile_add_sample(struct pt_regs * const regs, unsigned long event)
+void oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs,
+                                unsigned long event, int is_kernel)
 {
         struct oprofile_cpu_buffer * cpu_buf = &cpu_buffer[smp_processor_id()];
-        unsigned long pc = profile_pc(regs);
-        int is_kernel = !user_mode(regs);
 
         if (!backtrace_depth) {
                 log_sample(cpu_buf, pc, is_kernel, event);
@@ -238,6 +237,14 @@ void oprofile_add_sample(struct pt_regs * const regs, unsigned long event)
         oprofile_end_trace(cpu_buf);
 }
 
+void oprofile_add_sample(struct pt_regs * const regs, unsigned long event)
+{
+        int is_kernel = !user_mode(regs);
+        unsigned long pc = profile_pc(regs);
+
+        oprofile_add_ext_sample(pc, regs, event, is_kernel);
+}
+
 void oprofile_add_pc(unsigned long pc, int is_kernel, unsigned long event)
 {
         struct oprofile_cpu_buffer * cpu_buf = &cpu_buffer[smp_processor_id()];
diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
index e94b1e4a2a..f0acb661c2 100644
--- a/drivers/oprofile/oprofile_stats.c
+++ b/drivers/oprofile/oprofile_stats.c
@@ -22,7 +22,7 @@ void oprofile_reset_stats(void)
         struct oprofile_cpu_buffer * cpu_buf; 
         int i;
  
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 cpu_buf = &cpu_buffer[i]; 
                 cpu_buf->sample_received = 0;
                 cpu_buf->sample_lost_overflow = 0;
@@ -46,7 +46,7 @@ void oprofile_create_stats_files(struct super_block * sb, struct dentry * root)
         if (!dir)
                 return;
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 cpu_buf = &cpu_buffer[i]; 
                 snprintf(buf, 10, "cpu%d", i);
                 cpudir = oprofilefs_mkdir(sb, dir, buf);
diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
index d6bae69974..b62da9b0cb 100644
--- a/drivers/oprofile/oprofilefs.c
+++ b/drivers/oprofile/oprofilefs.c
@@ -130,7 +130,7 @@ static struct file_operations ulong_ro_fops = {
 
 
 static struct dentry * __oprofilefs_create_file(struct super_block * sb,
-        struct dentry * root, char const * name, struct file_operations * fops,
+        struct dentry * root, char const * name, const struct file_operations * fops,
         int perm)
 {
         struct dentry * dentry;
@@ -203,7 +203,7 @@ int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
 
  
 int oprofilefs_create_file(struct super_block * sb, struct dentry * root,
-        char const * name, struct file_operations * fops)
+        char const * name, const struct file_operations * fops)
 {
         if (!__oprofilefs_create_file(sb, root, name, fops, 0644))
                 return -EFAULT;
@@ -212,7 +212,7 @@ int oprofilefs_create_file(struct super_block * sb, struct dentry * root,
 
 
 int oprofilefs_create_file_perm(struct super_block * sb, struct dentry * root,
-        char const * name, struct file_operations * fops, int perm)
+        char const * name, const struct file_operations * fops, int perm)
 {
         if (!__oprofilefs_create_file(sb, root, name, fops, perm))
                 return -EFAULT;
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index 3627a2d7f7..298f2ddb2c 100644
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -499,11 +499,16 @@ static int led_halt(struct notifier_block *, unsigned long, void *);
 static struct notifier_block led_notifier = {
         .notifier_call = led_halt,
 };
+static int notifier_disabled = 0;
 
 static int led_halt(struct notifier_block *nb, unsigned long event, void *buf) 
 {
         char *txt;
-        
+
+        if (notifier_disabled)
+                return NOTIFY_OK;
+
+        notifier_disabled = 1;
         switch (event) {
         case SYS_RESTART:       txt = "SYSTEM RESTART";
                                 break;
@@ -527,7 +532,6 @@ static int led_halt(struct notifier_block *nb, unsigned long event, void *buf)
                 if (led_func_ptr)
                         led_func_ptr(0xff); /* turn all LEDs ON */
         
-        unregister_reboot_notifier(&led_notifier);
         return NOTIFY_OK;
 }
 
@@ -758,6 +762,12 @@ not_found:
         return 1;
 }
 
+static void __exit led_exit(void)
+{
+        unregister_reboot_notifier(&led_notifier);
+        return;
+}
+
 #ifdef CONFIG_PROC_FS
 module_init(led_create_procfs)
 #endif
diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c
index 54b2b7f20b..0bcab83b40 100644
--- a/drivers/parisc/power.c
+++ b/drivers/parisc/power.c
@@ -251,7 +251,8 @@ static int __init power_init(void)
         }
 
         /* Register a call for panic conditions. */
-        notifier_chain_register(&panic_notifier_list, &parisc_panic_block);
+        atomic_notifier_chain_register(&panic_notifier_list,
+                        &parisc_panic_block);
 
         tasklet_enable(&power_tasklet);
 
@@ -264,7 +265,8 @@ static void __exit power_exit(void)
                 return;
 
         tasklet_disable(&power_tasklet);
-        notifier_chain_unregister(&panic_notifier_list, &parisc_panic_block);
+        atomic_notifier_chain_unregister(&panic_notifier_list,
+                        &parisc_panic_block);
         power_tasklet.func = NULL;
         pdc_soft_power_button(0);
 }
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 5d47c5965c..0821747e44 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -1724,9 +1724,7 @@ printk("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n", PAGE0->mem_boot.hpa,
                 sba_dev->chip_resv.start = PCI_F_EXTEND | 0xfef00000UL;
                 sba_dev->chip_resv.end   = PCI_F_EXTEND | (0xff000000UL - 1) ;
                 err = request_resource(&iomem_resource, &(sba_dev->chip_resv));
-                if (err < 0) {
-                        BUG();
-                }
+                BUG_ON(err < 0);
 
         } else if (IS_PLUTO(sba_dev->iodc)) {
                 int err;
@@ -2185,8 +2183,7 @@ void sba_directed_lmmio(struct parisc_device *pci_hba, struct resource *r)
         int i;
         int rope = (pci_hba->hw_path & (ROPES_PER_IOC-1));  /* rope # */
 
-        if ((t!=HPHW_IOA) && (t!=HPHW_BCPORT))
-                BUG();
+        BUG_ON((t!=HPHW_IOA) && (t!=HPHW_BCPORT));
 
         r->start = r->end = 0;
 
@@ -2228,8 +2225,7 @@ void sba_distributed_lmmio(struct parisc_device *pci_hba, struct resource *r )
         int base, size;
         int rope = (pci_hba->hw_path & (ROPES_PER_IOC-1));  /* rope # */
 
-        if ((t!=HPHW_IOA) && (t!=HPHW_BCPORT))
-                BUG();
+        BUG_ON((t!=HPHW_IOA) && (t!=HPHW_BCPORT));
 
         r->start = r->end = 0;
 
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index ba971fecd0..ad6d3b28a3 100644
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -157,8 +157,8 @@ superio_init(struct pci_dev *pcidev)
         if (sio->suckyio_irq_enabled)                                       
                 return;
 
-        if (!pdev) BUG();
-        if (!sio->usb_pdev) BUG();
+        BUG_ON(!pdev);
+        BUG_ON(!sio->usb_pdev);
 
         /* use the IRQ iosapic found for USB INT D... */
         pdev->irq = sio->usb_pdev->irq;
@@ -474,8 +474,7 @@ superio_probe(struct pci_dev *dev, const struct pci_device_id *id)
                 dev->subsystem_vendor, dev->subsystem_device,
                 dev->class);
 
-        if (!sio->suckyio_irq_enabled)
-                BUG(); /* Enabled by PCI_FIXUP_FINAL */
+        BUG_ON(!sio->suckyio_irq_enabled);      /* Enabled by PCI_FIXUP_FINAL */
 
         if (dev->device == PCI_DEVICE_ID_NS_87560_LIO) {        /* Function 1 */
                 superio_parport_init();
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 9302b8fd74..d5890027f8 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -3126,9 +3126,9 @@ parport_pc_find_isa_ports (int autoirq, int autodma)
  * autoirq is PARPORT_IRQ_NONE, PARPORT_IRQ_AUTO, or PARPORT_IRQ_PROBEONLY
  * autodma is PARPORT_DMA_NONE or PARPORT_DMA_AUTO
  */
-static int __init parport_pc_find_ports (int autoirq, int autodma)
+static void __init parport_pc_find_ports (int autoirq, int autodma)
 {
-        int count = 0, r;
+        int count = 0, err;
 
 #ifdef CONFIG_PARPORT_PC_SUPERIO
         detect_and_report_winbond ();
@@ -3140,23 +3140,17 @@ static int __init parport_pc_find_ports (int autoirq, int autodma)
 
         /* PnP ports, skip detection if SuperIO already found them */
         if (!count) {
-                r = pnp_register_driver (&parport_pc_pnp_driver);
-                if (r >= 0) {
+                err = pnp_register_driver (&parport_pc_pnp_driver);
+                if (!err)
                         pnp_registered_parport = 1;
-                        count += r;
-                }
         }
 
         /* ISA ports and whatever (see asm/parport.h). */
-        count += parport_pc_find_nonpci_ports (autoirq, autodma);
-
-        r = pci_register_driver (&parport_pc_pci_driver);
-        if (r)
-                return r;
-        pci_registered_parport = 1;
-        count += 1;
+        parport_pc_find_nonpci_ports (autoirq, autodma);
 
-        return count;
+        err = pci_register_driver (&parport_pc_pci_driver);
+        if (!err)
+                pci_registered_parport = 1;
 }
 
 /*
@@ -3381,8 +3375,6 @@ __setup("parport_init_mode=",parport_init_mode_setup);
 
 static int __init parport_pc_init(void)
 {
-        int count = 0;
-
         if (parse_parport_params())
                 return -EINVAL;
 
@@ -3395,12 +3387,11 @@ static int __init parport_pc_init(void)
                                 break;
                         if ((io_hi[i]) == PARPORT_IOHI_AUTO)
                                io_hi[i] = 0x400 + io[i];
-                        if (parport_pc_probe_port(io[i], io_hi[i],
-                                                  irqval[i], dmaval[i], NULL))
-                                count++;
+                        parport_pc_probe_port(io[i], io_hi[i],
+                                                  irqval[i], dmaval[i], NULL);
                 }
         } else
-                count += parport_pc_find_ports (irqval[0], dmaval[0]);
+                parport_pc_find_ports (irqval[0], dmaval[0]);
 
         return 0;
 }
diff --git a/drivers/parport/share.c b/drivers/parport/share.c
index ea62bed6bc..bbbfd79adb 100644
--- a/drivers/parport/share.c
+++ b/drivers/parport/share.c
@@ -32,6 +32,7 @@
 #include <linux/kmod.h>
 
 #include <linux/spinlock.h>
+#include <linux/mutex.h>
 #include <asm/irq.h>
 
 #undef PARPORT_PARANOID
@@ -50,7 +51,7 @@ static DEFINE_SPINLOCK(full_list_lock);
 
 static LIST_HEAD(drivers);
 
-static DECLARE_MUTEX(registration_lock);
+static DEFINE_MUTEX(registration_lock);
 
 /* What you can do to a port that's gone away.. */
 static void dead_write_lines (struct parport *p, unsigned char b){}
@@ -158,11 +159,11 @@ int parport_register_driver (struct parport_driver *drv)
         if (list_empty(&portlist))
                 get_lowlevel_driver ();
 
-        down(&registration_lock);
+        mutex_lock(&registration_lock);
         list_for_each_entry(port, &portlist, list)
                 drv->attach(port);
         list_add(&drv->list, &drivers);
-        up(&registration_lock);
+        mutex_unlock(&registration_lock);
 
         return 0;
 }
@@ -188,11 +189,11 @@ void parport_unregister_driver (struct parport_driver *drv)
 {
         struct parport *port;
 
-        down(&registration_lock);
+        mutex_lock(&registration_lock);
         list_del_init(&drv->list);
         list_for_each_entry(port, &portlist, list)
                 drv->detach(port);
-        up(&registration_lock);
+        mutex_unlock(&registration_lock);
 }
 
 static void free_port (struct parport *port)
@@ -366,7 +367,7 @@ void parport_announce_port (struct parport *port)
 #endif
 
         parport_proc_register(port);
-        down(&registration_lock);
+        mutex_lock(&registration_lock);
         spin_lock_irq(&parportlist_lock);
         list_add_tail(&port->list, &portlist);
         for (i = 1; i < 3; i++) {
@@ -383,7 +384,7 @@ void parport_announce_port (struct parport *port)
                 if (slave)
                         attach_driver_chain(slave);
         }
-        up(&registration_lock);
+        mutex_unlock(&registration_lock);
 }
 
 /**
@@ -409,7 +410,7 @@ void parport_remove_port(struct parport *port)
 {
         int i;
 
-        down(&registration_lock);
+        mutex_lock(&registration_lock);
 
         /* Spread the word. */
         detach_driver_chain (port);
@@ -436,7 +437,7 @@ void parport_remove_port(struct parport *port)
         }
         spin_unlock(&parportlist_lock);
 
-        up(&registration_lock);
+        mutex_unlock(&registration_lock);
 
         parport_proc_unregister(port);
 
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index 3eefe2cec7..46825fee3a 100644
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/drivers/pci/hotplug/rpadlpar_core.c
@@ -19,7 +19,7 @@
 #include <linux/string.h>
 
 #include <asm/pci-bridge.h>
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 #include <asm/rtas.h>
 #include <asm/vio.h>
 
@@ -27,7 +27,7 @@
 #include "rpaphp.h"
 #include "rpadlpar.h"
 
-static DECLARE_MUTEX(rpadlpar_sem);
+static DEFINE_MUTEX(rpadlpar_mutex);
 
 #define DLPAR_MODULE_NAME "rpadlpar_io"
 
@@ -300,7 +300,7 @@ int dlpar_add_slot(char *drc_name)
         int node_type;
         int rc = -EIO;
 
-        if (down_interruptible(&rpadlpar_sem))
+        if (mutex_lock_interruptible(&rpadlpar_mutex))
                 return -ERESTARTSYS;
 
         /* Find newly added node */
@@ -324,7 +324,7 @@ int dlpar_add_slot(char *drc_name)
 
         printk(KERN_INFO "%s: slot %s added\n", DLPAR_MODULE_NAME, drc_name);
 exit:
-        up(&rpadlpar_sem);
+        mutex_unlock(&rpadlpar_mutex);
         return rc;
 }
 
@@ -417,7 +417,7 @@ int dlpar_remove_slot(char *drc_name)
         int node_type;
         int rc = 0;
 
-        if (down_interruptible(&rpadlpar_sem))
+        if (mutex_lock_interruptible(&rpadlpar_mutex))
                 return -ERESTARTSYS;
 
         dn = find_dlpar_node(drc_name, &node_type);
@@ -439,7 +439,7 @@ int dlpar_remove_slot(char *drc_name)
         }
         printk(KERN_INFO "%s: slot %s removed\n", DLPAR_MODULE_NAME, drc_name);
 exit:
-        up(&rpadlpar_sem);
+        mutex_unlock(&rpadlpar_mutex);
         return rc;
 }
 
diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c
index c402da8e78..8cb9abde73 100644
--- a/drivers/pci/hotplug/sgi_hotplug.c
+++ b/drivers/pci/hotplug/sgi_hotplug.c
@@ -15,6 +15,7 @@
 #include <linux/pci.h>
 #include <linux/proc_fs.h>
 #include <linux/types.h>
+#include <linux/mutex.h>
 
 #include <asm/sn/addrs.h>
 #include <asm/sn/l1.h>
@@ -81,7 +82,7 @@ static struct hotplug_slot_ops sn_hotplug_slot_ops = {
         .get_power_status       = get_power_status,
 };
 
-static DECLARE_MUTEX(sn_hotplug_sem);
+static DEFINE_MUTEX(sn_hotplug_mutex);
 
 static ssize_t path_show (struct hotplug_slot *bss_hotplug_slot,
                           char *buf)
@@ -346,7 +347,7 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
         int rc;
 
         /* Serialize the Linux PCI infrastructure */
-        down(&sn_hotplug_sem);
+        mutex_lock(&sn_hotplug_mutex);
 
         /*
          * Power-on and initialize the slot in the SN
@@ -354,7 +355,7 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
          */
         rc = sn_slot_enable(bss_hotplug_slot, slot->device_num);
         if (rc) {
-                up(&sn_hotplug_sem);
+                mutex_unlock(&sn_hotplug_mutex);
                 return rc;
         }
 
@@ -362,7 +363,7 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
                                   PCI_DEVFN(slot->device_num + 1, 0));
         if (!num_funcs) {
                 dev_dbg(slot->pci_bus->self, "no device in slot\n");
-                up(&sn_hotplug_sem);
+                mutex_unlock(&sn_hotplug_mutex);
                 return -ENODEV;
         }
 
@@ -402,7 +403,7 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
         if (new_ppb)
                 pci_bus_add_devices(new_bus);
 
-        up(&sn_hotplug_sem);
+        mutex_unlock(&sn_hotplug_mutex);
 
         if (rc == 0)
                 dev_dbg(slot->pci_bus->self,
@@ -422,7 +423,7 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)
         int rc;
 
         /* Acquire update access to the bus */
-        down(&sn_hotplug_sem);
+        mutex_lock(&sn_hotplug_mutex);
 
         /* is it okay to bring this slot down? */
         rc = sn_slot_disable(bss_hotplug_slot, slot->device_num,
@@ -450,7 +451,7 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)
                              PCI_REQ_SLOT_DISABLE);
  leaving:
         /* Release the bus lock */
-        up(&sn_hotplug_sem);
+        mutex_unlock(&sn_hotplug_mutex);
 
         return rc;
 }
@@ -462,9 +463,9 @@ static inline int get_power_status(struct hotplug_slot *bss_hotplug_slot,
         struct pcibus_info *pcibus_info;
 
         pcibus_info = SN_PCIBUS_BUSSOFT_INFO(slot->pci_bus);
-        down(&sn_hotplug_sem);
+        mutex_lock(&sn_hotplug_mutex);
         *value = pcibus_info->pbi_enabled_devices & (1 << slot->device_num);
-        up(&sn_hotplug_sem);
+        mutex_unlock(&sn_hotplug_mutex);
         return 0;
 }
 
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index b68eef2516..bb19c64073 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -47,7 +47,7 @@ static void card_remove(struct pnp_dev * dev)
 {
         dev->card_link = NULL;
 }
- 
+
 static void card_remove_first(struct pnp_dev * dev)
 {
         struct pnp_card_driver * drv = to_pnp_card_driver(dev->driver);
@@ -361,7 +361,7 @@ static int card_resume(struct pnp_dev *dev)
 
 int pnp_register_card_driver(struct pnp_card_driver * drv)
 {
-        int count;
+        int error;
         struct list_head *pos, *temp;
 
         drv->link.name = drv->name;
@@ -372,21 +372,19 @@ int pnp_register_card_driver(struct pnp_card_driver * drv)
         drv->link.suspend = drv->suspend ? card_suspend : NULL;
         drv->link.resume = drv->resume ? card_resume : NULL;
 
-        count = pnp_register_driver(&drv->link);
-        if (count < 0)
-                return count;
+        error = pnp_register_driver(&drv->link);
+        if (error < 0)
+                return error;
 
         spin_lock(&pnp_lock);
         list_add_tail(&drv->global_list, &pnp_card_drivers);
         spin_unlock(&pnp_lock);
 
-        count = 0;
-
         list_for_each_safe(pos,temp,&pnp_cards){
                 struct pnp_card *card = list_entry(pos, struct pnp_card, global_list);
-                count += card_probe(card,drv);
+                card_probe(card,drv);
         }
-        return count;
+        return 0;
 }
 
 /**
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 7cafacdd12..e54c153831 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -201,31 +201,14 @@ struct bus_type pnp_bus_type = {
         .resume = pnp_bus_resume,
 };
 
-
-static int count_devices(struct device * dev, void * c)
-{
-        int * count = c;
-        (*count)++;
-        return 0;
-}
-
 int pnp_register_driver(struct pnp_driver *drv)
 {
-        int count;
-
         pnp_dbg("the driver '%s' has been registered", drv->name);
 
         drv->driver.name = drv->name;
         drv->driver.bus = &pnp_bus_type;
 
-        count = driver_register(&drv->driver);
-
-        /* get the number of initial matches */
-        if (count >= 0){
-                count = 0;
-                driver_for_each_device(&drv->driver, NULL, &count, count_devices);
-        }
-        return count;
+        return driver_register(&drv->driver);
 }
 
 void pnp_unregister_driver(struct pnp_driver *drv)
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index 57fd60314d..ac7c2bb6c6 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -42,6 +42,7 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/isapnp.h>
+#include <linux/mutex.h>
 #include <asm/io.h>
 
 #if 0
@@ -92,7 +93,7 @@ MODULE_LICENSE("GPL");
 #define _LTAG_FIXEDMEM32RANGE   0x86
 
 static unsigned char isapnp_checksum_value;
-static DECLARE_MUTEX(isapnp_cfg_mutex);
+static DEFINE_MUTEX(isapnp_cfg_mutex);
 static int isapnp_detected;
 static int isapnp_csn_count;
 
@@ -646,8 +647,10 @@ static int __init isapnp_create_device(struct pnp_card *card,
                                 size = 0;
                                 skip = 0;
                                 option = pnp_register_independent_option(dev);
-                                if (!option)
+                                if (!option) {
+                                        kfree(dev);
                                         return 1;
+                                }
                                 pnp_add_card_device(card,dev);
                         } else {
                                 skip = 1;
@@ -901,7 +904,7 @@ int isapnp_cfg_begin(int csn, int logdev)
 {
         if (csn < 1 || csn > isapnp_csn_count || logdev > 10)
                 return -EINVAL;
-        down(&isapnp_cfg_mutex);
+        mutex_lock(&isapnp_cfg_mutex);
         isapnp_wait();
         isapnp_key();
         isapnp_wake(csn);
@@ -927,7 +930,7 @@ int isapnp_cfg_begin(int csn, int logdev)
 int isapnp_cfg_end(void)
 {
         isapnp_wait();
-        up(&isapnp_cfg_mutex);
+        mutex_unlock(&isapnp_cfg_mutex);
         return 0;
 }
 
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
new file mode 100644
index 0000000000..929dd80905
--- /dev/null
+++ b/drivers/rtc/Kconfig
@@ -0,0 +1,165 @@
+\#
+# RTC class/drivers configuration
+#
+
+menu "Real Time Clock"
+
+config RTC_LIB
+        tristate
+
+config RTC_CLASS
+        tristate "RTC class"
+        depends on EXPERIMENTAL
+        default n
+        select RTC_LIB
+        help
+          Generic RTC class support. If you say yes here, you will
+          be allowed to plug one or more RTCs to your system. You will
+          probably want to enable one of more of the interfaces below.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-class.
+
+config RTC_HCTOSYS
+        bool "Set system time from RTC on startup"
+        depends on RTC_CLASS = y
+        default y
+        help
+          If you say yes here, the system time will be set using
+          the value read from the specified RTC device. This is useful
+          in order to avoid unnecessary fschk runs.
+
+config RTC_HCTOSYS_DEVICE
+        string "The RTC to read the time from"
+        depends on RTC_HCTOSYS = y
+        default "rtc0"
+        help
+          The RTC device that will be used as the source for
+          the system time, usually rtc0.
+
+comment "RTC interfaces"
+        depends on RTC_CLASS
+
+config RTC_INTF_SYSFS
+        tristate "sysfs"
+        depends on RTC_CLASS && SYSFS
+        default RTC_CLASS
+        help
+          Say yes here if you want to use your RTC using the sysfs
+          interface, /sys/class/rtc/rtcX .
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-sysfs.
+
+config RTC_INTF_PROC
+        tristate "proc"
+        depends on RTC_CLASS && PROC_FS
+        default RTC_CLASS
+        help
+          Say yes here if you want to use your RTC using the proc
+          interface, /proc/driver/rtc .
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-proc.
+
+config RTC_INTF_DEV
+        tristate "dev"
+        depends on RTC_CLASS
+        default RTC_CLASS
+        help
+          Say yes here if you want to use your RTC using the dev
+          interface, /dev/rtc .
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-dev.
+
+comment "RTC drivers"
+        depends on RTC_CLASS
+
+config RTC_DRV_X1205
+        tristate "Xicor/Intersil X1205"
+        depends on RTC_CLASS && I2C
+        help
+          If you say yes here you get support for the
+          Xicor/Intersil X1205 RTC chip.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-x1205.
+
+config RTC_DRV_DS1672
+        tristate "Dallas/Maxim DS1672"
+        depends on RTC_CLASS && I2C
+        help
+          If you say yes here you get support for the
+          Dallas/Maxim DS1672 timekeeping chip.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-ds1672.
+
+config RTC_DRV_PCF8563
+        tristate "Philips PCF8563/Epson RTC8564"
+        depends on RTC_CLASS && I2C
+        help
+          If you say yes here you get support for the
+          Philips PCF8563 RTC chip. The Epson RTC8564
+          should work as well.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-pcf8563.
+
+config RTC_DRV_RS5C372
+        tristate "Ricoh RS5C372A/B"
+        depends on RTC_CLASS && I2C
+        help
+          If you say yes here you get support for the
+          Ricoh RS5C372A and RS5C372B RTC chips.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-rs5c372.
+
+config RTC_DRV_M48T86
+        tristate "ST M48T86/Dallas DS12887"
+        depends on RTC_CLASS
+        help
+          If you say Y here you will get support for the
+          ST M48T86 and Dallas DS12887 RTC chips.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-m48t86.
+
+config RTC_DRV_EP93XX
+        tristate "Cirrus Logic EP93XX"
+        depends on RTC_CLASS && ARCH_EP93XX
+        help
+          If you say yes here you get support for the
+          RTC embedded in the Cirrus Logic EP93XX processors.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-ep93xx.
+
+config RTC_DRV_SA1100
+        tristate "SA11x0/PXA2xx"
+        depends on RTC_CLASS && (ARCH_SA1100 || ARCH_PXA)
+        help
+          If you say Y here you will get access to the real time clock
+          built into your SA11x0 or PXA2xx CPU.
+
+          To compile this driver as a module, choose M here: the
+          module will be called rtc-sa1100.
+
+config RTC_DRV_TEST
+        tristate "Test driver/device"
+        depends on RTC_CLASS
+        help
+          If you say yes here you get support for the
+          RTC test driver. It's a software RTC which can be
+          used to test the RTC subsystem APIs. It gets
+          the time from the system clock.
+          You want this driver only if you are doing development
+          on the RTC subsystem. Please read the source code
+          for further details.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-test.
+
+endmenu
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
new file mode 100644
index 0000000000..8d4c7fe88d
--- /dev/null
+++ b/drivers/rtc/Makefile
@@ -0,0 +1,21 @@
+#
+# Makefile for RTC class/drivers.
+#
+
+obj-$(CONFIG_RTC_LIB)           += rtc-lib.o
+obj-$(CONFIG_RTC_HCTOSYS)       += hctosys.o
+obj-$(CONFIG_RTC_CLASS)         += rtc-core.o
+rtc-core-y                      := class.o interface.o
+
+obj-$(CONFIG_RTC_INTF_SYSFS)    += rtc-sysfs.o
+obj-$(CONFIG_RTC_INTF_PROC)     += rtc-proc.o
+obj-$(CONFIG_RTC_INTF_DEV)      += rtc-dev.o
+
+obj-$(CONFIG_RTC_DRV_X1205)     += rtc-x1205.o
+obj-$(CONFIG_RTC_DRV_TEST)      += rtc-test.o
+obj-$(CONFIG_RTC_DRV_DS1672)    += rtc-ds1672.o
+obj-$(CONFIG_RTC_DRV_PCF8563)   += rtc-pcf8563.o
+obj-$(CONFIG_RTC_DRV_RS5C372)   += rtc-rs5c372.o
+obj-$(CONFIG_RTC_DRV_M48T86)    += rtc-m48t86.o
+obj-$(CONFIG_RTC_DRV_EP93XX)    += rtc-ep93xx.o
+obj-$(CONFIG_RTC_DRV_SA1100)    += rtc-sa1100.o
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
new file mode 100644
index 0000000000..8533936d50
--- /dev/null
+++ b/drivers/rtc/class.c
@@ -0,0 +1,145 @@
+/*
+ * RTC subsystem, base class
+ *
+ * Copyright (C) 2005 Tower Technologies
+ * Author: Alessandro Zummo <a.zummo@towertech.it>
+ *
+ * class skeleton from drivers/hwmon/hwmon.c
+ *
+ * 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/rtc.h>
+#include <linux/kdev_t.h>
+#include <linux/idr.h>
+
+static DEFINE_IDR(rtc_idr);
+static DEFINE_MUTEX(idr_lock);
+struct class *rtc_class;
+
+static void rtc_device_release(struct class_device *class_dev)
+{
+        struct rtc_device *rtc = to_rtc_device(class_dev);
+        mutex_lock(&idr_lock);
+        idr_remove(&rtc_idr, rtc->id);
+        mutex_unlock(&idr_lock);
+        kfree(rtc);
+}
+
+/**
+ * rtc_device_register - register w/ RTC class
+ * @dev: the device to register
+ *
+ * rtc_device_unregister() must be called when the class device is no
+ * longer needed.
+ *
+ * Returns the pointer to the new struct class device.
+ */
+struct rtc_device *rtc_device_register(const char *name, struct device *dev,
+                                        struct rtc_class_ops *ops,
+                                        struct module *owner)
+{
+        struct rtc_device *rtc;
+        int id, err;
+
+        if (idr_pre_get(&rtc_idr, GFP_KERNEL) == 0) {
+                err = -ENOMEM;
+                goto exit;
+        }
+
+
+        mutex_lock(&idr_lock);
+        err = idr_get_new(&rtc_idr, NULL, &id);
+        mutex_unlock(&idr_lock);
+
+        if (err < 0)
+                goto exit;
+
+        id = id & MAX_ID_MASK;
+
+        rtc = kzalloc(sizeof(struct rtc_device), GFP_KERNEL);
+        if (rtc == NULL) {
+                err = -ENOMEM;
+                goto exit_idr;
+        }
+
+        rtc->id = id;
+        rtc->ops = ops;
+        rtc->owner = owner;
+        rtc->class_dev.dev = dev;
+        rtc->class_dev.class = rtc_class;
+        rtc->class_dev.release = rtc_device_release;
+
+        mutex_init(&rtc->ops_lock);
+        spin_lock_init(&rtc->irq_lock);
+        spin_lock_init(&rtc->irq_task_lock);
+
+        strlcpy(rtc->name, name, RTC_DEVICE_NAME_SIZE);
+        snprintf(rtc->class_dev.class_id, BUS_ID_SIZE, "rtc%d", id);
+
+        err = class_device_register(&rtc->class_dev);
+        if (err)
+                goto exit_kfree;
+
+        dev_info(dev, "rtc core: registered %s as %s\n",
+                        rtc->name, rtc->class_dev.class_id);
+
+        return rtc;
+
+exit_kfree:
+        kfree(rtc);
+
+exit_idr:
+        idr_remove(&rtc_idr, id);
+
+exit:
+        return ERR_PTR(err);
+}
+EXPORT_SYMBOL_GPL(rtc_device_register);
+
+
+/**
+ * rtc_device_unregister - removes the previously registered RTC class device
+ *
+ * @rtc: the RTC class device to destroy
+ */
+void rtc_device_unregister(struct rtc_device *rtc)
+{
+        mutex_lock(&rtc->ops_lock);
+        rtc->ops = NULL;
+        mutex_unlock(&rtc->ops_lock);
+        class_device_unregister(&rtc->class_dev);
+}
+EXPORT_SYMBOL_GPL(rtc_device_unregister);
+
+int rtc_interface_register(struct class_interface *intf)
+{
+        intf->class = rtc_class;
+        return class_interface_register(intf);
+}
+EXPORT_SYMBOL_GPL(rtc_interface_register);
+
+static int __init rtc_init(void)
+{
+        rtc_class = class_create(THIS_MODULE, "rtc");
+        if (IS_ERR(rtc_class)) {
+                printk(KERN_ERR "%s: couldn't create class\n", __FILE__);
+                return PTR_ERR(rtc_class);
+        }
+        return 0;
+}
+
+static void __exit rtc_exit(void)
+{
+        class_destroy(rtc_class);
+}
+
+module_init(rtc_init);
+module_exit(rtc_exit);
+
+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towerteh.it>");
+MODULE_DESCRIPTION("RTC class support");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/hctosys.c b/drivers/rtc/hctosys.c
new file mode 100644
index 0000000000..d02fe9a000
--- /dev/null
+++ b/drivers/rtc/hctosys.c
@@ -0,0 +1,69 @@
+/*
+ * RTC subsystem, initialize system time on startup
+ *
+ * Copyright (C) 2005 Tower Technologies
+ * Author: Alessandro Zummo <a.zummo@towertech.it>
+ *
+ * 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/rtc.h>
+
+/* IMPORTANT: the RTC only stores whole seconds. It is arbitrary
+ * whether it stores the most close value or the value with partial
+ * seconds truncated. However, it is important that we use it to store
+ * the truncated value. This is because otherwise it is necessary,
+ * in an rtc sync function, to read both xtime.tv_sec and
+ * xtime.tv_nsec. On some processors (i.e. ARM), an atomic read
+ * of >32bits is not possible. So storing the most close value would
+ * slow down the sync API. So here we have the truncated value and
+ * the best guess is to add 0.5s.
+ */
+
+static int __init rtc_hctosys(void)
+{
+        int err;
+        struct rtc_time tm;
+        struct class_device *class_dev = rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
+
+        if (class_dev == NULL) {
+                printk("%s: unable to open rtc device (%s)\n",
+                        __FILE__, CONFIG_RTC_HCTOSYS_DEVICE);
+                return -ENODEV;
+        }
+
+        err = rtc_read_time(class_dev, &tm);
+        if (err == 0) {
+                err = rtc_valid_tm(&tm);
+                if (err == 0) {
+                        struct timespec tv;
+
+                        tv.tv_nsec = NSEC_PER_SEC >> 1;
+
+                        rtc_tm_to_time(&tm, &tv.tv_sec);
+
+                        do_settimeofday(&tv);
+
+                        dev_info(class_dev->dev,
+                                "setting the system clock to "
+                                "%d-%02d-%02d %02d:%02d:%02d (%u)\n",
+                                tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
+                                tm.tm_hour, tm.tm_min, tm.tm_sec,
+                                (unsigned int) tv.tv_sec);
+                }
+                else
+                        dev_err(class_dev->dev,
+                                "hctosys: invalid date/time\n");
+        }
+        else
+                dev_err(class_dev->dev,
+                        "hctosys: unable to read the hardware clock\n");
+
+        rtc_class_close(class_dev);
+
+        return 0;
+}
+
+late_initcall(rtc_hctosys);
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
new file mode 100644
index 0000000000..56e490709b
--- /dev/null
+++ b/drivers/rtc/interface.c
@@ -0,0 +1,277 @@
+/*
+ * RTC subsystem, interface functions
+ *
+ * Copyright (C) 2005 Tower Technologies
+ * Author: Alessandro Zummo <a.zummo@towertech.it>
+ *
+ * based on arch/arm/common/rtctime.c
+ *
+ * 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/rtc.h>
+
+int rtc_read_time(struct class_device *class_dev, struct rtc_time *tm)
+{
+        int err;
+        struct rtc_device *rtc = to_rtc_device(class_dev);
+
+        err = mutex_lock_interruptible(&rtc->ops_lock);
+        if (err)
+                return -EBUSY;
+
+        if (!rtc->ops)
+                err = -ENODEV;
+        else if (!rtc->ops->read_time)
+                err = -EINVAL;
+        else {
+                memset(tm, 0, sizeof(struct rtc_time));
+                err = rtc->ops->read_time(class_dev->dev, tm);
+        }
+
+        mutex_unlock(&rtc->ops_lock);
+        return err;
+}
+EXPORT_SYMBOL_GPL(rtc_read_time);
+
+int rtc_set_time(struct class_device *class_dev, struct rtc_time *tm)
+{
+        int err;
+        struct rtc_device *rtc = to_rtc_device(class_dev);
+
+        err = rtc_valid_tm(tm);
+        if (err != 0)
+                return err;
+
+        err = mutex_lock_interruptible(&rtc->ops_lock);
+        if (err)
+                return -EBUSY;
+
+        if (!rtc->ops)
+                err = -ENODEV;
+        else if (!rtc->ops->set_time)
+                err = -EINVAL;
+        else
+                err = rtc->ops->set_time(class_dev->dev, tm);
+
+        mutex_unlock(&rtc->ops_lock);
+        return err;
+}
+EXPORT_SYMBOL_GPL(rtc_set_time);
+
+int rtc_set_mmss(struct class_device *class_dev, unsigned long secs)
+{
+        int err;
+        struct rtc_device *rtc = to_rtc_device(class_dev);
+
+        err = mutex_lock_interruptible(&rtc->ops_lock);
+        if (err)
+                return -EBUSY;
+
+        if (!rtc->ops)
+                err = -ENODEV;
+        else if (rtc->ops->set_mmss)
+                err = rtc->ops->set_mmss(class_dev->dev, secs);
+        else if (rtc->ops->read_time && rtc->ops->set_time) {
+                struct rtc_time new, old;
+
+                err = rtc->ops->read_time(class_dev->dev, &old);
+                if (err == 0) {
+                        rtc_time_to_tm(secs, &new);
+
+                        /*
+                         * avoid writing when we're going to change the day of
+                         * the month. We will retry in the next minute. This
+                         * basically means that if the RTC must not drift
+                         * by more than 1 minute in 11 minutes.
+                         */
+                        if (!((old.tm_hour == 23 && old.tm_min == 59) ||
+                                (new.tm_hour == 23 && new.tm_min == 59)))
+                                err = rtc->ops->set_time(class_dev->dev, &new);
+                }
+        }
+        else
+                err = -EINVAL;
+
+        mutex_unlock(&rtc->ops_lock);
+
+        return err;
+}
+EXPORT_SYMBOL_GPL(rtc_set_mmss);
+
+int rtc_read_alarm(struct class_device *class_dev, struct rtc_wkalrm *alarm)
+{
+        int err;
+        struct rtc_device *rtc = to_rtc_device(class_dev);
+
+        err = mutex_lock_interruptible(&rtc->ops_lock);
+        if (err)
+                return -EBUSY;
+
+        if (rtc->ops == NULL)
+                err = -ENODEV;
+        else if (!rtc->ops->read_alarm)
+                err = -EINVAL;
+        else {
+                memset(alarm, 0, sizeof(struct rtc_wkalrm));
+                err = rtc->ops->read_alarm(class_dev->dev, alarm);
+        }
+
+        mutex_unlock(&rtc->ops_lock);
+        return err;
+}
+EXPORT_SYMBOL_GPL(rtc_read_alarm);
+
+int rtc_set_alarm(struct class_device *class_dev, struct rtc_wkalrm *alarm)
+{
+        int err;
+        struct rtc_device *rtc = to_rtc_device(class_dev);
+
+        err = mutex_lock_interruptible(&rtc->ops_lock);
+        if (err)
+                return -EBUSY;
+
+        if (!rtc->ops)
+                err = -ENODEV;
+        else if (!rtc->ops->set_alarm)
+                err = -EINVAL;
+        else
+                err = rtc->ops->set_alarm(class_dev->dev, alarm);
+
+        mutex_unlock(&rtc->ops_lock);
+        return err;
+}
+EXPORT_SYMBOL_GPL(rtc_set_alarm);
+
+void rtc_update_irq(struct class_device *class_dev,
+                unsigned long num, unsigned long events)
+{
+        struct rtc_device *rtc = to_rtc_device(class_dev);
+
+        spin_lock(&rtc->irq_lock);
+        rtc->irq_data = (rtc->irq_data + (num << 8)) | events;
+        spin_unlock(&rtc->irq_lock);
+
+        spin_lock(&rtc->irq_task_lock);
+        if (rtc->irq_task)
+                rtc->irq_task->func(rtc->irq_task->private_data);
+        spin_unlock(&rtc->irq_task_lock);
+
+        wake_up_interruptible(&rtc->irq_queue);
+        kill_fasync(&rtc->async_queue, SIGIO, POLL_IN);
+}
+EXPORT_SYMBOL_GPL(rtc_update_irq);
+
+struct class_device *rtc_class_open(char *name)
+{
+        struct class_device *class_dev = NULL,
+                                *class_dev_tmp;
+
+        down(&rtc_class->sem);
+        list_for_each_entry(class_dev_tmp, &rtc_class->children, node) {
+                if (strncmp(class_dev_tmp->class_id, name, BUS_ID_SIZE) == 0) {
+                        class_dev = class_dev_tmp;
+                        break;
+                }
+        }
+
+        if (class_dev) {
+                if (!try_module_get(to_rtc_device(class_dev)->owner))
+                        class_dev = NULL;
+        }
+        up(&rtc_class->sem);
+
+        return class_dev;
+}
+EXPORT_SYMBOL_GPL(rtc_class_open);
+
+void rtc_class_close(struct class_device *class_dev)
+{
+        module_put(to_rtc_device(class_dev)->owner);
+}
+EXPORT_SYMBOL_GPL(rtc_class_close);
+
+int rtc_irq_register(struct class_device *class_dev, struct rtc_task *task)
+{
+        int retval = -EBUSY;
+        struct rtc_device *rtc = to_rtc_device(class_dev);
+
+        if (task == NULL || task->func == NULL)
+                return -EINVAL;
+
+        spin_lock(&rtc->irq_task_lock);
+        if (rtc->irq_task == NULL) {
+                rtc->irq_task = task;
+                retval = 0;
+        }
+        spin_unlock(&rtc->irq_task_lock);
+
+        return retval;
+}
+EXPORT_SYMBOL_GPL(rtc_irq_register);
+
+void rtc_irq_unregister(struct class_device *class_dev, struct rtc_task *task)
+{
+        struct rtc_device *rtc = to_rtc_device(class_dev);
+
+        spin_lock(&rtc->irq_task_lock);
+        if (rtc->irq_task == task)
+                rtc->irq_task = NULL;
+        spin_unlock(&rtc->irq_task_lock);
+}
+EXPORT_SYMBOL_GPL(rtc_irq_unregister);
+
+int rtc_irq_set_state(struct class_device *class_dev, struct rtc_task *task, int enabled)
+{
+        int err = 0;
+        unsigned long flags;
+        struct rtc_device *rtc = to_rtc_device(class_dev);
+
+        spin_lock_irqsave(&rtc->irq_task_lock, flags);
+        if (rtc->irq_task != task)
+                err = -ENXIO;
+        spin_unlock_irqrestore(&rtc->irq_task_lock, flags);
+
+        if (err == 0)
+                err = rtc->ops->irq_set_state(class_dev->dev, enabled);
+
+        return err;
+}
+EXPORT_SYMBOL_GPL(rtc_irq_set_state);
+
+int rtc_irq_set_freq(struct class_device *class_dev, struct rtc_task *task, int freq)
+{
+        int err = 0, tmp = 0;
+        unsigned long flags;
+        struct rtc_device *rtc = to_rtc_device(class_dev);
+
+        /* allowed range is 2-8192 */
+        if (freq < 2 || freq > 8192)
+                return -EINVAL;
+/*
+        FIXME: this does not belong here, will move where appropriate
+        at a later stage. It cannot hurt right now, trust me :)
+        if ((freq > rtc_max_user_freq) && (!capable(CAP_SYS_RESOURCE)))
+                return -EACCES;
+*/
+        /* check if freq is a power of 2 */
+        while (freq > (1 << tmp))
+                tmp++;
+
+        if (freq != (1 << tmp))
+                return -EINVAL;
+
+        spin_lock_irqsave(&rtc->irq_task_lock, flags);
+        if (rtc->irq_task != task)
+                err = -ENXIO;
+        spin_unlock_irqrestore(&rtc->irq_task_lock, flags);
+
+        if (err == 0) {
+                err = rtc->ops->irq_set_freq(class_dev->dev, freq);
+                if (err == 0)
+                        rtc->irq_freq = freq;
+        }
+        return err;
+}
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
new file mode 100644
index 0000000000..b1e3e6179e
--- /dev/null
+++ b/drivers/rtc/rtc-dev.c
@@ -0,0 +1,382 @@
+/*
+ * RTC subsystem, dev interface
+ *
+ * Copyright (C) 2005 Tower Technologies
+ * Author: Alessandro Zummo <a.zummo@towertech.it>
+ *
+ * based on arch/arm/common/rtctime.c
+ *
+ * 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/rtc.h>
+
+static struct class *rtc_dev_class;
+static dev_t rtc_devt;
+
+#define RTC_DEV_MAX 16 /* 16 RTCs should be enough for everyone... */
+
+static int rtc_dev_open(struct inode *inode, struct file *file)
+{
+        int err;
+        struct rtc_device *rtc = container_of(inode->i_cdev,
+                                        struct rtc_device, char_dev);
+        struct rtc_class_ops *ops = rtc->ops;
+
+        /* We keep the lock as long as the device is in use
+         * and return immediately if busy
+         */
+        if (!(mutex_trylock(&rtc->char_lock)))
+                return -EBUSY;
+
+        file->private_data = &rtc->class_dev;
+
+        err = ops->open ? ops->open(rtc->class_dev.dev) : 0;
+        if (err == 0) {
+                spin_lock_irq(&rtc->irq_lock);
+                rtc->irq_data = 0;
+                spin_unlock_irq(&rtc->irq_lock);
+
+                return 0;
+        }
+
+        /* something has gone wrong, release the lock */
+        mutex_unlock(&rtc->char_lock);
+        return err;
+}
+
+
+static ssize_t
+rtc_dev_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
+{
+        struct rtc_device *rtc = to_rtc_device(file->private_data);
+
+        DECLARE_WAITQUEUE(wait, current);
+        unsigned long data;
+        ssize_t ret;
+
+        if (count < sizeof(unsigned long))
+                return -EINVAL;
+
+        add_wait_queue(&rtc->irq_queue, &wait);
+        do {
+                __set_current_state(TASK_INTERRUPTIBLE);
+
+                spin_lock_irq(&rtc->irq_lock);
+                data = rtc->irq_data;
+                rtc->irq_data = 0;
+                spin_unlock_irq(&rtc->irq_lock);
+
+                if (data != 0) {
+                        ret = 0;
+                        break;
+                }
+                if (file->f_flags & O_NONBLOCK) {
+                        ret = -EAGAIN;
+                        break;
+                }
+                if (signal_pending(current)) {
+                        ret = -ERESTARTSYS;
+                        break;
+                }
+                schedule();
+        } while (1);
+        set_current_state(TASK_RUNNING);
+        remove_wait_queue(&rtc->irq_queue, &wait);
+
+        if (ret == 0) {
+                /* Check for any data updates */
+                if (rtc->ops->read_callback)
+                        data = rtc->ops->read_callback(rtc->class_dev.dev, data);
+
+                ret = put_user(data, (unsigned long __user *)buf);
+                if (ret == 0)
+                        ret = sizeof(unsigned long);
+        }
+        return ret;
+}
+
+static unsigned int rtc_dev_poll(struct file *file, poll_table *wait)
+{
+        struct rtc_device *rtc = to_rtc_device(file->private_data);
+        unsigned long data;
+
+        poll_wait(file, &rtc->irq_queue, wait);
+
+        data = rtc->irq_data;
+
+        return (data != 0) ? (POLLIN | POLLRDNORM) : 0;
+}
+
+static int rtc_dev_ioctl(struct inode *inode, struct file *file,
+                unsigned int cmd, unsigned long arg)
+{
+        int err = 0;
+        struct class_device *class_dev = file->private_data;
+        struct rtc_device *rtc = to_rtc_device(class_dev);
+        struct rtc_class_ops *ops = rtc->ops;
+        struct rtc_time tm;
+        struct rtc_wkalrm alarm;
+        void __user *uarg = (void __user *) arg;
+
+        /* avoid conflicting IRQ users */
+        if (cmd == RTC_PIE_ON || cmd == RTC_PIE_OFF || cmd == RTC_IRQP_SET) {
+                spin_lock(&rtc->irq_task_lock);
+                if (rtc->irq_task)
+                        err = -EBUSY;
+                spin_unlock(&rtc->irq_task_lock);
+
+                if (err < 0)
+                        return err;
+        }
+
+        /* try the driver's ioctl interface */
+        if (ops->ioctl) {
+                err = ops->ioctl(class_dev->dev, cmd, arg);
+                if (err != -EINVAL)
+                        return err;
+        }
+
+        /* if the driver does not provide the ioctl interface
+         * or if that particular ioctl was not implemented
+         * (-EINVAL), we will try to emulate here.
+         */
+
+        switch (cmd) {
+        case RTC_ALM_READ:
+                err = rtc_read_alarm(class_dev, &alarm);
+                if (err < 0)
+                        return err;
+
+                if (copy_to_user(uarg, &alarm.time, sizeof(tm)))
+                        return -EFAULT;
+                break;
+
+        case RTC_ALM_SET:
+                if (copy_from_user(&alarm.time, uarg, sizeof(tm)))
+                        return -EFAULT;
+
+                alarm.enabled = 0;
+                alarm.pending = 0;
+                alarm.time.tm_mday = -1;
+                alarm.time.tm_mon = -1;
+                alarm.time.tm_year = -1;
+                alarm.time.tm_wday = -1;
+                alarm.time.tm_yday = -1;
+                alarm.time.tm_isdst = -1;
+                err = rtc_set_alarm(class_dev, &alarm);
+                break;
+
+        case RTC_RD_TIME:
+                err = rtc_read_time(class_dev, &tm);
+                if (err < 0)
+                        return err;
+
+                if (copy_to_user(uarg, &tm, sizeof(tm)))
+                        return -EFAULT;
+                break;
+
+        case RTC_SET_TIME:
+                if (!capable(CAP_SYS_TIME))
+                        return -EACCES;
+
+                if (copy_from_user(&tm, uarg, sizeof(tm)))
+                        return -EFAULT;
+
+                err = rtc_set_time(class_dev, &tm);
+                break;
+#if 0
+        case RTC_EPOCH_SET:
+#ifndef rtc_epoch
+                /*
+                 * There were no RTC clocks before 1900.
+                 */
+                if (arg < 1900) {
+                        err = -EINVAL;
+                        break;
+                }
+                if (!capable(CAP_SYS_TIME)) {
+                        err = -EACCES;
+                        break;
+                }
+                rtc_epoch = arg;
+                err = 0;
+#endif
+                break;
+
+        case RTC_EPOCH_READ:
+                err = put_user(rtc_epoch, (unsigned long __user *)uarg);
+                break;
+#endif
+        case RTC_WKALM_SET:
+                if (copy_from_user(&alarm, uarg, sizeof(alarm)))
+                        return -EFAULT;
+
+                err = rtc_set_alarm(class_dev, &alarm);
+                break;
+
+        case RTC_WKALM_RD:
+                err = rtc_read_alarm(class_dev, &alarm);
+                if (err < 0)
+                        return err;
+
+                if (copy_to_user(uarg, &alarm, sizeof(alarm)))
+                        return -EFAULT;
+                break;
+
+        default:
+                err = -EINVAL;
+                break;
+        }
+
+        return err;
+}
+
+static int rtc_dev_release(struct inode *inode, struct file *file)
+{
+        struct rtc_device *rtc = to_rtc_device(file->private_data);
+
+        if (rtc->ops->release)
+                rtc->ops->release(rtc->class_dev.dev);
+
+        mutex_unlock(&rtc->char_lock);
+        return 0;
+}
+
+static int rtc_dev_fasync(int fd, struct file *file, int on)
+{
+        struct rtc_device *rtc = to_rtc_device(file->private_data);
+        return fasync_helper(fd, file, on, &rtc->async_queue);
+}
+
+static struct file_operations rtc_dev_fops = {
+        .owner          = THIS_MODULE,
+        .llseek         = no_llseek,
+        .read           = rtc_dev_read,
+        .poll           = rtc_dev_poll,
+        .ioctl          = rtc_dev_ioctl,
+        .open           = rtc_dev_open,
+        .release        = rtc_dev_release,
+        .fasync         = rtc_dev_fasync,
+};
+
+/* insertion/removal hooks */
+
+static int rtc_dev_add_device(struct class_device *class_dev,
+                                struct class_interface *class_intf)
+{
+        int err = 0;
+        struct rtc_device *rtc = to_rtc_device(class_dev);
+
+        if (rtc->id >= RTC_DEV_MAX) {
+                dev_err(class_dev->dev, "too many RTCs\n");
+                return -EINVAL;
+        }
+
+        mutex_init(&rtc->char_lock);
+        spin_lock_init(&rtc->irq_lock);
+        init_waitqueue_head(&rtc->irq_queue);
+
+        cdev_init(&rtc->char_dev, &rtc_dev_fops);
+        rtc->char_dev.owner = rtc->owner;
+
+        if (cdev_add(&rtc->char_dev, MKDEV(MAJOR(rtc_devt), rtc->id), 1)) {
+                cdev_del(&rtc->char_dev);
+                dev_err(class_dev->dev,
+                        "failed to add char device %d:%d\n",
+                        MAJOR(rtc_devt), rtc->id);
+                return -ENODEV;
+        }
+
+        rtc->rtc_dev = class_device_create(rtc_dev_class, NULL,
+                                                MKDEV(MAJOR(rtc_devt), rtc->id),
+                                                class_dev->dev, "rtc%d", rtc->id);
+        if (IS_ERR(rtc->rtc_dev)) {
+                dev_err(class_dev->dev, "cannot create rtc_dev device\n");
+                err = PTR_ERR(rtc->rtc_dev);
+                goto err_cdev_del;
+        }
+
+        dev_info(class_dev->dev, "rtc intf: dev (%d:%d)\n",
+                MAJOR(rtc->rtc_dev->devt),
+                MINOR(rtc->rtc_dev->devt));
+
+        return 0;
+
+err_cdev_del:
+
+        cdev_del(&rtc->char_dev);
+        return err;
+}
+
+static void rtc_dev_remove_device(struct class_device *class_dev,
+                                        struct class_interface *class_intf)
+{
+        struct rtc_device *rtc = to_rtc_device(class_dev);
+
+        if (rtc->rtc_dev) {
+                dev_dbg(class_dev->dev, "removing char %d:%d\n",
+                        MAJOR(rtc->rtc_dev->devt),
+                        MINOR(rtc->rtc_dev->devt));
+
+                class_device_unregister(rtc->rtc_dev);
+                cdev_del(&rtc->char_dev);
+        }
+}
+
+/* interface registration */
+
+static struct class_interface rtc_dev_interface = {
+        .add = &rtc_dev_add_device,
+        .remove = &rtc_dev_remove_device,
+};
+
+static int __init rtc_dev_init(void)
+{
+        int err;
+
+        rtc_dev_class = class_create(THIS_MODULE, "rtc-dev");
+        if (IS_ERR(rtc_dev_class))
+                return PTR_ERR(rtc_dev_class);
+
+        err = alloc_chrdev_region(&rtc_devt, 0, RTC_DEV_MAX, "rtc");
+        if (err < 0) {
+                printk(KERN_ERR "%s: failed to allocate char dev region\n",
+                        __FILE__);
+                goto err_destroy_class;
+        }
+
+        err = rtc_interface_register(&rtc_dev_interface);
+        if (err < 0) {
+                printk(KERN_ERR "%s: failed to register the interface\n",
+                        __FILE__);
+                goto err_unregister_chrdev;
+        }
+
+        return 0;
+
+err_unregister_chrdev:
+        unregister_chrdev_region(rtc_devt, RTC_DEV_MAX);
+
+err_destroy_class:
+        class_destroy(rtc_dev_class);
+
+        return err;
+}
+
+static void __exit rtc_dev_exit(void)
+{
+        class_interface_unregister(&rtc_dev_interface);
+        class_destroy(rtc_dev_class);
+        unregister_chrdev_region(rtc_devt, RTC_DEV_MAX);
+}
+
+module_init(rtc_dev_init);
+module_exit(rtc_dev_exit);
+
+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
+MODULE_DESCRIPTION("RTC class dev interface");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c
new file mode 100644
index 0000000000..358695a416
--- /dev/null
+++ b/drivers/rtc/rtc-ds1672.c
@@ -0,0 +1,233 @@
+/*
+ * An rtc/i2c driver for the Dallas DS1672
+ * Copyright 2005 Alessandro Zummo
+ *
+ * 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/i2c.h>
+#include <linux/rtc.h>
+
+#define DRV_VERSION "0.2"
+
+/* Addresses to scan: none. This chip cannot be detected. */
+static unsigned short normal_i2c[] = { I2C_CLIENT_END };
+
+/* Insmod parameters */
+I2C_CLIENT_INSMOD;
+
+/* Registers */
+
+#define DS1672_REG_CNT_BASE     0
+#define DS1672_REG_CONTROL      4
+#define DS1672_REG_TRICKLE      5
+
+
+/* Prototypes */
+static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind);
+
+/*
+ * In the routines that deal directly with the ds1672 hardware, we use
+ * rtc_time -- month 0-11, hour 0-23, yr = calendar year-epoch
+ * Epoch is initialized as 2000. Time is set to UTC.
+ */
+static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm)
+{
+        unsigned long time;
+        unsigned char addr = DS1672_REG_CNT_BASE;
+        unsigned char buf[4];
+
+        struct i2c_msg msgs[] = {
+                { client->addr, 0, 1, &addr },          /* setup read ptr */
+                { client->addr, I2C_M_RD, 4, buf },     /* read date */
+        };
+
+        /* read date registers */
+        if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {
+                dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
+                return -EIO;
+        }
+
+        dev_dbg(&client->dev,
+                "%s: raw read data - counters=%02x,%02x,%02x,%02x\n"
+                __FUNCTION__,
+                buf[0], buf[1], buf[2], buf[3]);
+
+        time = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
+
+        rtc_time_to_tm(time, tm);
+
+        dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
+                "mday=%d, mon=%d, year=%d, wday=%d\n",
+                __FUNCTION__,
+                tm->tm_sec, tm->tm_min, tm->tm_hour,
+                tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
+
+        return 0;
+}
+
+static int ds1672_set_mmss(struct i2c_client *client, unsigned long secs)
+{
+        int xfer;
+        unsigned char buf[5];
+
+        buf[0] = DS1672_REG_CNT_BASE;
+        buf[1] = secs & 0x000000FF;
+        buf[2] = (secs & 0x0000FF00) >> 8;
+        buf[3] = (secs & 0x00FF0000) >> 16;
+        buf[4] = (secs & 0xFF000000) >> 24;
+
+        xfer = i2c_master_send(client, buf, 5);
+        if (xfer != 5) {
+                dev_err(&client->dev, "%s: send: %d\n", __FUNCTION__, xfer);
+                return -EIO;
+        }
+
+        return 0;
+}
+
+static int ds1672_set_datetime(struct i2c_client *client, struct rtc_time *tm)
+{
+        unsigned long secs;
+
+        dev_dbg(&client->dev,
+                "%s: secs=%d, mins=%d, hours=%d, ",
+                "mday=%d, mon=%d, year=%d, wday=%d\n",
+                __FUNCTION__,
+                tm->tm_sec, tm->tm_min, tm->tm_hour,
+                tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
+
+        rtc_tm_to_time(tm, &secs);
+
+        return ds1672_set_mmss(client, secs);
+}
+
+static int ds1672_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        return ds1672_get_datetime(to_i2c_client(dev), tm);
+}
+
+static int ds1672_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        return ds1672_set_datetime(to_i2c_client(dev), tm);
+}
+
+static int ds1672_rtc_set_mmss(struct device *dev, unsigned long secs)
+{
+        return ds1672_set_mmss(to_i2c_client(dev), secs);
+}
+
+static struct rtc_class_ops ds1672_rtc_ops = {
+        .read_time      = ds1672_rtc_read_time,
+        .set_time       = ds1672_rtc_set_time,
+        .set_mmss       = ds1672_rtc_set_mmss,
+};
+
+static int ds1672_attach(struct i2c_adapter *adapter)
+{
+        dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
+        return i2c_probe(adapter, &addr_data, ds1672_probe);
+}
+
+static int ds1672_detach(struct i2c_client *client)
+{
+        int err;
+        struct rtc_device *rtc = i2c_get_clientdata(client);
+
+        dev_dbg(&client->dev, "%s\n", __FUNCTION__);
+
+        if (rtc)
+                rtc_device_unregister(rtc);
+
+        if ((err = i2c_detach_client(client)))
+                return err;
+
+        kfree(client);
+
+        return 0;
+}
+
+static struct i2c_driver ds1672_driver = {
+        .driver         = {
+                .name   = "ds1672",
+        },
+        .id             = I2C_DRIVERID_DS1672,
+        .attach_adapter = &ds1672_attach,
+        .detach_client  = &ds1672_detach,
+};
+
+static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind)
+{
+        int err = 0;
+        struct i2c_client *client;
+        struct rtc_device *rtc;
+
+        dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
+                err = -ENODEV;
+                goto exit;
+        }
+
+        if (!(client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit;
+        }
+
+        /* I2C client */
+        client->addr = address;
+        client->driver = &ds1672_driver;
+        client->adapter = adapter;
+
+        strlcpy(client->name, ds1672_driver.driver.name, I2C_NAME_SIZE);
+
+        /* Inform the i2c layer */
+        if ((err = i2c_attach_client(client)))
+                goto exit_kfree;
+
+        dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
+
+        rtc = rtc_device_register(ds1672_driver.driver.name, &client->dev,
+                                &ds1672_rtc_ops, THIS_MODULE);
+
+        if (IS_ERR(rtc)) {
+                err = PTR_ERR(rtc);
+                dev_err(&client->dev,
+                        "unable to register the class device\n");
+                goto exit_detach;
+        }
+
+        i2c_set_clientdata(client, rtc);
+
+        return 0;
+
+exit_detach:
+        i2c_detach_client(client);
+
+exit_kfree:
+        kfree(client);
+
+exit:
+        return err;
+}
+
+static int __init ds1672_init(void)
+{
+        return i2c_add_driver(&ds1672_driver);
+}
+
+static void __exit ds1672_exit(void)
+{
+        i2c_del_driver(&ds1672_driver);
+}
+
+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
+MODULE_DESCRIPTION("Dallas/Maxim DS1672 timekeeper driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+
+module_init(ds1672_init);
+module_exit(ds1672_exit);
diff --git a/drivers/rtc/rtc-ep93xx.c b/drivers/rtc/rtc-ep93xx.c
new file mode 100644
index 0000000000..0dd80ea686
--- /dev/null
+++ b/drivers/rtc/rtc-ep93xx.c
@@ -0,0 +1,162 @@
+/*
+ * A driver for the RTC embedded in the Cirrus Logic EP93XX processors
+ * Copyright (c) 2006 Tower Technologies
+ *
+ * Author: Alessandro Zummo <a.zummo@towertech.it>
+ *
+ * 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/rtc.h>
+#include <linux/platform_device.h>
+#include <asm/hardware.h>
+
+#define EP93XX_RTC_REG(x)       (EP93XX_RTC_BASE + (x))
+#define EP93XX_RTC_DATA         EP93XX_RTC_REG(0x0000)
+#define EP93XX_RTC_LOAD         EP93XX_RTC_REG(0x000C)
+#define EP93XX_RTC_SWCOMP       EP93XX_RTC_REG(0x0108)
+
+#define DRV_VERSION "0.2"
+
+static int ep93xx_get_swcomp(struct device *dev, unsigned short *preload,
+                                unsigned short *delete)
+{
+        unsigned short comp = __raw_readl(EP93XX_RTC_SWCOMP);
+
+        if (preload)
+                *preload = comp & 0xffff;
+
+        if (delete)
+                *delete = (comp >> 16) & 0x1f;
+
+        return 0;
+}
+
+static int ep93xx_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        unsigned long time = __raw_readl(EP93XX_RTC_DATA);
+
+        rtc_time_to_tm(time, tm);
+        return 0;
+}
+
+static int ep93xx_rtc_set_mmss(struct device *dev, unsigned long secs)
+{
+        __raw_writel(secs + 1, EP93XX_RTC_LOAD);
+        return 0;
+}
+
+static int ep93xx_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        int err;
+        unsigned long secs;
+
+        err = rtc_tm_to_time(tm, &secs);
+        if (err != 0)
+                return err;
+
+        return ep93xx_rtc_set_mmss(dev, secs);
+}
+
+static int ep93xx_rtc_proc(struct device *dev, struct seq_file *seq)
+{
+        unsigned short preload, delete;
+
+        ep93xx_get_swcomp(dev, &preload, &delete);
+
+        seq_printf(seq, "24hr\t\t: yes\n");
+        seq_printf(seq, "preload\t\t: %d\n", preload);
+        seq_printf(seq, "delete\t\t: %d\n", delete);
+
+        return 0;
+}
+
+static struct rtc_class_ops ep93xx_rtc_ops = {
+        .read_time      = ep93xx_rtc_read_time,
+        .set_time       = ep93xx_rtc_set_time,
+        .set_mmss       = ep93xx_rtc_set_mmss,
+        .proc           = ep93xx_rtc_proc,
+};
+
+static ssize_t ep93xx_sysfs_show_comp_preload(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        unsigned short preload;
+
+        ep93xx_get_swcomp(dev, &preload, NULL);
+
+        return sprintf(buf, "%d\n", preload);
+}
+static DEVICE_ATTR(comp_preload, S_IRUGO, ep93xx_sysfs_show_comp_preload, NULL);
+
+static ssize_t ep93xx_sysfs_show_comp_delete(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        unsigned short delete;
+
+        ep93xx_get_swcomp(dev, NULL, &delete);
+
+        return sprintf(buf, "%d\n", delete);
+}
+static DEVICE_ATTR(comp_delete, S_IRUGO, ep93xx_sysfs_show_comp_delete, NULL);
+
+
+static int __devinit ep93xx_rtc_probe(struct platform_device *dev)
+{
+        struct rtc_device *rtc = rtc_device_register("ep93xx",
+                                &dev->dev, &ep93xx_rtc_ops, THIS_MODULE);
+
+        if (IS_ERR(rtc)) {
+                dev_err(&dev->dev, "unable to register\n");
+                return PTR_ERR(rtc);
+        }
+
+        platform_set_drvdata(dev, rtc);
+
+        device_create_file(&dev->dev, &dev_attr_comp_preload);
+        device_create_file(&dev->dev, &dev_attr_comp_delete);
+
+        return 0;
+}
+
+static int __devexit ep93xx_rtc_remove(struct platform_device *dev)
+{
+        struct rtc_device *rtc = platform_get_drvdata(dev);
+
+        if (rtc)
+                rtc_device_unregister(rtc);
+
+        platform_set_drvdata(dev, NULL);
+
+        return 0;
+}
+
+static struct platform_driver ep93xx_rtc_platform_driver = {
+        .driver         = {
+                .name   = "ep93xx-rtc",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = ep93xx_rtc_probe,
+        .remove         = __devexit_p(ep93xx_rtc_remove),
+};
+
+static int __init ep93xx_rtc_init(void)
+{
+        return platform_driver_register(&ep93xx_rtc_platform_driver);
+}
+
+static void __exit ep93xx_rtc_exit(void)
+{
+        platform_driver_unregister(&ep93xx_rtc_platform_driver);
+}
+
+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
+MODULE_DESCRIPTION("EP93XX RTC driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+
+module_init(ep93xx_rtc_init);
+module_exit(ep93xx_rtc_exit);
diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c
new file mode 100644
index 0000000000..cfedc1d28e
--- /dev/null
+++ b/drivers/rtc/rtc-lib.c
@@ -0,0 +1,101 @@
+/*
+ * rtc and date/time utility functions
+ *
+ * Copyright (C) 2005-06 Tower Technologies
+ * Author: Alessandro Zummo <a.zummo@towertech.it>
+ *
+ * based on arch/arm/common/rtctime.c and other bits
+ *
+ * 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/rtc.h>
+
+static const unsigned char rtc_days_in_month[] = {
+        31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
+};
+
+#define LEAPS_THRU_END_OF(y) ((y)/4 - (y)/100 + (y)/400)
+#define LEAP_YEAR(year) ((!(year % 4) && (year % 100)) || !(year % 400))
+
+int rtc_month_days(unsigned int month, unsigned int year)
+{
+        return rtc_days_in_month[month] + (LEAP_YEAR(year) && month == 1);
+}
+EXPORT_SYMBOL(rtc_month_days);
+
+/*
+ * Convert seconds since 01-01-1970 00:00:00 to Gregorian date.
+ */
+void rtc_time_to_tm(unsigned long time, struct rtc_time *tm)
+{
+        register int days, month, year;
+
+        days = time / 86400;
+        time -= days * 86400;
+
+        /* day of the week, 1970-01-01 was a Thursday */
+        tm->tm_wday = (days + 4) % 7;
+
+        year = 1970 + days / 365;
+        days -= (year - 1970) * 365
+                + LEAPS_THRU_END_OF(year - 1)
+                - LEAPS_THRU_END_OF(1970 - 1);
+        if (days < 0) {
+                year -= 1;
+                days += 365 + LEAP_YEAR(year);
+        }
+        tm->tm_year = year - 1900;
+        tm->tm_yday = days + 1;
+
+        for (month = 0; month < 11; month++) {
+                int newdays;
+
+                newdays = days - rtc_month_days(month, year);
+                if (newdays < 0)
+                        break;
+                days = newdays;
+        }
+        tm->tm_mon = month;
+        tm->tm_mday = days + 1;
+
+        tm->tm_hour = time / 3600;
+        time -= tm->tm_hour * 3600;
+        tm->tm_min = time / 60;
+        tm->tm_sec = time - tm->tm_min * 60;
+}
+EXPORT_SYMBOL(rtc_time_to_tm);
+
+/*
+ * Does the rtc_time represent a valid date/time?
+ */
+int rtc_valid_tm(struct rtc_time *tm)
+{
+        if (tm->tm_year < 70
+                || tm->tm_mon >= 12
+                || tm->tm_mday < 1
+                || tm->tm_mday > rtc_month_days(tm->tm_mon, tm->tm_year + 1900)
+                || tm->tm_hour >= 24
+                || tm->tm_min >= 60
+                || tm->tm_sec >= 60)
+                return -EINVAL;
+
+        return 0;
+}
+EXPORT_SYMBOL(rtc_valid_tm);
+
+/*
+ * Convert Gregorian date to seconds since 01-01-1970 00:00:00.
+ */
+int rtc_tm_to_time(struct rtc_time *tm, unsigned long *time)
+{
+        *time = mktime(tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
+                        tm->tm_hour, tm->tm_min, tm->tm_sec);
+        return 0;
+}
+EXPORT_SYMBOL(rtc_tm_to_time);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-m48t86.c b/drivers/rtc/rtc-m48t86.c
new file mode 100644
index 0000000000..db445c872b
--- /dev/null
+++ b/drivers/rtc/rtc-m48t86.c
@@ -0,0 +1,209 @@
+/*
+ * ST M48T86 / Dallas DS12887 RTC driver
+ * Copyright (c) 2006 Tower Technologies
+ *
+ * Author: Alessandro Zummo <a.zummo@towertech.it>
+ *
+ * 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.
+ *
+ * This drivers only supports the clock running in BCD and 24H mode.
+ * If it will be ever adapted to binary and 12H mode, care must be taken
+ * to not introduce bugs.
+ */
+
+#include <linux/module.h>
+#include <linux/rtc.h>
+#include <linux/platform_device.h>
+#include <linux/m48t86.h>
+#include <linux/bcd.h>
+
+#define M48T86_REG_SEC          0x00
+#define M48T86_REG_SECALRM      0x01
+#define M48T86_REG_MIN          0x02
+#define M48T86_REG_MINALRM      0x03
+#define M48T86_REG_HOUR 0x04
+#define M48T86_REG_HOURALRM     0x05
+#define M48T86_REG_DOW          0x06 /* 1 = sunday */
+#define M48T86_REG_DOM          0x07
+#define M48T86_REG_MONTH        0x08 /* 1 - 12 */
+#define M48T86_REG_YEAR         0x09 /* 0 - 99 */
+#define M48T86_REG_A            0x0A
+#define M48T86_REG_B            0x0B
+#define M48T86_REG_C            0x0C
+#define M48T86_REG_D            0x0D
+
+#define M48T86_REG_B_H24        (1 << 1)
+#define M48T86_REG_B_DM         (1 << 2)
+#define M48T86_REG_B_SET        (1 << 7)
+#define M48T86_REG_D_VRT        (1 << 7)
+
+#define DRV_VERSION "0.1"
+
+
+static int m48t86_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        unsigned char reg;
+        struct platform_device *pdev = to_platform_device(dev);
+        struct m48t86_ops *ops = pdev->dev.platform_data;
+
+        reg = ops->readb(M48T86_REG_B);
+
+        if (reg & M48T86_REG_B_DM) {
+                /* data (binary) mode */
+                tm->tm_sec      = ops->readb(M48T86_REG_SEC);
+                tm->tm_min      = ops->readb(M48T86_REG_MIN);
+                tm->tm_hour     = ops->readb(M48T86_REG_HOUR) & 0x3F;
+                tm->tm_mday     = ops->readb(M48T86_REG_DOM);
+                /* tm_mon is 0-11 */
+                tm->tm_mon      = ops->readb(M48T86_REG_MONTH) - 1;
+                tm->tm_year     = ops->readb(M48T86_REG_YEAR) + 100;
+                tm->tm_wday     = ops->readb(M48T86_REG_DOW);
+        } else {
+                /* bcd mode */
+                tm->tm_sec      = BCD2BIN(ops->readb(M48T86_REG_SEC));
+                tm->tm_min      = BCD2BIN(ops->readb(M48T86_REG_MIN));
+                tm->tm_hour     = BCD2BIN(ops->readb(M48T86_REG_HOUR) & 0x3F);
+                tm->tm_mday     = BCD2BIN(ops->readb(M48T86_REG_DOM));
+                /* tm_mon is 0-11 */
+                tm->tm_mon      = BCD2BIN(ops->readb(M48T86_REG_MONTH)) - 1;
+                tm->tm_year     = BCD2BIN(ops->readb(M48T86_REG_YEAR)) + 100;
+                tm->tm_wday     = BCD2BIN(ops->readb(M48T86_REG_DOW));
+        }
+
+        /* correct the hour if the clock is in 12h mode */
+        if (!(reg & M48T86_REG_B_H24))
+                if (ops->readb(M48T86_REG_HOUR) & 0x80)
+                        tm->tm_hour += 12;
+
+        return 0;
+}
+
+static int m48t86_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        unsigned char reg;
+        struct platform_device *pdev = to_platform_device(dev);
+        struct m48t86_ops *ops = pdev->dev.platform_data;
+
+        reg = ops->readb(M48T86_REG_B);
+
+        /* update flag and 24h mode */
+        reg |= M48T86_REG_B_SET | M48T86_REG_B_H24;
+        ops->writeb(reg, M48T86_REG_B);
+
+        if (reg & M48T86_REG_B_DM) {
+                /* data (binary) mode */
+                ops->writeb(tm->tm_sec, M48T86_REG_SEC);
+                ops->writeb(tm->tm_min, M48T86_REG_MIN);
+                ops->writeb(tm->tm_hour, M48T86_REG_HOUR);
+                ops->writeb(tm->tm_mday, M48T86_REG_DOM);
+                ops->writeb(tm->tm_mon + 1, M48T86_REG_MONTH);
+                ops->writeb(tm->tm_year % 100, M48T86_REG_YEAR);
+                ops->writeb(tm->tm_wday, M48T86_REG_DOW);
+        } else {
+                /* bcd mode */
+                ops->writeb(BIN2BCD(tm->tm_sec), M48T86_REG_SEC);
+                ops->writeb(BIN2BCD(tm->tm_min), M48T86_REG_MIN);
+                ops->writeb(BIN2BCD(tm->tm_hour), M48T86_REG_HOUR);
+                ops->writeb(BIN2BCD(tm->tm_mday), M48T86_REG_DOM);
+                ops->writeb(BIN2BCD(tm->tm_mon + 1), M48T86_REG_MONTH);
+                ops->writeb(BIN2BCD(tm->tm_year % 100), M48T86_REG_YEAR);
+                ops->writeb(BIN2BCD(tm->tm_wday), M48T86_REG_DOW);
+        }
+
+        /* update ended */
+        reg &= ~M48T86_REG_B_SET;
+        ops->writeb(reg, M48T86_REG_B);
+
+        return 0;
+}
+
+static int m48t86_rtc_proc(struct device *dev, struct seq_file *seq)
+{
+        unsigned char reg;
+        struct platform_device *pdev = to_platform_device(dev);
+        struct m48t86_ops *ops = pdev->dev.platform_data;
+
+        reg = ops->readb(M48T86_REG_B);
+
+        seq_printf(seq, "24hr\t\t: %s\n",
+                 (reg & M48T86_REG_B_H24) ? "yes" : "no");
+
+        seq_printf(seq, "mode\t\t: %s\n",
+                 (reg & M48T86_REG_B_DM) ? "binary" : "bcd");
+
+        reg = ops->readb(M48T86_REG_D);
+
+        seq_printf(seq, "battery\t\t: %s\n",
+                 (reg & M48T86_REG_D_VRT) ? "ok" : "exhausted");
+
+        return 0;
+}
+
+static struct rtc_class_ops m48t86_rtc_ops = {
+        .read_time      = m48t86_rtc_read_time,
+        .set_time       = m48t86_rtc_set_time,
+        .proc           = m48t86_rtc_proc,
+};
+
+static int __devinit m48t86_rtc_probe(struct platform_device *dev)
+{
+        unsigned char reg;
+        struct m48t86_ops *ops = dev->dev.platform_data;
+        struct rtc_device *rtc = rtc_device_register("m48t86",
+                                &dev->dev, &m48t86_rtc_ops, THIS_MODULE);
+
+        if (IS_ERR(rtc)) {
+                dev_err(&dev->dev, "unable to register\n");
+                return PTR_ERR(rtc);
+        }
+
+        platform_set_drvdata(dev, rtc);
+
+        /* read battery status */
+        reg = ops->readb(M48T86_REG_D);
+        dev_info(&dev->dev, "battery %s\n",
+                (reg & M48T86_REG_D_VRT) ? "ok" : "exhausted");
+
+        return 0;
+}
+
+static int __devexit m48t86_rtc_remove(struct platform_device *dev)
+{
+        struct rtc_device *rtc = platform_get_drvdata(dev);
+
+        if (rtc)
+                rtc_device_unregister(rtc);
+
+        platform_set_drvdata(dev, NULL);
+
+        return 0;
+}
+
+static struct platform_driver m48t86_rtc_platform_driver = {
+        .driver         = {
+                .name   = "rtc-m48t86",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = m48t86_rtc_probe,
+        .remove         = __devexit_p(m48t86_rtc_remove),
+};
+
+static int __init m48t86_rtc_init(void)
+{
+        return platform_driver_register(&m48t86_rtc_platform_driver);
+}
+
+static void __exit m48t86_rtc_exit(void)
+{
+        platform_driver_unregister(&m48t86_rtc_platform_driver);
+}
+
+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
+MODULE_DESCRIPTION("M48T86 RTC driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+
+module_init(m48t86_rtc_init);
+module_exit(m48t86_rtc_exit);
diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c
new file mode 100644
index 0000000000..d857d45bdb
--- /dev/null
+++ b/drivers/rtc/rtc-pcf8563.c
@@ -0,0 +1,353 @@
+/*
+ * An I2C driver for the Philips PCF8563 RTC
+ * Copyright 2005-06 Tower Technologies
+ *
+ * Author: Alessandro Zummo <a.zummo@towertech.it>
+ * Maintainers: http://www.nslu2-linux.org/
+ *
+ * based on the other drivers in this same directory.
+ *
+ * http://www.semiconductors.philips.com/acrobat/datasheets/PCF8563-04.pdf
+ *
+ * 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/i2c.h>
+#include <linux/bcd.h>
+#include <linux/rtc.h>
+
+#define DRV_VERSION "0.4.2"
+
+/* Addresses to scan: none
+ * This chip cannot be reliably autodetected. An empty eeprom
+ * located at 0x51 will pass the validation routine due to
+ * the way the registers are implemented.
+ */
+static unsigned short normal_i2c[] = { I2C_CLIENT_END };
+
+/* Module parameters */
+I2C_CLIENT_INSMOD;
+
+#define PCF8563_REG_ST1         0x00 /* status */
+#define PCF8563_REG_ST2         0x01
+
+#define PCF8563_REG_SC          0x02 /* datetime */
+#define PCF8563_REG_MN          0x03
+#define PCF8563_REG_HR          0x04
+#define PCF8563_REG_DM          0x05
+#define PCF8563_REG_DW          0x06
+#define PCF8563_REG_MO          0x07
+#define PCF8563_REG_YR          0x08
+
+#define PCF8563_REG_AMN         0x09 /* alarm */
+#define PCF8563_REG_AHR         0x0A
+#define PCF8563_REG_ADM         0x0B
+#define PCF8563_REG_ADW         0x0C
+
+#define PCF8563_REG_CLKO        0x0D /* clock out */
+#define PCF8563_REG_TMRC        0x0E /* timer control */
+#define PCF8563_REG_TMR         0x0F /* timer */
+
+#define PCF8563_SC_LV           0x80 /* low voltage */
+#define PCF8563_MO_C            0x80 /* century */
+
+static int pcf8563_probe(struct i2c_adapter *adapter, int address, int kind);
+static int pcf8563_detach(struct i2c_client *client);
+
+/*
+ * In the routines that deal directly with the pcf8563 hardware, we use
+ * rtc_time -- month 0-11, hour 0-23, yr = calendar year-epoch.
+ */
+static int pcf8563_get_datetime(struct i2c_client *client, struct rtc_time *tm)
+{
+        unsigned char buf[13] = { PCF8563_REG_ST1 };
+
+        struct i2c_msg msgs[] = {
+                { client->addr, 0, 1, buf },    /* setup read ptr */
+                { client->addr, I2C_M_RD, 13, buf },    /* read status + date */
+        };
+
+        /* read registers */
+        if ((i2c_transfer(client->adapter, msgs, 2)) != 2) {
+                dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
+                return -EIO;
+        }
+
+        if (buf[PCF8563_REG_SC] & PCF8563_SC_LV)
+                dev_info(&client->dev,
+                        "low voltage detected, date/time is not reliable.\n");
+
+        dev_dbg(&client->dev,
+                "%s: raw data is st1=%02x, st2=%02x, sec=%02x, min=%02x, hr=%02x, "
+                "mday=%02x, wday=%02x, mon=%02x, year=%02x\n",
+                __FUNCTION__,
+                buf[0], buf[1], buf[2], buf[3],
+                buf[4], buf[5], buf[6], buf[7],
+                buf[8]);
+
+
+        tm->tm_sec = BCD2BIN(buf[PCF8563_REG_SC] & 0x7F);
+        tm->tm_min = BCD2BIN(buf[PCF8563_REG_MN] & 0x7F);
+        tm->tm_hour = BCD2BIN(buf[PCF8563_REG_HR] & 0x3F); /* rtc hr 0-23 */
+        tm->tm_mday = BCD2BIN(buf[PCF8563_REG_DM] & 0x3F);
+        tm->tm_wday = buf[PCF8563_REG_DW] & 0x07;
+        tm->tm_mon = BCD2BIN(buf[PCF8563_REG_MO] & 0x1F) - 1; /* rtc mn 1-12 */
+        tm->tm_year = BCD2BIN(buf[PCF8563_REG_YR])
+                + (buf[PCF8563_REG_MO] & PCF8563_MO_C ? 100 : 0);
+
+        dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
+                "mday=%d, mon=%d, year=%d, wday=%d\n",
+                __FUNCTION__,
+                tm->tm_sec, tm->tm_min, tm->tm_hour,
+                tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
+
+        /* the clock can give out invalid datetime, but we cannot return
+         * -EINVAL otherwise hwclock will refuse to set the time on bootup.
+         */
+        if (rtc_valid_tm(tm) < 0)
+                dev_err(&client->dev, "retrieved date/time is not valid.\n");
+
+        return 0;
+}
+
+static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm)
+{
+        int i, err;
+        unsigned char buf[9];
+
+        dev_dbg(&client->dev, "%s: secs=%d, mins=%d, hours=%d, "
+                "mday=%d, mon=%d, year=%d, wday=%d\n",
+                __FUNCTION__,
+                tm->tm_sec, tm->tm_min, tm->tm_hour,
+                tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
+
+        /* hours, minutes and seconds */
+        buf[PCF8563_REG_SC] = BIN2BCD(tm->tm_sec);
+        buf[PCF8563_REG_MN] = BIN2BCD(tm->tm_min);
+        buf[PCF8563_REG_HR] = BIN2BCD(tm->tm_hour);
+
+        buf[PCF8563_REG_DM] = BIN2BCD(tm->tm_mday);
+
+        /* month, 1 - 12 */
+        buf[PCF8563_REG_MO] = BIN2BCD(tm->tm_mon + 1);
+
+        /* year and century */
+        buf[PCF8563_REG_YR] = BIN2BCD(tm->tm_year % 100);
+        if (tm->tm_year / 100)
+                buf[PCF8563_REG_MO] |= PCF8563_MO_C;
+
+        buf[PCF8563_REG_DW] = tm->tm_wday & 0x07;
+
+        /* write register's data */
+        for (i = 0; i < 7; i++) {
+                unsigned char data[2] = { PCF8563_REG_SC + i,
+                                                buf[PCF8563_REG_SC + i] };
+
+                err = i2c_master_send(client, data, sizeof(data));
+                if (err != sizeof(data)) {
+                        dev_err(&client->dev,
+                                "%s: err=%d addr=%02x, data=%02x\n",
+                                __FUNCTION__, err, data[0], data[1]);
+                        return -EIO;
+                }
+        };
+
+        return 0;
+}
+
+struct pcf8563_limit
+{
+        unsigned char reg;
+        unsigned char mask;
+        unsigned char min;
+        unsigned char max;
+};
+
+static int pcf8563_validate_client(struct i2c_client *client)
+{
+        int i;
+
+        static const struct pcf8563_limit pattern[] = {
+                /* register, mask, min, max */
+                { PCF8563_REG_SC,       0x7F,   0,      59      },
+                { PCF8563_REG_MN,       0x7F,   0,      59      },
+                { PCF8563_REG_HR,       0x3F,   0,      23      },
+                { PCF8563_REG_DM,       0x3F,   0,      31      },
+                { PCF8563_REG_MO,       0x1F,   0,      12      },
+        };
+
+        /* check limits (only registers with bcd values) */
+        for (i = 0; i < ARRAY_SIZE(pattern); i++) {
+                int xfer;
+                unsigned char value;
+                unsigned char buf = pattern[i].reg;
+
+                struct i2c_msg msgs[] = {
+                        { client->addr, 0, 1, &buf },
+                        { client->addr, I2C_M_RD, 1, &buf },
+                };
+
+                xfer = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
+
+                if (xfer != ARRAY_SIZE(msgs)) {
+                        dev_err(&client->adapter->dev,
+                                "%s: could not read register 0x%02X\n",
+                                __FUNCTION__, pattern[i].reg);
+
+                        return -EIO;
+                }
+
+                value = BCD2BIN(buf & pattern[i].mask);
+
+                if (value > pattern[i].max ||
+                        value < pattern[i].min) {
+                        dev_dbg(&client->adapter->dev,
+                                "%s: pattern=%d, reg=%x, mask=0x%02x, min=%d, "
+                                "max=%d, value=%d, raw=0x%02X\n",
+                                __FUNCTION__, i, pattern[i].reg, pattern[i].mask,
+                                pattern[i].min, pattern[i].max,
+                                value, buf);
+
+                        return -ENODEV;
+                }
+        }
+
+        return 0;
+}
+
+static int pcf8563_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        return pcf8563_get_datetime(to_i2c_client(dev), tm);
+}
+
+static int pcf8563_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        return pcf8563_set_datetime(to_i2c_client(dev), tm);
+}
+
+static int pcf8563_rtc_proc(struct device *dev, struct seq_file *seq)
+{
+        seq_printf(seq, "24hr\t\t: yes\n");
+        return 0;
+}
+
+static struct rtc_class_ops pcf8563_rtc_ops = {
+        .proc           = pcf8563_rtc_proc,
+        .read_time      = pcf8563_rtc_read_time,
+        .set_time       = pcf8563_rtc_set_time,
+};
+
+static int pcf8563_attach(struct i2c_adapter *adapter)
+{
+        return i2c_probe(adapter, &addr_data, pcf8563_probe);
+}
+
+static struct i2c_driver pcf8563_driver = {
+        .driver         = {
+                .name   = "pcf8563",
+        },
+        .id             = I2C_DRIVERID_PCF8563,
+        .attach_adapter = &pcf8563_attach,
+        .detach_client  = &pcf8563_detach,
+};
+
+static int pcf8563_probe(struct i2c_adapter *adapter, int address, int kind)
+{
+        struct i2c_client *client;
+        struct rtc_device *rtc;
+
+        int err = 0;
+
+        dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
+                err = -ENODEV;
+                goto exit;
+        }
+
+        if (!(client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit;
+        }
+
+        client->addr = address;
+        client->driver = &pcf8563_driver;
+        client->adapter = adapter;
+
+        strlcpy(client->name, pcf8563_driver.driver.name, I2C_NAME_SIZE);
+
+        /* Verify the chip is really an PCF8563 */
+        if (kind < 0) {
+                if (pcf8563_validate_client(client) < 0) {
+                        err = -ENODEV;
+                        goto exit_kfree;
+                }
+        }
+
+        /* Inform the i2c layer */
+        if ((err = i2c_attach_client(client)))
+                goto exit_kfree;
+
+        dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
+
+        rtc = rtc_device_register(pcf8563_driver.driver.name, &client->dev,
+                                &pcf8563_rtc_ops, THIS_MODULE);
+
+        if (IS_ERR(rtc)) {
+                err = PTR_ERR(rtc);
+                dev_err(&client->dev,
+                        "unable to register the class device\n");
+                goto exit_detach;
+        }
+
+        i2c_set_clientdata(client, rtc);
+
+        return 0;
+
+exit_detach:
+        i2c_detach_client(client);
+
+exit_kfree:
+        kfree(client);
+
+exit:
+        return err;
+}
+
+static int pcf8563_detach(struct i2c_client *client)
+{
+        int err;
+        struct rtc_device *rtc = i2c_get_clientdata(client);
+
+        dev_dbg(&client->dev, "%s\n", __FUNCTION__);
+
+        if (rtc)
+                rtc_device_unregister(rtc);
+
+        if ((err = i2c_detach_client(client)))
+                return err;
+
+        kfree(client);
+
+        return 0;
+}
+
+static int __init pcf8563_init(void)
+{
+        return i2c_add_driver(&pcf8563_driver);
+}
+
+static void __exit pcf8563_exit(void)
+{
+        i2c_del_driver(&pcf8563_driver);
+}
+
+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
+MODULE_DESCRIPTION("Philips PCF8563/Epson RTC8564 RTC driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+
+module_init(pcf8563_init);
+module_exit(pcf8563_exit);
diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c
new file mode 100644
index 0000000000..90b8a97a09
--- /dev/null
+++ b/drivers/rtc/rtc-proc.c
@@ -0,0 +1,162 @@
+/*
+ * RTC subsystem, proc interface
+ *
+ * Copyright (C) 2005-06 Tower Technologies
+ * Author: Alessandro Zummo <a.zummo@towertech.it>
+ *
+ * based on arch/arm/common/rtctime.c
+ *
+ * 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/rtc.h>
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
+
+static struct class_device *rtc_dev = NULL;
+static DEFINE_MUTEX(rtc_lock);
+
+static int rtc_proc_show(struct seq_file *seq, void *offset)
+{
+        int err;
+        struct class_device *class_dev = seq->private;
+        struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops;
+        struct rtc_wkalrm alrm;
+        struct rtc_time tm;
+
+        err = rtc_read_time(class_dev, &tm);
+        if (err == 0) {
+                seq_printf(seq,
+                        "rtc_time\t: %02d:%02d:%02d\n"
+                        "rtc_date\t: %04d-%02d-%02d\n",
+                        tm.tm_hour, tm.tm_min, tm.tm_sec,
+                        tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
+        }
+
+        err = rtc_read_alarm(class_dev, &alrm);
+        if (err == 0) {
+                seq_printf(seq, "alrm_time\t: ");
+                if ((unsigned int)alrm.time.tm_hour <= 24)
+                        seq_printf(seq, "%02d:", alrm.time.tm_hour);
+                else
+                        seq_printf(seq, "**:");
+                if ((unsigned int)alrm.time.tm_min <= 59)
+                        seq_printf(seq, "%02d:", alrm.time.tm_min);
+                else
+                        seq_printf(seq, "**:");
+                if ((unsigned int)alrm.time.tm_sec <= 59)
+                        seq_printf(seq, "%02d\n", alrm.time.tm_sec);
+                else
+                        seq_printf(seq, "**\n");
+
+                seq_printf(seq, "alrm_date\t: ");
+                if ((unsigned int)alrm.time.tm_year <= 200)
+                        seq_printf(seq, "%04d-", alrm.time.tm_year + 1900);
+                else
+                        seq_printf(seq, "****-");
+                if ((unsigned int)alrm.time.tm_mon <= 11)
+                        seq_printf(seq, "%02d-", alrm.time.tm_mon + 1);
+                else
+                        seq_printf(seq, "**-");
+                if ((unsigned int)alrm.time.tm_mday <= 31)
+                        seq_printf(seq, "%02d\n", alrm.time.tm_mday);
+                else
+                        seq_printf(seq, "**\n");
+                seq_printf(seq, "alrm_wakeup\t: %s\n",
+                                alrm.enabled ? "yes" : "no");
+                seq_printf(seq, "alrm_pending\t: %s\n",
+                                alrm.pending ? "yes" : "no");
+        }
+
+        if (ops->proc)
+                ops->proc(class_dev->dev, seq);
+
+        return 0;
+}
+
+static int rtc_proc_open(struct inode *inode, struct file *file)
+{
+        struct class_device *class_dev = PDE(inode)->data;
+
+        if (!try_module_get(THIS_MODULE))
+                return -ENODEV;
+
+        return single_open(file, rtc_proc_show, class_dev);
+}
+
+static int rtc_proc_release(struct inode *inode, struct file *file)
+{
+        int res = single_release(inode, file);
+        module_put(THIS_MODULE);
+        return res;
+}
+
+static struct file_operations rtc_proc_fops = {
+        .open           = rtc_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = rtc_proc_release,
+};
+
+static int rtc_proc_add_device(struct class_device *class_dev,
+                                        struct class_interface *class_intf)
+{
+        mutex_lock(&rtc_lock);
+        if (rtc_dev == NULL) {
+                struct proc_dir_entry *ent;
+
+                rtc_dev = class_dev;
+
+                ent = create_proc_entry("driver/rtc", 0, NULL);
+                if (ent) {
+                        struct rtc_device *rtc = to_rtc_device(class_dev);
+
+                        ent->proc_fops = &rtc_proc_fops;
+                        ent->owner = rtc->owner;
+                        ent->data = class_dev;
+
+                        dev_info(class_dev->dev, "rtc intf: proc\n");
+                }
+                else
+                        rtc_dev = NULL;
+        }
+        mutex_unlock(&rtc_lock);
+
+        return 0;
+}
+
+static void rtc_proc_remove_device(struct class_device *class_dev,
+                                        struct class_interface *class_intf)
+{
+        mutex_lock(&rtc_lock);
+        if (rtc_dev == class_dev) {
+                remove_proc_entry("driver/rtc", NULL);
+                rtc_dev = NULL;
+        }
+        mutex_unlock(&rtc_lock);
+}
+
+static struct class_interface rtc_proc_interface = {
+        .add = &rtc_proc_add_device,
+        .remove = &rtc_proc_remove_device,
+};
+
+static int __init rtc_proc_init(void)
+{
+        return rtc_interface_register(&rtc_proc_interface);
+}
+
+static void __exit rtc_proc_exit(void)
+{
+        class_interface_unregister(&rtc_proc_interface);
+}
+
+module_init(rtc_proc_init);
+module_exit(rtc_proc_exit);
+
+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
+MODULE_DESCRIPTION("RTC class proc interface");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c
new file mode 100644
index 0000000000..396c8681f6
--- /dev/null
+++ b/drivers/rtc/rtc-rs5c372.c
@@ -0,0 +1,294 @@
+/*
+ * An I2C driver for the Ricoh RS5C372 RTC
+ *
+ * Copyright (C) 2005 Pavel Mironchik <pmironchik@optifacio.net>
+ * Copyright (C) 2006 Tower Technologies
+ *
+ * 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/i2c.h>
+#include <linux/rtc.h>
+#include <linux/bcd.h>
+
+#define DRV_VERSION "0.2"
+
+/* Addresses to scan */
+static unsigned short normal_i2c[] = { /* 0x32,*/ I2C_CLIENT_END };
+
+/* Insmod parameters */
+I2C_CLIENT_INSMOD;
+
+#define RS5C372_REG_SECS        0
+#define RS5C372_REG_MINS        1
+#define RS5C372_REG_HOURS       2
+#define RS5C372_REG_WDAY        3
+#define RS5C372_REG_DAY         4
+#define RS5C372_REG_MONTH       5
+#define RS5C372_REG_YEAR        6
+#define RS5C372_REG_TRIM        7
+
+#define RS5C372_TRIM_XSL        0x80
+#define RS5C372_TRIM_MASK       0x7F
+
+#define RS5C372_REG_BASE        0
+
+static int rs5c372_attach(struct i2c_adapter *adapter);
+static int rs5c372_detach(struct i2c_client *client);
+static int rs5c372_probe(struct i2c_adapter *adapter, int address, int kind);
+
+static struct i2c_driver rs5c372_driver = {
+        .driver         = {
+                .name   = "rs5c372",
+        },
+        .attach_adapter = &rs5c372_attach,
+        .detach_client  = &rs5c372_detach,
+};
+
+static int rs5c372_get_datetime(struct i2c_client *client, struct rtc_time *tm)
+{
+        unsigned char buf[7] = { RS5C372_REG_BASE };
+
+        /* this implements the 1st reading method, according
+         * to the datasheet. buf[0] is initialized with
+         * address ptr and transmission format register.
+         */
+        struct i2c_msg msgs[] = {
+                { client->addr, 0, 1, buf },
+                { client->addr, I2C_M_RD, 7, buf },
+        };
+
+        if ((i2c_transfer(client->adapter, msgs, 2)) != 2) {
+                dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
+                return -EIO;
+        }
+
+        tm->tm_sec = BCD2BIN(buf[RS5C372_REG_SECS] & 0x7f);
+        tm->tm_min = BCD2BIN(buf[RS5C372_REG_MINS] & 0x7f);
+        tm->tm_hour = BCD2BIN(buf[RS5C372_REG_HOURS] & 0x3f);
+        tm->tm_wday = BCD2BIN(buf[RS5C372_REG_WDAY] & 0x07);
+        tm->tm_mday = BCD2BIN(buf[RS5C372_REG_DAY] & 0x3f);
+
+        /* tm->tm_mon is zero-based */
+        tm->tm_mon = BCD2BIN(buf[RS5C372_REG_MONTH] & 0x1f) - 1;
+
+        /* year is 1900 + tm->tm_year */
+        tm->tm_year = BCD2BIN(buf[RS5C372_REG_YEAR]) + 100;
+
+        dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
+                "mday=%d, mon=%d, year=%d, wday=%d\n",
+                __FUNCTION__,
+                tm->tm_sec, tm->tm_min, tm->tm_hour,
+                tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
+
+        return 0;
+}
+
+static int rs5c372_set_datetime(struct i2c_client *client, struct rtc_time *tm)
+{
+        unsigned char buf[8] = { RS5C372_REG_BASE };
+
+        dev_dbg(&client->dev,
+                "%s: secs=%d, mins=%d, hours=%d ",
+                "mday=%d, mon=%d, year=%d, wday=%d\n",
+                __FUNCTION__, tm->tm_sec, tm->tm_min, tm->tm_hour,
+                tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
+
+        buf[1] = BIN2BCD(tm->tm_sec);
+        buf[2] = BIN2BCD(tm->tm_min);
+        buf[3] = BIN2BCD(tm->tm_hour);
+        buf[4] = BIN2BCD(tm->tm_wday);
+        buf[5] = BIN2BCD(tm->tm_mday);
+        buf[6] = BIN2BCD(tm->tm_mon + 1);
+        buf[7] = BIN2BCD(tm->tm_year - 100);
+
+        if ((i2c_master_send(client, buf, 8)) != 8) {
+                dev_err(&client->dev, "%s: write error\n", __FUNCTION__);
+                return -EIO;
+        }
+
+        return 0;
+}
+
+static int rs5c372_get_trim(struct i2c_client *client, int *osc, int *trim)
+{
+        unsigned char buf = RS5C372_REG_TRIM;
+
+        struct i2c_msg msgs[] = {
+                { client->addr, 0, 1, &buf },
+                { client->addr, I2C_M_RD, 1, &buf },
+        };
+
+        if ((i2c_transfer(client->adapter, msgs, 2)) != 2) {
+                dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
+                return -EIO;
+        }
+
+        dev_dbg(&client->dev, "%s: raw trim=%x\n", __FUNCTION__, trim);
+
+        if (osc)
+                *osc = (buf & RS5C372_TRIM_XSL) ? 32000 : 32768;
+
+        if (trim)
+                *trim = buf & RS5C372_TRIM_MASK;
+
+        return 0;
+}
+
+static int rs5c372_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        return rs5c372_get_datetime(to_i2c_client(dev), tm);
+}
+
+static int rs5c372_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        return rs5c372_set_datetime(to_i2c_client(dev), tm);
+}
+
+static int rs5c372_rtc_proc(struct device *dev, struct seq_file *seq)
+{
+        int err, osc, trim;
+
+        seq_printf(seq, "24hr\t\t: yes\n");
+
+        if ((err = rs5c372_get_trim(to_i2c_client(dev), &osc, &trim)) == 0) {
+                seq_printf(seq, "%d.%03d KHz\n", osc / 1000, osc % 1000);
+                seq_printf(seq, "trim\t: %d\n", trim);
+        }
+
+        return 0;
+}
+
+static struct rtc_class_ops rs5c372_rtc_ops = {
+        .proc           = rs5c372_rtc_proc,
+        .read_time      = rs5c372_rtc_read_time,
+        .set_time       = rs5c372_rtc_set_time,
+};
+
+static ssize_t rs5c372_sysfs_show_trim(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        int trim;
+
+        if (rs5c372_get_trim(to_i2c_client(dev), NULL, &trim) == 0)
+                return sprintf(buf, "0x%2x\n", trim);
+
+        return 0;
+}
+static DEVICE_ATTR(trim, S_IRUGO, rs5c372_sysfs_show_trim, NULL);
+
+static ssize_t rs5c372_sysfs_show_osc(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        int osc;
+
+        if (rs5c372_get_trim(to_i2c_client(dev), &osc, NULL) == 0)
+                return sprintf(buf, "%d.%03d KHz\n", osc / 1000, osc % 1000);
+
+        return 0;
+}
+static DEVICE_ATTR(osc, S_IRUGO, rs5c372_sysfs_show_osc, NULL);
+
+static int rs5c372_attach(struct i2c_adapter *adapter)
+{
+        dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
+        return i2c_probe(adapter, &addr_data, rs5c372_probe);
+}
+
+static int rs5c372_probe(struct i2c_adapter *adapter, int address, int kind)
+{
+        int err = 0;
+        struct i2c_client *client;
+        struct rtc_device *rtc;
+
+        dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
+                err = -ENODEV;
+                goto exit;
+        }
+
+        if (!(client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit;
+        }
+
+        /* I2C client */
+        client->addr = address;
+        client->driver = &rs5c372_driver;
+        client->adapter = adapter;
+
+        strlcpy(client->name, rs5c372_driver.driver.name, I2C_NAME_SIZE);
+
+        /* Inform the i2c layer */
+        if ((err = i2c_attach_client(client)))
+                goto exit_kfree;
+
+        dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
+
+        rtc = rtc_device_register(rs5c372_driver.driver.name, &client->dev,
+                                &rs5c372_rtc_ops, THIS_MODULE);
+
+        if (IS_ERR(rtc)) {
+                err = PTR_ERR(rtc);
+                dev_err(&client->dev,
+                        "unable to register the class device\n");
+                goto exit_detach;
+        }
+
+        i2c_set_clientdata(client, rtc);
+
+        device_create_file(&client->dev, &dev_attr_trim);
+        device_create_file(&client->dev, &dev_attr_osc);
+
+        return 0;
+
+exit_detach:
+        i2c_detach_client(client);
+
+exit_kfree:
+        kfree(client);
+
+exit:
+        return err;
+}
+
+static int rs5c372_detach(struct i2c_client *client)
+{
+        int err;
+        struct rtc_device *rtc = i2c_get_clientdata(client);
+
+        dev_dbg(&client->dev, "%s\n", __FUNCTION__);
+
+        if (rtc)
+                rtc_device_unregister(rtc);
+
+        if ((err = i2c_detach_client(client)))
+                return err;
+
+        kfree(client);
+
+        return 0;
+}
+
+static __init int rs5c372_init(void)
+{
+        return i2c_add_driver(&rs5c372_driver);
+}
+
+static __exit void rs5c372_exit(void)
+{
+        i2c_del_driver(&rs5c372_driver);
+}
+
+module_init(rs5c372_init);
+module_exit(rs5c372_exit);
+
+MODULE_AUTHOR(
+                "Pavel Mironchik <pmironchik@optifacio.net>, "
+                "Alessandro Zummo <a.zummo@towertech.it>");
+MODULE_DESCRIPTION("Ricoh RS5C372 RTC driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
new file mode 100644
index 0000000000..83b2bb480a
--- /dev/null
+++ b/drivers/rtc/rtc-sa1100.c
@@ -0,0 +1,388 @@
+/*
+ * Real Time Clock interface for StrongARM SA1x00 and XScale PXA2xx
+ *
+ * Copyright (c) 2000 Nils Faerber
+ *
+ * Based on rtc.c by Paul Gortmaker
+ *
+ * Original Driver by Nils Faerber <nils@kernelconcepts.de>
+ *
+ * Modifications from:
+ *   CIH <cih@coventive.com>
+ *   Nicolas Pitre <nico@cam.org>
+ *   Andrew Christian <andrew.christian@hp.com>
+ *
+ * Converted to the RTC subsystem and Driver Model
+ *   by Richard Purdie <rpurdie@rpsys.net>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/module.h>
+#include <linux/rtc.h>
+#include <linux/init.h>
+#include <linux/fs.h>
+#include <linux/interrupt.h>
+#include <linux/string.h>
+#include <linux/pm.h>
+
+#include <asm/bitops.h>
+#include <asm/hardware.h>
+#include <asm/irq.h>
+#include <asm/rtc.h>
+
+#ifdef CONFIG_ARCH_PXA
+#include <asm/arch/pxa-regs.h>
+#endif
+
+#define TIMER_FREQ              CLOCK_TICK_RATE
+#define RTC_DEF_DIVIDER         32768 - 1
+#define RTC_DEF_TRIM            0
+
+static unsigned long rtc_freq = 1024;
+static struct rtc_time rtc_alarm;
+static spinlock_t sa1100_rtc_lock = SPIN_LOCK_UNLOCKED;
+
+static int rtc_update_alarm(struct rtc_time *alrm)
+{
+        struct rtc_time alarm_tm, now_tm;
+        unsigned long now, time;
+        int ret;
+
+        do {
+                now = RCNR;
+                rtc_time_to_tm(now, &now_tm);
+                rtc_next_alarm_time(&alarm_tm, &now_tm, alrm);
+                ret = rtc_tm_to_time(&alarm_tm, &time);
+                if (ret != 0)
+                        break;
+
+                RTSR = RTSR & (RTSR_HZE|RTSR_ALE|RTSR_AL);
+                RTAR = time;
+        } while (now != RCNR);
+
+        return ret;
+}
+
+static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id,
+                struct pt_regs *regs)
+{
+        struct platform_device *pdev = to_platform_device(dev_id);
+        struct rtc_device *rtc = platform_get_drvdata(pdev);
+        unsigned int rtsr;
+        unsigned long events = 0;
+
+        spin_lock(&sa1100_rtc_lock);
+
+        rtsr = RTSR;
+        /* clear interrupt sources */
+        RTSR = 0;
+        RTSR = (RTSR_AL | RTSR_HZ) & (rtsr >> 2);
+
+        /* clear alarm interrupt if it has occurred */
+        if (rtsr & RTSR_AL)
+                rtsr &= ~RTSR_ALE;
+        RTSR = rtsr & (RTSR_ALE | RTSR_HZE);
+
+        /* update irq data & counter */
+        if (rtsr & RTSR_AL)
+                events |= RTC_AF | RTC_IRQF;
+        if (rtsr & RTSR_HZ)
+                events |= RTC_UF | RTC_IRQF;
+
+        rtc_update_irq(&rtc->class_dev, 1, events);
+
+        if (rtsr & RTSR_AL && rtc_periodic_alarm(&rtc_alarm))
+                rtc_update_alarm(&rtc_alarm);
+
+        spin_unlock(&sa1100_rtc_lock);
+
+        return IRQ_HANDLED;
+}
+
+static int rtc_timer1_count;
+
+static irqreturn_t timer1_interrupt(int irq, void *dev_id,
+                struct pt_regs *regs)
+{
+        struct platform_device *pdev = to_platform_device(dev_id);
+        struct rtc_device *rtc = platform_get_drvdata(pdev);
+
+        /*
+         * If we match for the first time, rtc_timer1_count will be 1.
+         * Otherwise, we wrapped around (very unlikely but
+         * still possible) so compute the amount of missed periods.
+         * The match reg is updated only when the data is actually retrieved
+         * to avoid unnecessary interrupts.
+         */
+        OSSR = OSSR_M1; /* clear match on timer1 */
+
+        rtc_update_irq(&rtc->class_dev, rtc_timer1_count, RTC_PF | RTC_IRQF);
+
+        if (rtc_timer1_count == 1)
+                rtc_timer1_count = (rtc_freq * ((1<<30)/(TIMER_FREQ>>2)));
+
+        return IRQ_HANDLED;
+}
+
+static int sa1100_rtc_read_callback(struct device *dev, int data)
+{
+        if (data & RTC_PF) {
+                /* interpolate missed periods and set match for the next */
+                unsigned long period = TIMER_FREQ/rtc_freq;
+                unsigned long oscr = OSCR;
+                unsigned long osmr1 = OSMR1;
+                unsigned long missed = (oscr - osmr1)/period;
+                data += missed << 8;
+                OSSR = OSSR_M1; /* clear match on timer 1 */
+                OSMR1 = osmr1 + (missed + 1)*period;
+                /* Ensure we didn't miss another match in the mean time.
+                 * Here we compare (match - OSCR) 8 instead of 0 --
+                 * see comment in pxa_timer_interrupt() for explanation.
+                 */
+                while( (signed long)((osmr1 = OSMR1) - OSCR) <= 8 ) {
+                        data += 0x100;
+                        OSSR = OSSR_M1; /* clear match on timer 1 */
+                        OSMR1 = osmr1 + period;
+                }
+        }
+        return data;
+}
+
+static int sa1100_rtc_open(struct device *dev)
+{
+        int ret;
+
+        ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, SA_INTERRUPT,
+                                "rtc 1Hz", dev);
+        if (ret) {
+                printk(KERN_ERR "rtc: IRQ%d already in use.\n", IRQ_RTC1Hz);
+                goto fail_ui;
+        }
+        ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, SA_INTERRUPT,
+                                "rtc Alrm", dev);
+        if (ret) {
+                printk(KERN_ERR "rtc: IRQ%d already in use.\n", IRQ_RTCAlrm);
+                goto fail_ai;
+        }
+        ret = request_irq(IRQ_OST1, timer1_interrupt, SA_INTERRUPT,
+                                "rtc timer", dev);
+        if (ret) {
+                printk(KERN_ERR "rtc: IRQ%d already in use.\n", IRQ_OST1);
+                goto fail_pi;
+        }
+        return 0;
+
+ fail_pi:
+        free_irq(IRQ_RTCAlrm, NULL);
+ fail_ai:
+        free_irq(IRQ_RTC1Hz, NULL);
+ fail_ui:
+        return ret;
+}
+
+static void sa1100_rtc_release(struct device *dev)
+{
+        spin_lock_irq(&sa1100_rtc_lock);
+        RTSR = 0;
+        OIER &= ~OIER_E1;
+        OSSR = OSSR_M1;
+        spin_unlock_irq(&sa1100_rtc_lock);
+
+        free_irq(IRQ_OST1, dev);
+        free_irq(IRQ_RTCAlrm, dev);
+        free_irq(IRQ_RTC1Hz, dev);
+}
+
+
+static int sa1100_rtc_ioctl(struct device *dev, unsigned int cmd,
+                unsigned long arg)
+{
+        switch(cmd) {
+        case RTC_AIE_OFF:
+                spin_lock_irq(&sa1100_rtc_lock);
+                RTSR &= ~RTSR_ALE;
+                spin_unlock_irq(&sa1100_rtc_lock);
+                return 0;
+        case RTC_AIE_ON:
+                spin_lock_irq(&sa1100_rtc_lock);
+                RTSR |= RTSR_ALE;
+                spin_unlock_irq(&sa1100_rtc_lock);
+                return 0;
+        case RTC_UIE_OFF:
+                spin_lock_irq(&sa1100_rtc_lock);
+                RTSR &= ~RTSR_HZE;
+                spin_unlock_irq(&sa1100_rtc_lock);
+                return 0;
+        case RTC_UIE_ON:
+                spin_lock_irq(&sa1100_rtc_lock);
+                RTSR |= RTSR_HZE;
+                spin_unlock_irq(&sa1100_rtc_lock);
+                return 0;
+        case RTC_PIE_OFF:
+                spin_lock_irq(&sa1100_rtc_lock);
+                OIER &= ~OIER_E1;
+                spin_unlock_irq(&sa1100_rtc_lock);
+                return 0;
+        case RTC_PIE_ON:
+                if ((rtc_freq > 64) && !capable(CAP_SYS_RESOURCE))
+                        return -EACCES;
+                spin_lock_irq(&sa1100_rtc_lock);
+                OSMR1 = TIMER_FREQ/rtc_freq + OSCR;
+                OIER |= OIER_E1;
+                rtc_timer1_count = 1;
+                spin_unlock_irq(&sa1100_rtc_lock);
+                return 0;
+        case RTC_IRQP_READ:
+                return put_user(rtc_freq, (unsigned long *)arg);
+        case RTC_IRQP_SET:
+                if (arg < 1 || arg > TIMER_FREQ)
+                        return -EINVAL;
+                if ((arg > 64) && (!capable(CAP_SYS_RESOURCE)))
+                        return -EACCES;
+                rtc_freq = arg;
+                return 0;
+        }
+        return -EINVAL;
+}
+
+static int sa1100_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        rtc_time_to_tm(RCNR, tm);
+        return 0;
+}
+
+static int sa1100_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        unsigned long time;
+        int ret;
+
+        ret = rtc_tm_to_time(tm, &time);
+        if (ret == 0)
+                RCNR = time;
+        return ret;
+}
+
+static int sa1100_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+        memcpy(&alrm->time, &rtc_alarm, sizeof(struct rtc_time));
+        alrm->pending = RTSR & RTSR_AL ? 1 : 0;
+        return 0;
+}
+
+static int sa1100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+        int ret;
+
+        spin_lock_irq(&sa1100_rtc_lock);
+        ret = rtc_update_alarm(&alrm->time);
+        if (ret == 0) {
+                memcpy(&rtc_alarm, &alrm->time, sizeof(struct rtc_time));
+
+                if (alrm->enabled)
+                        enable_irq_wake(IRQ_RTCAlrm);
+                else
+                        disable_irq_wake(IRQ_RTCAlrm);
+        }
+        spin_unlock_irq(&sa1100_rtc_lock);
+
+        return ret;
+}
+
+static int sa1100_rtc_proc(struct device *dev, struct seq_file *seq)
+{
+        seq_printf(seq, "trim/divider\t: 0x%08x\n", RTTR);
+        seq_printf(seq, "alarm_IRQ\t: %s\n",
+                        (RTSR & RTSR_ALE) ? "yes" : "no" );
+        seq_printf(seq, "update_IRQ\t: %s\n",
+                        (RTSR & RTSR_HZE) ? "yes" : "no");
+        seq_printf(seq, "periodic_IRQ\t: %s\n",
+                        (OIER & OIER_E1) ? "yes" : "no");
+        seq_printf(seq, "periodic_freq\t: %ld\n", rtc_freq);
+
+        return 0;
+}
+
+static struct rtc_class_ops sa1100_rtc_ops = {
+        .open = sa1100_rtc_open,
+        .read_callback = sa1100_rtc_read_callback,
+        .release = sa1100_rtc_release,
+        .ioctl = sa1100_rtc_ioctl,
+        .read_time = sa1100_rtc_read_time,
+        .set_time = sa1100_rtc_set_time,
+        .read_alarm = sa1100_rtc_read_alarm,
+        .set_alarm = sa1100_rtc_set_alarm,
+        .proc = sa1100_rtc_proc,
+};
+
+static int sa1100_rtc_probe(struct platform_device *pdev)
+{
+        struct rtc_device *rtc;
+
+        /*
+         * According to the manual we should be able to let RTTR be zero
+         * and then a default diviser for a 32.768KHz clock is used.
+         * Apparently this doesn't work, at least for my SA1110 rev 5.
+         * If the clock divider is uninitialized then reset it to the
+         * default value to get the 1Hz clock.
+         */
+        if (RTTR == 0) {
+                RTTR = RTC_DEF_DIVIDER + (RTC_DEF_TRIM << 16);
+                printk(KERN_WARNING "rtc: warning: initializing default clock divider/trim value\n");
+                /* The current RTC value probably doesn't make sense either */
+                RCNR = 0;
+        }
+
+        rtc = rtc_device_register(pdev->name, &pdev->dev, &sa1100_rtc_ops,
+                                THIS_MODULE);
+
+        if (IS_ERR(rtc)) {
+                dev_err(&pdev->dev, "Unable to register the RTC device\n");
+                return PTR_ERR(rtc);
+        }
+
+        platform_set_drvdata(pdev, rtc);
+
+        dev_info(&pdev->dev, "SA11xx/PXA2xx RTC Registered\n");
+
+        return 0;
+}
+
+static int sa1100_rtc_remove(struct platform_device *pdev)
+{
+        struct rtc_device *rtc = platform_get_drvdata(pdev);
+
+        if (rtc)
+                rtc_device_unregister(rtc);
+
+        return 0;
+}
+
+static struct platform_driver sa1100_rtc_driver = {
+        .probe          = sa1100_rtc_probe,
+        .remove         = sa1100_rtc_remove,
+        .driver         = {
+                .name           = "sa1100-rtc",
+        },
+};
+
+static int __init sa1100_rtc_init(void)
+{
+        return platform_driver_register(&sa1100_rtc_driver);
+}
+
+static void __exit sa1100_rtc_exit(void)
+{
+        platform_driver_unregister(&sa1100_rtc_driver);
+}
+
+module_init(sa1100_rtc_init);
+module_exit(sa1100_rtc_exit);
+
+MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>");
+MODULE_DESCRIPTION("SA11x0/PXA2xx Realtime Clock Driver (RTC)");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c
new file mode 100644
index 0000000000..7c1f3d2e53
--- /dev/null
+++ b/drivers/rtc/rtc-sysfs.c
@@ -0,0 +1,124 @@
+/*
+ * RTC subsystem, sysfs interface
+ *
+ * Copyright (C) 2005 Tower Technologies
+ * Author: Alessandro Zummo <a.zummo@towertech.it>
+ *
+ * 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/rtc.h>
+
+/* device attributes */
+
+static ssize_t rtc_sysfs_show_name(struct class_device *dev, char *buf)
+{
+        return sprintf(buf, "%s\n", to_rtc_device(dev)->name);
+}
+static CLASS_DEVICE_ATTR(name, S_IRUGO, rtc_sysfs_show_name, NULL);
+
+static ssize_t rtc_sysfs_show_date(struct class_device *dev, char *buf)
+{
+        ssize_t retval;
+        struct rtc_time tm;
+
+        retval = rtc_read_time(dev, &tm);
+        if (retval == 0) {
+                retval = sprintf(buf, "%04d-%02d-%02d\n",
+                        tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
+        }
+
+        return retval;
+}
+static CLASS_DEVICE_ATTR(date, S_IRUGO, rtc_sysfs_show_date, NULL);
+
+static ssize_t rtc_sysfs_show_time(struct class_device *dev, char *buf)
+{
+        ssize_t retval;
+        struct rtc_time tm;
+
+        retval = rtc_read_time(dev, &tm);
+        if (retval == 0) {
+                retval = sprintf(buf, "%02d:%02d:%02d\n",
+                        tm.tm_hour, tm.tm_min, tm.tm_sec);
+        }
+
+        return retval;
+}
+static CLASS_DEVICE_ATTR(time, S_IRUGO, rtc_sysfs_show_time, NULL);
+
+static ssize_t rtc_sysfs_show_since_epoch(struct class_device *dev, char *buf)
+{
+        ssize_t retval;
+        struct rtc_time tm;
+
+        retval = rtc_read_time(dev, &tm);
+        if (retval == 0) {
+                unsigned long time;
+                rtc_tm_to_time(&tm, &time);
+                retval = sprintf(buf, "%lu\n", time);
+        }
+
+        return retval;
+}
+static CLASS_DEVICE_ATTR(since_epoch, S_IRUGO, rtc_sysfs_show_since_epoch, NULL);
+
+static struct attribute *rtc_attrs[] = {
+        &class_device_attr_name.attr,
+        &class_device_attr_date.attr,
+        &class_device_attr_time.attr,
+        &class_device_attr_since_epoch.attr,
+        NULL,
+};
+
+static struct attribute_group rtc_attr_group = {
+        .attrs = rtc_attrs,
+};
+
+static int __devinit rtc_sysfs_add_device(struct class_device *class_dev,
+                                        struct class_interface *class_intf)
+{
+        int err;
+
+        dev_info(class_dev->dev, "rtc intf: sysfs\n");
+
+        err = sysfs_create_group(&class_dev->kobj, &rtc_attr_group);
+        if (err)
+                dev_err(class_dev->dev,
+                        "failed to create sysfs attributes\n");
+
+        return err;
+}
+
+static void rtc_sysfs_remove_device(struct class_device *class_dev,
+                                struct class_interface *class_intf)
+{
+        sysfs_remove_group(&class_dev->kobj, &rtc_attr_group);
+}
+
+/* interface registration */
+
+static struct class_interface rtc_sysfs_interface = {
+        .add = &rtc_sysfs_add_device,
+        .remove = &rtc_sysfs_remove_device,
+};
+
+static int __init rtc_sysfs_init(void)
+{
+        return rtc_interface_register(&rtc_sysfs_interface);
+}
+
+static void __exit rtc_sysfs_exit(void)
+{
+        class_interface_unregister(&rtc_sysfs_interface);
+}
+
+module_init(rtc_sysfs_init);
+module_exit(rtc_sysfs_exit);
+
+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
+MODULE_DESCRIPTION("RTC class sysfs interface");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c
new file mode 100644
index 0000000000..43d1074878
--- /dev/null
+++ b/drivers/rtc/rtc-test.c
@@ -0,0 +1,204 @@
+/*
+ * An RTC test device/driver
+ * Copyright (C) 2005 Tower Technologies
+ * Author: Alessandro Zummo <a.zummo@towertech.it>
+ *
+ * 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/err.h>
+#include <linux/rtc.h>
+#include <linux/platform_device.h>
+
+static struct platform_device *test0 = NULL, *test1 = NULL;
+
+static int test_rtc_read_alarm(struct device *dev,
+        struct rtc_wkalrm *alrm)
+{
+        return 0;
+}
+
+static int test_rtc_set_alarm(struct device *dev,
+        struct rtc_wkalrm *alrm)
+{
+        return 0;
+}
+
+static int test_rtc_read_time(struct device *dev,
+        struct rtc_time *tm)
+{
+        rtc_time_to_tm(get_seconds(), tm);
+        return 0;
+}
+
+static int test_rtc_set_time(struct device *dev,
+        struct rtc_time *tm)
+{
+        return 0;
+}
+
+static int test_rtc_set_mmss(struct device *dev, unsigned long secs)
+{
+        return 0;
+}
+
+static int test_rtc_proc(struct device *dev, struct seq_file *seq)
+{
+        struct platform_device *plat_dev = to_platform_device(dev);
+
+        seq_printf(seq, "24hr\t\t: yes\n");
+        seq_printf(seq, "test\t\t: yes\n");
+        seq_printf(seq, "id\t\t: %d\n", plat_dev->id);
+
+        return 0;
+}
+
+static int test_rtc_ioctl(struct device *dev, unsigned int cmd,
+        unsigned long arg)
+{
+        /* We do support interrupts, they're generated
+         * using the sysfs interface.
+         */
+        switch (cmd) {
+        case RTC_PIE_ON:
+        case RTC_PIE_OFF:
+        case RTC_UIE_ON:
+        case RTC_UIE_OFF:
+        case RTC_AIE_ON:
+        case RTC_AIE_OFF:
+                return 0;
+
+        default:
+                return -EINVAL;
+        }
+}
+
+static struct rtc_class_ops test_rtc_ops = {
+        .proc = test_rtc_proc,
+        .read_time = test_rtc_read_time,
+        .set_time = test_rtc_set_time,
+        .read_alarm = test_rtc_read_alarm,
+        .set_alarm = test_rtc_set_alarm,
+        .set_mmss = test_rtc_set_mmss,
+        .ioctl = test_rtc_ioctl,
+};
+
+static ssize_t test_irq_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        return sprintf(buf, "%d\n", 42);
+}
+static ssize_t test_irq_store(struct device *dev,
+                                struct device_attribute *attr,
+                                const char *buf, size_t count)
+{
+        int retval;
+        struct platform_device *plat_dev = to_platform_device(dev);
+        struct rtc_device *rtc = platform_get_drvdata(plat_dev);
+
+        retval = count;
+        if (strncmp(buf, "tick", 4) == 0)
+                rtc_update_irq(&rtc->class_dev, 1, RTC_PF | RTC_IRQF);
+        else if (strncmp(buf, "alarm", 5) == 0)
+                rtc_update_irq(&rtc->class_dev, 1, RTC_AF | RTC_IRQF);
+        else if (strncmp(buf, "update", 6) == 0)
+                rtc_update_irq(&rtc->class_dev, 1, RTC_UF | RTC_IRQF);
+        else
+                retval = -EINVAL;
+
+        return retval;
+}
+static DEVICE_ATTR(irq, S_IRUGO | S_IWUSR, test_irq_show, test_irq_store);
+
+static int test_probe(struct platform_device *plat_dev)
+{
+        int err;
+        struct rtc_device *rtc = rtc_device_register("test", &plat_dev->dev,
+                                                &test_rtc_ops, THIS_MODULE);
+        if (IS_ERR(rtc)) {
+                err = PTR_ERR(rtc);
+                dev_err(&plat_dev->dev,
+                        "unable to register the class device\n");
+                return err;
+        }
+        device_create_file(&plat_dev->dev, &dev_attr_irq);
+
+        platform_set_drvdata(plat_dev, rtc);
+
+        return 0;
+}
+
+static int __devexit test_remove(struct platform_device *plat_dev)
+{
+        struct rtc_device *rtc = platform_get_drvdata(plat_dev);
+
+        rtc_device_unregister(rtc);
+        device_remove_file(&plat_dev->dev, &dev_attr_irq);
+
+        return 0;
+}
+
+static struct platform_driver test_drv = {
+        .probe  = test_probe,
+        .remove = __devexit_p(test_remove),
+        .driver = {
+                .name = "rtc-test",
+                .owner = THIS_MODULE,
+        },
+};
+
+static int __init test_init(void)
+{
+        int err;
+
+        if ((err = platform_driver_register(&test_drv)))
+                return err;
+
+        if ((test0 = platform_device_alloc("rtc-test", 0)) == NULL) {
+                err = -ENOMEM;
+                goto exit_driver_unregister;
+        }
+
+        if ((test1 = platform_device_alloc("rtc-test", 1)) == NULL) {
+                err = -ENOMEM;
+                goto exit_free_test0;
+        }
+
+        if ((err = platform_device_add(test0)))
+                goto exit_free_test1;
+
+        if ((err = platform_device_add(test1)))
+                goto exit_device_unregister;
+
+        return 0;
+
+exit_device_unregister:
+        platform_device_unregister(test0);
+
+exit_free_test1:
+        platform_device_put(test1);
+
+exit_free_test0:
+        platform_device_put(test0);
+
+exit_driver_unregister:
+        platform_driver_unregister(&test_drv);
+        return err;
+}
+
+static void __exit test_exit(void)
+{
+        platform_device_unregister(test0);
+        platform_device_unregister(test1);
+        platform_driver_unregister(&test_drv);
+}
+
+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
+MODULE_DESCRIPTION("RTC test driver/device");
+MODULE_LICENSE("GPL");
+
+module_init(test_init);
+module_exit(test_exit);
diff --git a/drivers/i2c/chips/x1205.c b/drivers/rtc/rtc-x1205.c
index 245fffa92d..621d17afc0 100644
--- a/drivers/i2c/chips/x1205.c
+++ b/drivers/rtc/rtc-x1205.c
@@ -1,32 +1,25 @@
 /*
- *  x1205.c - An i2c driver for the Xicor X1205 RTC
- *  Copyright 2004 Karen Spearel
- *  Copyright 2005 Alessandro Zummo
+ * An i2c driver for the Xicor/Intersil X1205 RTC
+ * Copyright 2004 Karen Spearel
+ * Copyright 2005 Alessandro Zummo
  *
- *  please send all reports to:
- *      kas11 at tampabay dot rr dot com
- *      a dot zummo at towertech dot it
+ * please send all reports to:
+ *      Karen Spearel <kas111 at gmail dot com>
+ *      Alessandro Zummo <a.zummo@towertech.it>
  *
- *  based on the other drivers in this same directory.
+ * based on a lot of other RTC drivers.
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ * 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/init.h>
-#include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/string.h>
 #include <linux/bcd.h>
 #include <linux/rtc.h>
-#include <linux/list.h>
+#include <linux/delay.h>
 
-#include <linux/x1205.h>
-
-#define DRV_VERSION "0.9.9"
+#define DRV_VERSION "1.0.6"
 
 /* Addresses to scan: none. This chip is located at
  * 0x6f and uses a two bytes register addressing.
@@ -40,8 +33,6 @@ static unsigned short normal_i2c[] = { I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD;
-I2C_CLIENT_MODULE_PARM(hctosys,
-        "Set the system time from the hardware clock upon initialization");
 
 /* offsets into CCR area */
 
@@ -101,107 +92,35 @@ I2C_CLIENT_MODULE_PARM(hctosys,
 static int x1205_attach(struct i2c_adapter *adapter);
 static int x1205_detach(struct i2c_client *client);
 static int x1205_probe(struct i2c_adapter *adapter, int address, int kind);
-static int x1205_command(struct i2c_client *client, unsigned int cmd,
-        void *arg);
 
 static struct i2c_driver x1205_driver = {
-        .driver = {
+        .driver         = {
                 .name   = "x1205",
         },
+        .id             = I2C_DRIVERID_X1205,
         .attach_adapter = &x1205_attach,
         .detach_client  = &x1205_detach,
 };
 
-struct x1205_data {
-        struct i2c_client client;
-        struct list_head list;
-        unsigned int epoch;
-};
-
-static const unsigned char days_in_mo[] =
-        { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
-
-static LIST_HEAD(x1205_clients);
-
-/* Workaround until the I2C subsytem will allow to send
- * commands to a specific client. This function will send the command
- * to the first client.
- */
-int x1205_do_command(unsigned int cmd, void *arg)
-{
-        struct list_head *walk;
-        struct list_head *tmp;
-        struct x1205_data *data;
-
-        list_for_each_safe(walk, tmp, &x1205_clients) {
-                data = list_entry(walk, struct x1205_data, list);
-                return x1205_command(&data->client, cmd, arg);
-        }
-
-        return -ENODEV;
-}
-
-#define is_leap(year) \
-        ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))
-
-/* make sure the rtc_time values are in bounds */
-static int x1205_validate_tm(struct rtc_time *tm)
-{
-        int year = tm->tm_year + 1900;
-
-        if ((tm->tm_year < 70) || (tm->tm_year > 255))
-                return -EINVAL;
-
-        if ((tm->tm_mon > 11) || (tm->tm_mday == 0))
-                return -EINVAL;
-
-        if (tm->tm_mday > days_in_mo[tm->tm_mon]
-                + ((tm->tm_mon == 1) && is_leap(year)))
-                return -EINVAL;
-
-        if ((tm->tm_hour >= 24) || (tm->tm_min >= 60) || (tm->tm_sec >= 60))
-                return -EINVAL;
-
-        return 0;
-}
-
 /*
  * In the routines that deal directly with the x1205 hardware, we use
  * rtc_time -- month 0-11, hour 0-23, yr = calendar year-epoch
  * Epoch is initialized as 2000. Time is set to UTC.
  */
 static int x1205_get_datetime(struct i2c_client *client, struct rtc_time *tm,
-                                u8 reg_base)
+                                unsigned char reg_base)
 {
         unsigned char dt_addr[2] = { 0, reg_base };
-        static unsigned char sr_addr[2] = { 0, X1205_REG_SR };
 
-        unsigned char buf[8], sr;
+        unsigned char buf[8];
 
         struct i2c_msg msgs[] = {
-                { client->addr, 0, 2, sr_addr },        /* setup read ptr */
-                { client->addr, I2C_M_RD, 1, &sr },     /* read status */
                 { client->addr, 0, 2, dt_addr },        /* setup read ptr */
                 { client->addr, I2C_M_RD, 8, buf },     /* read date */
         };
 
-        struct x1205_data *data = i2c_get_clientdata(client);
-
-        /* read status register */
-        if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {
-                dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
-                return -EIO;
-        }
-
-        /* check for battery failure */
-        if (sr & X1205_SR_RTCF) {
-                dev_warn(&client->dev,
-                        "Clock had a power failure, you must set the date.\n");
-                return -EINVAL;
-        }
-
         /* read date registers */
-        if ((i2c_transfer(client->adapter, &msgs[2], 2)) != 2) {
+        if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {
                 dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
                 return -EIO;
         }
@@ -217,9 +136,9 @@ static int x1205_get_datetime(struct i2c_client *client, struct rtc_time *tm,
         tm->tm_min = BCD2BIN(buf[CCR_MIN]);
         tm->tm_hour = BCD2BIN(buf[CCR_HOUR] & 0x3F); /* hr is 0-23 */
         tm->tm_mday = BCD2BIN(buf[CCR_MDAY]);
-        tm->tm_mon = BCD2BIN(buf[CCR_MONTH]);
-        data->epoch = BCD2BIN(buf[CCR_Y2K]) * 100;
-        tm->tm_year = BCD2BIN(buf[CCR_YEAR]) + data->epoch - 1900;
+        tm->tm_mon = BCD2BIN(buf[CCR_MONTH]) - 1; /* mon is 0-11 */
+        tm->tm_year = BCD2BIN(buf[CCR_YEAR])
+                        + (BCD2BIN(buf[CCR_Y2K]) * 100) - 1900;
         tm->tm_wday = buf[CCR_WDAY];
 
         dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
@@ -231,11 +150,28 @@ static int x1205_get_datetime(struct i2c_client *client, struct rtc_time *tm,
         return 0;
 }
 
+static int x1205_get_status(struct i2c_client *client, unsigned char *sr)
+{
+        static unsigned char sr_addr[2] = { 0, X1205_REG_SR };
+
+        struct i2c_msg msgs[] = {
+                { client->addr, 0, 2, sr_addr },        /* setup read ptr */
+                { client->addr, I2C_M_RD, 1, sr },      /* read status */
+        };
+
+        /* read status register */
+        if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {
+                dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
+                return -EIO;
+        }
+
+        return 0;
+}
+
 static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm,
                                 int datetoo, u8 reg_base)
 {
-        int i, err, xfer;
-
+        int i, xfer;
         unsigned char buf[8];
 
         static const unsigned char wel[3] = { 0, X1205_REG_SR,
@@ -246,17 +182,10 @@ static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm,
 
         static const unsigned char diswe[3] = { 0, X1205_REG_SR, 0 };
 
-        struct x1205_data *data = i2c_get_clientdata(client);
-
-        /* check if all values in the tm struct are correct */
-        if ((err = x1205_validate_tm(tm)) < 0)
-                return err;
-
-        dev_dbg(&client->dev, "%s: secs=%d, mins=%d, hours=%d, "
-                "mday=%d, mon=%d, year=%d, wday=%d\n",
+        dev_dbg(&client->dev,
+                "%s: secs=%d, mins=%d, hours=%d\n",
                 __FUNCTION__,
-                tm->tm_sec, tm->tm_min, tm->tm_hour,
-                tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
+                tm->tm_sec, tm->tm_min, tm->tm_hour);
 
         buf[CCR_SEC] = BIN2BCD(tm->tm_sec);
         buf[CCR_MIN] = BIN2BCD(tm->tm_min);
@@ -266,26 +195,29 @@ static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm,
 
         /* should we also set the date? */
         if (datetoo) {
+                dev_dbg(&client->dev,
+                        "%s: mday=%d, mon=%d, year=%d, wday=%d\n",
+                        __FUNCTION__,
+                        tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
+
                 buf[CCR_MDAY] = BIN2BCD(tm->tm_mday);
 
-                /* month, 0 - 11 */
-                buf[CCR_MONTH] = BIN2BCD(tm->tm_mon);
+                /* month, 1 - 12 */
+                buf[CCR_MONTH] = BIN2BCD(tm->tm_mon + 1);
 
-                /* year, since 1900 */
-                buf[CCR_YEAR] = BIN2BCD(tm->tm_year + 1900 - data->epoch);
+                /* year, since the rtc epoch*/
+                buf[CCR_YEAR] = BIN2BCD(tm->tm_year % 100);
                 buf[CCR_WDAY] = tm->tm_wday & 0x07;
-                buf[CCR_Y2K] = BIN2BCD(data->epoch / 100);
+                buf[CCR_Y2K] = BIN2BCD(tm->tm_year / 100);
         }
 
         /* this sequence is required to unlock the chip */
-        xfer = i2c_master_send(client, wel, 3);
-        if (xfer != 3) {
+        if ((xfer = i2c_master_send(client, wel, 3)) != 3) {
                 dev_err(&client->dev, "%s: wel - %d\n", __FUNCTION__, xfer);
                 return -EIO;
         }
 
-        xfer = i2c_master_send(client, rwel, 3);
-        if (xfer != 3) {
+        if ((xfer = i2c_master_send(client, rwel, 3)) != 3) {
                 dev_err(&client->dev, "%s: rwel - %d\n", __FUNCTION__, xfer);
                 return -EIO;
         }
@@ -305,8 +237,7 @@ static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm,
         };
 
         /* disable further writes */
-        xfer = i2c_master_send(client, diswe, 3);
-        if (xfer != 3) {
+        if ((xfer = i2c_master_send(client, diswe, 3)) != 3) {
                 dev_err(&client->dev, "%s: diswe - %d\n", __FUNCTION__, xfer);
                 return -EIO;
         }
@@ -314,6 +245,20 @@ static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm,
         return 0;
 }
 
+static int x1205_fix_osc(struct i2c_client *client)
+{
+        int err;
+        struct rtc_time tm;
+
+        tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
+
+        if ((err = x1205_set_datetime(client, &tm, 0, X1205_CCR_BASE)) < 0)
+                dev_err(&client->dev,
+                        "unable to restart the oscillator\n");
+
+        return err;
+}
+
 static int x1205_get_dtrim(struct i2c_client *client, int *trim)
 {
         unsigned char dtr;
@@ -380,60 +325,9 @@ static int x1205_get_atrim(struct i2c_client *client, int *trim)
         return 0;
 }
 
-static int x1205_hctosys(struct i2c_client *client)
-{
-        int err;
-
-        struct rtc_time tm;
-        struct timespec tv;
-
-        err = x1205_command(client, X1205_CMD_GETDATETIME, &tm);
-
-        if (err) {
-                dev_err(&client->dev,
-                        "Unable to set the system clock\n");
-                return err;
-        }
-
-        /* IMPORTANT: the RTC only stores whole seconds. It is arbitrary
-         * whether it stores the most close value or the value with partial
-         * seconds truncated. However, it is important that we use it to store
-         * the truncated value. This is because otherwise it is necessary,
-         * in an rtc sync function, to read both xtime.tv_sec and
-         * xtime.tv_nsec. On some processors (i.e. ARM), an atomic read
-         * of >32bits is not possible. So storing the most close value would
-         * slow down the sync API. So here we have the truncated value and
-         * the best guess is to add 0.5s.
-         */
-
-        tv.tv_nsec = NSEC_PER_SEC >> 1;
-
-        /* WARNING: this is not the C library 'mktime' call, it is a built in
-         * inline function from include/linux/time.h.  It expects (requires)
-         * the month to be in the range 1-12
-         */
-
-        tv.tv_sec  = mktime(tm.tm_year + 1900, tm.tm_mon + 1,
-                                tm.tm_mday, tm.tm_hour,
-                                tm.tm_min, tm.tm_sec);
-
-        do_settimeofday(&tv);
-
-        dev_info(&client->dev,
-                "setting the system clock to %d-%d-%d %d:%d:%d\n",
-                tm.tm_year + 1900, tm.tm_mon + 1,
-                tm.tm_mday, tm.tm_hour, tm.tm_min,
-                tm.tm_sec);
-
-        return 0;
-}
-
 struct x1205_limit
 {
-        unsigned char reg;
-        unsigned char mask;
-        unsigned char min;
-        unsigned char max;
+        unsigned char reg, mask, min, max;
 };
 
 static int x1205_validate_client(struct i2c_client *client)
@@ -477,11 +371,10 @@ static int x1205_validate_client(struct i2c_client *client)
                         { client->addr, I2C_M_RD, 1, &buf },
                 };
 
-                xfer = i2c_transfer(client->adapter, msgs, 2);
-                if (xfer != 2) {
+                if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) {
                         dev_err(&client->adapter->dev,
                                 "%s: could not read register %x\n",
-                                __FUNCTION__, addr[1]);
+                                __FUNCTION__, probe_zero_pattern[i]);
 
                         return -EIO;
                 }
@@ -489,7 +382,7 @@ static int x1205_validate_client(struct i2c_client *client)
                 if ((buf & probe_zero_pattern[i+1]) != 0) {
                         dev_err(&client->adapter->dev,
                                 "%s: register=%02x, zero pattern=%d, value=%x\n",
-                                __FUNCTION__, addr[1], i, buf);
+                                __FUNCTION__, probe_zero_pattern[i], i, buf);
 
                         return -ENODEV;
                 }
@@ -506,12 +399,10 @@ static int x1205_validate_client(struct i2c_client *client)
                         { client->addr, I2C_M_RD, 1, &reg },
                 };
 
-                xfer = i2c_transfer(client->adapter, msgs, 2);
-
-                if (xfer != 2) {
+                if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) {
                         dev_err(&client->adapter->dev,
                                 "%s: could not read register %x\n",
-                                __FUNCTION__, addr[1]);
+                                __FUNCTION__, probe_limits_pattern[i].reg);
 
                         return -EIO;
                 }
@@ -522,7 +413,8 @@ static int x1205_validate_client(struct i2c_client *client)
                         value < probe_limits_pattern[i].min) {
                         dev_dbg(&client->adapter->dev,
                                 "%s: register=%x, lim pattern=%d, value=%d\n",
-                                __FUNCTION__, addr[1], i, value);
+                                __FUNCTION__, probe_limits_pattern[i].reg,
+                                i, value);
 
                         return -ENODEV;
                 }
@@ -531,37 +423,89 @@ static int x1205_validate_client(struct i2c_client *client)
         return 0;
 }
 
-static int x1205_attach(struct i2c_adapter *adapter)
+static int x1205_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 {
-        dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
+        return x1205_get_datetime(to_i2c_client(dev),
+                &alrm->time, X1205_ALM0_BASE);
+}
 
-        return i2c_probe(adapter, &addr_data, x1205_probe);
+static int x1205_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+        return x1205_set_datetime(to_i2c_client(dev),
+                &alrm->time, 1, X1205_ALM0_BASE);
 }
 
-int x1205_direct_attach(int adapter_id,
-        struct i2c_client_address_data *address_data)
+static int x1205_rtc_read_time(struct device *dev, struct rtc_time *tm)
 {
-        int err;
-        struct i2c_adapter *adapter = i2c_get_adapter(adapter_id);
+        return x1205_get_datetime(to_i2c_client(dev),
+                tm, X1205_CCR_BASE);
+}
 
-        if (adapter) {
-                err = i2c_probe(adapter,
-                        address_data, x1205_probe);
+static int x1205_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        return x1205_set_datetime(to_i2c_client(dev),
+                tm, 1, X1205_CCR_BASE);
+}
 
-                i2c_put_adapter(adapter);
+static int x1205_rtc_proc(struct device *dev, struct seq_file *seq)
+{
+        int err, dtrim, atrim;
 
-                return err;
-        }
+        seq_printf(seq, "24hr\t\t: yes\n");
 
-        return -ENODEV;
+        if ((err = x1205_get_dtrim(to_i2c_client(dev), &dtrim)) == 0)
+                seq_printf(seq, "digital_trim\t: %d ppm\n", dtrim);
+
+        if ((err = x1205_get_atrim(to_i2c_client(dev), &atrim)) == 0)
+                seq_printf(seq, "analog_trim\t: %d.%02d pF\n",
+                        atrim / 1000, atrim % 1000);
+        return 0;
 }
 
-static int x1205_probe(struct i2c_adapter *adapter, int address, int kind)
+static struct rtc_class_ops x1205_rtc_ops = {
+        .proc           = x1205_rtc_proc,
+        .read_time      = x1205_rtc_read_time,
+        .set_time       = x1205_rtc_set_time,
+        .read_alarm     = x1205_rtc_read_alarm,
+        .set_alarm      = x1205_rtc_set_alarm,
+};
+
+static ssize_t x1205_sysfs_show_atrim(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
-        struct i2c_client *client;
-        struct x1205_data *data;
+        int atrim;
+
+        if (x1205_get_atrim(to_i2c_client(dev), &atrim) == 0)
+                return sprintf(buf, "%d.%02d pF\n",
+                        atrim / 1000, atrim % 1000);
+        return 0;
+}
+static DEVICE_ATTR(atrim, S_IRUGO, x1205_sysfs_show_atrim, NULL);
+
+static ssize_t x1205_sysfs_show_dtrim(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        int dtrim;
+
+        if (x1205_get_dtrim(to_i2c_client(dev), &dtrim) == 0)
+                return sprintf(buf, "%d ppm\n", dtrim);
+
+        return 0;
+}
+static DEVICE_ATTR(dtrim, S_IRUGO, x1205_sysfs_show_dtrim, NULL);
 
+static int x1205_attach(struct i2c_adapter *adapter)
+{
+        dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
+        return i2c_probe(adapter, &addr_data, x1205_probe);
+}
+
+static int x1205_probe(struct i2c_adapter *adapter, int address, int kind)
+{
         int err = 0;
+        unsigned char sr;
+        struct i2c_client *client;
+        struct rtc_device *rtc;
 
         dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
 
@@ -570,22 +514,17 @@ static int x1205_probe(struct i2c_adapter *adapter, int address, int kind)
                 goto exit;
         }
 
-        if (!(data = kzalloc(sizeof(struct x1205_data), GFP_KERNEL))) {
+        if (!(client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL))) {
                 err = -ENOMEM;
                 goto exit;
         }
 
-        /* Initialize our structures */
-        data->epoch = 2000;
-
-        client = &data->client;
+        /* I2C client */
         client->addr = address;
         client->driver = &x1205_driver;
         client->adapter = adapter;
 
-        strlcpy(client->name, "x1205", I2C_NAME_SIZE);
-
-        i2c_set_clientdata(client, data);
+        strlcpy(client->name, x1205_driver.driver.name, I2C_NAME_SIZE);
 
         /* Verify the chip is really an X1205 */
         if (kind < 0) {
@@ -599,18 +538,43 @@ static int x1205_probe(struct i2c_adapter *adapter, int address, int kind)
         if ((err = i2c_attach_client(client)))
                 goto exit_kfree;
 
-        list_add(&data->list, &x1205_clients);
-
         dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
 
-        /* If requested, set the system time */
-        if (hctosys)
-                x1205_hctosys(client);
+        rtc = rtc_device_register(x1205_driver.driver.name, &client->dev,
+                                &x1205_rtc_ops, THIS_MODULE);
+
+        if (IS_ERR(rtc)) {
+                err = PTR_ERR(rtc);
+                dev_err(&client->dev,
+                        "unable to register the class device\n");
+                goto exit_detach;
+        }
+
+        i2c_set_clientdata(client, rtc);
+
+        /* Check for power failures and eventualy enable the osc */
+        if ((err = x1205_get_status(client, &sr)) == 0) {
+                if (sr & X1205_SR_RTCF) {
+                        dev_err(&client->dev,
+                                "power failure detected, "
+                                "please set the clock\n");
+                        udelay(50);
+                        x1205_fix_osc(client);
+                }
+        }
+        else
+                dev_err(&client->dev, "couldn't read status\n");
+
+        device_create_file(&client->dev, &dev_attr_atrim);
+        device_create_file(&client->dev, &dev_attr_dtrim);
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(client);
+
 exit_kfree:
-        kfree(data);
+        kfree(client);
 
 exit:
         return err;
@@ -619,61 +583,21 @@ exit:
 static int x1205_detach(struct i2c_client *client)
 {
         int err;
-        struct x1205_data *data = i2c_get_clientdata(client);
+        struct rtc_device *rtc = i2c_get_clientdata(client);
 
         dev_dbg(&client->dev, "%s\n", __FUNCTION__);
 
+        if (rtc)
+                rtc_device_unregister(rtc);
+
         if ((err = i2c_detach_client(client)))
                 return err;
 
-        list_del(&data->list);
-
-        kfree(data);
+        kfree(client);
 
         return 0;
 }
 
-static int x1205_command(struct i2c_client *client, unsigned int cmd,
-        void *param)
-{
-        if (param == NULL)
-                return -EINVAL;
-
-        if (!capable(CAP_SYS_TIME))
-                return -EACCES;
-
-        dev_dbg(&client->dev, "%s: cmd=%d\n", __FUNCTION__, cmd);
-
-        switch (cmd) {
-        case X1205_CMD_GETDATETIME:
-                return x1205_get_datetime(client, param, X1205_CCR_BASE);
-
-        case X1205_CMD_SETTIME:
-                return x1205_set_datetime(client, param, 0,
-                                X1205_CCR_BASE);
-
-        case X1205_CMD_SETDATETIME:
-                return x1205_set_datetime(client, param, 1,
-                                X1205_CCR_BASE);
-
-        case X1205_CMD_GETALARM:
-                return x1205_get_datetime(client, param, X1205_ALM0_BASE);
-
-        case X1205_CMD_SETALARM:
-                return x1205_set_datetime(client, param, 1,
-                                X1205_ALM0_BASE);
-
-        case X1205_CMD_GETDTRIM:
-                return x1205_get_dtrim(client, param);
-
-        case X1205_CMD_GETATRIM:
-                return x1205_get_atrim(client, param);
-
-        default:
-                return -EINVAL;
-        }
-}
-
 static int __init x1205_init(void)
 {
         return i2c_add_driver(&x1205_driver);
@@ -685,14 +609,11 @@ static void __exit x1205_exit(void)
 }
 
 MODULE_AUTHOR(
-        "Karen Spearel <kas11@tampabay.rr.com>, "
+        "Karen Spearel <kas111 at gmail dot com>, "
         "Alessandro Zummo <a.zummo@towertech.it>");
-MODULE_DESCRIPTION("Xicor X1205 RTC driver");
+MODULE_DESCRIPTION("Xicor/Intersil X1205 RTC driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
 
-EXPORT_SYMBOL_GPL(x1205_do_command);
-EXPORT_SYMBOL_GPL(x1205_direct_attach);
-
 module_init(x1205_init);
 module_exit(x1205_exit);
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index dfe542b206..0a9f12c4e9 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -43,7 +43,6 @@ MODULE_AUTHOR("Holger Smolinski <Holger.Smolinski@de.ibm.com>");
 MODULE_DESCRIPTION("Linux on S/390 DASD device driver,"
                    " Copyright 2000 IBM Corporation");
 MODULE_SUPPORTED_DEVICE("dasd");
-MODULE_PARM(dasd, "1-" __MODULE_STRING(256) "s");
 MODULE_LICENSE("GPL");
 
 /*
@@ -542,9 +541,8 @@ dasd_kmalloc_request(char *magic, int cplength, int datasize,
         struct dasd_ccw_req *cqr;
 
         /* Sanity checks */
-        if ( magic == NULL || datasize > PAGE_SIZE ||
-             (cplength*sizeof(struct ccw1)) > PAGE_SIZE)
-                BUG();
+        BUG_ON( magic == NULL || datasize > PAGE_SIZE ||
+             (cplength*sizeof(struct ccw1)) > PAGE_SIZE);
 
         cqr = kzalloc(sizeof(struct dasd_ccw_req), GFP_ATOMIC);
         if (cqr == NULL)
@@ -584,9 +582,8 @@ dasd_smalloc_request(char *magic, int cplength, int datasize,
         int size;
 
         /* Sanity checks */
-        if ( magic == NULL || datasize > PAGE_SIZE ||
-             (cplength*sizeof(struct ccw1)) > PAGE_SIZE)
-                BUG();
+        BUG_ON( magic == NULL || datasize > PAGE_SIZE ||
+             (cplength*sizeof(struct ccw1)) > PAGE_SIZE);
 
         size = (sizeof(struct dasd_ccw_req) + 7L) & -8L;
         if (cplength > 0)
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index f576f243cd..c1c6f13811 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -16,6 +16,7 @@
 #include <linux/config.h>
 #include <linux/ctype.h>
 #include <linux/init.h>
+#include <linux/module.h>
 
 #include <asm/debug.h>
 #include <asm/uaccess.h>
@@ -69,6 +70,8 @@ int dasd_autodetect = 0;	/* is true, when autodetection is active */
  * strings when running as a module.
  */
 static char *dasd[256];
+module_param_array(dasd, charp, NULL, 0);
+
 /*
  * Single spinlock to protect devmap structures and lists.
  */
@@ -434,8 +437,7 @@ dasd_forget_ranges(void)
         spin_lock(&dasd_devmap_lock);
         for (i = 0; i < 256; i++) {
                 list_for_each_entry_safe(devmap, n, &dasd_hashlists[i], list) {
-                        if (devmap->device != NULL)
-                                BUG();
+                        BUG_ON(devmap->device != NULL);
                         list_del(&devmap->list);
                         kfree(devmap);
                 }
@@ -544,8 +546,7 @@ dasd_delete_device(struct dasd_device *device)
 
         /* First remove device pointer from devmap. */
         devmap = dasd_find_busid(device->cdev->dev.bus_id);
-        if (IS_ERR(devmap))
-                BUG();
+        BUG_ON(IS_ERR(devmap));
         spin_lock(&dasd_devmap_lock);
         if (devmap->device != device) {
                 spin_unlock(&dasd_devmap_lock);
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index bd06607a5d..eecb2afad5 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -28,6 +28,7 @@
 #include <linux/major.h>
 #include <linux/kdev_t.h>
 #include <linux/device.h>
+#include <linux/mutex.h>
 
 struct class *class3270;
 
@@ -59,7 +60,7 @@ struct raw3270 {
 #define RAW3270_FLAGS_CONSOLE   8       /* Device is the console. */
 
 /* Semaphore to protect global data of raw3270 (devices, views, etc). */
-static DECLARE_MUTEX(raw3270_sem);
+static DEFINE_MUTEX(raw3270_mutex);
 
 /* List of 3270 devices. */
 static struct list_head raw3270_devices = LIST_HEAD_INIT(raw3270_devices);
@@ -815,7 +816,7 @@ raw3270_setup_device(struct ccw_device *cdev, struct raw3270 *rp, char *ascebc)
          * number for it. Note: there is no device with minor 0,
          * see special case for fs3270.c:fs3270_open().
          */
-        down(&raw3270_sem);
+        mutex_lock(&raw3270_mutex);
         /* Keep the list sorted. */
         minor = RAW3270_FIRSTMINOR;
         rp->minor = -1;
@@ -832,7 +833,7 @@ raw3270_setup_device(struct ccw_device *cdev, struct raw3270 *rp, char *ascebc)
                 rp->minor = minor;
                 list_add_tail(&rp->list, &raw3270_devices);
         }
-        up(&raw3270_sem);
+        mutex_unlock(&raw3270_mutex);
         /* No free minor number? Then give up. */
         if (rp->minor == -1)
                 return -EUSERS;
@@ -1003,7 +1004,7 @@ raw3270_add_view(struct raw3270_view *view, struct raw3270_fn *fn, int minor)
 
         if (minor <= 0)
                 return -ENODEV;
-        down(&raw3270_sem);
+        mutex_lock(&raw3270_mutex);
         rc = -ENODEV;
         list_for_each_entry(rp, &raw3270_devices, list) {
                 if (rp->minor != minor)
@@ -1024,7 +1025,7 @@ raw3270_add_view(struct raw3270_view *view, struct raw3270_fn *fn, int minor)
                 spin_unlock_irqrestore(get_ccwdev_lock(rp->cdev), flags);
                 break;
         }
-        up(&raw3270_sem);
+        mutex_unlock(&raw3270_mutex);
         return rc;
 }
 
@@ -1038,7 +1039,7 @@ raw3270_find_view(struct raw3270_fn *fn, int minor)
         struct raw3270_view *view, *tmp;
         unsigned long flags;
 
-        down(&raw3270_sem);
+        mutex_lock(&raw3270_mutex);
         view = ERR_PTR(-ENODEV);
         list_for_each_entry(rp, &raw3270_devices, list) {
                 if (rp->minor != minor)
@@ -1057,7 +1058,7 @@ raw3270_find_view(struct raw3270_fn *fn, int minor)
                 spin_unlock_irqrestore(get_ccwdev_lock(rp->cdev), flags);
                 break;
         }
-        up(&raw3270_sem);
+        mutex_unlock(&raw3270_mutex);
         return view;
 }
 
@@ -1104,7 +1105,7 @@ raw3270_delete_device(struct raw3270 *rp)
         struct ccw_device *cdev;
 
         /* Remove from device chain. */
-        down(&raw3270_sem);
+        mutex_lock(&raw3270_mutex);
         if (rp->clttydev)
                 class_device_destroy(class3270,
                                      MKDEV(IBM_TTY3270_MAJOR, rp->minor));
@@ -1112,7 +1113,7 @@ raw3270_delete_device(struct raw3270 *rp)
                 class_device_destroy(class3270,
                                      MKDEV(IBM_FS3270_MAJOR, rp->minor));
         list_del_init(&rp->list);
-        up(&raw3270_sem);
+        mutex_unlock(&raw3270_mutex);
 
         /* Disconnect from ccw_device. */
         cdev = rp->cdev;
@@ -1208,13 +1209,13 @@ int raw3270_register_notifier(void (*notifier)(int, int))
         if (!np)
                 return -ENOMEM;
         np->notifier = notifier;
-        down(&raw3270_sem);
+        mutex_lock(&raw3270_mutex);
         list_add_tail(&np->list, &raw3270_notifier);
         list_for_each_entry(rp, &raw3270_devices, list) {
                 get_device(&rp->cdev->dev);
                 notifier(rp->minor, 1);
         }
-        up(&raw3270_sem);
+        mutex_unlock(&raw3270_mutex);
         return 0;
 }
 
@@ -1222,14 +1223,14 @@ void raw3270_unregister_notifier(void (*notifier)(int, int))
 {
         struct raw3270_notifier *np;
 
-        down(&raw3270_sem);
+        mutex_lock(&raw3270_mutex);
         list_for_each_entry(np, &raw3270_notifier, list)
                 if (np->notifier == notifier) {
                         list_del(&np->list);
                         kfree(np);
                         break;
                 }
-        up(&raw3270_sem);
+        mutex_unlock(&raw3270_mutex);
 }
 
 /*
@@ -1256,10 +1257,10 @@ raw3270_set_online (struct ccw_device *cdev)
                 goto failure;
         raw3270_create_attributes(rp);
         set_bit(RAW3270_FLAGS_READY, &rp->flags);
-        down(&raw3270_sem);
+        mutex_lock(&raw3270_mutex);
         list_for_each_entry(np, &raw3270_notifier, list)
                 np->notifier(rp->minor, 1);
-        up(&raw3270_sem);
+        mutex_unlock(&raw3270_mutex);
         return 0;
 
 failure:
@@ -1307,10 +1308,10 @@ raw3270_remove (struct ccw_device *cdev)
         }
         spin_unlock_irqrestore(get_ccwdev_lock(cdev), flags);
 
-        down(&raw3270_sem);
+        mutex_lock(&raw3270_mutex);
         list_for_each_entry(np, &raw3270_notifier, list)
                 np->notifier(rp->minor, 0);
-        up(&raw3270_sem);
+        mutex_unlock(&raw3270_mutex);
 
         /* Reset 3270 device. */
         raw3270_reset_device(rp);
@@ -1370,13 +1371,13 @@ raw3270_init(void)
         rc = ccw_driver_register(&raw3270_ccw_driver);
         if (rc == 0) {
                 /* Create attributes for early (= console) device. */
-                down(&raw3270_sem);
+                mutex_lock(&raw3270_mutex);
                 class3270 = class_create(THIS_MODULE, "3270");
                 list_for_each_entry(rp, &raw3270_devices, list) {
                         get_device(&rp->cdev->dev);
                         raw3270_create_attributes(rp);
                 }
-                up(&raw3270_sem);
+                mutex_unlock(&raw3270_mutex);
         }
         return rc;
 }
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index 95b92f317b..395cfc6a34 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -829,18 +829,6 @@ zfcp_unit_dequeue(struct zfcp_unit *unit)
         device_unregister(&unit->sysfs_device);
 }
 
-static void *
-zfcp_mempool_alloc(gfp_t gfp_mask, void *size)
-{
-        return kmalloc((size_t) size, gfp_mask);
-}
-
-static void
-zfcp_mempool_free(void *element, void *size)
-{
-        kfree(element);
-}
-
 /*
  * Allocates a combined QTCB/fsf_req buffer for erp actions and fcp/SCSI
  * commands.
@@ -853,51 +841,39 @@ static int
 zfcp_allocate_low_mem_buffers(struct zfcp_adapter *adapter)
 {
         adapter->pool.fsf_req_erp =
-                mempool_create(ZFCP_POOL_FSF_REQ_ERP_NR,
-                               zfcp_mempool_alloc, zfcp_mempool_free, (void *)
-                               sizeof(struct zfcp_fsf_req_pool_element));
-
-        if (NULL == adapter->pool.fsf_req_erp)
+                mempool_create_kmalloc_pool(ZFCP_POOL_FSF_REQ_ERP_NR,
+                                sizeof(struct zfcp_fsf_req_pool_element));
+        if (!adapter->pool.fsf_req_erp)
                 return -ENOMEM;
 
         adapter->pool.fsf_req_scsi =
-                mempool_create(ZFCP_POOL_FSF_REQ_SCSI_NR,
-                               zfcp_mempool_alloc, zfcp_mempool_free, (void *)
-                               sizeof(struct zfcp_fsf_req_pool_element));
-
-        if (NULL == adapter->pool.fsf_req_scsi)
+                mempool_create_kmalloc_pool(ZFCP_POOL_FSF_REQ_SCSI_NR,
+                                sizeof(struct zfcp_fsf_req_pool_element));
+        if (!adapter->pool.fsf_req_scsi)
                 return -ENOMEM;
 
         adapter->pool.fsf_req_abort =
-                mempool_create(ZFCP_POOL_FSF_REQ_ABORT_NR,
-                               zfcp_mempool_alloc, zfcp_mempool_free, (void *)
-                               sizeof(struct zfcp_fsf_req_pool_element));
-
-        if (NULL == adapter->pool.fsf_req_abort)
+                mempool_create_kmalloc_pool(ZFCP_POOL_FSF_REQ_ABORT_NR,
+                                sizeof(struct zfcp_fsf_req_pool_element));
+        if (!adapter->pool.fsf_req_abort)
                 return -ENOMEM;
 
         adapter->pool.fsf_req_status_read =
-                mempool_create(ZFCP_POOL_STATUS_READ_NR,
-                               zfcp_mempool_alloc, zfcp_mempool_free,
-                               (void *) sizeof(struct zfcp_fsf_req));
-
-        if (NULL == adapter->pool.fsf_req_status_read)
+                mempool_create_kmalloc_pool(ZFCP_POOL_STATUS_READ_NR,
+                                            sizeof(struct zfcp_fsf_req));
+        if (!adapter->pool.fsf_req_status_read)
                 return -ENOMEM;
 
         adapter->pool.data_status_read =
-                mempool_create(ZFCP_POOL_STATUS_READ_NR,
-                               zfcp_mempool_alloc, zfcp_mempool_free,
-                               (void *) sizeof(struct fsf_status_read_buffer));
-
-        if (NULL == adapter->pool.data_status_read)
+                mempool_create_kmalloc_pool(ZFCP_POOL_STATUS_READ_NR,
+                                        sizeof(struct fsf_status_read_buffer));
+        if (!adapter->pool.data_status_read)
                 return -ENOMEM;
 
         adapter->pool.data_gid_pn =
-                mempool_create(ZFCP_POOL_DATA_GID_PN_NR,
-                               zfcp_mempool_alloc, zfcp_mempool_free, (void *)
-                               sizeof(struct zfcp_gid_pn_data));
-
-        if (NULL == adapter->pool.data_gid_pn)
+                mempool_create_kmalloc_pool(ZFCP_POOL_DATA_GID_PN_NR,
+                                            sizeof(struct zfcp_gid_pn_data));
+        if (!adapter->pool.data_gid_pn)
                 return -ENOMEM;
 
         return 0;
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 0ab26d0187..0d2b447c50 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -1026,7 +1026,7 @@ static void twa_free_request_id(TW_Device_Extension *tw_dev, int request_id)
         tw_dev->free_tail = (tw_dev->free_tail + 1) % TW_Q_LENGTH;
 } /* End twa_free_request_id() */
 
-/* This function will get parameter table entires from the firmware */
+/* This function will get parameter table entries from the firmware */
 static void *twa_get_param(TW_Device_Extension *tw_dev, int request_id, int table_id, int parameter_id, int parameter_size_bytes)
 {
         TW_Command_Full *full_command_packet;
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index 1c45934329..bde3d5834a 100644
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -41,6 +41,8 @@
 #include <linux/stat.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
+#include <linux/jiffies.h>
+#include <linux/dma-mapping.h>
 #include <scsi/scsicam.h>
 
 #include <asm/dma.h>
@@ -676,7 +678,7 @@ static int __init BusLogic_InitializeMultiMasterProbeInfo(struct BusLogic_HostAd
                 if (pci_enable_device(PCI_Device))
                         continue;
 
-                if (pci_set_dma_mask(PCI_Device, (u64) 0xffffffff))
+                if (pci_set_dma_mask(PCI_Device, DMA_32BIT_MASK ))
                         continue;
 
                 Bus = PCI_Device->bus->number;
@@ -831,7 +833,7 @@ static int __init BusLogic_InitializeMultiMasterProbeInfo(struct BusLogic_HostAd
                 if (pci_enable_device(PCI_Device))
                         continue;
 
-                if (pci_set_dma_mask(PCI_Device, (u64) 0xffffffff))
+                if (pci_set_dma_mask(PCI_Device, DMA_32BIT_MASK))
                         continue;
 
                 Bus = PCI_Device->bus->number;
@@ -885,7 +887,7 @@ static int __init BusLogic_InitializeFlashPointProbeInfo(struct BusLogic_HostAda
                 if (pci_enable_device(PCI_Device))
                         continue;
 
-                if (pci_set_dma_mask(PCI_Device, (u64) 0xffffffff))
+                if (pci_set_dma_mask(PCI_Device, DMA_32BIT_MASK))
                         continue;
 
                 Bus = PCI_Device->bus->number;
@@ -2896,7 +2898,7 @@ static int BusLogic_QueueCommand(struct scsi_cmnd *Command, void (*CompletionRou
                  */
                 if (HostAdapter->ActiveCommands[TargetID] == 0)
                         HostAdapter->LastSequencePoint[TargetID] = jiffies;
-                else if (jiffies - HostAdapter->LastSequencePoint[TargetID] > 4 * HZ) {
+                else if (time_after(jiffies, HostAdapter->LastSequencePoint[TargetID] + 4 * HZ)) {
                         HostAdapter->LastSequencePoint[TargetID] = jiffies;
                         QueueTag = BusLogic_OrderedQueueTag;
                 }
diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index 9f45ae1745..3dce21c787 100644
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -89,6 +89,7 @@
 #include <linux/string.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -1052,7 +1053,7 @@ static int __devinit inia100_probe_one(struct pci_dev *pdev,
 
         if (pci_enable_device(pdev))
                 goto out;
-        if (pci_set_dma_mask(pdev, 0xffffffffULL)) {
+        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
                 printk(KERN_WARNING "Unable to set 32bit DMA "
                                     "on inia100 adapter, ignoring.\n");
                 goto out_disable_device;
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index a16f8ded8f..8df4a0ea37 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -32,6 +32,7 @@
 #include <linux/slab.h>
 #include <linux/completion.h>
 #include <linux/blkdev.h>
+#include <linux/dma-mapping.h>
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index c259633554..7203307786 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -45,6 +45,7 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
+#include <linux/dma-mapping.h>
 #include <linux/syscalls.h>
 #include <linux/delay.h>
 #include <linux/smp_lock.h>
@@ -806,8 +807,8 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
          * to driver communication memory to be allocated below 2gig
          */
         if (aac_drivers[index].quirks & AAC_QUIRK_31BIT) 
-                if (pci_set_dma_mask(pdev, 0x7FFFFFFFULL) ||
-                                pci_set_consistent_dma_mask(pdev, 0x7FFFFFFFULL))
+                if (pci_set_dma_mask(pdev, DMA_31BIT_MASK) ||
+                                pci_set_consistent_dma_mask(pdev, DMA_31BIT_MASK))
                         goto out;
         
         pci_set_master(pdev);
diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c
index 583d2d8c83..fad2109268 100644
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -550,6 +550,6 @@ module_exit(cumanascsi2_exit);
 
 MODULE_AUTHOR("Russell King");
 MODULE_DESCRIPTION("Cumana SCSI-2 driver for Acorn machines");
-MODULE_PARM(term, "1-8i");
+module_param_array(term, int, NULL, 0);
 MODULE_PARM_DESC(term, "SCSI bus termination");
 MODULE_LICENSE("GPL");
diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c
index 3ffec7efc9..dcbb4b2b3f 100644
--- a/drivers/scsi/arm/eesox.c
+++ b/drivers/scsi/arm/eesox.c
@@ -674,6 +674,6 @@ module_exit(eesox_exit);
 
 MODULE_AUTHOR("Russell King");
 MODULE_DESCRIPTION("EESOX 'Fast' SCSI driver for Acorn machines");
-MODULE_PARM(term, "1-8i");
+module_param_array(term, int, NULL, 0);
 MODULE_PARM_DESC(term, "SCSI bus termination");
 MODULE_LICENSE("GPL");
diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c
index 3113bdcedb..3d69f6c45a 100644
--- a/drivers/scsi/arm/powertec.c
+++ b/drivers/scsi/arm/powertec.c
@@ -466,6 +466,6 @@ module_exit(powertecscsi_exit);
 
 MODULE_AUTHOR("Russell King");
 MODULE_DESCRIPTION("Powertec SCSI driver");
-MODULE_PARM(term, "1-8i");
+module_param_array(term, int, NULL, 0);
 MODULE_PARM_DESC(term, "SCSI bus termination");
 MODULE_LICENSE("GPL");
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index f4c1ca7c15..f677c5a32a 100644
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -239,17 +239,17 @@ static int atari_read_overruns = 0;
 #endif
 
 static int setup_can_queue = -1;
-MODULE_PARM(setup_can_queue, "i");
+module_param(setup_can_queue, int, 0);
 static int setup_cmd_per_lun = -1;
-MODULE_PARM(setup_cmd_per_lun, "i");
+module_param(setup_cmd_per_lun, int, 0);
 static int setup_sg_tablesize = -1;
-MODULE_PARM(setup_sg_tablesize, "i");
+module_param(setup_sg_tablesize, int, 0);
 #ifdef SUPPORT_TAGS
 static int setup_use_tagged_queuing = -1;
-MODULE_PARM(setup_use_tagged_queuing, "i");
+module_param(setup_use_tagged_queuing, int, 0);
 #endif
 static int setup_hostid = -1;
-MODULE_PARM(setup_hostid, "i");
+module_param(setup_hostid, int, 0);
 
 
 #if defined(CONFIG_TT_DMA_EMUL)
diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c
index 5227a779c0..a198d86667 100644
--- a/drivers/scsi/atp870u.c
+++ b/drivers/scsi/atp870u.c
@@ -28,6 +28,7 @@
 #include <linux/spinlock.h>
 #include <linux/pci.h>
 #include <linux/blkdev.h>
+#include <linux/dma-mapping.h>
 #include <asm/system.h>
 #include <asm/io.h>
 
@@ -2631,7 +2632,7 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (pci_enable_device(pdev))
                 return -EIO;
 
-        if (!pci_set_dma_mask(pdev, 0xFFFFFFFFUL)) {
+        if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
                 printk(KERN_INFO "atp870u: use 32bit DMA mask.\n");
         } else {
                 printk(KERN_ERR "atp870u: DMA mask required but not available.\n");
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 6e6b293dcb..b1b704a42e 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -57,6 +57,7 @@ MODULE_DESCRIPTION("Adaptec I2O RAID Driver");
 #include <linux/reboot.h>
 #include <linux/spinlock.h>
 #include <linux/smp_lock.h>
+#include <linux/dma-mapping.h>
 
 #include <linux/timer.h>
 #include <linux/string.h>
@@ -906,8 +907,8 @@ static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev
         }
 
         pci_set_master(pDev);
-        if (pci_set_dma_mask(pDev, 0xffffffffffffffffULL) &&
-            pci_set_dma_mask(pDev, 0xffffffffULL))
+        if (pci_set_dma_mask(pDev, DMA_64BIT_MASK) &&
+            pci_set_dma_mask(pDev, DMA_32BIT_MASK))
                 return -EINVAL;
 
         base_addr0_phys = pci_resource_start(pDev,0);
diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
index b3f9de8f75..059eeee4b5 100644
--- a/drivers/scsi/eata.c
+++ b/drivers/scsi/eata.c
@@ -490,6 +490,7 @@
 #include <linux/init.h>
 #include <linux/ctype.h>
 #include <linux/spinlock.h>
+#include <linux/dma-mapping.h>
 #include <asm/byteorder.h>
 #include <asm/dma.h>
 #include <asm/io.h>
@@ -1426,7 +1427,7 @@ static int port_detect(unsigned long port_base, unsigned int j,
 
         if (ha->pdev) {
                 pci_set_master(ha->pdev);
-                if (pci_set_dma_mask(ha->pdev, 0xffffffff))
+                if (pci_set_dma_mask(ha->pdev, DMA_32BIT_MASK))
                         printk("%s: warning, pci_set_dma_mask failed.\n",
                                ha->board_name);
         }
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index 62e3cda859..d5740bbdef 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -388,6 +388,7 @@
 #include <linux/proc_fs.h>
 #include <linux/time.h>
 #include <linux/timer.h>
+#include <linux/dma-mapping.h>
 #ifdef GDTH_RTC
 #include <linux/mc146818rtc.h>
 #endif
@@ -671,7 +672,7 @@ static struct file_operations gdth_fops = {
 static struct notifier_block gdth_notifier = {
     gdth_halt, NULL, 0
 };
-
+static int notifier_disabled = 0;
 
 static void gdth_delay(int milliseconds)
 {
@@ -4527,15 +4528,15 @@ static int __init gdth_detect(struct scsi_host_template *shtp)
             if (!(ha->cache_feat & ha->raw_feat & ha->screen_feat &GDT_64BIT)||
                 /* 64-bit DMA only supported from FW >= x.43 */
                 (!ha->dma64_support)) {
-                if (pci_set_dma_mask(pcistr[ctr].pdev, 0xffffffff)) {
+                if (pci_set_dma_mask(pcistr[ctr].pdev, DMA_32BIT_MASK)) {
                     printk(KERN_WARNING "GDT-PCI %d: Unable to set 32-bit DMA\n", hanum);
                     err = TRUE;
                 }
             } else {
                 shp->max_cmd_len = 16;
-                if (!pci_set_dma_mask(pcistr[ctr].pdev, 0xffffffffffffffffULL)) {
+                if (!pci_set_dma_mask(pcistr[ctr].pdev, DMA_64BIT_MASK)) {
                     printk("GDT-PCI %d: 64-bit DMA enabled\n", hanum);
-                } else if (pci_set_dma_mask(pcistr[ctr].pdev, 0xffffffff)) {
+                } else if (pci_set_dma_mask(pcistr[ctr].pdev, DMA_32BIT_MASK)) {
                     printk(KERN_WARNING "GDT-PCI %d: Unable to set 64/32-bit DMA\n", hanum);
                     err = TRUE;
                 }
@@ -4595,13 +4596,13 @@ static int __init gdth_detect(struct scsi_host_template *shtp)
         add_timer(&gdth_timer);
 #endif
         major = register_chrdev(0,"gdth",&gdth_fops);
+        notifier_disabled = 0;
         register_reboot_notifier(&gdth_notifier);
     }
     gdth_polling = FALSE;
     return gdth_ctr_vcount;
 }
 
-
 static int gdth_release(struct Scsi_Host *shp)
 {
     int hanum;
@@ -5632,10 +5633,14 @@ static int gdth_halt(struct notifier_block *nb, ulong event, void *buf)
     char            cmnd[MAX_COMMAND_SIZE];   
 #endif
 
+    if (notifier_disabled)
+        return NOTIFY_OK;
+
     TRACE2(("gdth_halt() event %d\n",(int)event));
     if (event != SYS_RESTART && event != SYS_HALT && event != SYS_POWER_OFF)
         return NOTIFY_DONE;
 
+    notifier_disabled = 1;
     printk("GDT-HA: Flushing all host drives .. ");
     for (hanum = 0; hanum < gdth_ctr_count; ++hanum) {
         gdth_flush(hanum);
@@ -5679,7 +5684,6 @@ static int gdth_halt(struct notifier_block *nb, ulong event, void *buf)
 #ifdef GDTH_STATISTICS
     del_timer(&gdth_timer);
 #endif
-    unregister_reboot_notifier(&gdth_notifier);
     return NOTIFY_OK;
 }
 
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index ea6f3c0e05..0cc7f65b58 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -127,6 +127,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/jiffies.h>
+#include <linux/dma-mapping.h>
 #include <asm/io.h>
 
 #include <scsi/scsi.h>
@@ -2780,7 +2781,7 @@ static int tul_NewReturnNumberOfAdapters(void)
                         if (((dRegValue & 0xFF00) >> 8) == 0xFF)
                                 dRegValue = 0;
                         wBIOS = (wBIOS << 8) + ((UWORD) ((dRegValue & 0xFF00) >> 8));
-                        if (pci_set_dma_mask(pDev, 0xffffffff)) {
+                        if (pci_set_dma_mask(pDev, DMA_32BIT_MASK)) {
                                 printk(KERN_WARNING 
                                        "i91u: Could not set 32 bit DMA mask\n");
                                 continue;
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 481708d527..a4c0b04cfd 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -179,6 +179,7 @@
 
 #include <linux/blkdev.h>
 #include <linux/types.h>
+#include <linux/dma-mapping.h>
 
 #include <scsi/sg.h>
 
@@ -7284,10 +7285,10 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr)
          * are guaranteed to be < 4G.
          */
         if (IPS_ENABLE_DMA64 && IPS_HAS_ENH_SGLIST(ha) &&
-            !pci_set_dma_mask(ha->pcidev, 0xffffffffffffffffULL)) {
+            !pci_set_dma_mask(ha->pcidev, DMA_64BIT_MASK)) {
                 (ha)->flags |= IPS_HA_ENH_SG;
         } else {
-                if (pci_set_dma_mask(ha->pcidev, 0xffffffffULL) != 0) {
+                if (pci_set_dma_mask(ha->pcidev, DMA_32BIT_MASK) != 0) {
                         printk(KERN_WARNING "Unable to set DMA Mask\n");
                         return ips_abort_init(ha, index);
                 }
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 7b82ff090d..2068b66822 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -3200,8 +3200,8 @@ iscsi_r2tpool_alloc(struct iscsi_session *session)
                  * Data-Out PDU's within R2T-sequence can be quite big;
                  * using mempool
                  */
-                ctask->datapool = mempool_create(ISCSI_DTASK_DEFAULT_MAX,
-                         mempool_alloc_slab, mempool_free_slab, taskcache);
+                ctask->datapool = mempool_create_slab_pool(ISCSI_DTASK_DEFAULT_MAX,
+                                                           taskcache);
                 if (ctask->datapool == NULL) {
                         kfifo_free(ctask->r2tqueue);
                         iscsi_pool_free(&ctask->r2tpool, (void**)ctask->r2ts);
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 5fdc3143ed..83c92b19e7 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -2017,13 +2017,12 @@ static unsigned int ata_bus_softreset(struct ata_port *ap,
          */
         msleep(150);
 
-
         /* Before we perform post reset processing we want to see if
-           the bus shows 0xFF because the odd clown forgets the D7 pulldown
-           resistor */
-
+         * the bus shows 0xFF because the odd clown forgets the D7
+         * pulldown resistor.
+         */
         if (ata_check_status(ap) == 0xFF)
-                return 1;       /* Positive is failure for some reason */
+                return AC_ERR_OTHER;
 
         ata_bus_post_reset(ap, devmask);
 
@@ -2643,6 +2642,10 @@ static int ata_dma_blacklisted(const struct ata_device *dev)
  *      known limits including host controller limits, device
  *      blacklist, etc...
  *
+ *      FIXME: The current implementation limits all transfer modes to
+ *      the fastest of the lowested device on the port.  This is not
+ *      required on most controllers.
+ *
  *      LOCKING:
  *      None.
  */
diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c
index 352df47bca..07017658ac 100644
--- a/drivers/scsi/lpfc/lpfc_mem.c
+++ b/drivers/scsi/lpfc/lpfc_mem.c
@@ -38,18 +38,6 @@
 #define LPFC_MBUF_POOL_SIZE     64      /* max elements in MBUF safety pool */
 #define LPFC_MEM_POOL_SIZE      64      /* max elem in non-DMA safety pool */
 
-static void *
-lpfc_pool_kmalloc(gfp_t gfp_flags, void *data)
-{
-        return kmalloc((unsigned long)data, gfp_flags);
-}
-
-static void
-lpfc_pool_kfree(void *obj, void *data)
-{
-        kfree(obj);
-}
-
 int
 lpfc_mem_alloc(struct lpfc_hba * phba)
 {
@@ -79,15 +67,13 @@ lpfc_mem_alloc(struct lpfc_hba * phba)
                 pool->current_count++;
         }
 
-        phba->mbox_mem_pool = mempool_create(LPFC_MEM_POOL_SIZE,
-                                lpfc_pool_kmalloc, lpfc_pool_kfree,
-                                (void *)(unsigned long)sizeof(LPFC_MBOXQ_t));
+        phba->mbox_mem_pool = mempool_create_kmalloc_pool(LPFC_MEM_POOL_SIZE,
+                                                         sizeof(LPFC_MBOXQ_t));
         if (!phba->mbox_mem_pool)
                 goto fail_free_mbuf_pool;
 
-        phba->nlp_mem_pool = mempool_create(LPFC_MEM_POOL_SIZE,
-                        lpfc_pool_kmalloc, lpfc_pool_kfree,
-                        (void *)(unsigned long)sizeof(struct lpfc_nodelist));
+        phba->nlp_mem_pool = mempool_create_kmalloc_pool(LPFC_MEM_POOL_SIZE,
+                                                sizeof(struct lpfc_nodelist));
         if (!phba->nlp_mem_pool)
                 goto fail_free_mbox_pool;
 
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 7144674bc8..80b68a2481 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -45,6 +45,7 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/dma-mapping.h>
 #include <scsi/scsicam.h>
 
 #include "scsi.h"
@@ -2094,7 +2095,7 @@ make_local_pdev(adapter_t *adapter, struct pci_dev **pdev)
 
         memcpy(*pdev, adapter->dev, sizeof(struct pci_dev));
 
-        if( pci_set_dma_mask(*pdev, 0xffffffff) != 0 ) {
+        if( pci_set_dma_mask(*pdev, DMA_32BIT_MASK) != 0 ) {
                 kfree(*pdev);
                 return -1;
         }
@@ -4859,10 +4860,10 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
         /* Set the Mode of addressing to 64 bit if we can */
         if ((adapter->flag & BOARD_64BIT) && (sizeof(dma_addr_t) == 8)) {
-                pci_set_dma_mask(pdev, 0xffffffffffffffffULL);
+                pci_set_dma_mask(pdev, DMA_64BIT_MASK);
                 adapter->has_64bit_addr = 1;
         } else  {
-                pci_set_dma_mask(pdev, 0xffffffff);
+                pci_set_dma_mask(pdev, DMA_32BIT_MASK);
                 adapter->has_64bit_addr = 0;
         }
                 
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index d6d2125f90..f852421002 100644
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -1748,7 +1748,7 @@ static int mesh_host_reset(struct scsi_cmnd *cmd)
 
 static void set_mesh_power(struct mesh_state *ms, int state)
 {
-        if (_machine != _MACH_Pmac)
+        if (!machine_is(powermac))
                 return;
         if (state) {
                 pmac_call_feature(PMAC_FTR_MESH_ENABLE, macio_get_of_node(ms->mdev), 0, 1);
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index a279ebb614..30ee0ef4b4 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -38,6 +38,7 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/ctype.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/dma.h>
 #include <asm/system.h>
@@ -2776,7 +2777,7 @@ static int nsp32_detect(struct scsi_host_template *sht)
         /*
          * setup DMA 
          */
-        if (pci_set_dma_mask(PCIDEV, 0xffffffffUL) != 0) {
+        if (pci_set_dma_mask(PCIDEV, DMA_32BIT_MASK) != 0) {
                 nsp32_msg (KERN_ERR, "failed to set PCI DMA mask");
                 goto scsi_unregister;
         }
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 66ea47a9c5..e3bd4bc339 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -49,6 +49,7 @@ static const char * osst_version = "0.99.4";
 #include <linux/blkdev.h>
 #include <linux/moduleparam.h>
 #include <linux/delay.h>
+#include <linux/jiffies.h>
 #include <asm/uaccess.h>
 #include <asm/dma.h>
 #include <asm/system.h>
@@ -856,7 +857,7 @@ static int osst_wait_frame(struct osst_tape * STp, struct osst_request ** aSRpnt
                     ) && result >= 0)
                 {
 #if DEBUG                       
-                        if (debugging || jiffies - startwait >= 2*HZ/OSST_POLL_PER_SEC)
+                        if (debugging || time_after_eq(jiffies, startwait + 2*HZ/OSST_POLL_PER_SEC))
                                 printk (OSST_DEB_MSG
                                         "%s:D: Succ wait f fr %i (>%i): %i-%i %i (%i): %3li.%li s\n",
                                         name, curr, curr+minlast, STp->first_frame_position,
@@ -867,7 +868,7 @@ static int osst_wait_frame(struct osst_tape * STp, struct osst_request ** aSRpnt
                         return 0;
                 }
 #if DEBUG
-                if (jiffies - startwait >= 2*HZ/OSST_POLL_PER_SEC && notyetprinted)
+                if (time_after_eq(jiffies, startwait + 2*HZ/OSST_POLL_PER_SEC) && notyetprinted)
                 {
                         printk (OSST_DEB_MSG "%s:D: Wait for frame %i (>%i): %i-%i %i (%i)\n",
                                 name, curr, curr+minlast, STp->first_frame_position,
diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c
index 05347eed9d..fee843fab1 100644
--- a/drivers/scsi/ppa.c
+++ b/drivers/scsi/ppa.c
@@ -18,6 +18,7 @@
 #include <linux/parport.h>
 #include <linux/workqueue.h>
 #include <linux/delay.h>
+#include <linux/jiffies.h>
 #include <asm/io.h>
 
 #include <scsi/scsi.h>
@@ -726,7 +727,7 @@ static int ppa_engine(ppa_struct *dev, struct scsi_cmnd *cmd)
                                 retv--;
 
                         if (retv) {
-                                if ((jiffies - dev->jstart) > (1 * HZ)) {
+                                if (time_after(jiffies, dev->jstart + (1 * HZ))) {
                                         printk
                                             ("ppa: Parallel port cable is unplugged!!\n");
                                         ppa_fail(dev, DID_BUS_BUSY);
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index e0230249fa..5a48e55f94 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -350,6 +350,7 @@
 #include <linux/pci_ids.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -4321,7 +4322,7 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
 #ifdef QLA_64BIT_PTR
         if (pci_set_dma_mask(ha->pdev, (dma_addr_t) ~ 0ULL)) {
-                if (pci_set_dma_mask(ha->pdev, 0xffffffff)) {
+                if (pci_set_dma_mask(ha->pdev, DMA_32BIT_MASK)) {
                         printk(KERN_WARNING "scsi(%li): Unable to set a "
                                "suitable DMA mask - aborting\n", ha->host_no);
                         error = -ENODEV;
@@ -4331,7 +4332,7 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 dprintk(2, "scsi(%li): 64 Bit PCI Addressing Enabled\n",
                         ha->host_no);
 #else
-        if (pci_set_dma_mask(ha->pdev, 0xffffffff)) {
+        if (pci_set_dma_mask(ha->pdev, DMA_32BIT_MASK)) {
                 printk(KERN_WARNING "scsi(%li): Unable to set a "
                        "suitable DMA mask - aborting\n", ha->host_no);
                 error = -ENODEV;
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 029bbf461b..017729c59a 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -2154,8 +2154,7 @@ qla2x00_allocate_sp_pool(scsi_qla_host_t *ha)
         int      rval;
 
         rval = QLA_SUCCESS;
-        ha->srb_mempool = mempool_create(SRB_MIN_REQ, mempool_alloc_slab,
-            mempool_free_slab, srb_cachep);
+        ha->srb_mempool = mempool_create_slab_pool(SRB_MIN_REQ, srb_cachep);
         if (ha->srb_mempool == NULL) {
                 qla_printk(KERN_INFO, ha, "Unable to allocate SRB mempool.\n");
                 rval = QLA_FUNCTION_FAILED;
diff --git a/drivers/scsi/qlogicfc.c b/drivers/scsi/qlogicfc.c
index 94ef3f08d3..52b224a5d6 100644
--- a/drivers/scsi/qlogicfc.c
+++ b/drivers/scsi/qlogicfc.c
@@ -61,6 +61,8 @@
 #include <linux/unistd.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
+#include <linux/jiffies.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include "scsi.h"
@@ -737,8 +739,8 @@ static int isp2x00_detect(struct scsi_host_template * tmpt)
                                 continue;
 
                         /* Try to configure DMA attributes. */
-                        if (pci_set_dma_mask(pdev, 0xffffffffffffffffULL) &&
-                            pci_set_dma_mask(pdev, 0xffffffffULL))
+                        if (pci_set_dma_mask(pdev, DMA_64BIT_MASK) &&
+                            pci_set_dma_mask(pdev, DMA_32BIT_MASK))
                                         continue;
 
                         host = scsi_register(tmpt, sizeof(struct isp2x00_hostdata));
@@ -1325,7 +1327,7 @@ static int isp2x00_queuecommand(Scsi_Cmnd * Cmnd, void (*done) (Scsi_Cmnd *))
                 cmd->control_flags = cpu_to_le16(CFLAG_READ);
 
         if (Cmnd->device->tagged_supported) {
-                if ((jiffies - hostdata->tag_ages[Cmnd->device->id]) > (2 * ISP_TIMEOUT)) {
+                if (time_after(jiffies, hostdata->tag_ages[Cmnd->device->id] + (2 * ISP_TIMEOUT))) {
                         cmd->control_flags |= cpu_to_le16(CFLAG_ORDERED_TAG);
                         hostdata->tag_ages[Cmnd->device->id] = jiffies;
                 } else
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index 1fd5fc6d0f..c7e78dcf09 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -24,6 +24,7 @@
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
+#include <linux/jiffies.h>
 
 #include <asm/byteorder.h>
 
@@ -1017,7 +1018,7 @@ static inline void cmd_frob(struct Command_Entry *cmd, struct scsi_cmnd *Cmnd,
         if (Cmnd->device->tagged_supported) {
                 if (qpti->cmd_count[Cmnd->device->id] == 0)
                         qpti->tag_ages[Cmnd->device->id] = jiffies;
-                if ((jiffies - qpti->tag_ages[Cmnd->device->id]) > (5*HZ)) {
+                if (time_after(jiffies, qpti->tag_ages[Cmnd->device->id] + (5*HZ))) {
                         cmd->control_flags = CFLAG_ORDERED_TAG;
                         qpti->tag_ages[Cmnd->device->id] = jiffies;
                 } else
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index ede158d08d..8f010a314a 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1787,9 +1787,8 @@ int __init scsi_init_queue(void)
                                         sgp->name);
                 }
 
-                sgp->pool = mempool_create(SG_MEMPOOL_SIZE,
-                                mempool_alloc_slab, mempool_free_slab,
-                                sgp->slab);
+                sgp->pool = mempool_create_slab_pool(SG_MEMPOOL_SIZE,
+                                                     sgp->slab);
                 if (!sgp->pool) {
                         printk(KERN_ERR "SCSI: can't init sg mempool %s\n",
                                         sgp->name);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 024ef86c52..c647d85d97 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -190,7 +190,7 @@ static ssize_t sd_store_cache_type(struct class_device *cdev, const char *buf,
         if (scsi_mode_sense(sdp, 0x08, 8, buffer, sizeof(buffer), SD_TIMEOUT,
                             SD_MAX_RETRIES, &data, NULL))
                 return -EINVAL;
-        len = min(sizeof(buffer), data.length - data.header_length -
+        len = min_t(size_t, sizeof(buffer), data.length - data.header_length -
                   data.block_descriptor_length);
         buffer_data = buffer + data.header_length +
                 data.block_descriptor_length;
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 5996d3cd0e..674b15c78f 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1528,7 +1528,7 @@ static int serial8250_startup(struct uart_port *port)
 
         /*
          * Clear the FIFO buffers and disable them.
-         * (they will be reeanbled in set_termios())
+         * (they will be reenabled in set_termios())
          */
         serial8250_clear_fifos(up);
 
diff --git a/drivers/serial/8250_acpi.c b/drivers/serial/8250_acpi.c
deleted file mode 100644
index 809f89ab96..0000000000
--- a/drivers/serial/8250_acpi.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) 2002-2003 Matthew Wilcox for Hewlett-Packard
- * Copyright (C) 2004 Hewlett-Packard Co
- *      Bjorn Helgaas <bjorn.helgaas@hp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <linux/acpi.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/serial_core.h>
-
-#include <acpi/acpi_bus.h>
-
-#include <asm/io.h>
-
-#include "8250.h"
-
-struct serial_private {
-        int     line;
-};
-
-static acpi_status acpi_serial_mmio(struct uart_port *port,
-                                    struct acpi_resource_address64 *addr)
-{
-        port->mapbase = addr->minimum;
-        port->iotype = UPIO_MEM;
-        port->flags |= UPF_IOREMAP;
-        return AE_OK;
-}
-
-static acpi_status acpi_serial_port(struct uart_port *port,
-                                    struct acpi_resource_io *io)
-{
-        if (io->address_length) {
-                port->iobase = io->minimum;
-                port->iotype = UPIO_PORT;
-        } else
-                printk(KERN_ERR "%s: zero-length IO port range?\n", __FUNCTION__);
-        return AE_OK;
-}
-
-static acpi_status acpi_serial_ext_irq(struct uart_port *port,
-                                       struct acpi_resource_extended_irq *ext_irq)
-{
-        int rc;
-
-        if (ext_irq->interrupt_count > 0) {
-                rc = acpi_register_gsi(ext_irq->interrupts[0],
-                           ext_irq->triggering, ext_irq->polarity);
-                if (rc < 0)
-                        return AE_ERROR;
-                port->irq = rc;
-        }
-        return AE_OK;
-}
-
-static acpi_status acpi_serial_irq(struct uart_port *port,
-                                   struct acpi_resource_irq *irq)
-{
-        int rc;
-
-        if (irq->interrupt_count > 0) {
-                rc = acpi_register_gsi(irq->interrupts[0],
-                           irq->triggering, irq->polarity);
-                if (rc < 0)
-                        return AE_ERROR;
-                port->irq = rc;
-        }
-        return AE_OK;
-}
-
-static acpi_status acpi_serial_resource(struct acpi_resource *res, void *data)
-{
-        struct uart_port *port = (struct uart_port *) data;
-        struct acpi_resource_address64 addr;
-        acpi_status status;
-
-        status = acpi_resource_to_address64(res, &addr);
-        if (ACPI_SUCCESS(status))
-                return acpi_serial_mmio(port, &addr);
-        else if (res->type == ACPI_RESOURCE_TYPE_IO)
-                return acpi_serial_port(port, &res->data.io);
-        else if (res->type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ)
-                return acpi_serial_ext_irq(port, &res->data.extended_irq);
-        else if (res->type == ACPI_RESOURCE_TYPE_IRQ)
-                return acpi_serial_irq(port, &res->data.irq);
-        return AE_OK;
-}
-
-static int acpi_serial_add(struct acpi_device *device)
-{
-        struct serial_private *priv;
-        acpi_status status;
-        struct uart_port port;
-        int result;
-
-        memset(&port, 0, sizeof(struct uart_port));
-
-        port.uartclk = 1843200;
-        port.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;
-
-        priv = kmalloc(sizeof(struct serial_private), GFP_KERNEL);
-        if (!priv) {
-                result = -ENOMEM;
-                goto fail;
-        }
-        memset(priv, 0, sizeof(*priv));
-
-        status = acpi_walk_resources(device->handle, METHOD_NAME__CRS,
-                                     acpi_serial_resource, &port);
-        if (ACPI_FAILURE(status)) {
-                result = -ENODEV;
-                goto fail;
-        }
-
-        if (!port.mapbase && !port.iobase) {
-                printk(KERN_ERR "%s: no iomem or port address in %s _CRS\n",
-                        __FUNCTION__, device->pnp.bus_id);
-                result = -ENODEV;
-                goto fail;
-        }
-
-        priv->line = serial8250_register_port(&port);
-        if (priv->line < 0) {
-                printk(KERN_WARNING "Couldn't register serial port %s: %d\n",
-                        device->pnp.bus_id, priv->line);
-                result = -ENODEV;
-                goto fail;
-        }
-
-        acpi_driver_data(device) = priv;
-        return 0;
-
-fail:
-        kfree(priv);
-
-        return result;
-}
-
-static int acpi_serial_remove(struct acpi_device *device, int type)
-{
-        struct serial_private *priv;
-
-        if (!device || !acpi_driver_data(device))
-                return -EINVAL;
-
-        priv = acpi_driver_data(device);
-        serial8250_unregister_port(priv->line);
-        kfree(priv);
-
-        return 0;
-}
-
-static struct acpi_driver acpi_serial_driver = {
-        .name =         "serial",
-        .class =        "",
-        .ids =          "PNP0501",
-        .ops =  {
-                .add =          acpi_serial_add,
-                .remove =       acpi_serial_remove,
-        },
-};
-
-static int __init acpi_serial_init(void)
-{
-        return acpi_bus_register_driver(&acpi_serial_driver);
-}
-
-static void __exit acpi_serial_exit(void)
-{
-        acpi_bus_unregister_driver(&acpi_serial_driver);
-}
-
-module_init(acpi_serial_init);
-module_exit(acpi_serial_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Generic 8250/16x50 ACPI serial driver");
diff --git a/drivers/serial/8250_au1x00.c b/drivers/serial/8250_au1x00.c
index 8d8d7a70d0..3d1bfd0720 100644
--- a/drivers/serial/8250_au1x00.c
+++ b/drivers/serial/8250_au1x00.c
@@ -51,7 +51,7 @@ static struct plat_serial8250_port au1x00_data[] = {
 #elif defined(CONFIG_SOC_AU1100)
         PORT(UART0_ADDR, AU1100_UART0_INT),
         PORT(UART1_ADDR, AU1100_UART1_INT),
-        PORT(UART2_ADDR, AU1100_UART2_INT),
+        /* The internal UART2 does not exist on the AU1100 processor. */
         PORT(UART3_ADDR, AU1100_UART3_INT),
 #elif defined(CONFIG_SOC_AU1550)
         PORT(UART0_ADDR, AU1550_UART0_INT),
diff --git a/drivers/serial/8250_hp300.c b/drivers/serial/8250_hp300.c
index 4315afe9c0..53e81a44c1 100644
--- a/drivers/serial/8250_hp300.c
+++ b/drivers/serial/8250_hp300.c
@@ -55,6 +55,8 @@ static struct dio_driver hpdca_driver = {
 
 #endif
 
+static unsigned int num_ports;
+
 extern int hp300_uart_scode;
 
 /* Offset to UART registers from base of DCA */
@@ -199,6 +201,8 @@ static int __devinit hpdca_init_one(struct dio_dev *d,
         out_8(d->resource.start + DIO_VIRADDRBASE + DCA_ID, 0xff);
         udelay(100);
 
+        num_ports++;
+
         return 0;
 }
 #endif
@@ -206,7 +210,6 @@ static int __devinit hpdca_init_one(struct dio_dev *d,
 static int __init hp300_8250_init(void)
 {
         static int called = 0;
-        int num_ports;
 #ifdef CONFIG_HPAPCI
         int line;
         unsigned long base;
@@ -221,11 +224,8 @@ static int __init hp300_8250_init(void)
         if (!MACH_IS_HP300)
                 return -ENODEV;
 
-        num_ports = 0;
-
 #ifdef CONFIG_HPDCA
-        if (dio_module_init(&hpdca_driver) == 0)
-                num_ports++;
+        dio_register_driver(&hpdca_driver);
 #endif
 #ifdef CONFIG_HPAPCI
         if (hp300_model < HP_400) {
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index c66ef96c71..fe0d8b8e91 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -77,14 +77,6 @@ config SERIAL_8250_CS
 
           If unsure, say N.
 
-config SERIAL_8250_ACPI
-        bool "8250/16550 device discovery via ACPI namespace"
-        default y if IA64
-        depends on ACPI && SERIAL_8250
-        ---help---
-          If you wish to enable serial port discovery via the ACPI
-          namespace, say Y here.  If unsure, say N.
-
 config SERIAL_8250_NR_UARTS
         int "Maximum number of 8250/16550 serial ports"
         depends on SERIAL_8250
@@ -628,22 +620,6 @@ config SERIAL_SH_SCI_CONSOLE
         depends on SERIAL_SH_SCI=y
         select SERIAL_CORE_CONSOLE
 
-config SERIAL_AU1X00
-        bool "Enable Au1x00 UART Support"
-        depends on MIPS && SOC_AU1X00
-        select SERIAL_CORE
-        help
-          If you have an Alchemy AU1X00 processor (MIPS based) and you want
-          to use serial ports, say Y.  Otherwise, say N.
-
-config SERIAL_AU1X00_CONSOLE
-        bool "Enable Au1x00 serial console"
-        depends on SERIAL_AU1X00
-        select SERIAL_CORE_CONSOLE
-        help
-          If you have an Alchemy AU1X00 processor (MIPS based) and you want
-          to use a console on a serial port, say Y.  Otherwise, say N.
-
 config SERIAL_CORE
         tristate
 
@@ -827,6 +803,7 @@ config SERIAL_ICOM
         tristate "IBM Multiport Serial Adapter"
         depends on PCI && (PPC_ISERIES || PPC_PSERIES)
         select SERIAL_CORE
+        select FW_LOADER
         help
           This driver is for a family of multiport serial adapters
           including 2 port RVX, 2 port internal modem, 4 port internal
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 50c221af9e..d2b4c21487 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -5,7 +5,6 @@
 #
 
 serial-8250-y :=
-serial-8250-$(CONFIG_SERIAL_8250_ACPI) += 8250_acpi.o
 serial-8250-$(CONFIG_PNP) += 8250_pnp.o
 serial-8250-$(CONFIG_GSC) += 8250_gsc.o
 serial-8250-$(CONFIG_PCI) += 8250_pci.o
@@ -42,7 +41,6 @@ obj-$(CONFIG_SERIAL_COLDFIRE) += mcfserial.o
 obj-$(CONFIG_V850E_UART) += v850e_uart.o
 obj-$(CONFIG_SERIAL_PMACZILOG) += pmac_zilog.o
 obj-$(CONFIG_SERIAL_LH7A40X) += serial_lh7a40x.o
-obj-$(CONFIG_SERIAL_AU1X00) += au1x00_uart.o
 obj-$(CONFIG_SERIAL_DZ) += dz.o
 obj-$(CONFIG_SERIAL_SH_SCI) += sh-sci.o
 obj-$(CONFIG_SERIAL_SGI_L1_CONSOLE) += sn_console.o
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
index e04d5e82d9..1631414000 100644
--- a/drivers/serial/amba-pl010.c
+++ b/drivers/serial/amba-pl010.c
@@ -51,8 +51,6 @@
 #include <linux/amba/serial.h>
 
 #include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/hardware.h>
 
 #define UART_NR         2
 
@@ -62,47 +60,19 @@
 
 #define AMBA_ISR_PASS_LIMIT     256
 
-/*
- * Access macros for the AMBA UARTs
- */
-#define UART_GET_INT_STATUS(p)  readb((p)->membase + UART010_IIR)
-#define UART_PUT_ICR(p, c)      writel((c), (p)->membase + UART010_ICR)
-#define UART_GET_FR(p)          readb((p)->membase + UART01x_FR)
-#define UART_GET_CHAR(p)        readb((p)->membase + UART01x_DR)
-#define UART_PUT_CHAR(p, c)     writel((c), (p)->membase + UART01x_DR)
-#define UART_GET_RSR(p)         readb((p)->membase + UART01x_RSR)
-#define UART_GET_CR(p)          readb((p)->membase + UART010_CR)
-#define UART_PUT_CR(p,c)        writel((c), (p)->membase + UART010_CR)
-#define UART_GET_LCRL(p)        readb((p)->membase + UART010_LCRL)
-#define UART_PUT_LCRL(p,c)      writel((c), (p)->membase + UART010_LCRL)
-#define UART_GET_LCRM(p)        readb((p)->membase + UART010_LCRM)
-#define UART_PUT_LCRM(p,c)      writel((c), (p)->membase + UART010_LCRM)
-#define UART_GET_LCRH(p)        readb((p)->membase + UART010_LCRH)
-#define UART_PUT_LCRH(p,c)      writel((c), (p)->membase + UART010_LCRH)
 #define UART_RX_DATA(s)         (((s) & UART01x_FR_RXFE) == 0)
 #define UART_TX_READY(s)        (((s) & UART01x_FR_TXFF) == 0)
-#define UART_TX_EMPTY(p)        ((UART_GET_FR(p) & UART01x_FR_TMSK) == 0)
 
-#define UART_DUMMY_RSR_RX       /*256*/0
+#define UART_DUMMY_RSR_RX       256
 #define UART_PORT_SIZE          64
 
 /*
- * On the Integrator platform, the port RTS and DTR are provided by
- * bits in the following SC_CTRLS register bits:
- *        RTS  DTR
- *  UART0  7    6
- *  UART1  5    4
- */
-#define SC_CTRLC        (IO_ADDRESS(INTEGRATOR_SC_BASE) + INTEGRATOR_SC_CTRLC_OFFSET)
-#define SC_CTRLS        (IO_ADDRESS(INTEGRATOR_SC_BASE) + INTEGRATOR_SC_CTRLS_OFFSET)
-
-/*
  * We wrap our port structure around the generic uart_port.
  */
 struct uart_amba_port {
         struct uart_port        port;
-        unsigned int            dtr_mask;
-        unsigned int            rts_mask;
+        struct amba_device      *dev;
+        struct amba_pl010_data  *data;
         unsigned int            old_status;
 };
 
@@ -110,36 +80,36 @@ static void pl010_stop_tx(struct uart_port *port)
 {
         unsigned int cr;
 
-        cr = UART_GET_CR(port);
+        cr = readb(port->membase + UART010_CR);
         cr &= ~UART010_CR_TIE;
-        UART_PUT_CR(port, cr);
+        writel(cr, port->membase + UART010_CR);
 }
 
 static void pl010_start_tx(struct uart_port *port)
 {
         unsigned int cr;
 
-        cr = UART_GET_CR(port);
+        cr = readb(port->membase + UART010_CR);
         cr |= UART010_CR_TIE;
-        UART_PUT_CR(port, cr);
+        writel(cr, port->membase + UART010_CR);
 }
 
 static void pl010_stop_rx(struct uart_port *port)
 {
         unsigned int cr;
 
-        cr = UART_GET_CR(port);
+        cr = readb(port->membase + UART010_CR);
         cr &= ~(UART010_CR_RIE | UART010_CR_RTIE);
-        UART_PUT_CR(port, cr);
+        writel(cr, port->membase + UART010_CR);
 }
 
 static void pl010_enable_ms(struct uart_port *port)
 {
         unsigned int cr;
 
-        cr = UART_GET_CR(port);
+        cr = readb(port->membase + UART010_CR);
         cr |= UART010_CR_MSIE;
-        UART_PUT_CR(port, cr);
+        writel(cr, port->membase + UART010_CR);
 }
 
 static void
@@ -152,9 +122,9 @@ pl010_rx_chars(struct uart_port *port)
         struct tty_struct *tty = port->info->tty;
         unsigned int status, ch, flag, rsr, max_count = 256;
 
-        status = UART_GET_FR(port);
+        status = readb(port->membase + UART01x_FR);
         while (UART_RX_DATA(status) && max_count--) {
-                ch = UART_GET_CHAR(port);
+                ch = readb(port->membase + UART01x_DR);
                 flag = TTY_NORMAL;
 
                 port->icount.rx++;
@@ -163,7 +133,7 @@ pl010_rx_chars(struct uart_port *port)
                  * Note that the error handling code is
                  * out of the main execution path
                  */
-                rsr = UART_GET_RSR(port) | UART_DUMMY_RSR_RX;
+                rsr = readb(port->membase + UART01x_RSR) | UART_DUMMY_RSR_RX;
                 if (unlikely(rsr & UART01x_RSR_ANY)) {
                         if (rsr & UART01x_RSR_BE) {
                                 rsr &= ~(UART01x_RSR_FE | UART01x_RSR_PE);
@@ -193,7 +163,7 @@ pl010_rx_chars(struct uart_port *port)
                 uart_insert_char(port, rsr, UART01x_RSR_OE, ch, flag);
 
         ignore_char:
-                status = UART_GET_FR(port);
+                status = readb(port->membase + UART01x_FR);
         }
         tty_flip_buffer_push(tty);
         return;
@@ -205,7 +175,7 @@ static void pl010_tx_chars(struct uart_port *port)
         int count;
 
         if (port->x_char) {
-                UART_PUT_CHAR(port, port->x_char);
+                writel(port->x_char, port->membase + UART01x_DR);
                 port->icount.tx++;
                 port->x_char = 0;
                 return;
@@ -217,7 +187,7 @@ static void pl010_tx_chars(struct uart_port *port)
 
         count = port->fifosize >> 1;
         do {
-                UART_PUT_CHAR(port, xmit->buf[xmit->tail]);
+                writel(xmit->buf[xmit->tail], port->membase + UART01x_DR);
                 xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
                 port->icount.tx++;
                 if (uart_circ_empty(xmit))
@@ -236,9 +206,9 @@ static void pl010_modem_status(struct uart_port *port)
         struct uart_amba_port *uap = (struct uart_amba_port *)port;
         unsigned int status, delta;
 
-        UART_PUT_ICR(&uap->port, 0);
+        writel(0, uap->port.membase + UART010_ICR);
 
-        status = UART_GET_FR(&uap->port) & UART01x_FR_MODEM_ANY;
+        status = readb(uap->port.membase + UART01x_FR) & UART01x_FR_MODEM_ANY;
 
         delta = status ^ uap->old_status;
         uap->old_status = status;
@@ -266,7 +236,7 @@ static irqreturn_t pl010_int(int irq, void *dev_id, struct pt_regs *regs)
 
         spin_lock(&port->lock);
 
-        status = UART_GET_INT_STATUS(port);
+        status = readb(port->membase + UART010_IIR);
         if (status) {
                 do {
                         if (status & (UART010_IIR_RTIS | UART010_IIR_RIS))
@@ -283,7 +253,7 @@ static irqreturn_t pl010_int(int irq, void *dev_id, struct pt_regs *regs)
                         if (pass_counter-- == 0)
                                 break;
 
-                        status = UART_GET_INT_STATUS(port);
+                        status = readb(port->membase + UART010_IIR);
                 } while (status & (UART010_IIR_RTIS | UART010_IIR_RIS |
                                    UART010_IIR_TIS));
                 handled = 1;
@@ -296,7 +266,7 @@ static irqreturn_t pl010_int(int irq, void *dev_id, struct pt_regs *regs)
 
 static unsigned int pl010_tx_empty(struct uart_port *port)
 {
-        return UART_GET_FR(port) & UART01x_FR_BUSY ? 0 : TIOCSER_TEMT;
+        return readb(port->membase + UART01x_FR) & UART01x_FR_BUSY ? 0 : TIOCSER_TEMT;
 }
 
 static unsigned int pl010_get_mctrl(struct uart_port *port)
@@ -304,7 +274,7 @@ static unsigned int pl010_get_mctrl(struct uart_port *port)
         unsigned int result = 0;
         unsigned int status;
 
-        status = UART_GET_FR(port);
+        status = readb(port->membase + UART01x_FR);
         if (status & UART01x_FR_DCD)
                 result |= TIOCM_CAR;
         if (status & UART01x_FR_DSR)
@@ -318,20 +288,9 @@ static unsigned int pl010_get_mctrl(struct uart_port *port)
 static void pl010_set_mctrl(struct uart_port *port, unsigned int mctrl)
 {
         struct uart_amba_port *uap = (struct uart_amba_port *)port;
-        unsigned int ctrls = 0, ctrlc = 0;
-
-        if (mctrl & TIOCM_RTS)
-                ctrlc |= uap->rts_mask;
-        else
-                ctrls |= uap->rts_mask;
-
-        if (mctrl & TIOCM_DTR)
-                ctrlc |= uap->dtr_mask;
-        else
-                ctrls |= uap->dtr_mask;
 
-        __raw_writel(ctrls, SC_CTRLS);
-        __raw_writel(ctrlc, SC_CTRLC);
+        if (uap->data)
+                uap->data->set_mctrl(uap->dev, uap->port.membase, mctrl);
 }
 
 static void pl010_break_ctl(struct uart_port *port, int break_state)
@@ -340,12 +299,12 @@ static void pl010_break_ctl(struct uart_port *port, int break_state)
         unsigned int lcr_h;
 
         spin_lock_irqsave(&port->lock, flags);
-        lcr_h = UART_GET_LCRH(port);
+        lcr_h = readb(port->membase + UART010_LCRH);
         if (break_state == -1)
                 lcr_h |= UART01x_LCRH_BRK;
         else
                 lcr_h &= ~UART01x_LCRH_BRK;
-        UART_PUT_LCRH(port, lcr_h);
+        writel(lcr_h, port->membase + UART010_LCRH);
         spin_unlock_irqrestore(&port->lock, flags);
 }
 
@@ -364,13 +323,13 @@ static int pl010_startup(struct uart_port *port)
         /*
          * initialise the old status of the modem signals
          */
-        uap->old_status = UART_GET_FR(port) & UART01x_FR_MODEM_ANY;
+        uap->old_status = readb(port->membase + UART01x_FR) & UART01x_FR_MODEM_ANY;
 
         /*
          * Finally, enable interrupts
          */
-        UART_PUT_CR(port, UART01x_CR_UARTEN | UART010_CR_RIE |
-                          UART010_CR_RTIE);
+        writel(UART01x_CR_UARTEN | UART010_CR_RIE | UART010_CR_RTIE,
+               port->membase + UART010_CR);
 
         return 0;
 }
@@ -385,11 +344,12 @@ static void pl010_shutdown(struct uart_port *port)
         /*
          * disable all interrupts, disable the port
          */
-        UART_PUT_CR(port, 0);
+        writel(0, port->membase + UART010_CR);
 
         /* disable break condition and fifos */
-        UART_PUT_LCRH(port, UART_GET_LCRH(port) &
-                ~(UART01x_LCRH_BRK | UART01x_LCRH_FEN));
+        writel(readb(port->membase + UART010_LCRH) &
+                ~(UART01x_LCRH_BRK | UART01x_LCRH_FEN),
+               port->membase + UART010_LCRH);
 }
 
 static void
@@ -466,25 +426,25 @@ pl010_set_termios(struct uart_port *port, struct termios *termios,
                 port->ignore_status_mask |= UART_DUMMY_RSR_RX;
 
         /* first, disable everything */
-        old_cr = UART_GET_CR(port) & ~UART010_CR_MSIE;
+        old_cr = readb(port->membase + UART010_CR) & ~UART010_CR_MSIE;
 
         if (UART_ENABLE_MS(port, termios->c_cflag))
                 old_cr |= UART010_CR_MSIE;
 
-        UART_PUT_CR(port, 0);
+        writel(0, port->membase + UART010_CR);
 
         /* Set baud rate */
         quot -= 1;
-        UART_PUT_LCRM(port, ((quot & 0xf00) >> 8));
-        UART_PUT_LCRL(port, (quot & 0xff));
+        writel((quot & 0xf00) >> 8, port->membase + UART010_LCRM);
+        writel(quot & 0xff, port->membase + UART010_LCRL);
 
         /*
          * ----------v----------v----------v----------v-----
          * NOTE: MUST BE WRITTEN AFTER UARTLCR_M & UARTLCR_L
          * ----------^----------^----------^----------^-----
          */
-        UART_PUT_LCRH(port, lcr_h);
-        UART_PUT_CR(port, old_cr);
+        writel(lcr_h, port->membase + UART010_LCRH);
+        writel(old_cr, port->membase + UART010_CR);
 
         spin_unlock_irqrestore(&port->lock, flags);
 }
@@ -556,59 +516,32 @@ static struct uart_ops amba_pl010_pops = {
         .verify_port    = pl010_verify_port,
 };
 
-static struct uart_amba_port amba_ports[UART_NR] = {
-        {
-                .port   = {
-                        .membase        = (void *)IO_ADDRESS(INTEGRATOR_UART0_BASE),
-                        .mapbase        = INTEGRATOR_UART0_BASE,
-                        .iotype         = UPIO_MEM,
-                        .irq            = IRQ_UARTINT0,
-                        .uartclk        = 14745600,
-                        .fifosize       = 16,
-                        .ops            = &amba_pl010_pops,
-                        .flags          = UPF_BOOT_AUTOCONF,
-                        .line           = 0,
-                },
-                .dtr_mask       = 1 << 5,
-                .rts_mask       = 1 << 4,
-        },
-        {
-                .port   = {
-                        .membase        = (void *)IO_ADDRESS(INTEGRATOR_UART1_BASE),
-                        .mapbase        = INTEGRATOR_UART1_BASE,
-                        .iotype         = UPIO_MEM,
-                        .irq            = IRQ_UARTINT1,
-                        .uartclk        = 14745600,
-                        .fifosize       = 16,
-                        .ops            = &amba_pl010_pops,
-                        .flags          = UPF_BOOT_AUTOCONF,
-                        .line           = 1,
-                },
-                .dtr_mask       = 1 << 7,
-                .rts_mask       = 1 << 6,
-        }
-};
+static struct uart_amba_port *amba_ports[UART_NR];
 
 #ifdef CONFIG_SERIAL_AMBA_PL010_CONSOLE
 
 static void pl010_console_putchar(struct uart_port *port, int ch)
 {
-        while (!UART_TX_READY(UART_GET_FR(port)))
+        unsigned int status;
+
+        do {
+                status = readb(port->membase + UART01x_FR);
                 barrier();
-        UART_PUT_CHAR(port, ch);
+        } while (!UART_TX_READY(status));
+        writel(ch, port->membase + UART01x_DR);
 }
 
 static void
 pl010_console_write(struct console *co, const char *s, unsigned int count)
 {
-        struct uart_port *port = &amba_ports[co->index].port;
+        struct uart_port *port = &amba_ports[co->index]->port;
         unsigned int status, old_cr;
 
         /*
          *      First save the CR then disable the interrupts
          */
-        old_cr = UART_GET_CR(port);
-        UART_PUT_CR(port, UART01x_CR_UARTEN);
+        old_cr = readb(port->membase + UART010_CR);
+        writel(UART01x_CR_UARTEN, port->membase + UART010_CR);
 
         uart_console_write(port, s, count, pl010_console_putchar);
 
@@ -617,18 +550,19 @@ pl010_console_write(struct console *co, const char *s, unsigned int count)
          *      and restore the TCR
          */
         do {
-                status = UART_GET_FR(port);
+                status = readb(port->membase + UART01x_FR);
+                barrier();
         } while (status & UART01x_FR_BUSY);
-        UART_PUT_CR(port, old_cr);
+        writel(old_cr, port->membase + UART010_CR);
 }
 
 static void __init
 pl010_console_get_options(struct uart_port *port, int *baud,
                              int *parity, int *bits)
 {
-        if (UART_GET_CR(port) & UART01x_CR_UARTEN) {
+        if (readb(port->membase + UART010_CR) & UART01x_CR_UARTEN) {
                 unsigned int lcr_h, quot;
-                lcr_h = UART_GET_LCRH(port);
+                lcr_h = readb(port->membase + UART010_LCRH);
 
                 *parity = 'n';
                 if (lcr_h & UART01x_LCRH_PEN) {
@@ -643,7 +577,7 @@ pl010_console_get_options(struct uart_port *port, int *baud,
                 else
                         *bits = 8;
 
-                quot = UART_GET_LCRL(port) | UART_GET_LCRM(port) << 8;
+                quot = readb(port->membase + UART010_LCRL) | readb(port->membase + UART010_LCRM) << 8;
                 *baud = port->uartclk / (16 * (quot + 1));
         }
 }
@@ -663,7 +597,7 @@ static int __init pl010_console_setup(struct console *co, char *options)
          */
         if (co->index >= UART_NR)
                 co->index = 0;
-        port = &amba_ports[co->index].port;
+        port = &amba_ports[co->index]->port;
 
         if (options)
                 uart_parse_options(options, &baud, &parity, &bits, &flow);
@@ -684,24 +618,6 @@ static struct console amba_console = {
         .data           = &amba_reg,
 };
 
-static int __init amba_console_init(void)
-{
-        /*
-         * All port initializations are done statically
-         */
-        register_console(&amba_console);
-        return 0;
-}
-console_initcall(amba_console_init);
-
-static int __init amba_late_console_init(void)
-{
-        if (!(amba_console.flags & CON_ENABLED))
-                register_console(&amba_console);
-        return 0;
-}
-late_initcall(amba_late_console_init);
-
 #define AMBA_CONSOLE    &amba_console
 #else
 #define AMBA_CONSOLE    NULL
@@ -719,30 +635,76 @@ static struct uart_driver amba_reg = {
 
 static int pl010_probe(struct amba_device *dev, void *id)
 {
-        int i;
+        struct uart_amba_port *port;
+        void __iomem *base;
+        int i, ret;
 
-        for (i = 0; i < UART_NR; i++) {
-                if (amba_ports[i].port.mapbase != dev->res.start)
-                        continue;
+        for (i = 0; i < ARRAY_SIZE(amba_ports); i++)
+                if (amba_ports[i] == NULL)
+                        break;
 
-                amba_ports[i].port.dev = &dev->dev;
-                uart_add_one_port(&amba_reg, &amba_ports[i].port);
-                amba_set_drvdata(dev, &amba_ports[i]);
-                break;
+        if (i == ARRAY_SIZE(amba_ports)) {
+                ret = -EBUSY;
+                goto out;
         }
 
-        return 0;
+        port = kzalloc(sizeof(struct uart_amba_port), GFP_KERNEL);
+        if (!port) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        base = ioremap(dev->res.start, PAGE_SIZE);
+        if (!base) {
+                ret = -ENOMEM;
+                goto free;
+        }
+
+        port->port.dev = &dev->dev;
+        port->port.mapbase = dev->res.start;
+        port->port.membase = base;
+        port->port.iotype = UPIO_MEM;
+        port->port.irq = dev->irq[0];
+        port->port.uartclk = 14745600;
+        port->port.fifosize = 16;
+        port->port.ops = &amba_pl010_pops;
+        port->port.flags = UPF_BOOT_AUTOCONF;
+        port->port.line = i;
+        port->dev = dev;
+        port->data = dev->dev.platform_data;
+
+        amba_ports[i] = port;
+
+        amba_set_drvdata(dev, port);
+        ret = uart_add_one_port(&amba_reg, &port->port);
+        if (ret) {
+                amba_set_drvdata(dev, NULL);
+                amba_ports[i] = NULL;
+                iounmap(base);
+ free:
+                kfree(port);
+        }
+
+ out:
+        return ret;
 }
 
 static int pl010_remove(struct amba_device *dev)
 {
-        struct uart_amba_port *uap = amba_get_drvdata(dev);
-
-        if (uap)
-                uart_remove_one_port(&amba_reg, &uap->port);
+        struct uart_amba_port *port = amba_get_drvdata(dev);
+        int i;
 
         amba_set_drvdata(dev, NULL);
 
+        uart_remove_one_port(&amba_reg, &port->port);
+
+        for (i = 0; i < ARRAY_SIZE(amba_ports); i++)
+                if (amba_ports[i] == port)
+                        amba_ports[i] = NULL;
+
+        iounmap(port->port.membase);
+        kfree(port);
+
         return 0;
 }
 
diff --git a/drivers/serial/au1x00_uart.c b/drivers/serial/au1x00_uart.c
deleted file mode 100644
index 948880ac58..0000000000
--- a/drivers/serial/au1x00_uart.c
+++ /dev/null
@@ -1,1287 +0,0 @@
-/*
- *  Driver for 8250/16550-type serial ports
- *
- *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
- *
- *  Copyright (C) 2001 Russell King.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * A note about mapbase / membase
- *
- *  mapbase is the physical address of the IO port.  Currently, we don't
- *  support this very well, and it may well be dropped from this driver
- *  in future.  As such, mapbase should be NULL.
- *
- *  membase is an 'ioremapped' cookie.  This is compatible with the old
- *  serial.c driver, and is currently the preferred form.
- */
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/tty.h>
-#include <linux/ioport.h>
-#include <linux/init.h>
-#include <linux/console.h>
-#include <linux/sysrq.h>
-#include <linux/serial.h>
-#include <linux/serialP.h>
-#include <linux/delay.h>
-
-#include <asm/serial.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/mach-au1x00/au1000.h>
-
-#if defined(CONFIG_SERIAL_AU1X00_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
-#include <linux/serial_core.h>
-#include "8250.h"
-
-/*
- * Debugging.
- */
-#if 0
-#define DEBUG_AUTOCONF(fmt...)  printk(fmt)
-#else
-#define DEBUG_AUTOCONF(fmt...)  do { } while (0)
-#endif
-
-#if 0
-#define DEBUG_INTR(fmt...)      printk(fmt)
-#else
-#define DEBUG_INTR(fmt...)      do { } while (0)
-#endif
-
-#define PASS_LIMIT      256
-
-/*
- * We default to IRQ0 for the "no irq" hack.   Some
- * machine types want others as well - they're free
- * to redefine this in their header file.
- */
-#define is_real_interrupt(irq)  ((irq) != 0)
-
-static struct old_serial_port old_serial_port[] = {
-        {       .baud_base = 0,
-                .iomem_base = (u8 *)UART0_ADDR,
-                .irq = AU1000_UART0_INT,
-                .flags = STD_COM_FLAGS,
-                .iomem_reg_shift = 2,
-        }, {
-                .baud_base = 0,
-                .iomem_base = (u8 *)UART1_ADDR,
-                .irq = AU1000_UART1_INT,
-                .flags = STD_COM_FLAGS,
-                .iomem_reg_shift = 2
-        }, {
-                .baud_base = 0,
-                .iomem_base = (u8 *)UART2_ADDR,
-                .irq = AU1000_UART2_INT,
-                .flags = STD_COM_FLAGS,
-                .iomem_reg_shift = 2
-        }, {
-                .baud_base = 0,
-                .iomem_base = (u8 *)UART3_ADDR,
-                .irq = AU1000_UART3_INT,
-                .flags = STD_COM_FLAGS,
-                .iomem_reg_shift = 2
-        }
-};
-
-#define UART_NR ARRAY_SIZE(old_serial_port)
-
-struct uart_8250_port {
-        struct uart_port        port;
-        struct timer_list       timer;          /* "no irq" timer */
-        struct list_head        list;           /* ports on this IRQ */
-        unsigned short          rev;
-        unsigned char           acr;
-        unsigned char           ier;
-        unsigned char           lcr;
-        unsigned char           mcr_mask;       /* mask of user bits */
-        unsigned char           mcr_force;      /* mask of forced bits */
-        unsigned char           lsr_break_flag;
-
-        /*
-         * We provide a per-port pm hook.
-         */
-        void                    (*pm)(struct uart_port *port,
-                                      unsigned int state, unsigned int old);
-};
-
-struct irq_info {
-        spinlock_t              lock;
-        struct list_head        *head;
-};
-
-static struct irq_info irq_lists[NR_IRQS];
-
-/*
- * Here we define the default xmit fifo size used for each type of UART.
- */
-static const struct serial_uart_config uart_config[PORT_MAX_8250+1] = {
-        { "unknown",    1,      0 },
-        { "8250",       1,      0 },
-        { "16450",      1,      0 },
-        { "16550",      1,      0 },
-        /* PORT_16550A */
-        { "AU1X00_UART",16,     UART_CLEAR_FIFO | UART_USE_FIFO },
-};
-
-static unsigned int serial_in(struct uart_8250_port *up, int offset)
-{
-        return au_readl((unsigned long)up->port.membase + offset);
-}
-
-static void serial_out(struct uart_8250_port *up, int offset, int value)
-{
-        au_writel(value, (unsigned long)up->port.membase + offset);
-}
-
-#define serial_inp(up, offset)          serial_in(up, offset)
-#define serial_outp(up, offset, value)  serial_out(up, offset, value)
-
-/*
- * This routine is called by rs_init() to initialize a specific serial
- * port.  It determines what type of UART chip this serial port is
- * using: 8250, 16450, 16550, 16550A.  The important question is
- * whether or not this UART is a 16550A or not, since this will
- * determine whether or not we can use its FIFO features or not.
- */
-static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
-{
-        unsigned char save_lcr, save_mcr;
-        unsigned long flags;
-
-        if (!up->port.iobase && !up->port.mapbase && !up->port.membase)
-                return;
-
-        DEBUG_AUTOCONF("ttyS%d: autoconf (0x%04x, 0x%08lx): ",
-                        up->port.line, up->port.iobase, up->port.membase);
-
-        /*
-         * We really do need global IRQs disabled here - we're going to
-         * be frobbing the chips IRQ enable register to see if it exists.
-         */
-        spin_lock_irqsave(&up->port.lock, flags);
-//      save_flags(flags); cli();
-
-        save_mcr = serial_in(up, UART_MCR);
-        save_lcr = serial_in(up, UART_LCR);
-
-        up->port.type = PORT_16550A;
-        serial_outp(up, UART_LCR, save_lcr);
-
-        up->port.fifosize = uart_config[up->port.type].dfl_xmit_fifo_size;
-
-        if (up->port.type == PORT_UNKNOWN)
-                goto out;
-
-        /*
-         * Reset the UART.
-         */
-        serial_outp(up, UART_MCR, save_mcr);
-        serial_outp(up, UART_FCR, (UART_FCR_ENABLE_FIFO |
-                                     UART_FCR_CLEAR_RCVR |
-                                     UART_FCR_CLEAR_XMIT));
-        serial_outp(up, UART_FCR, 0);
-        (void)serial_in(up, UART_RX);
-        serial_outp(up, UART_IER, 0);
-
- out:   
-        spin_unlock_irqrestore(&up->port.lock, flags);
-//      restore_flags(flags);
-        DEBUG_AUTOCONF("type=%s\n", uart_config[up->port.type].name);
-}
-
-static void serial8250_stop_tx(struct uart_port *port)
-{
-        struct uart_8250_port *up = (struct uart_8250_port *)port;
-
-        if (up->ier & UART_IER_THRI) {
-                up->ier &= ~UART_IER_THRI;
-                serial_out(up, UART_IER, up->ier);
-        }
-}
-
-static void serial8250_start_tx(struct uart_port *port)
-{
-        struct uart_8250_port *up = (struct uart_8250_port *)port;
-
-        if (!(up->ier & UART_IER_THRI)) {
-                up->ier |= UART_IER_THRI;
-                serial_out(up, UART_IER, up->ier);
-        }
-}
-
-static void serial8250_stop_rx(struct uart_port *port)
-{
-        struct uart_8250_port *up = (struct uart_8250_port *)port;
-
-        up->ier &= ~UART_IER_RLSI;
-        up->port.read_status_mask &= ~UART_LSR_DR;
-        serial_out(up, UART_IER, up->ier);
-}
-
-static void serial8250_enable_ms(struct uart_port *port)
-{
-        struct uart_8250_port *up = (struct uart_8250_port *)port;
-
-        up->ier |= UART_IER_MSI;
-        serial_out(up, UART_IER, up->ier);
-}
-
-static void
-receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs)
-{
-        struct tty_struct *tty = up->port.info->tty;
-        unsigned char ch, flag;
-        int max_count = 256;
-
-        do {
-                ch = serial_inp(up, UART_RX);
-                flag = TTY_NORMAL;
-                up->port.icount.rx++;
-
-                if (unlikely(*status & (UART_LSR_BI | UART_LSR_PE |
-                                       UART_LSR_FE | UART_LSR_OE))) {
-                        /*
-                         * For statistics only
-                         */
-                        if (*status & UART_LSR_BI) {
-                                *status &= ~(UART_LSR_FE | UART_LSR_PE);
-                                up->port.icount.brk++;
-                                /*
-                                 * We do the SysRQ and SAK checking
-                                 * here because otherwise the break
-                                 * may get masked by ignore_status_mask
-                                 * or read_status_mask.
-                                 */
-                                if (uart_handle_break(&up->port))
-                                        goto ignore_char;
-                        } else if (*status & UART_LSR_PE)
-                                up->port.icount.parity++;
-                        else if (*status & UART_LSR_FE)
-                                up->port.icount.frame++;
-                        if (*status & UART_LSR_OE)
-                                up->port.icount.overrun++;
-
-                        /*
-                         * Mask off conditions which should be ingored.
-                         */
-                        *status &= up->port.read_status_mask;
-
-#ifdef CONFIG_SERIAL_AU1X00_CONSOLE
-                        if (up->port.line == up->port.cons->index) {
-                                /* Recover the break flag from console xmit */
-                                *status |= up->lsr_break_flag;
-                                up->lsr_break_flag = 0;
-                        }
-#endif
-                        if (*status & UART_LSR_BI) {
-                                DEBUG_INTR("handling break....");
-                                flag = TTY_BREAK;
-                        } else if (*status & UART_LSR_PE)
-                                flag = TTY_PARITY;
-                        else if (*status & UART_LSR_FE)
-                                flag = TTY_FRAME;
-                }
-                if (uart_handle_sysrq_char(&up->port, ch, regs))
-                        goto ignore_char;
-                if ((*status & up->port.ignore_status_mask) == 0)
-                        tty_insert_flip_char(tty, ch, flag);
-                if (*status & UART_LSR_OE)
-                        /*
-                         * Overrun is special, since it's reported
-                         * immediately, and doesn't affect the current
-                         * character.
-                         */
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
-                }
-        ignore_char:
-                *status = serial_inp(up, UART_LSR);
-        } while ((*status & UART_LSR_DR) && (max_count-- > 0));
-        spin_unlock(&up->port.lock);
-        tty_flip_buffer_push(tty);
-        spin_lock(&up->port.lock);
-}
-
-static void transmit_chars(struct uart_8250_port *up)
-{
-        struct circ_buf *xmit = &up->port.info->xmit;
-        int count;
-
-        if (up->port.x_char) {
-                serial_outp(up, UART_TX, up->port.x_char);
-                up->port.icount.tx++;
-                up->port.x_char = 0;
-                return;
-        }
-        if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) {
-                serial8250_stop_tx(&up->port);
-                return;
-        }
-
-        count = up->port.fifosize;
-        do {
-                serial_out(up, UART_TX, xmit->buf[xmit->tail]);
-                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-                up->port.icount.tx++;
-                if (uart_circ_empty(xmit))
-                        break;
-        } while (--count > 0);
-
-        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-                uart_write_wakeup(&up->port);
-
-        DEBUG_INTR("THRE...");
-
-        if (uart_circ_empty(xmit))
-                serial8250_stop_tx(&up->port);
-}
-
-static void check_modem_status(struct uart_8250_port *up)
-{
-        int status;
-
-        status = serial_in(up, UART_MSR);
-
-        if ((status & UART_MSR_ANY_DELTA) == 0)
-                return;
-
-        if (status & UART_MSR_TERI)
-                up->port.icount.rng++;
-        if (status & UART_MSR_DDSR)
-                up->port.icount.dsr++;
-        if (status & UART_MSR_DDCD)
-                uart_handle_dcd_change(&up->port, status & UART_MSR_DCD);
-        if (status & UART_MSR_DCTS)
-                uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
-
-        wake_up_interruptible(&up->port.info->delta_msr_wait);
-}
-
-/*
- * This handles the interrupt from one port.
- */
-static inline void
-serial8250_handle_port(struct uart_8250_port *up, struct pt_regs *regs)
-{
-        unsigned int status = serial_inp(up, UART_LSR);
-
-        DEBUG_INTR("status = %x...", status);
-
-        if (status & UART_LSR_DR)
-                receive_chars(up, &status, regs);
-        check_modem_status(up);
-        if (status & UART_LSR_THRE)
-                transmit_chars(up);
-}
-
-/*
- * This is the serial driver's interrupt routine.
- *
- * Arjan thinks the old way was overly complex, so it got simplified.
- * Alan disagrees, saying that need the complexity to handle the weird
- * nature of ISA shared interrupts.  (This is a special exception.)
- *
- * In order to handle ISA shared interrupts properly, we need to check
- * that all ports have been serviced, and therefore the ISA interrupt
- * line has been de-asserted.
- *
- * This means we need to loop through all ports. checking that they
- * don't have an interrupt pending.
- */
-static irqreturn_t serial8250_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-        struct irq_info *i = dev_id;
-        struct list_head *l, *end = NULL;
-        int pass_counter = 0;
-
-        DEBUG_INTR("serial8250_interrupt(%d)...", irq);
-
-        spin_lock(&i->lock);
-
-        l = i->head;
-        do {
-                struct uart_8250_port *up;
-                unsigned int iir;
-
-                up = list_entry(l, struct uart_8250_port, list);
-
-                iir = serial_in(up, UART_IIR);
-                if (!(iir & UART_IIR_NO_INT)) {
-                        spin_lock(&up->port.lock);
-                        serial8250_handle_port(up, regs);
-                        spin_unlock(&up->port.lock);
-
-                        end = NULL;
-                } else if (end == NULL)
-                        end = l;
-
-                l = l->next;
-
-                if (l == i->head && pass_counter++ > PASS_LIMIT) {
-                        /* If we hit this, we're dead. */
-                        printk(KERN_ERR "serial8250: too much work for "
-                                "irq%d\n", irq);
-                        break;
-                }
-        } while (l != end);
-
-        spin_unlock(&i->lock);
-
-        DEBUG_INTR("end.\n");
-        /* FIXME! Was it really ours? */
-        return IRQ_HANDLED;
-}
-
-/*
- * To support ISA shared interrupts, we need to have one interrupt
- * handler that ensures that the IRQ line has been deasserted
- * before returning.  Failing to do this will result in the IRQ
- * line being stuck active, and, since ISA irqs are edge triggered,
- * no more IRQs will be seen.
- */
-static void serial_do_unlink(struct irq_info *i, struct uart_8250_port *up)
-{
-        spin_lock_irq(&i->lock);
-
-        if (!list_empty(i->head)) {
-                if (i->head == &up->list)
-                        i->head = i->head->next;
-                list_del(&up->list);
-        } else {
-                BUG_ON(i->head != &up->list);
-                i->head = NULL;
-        }
-
-        spin_unlock_irq(&i->lock);
-}
-
-static int serial_link_irq_chain(struct uart_8250_port *up)
-{
-        struct irq_info *i = irq_lists + up->port.irq;
-        int ret, irq_flags = up->port.flags & UPF_SHARE_IRQ ? SA_SHIRQ : 0;
-
-        spin_lock_irq(&i->lock);
-
-        if (i->head) {
-                list_add(&up->list, i->head);
-                spin_unlock_irq(&i->lock);
-
-                ret = 0;
-        } else {
-                INIT_LIST_HEAD(&up->list);
-                i->head = &up->list;
-                spin_unlock_irq(&i->lock);
-
-                ret = request_irq(up->port.irq, serial8250_interrupt,
-                                  irq_flags, "serial", i);
-                if (ret < 0)
-                        serial_do_unlink(i, up);
-        }
-
-        return ret;
-}
-
-static void serial_unlink_irq_chain(struct uart_8250_port *up)
-{
-        struct irq_info *i = irq_lists + up->port.irq;
-
-        BUG_ON(i->head == NULL);
-
-        if (list_empty(i->head))
-                free_irq(up->port.irq, i);
-
-        serial_do_unlink(i, up);
-}
-
-/*
- * This function is used to handle ports that do not have an
- * interrupt.  This doesn't work very well for 16450's, but gives
- * barely passable results for a 16550A.  (Although at the expense
- * of much CPU overhead).
- */
-static void serial8250_timeout(unsigned long data)
-{
-        struct uart_8250_port *up = (struct uart_8250_port *)data;
-        unsigned int timeout;
-        unsigned int iir;
-
-        iir = serial_in(up, UART_IIR);
-        if (!(iir & UART_IIR_NO_INT)) {
-                spin_lock(&up->port.lock);
-                serial8250_handle_port(up, NULL);
-                spin_unlock(&up->port.lock);
-        }
-
-        timeout = up->port.timeout;
-        timeout = timeout > 6 ? (timeout / 2 - 2) : 1;
-        mod_timer(&up->timer, jiffies + timeout);
-}
-
-static unsigned int serial8250_tx_empty(struct uart_port *port)
-{
-        struct uart_8250_port *up = (struct uart_8250_port *)port;
-        unsigned long flags;
-        unsigned int ret;
-
-        spin_lock_irqsave(&up->port.lock, flags);
-        ret = serial_in(up, UART_LSR) & UART_LSR_TEMT ? TIOCSER_TEMT : 0;
-        spin_unlock_irqrestore(&up->port.lock, flags);
-
-        return ret;
-}
-
-static unsigned int serial8250_get_mctrl(struct uart_port *port)
-{
-        struct uart_8250_port *up = (struct uart_8250_port *)port;
-        unsigned char status;
-        unsigned int ret;
-
-        status = serial_in(up, UART_MSR);
-
-        ret = 0;
-        if (status & UART_MSR_DCD)
-                ret |= TIOCM_CAR;
-        if (status & UART_MSR_RI)
-                ret |= TIOCM_RNG;
-        if (status & UART_MSR_DSR)
-                ret |= TIOCM_DSR;
-        if (status & UART_MSR_CTS)
-                ret |= TIOCM_CTS;
-        return ret;
-}
-
-static void serial8250_set_mctrl(struct uart_port *port, unsigned int mctrl)
-{
-        struct uart_8250_port *up = (struct uart_8250_port *)port;
-        unsigned char mcr = 0;
-
-        if (mctrl & TIOCM_RTS)
-                mcr |= UART_MCR_RTS;
-        if (mctrl & TIOCM_DTR)
-                mcr |= UART_MCR_DTR;
-        if (mctrl & TIOCM_OUT1)
-                mcr |= UART_MCR_OUT1;
-        if (mctrl & TIOCM_OUT2)
-                mcr |= UART_MCR_OUT2;
-        if (mctrl & TIOCM_LOOP)
-                mcr |= UART_MCR_LOOP;
-
-        mcr = (mcr & up->mcr_mask) | up->mcr_force;
-
-        serial_out(up, UART_MCR, mcr);
-}
-
-static void serial8250_break_ctl(struct uart_port *port, int break_state)
-{
-        struct uart_8250_port *up = (struct uart_8250_port *)port;
-        unsigned long flags;
-
-        spin_lock_irqsave(&up->port.lock, flags);
-        if (break_state == -1)
-                up->lcr |= UART_LCR_SBC;
-        else
-                up->lcr &= ~UART_LCR_SBC;
-        serial_out(up, UART_LCR, up->lcr);
-        spin_unlock_irqrestore(&up->port.lock, flags);
-}
-
-static int serial8250_startup(struct uart_port *port)
-{
-        struct uart_8250_port *up = (struct uart_8250_port *)port;
-        unsigned long flags;
-        int retval;
-
-        /*
-         * Clear the FIFO buffers and disable them.
-         * (they will be reeanbled in set_termios())
-         */
-        if (uart_config[up->port.type].flags & UART_CLEAR_FIFO) {
-                serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
-                serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO |
-                                UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT);
-                serial_outp(up, UART_FCR, 0);
-        }
-
-        /*
-         * Clear the interrupt registers.
-         */
-        (void) serial_inp(up, UART_LSR);
-        (void) serial_inp(up, UART_RX);
-        (void) serial_inp(up, UART_IIR);
-        (void) serial_inp(up, UART_MSR);
-
-        /*
-         * At this point, there's no way the LSR could still be 0xff;
-         * if it is, then bail out, because there's likely no UART
-         * here.
-         */
-        if (!(up->port.flags & UPF_BUGGY_UART) &&
-            (serial_inp(up, UART_LSR) == 0xff)) {
-                printk("ttyS%d: LSR safety check engaged!\n", up->port.line);
-                return -ENODEV;
-        }
-
-        retval = serial_link_irq_chain(up);
-                if (retval)
-                        return retval;
-
-        /*
-         * Now, initialize the UART
-         */
-        serial_outp(up, UART_LCR, UART_LCR_WLEN8);
-
-        spin_lock_irqsave(&up->port.lock, flags);
-        if (up->port.flags & UPF_FOURPORT) {
-                if (!is_real_interrupt(up->port.irq))
-                        up->port.mctrl |= TIOCM_OUT1;
-        } else
-                /*
-                 * Most PC uarts need OUT2 raised to enable interrupts.
-                 */
-                if (is_real_interrupt(up->port.irq))
-                        up->port.mctrl |= TIOCM_OUT2;
-
-        serial8250_set_mctrl(&up->port, up->port.mctrl);
-        spin_unlock_irqrestore(&up->port.lock, flags);
-
-        /*
-         * Finally, enable interrupts.  Note: Modem status interrupts
-         * are set via set_termios(), which will be occurring imminently
-         * anyway, so we don't enable them here.
-         */
-        up->ier = UART_IER_RLSI | UART_IER_RDI;
-        serial_outp(up, UART_IER, up->ier);
-
-        if (up->port.flags & UPF_FOURPORT) {
-                unsigned int icp;
-                /*
-                 * Enable interrupts on the AST Fourport board
-                 */
-                icp = (up->port.iobase & 0xfe0) | 0x01f;
-                outb_p(0x80, icp);
-                (void) inb_p(icp);
-        }
-
-        /*
-         * And clear the interrupt registers again for luck.
-         */
-        (void) serial_inp(up, UART_LSR);
-        (void) serial_inp(up, UART_RX);
-        (void) serial_inp(up, UART_IIR);
-        (void) serial_inp(up, UART_MSR);
-
-        return 0;
-}
-
-static void serial8250_shutdown(struct uart_port *port)
-{
-        struct uart_8250_port *up = (struct uart_8250_port *)port;
-        unsigned long flags;
-
-        /*
-         * Disable interrupts from this port
-         */
-        up->ier = 0;
-        serial_outp(up, UART_IER, 0);
-
-        spin_lock_irqsave(&up->port.lock, flags);
-        if (up->port.flags & UPF_FOURPORT) {
-                /* reset interrupts on the AST Fourport board */
-                inb((up->port.iobase & 0xfe0) | 0x1f);
-                up->port.mctrl |= TIOCM_OUT1;
-        } else
-                up->port.mctrl &= ~TIOCM_OUT2;
-
-        serial8250_set_mctrl(&up->port, up->port.mctrl);
-        spin_unlock_irqrestore(&up->port.lock, flags);
-
-        /*
-         * Disable break condition and FIFOs
-         */
-        serial_out(up, UART_LCR, serial_inp(up, UART_LCR) & ~UART_LCR_SBC);
-        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO |
-                                  UART_FCR_CLEAR_RCVR |
-                                  UART_FCR_CLEAR_XMIT);
-        serial_outp(up, UART_FCR, 0);
-
-        /*
-         * Read data port to reset things, and then unlink from
-         * the IRQ chain.
-         */
-        (void) serial_in(up, UART_RX);
-
-        if (!is_real_interrupt(up->port.irq))
-                del_timer_sync(&up->timer);
-        else
-                serial_unlink_irq_chain(up);
-}
-
-static unsigned int serial8250_get_divisor(struct uart_port *port, unsigned int baud)
-{
-        unsigned int quot;
-
-        /*
-         * Handle magic divisors for baud rates above baud_base on
-         * SMSC SuperIO chips.
-         */
-        if ((port->flags & UPF_MAGIC_MULTIPLIER) &&
-            baud == (port->uartclk/4))
-                quot = 0x8001;
-        else if ((port->flags & UPF_MAGIC_MULTIPLIER) &&
-                 baud == (port->uartclk/8))
-                quot = 0x8002;
-        else
-                quot = uart_get_divisor(port, baud);
-
-        return quot;
-}
-
-static void
-serial8250_set_termios(struct uart_port *port, struct termios *termios,
-                       struct termios *old)
-{
-        struct uart_8250_port *up = (struct uart_8250_port *)port;
-        unsigned char cval, fcr = 0;
-        unsigned long flags;
-        unsigned int baud, quot;
-
-        switch (termios->c_cflag & CSIZE) {
-        case CS5:
-                cval = UART_LCR_WLEN5;
-                break;
-        case CS6:
-                cval = UART_LCR_WLEN6;
-                break;
-        case CS7:
-                cval = UART_LCR_WLEN7;
-                break;
-        default:
-        case CS8:
-                cval = UART_LCR_WLEN8;
-                break;
-        }
-
-        if (termios->c_cflag & CSTOPB)
-                cval |= UART_LCR_STOP;
-        if (termios->c_cflag & PARENB)
-                cval |= UART_LCR_PARITY;
-        if (!(termios->c_cflag & PARODD))
-                cval |= UART_LCR_EPAR;
-#ifdef CMSPAR
-        if (termios->c_cflag & CMSPAR)
-                cval |= UART_LCR_SPAR;
-#endif
-
-        /*
-         * Ask the core to calculate the divisor for us.
-         */
-        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 
-        quot = serial8250_get_divisor(port, baud);
-        quot = 0x35; /* FIXME */
-
-        /*
-         * Work around a bug in the Oxford Semiconductor 952 rev B
-         * chip which causes it to seriously miscalculate baud rates
-         * when DLL is 0.
-         */
-        if ((quot & 0xff) == 0 && up->port.type == PORT_16C950 &&
-            up->rev == 0x5201)
-                quot ++;
-
-        if (uart_config[up->port.type].flags & UART_USE_FIFO) {
-                if (baud < 2400)
-                        fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIGGER_1;
-                else
-                        fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIGGER_8;
-        }
-
-        /*
-         * Ok, we're now changing the port state.  Do it with
-         * interrupts disabled.
-         */
-        spin_lock_irqsave(&up->port.lock, flags);
-
-        /*
-         * Update the per-port timeout.
-         */
-        uart_update_timeout(port, termios->c_cflag, baud);
-
-        up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
-        if (termios->c_iflag & INPCK)
-                up->port.read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (termios->c_iflag & (BRKINT | PARMRK))
-                up->port.read_status_mask |= UART_LSR_BI;
-
-        /*
-         * Characteres to ignore
-         */
-        up->port.ignore_status_mask = 0;
-        if (termios->c_iflag & IGNPAR)
-                up->port.ignore_status_mask |= UART_LSR_PE | UART_LSR_FE;
-        if (termios->c_iflag & IGNBRK) {
-                up->port.ignore_status_mask |= UART_LSR_BI;
-                /*
-                 * If we're ignoring parity and break indicators,
-                 * ignore overruns too (for real raw support).
-                 */
-                if (termios->c_iflag & IGNPAR)
-                        up->port.ignore_status_mask |= UART_LSR_OE;
-        }
-
-        /*
-         * ignore all characters if CREAD is not set
-         */
-        if ((termios->c_cflag & CREAD) == 0)
-                up->port.ignore_status_mask |= UART_LSR_DR;
-
-        /*
-         * CTS flow control flag and modem status interrupts
-         */
-        up->ier &= ~UART_IER_MSI;
-        if (UART_ENABLE_MS(&up->port, termios->c_cflag))
-                up->ier |= UART_IER_MSI;
-
-        serial_out(up, UART_IER, up->ier);
-        serial_outp(up, 0x28, quot & 0xffff);
-        up->lcr = cval;                                 /* Save LCR */
-        if (up->port.type != PORT_16750) {
-                if (fcr & UART_FCR_ENABLE_FIFO) {
-                        /* emulated UARTs (Lucent Venus 167x) need two steps */
-                        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
-                }
-                serial_outp(up, UART_FCR, fcr);         /* set fcr */
-        }
-        spin_unlock_irqrestore(&up->port.lock, flags);
-}
-
-static void
-serial8250_pm(struct uart_port *port, unsigned int state,
-              unsigned int oldstate)
-{
-        struct uart_8250_port *up = (struct uart_8250_port *)port;
-        if (state) {
-                /* sleep */
-                if (up->pm)
-                        up->pm(port, state, oldstate);
-        } else {
-                /* wake */
-                if (up->pm)
-                        up->pm(port, state, oldstate);
-        }
-}
-
-/*
- * Resource handling.  This is complicated by the fact that resources
- * depend on the port type.  Maybe we should be claiming the standard
- * 8250 ports, and then trying to get other resources as necessary?
- */
-static int
-serial8250_request_std_resource(struct uart_8250_port *up, struct resource **res)
-{
-        unsigned int size = 8 << up->port.regshift;
-        int ret = 0;
-
-        switch (up->port.iotype) {
-        case UPIO_MEM:
-                if (up->port.mapbase) {
-                        *res = request_mem_region(up->port.mapbase, size, "serial");
-                        if (!*res)
-                                ret = -EBUSY;
-                }
-                break;
-
-        case UPIO_HUB6:
-        case UPIO_PORT:
-                *res = request_region(up->port.iobase, size, "serial");
-                if (!*res)
-                        ret = -EBUSY;
-                break;
-        }
-        return ret;
-}
-
-
-static void serial8250_release_port(struct uart_port *port)
-{
-        struct uart_8250_port *up = (struct uart_8250_port *)port;
-        unsigned long start, offset = 0, size = 0;
-
-        size <<= up->port.regshift;
-
-        switch (up->port.iotype) {
-        case UPIO_MEM:
-                if (up->port.mapbase) {
-                        /*
-                         * Unmap the area.
-                         */
-                        iounmap(up->port.membase);
-                        up->port.membase = NULL;
-
-                        start = up->port.mapbase;
-
-                        if (size)
-                                release_mem_region(start + offset, size);
-                        release_mem_region(start, 8 << up->port.regshift);
-                }
-                break;
-
-        case UPIO_HUB6:
-        case UPIO_PORT:
-                start = up->port.iobase;
-
-                if (size)
-                        release_region(start + offset, size);
-                release_region(start + offset, 8 << up->port.regshift);
-                break;
-
-        default:
-                break;
-        }
-}
-
-static int serial8250_request_port(struct uart_port *port)
-{
-        struct uart_8250_port *up = (struct uart_8250_port *)port;
-        struct resource *res = NULL, *res_rsa = NULL;
-        int ret = 0;
-
-        ret = serial8250_request_std_resource(up, &res);
-
-        /*
-         * If we have a mapbase, then request that as well.
-         */
-        if (ret == 0 && up->port.flags & UPF_IOREMAP) {
-                int size = res->end - res->start + 1;
-
-                up->port.membase = ioremap(up->port.mapbase, size);
-                if (!up->port.membase)
-                        ret = -ENOMEM;
-        }
-
-        if (ret < 0) {
-                if (res_rsa)
-                        release_resource(res_rsa);
-                if (res)
-                        release_resource(res);
-        }
-        return ret;
-}
-
-static void serial8250_config_port(struct uart_port *port, int flags)
-{
-        struct uart_8250_port *up = (struct uart_8250_port *)port;
-        struct resource *res_std = NULL, *res_rsa = NULL;
-        int probeflags = PROBE_ANY;
-
-        probeflags &= ~PROBE_RSA;
-
-        if (flags & UART_CONFIG_TYPE)
-                autoconfig(up, probeflags);
-
-        /*
-         * If the port wasn't an RSA port, release the resource.
-         */
-        if (up->port.type != PORT_RSA && res_rsa)
-                release_resource(res_rsa);
-
-        if (up->port.type == PORT_UNKNOWN && res_std)
-                release_resource(res_std);
-}
-
-static int
-serial8250_verify_port(struct uart_port *port, struct serial_struct *ser)
-{
-        if (ser->irq >= NR_IRQS || ser->irq < 0 ||
-            ser->baud_base < 9600 || ser->type < PORT_UNKNOWN ||
-            ser->type > PORT_MAX_8250 || ser->type == PORT_CIRRUS ||
-            ser->type == PORT_STARTECH)
-                return -EINVAL;
-        return 0;
-}
-
-static const char *
-serial8250_type(struct uart_port *port)
-{
-        int type = port->type;
-
-        if (type >= ARRAY_SIZE(uart_config))
-                type = 0;
-        return uart_config[type].name;
-}
-
-static struct uart_ops serial8250_pops = {
-        .tx_empty       = serial8250_tx_empty,
-        .set_mctrl      = serial8250_set_mctrl,
-        .get_mctrl      = serial8250_get_mctrl,
-        .stop_tx        = serial8250_stop_tx,
-        .start_tx       = serial8250_start_tx,
-        .stop_rx        = serial8250_stop_rx,
-        .enable_ms      = serial8250_enable_ms,
-        .break_ctl      = serial8250_break_ctl,
-        .startup        = serial8250_startup,
-        .shutdown       = serial8250_shutdown,
-        .set_termios    = serial8250_set_termios,
-        .pm             = serial8250_pm,
-        .type           = serial8250_type,
-        .release_port   = serial8250_release_port,
-        .request_port   = serial8250_request_port,
-        .config_port    = serial8250_config_port,
-        .verify_port    = serial8250_verify_port,
-};
-
-static struct uart_8250_port serial8250_ports[UART_NR];
-
-static void __init serial8250_isa_init_ports(void)
-{
-        struct uart_8250_port *up;
-        static int first = 1;
-        int i;
-
-        if (!first)
-                return;
-        first = 0;
-
-        for (i = 0, up = serial8250_ports; i < ARRAY_SIZE(old_serial_port);
-             i++, up++) {
-                up->port.iobase   = old_serial_port[i].port;
-                up->port.irq      = old_serial_port[i].irq;
-                up->port.uartclk  = get_au1x00_uart_baud_base();
-                up->port.flags    = old_serial_port[i].flags;
-                up->port.hub6     = old_serial_port[i].hub6;
-                up->port.membase  = old_serial_port[i].iomem_base;
-                up->port.iotype   = old_serial_port[i].io_type;
-                up->port.regshift = old_serial_port[i].iomem_reg_shift;
-                up->port.ops      = &serial8250_pops;
-        }
-}
-
-static void __init serial8250_register_ports(struct uart_driver *drv)
-{
-        int i;
-
-        serial8250_isa_init_ports();
-
-        for (i = 0; i < UART_NR; i++) {
-                struct uart_8250_port *up = &serial8250_ports[i];
-
-                up->port.line = i;
-                up->port.ops = &serial8250_pops;
-                init_timer(&up->timer);
-                up->timer.function = serial8250_timeout;
-
-                /*
-                 * ALPHA_KLUDGE_MCR needs to be killed.
-                 */
-                up->mcr_mask = ~ALPHA_KLUDGE_MCR;
-                up->mcr_force = ALPHA_KLUDGE_MCR;
-
-                uart_add_one_port(drv, &up->port);
-        }
-}
-
-#ifdef CONFIG_SERIAL_AU1X00_CONSOLE
-
-#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
-
-/*
- *      Wait for transmitter & holding register to empty
- */
-static inline void wait_for_xmitr(struct uart_8250_port *up)
-{
-        unsigned int status, tmout = 10000;
-
-        /* Wait up to 10ms for the character(s) to be sent. */
-        do {
-                status = serial_in(up, UART_LSR);
-
-                if (status & UART_LSR_BI)
-                        up->lsr_break_flag = UART_LSR_BI;
-
-                if (--tmout == 0)
-                        break;
-                udelay(1);
-        } while ((status & BOTH_EMPTY) != BOTH_EMPTY);
-
-        /* Wait up to 1s for flow control if necessary */
-        if (up->port.flags & UPF_CONS_FLOW) {
-                tmout = 1000000;
-                while (--tmout &&
-                       ((serial_in(up, UART_MSR) & UART_MSR_CTS) == 0))
-                        udelay(1);
-        }
-}
-
-static void au1x00_console_putchar(struct uart_port *port, int ch)
-{
-        struct uart_8250_port *up = (struct uart_8250_port *)port;
-
-        wait_for_xmitr(up);
-        serial_out(up, UART_TX, ch);
-}
-
-/*
- *      Print a string to the serial port trying not to disturb
- *      any possible real use of the port...
- *
- *      The console_lock must be held when we get here.
- */
-static void
-serial8250_console_write(struct console *co, const char *s, unsigned int count)
-{
-        struct uart_8250_port *up = &serial8250_ports[co->index];
-        unsigned int ier;
-
-        /*
-         *      First save the UER then disable the interrupts
-         */
-        ier = serial_in(up, UART_IER);
-        serial_out(up, UART_IER, 0);
-
-        uart_console_write(&up->port, s, count, au1x00_console_putchar);
-
-        /*
-         *      Finally, wait for transmitter to become empty
-         *      and restore the IER
-         */
-        wait_for_xmitr(up);
-        serial_out(up, UART_IER, ier);
-}
-
-static int __init serial8250_console_setup(struct console *co, char *options)
-{
-        struct uart_port *port;
-        int baud = 9600;
-        int bits = 8;
-        int parity = 'n';
-        int flow = 'n';
-
-        /*
-         * Check whether an invalid uart number has been specified, and
-         * if so, search for the first available port that does have
-         * console support.
-         */
-        if (co->index >= UART_NR)
-                co->index = 0;
-        port = &serial8250_ports[co->index].port;
-
-        /*
-         * Temporary fix.
-         */
-        spin_lock_init(&port->lock);
-
-        if (options)
-                uart_parse_options(options, &baud, &parity, &bits, &flow);
-
-        return uart_set_options(port, co, baud, parity, bits, flow);
-}
-
-extern struct uart_driver serial8250_reg;
-static struct console serial8250_console = {
-        .name           = "ttyS",
-        .write          = serial8250_console_write,
-        .device         = uart_console_device,
-        .setup          = serial8250_console_setup,
-        .flags          = CON_PRINTBUFFER,
-        .index          = -1,
-        .data           = &serial8250_reg,
-};
-
-static int __init serial8250_console_init(void)
-{
-        serial8250_isa_init_ports();
-        register_console(&serial8250_console);
-        return 0;
-}
-console_initcall(serial8250_console_init);
-
-#define SERIAL8250_CONSOLE      &serial8250_console
-#else
-#define SERIAL8250_CONSOLE      NULL
-#endif
-
-static struct uart_driver serial8250_reg = {
-        .owner                  = THIS_MODULE,
-        .driver_name            = "serial",
-        .devfs_name             = "tts/",
-        .dev_name               = "ttyS",
-        .major                  = TTY_MAJOR,
-        .minor                  = 64,
-        .nr                     = UART_NR,
-        .cons                   = SERIAL8250_CONSOLE,
-};
-
-int __init early_serial_setup(struct uart_port *port)
-{
-        serial8250_isa_init_ports();
-        serial8250_ports[port->line].port       = *port;
-        serial8250_ports[port->line].port.ops   = &serial8250_pops;
-        return 0;
-}
-
-/**
- *      serial8250_suspend_port - suspend one serial port
- *      @line:  serial line number
- *      @level: the level of port suspension, as per uart_suspend_port
- *
- *      Suspend one serial port.
- */
-void serial8250_suspend_port(int line)
-{
-        uart_suspend_port(&serial8250_reg, &serial8250_ports[line].port);
-}
-
-/**
- *      serial8250_resume_port - resume one serial port
- *      @line:  serial line number
- *      @level: the level of port resumption, as per uart_resume_port
- *
- *      Resume one serial port.
- */
-void serial8250_resume_port(int line)
-{
-        uart_resume_port(&serial8250_reg, &serial8250_ports[line].port);
-}
-
-static int __init serial8250_init(void)
-{
-        int ret, i;
-
-        printk(KERN_INFO "Serial: Au1x00 driver\n");
-
-        for (i = 0; i < NR_IRQS; i++)
-                spin_lock_init(&irq_lists[i].lock);
-
-        ret = uart_register_driver(&serial8250_reg);
-        if (ret >= 0)
-                serial8250_register_ports(&serial8250_reg);
-
-        return ret;
-}
-
-static void __exit serial8250_exit(void)
-{
-        int i;
-
-        for (i = 0; i < UART_NR; i++)
-                uart_remove_one_port(&serial8250_reg, &serial8250_ports[i].port);
-
-        uart_unregister_driver(&serial8250_reg);
-}
-
-module_init(serial8250_init);
-module_exit(serial8250_exit);
-
-EXPORT_SYMBOL(serial8250_suspend_port);
-EXPORT_SYMBOL(serial8250_resume_port);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Au1x00 serial driver\n");
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
index a37579ce6d..c620209d7b 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 2003-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (C) 2003-2006 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
 
@@ -323,9 +323,12 @@ static unsigned int Num_of_ioc4_cards;
 #define IOC4_FIFO_CHARS 255
 
 /* Device name we're using */
-#define DEVICE_NAME     "ttyIOC"
-#define DEVICE_MAJOR 204
-#define DEVICE_MINOR 50
+#define DEVICE_NAME_RS232  "ttyIOC"
+#define DEVICE_NAME_RS422  "ttyAIOC"
+#define DEVICE_MAJOR       204
+#define DEVICE_MINOR_RS232 50
+#define DEVICE_MINOR_RS422 84
+
 
 /* register offsets */
 #define IOC4_SERIAL_OFFSET      0x300
@@ -341,10 +344,8 @@ static unsigned int Num_of_ioc4_cards;
 #define MAX_BAUD_SUPPORTED      115200
 
 /* protocol types supported */
-enum sio_proto {
-        PROTO_RS232,
-        PROTO_RS422
-};
+#define PROTO_RS232     3
+#define PROTO_RS422     7
 
 /* Notification types */
 #define N_DATA_READY    0x01
@@ -395,11 +396,17 @@ enum sio_proto {
 /*
  * This is the entry saved by the driver - one per card
  */
+
+#define UART_PORT_MIN           0
+#define UART_PORT_RS232         UART_PORT_MIN
+#define UART_PORT_RS422         1
+#define UART_PORT_COUNT         2       /* one for each mode */
+
 struct ioc4_control {
         int ic_irq;
         struct {
-                /* uart ports are allocated here */
-                struct uart_port icp_uart_port;
+                /* uart ports are allocated here - 1 for rs232, 1 for rs422 */
+                struct uart_port icp_uart_port[UART_PORT_COUNT];
                 /* Handy reference material */
                 struct ioc4_port *icp_port;
         } ic_port[IOC4_NUM_SERIAL_PORTS];
@@ -443,7 +450,9 @@ struct ioc4_soft {
 
 /* Local port info for each IOC4 serial ports */
 struct ioc4_port {
-        struct uart_port *ip_port;
+        struct uart_port *ip_port;      /* current active port ptr */
+        /* Ptrs for all ports */
+        struct uart_port *ip_all_ports[UART_PORT_COUNT];
         /* Back ptrs for this port */
         struct ioc4_control *ip_control;
         struct pci_dev *ip_pdev;
@@ -502,6 +511,9 @@ struct ioc4_port {
 #define DCD_ON          0x02
 #define LOWAT_WRITTEN   0x04
 #define READ_ABORTED    0x08
+#define PORT_ACTIVE     0x10
+#define PORT_INACTIVE   0       /* This is the value when "off" */
+
 
 /* Since each port has different register offsets and bitmasks
  * for everything, we'll store those that we need in tables so we
@@ -623,6 +635,23 @@ struct ring_buffer {
 static void receive_chars(struct uart_port *);
 static void handle_intr(void *arg, uint32_t sio_ir);
 
+/*
+ * port_is_active - determines if this port is currently active
+ * @port: ptr to soft struct for this port
+ * @uart_port: uart port to test for
+ */
+static inline int port_is_active(struct ioc4_port *port,
+                struct uart_port *uart_port)
+{
+        if (port) {
+                if ((port->ip_flags & PORT_ACTIVE)
+                                        && (port->ip_port == uart_port))
+                        return 1;
+        }
+        return 0;
+}
+
+
 /**
  * write_ireg - write the interrupt regs
  * @ioc4_soft: ptr to soft struct for this port
@@ -708,19 +737,33 @@ static int set_baud(struct ioc4_port *port, int baud)
 /**
  * get_ioc4_port - given a uart port, return the control structure
  * @port: uart port
+ * @set: set this port as current
  */
-static struct ioc4_port *get_ioc4_port(struct uart_port *the_port)
+static struct ioc4_port *get_ioc4_port(struct uart_port *the_port, int set)
 {
         struct ioc4_driver_data *idd = dev_get_drvdata(the_port->dev);
         struct ioc4_control *control = idd->idd_serial_data;
-        int ii;
+        struct ioc4_port *port;
+        int port_num, port_type;
 
         if (control) {
-                for ( ii = 0; ii < IOC4_NUM_SERIAL_PORTS; ii++ ) {
-                        if (!control->ic_port[ii].icp_port)
+                for ( port_num = 0; port_num < IOC4_NUM_SERIAL_PORTS;
+                                                        port_num++ ) {
+                        port = control->ic_port[port_num].icp_port;
+                        if (!port)
                                 continue;
-                        if (the_port == control->ic_port[ii].icp_port->ip_port)
-                                return control->ic_port[ii].icp_port;
+                        for (port_type = UART_PORT_MIN;
+                                                port_type < UART_PORT_COUNT;
+                                                port_type++) {
+                                if (the_port == port->ip_all_ports
+                                                        [port_type]) {
+                                        /* set local copy */
+                                        if (set) {
+                                                port->ip_port = the_port;
+                                        }
+                                        return port;
+                                }
+                        }
                 }
         }
         return NULL;
@@ -946,6 +989,7 @@ intr_connect(struct ioc4_soft *soft, int type,
  * @arg: handler arg
  * @regs: registers
  */
+
 static irqreturn_t ioc4_intr(int irq, void *arg, struct pt_regs *regs)
 {
         struct ioc4_soft *soft;
@@ -953,7 +997,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg, struct pt_regs *regs)
         int xx, num_intrs = 0;
         int intr_type;
         int handled = 0;
-        struct ioc4_intr_info *ii;
+        struct ioc4_intr_info *intr_info;
 
         soft = arg;
         for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
@@ -966,13 +1010,13 @@ static irqreturn_t ioc4_intr(int irq, void *arg, struct pt_regs *regs)
                  * which interrupt bits are set.
                  */
                 for (xx = 0; xx < num_intrs; xx++) {
-                        ii = &soft->is_intr_type[intr_type].is_intr_info[xx];
-                        if ((this_mir = this_ir & ii->sd_bits)) {
+                        intr_info = &soft->is_intr_type[intr_type].is_intr_info[xx];
+                        if ((this_mir = this_ir & intr_info->sd_bits)) {
                                 /* Disable owned interrupts, call handler */
                                 handled++;
-                                write_ireg(soft, ii->sd_bits, IOC4_W_IEC,
+                                write_ireg(soft, intr_info->sd_bits, IOC4_W_IEC,
                                                                 intr_type);
-                                ii->sd_intr(ii->sd_info, this_mir);
+                                intr_info->sd_intr(intr_info->sd_info, this_mir);
                                 this_ir &= ~this_mir;
                         }
                 }
@@ -980,7 +1024,6 @@ static irqreturn_t ioc4_intr(int irq, void *arg, struct pt_regs *regs)
 #ifdef DEBUG_INTERRUPTS
         {
                 struct ioc4_misc_regs __iomem *mem = soft->is_ioc4_misc_addr;
-                spinlock_t *lp = &soft->is_ir_lock;
                 unsigned long flag;
 
                 spin_lock_irqsave(&soft->is_ir_lock, flag);
@@ -1177,7 +1220,7 @@ static inline int local_open(struct ioc4_port *port)
 {
         int spiniter = 0;
 
-        port->ip_flags = 0;
+        port->ip_flags = PORT_ACTIVE;
 
         /* Pause the DMA interface if necessary */
         if (port->ip_sscr & IOC4_SSCR_DMA_EN) {
@@ -1187,6 +1230,7 @@ static inline int local_open(struct ioc4_port *port)
                                 & IOC4_SSCR_PAUSE_STATE) == 0) {
                         spiniter++;
                         if (spiniter > MAXITER) {
+                                port->ip_flags = PORT_INACTIVE;
                                 return -1;
                         }
                 }
@@ -1506,14 +1550,13 @@ static int set_notification(struct ioc4_port *port, int mask, int set_on)
 /**
  * set_mcr - set the master control reg
  * @the_port: port to use
- * @set: set ?
  * @mask1: mcr mask
  * @mask2: shadow mask
  */
-static inline int set_mcr(struct uart_port *the_port, int set,
+static inline int set_mcr(struct uart_port *the_port,
                 int mask1, int mask2)
 {
-        struct ioc4_port *port = get_ioc4_port(the_port);
+        struct ioc4_port *port = get_ioc4_port(the_port, 0);
         uint32_t shadow;
         int spiniter = 0;
         char mcr;
@@ -1536,13 +1579,9 @@ static inline int set_mcr(struct uart_port *the_port, int set,
         mcr = (shadow & 0xff000000) >> 24;
 
         /* Set new value */
-        if (set) {
-                mcr |= mask1;
-                shadow |= mask2;
-        } else {
-                mcr &= ~mask1;
-                shadow &= ~mask2;
-        }
+        mcr |= mask1;
+        shadow |= mask2;
+
         writeb(mcr, &port->ip_uart_regs->i4u_mcr);
         writel(shadow, &port->ip_serial_regs->shadow);
 
@@ -1558,7 +1597,7 @@ static inline int set_mcr(struct uart_port *the_port, int set,
  * @port: port to use
  * @proto: protocol to use
  */
-static int ioc4_set_proto(struct ioc4_port *port, enum sio_proto proto)
+static int ioc4_set_proto(struct ioc4_port *port, int proto)
 {
         struct hooks *hooks = port->ip_hooks;
 
@@ -1589,7 +1628,7 @@ static void transmit_chars(struct uart_port *the_port)
         int result;
         char *start;
         struct tty_struct *tty;
-        struct ioc4_port *port = get_ioc4_port(the_port);
+        struct ioc4_port *port = get_ioc4_port(the_port, 0);
         struct uart_info *info;
 
         if (!the_port)
@@ -1645,7 +1684,7 @@ static void
 ioc4_change_speed(struct uart_port *the_port,
                   struct termios *new_termios, struct termios *old_termios)
 {
-        struct ioc4_port *port = get_ioc4_port(the_port);
+        struct ioc4_port *port = get_ioc4_port(the_port, 0);
         int baud, bits;
         unsigned cflag;
         int new_parity = 0, new_parity_enable = 0, new_stop = 0, new_data = 8;
@@ -1752,7 +1791,7 @@ static inline int ic4_startup_local(struct uart_port *the_port)
         if (!the_port)
                 return -1;
 
-        port = get_ioc4_port(the_port);
+        port = get_ioc4_port(the_port, 0);
         if (!port)
                 return -1;
 
@@ -1760,6 +1799,9 @@ static inline int ic4_startup_local(struct uart_port *the_port)
 
         local_open(port);
 
+        /* set the protocol - mapbase has the port type */
+        ioc4_set_proto(port, the_port->mapbase);
+
         /* set the speed of the serial port */
         ioc4_change_speed(the_port, info->tty->termios, (struct termios *)0);
 
@@ -1768,17 +1810,17 @@ static inline int ic4_startup_local(struct uart_port *the_port)
 
 /*
  * ioc4_cb_output_lowat - called when the output low water mark is hit
- * @port: port to output
+ * @the_port: port to output
  */
-static void ioc4_cb_output_lowat(struct ioc4_port *port)
+static void ioc4_cb_output_lowat(struct uart_port *the_port)
 {
         unsigned long pflags;
 
         /* ip_lock is set on the call here */
-        if (port->ip_port) {
-                spin_lock_irqsave(&port->ip_port->lock, pflags);
-                transmit_chars(port->ip_port);
-                spin_unlock_irqrestore(&port->ip_port->lock, pflags);
+        if (the_port) {
+                spin_lock_irqsave(&the_port->lock, pflags);
+                transmit_chars(the_port);
+                spin_unlock_irqrestore(&the_port->lock, pflags);
         }
 }
 
@@ -1923,7 +1965,7 @@ static void handle_intr(void *arg, uint32_t sio_ir)
                                         &port->ip_mem->sio_ir.raw);
 
                         if (port->ip_notify & N_OUTPUT_LOWAT)
-                                ioc4_cb_output_lowat(port);
+                                ioc4_cb_output_lowat(port->ip_port);
                 }
 
                 /* Handle tx_mt.  Must come after tx_explicit.  */
@@ -1936,7 +1978,7 @@ static void handle_intr(void *arg, uint32_t sio_ir)
                          * So send the notification now.
                          */
                         if (port->ip_notify & N_OUTPUT_LOWAT) {
-                                ioc4_cb_output_lowat(port);
+                                ioc4_cb_output_lowat(port->ip_port);
 
                                 /* We need to reload the sio_ir since the lowat
                                  * call may have caused another write to occur,
@@ -2023,7 +2065,7 @@ static inline int do_read(struct uart_port *the_port, unsigned char *buf,
                                 int len)
 {
         int prod_ptr, cons_ptr, total;
-        struct ioc4_port *port = get_ioc4_port(the_port);
+        struct ioc4_port *port = get_ioc4_port(the_port, 0);
         struct ring *inring;
         struct ring_entry *entry;
         struct hooks *hooks = port->ip_hooks;
@@ -2335,17 +2377,27 @@ static void receive_chars(struct uart_port *the_port)
  */
 static const char *ic4_type(struct uart_port *the_port)
 {
-        return "SGI IOC4 Serial";
+        if (the_port->mapbase == PROTO_RS232)
+                return "SGI IOC4 Serial [rs232]";
+        else
+                return "SGI IOC4 Serial [rs422]";
 }
 
 /**
- * ic4_tx_empty - Is the transmitter empty?  We pretend we're always empty
- * @port: Port to operate on (we ignore since we always return 1)
+ * ic4_tx_empty - Is the transmitter empty?
+ * @port: Port to operate on
  *
  */
 static unsigned int ic4_tx_empty(struct uart_port *the_port)
 {
-        return 1;
+        struct ioc4_port *port = get_ioc4_port(the_port, 0);
+        unsigned int ret = 0;
+
+        if (port_is_active(port, the_port)) {
+                if (readl(&port->ip_serial_regs->shadow) & IOC4_SHADOW_TEMT)
+                        ret = TIOCSER_TEMT;
+        }
+        return ret;
 }
 
 /**
@@ -2355,6 +2407,10 @@ static unsigned int ic4_tx_empty(struct uart_port *the_port)
  */
 static void ic4_stop_tx(struct uart_port *the_port)
 {
+        struct ioc4_port *port = get_ioc4_port(the_port, 0);
+
+        if (port_is_active(port, the_port))
+                set_notification(port, N_OUTPUT_LOWAT, 0);
 }
 
 /**
@@ -2377,11 +2433,12 @@ static void ic4_shutdown(struct uart_port *the_port)
         struct ioc4_port *port;
         struct uart_info *info;
 
-        port = get_ioc4_port(the_port);
+        port = get_ioc4_port(the_port, 0);
         if (!port)
                 return;
 
         info = the_port->info;
+        port->ip_port = NULL;
 
         wake_up_interruptible(&info->delta_msr_wait);
 
@@ -2390,6 +2447,7 @@ static void ic4_shutdown(struct uart_port *the_port)
 
         spin_lock_irqsave(&the_port->lock, port_flags);
         set_notification(port, N_ALL, 0);
+        port->ip_flags = PORT_INACTIVE;
         spin_unlock_irqrestore(&the_port->lock, port_flags);
 }
 
@@ -2402,6 +2460,11 @@ static void ic4_shutdown(struct uart_port *the_port)
 static void ic4_set_mctrl(struct uart_port *the_port, unsigned int mctrl)
 {
         unsigned char mcr = 0;
+        struct ioc4_port *port;
+
+        port = get_ioc4_port(the_port, 0);
+        if (!port_is_active(port, the_port))
+                return;
 
         if (mctrl & TIOCM_RTS)
                 mcr |= UART_MCR_RTS;
@@ -2414,7 +2477,7 @@ static void ic4_set_mctrl(struct uart_port *the_port, unsigned int mctrl)
         if (mctrl & TIOCM_LOOP)
                 mcr |= UART_MCR_LOOP;
 
-        set_mcr(the_port, 1, mcr, IOC4_SHADOW_DTR);
+        set_mcr(the_port, mcr, IOC4_SHADOW_DTR);
 }
 
 /**
@@ -2424,11 +2487,11 @@ static void ic4_set_mctrl(struct uart_port *the_port, unsigned int mctrl)
  */
 static unsigned int ic4_get_mctrl(struct uart_port *the_port)
 {
-        struct ioc4_port *port = get_ioc4_port(the_port);
+        struct ioc4_port *port = get_ioc4_port(the_port, 0);
         uint32_t shadow;
         unsigned int ret = 0;
 
-        if (!port)
+        if (!port_is_active(port, the_port))
                 return 0;
 
         shadow = readl(&port->ip_serial_regs->shadow);
@@ -2448,9 +2511,9 @@ static unsigned int ic4_get_mctrl(struct uart_port *the_port)
  */
 static void ic4_start_tx(struct uart_port *the_port)
 {
-        struct ioc4_port *port = get_ioc4_port(the_port);
+        struct ioc4_port *port = get_ioc4_port(the_port, 0);
 
-        if (port) {
+        if (port_is_active(port, the_port)) {
                 set_notification(port, N_OUTPUT_LOWAT, 1);
                 enable_intrs(port, port->ip_hooks->intr_tx_mt);
         }
@@ -2467,7 +2530,7 @@ static void ic4_break_ctl(struct uart_port *the_port, int break_state)
 }
 
 /**
- * ic4_startup - Start up the serial port - always return 0 (We're always on)
+ * ic4_startup - Start up the serial port
  * @port: Port to operate on
  *
  */
@@ -2479,17 +2542,16 @@ static int ic4_startup(struct uart_port *the_port)
         struct uart_info *info;
         unsigned long port_flags;
 
-        if (!the_port) {
+        if (!the_port)
                 return -ENODEV;
-        }
-        port = get_ioc4_port(the_port);
-        if (!port) {
+        port = get_ioc4_port(the_port, 1);
+        if (!port)
                 return -ENODEV;
-        }
         info = the_port->info;
 
         control = port->ip_control;
         if (!control) {
+                port->ip_port = NULL;
                 return -ENODEV;
         }
 
@@ -2551,28 +2613,104 @@ static struct uart_ops ioc4_ops = {
  * Boot-time initialization code
  */
 
-static struct uart_driver ioc4_uart = {
+static struct uart_driver ioc4_uart_rs232 = {
         .owner          = THIS_MODULE,
-        .driver_name    = "ioc4_serial",
-        .dev_name       = DEVICE_NAME,
+        .driver_name    = "ioc4_serial_rs232",
+        .dev_name       = DEVICE_NAME_RS232,
         .major          = DEVICE_MAJOR,
-        .minor          = DEVICE_MINOR,
+        .minor          = DEVICE_MINOR_RS232,
         .nr             = IOC4_NUM_CARDS * IOC4_NUM_SERIAL_PORTS,
 };
 
+static struct uart_driver ioc4_uart_rs422 = {
+        .owner          = THIS_MODULE,
+        .driver_name    = "ioc4_serial_rs422",
+        .dev_name       = DEVICE_NAME_RS422,
+        .major          = DEVICE_MAJOR,
+        .minor          = DEVICE_MINOR_RS422,
+        .nr             = IOC4_NUM_CARDS * IOC4_NUM_SERIAL_PORTS,
+};
+
+
 /**
- * ioc4_serial_core_attach - register with serial core
+ * ioc4_serial_remove_one - detach function
+ *
+ * @idd: IOC4 master module data for this IOC4
+ */
+
+static int ioc4_serial_remove_one(struct ioc4_driver_data *idd)
+{
+        int port_num, port_type;
+        struct ioc4_control *control;
+        struct uart_port *the_port;
+        struct ioc4_port *port;
+        struct ioc4_soft *soft;
+
+        control = idd->idd_serial_data;
+
+        for (port_num = 0; port_num < IOC4_NUM_SERIAL_PORTS; port_num++) {
+                for (port_type = UART_PORT_MIN;
+                                        port_type < UART_PORT_COUNT;
+                                        port_type++) {
+                        the_port = &control->ic_port[port_num].icp_uart_port
+                                                        [port_type];
+                        if (the_port) {
+                                switch (port_type) {
+                                case UART_PORT_RS422:
+                                        uart_remove_one_port(&ioc4_uart_rs422,
+                                                        the_port);
+                                        break;
+                                default:
+                                case UART_PORT_RS232:
+                                        uart_remove_one_port(&ioc4_uart_rs232,
+                                                        the_port);
+                                        break;
+                                }
+                        }
+                }
+                port = control->ic_port[port_num].icp_port;
+                /* we allocate in pairs */
+                if (!(port_num & 1) && port) {
+                        pci_free_consistent(port->ip_pdev,
+                                        TOTAL_RING_BUF_SIZE,
+                                        port->ip_cpu_ringbuf,
+                                        port->ip_dma_ringbuf);
+                        kfree(port);
+                }
+        }
+        soft = control->ic_soft;
+        if (soft) {
+                free_irq(control->ic_irq, soft);
+                if (soft->is_ioc4_serial_addr) {
+                        release_region((unsigned long)
+                             soft->is_ioc4_serial_addr,
+                                sizeof(struct ioc4_serial));
+                }
+                kfree(soft);
+        }
+        kfree(control);
+        idd->idd_serial_data = NULL;
+
+        return 0;
+}
+
+
+/**
+ * ioc4_serial_core_attach_rs232 - register with serial core
  *              This is done during pci probing
  * @pdev: handle for this card
  */
 static inline int
-ioc4_serial_core_attach(struct pci_dev *pdev)
+ioc4_serial_core_attach(struct pci_dev *pdev, int port_type)
 {
         struct ioc4_port *port;
         struct uart_port *the_port;
         struct ioc4_driver_data *idd = pci_get_drvdata(pdev);
         struct ioc4_control *control = idd->idd_serial_data;
-        int ii;
+        int port_num;
+        int port_type_idx;
+        struct uart_driver *u_driver;
+
 
         DPRINT_CONFIG(("%s: attach pdev 0x%p - control 0x%p\n",
                         __FUNCTION__, pdev, (void *)control));
@@ -2580,28 +2718,36 @@ ioc4_serial_core_attach(struct pci_dev *pdev)
         if (!control)
                 return -ENODEV;
 
+        port_type_idx = (port_type == PROTO_RS232) ? UART_PORT_RS232
+                                                : UART_PORT_RS422;
+
+        u_driver = (port_type == PROTO_RS232)   ? &ioc4_uart_rs232
+                                                : &ioc4_uart_rs422;
+
         /* once around for each port on this card */
-        for (ii = 0; ii < IOC4_NUM_SERIAL_PORTS; ii++) {
-                the_port = &control->ic_port[ii].icp_uart_port;
-                port = control->ic_port[ii].icp_port;
-                port->ip_port = the_port;
+        for (port_num = 0; port_num < IOC4_NUM_SERIAL_PORTS; port_num++) {
+                the_port = &control->ic_port[port_num].icp_uart_port
+                                                        [port_type_idx];
+                port = control->ic_port[port_num].icp_port;
+                port->ip_all_ports[port_type_idx] = the_port;
 
-                DPRINT_CONFIG(("%s: attach the_port 0x%p / port 0x%p\n",
+                DPRINT_CONFIG(("%s: attach the_port 0x%p / port 0x%p : type %s\n",
                                 __FUNCTION__, (void *)the_port,
-                                (void *)port));
+                                (void *)port,
+                                port_type == PROTO_RS232 ? "rs232" : "rs422"));
 
                 /* membase, iobase and mapbase just need to be non-0 */
                 the_port->membase = (unsigned char __iomem *)1;
-                the_port->iobase = (pdev->bus->number << 16) |  ii;
-                the_port->line = (Num_of_ioc4_cards << 2) | ii;
-                the_port->mapbase = 1;
+                the_port->iobase = (pdev->bus->number << 16) |  port_num;
+                the_port->line = (Num_of_ioc4_cards << 2) | port_num;
+                the_port->mapbase = port_type;
                 the_port->type = PORT_16550A;
                 the_port->fifosize = IOC4_FIFO_CHARS;
                 the_port->ops = &ioc4_ops;
                 the_port->irq = control->ic_irq;
                 the_port->dev = &pdev->dev;
                 spin_lock_init(&the_port->lock);
-                if (uart_add_one_port(&ioc4_uart, the_port) < 0) {
+                if (uart_add_one_port(u_driver, the_port) < 0) {
                         printk(KERN_WARNING
                            "%s: unable to add port %d bus %d\n",
                                __FUNCTION__, the_port->line, pdev->bus->number);
@@ -2610,8 +2756,6 @@ ioc4_serial_core_attach(struct pci_dev *pdev)
                             ("IOC4 serial port %d irq = %d, bus %d\n",
                                the_port->line, the_port->irq, pdev->bus->number));
                 }
-                /* all ports are rs232 for now */
-                ioc4_set_proto(port, PROTO_RS232);
         }
         return 0;
 }
@@ -2631,7 +2775,8 @@ ioc4_serial_attach_one(struct ioc4_driver_data *idd)
         int ret = 0;
 
 
-        DPRINT_CONFIG(("%s (0x%p, 0x%p)\n", __FUNCTION__, idd->idd_pdev, idd->idd_pci_id));
+        DPRINT_CONFIG(("%s (0x%p, 0x%p)\n", __FUNCTION__, idd->idd_pdev,
+                                                        idd->idd_pci_id));
 
         /* request serial registers */
         tmp_addr1 = idd->idd_bar0 + IOC4_SERIAL_OFFSET;
@@ -2653,11 +2798,11 @@ ioc4_serial_attach_one(struct ioc4_driver_data *idd)
                 goto out2;
         }
         DPRINT_CONFIG(("%s : mem 0x%p, serial 0x%p\n",
-                                __FUNCTION__, (void *)idd->idd_misc_regs, (void *)serial));
+                                __FUNCTION__, (void *)idd->idd_misc_regs,
+                                (void *)serial));
 
         /* Get memory for the new card */
-        control = kmalloc(sizeof(struct ioc4_control) * IOC4_NUM_SERIAL_PORTS,
-                                                GFP_KERNEL);
+        control = kmalloc(sizeof(struct ioc4_control), GFP_KERNEL);
 
         if (!control) {
                 printk(KERN_WARNING "ioc4_attach_one"
@@ -2702,7 +2847,7 @@ ioc4_serial_attach_one(struct ioc4_driver_data *idd)
 
         /* Hook up interrupt handler */
         if (!request_irq(idd->idd_pdev->irq, ioc4_intr, SA_SHIRQ,
-                                "sgi-ioc4serial", (void *)soft)) {
+                                "sgi-ioc4serial", soft)) {
                 control->ic_irq = idd->idd_pdev->irq;
         } else {
                 printk(KERN_WARNING
@@ -2713,16 +2858,21 @@ ioc4_serial_attach_one(struct ioc4_driver_data *idd)
         if (ret)
                 goto out4;
 
-        /* register port with the serial core */
+        /* register port with the serial core - 1 rs232, 1 rs422 */
 
-        if ((ret = ioc4_serial_core_attach(idd->idd_pdev)))
+        if ((ret = ioc4_serial_core_attach(idd->idd_pdev, PROTO_RS232)))
                 goto out4;
 
+        if ((ret = ioc4_serial_core_attach(idd->idd_pdev, PROTO_RS422)))
+                goto out5;
+
         Num_of_ioc4_cards++;
 
         return ret;
 
         /* error exits that give back resources */
+out5:
+        ioc4_serial_remove_one(idd);
 out4:
         kfree(soft);
 out3:
@@ -2735,52 +2885,6 @@ out1:
 }
 
 
-/**
- * ioc4_serial_remove_one - detach function
- *
- * @idd: IOC4 master module data for this IOC4
- */
-
-int ioc4_serial_remove_one(struct ioc4_driver_data *idd)
-{
-        int ii;
-        struct ioc4_control *control;
-        struct uart_port *the_port;
-        struct ioc4_port *port;
-        struct ioc4_soft *soft;
-
-        control = idd->idd_serial_data;
-
-        for (ii = 0; ii < IOC4_NUM_SERIAL_PORTS; ii++) {
-                the_port = &control->ic_port[ii].icp_uart_port;
-                if (the_port) {
-                        uart_remove_one_port(&ioc4_uart, the_port);
-                }
-                port = control->ic_port[ii].icp_port;
-                if (!(ii & 1) && port) {
-                        pci_free_consistent(port->ip_pdev,
-                                        TOTAL_RING_BUF_SIZE,
-                                        (void *)port->ip_cpu_ringbuf,
-                                        port->ip_dma_ringbuf);
-                        kfree(port);
-                }
-        }
-        soft = control->ic_soft;
-        if (soft) {
-                free_irq(control->ic_irq, (void *)soft);
-                if (soft->is_ioc4_serial_addr) {
-                        release_region((unsigned long)
-                             soft->is_ioc4_serial_addr,
-                                sizeof(struct ioc4_serial));
-                }
-                kfree(soft);
-        }
-        kfree(control);
-        idd->idd_serial_data = NULL;
-
-        return 0;
-}
-
 static struct ioc4_submodule ioc4_serial_submodule = {
         .is_name = "IOC4_serial",
         .is_owner = THIS_MODULE,
@@ -2796,9 +2900,15 @@ int ioc4_serial_init(void)
         int ret;
 
         /* register with serial core */
-        if ((ret = uart_register_driver(&ioc4_uart)) < 0) {
+        if ((ret = uart_register_driver(&ioc4_uart_rs232)) < 0) {
+                printk(KERN_WARNING
+                        "%s: Couldn't register rs232 IOC4 serial driver\n",
+                        __FUNCTION__);
+                return ret;
+        }
+        if ((ret = uart_register_driver(&ioc4_uart_rs422)) < 0) {
                 printk(KERN_WARNING
-                        "%s: Couldn't register IOC4 serial driver\n",
+                        "%s: Couldn't register rs422 IOC4 serial driver\n",
                         __FUNCTION__);
                 return ret;
         }
@@ -2810,7 +2920,8 @@ int ioc4_serial_init(void)
 static void __devexit ioc4_serial_exit(void)
 {
         ioc4_unregister_submodule(&ioc4_serial_submodule);
-        uart_unregister_driver(&ioc4_uart);
+        uart_unregister_driver(&ioc4_uart_rs232);
+        uart_unregister_driver(&ioc4_uart_rs422);
 }
 
 module_init(ioc4_serial_init);
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 928e6cf12d..6459edc7f5 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -40,7 +40,7 @@
  * and so on). So the PSC1 is mapped to /dev/ttyPSC0, PSC2 to /dev/ttyPSC1 and
  * so on. But be warned, it's an ABSOLUTE REQUIREMENT ! This is needed mainly
  * fpr the console code : without this 1:1 mapping, at early boot time, when we
- * are parsing the kernel args console=ttyPSC?, we wouldn't know wich PSC it
+ * are parsing the kernel args console=ttyPSC?, we wouldn't know which PSC it
  * will be mapped to.
  */
 
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index 0ca83ac31d..94681922ea 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -1,6 +1,4 @@
 /*
- * drivers/serial/mpsc.c
- *
  * Generic driver for the MPSC (UART mode) on Marvell parts (e.g., GT64240,
  * GT64260, MV64340, MV64360, GT96100, ... ).
  *
@@ -52,9 +50,263 @@
  * 4) AFAICT, hardware flow control isn't supported by the controller --MAG.
  */
 
+#include <linux/config.h>
+
+#if defined(CONFIG_SERIAL_MPSC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+#include <linux/serial.h>
+#include <linux/serial_core.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/dma-mapping.h>
+#include <linux/mv643xx.h>
 #include <linux/platform_device.h>
 
-#include "mpsc.h"
+#include <asm/io.h>
+#include <asm/irq.h>
+
+#if defined(CONFIG_SERIAL_MPSC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#define MPSC_NUM_CTLRS          2
+
+/*
+ * Descriptors and buffers must be cache line aligned.
+ * Buffers lengths must be multiple of cache line size.
+ * Number of Tx & Rx descriptors must be powers of 2.
+ */
+#define MPSC_RXR_ENTRIES        32
+#define MPSC_RXRE_SIZE          dma_get_cache_alignment()
+#define MPSC_RXR_SIZE           (MPSC_RXR_ENTRIES * MPSC_RXRE_SIZE)
+#define MPSC_RXBE_SIZE          dma_get_cache_alignment()
+#define MPSC_RXB_SIZE           (MPSC_RXR_ENTRIES * MPSC_RXBE_SIZE)
+
+#define MPSC_TXR_ENTRIES        32
+#define MPSC_TXRE_SIZE          dma_get_cache_alignment()
+#define MPSC_TXR_SIZE           (MPSC_TXR_ENTRIES * MPSC_TXRE_SIZE)
+#define MPSC_TXBE_SIZE          dma_get_cache_alignment()
+#define MPSC_TXB_SIZE           (MPSC_TXR_ENTRIES * MPSC_TXBE_SIZE)
+
+#define MPSC_DMA_ALLOC_SIZE     (MPSC_RXR_SIZE + MPSC_RXB_SIZE +        \
+                                MPSC_TXR_SIZE + MPSC_TXB_SIZE +         \
+                                dma_get_cache_alignment() /* for alignment */)
+
+/* Rx and Tx Ring entry descriptors -- assume entry size is <= cacheline size */
+struct mpsc_rx_desc {
+        u16 bufsize;
+        u16 bytecnt;
+        u32 cmdstat;
+        u32 link;
+        u32 buf_ptr;
+} __attribute((packed));
+
+struct mpsc_tx_desc {
+        u16 bytecnt;
+        u16 shadow;
+        u32 cmdstat;
+        u32 link;
+        u32 buf_ptr;
+} __attribute((packed));
+
+/*
+ * Some regs that have the erratum that you can't read them are are shared
+ * between the two MPSC controllers.  This struct contains those shared regs.
+ */
+struct mpsc_shared_regs {
+        phys_addr_t mpsc_routing_base_p;
+        phys_addr_t sdma_intr_base_p;
+
+        void __iomem *mpsc_routing_base;
+        void __iomem *sdma_intr_base;
+
+        u32 MPSC_MRR_m;
+        u32 MPSC_RCRR_m;
+        u32 MPSC_TCRR_m;
+        u32 SDMA_INTR_CAUSE_m;
+        u32 SDMA_INTR_MASK_m;
+};
+
+/* The main driver data structure */
+struct mpsc_port_info {
+        struct uart_port port;  /* Overlay uart_port structure */
+
+        /* Internal driver state for this ctlr */
+        u8 ready;
+        u8 rcv_data;
+        tcflag_t c_iflag;       /* save termios->c_iflag */
+        tcflag_t c_cflag;       /* save termios->c_cflag */
+
+        /* Info passed in from platform */
+        u8 mirror_regs;         /* Need to mirror regs? */
+        u8 cache_mgmt;          /* Need manual cache mgmt? */
+        u8 brg_can_tune;        /* BRG has baud tuning? */
+        u32 brg_clk_src;
+        u16 mpsc_max_idle;
+        int default_baud;
+        int default_bits;
+        int default_parity;
+        int default_flow;
+
+        /* Physical addresses of various blocks of registers (from platform) */
+        phys_addr_t mpsc_base_p;
+        phys_addr_t sdma_base_p;
+        phys_addr_t brg_base_p;
+
+        /* Virtual addresses of various blocks of registers (from platform) */
+        void __iomem *mpsc_base;
+        void __iomem *sdma_base;
+        void __iomem *brg_base;
+
+        /* Descriptor ring and buffer allocations */
+        void *dma_region;
+        dma_addr_t dma_region_p;
+
+        dma_addr_t rxr;         /* Rx descriptor ring */
+        dma_addr_t rxr_p;       /* Phys addr of rxr */
+        u8 *rxb;                /* Rx Ring I/O buf */
+        u8 *rxb_p;              /* Phys addr of rxb */
+        u32 rxr_posn;           /* First desc w/ Rx data */
+
+        dma_addr_t txr;         /* Tx descriptor ring */
+        dma_addr_t txr_p;       /* Phys addr of txr */
+        u8 *txb;                /* Tx Ring I/O buf */
+        u8 *txb_p;              /* Phys addr of txb */
+        int txr_head;           /* Where new data goes */
+        int txr_tail;           /* Where sent data comes off */
+
+        /* Mirrored values of regs we can't read (if 'mirror_regs' set) */
+        u32 MPSC_MPCR_m;
+        u32 MPSC_CHR_1_m;
+        u32 MPSC_CHR_2_m;
+        u32 MPSC_CHR_10_m;
+        u32 BRG_BCR_m;
+        struct mpsc_shared_regs *shared_regs;
+};
+
+/* Hooks to platform-specific code */
+int mpsc_platform_register_driver(void);
+void mpsc_platform_unregister_driver(void);
+
+/* Hooks back in to mpsc common to be called by platform-specific code */
+struct mpsc_port_info *mpsc_device_probe(int index);
+struct mpsc_port_info *mpsc_device_remove(int index);
+
+/* Main MPSC Configuration Register Offsets */
+#define MPSC_MMCRL                      0x0000
+#define MPSC_MMCRH                      0x0004
+#define MPSC_MPCR                       0x0008
+#define MPSC_CHR_1                      0x000c
+#define MPSC_CHR_2                      0x0010
+#define MPSC_CHR_3                      0x0014
+#define MPSC_CHR_4                      0x0018
+#define MPSC_CHR_5                      0x001c
+#define MPSC_CHR_6                      0x0020
+#define MPSC_CHR_7                      0x0024
+#define MPSC_CHR_8                      0x0028
+#define MPSC_CHR_9                      0x002c
+#define MPSC_CHR_10                     0x0030
+#define MPSC_CHR_11                     0x0034
+
+#define MPSC_MPCR_FRZ                   (1 << 9)
+#define MPSC_MPCR_CL_5                  0
+#define MPSC_MPCR_CL_6                  1
+#define MPSC_MPCR_CL_7                  2
+#define MPSC_MPCR_CL_8                  3
+#define MPSC_MPCR_SBL_1                 0
+#define MPSC_MPCR_SBL_2                 1
+
+#define MPSC_CHR_2_TEV                  (1<<1)
+#define MPSC_CHR_2_TA                   (1<<7)
+#define MPSC_CHR_2_TTCS                 (1<<9)
+#define MPSC_CHR_2_REV                  (1<<17)
+#define MPSC_CHR_2_RA                   (1<<23)
+#define MPSC_CHR_2_CRD                  (1<<25)
+#define MPSC_CHR_2_EH                   (1<<31)
+#define MPSC_CHR_2_PAR_ODD              0
+#define MPSC_CHR_2_PAR_SPACE            1
+#define MPSC_CHR_2_PAR_EVEN             2
+#define MPSC_CHR_2_PAR_MARK             3
+
+/* MPSC Signal Routing */
+#define MPSC_MRR                        0x0000
+#define MPSC_RCRR                       0x0004
+#define MPSC_TCRR                       0x0008
+
+/* Serial DMA Controller Interface Registers */
+#define SDMA_SDC                        0x0000
+#define SDMA_SDCM                       0x0008
+#define SDMA_RX_DESC                    0x0800
+#define SDMA_RX_BUF_PTR                 0x0808
+#define SDMA_SCRDP                      0x0810
+#define SDMA_TX_DESC                    0x0c00
+#define SDMA_SCTDP                      0x0c10
+#define SDMA_SFTDP                      0x0c14
+
+#define SDMA_DESC_CMDSTAT_PE            (1<<0)
+#define SDMA_DESC_CMDSTAT_CDL           (1<<1)
+#define SDMA_DESC_CMDSTAT_FR            (1<<3)
+#define SDMA_DESC_CMDSTAT_OR            (1<<6)
+#define SDMA_DESC_CMDSTAT_BR            (1<<9)
+#define SDMA_DESC_CMDSTAT_MI            (1<<10)
+#define SDMA_DESC_CMDSTAT_A             (1<<11)
+#define SDMA_DESC_CMDSTAT_AM            (1<<12)
+#define SDMA_DESC_CMDSTAT_CT            (1<<13)
+#define SDMA_DESC_CMDSTAT_C             (1<<14)
+#define SDMA_DESC_CMDSTAT_ES            (1<<15)
+#define SDMA_DESC_CMDSTAT_L             (1<<16)
+#define SDMA_DESC_CMDSTAT_F             (1<<17)
+#define SDMA_DESC_CMDSTAT_P             (1<<18)
+#define SDMA_DESC_CMDSTAT_EI            (1<<23)
+#define SDMA_DESC_CMDSTAT_O             (1<<31)
+
+#define SDMA_DESC_DFLT                  (SDMA_DESC_CMDSTAT_O |  \
+                                        SDMA_DESC_CMDSTAT_EI)
+
+#define SDMA_SDC_RFT                    (1<<0)
+#define SDMA_SDC_SFM                    (1<<1)
+#define SDMA_SDC_BLMR                   (1<<6)
+#define SDMA_SDC_BLMT                   (1<<7)
+#define SDMA_SDC_POVR                   (1<<8)
+#define SDMA_SDC_RIFB                   (1<<9)
+
+#define SDMA_SDCM_ERD                   (1<<7)
+#define SDMA_SDCM_AR                    (1<<15)
+#define SDMA_SDCM_STD                   (1<<16)
+#define SDMA_SDCM_TXD                   (1<<23)
+#define SDMA_SDCM_AT                    (1<<31)
+
+#define SDMA_0_CAUSE_RXBUF              (1<<0)
+#define SDMA_0_CAUSE_RXERR              (1<<1)
+#define SDMA_0_CAUSE_TXBUF              (1<<2)
+#define SDMA_0_CAUSE_TXEND              (1<<3)
+#define SDMA_1_CAUSE_RXBUF              (1<<8)
+#define SDMA_1_CAUSE_RXERR              (1<<9)
+#define SDMA_1_CAUSE_TXBUF              (1<<10)
+#define SDMA_1_CAUSE_TXEND              (1<<11)
+
+#define SDMA_CAUSE_RX_MASK      (SDMA_0_CAUSE_RXBUF | SDMA_0_CAUSE_RXERR | \
+        SDMA_1_CAUSE_RXBUF | SDMA_1_CAUSE_RXERR)
+#define SDMA_CAUSE_TX_MASK      (SDMA_0_CAUSE_TXBUF | SDMA_0_CAUSE_TXEND | \
+        SDMA_1_CAUSE_TXBUF | SDMA_1_CAUSE_TXEND)
+
+/* SDMA Interrupt registers */
+#define SDMA_INTR_CAUSE                 0x0000
+#define SDMA_INTR_MASK                  0x0080
+
+/* Baud Rate Generator Interface Registers */
+#define BRG_BCR                         0x0000
+#define BRG_BTR                         0x0004
 
 /*
  * Define how this driver is known to the outside (we've been assigned a
@@ -1165,7 +1417,7 @@ mpsc_startup(struct uart_port *port)
                         flag = SA_SHIRQ;
 
                 if (request_irq(pi->port.irq, mpsc_sdma_intr, flag,
-                                "mpsc/sdma", pi))
+                                "mpsc-sdma", pi))
                         printk(KERN_ERR "MPSC: Can't get SDMA IRQ %d\n",
                                pi->port.irq);
 
diff --git a/drivers/serial/mpsc.h b/drivers/serial/mpsc.h
deleted file mode 100644
index 678dbcf06c..0000000000
--- a/drivers/serial/mpsc.h
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * drivers/serial/mpsc.h
- *
- * Author: Mark A. Greer <mgreer@mvista.com>
- *
- * 2004 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.  This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-
-#ifndef __MPSC_H__
-#define __MPSC_H__
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/ioport.h>
-#include <linux/init.h>
-#include <linux/console.h>
-#include <linux/sysrq.h>
-#include <linux/serial.h>
-#include <linux/serial_core.h>
-#include <linux/delay.h>
-#include <linux/device.h>
-#include <linux/dma-mapping.h>
-#include <linux/mv643xx.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-
-#if defined(CONFIG_SERIAL_MPSC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
-#define MPSC_NUM_CTLRS          2
-
-/*
- * Descriptors and buffers must be cache line aligned.
- * Buffers lengths must be multiple of cache line size.
- * Number of Tx & Rx descriptors must be powers of 2.
- */
-#define MPSC_RXR_ENTRIES        32
-#define MPSC_RXRE_SIZE          dma_get_cache_alignment()
-#define MPSC_RXR_SIZE           (MPSC_RXR_ENTRIES * MPSC_RXRE_SIZE)
-#define MPSC_RXBE_SIZE          dma_get_cache_alignment()
-#define MPSC_RXB_SIZE           (MPSC_RXR_ENTRIES * MPSC_RXBE_SIZE)
-
-#define MPSC_TXR_ENTRIES        32
-#define MPSC_TXRE_SIZE          dma_get_cache_alignment()
-#define MPSC_TXR_SIZE           (MPSC_TXR_ENTRIES * MPSC_TXRE_SIZE)
-#define MPSC_TXBE_SIZE          dma_get_cache_alignment()
-#define MPSC_TXB_SIZE           (MPSC_TXR_ENTRIES * MPSC_TXBE_SIZE)
-
-#define MPSC_DMA_ALLOC_SIZE     (MPSC_RXR_SIZE + MPSC_RXB_SIZE +        \
-                                MPSC_TXR_SIZE + MPSC_TXB_SIZE +         \
-                                dma_get_cache_alignment() /* for alignment */)
-
-/* Rx and Tx Ring entry descriptors -- assume entry size is <= cacheline size */
-struct mpsc_rx_desc {
-        u16 bufsize;
-        u16 bytecnt;
-        u32 cmdstat;
-        u32 link;
-        u32 buf_ptr;
-} __attribute((packed));
-
-struct mpsc_tx_desc {
-        u16 bytecnt;
-        u16 shadow;
-        u32 cmdstat;
-        u32 link;
-        u32 buf_ptr;
-} __attribute((packed));
-
-/*
- * Some regs that have the erratum that you can't read them are are shared
- * between the two MPSC controllers.  This struct contains those shared regs.
- */
-struct mpsc_shared_regs {
-        phys_addr_t mpsc_routing_base_p;
-        phys_addr_t sdma_intr_base_p;
-
-        void __iomem *mpsc_routing_base;
-        void __iomem *sdma_intr_base;
-
-        u32 MPSC_MRR_m;
-        u32 MPSC_RCRR_m;
-        u32 MPSC_TCRR_m;
-        u32 SDMA_INTR_CAUSE_m;
-        u32 SDMA_INTR_MASK_m;
-};
-
-/* The main driver data structure */
-struct mpsc_port_info {
-        struct uart_port port;  /* Overlay uart_port structure */
-
-        /* Internal driver state for this ctlr */
-        u8 ready;
-        u8 rcv_data;
-        tcflag_t c_iflag;       /* save termios->c_iflag */
-        tcflag_t c_cflag;       /* save termios->c_cflag */
-
-        /* Info passed in from platform */
-        u8 mirror_regs;         /* Need to mirror regs? */
-        u8 cache_mgmt;          /* Need manual cache mgmt? */
-        u8 brg_can_tune;        /* BRG has baud tuning? */
-        u32 brg_clk_src;
-        u16 mpsc_max_idle;
-        int default_baud;
-        int default_bits;
-        int default_parity;
-        int default_flow;
-
-        /* Physical addresses of various blocks of registers (from platform) */
-        phys_addr_t mpsc_base_p;
-        phys_addr_t sdma_base_p;
-        phys_addr_t brg_base_p;
-
-        /* Virtual addresses of various blocks of registers (from platform) */
-        void __iomem *mpsc_base;
-        void __iomem *sdma_base;
-        void __iomem *brg_base;
-
-        /* Descriptor ring and buffer allocations */
-        void *dma_region;
-        dma_addr_t dma_region_p;
-
-        dma_addr_t rxr;         /* Rx descriptor ring */
-        dma_addr_t rxr_p;       /* Phys addr of rxr */
-        u8 *rxb;                /* Rx Ring I/O buf */
-        u8 *rxb_p;              /* Phys addr of rxb */
-        u32 rxr_posn;           /* First desc w/ Rx data */
-
-        dma_addr_t txr;         /* Tx descriptor ring */
-        dma_addr_t txr_p;       /* Phys addr of txr */
-        u8 *txb;                /* Tx Ring I/O buf */
-        u8 *txb_p;              /* Phys addr of txb */
-        int txr_head;           /* Where new data goes */
-        int txr_tail;           /* Where sent data comes off */
-
-        /* Mirrored values of regs we can't read (if 'mirror_regs' set) */
-        u32 MPSC_MPCR_m;
-        u32 MPSC_CHR_1_m;
-        u32 MPSC_CHR_2_m;
-        u32 MPSC_CHR_10_m;
-        u32 BRG_BCR_m;
-        struct mpsc_shared_regs *shared_regs;
-};
-
-/* Hooks to platform-specific code */
-int mpsc_platform_register_driver(void);
-void mpsc_platform_unregister_driver(void);
-
-/* Hooks back in to mpsc common to be called by platform-specific code */
-struct mpsc_port_info *mpsc_device_probe(int index);
-struct mpsc_port_info *mpsc_device_remove(int index);
-
-/*
- *****************************************************************************
- *
- *      Multi-Protocol Serial Controller Interface Registers
- *
- *****************************************************************************
- */
-
-/* Main Configuratino Register Offsets */
-#define MPSC_MMCRL                      0x0000
-#define MPSC_MMCRH                      0x0004
-#define MPSC_MPCR                       0x0008
-#define MPSC_CHR_1                      0x000c
-#define MPSC_CHR_2                      0x0010
-#define MPSC_CHR_3                      0x0014
-#define MPSC_CHR_4                      0x0018
-#define MPSC_CHR_5                      0x001c
-#define MPSC_CHR_6                      0x0020
-#define MPSC_CHR_7                      0x0024
-#define MPSC_CHR_8                      0x0028
-#define MPSC_CHR_9                      0x002c
-#define MPSC_CHR_10                     0x0030
-#define MPSC_CHR_11                     0x0034
-
-#define MPSC_MPCR_FRZ                   (1 << 9)
-#define MPSC_MPCR_CL_5                  0
-#define MPSC_MPCR_CL_6                  1
-#define MPSC_MPCR_CL_7                  2
-#define MPSC_MPCR_CL_8                  3
-#define MPSC_MPCR_SBL_1                 0
-#define MPSC_MPCR_SBL_2                 1
-
-#define MPSC_CHR_2_TEV                  (1<<1)
-#define MPSC_CHR_2_TA                   (1<<7)
-#define MPSC_CHR_2_TTCS                 (1<<9)
-#define MPSC_CHR_2_REV                  (1<<17)
-#define MPSC_CHR_2_RA                   (1<<23)
-#define MPSC_CHR_2_CRD                  (1<<25)
-#define MPSC_CHR_2_EH                   (1<<31)
-#define MPSC_CHR_2_PAR_ODD              0
-#define MPSC_CHR_2_PAR_SPACE            1
-#define MPSC_CHR_2_PAR_EVEN             2
-#define MPSC_CHR_2_PAR_MARK             3
-
-/* MPSC Signal Routing */
-#define MPSC_MRR                        0x0000
-#define MPSC_RCRR                       0x0004
-#define MPSC_TCRR                       0x0008
-
-/*
- *****************************************************************************
- *
- *      Serial DMA Controller Interface Registers
- *
- *****************************************************************************
- */
-
-#define SDMA_SDC                        0x0000
-#define SDMA_SDCM                       0x0008
-#define SDMA_RX_DESC                    0x0800
-#define SDMA_RX_BUF_PTR                 0x0808
-#define SDMA_SCRDP                      0x0810
-#define SDMA_TX_DESC                    0x0c00
-#define SDMA_SCTDP                      0x0c10
-#define SDMA_SFTDP                      0x0c14
-
-#define SDMA_DESC_CMDSTAT_PE            (1<<0)
-#define SDMA_DESC_CMDSTAT_CDL           (1<<1)
-#define SDMA_DESC_CMDSTAT_FR            (1<<3)
-#define SDMA_DESC_CMDSTAT_OR            (1<<6)
-#define SDMA_DESC_CMDSTAT_BR            (1<<9)
-#define SDMA_DESC_CMDSTAT_MI            (1<<10)
-#define SDMA_DESC_CMDSTAT_A             (1<<11)
-#define SDMA_DESC_CMDSTAT_AM            (1<<12)
-#define SDMA_DESC_CMDSTAT_CT            (1<<13)
-#define SDMA_DESC_CMDSTAT_C             (1<<14)
-#define SDMA_DESC_CMDSTAT_ES            (1<<15)
-#define SDMA_DESC_CMDSTAT_L             (1<<16)
-#define SDMA_DESC_CMDSTAT_F             (1<<17)
-#define SDMA_DESC_CMDSTAT_P             (1<<18)
-#define SDMA_DESC_CMDSTAT_EI            (1<<23)
-#define SDMA_DESC_CMDSTAT_O             (1<<31)
-
-#define SDMA_DESC_DFLT                  (SDMA_DESC_CMDSTAT_O |  \
-                                        SDMA_DESC_CMDSTAT_EI)
-
-#define SDMA_SDC_RFT                    (1<<0)
-#define SDMA_SDC_SFM                    (1<<1)
-#define SDMA_SDC_BLMR                   (1<<6)
-#define SDMA_SDC_BLMT                   (1<<7)
-#define SDMA_SDC_POVR                   (1<<8)
-#define SDMA_SDC_RIFB                   (1<<9)
-
-#define SDMA_SDCM_ERD                   (1<<7)
-#define SDMA_SDCM_AR                    (1<<15)
-#define SDMA_SDCM_STD                   (1<<16)
-#define SDMA_SDCM_TXD                   (1<<23)
-#define SDMA_SDCM_AT                    (1<<31)
-
-#define SDMA_0_CAUSE_RXBUF              (1<<0)
-#define SDMA_0_CAUSE_RXERR              (1<<1)
-#define SDMA_0_CAUSE_TXBUF              (1<<2)
-#define SDMA_0_CAUSE_TXEND              (1<<3)
-#define SDMA_1_CAUSE_RXBUF              (1<<8)
-#define SDMA_1_CAUSE_RXERR              (1<<9)
-#define SDMA_1_CAUSE_TXBUF              (1<<10)
-#define SDMA_1_CAUSE_TXEND              (1<<11)
-
-#define SDMA_CAUSE_RX_MASK      (SDMA_0_CAUSE_RXBUF | SDMA_0_CAUSE_RXERR | \
-        SDMA_1_CAUSE_RXBUF | SDMA_1_CAUSE_RXERR)
-#define SDMA_CAUSE_TX_MASK      (SDMA_0_CAUSE_TXBUF | SDMA_0_CAUSE_TXEND | \
-        SDMA_1_CAUSE_TXBUF | SDMA_1_CAUSE_TXEND)
-
-/* SDMA Interrupt registers */
-#define SDMA_INTR_CAUSE                 0x0000
-#define SDMA_INTR_MASK                  0x0080
-
-/*
- *****************************************************************************
- *
- *      Baud Rate Generator Interface Registers
- *
- *****************************************************************************
- */
-
-#define BRG_BCR                         0x0000
-#define BRG_BTR                         0x0004
-
-#endif                          /* __MPSC_H__ */
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c
index b848b7d944..3bdee64d1a 100644
--- a/drivers/serial/serial_txx9.c
+++ b/drivers/serial/serial_txx9.c
@@ -483,7 +483,7 @@ static int serial_txx9_startup(struct uart_port *port)
 
         /*
          * Clear the FIFO buffers and disable them.
-         * (they will be reeanbled in set_termios())
+         * (they will be reenabled in set_termios())
          */
         sio_set(up, TXX9_SIFCR,
                 TXX9_SIFCR_TFRST | TXX9_SIFCR_RFRST | TXX9_SIFCR_FRSTE);
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 9fe2283d91..1c4396c296 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -641,7 +641,7 @@ static int sunsu_startup(struct uart_port *port)
 
         /*
          * Clear the FIFO buffers and disable them.
-         * (they will be reeanbled in set_termios())
+         * (they will be reenabled in set_termios())
          */
         if (uart_config[up->port.type].flags & UART_CLEAR_FIFO) {
                 serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
diff --git a/drivers/telephony/phonedev.c b/drivers/telephony/phonedev.c
index 3c987f49f6..e166fffea8 100644
--- a/drivers/telephony/phonedev.c
+++ b/drivers/telephony/phonedev.c
@@ -29,6 +29,7 @@
 #include <linux/kmod.h>
 #include <linux/sem.h>
 #include <linux/devfs_fs_kernel.h>
+#include <linux/mutex.h>
 
 #define PHONE_NUM_DEVICES       256
 
@@ -37,7 +38,7 @@
  */
 
 static struct phone_device *phone_device[PHONE_NUM_DEVICES];
-static DECLARE_MUTEX(phone_lock);
+static DEFINE_MUTEX(phone_lock);
 
 /*
  *    Open a phone device.
@@ -48,19 +49,19 @@ static int phone_open(struct inode *inode, struct file *file)
         unsigned int minor = iminor(inode);
         int err = 0;
         struct phone_device *p;
-        struct file_operations *old_fops, *new_fops = NULL;
+        const struct file_operations *old_fops, *new_fops = NULL;
 
         if (minor >= PHONE_NUM_DEVICES)
                 return -ENODEV;
 
-        down(&phone_lock);
+        mutex_lock(&phone_lock);
         p = phone_device[minor];
         if (p)
                 new_fops = fops_get(p->f_op);
         if (!new_fops) {
-                up(&phone_lock);
+                mutex_unlock(&phone_lock);
                 request_module("char-major-%d-%d", PHONE_MAJOR, minor);
-                down(&phone_lock);
+                mutex_lock(&phone_lock);
                 p = phone_device[minor];
                 if (p == NULL || (new_fops = fops_get(p->f_op)) == NULL)
                 {
@@ -78,7 +79,7 @@ static int phone_open(struct inode *inode, struct file *file)
         }
         fops_put(old_fops);
 end:
-        up(&phone_lock);
+        mutex_unlock(&phone_lock);
         return err;
 }
 
@@ -100,18 +101,18 @@ int phone_register_device(struct phone_device *p, int unit)
                 end = unit + 1;  /* enter the loop at least one time */
         }
         
-        down(&phone_lock);
+        mutex_lock(&phone_lock);
         for (i = base; i < end; i++) {
                 if (phone_device[i] == NULL) {
                         phone_device[i] = p;
                         p->minor = i;
                         devfs_mk_cdev(MKDEV(PHONE_MAJOR,i),
                                 S_IFCHR|S_IRUSR|S_IWUSR, "phone/%d", i);
-                        up(&phone_lock);
+                        mutex_unlock(&phone_lock);
                         return 0;
                 }
         }
-        up(&phone_lock);
+        mutex_unlock(&phone_lock);
         return -ENFILE;
 }
 
@@ -121,12 +122,12 @@ int phone_register_device(struct phone_device *p, int unit)
 
 void phone_unregister_device(struct phone_device *pfd)
 {
-        down(&phone_lock);
+        mutex_lock(&phone_lock);
         if (phone_device[pfd->minor] != pfd)
                 panic("phone: bad unregister");
         devfs_remove("phone/%d", pfd->minor);
         phone_device[pfd->minor] = NULL;
-        up(&phone_lock);
+        mutex_unlock(&phone_lock);
 }
 
 
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index b1222cd4aa..7fdbc5dad5 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -87,8 +87,6 @@ source "drivers/usb/input/Kconfig"
 
 source "drivers/usb/image/Kconfig"
 
-source "drivers/usb/media/Kconfig"
-
 source "drivers/usb/net/Kconfig"
 
 source "drivers/usb/mon/Kconfig"
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index bb36a1c1db..9b7d9769fd 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -35,20 +35,6 @@ obj-$(CONFIG_USB_WACOM)		+= input/
 obj-$(CONFIG_USB_ACECAD)        += input/
 obj-$(CONFIG_USB_XPAD)          += input/
 
-obj-$(CONFIG_USB_DABUSB)        += media/
-obj-$(CONFIG_USB_DSBR)          += media/
-obj-$(CONFIG_USB_ET61X251)      += media/
-obj-$(CONFIG_USB_IBMCAM)        += media/
-obj-$(CONFIG_USB_KONICAWC)      += media/
-obj-$(CONFIG_USB_OV511)         += media/
-obj-$(CONFIG_USB_PWC)           += media/
-obj-$(CONFIG_USB_SE401)         += media/
-obj-$(CONFIG_USB_SN9C102)       += media/
-obj-$(CONFIG_USB_STV680)        += media/
-obj-$(CONFIG_USB_VICAM)         += media/
-obj-$(CONFIG_USB_W9968CF)       += media/
-obj-$(CONFIG_USB_ZC0301)        += media/
-
 obj-$(CONFIG_USB_CATC)          += net/
 obj-$(CONFIG_USB_KAWETH)        += net/
 obj-$(CONFIG_USB_PEGASUS)       += net/
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c
index 37b13368c8..b263a54a13 100644
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -24,15 +24,15 @@
 #include "usb.h"
 
 #define MAX_USB_MINORS  256
-static struct file_operations *usb_minors[MAX_USB_MINORS];
+static const struct file_operations *usb_minors[MAX_USB_MINORS];
 static DEFINE_SPINLOCK(minor_lock);
 
 static int usb_open(struct inode * inode, struct file * file)
 {
         int minor = iminor(inode);
-        struct file_operations *c;
+        const struct file_operations *c;
         int err = -ENODEV;
-        struct file_operations *old_fops, *new_fops = NULL;
+        const struct file_operations *old_fops, *new_fops = NULL;
 
         spin_lock (&minor_lock);
         c = usb_minors[minor];
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index e0afb5ad29..0d2193b692 100644
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -296,7 +296,7 @@ done:
 
 #ifdef CONFIG_PPC_PMAC
                 /* Disable ASIC clocks for USB */
-                if (_machine == _MACH_Pmac) {
+                if (machine_is(powermac)) {
                         struct device_node      *of_node;
 
                         of_node = pci_device_to_OF_node (dev);
@@ -331,7 +331,7 @@ int usb_hcd_pci_resume (struct pci_dev *dev)
 
 #ifdef CONFIG_PPC_PMAC
         /* Reenable ASIC clocks for USB */
-        if (_machine == _MACH_Pmac) {
+        if (machine_is(powermac)) {
                 struct device_node *of_node;
 
                 of_node = pci_device_to_OF_node (dev);
diff --git a/drivers/usb/core/notify.c b/drivers/usb/core/notify.c
index 4b55285de9..fe0ed54fa0 100644
--- a/drivers/usb/core/notify.c
+++ b/drivers/usb/core/notify.c
@@ -16,57 +16,7 @@
 #include <linux/mutex.h>
 #include "usb.h"
 
-
-static struct notifier_block *usb_notifier_list;
-static DEFINE_MUTEX(usb_notifier_lock);
-
-static void usb_notifier_chain_register(struct notifier_block **list,
-                                        struct notifier_block *n)
-{
-        mutex_lock(&usb_notifier_lock);
-        while (*list) {
-                if (n->priority > (*list)->priority)
-                        break;
-                list = &((*list)->next);
-        }
-        n->next = *list;
-        *list = n;
-        mutex_unlock(&usb_notifier_lock);
-}
-
-static void usb_notifier_chain_unregister(struct notifier_block **nl,
-                                   struct notifier_block *n)
-{
-        mutex_lock(&usb_notifier_lock);
-        while ((*nl)!=NULL) {
-                if ((*nl)==n) {
-                        *nl = n->next;
-                        goto exit;
-                }
-                nl=&((*nl)->next);
-        }
-exit:
-        mutex_unlock(&usb_notifier_lock);
-}
-
-static int usb_notifier_call_chain(struct notifier_block **n,
-                                   unsigned long val, void *v)
-{
-        int ret=NOTIFY_DONE;
-        struct notifier_block *nb = *n;
-
-        mutex_lock(&usb_notifier_lock);
-        while (nb) {
-                ret = nb->notifier_call(nb,val,v);
-                if (ret&NOTIFY_STOP_MASK) {
-                        goto exit;
-                }
-                nb = nb->next;
-        }
-exit:
-        mutex_unlock(&usb_notifier_lock);
-        return ret;
-}
+static BLOCKING_NOTIFIER_HEAD(usb_notifier_list);
 
 /**
  * usb_register_notify - register a notifier callback whenever a usb change happens
@@ -76,7 +26,7 @@ exit:
  */
 void usb_register_notify(struct notifier_block *nb)
 {
-        usb_notifier_chain_register(&usb_notifier_list, nb);
+        blocking_notifier_chain_register(&usb_notifier_list, nb);
 }
 EXPORT_SYMBOL_GPL(usb_register_notify);
 
@@ -89,27 +39,28 @@ EXPORT_SYMBOL_GPL(usb_register_notify);
  */
 void usb_unregister_notify(struct notifier_block *nb)
 {
-        usb_notifier_chain_unregister(&usb_notifier_list, nb);
+        blocking_notifier_chain_unregister(&usb_notifier_list, nb);
 }
 EXPORT_SYMBOL_GPL(usb_unregister_notify);
 
 
 void usb_notify_add_device(struct usb_device *udev)
 {
-        usb_notifier_call_chain(&usb_notifier_list, USB_DEVICE_ADD, udev);
+        blocking_notifier_call_chain(&usb_notifier_list, USB_DEVICE_ADD, udev);
 }
 
 void usb_notify_remove_device(struct usb_device *udev)
 {
-        usb_notifier_call_chain(&usb_notifier_list, USB_DEVICE_REMOVE, udev);
+        blocking_notifier_call_chain(&usb_notifier_list,
+                        USB_DEVICE_REMOVE, udev);
 }
 
 void usb_notify_add_bus(struct usb_bus *ubus)
 {
-        usb_notifier_call_chain(&usb_notifier_list, USB_BUS_ADD, ubus);
+        blocking_notifier_call_chain(&usb_notifier_list, USB_BUS_ADD, ubus);
 }
 
 void usb_notify_remove_bus(struct usb_bus *ubus)
 {
-        usb_notifier_call_chain(&usb_notifier_list, USB_BUS_REMOVE, ubus);
+        blocking_notifier_call_chain(&usb_notifier_list, USB_BUS_REMOVE, ubus);
 }
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index b44cfda76b..3f618ce699 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1581,7 +1581,7 @@ restart:
 
 static struct inode *
 gadgetfs_create_file (struct super_block *sb, char const *name,
-                void *data, struct file_operations *fops,
+                void *data, const struct file_operations *fops,
                 struct dentry **dentry_p);
 
 static int activate_ep_files (struct dev_data *dev)
@@ -1955,7 +1955,7 @@ module_param (default_perm, uint, 0644);
 
 static struct inode *
 gadgetfs_make_inode (struct super_block *sb,
-                void *data, struct file_operations *fops,
+                void *data, const struct file_operations *fops,
                 int mode)
 {
         struct inode *inode = new_inode (sb);
@@ -1979,7 +1979,7 @@ gadgetfs_make_inode (struct super_block *sb,
  */
 static struct inode *
 gadgetfs_create_file (struct super_block *sb, char const *name,
-                void *data, struct file_operations *fops,
+                void *data, const struct file_operations *fops,
                 struct dentry **dentry_p)
 {
         struct dentry   *dentry;
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index 372527a835..682bf22156 100644
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
@@ -158,7 +158,7 @@ static int ohci_s3c2410_hub_control (
                 "s3c2410_hub_control(%p,0x%04x,0x%04x,0x%04x,%p,%04x)\n",
                 hcd, typeReq, wValue, wIndex, buf, wLength);
 
-        /* if we are only an humble host without any special capabilites
+        /* if we are only an humble host without any special capabilities
          * process the request straight away and exit */
 
         if (info == NULL) {
diff --git a/drivers/usb/media/Kconfig b/drivers/usb/media/Kconfig
deleted file mode 100644
index 189d40f96b..0000000000
--- a/drivers/usb/media/Kconfig
+++ /dev/null
@@ -1,241 +0,0 @@
-#
-# USB Multimedia device configuration
-#
-comment "USB Multimedia devices"
-        depends on USB
-
-config USB_DABUSB
-        tristate "DABUSB driver"
-        depends on USB
-        ---help---
-          A Digital Audio Broadcasting (DAB) Receiver for USB and Linux
-          brought to you by the DAB-Team
-          <http://wwwbode.cs.tum.edu/Par/arch/dab/>.  This driver can be taken
-          as an example for URB-based bulk, control, and isochronous
-          transactions. URB's are explained in
-          <file:Documentation/usb/URB.txt>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called dabusb.
-
-comment "Video4Linux support is needed for USB Multimedia device support"
-        depends on USB && VIDEO_DEV=n
-
-config USB_VICAM
-        tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)"
-        depends on USB && VIDEO_DEV && EXPERIMENTAL
-        ---help---
-          Say Y here if you have 3com homeconnect camera (vicam).
-
-          This driver uses the Video For Linux API. You must say Y or M to
-          "Video For Linux" (under Multimedia Devices) to use this driver.
-          Information on this API and pointers to "v4l" programs may be found
-          at <file:Documentation/video4linux/API.html>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called vicam.
-
-config USB_DSBR
-        tristate "D-Link USB FM radio support (EXPERIMENTAL)"
-        depends on USB && VIDEO_DEV && EXPERIMENTAL
-        ---help---
-          Say Y here if you want to connect this type of radio to your
-          computer's USB port. Note that the audio is not digital, and
-          you must connect the line out connector to a sound card or a
-          set of speakers.
-
-          This driver uses the Video For Linux API.  You must enable
-          (Y or M in config) Video For Linux (under Character Devices)
-          to use this driver.  Information on this API and pointers to
-          "v4l" programs may be found at
-          <file:Documentation/video4linux/API.html>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called dsbr100.
-
-config USB_ET61X251
-        tristate "USB ET61X[12]51 PC Camera Controller support"
-        depends on USB && VIDEO_DEV
-        ---help---
-          Say Y here if you want support for cameras based on Etoms ET61X151
-          or ET61X251 PC Camera Controllers.
-
-          See <file:Documentation/usb/et61x251.txt> for more informations.
-
-          This driver uses the Video For Linux API. You must say Y or M to
-          "Video For Linux" to use this driver.
-
-          To compile this driver as a module, choose M here: the
-          module will be called et61x251.
-
-config USB_IBMCAM
-        tristate "USB IBM (Xirlink) C-it Camera support"
-        depends on USB && VIDEO_DEV
-        ---help---
-          Say Y here if you want to connect a IBM "C-It" camera, also known as
-          "Xirlink PC Camera" to your computer's USB port.  For more
-          information, read <file:Documentation/usb/ibmcam.txt>.
-
-          This driver uses the Video For Linux API.  You must enable
-          (Y or M in config) Video For Linux (under Character Devices)
-          to use this driver.  Information on this API and pointers to
-          "v4l" programs may be found at
-          <file:Documentation/video4linux/API.html>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called ibmcam.
-
-          This camera has several configuration options which
-          can be specified when you load the module. Read
-          <file:Documentation/usb/ibmcam.txt> to learn more.
-
-config USB_KONICAWC
-        tristate "USB Konica Webcam support"
-        depends on USB && VIDEO_DEV
-        ---help---
-          Say Y here if you want support for webcams based on a Konica
-          chipset. This is known to work with the Intel YC76 webcam.
-
-          This driver uses the Video For Linux API.  You must enable
-          (Y or M in config) Video For Linux (under Character Devices)
-          to use this driver.  Information on this API and pointers to
-          "v4l" programs may be found at
-          <file:Documentation/video4linux/API.html>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called konicawc.
-
-config USB_OV511
-        tristate "USB OV511 Camera support"
-        depends on USB && VIDEO_DEV
-        ---help---
-          Say Y here if you want to connect this type of camera to your
-          computer's USB port. See <file:Documentation/usb/ov511.txt> for more
-          information and for a list of supported cameras.
-
-          This driver uses the Video For Linux API. You must say Y or M to
-          "Video For Linux" (under Character Devices) to use this driver.
-          Information on this API and pointers to "v4l" programs may be found
-          at <file:Documentation/video4linux/API.html>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called ov511.
-
-config USB_SE401
-        tristate "USB SE401 Camera support"
-        depends on USB && VIDEO_DEV
-        ---help---
-          Say Y here if you want to connect this type of camera to your
-          computer's USB port. See <file:Documentation/usb/se401.txt> for more
-          information and for a list of supported cameras.
-
-          This driver uses the Video For Linux API. You must say Y or M to
-          "Video For Linux" (under Multimedia Devices) to use this driver.
-          Information on this API and pointers to "v4l" programs may be found
-          at <file:Documentation/video4linux/API.html>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called se401.
-
-config USB_SN9C102
-        tristate "USB SN9C10x PC Camera Controller support"
-        depends on USB && VIDEO_DEV
-        ---help---
-          Say Y here if you want support for cameras based on SONiX SN9C101,
-          SN9C102 or SN9C103 PC Camera Controllers.
-
-          See <file:Documentation/usb/sn9c102.txt> for more informations.
-
-          This driver uses the Video For Linux API. You must say Y or M to
-          "Video For Linux" to use this driver.
-
-          To compile this driver as a module, choose M here: the
-          module will be called sn9c102.
-
-config USB_STV680
-        tristate "USB STV680 (Pencam) Camera support"
-        depends on USB && VIDEO_DEV
-        ---help---
-          Say Y here if you want to connect this type of camera to your
-          computer's USB port. This includes the Pencam line of cameras.
-          See <file:Documentation/usb/stv680.txt> for more information and for
-          a list of supported cameras.
-
-          This driver uses the Video For Linux API. You must say Y or M to
-          "Video For Linux" (under Multimedia Devices) to use this driver.
-          Information on this API and pointers to "v4l" programs may be found
-          at <file:Documentation/video4linux/API.html>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called stv680.
-
-config USB_W9968CF
-        tristate "USB W996[87]CF JPEG Dual Mode Camera support"
-        depends on USB && VIDEO_DEV && I2C && VIDEO_OVCAMCHIP
-        ---help---
-          Say Y here if you want support for cameras based on OV681 or
-          Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips.
-        
-          This driver has an optional plugin, which is distributed as a
-          separate module only (released under GPL). It allows to use higher 
-          resolutions and framerates, but cannot be included in the official 
-          Linux kernel for performance purposes.
-
-          See <file:Documentation/usb/w9968cf.txt> for more informations.
-
-          This driver uses the Video For Linux and the I2C APIs. It needs the
-          OmniVision Camera Chip support as well. You must say Y or M to
-          "Video For Linux", "I2C Support" and "OmniVision Camera Chip 
-          support" to use this driver.
-
-          To compile this driver as a module, choose M here: the
-          module will be called w9968cf.
-
-config USB_ZC0301
-        tristate "USB ZC0301 Image Processor and Control Chip support"
-        depends on USB && VIDEO_DEV
-        ---help---
-          Say Y here if you want support for cameras based on the ZC0301
-          Image Processor and Control Chip.
-
-          See <file:Documentation/usb/zc0301.txt> for more informations.
-
-          This driver uses the Video For Linux API. You must say Y or M to
-          "Video For Linux" to use this driver.
-
-          To compile this driver as a module, choose M here: the
-          module will be called zc0301.
-
-config USB_PWC
-        tristate "USB Philips Cameras"
-        depends on USB && VIDEO_DEV
-        ---help---
-          Say Y or M here if you want to use one of these Philips & OEM
-          webcams:
-           * Philips PCA645, PCA646
-           * Philips PCVC675, PCVC680, PCVC690
-           * Philips PCVC720/40, PCVC730, PCVC740, PCVC750
-           * Askey VC010
-           * Logitech QuickCam Pro 3000, 4000, 'Zoom', 'Notebook Pro' 
-             and 'Orbit'/'Sphere'
-           * Samsung MPC-C10, MPC-C30
-           * Creative Webcam 5, Pro Ex
-           * SOTEC Afina Eye
-           * Visionite VCS-UC300, VCS-UM100
-           
-          The PCA635, PCVC665 and PCVC720/20 are not supported by this driver
-          and never will be, but the 665 and 720/20 are supported by other 
-          drivers.
-
-          See <file:Documentation/usb/philips.txt> for more information and
-          installation instructions.
-
-          The built-in microphone is enabled by selecting USB Audio support.
-
-          This driver uses the Video For Linux API. You must say Y or M to
-          "Video For Linux" (under Character Devices) to use this driver.
-          Information on this API and pointers to "v4l" programs may be found
-          at <file:Documentation/video4linux/API.html>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called pwc.
diff --git a/drivers/usb/media/Makefile b/drivers/usb/media/Makefile
deleted file mode 100644
index 50e89a33b8..0000000000
--- a/drivers/usb/media/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Makefile for USB Media drivers
-#
-
-sn9c102-objs    := sn9c102_core.o sn9c102_hv7131d.o sn9c102_mi0343.o \
-                   sn9c102_ov7630.o sn9c102_pas106b.o sn9c102_pas202bca.o \
-                   sn9c102_pas202bcb.o sn9c102_tas5110c1b.o \
-                   sn9c102_tas5130d1b.o
-et61x251-objs   := et61x251_core.o et61x251_tas5130d1b.o
-zc0301-objs     := zc0301_core.o zc0301_pas202bcb.o
-
-obj-$(CONFIG_USB_DABUSB)        += dabusb.o
-obj-$(CONFIG_USB_DSBR)          += dsbr100.o
-obj-$(CONFIG_USB_ET61X251)      += et61x251.o
-obj-$(CONFIG_USB_IBMCAM)        += ibmcam.o usbvideo.o ultracam.o
-obj-$(CONFIG_USB_KONICAWC)      += konicawc.o usbvideo.o
-obj-$(CONFIG_USB_OV511)         += ov511.o
-obj-$(CONFIG_USB_SE401)         += se401.o
-obj-$(CONFIG_USB_SN9C102)       += sn9c102.o
-obj-$(CONFIG_USB_STV680)        += stv680.o
-obj-$(CONFIG_USB_VICAM)         += vicam.o usbvideo.o
-obj-$(CONFIG_USB_W9968CF)       += w9968cf.o
-obj-$(CONFIG_USB_ZC0301)        += zc0301.o
-obj-$(CONFIG_USB_PWC)           += pwc/
diff --git a/drivers/usb/media/pwc/pwc-kiara.c b/drivers/usb/media/pwc/pwc-kiara.c
deleted file mode 100644
index c498c68bac..0000000000
--- a/drivers/usb/media/pwc/pwc-kiara.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/* Linux driver for Philips webcam
-   (C) 2004      Luc Saillard (luc@saillard.org)
-
-   NOTE: this version of pwc is an unofficial (modified) release of pwc & pcwx
-   driver and thus may have bugs that are not present in the original version.
-   Please send bug reports and support requests to <luc@saillard.org>.
-   The decompression routines have been implemented by reverse-engineering the
-   Nemosoft binary pwcx module. Caveat emptor.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-
-/* This tables contains entries for the 730/740/750 (Kiara) camera, with
-   4 different qualities (no compression, low, medium, high).
-   It lists the bandwidth requirements for said mode by its alternate interface
-   number. An alternate of 0 means that the mode is unavailable.
-
-   There are 6 * 4 * 4 entries:
-     6 different resolutions subqcif, qsif, qcif, sif, cif, vga
-     6 framerates: 5, 10, 15, 20, 25, 30
-     4 compression modi: none, low, medium, high
-
-   When an uncompressed mode is not available, the next available compressed mode
-   will be chosen (unless the decompressor is absent). Sometimes there are only
-   1 or 2 compressed modes available; in that case entries are duplicated.
-*/
-
-
-#include "pwc-kiara.h"
-#include "pwc-uncompress.h"
-
-const struct Kiara_table_entry Kiara_table[PSZ_MAX][6][4] =
-{
-   /* SQCIF */
-   {
-      /* 5 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-      /* 10 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-      /* 15 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-      /* 20 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-      /* 25 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-      /* 30 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-   },
-   /* QSIF */
-   {
-      /* 5 fps */
-      {
-         {1, 146,    0, {0x1D, 0xF4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x92, 0x00, 0x80}},
-         {1, 146,    0, {0x1D, 0xF4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x92, 0x00, 0x80}},
-         {1, 146,    0, {0x1D, 0xF4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x92, 0x00, 0x80}},
-         {1, 146,    0, {0x1D, 0xF4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x92, 0x00, 0x80}},
-      },
-      /* 10 fps */
-      {
-         {2, 291,    0, {0x1C, 0xF4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x23, 0x01, 0x80}},
-         {1, 192,  630, {0x14, 0xF4, 0x30, 0x13, 0xA9, 0x12, 0xE1, 0x17, 0x08, 0xC0, 0x00, 0x80}},
-         {1, 192,  630, {0x14, 0xF4, 0x30, 0x13, 0xA9, 0x12, 0xE1, 0x17, 0x08, 0xC0, 0x00, 0x80}},
-         {1, 192,  630, {0x14, 0xF4, 0x30, 0x13, 0xA9, 0x12, 0xE1, 0x17, 0x08, 0xC0, 0x00, 0x80}},
-      },
-      /* 15 fps */
-      {
-         {3, 437,    0, {0x1B, 0xF4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0xB5, 0x01, 0x80}},
-         {2, 292,  640, {0x13, 0xF4, 0x30, 0x13, 0xF7, 0x13, 0x2F, 0x13, 0x20, 0x24, 0x01, 0x80}},
-         {2, 292,  640, {0x13, 0xF4, 0x30, 0x13, 0xF7, 0x13, 0x2F, 0x13, 0x20, 0x24, 0x01, 0x80}},
-         {1, 192,  420, {0x13, 0xF4, 0x30, 0x0D, 0x1B, 0x0C, 0x53, 0x1E, 0x18, 0xC0, 0x00, 0x80}},
-      },
-      /* 20 fps */
-      {
-         {4, 589,    0, {0x1A, 0xF4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x4D, 0x02, 0x80}},
-         {3, 448,  730, {0x12, 0xF4, 0x30, 0x16, 0xC9, 0x16, 0x01, 0x0E, 0x18, 0xC0, 0x01, 0x80}},
-         {2, 292,  476, {0x12, 0xF4, 0x30, 0x0E, 0xD8, 0x0E, 0x10, 0x19, 0x18, 0x24, 0x01, 0x80}},
-         {1, 192,  312, {0x12, 0xF4, 0x50, 0x09, 0xB3, 0x08, 0xEB, 0x1E, 0x18, 0xC0, 0x00, 0x80}},
-      },
-      /* 25 fps */
-      {
-         {5, 703,    0, {0x19, 0xF4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0xBF, 0x02, 0x80}},
-         {3, 447,  610, {0x11, 0xF4, 0x30, 0x13, 0x0B, 0x12, 0x43, 0x14, 0x28, 0xBF, 0x01, 0x80}},
-         {2, 292,  398, {0x11, 0xF4, 0x50, 0x0C, 0x6C, 0x0B, 0xA4, 0x1E, 0x28, 0x24, 0x01, 0x80}},
-         {1, 193,  262, {0x11, 0xF4, 0x50, 0x08, 0x23, 0x07, 0x5B, 0x1E, 0x28, 0xC1, 0x00, 0x80}},
-      },
-      /* 30 fps */
-      {
-         {8, 874,    0, {0x18, 0xF4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x6A, 0x03, 0x80}},
-         {5, 704,  730, {0x10, 0xF4, 0x30, 0x16, 0xC9, 0x16, 0x01, 0x0E, 0x28, 0xC0, 0x02, 0x80}},
-         {3, 448,  492, {0x10, 0xF4, 0x30, 0x0F, 0x5D, 0x0E, 0x95, 0x15, 0x28, 0xC0, 0x01, 0x80}},
-         {2, 292,  320, {0x10, 0xF4, 0x50, 0x09, 0xFB, 0x09, 0x33, 0x1E, 0x28, 0x24, 0x01, 0x80}},
-      },
-   },
-   /* QCIF */
-   {
-      /* 5 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-      /* 10 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-      /* 15 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-      /* 20 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-      /* 25 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-      /* 30 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-   },
-   /* SIF */
-   {
-      /* 5 fps */
-      {
-         {4, 582,    0, {0x0D, 0xF4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x46, 0x02, 0x80}},
-         {3, 387, 1276, {0x05, 0xF4, 0x30, 0x27, 0xD8, 0x26, 0x48, 0x03, 0x10, 0x83, 0x01, 0x80}},
-         {2, 291,  960, {0x05, 0xF4, 0x30, 0x1D, 0xF2, 0x1C, 0x62, 0x04, 0x10, 0x23, 0x01, 0x80}},
-         {1, 191,  630, {0x05, 0xF4, 0x50, 0x13, 0xA9, 0x12, 0x19, 0x05, 0x18, 0xBF, 0x00, 0x80}},
-      },
-      /* 10 fps */
-      {
-         {0, },
-         {6, 775, 1278, {0x04, 0xF4, 0x30, 0x27, 0xE8, 0x26, 0x58, 0x05, 0x30, 0x07, 0x03, 0x80}},
-         {3, 447,  736, {0x04, 0xF4, 0x30, 0x16, 0xFB, 0x15, 0x6B, 0x05, 0x28, 0xBF, 0x01, 0x80}},
-         {2, 292,  480, {0x04, 0xF4, 0x70, 0x0E, 0xF9, 0x0D, 0x69, 0x09, 0x28, 0x24, 0x01, 0x80}},
-      },
-      /* 15 fps */
-      {
-         {0, },
-         {9, 955, 1050, {0x03, 0xF4, 0x30, 0x20, 0xCF, 0x1F, 0x3F, 0x06, 0x48, 0xBB, 0x03, 0x80}},
-         {4, 592,  650, {0x03, 0xF4, 0x30, 0x14, 0x44, 0x12, 0xB4, 0x08, 0x30, 0x50, 0x02, 0x80}},
-         {3, 448,  492, {0x03, 0xF4, 0x50, 0x0F, 0x52, 0x0D, 0xC2, 0x09, 0x38, 0xC0, 0x01, 0x80}},
-      },
-      /* 20 fps */
-      {
-         {0, },
-         {9, 958,  782, {0x02, 0xF4, 0x30, 0x18, 0x6A, 0x16, 0xDA, 0x0B, 0x58, 0xBE, 0x03, 0x80}},
-         {5, 703,  574, {0x02, 0xF4, 0x50, 0x11, 0xE7, 0x10, 0x57, 0x0B, 0x40, 0xBF, 0x02, 0x80}},
-         {3, 446,  364, {0x02, 0xF4, 0x90, 0x0B, 0x5C, 0x09, 0xCC, 0x0E, 0x38, 0xBE, 0x01, 0x80}},
-      },
-      /* 25 fps */
-      {
-         {0, },
-         {9, 958,  654, {0x01, 0xF4, 0x30, 0x14, 0x66, 0x12, 0xD6, 0x0B, 0x50, 0xBE, 0x03, 0x80}},
-         {6, 776,  530, {0x01, 0xF4, 0x50, 0x10, 0x8C, 0x0E, 0xFC, 0x0C, 0x48, 0x08, 0x03, 0x80}},
-         {4, 592,  404, {0x01, 0xF4, 0x70, 0x0C, 0x96, 0x0B, 0x06, 0x0B, 0x48, 0x50, 0x02, 0x80}},
-      },
-      /* 30 fps */
-      {
-         {0, },
-         {9, 957,  526, {0x00, 0xF4, 0x50, 0x10, 0x68, 0x0E, 0xD8, 0x0D, 0x58, 0xBD, 0x03, 0x80}},
-         {6, 775,  426, {0x00, 0xF4, 0x70, 0x0D, 0x48, 0x0B, 0xB8, 0x0F, 0x50, 0x07, 0x03, 0x80}},
-         {4, 590,  324, {0x00, 0x7A, 0x88, 0x0A, 0x1C, 0x08, 0xB4, 0x0E, 0x50, 0x4E, 0x02, 0x80}},
-      },
-   },
-   /* CIF */
-   {
-      /* 5 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-      /* 10 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-      /* 15 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-      /* 20 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-      /* 25 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-      /* 30 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-   },
-   /* VGA */
-   {
-      /* 5 fps */
-      {
-         {0, },
-         {6, 773, 1272, {0x25, 0xF4, 0x30, 0x27, 0xB6, 0x24, 0x96, 0x02, 0x30, 0x05, 0x03, 0x80}},
-         {4, 592,  976, {0x25, 0xF4, 0x50, 0x1E, 0x78, 0x1B, 0x58, 0x03, 0x30, 0x50, 0x02, 0x80}},
-         {3, 448,  738, {0x25, 0xF4, 0x90, 0x17, 0x0C, 0x13, 0xEC, 0x04, 0x30, 0xC0, 0x01, 0x80}},
-      },
-      /* 10 fps */
-      {
-         {0, },
-         {9, 956,  788, {0x24, 0xF4, 0x70, 0x18, 0x9C, 0x15, 0x7C, 0x03, 0x48, 0xBC, 0x03, 0x80}},
-         {6, 776,  640, {0x24, 0xF4, 0xB0, 0x13, 0xFC, 0x11, 0x2C, 0x04, 0x48, 0x08, 0x03, 0x80}},
-         {4, 592,  488, {0x24, 0x7A, 0xE8, 0x0F, 0x3C, 0x0C, 0x6C, 0x06, 0x48, 0x50, 0x02, 0x80}},
-      },
-      /* 15 fps */
-      {
-         {0, },
-         {9, 957,  526, {0x23, 0x7A, 0xE8, 0x10, 0x68, 0x0D, 0x98, 0x06, 0x58, 0xBD, 0x03, 0x80}},
-         {9, 957,  526, {0x23, 0x7A, 0xE8, 0x10, 0x68, 0x0D, 0x98, 0x06, 0x58, 0xBD, 0x03, 0x80}},
-         {8, 895,  492, {0x23, 0x7A, 0xE8, 0x0F, 0x5D, 0x0C, 0x8D, 0x06, 0x58, 0x7F, 0x03, 0x80}},
-      },
-      /* 20 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-      /* 25 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-      /* 30 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-   },
-};
-
diff --git a/drivers/usb/media/pwc/pwc-timon.c b/drivers/usb/media/pwc/pwc-timon.c
deleted file mode 100644
index dee967173d..0000000000
--- a/drivers/usb/media/pwc/pwc-timon.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/* Linux driver for Philips webcam
-   (C) 2004      Luc Saillard (luc@saillard.org)
-
-   NOTE: this version of pwc is an unofficial (modified) release of pwc & pcwx
-   driver and thus may have bugs that are not present in the original version.
-   Please send bug reports and support requests to <luc@saillard.org>.
-   The decompression routines have been implemented by reverse-engineering the
-   Nemosoft binary pwcx module. Caveat emptor.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-
-/* This tables contains entries for the 675/680/690 (Timon) camera, with
-   4 different qualities (no compression, low, medium, high).
-   It lists the bandwidth requirements for said mode by its alternate interface
-   number. An alternate of 0 means that the mode is unavailable.
-
-   There are 6 * 4 * 4 entries:
-     6 different resolutions subqcif, qsif, qcif, sif, cif, vga
-     6 framerates: 5, 10, 15, 20, 25, 30
-     4 compression modi: none, low, medium, high
-
-   When an uncompressed mode is not available, the next available compressed mode
-   will be chosen (unless the decompressor is absent). Sometimes there are only
-   1 or 2 compressed modes available; in that case entries are duplicated.
-*/
-
-#include "pwc-timon.h"
-
-const struct Timon_table_entry Timon_table[PSZ_MAX][6][4] =
-{
-   /* SQCIF */
-   {
-      /* 5 fps */
-      {
-         {1, 140,    0, {0x05, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x8C, 0xFC, 0x80, 0x02}},
-         {1, 140,    0, {0x05, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x8C, 0xFC, 0x80, 0x02}},
-         {1, 140,    0, {0x05, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x8C, 0xFC, 0x80, 0x02}},
-         {1, 140,    0, {0x05, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x8C, 0xFC, 0x80, 0x02}},
-      },
-      /* 10 fps */
-      {
-         {2, 280,    0, {0x04, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x18, 0xA9, 0x80, 0x02}},
-         {2, 280,    0, {0x04, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x18, 0xA9, 0x80, 0x02}},
-         {2, 280,    0, {0x04, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x18, 0xA9, 0x80, 0x02}},
-         {2, 280,    0, {0x04, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x18, 0xA9, 0x80, 0x02}},
-      },
-      /* 15 fps */
-      {
-         {3, 410,    0, {0x03, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x9A, 0x71, 0x80, 0x02}},
-         {3, 410,    0, {0x03, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x9A, 0x71, 0x80, 0x02}},
-         {3, 410,    0, {0x03, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x9A, 0x71, 0x80, 0x02}},
-         {3, 410,    0, {0x03, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x9A, 0x71, 0x80, 0x02}},
-      },
-      /* 20 fps */
-      {
-         {4, 559,    0, {0x02, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x2F, 0x56, 0x80, 0x02}},
-         {4, 559,    0, {0x02, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x2F, 0x56, 0x80, 0x02}},
-         {4, 559,    0, {0x02, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x2F, 0x56, 0x80, 0x02}},
-         {4, 559,    0, {0x02, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x2F, 0x56, 0x80, 0x02}},
-      },
-      /* 25 fps */
-      {
-         {5, 659,    0, {0x01, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x93, 0x46, 0x80, 0x02}},
-         {5, 659,    0, {0x01, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x93, 0x46, 0x80, 0x02}},
-         {5, 659,    0, {0x01, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x93, 0x46, 0x80, 0x02}},
-         {5, 659,    0, {0x01, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x93, 0x46, 0x80, 0x02}},
-      },
-      /* 30 fps */
-      {
-         {7, 838,    0, {0x00, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x46, 0x3B, 0x80, 0x02}},
-         {7, 838,    0, {0x00, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x46, 0x3B, 0x80, 0x02}},
-         {7, 838,    0, {0x00, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x46, 0x3B, 0x80, 0x02}},
-         {7, 838,    0, {0x00, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x46, 0x3B, 0x80, 0x02}},
-      },
-   },
-   /* QSIF */
-   {
-      /* 5 fps */
-      {
-         {1, 146,    0, {0x2D, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x92, 0xFC, 0xC0, 0x02}},
-         {1, 146,    0, {0x2D, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x92, 0xFC, 0xC0, 0x02}},
-         {1, 146,    0, {0x2D, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x92, 0xFC, 0xC0, 0x02}},
-         {1, 146,    0, {0x2D, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x92, 0xFC, 0xC0, 0x02}},
-      },
-      /* 10 fps */
-      {
-         {2, 291,    0, {0x2C, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x23, 0xA1, 0xC0, 0x02}},
-         {1, 191,  630, {0x2C, 0xF4, 0x05, 0x13, 0xA9, 0x12, 0xE1, 0x17, 0x08, 0xBF, 0xF4, 0xC0, 0x02}},
-         {1, 191,  630, {0x2C, 0xF4, 0x05, 0x13, 0xA9, 0x12, 0xE1, 0x17, 0x08, 0xBF, 0xF4, 0xC0, 0x02}},
-         {1, 191,  630, {0x2C, 0xF4, 0x05, 0x13, 0xA9, 0x12, 0xE1, 0x17, 0x08, 0xBF, 0xF4, 0xC0, 0x02}},
-      },
-      /* 15 fps */
-      {
-         {3, 437,    0, {0x2B, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0xB5, 0x6D, 0xC0, 0x02}},
-         {2, 291,  640, {0x2B, 0xF4, 0x05, 0x13, 0xF7, 0x13, 0x2F, 0x13, 0x08, 0x23, 0xA1, 0xC0, 0x02}},
-         {2, 291,  640, {0x2B, 0xF4, 0x05, 0x13, 0xF7, 0x13, 0x2F, 0x13, 0x08, 0x23, 0xA1, 0xC0, 0x02}},
-         {1, 191,  420, {0x2B, 0xF4, 0x0D, 0x0D, 0x1B, 0x0C, 0x53, 0x1E, 0x08, 0xBF, 0xF4, 0xC0, 0x02}},
-      },
-      /* 20 fps */
-      {
-         {4, 588,    0, {0x2A, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x4C, 0x52, 0xC0, 0x02}},
-         {3, 447,  730, {0x2A, 0xF4, 0x05, 0x16, 0xC9, 0x16, 0x01, 0x0E, 0x18, 0xBF, 0x69, 0xC0, 0x02}},
-         {2, 292,  476, {0x2A, 0xF4, 0x0D, 0x0E, 0xD8, 0x0E, 0x10, 0x19, 0x18, 0x24, 0xA1, 0xC0, 0x02}},
-         {1, 192,  312, {0x2A, 0xF4, 0x1D, 0x09, 0xB3, 0x08, 0xEB, 0x1E, 0x18, 0xC0, 0xF4, 0xC0, 0x02}},
-      },
-      /* 25 fps */
-      {
-         {5, 703,    0, {0x29, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0xBF, 0x42, 0xC0, 0x02}},
-         {3, 447,  610, {0x29, 0xF4, 0x05, 0x13, 0x0B, 0x12, 0x43, 0x14, 0x18, 0xBF, 0x69, 0xC0, 0x02}},
-         {2, 292,  398, {0x29, 0xF4, 0x0D, 0x0C, 0x6C, 0x0B, 0xA4, 0x1E, 0x18, 0x24, 0xA1, 0xC0, 0x02}},
-         {1, 192,  262, {0x29, 0xF4, 0x25, 0x08, 0x23, 0x07, 0x5B, 0x1E, 0x18, 0xC0, 0xF4, 0xC0, 0x02}},
-      },
-      /* 30 fps */
-      {
-         {8, 873,    0, {0x28, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x69, 0x37, 0xC0, 0x02}},
-         {5, 704,  774, {0x28, 0xF4, 0x05, 0x18, 0x21, 0x17, 0x59, 0x0F, 0x18, 0xC0, 0x42, 0xC0, 0x02}},
-         {3, 448,  492, {0x28, 0xF4, 0x05, 0x0F, 0x5D, 0x0E, 0x95, 0x15, 0x18, 0xC0, 0x69, 0xC0, 0x02}},
-         {2, 291,  320, {0x28, 0xF4, 0x1D, 0x09, 0xFB, 0x09, 0x33, 0x1E, 0x18, 0x23, 0xA1, 0xC0, 0x02}},
-      },
-   },
-   /* QCIF */
-   {
-      /* 5 fps */
-      {
-         {1, 193,    0, {0x0D, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0xC1, 0xF4, 0xC0, 0x02}},
-         {1, 193,    0, {0x0D, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0xC1, 0xF4, 0xC0, 0x02}},
-         {1, 193,    0, {0x0D, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0xC1, 0xF4, 0xC0, 0x02}},
-         {1, 193,    0, {0x0D, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0xC1, 0xF4, 0xC0, 0x02}},
-      },
-      /* 10 fps */
-      {
-         {3, 385,    0, {0x0C, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x81, 0x79, 0xC0, 0x02}},
-         {2, 291,  800, {0x0C, 0xF4, 0x05, 0x18, 0xF4, 0x18, 0x18, 0x11, 0x08, 0x23, 0xA1, 0xC0, 0x02}},
-         {2, 291,  800, {0x0C, 0xF4, 0x05, 0x18, 0xF4, 0x18, 0x18, 0x11, 0x08, 0x23, 0xA1, 0xC0, 0x02}},
-         {1, 194,  532, {0x0C, 0xF4, 0x05, 0x10, 0x9A, 0x0F, 0xBE, 0x1B, 0x08, 0xC2, 0xF0, 0xC0, 0x02}},
-      },
-      /* 15 fps */
-      {
-         {4, 577,    0, {0x0B, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x41, 0x52, 0xC0, 0x02}},
-         {3, 447,  818, {0x0B, 0xF4, 0x05, 0x19, 0x89, 0x18, 0xAD, 0x0F, 0x10, 0xBF, 0x69, 0xC0, 0x02}},
-         {2, 292,  534, {0x0B, 0xF4, 0x05, 0x10, 0xA3, 0x0F, 0xC7, 0x19, 0x10, 0x24, 0xA1, 0xC0, 0x02}},
-         {1, 195,  356, {0x0B, 0xF4, 0x15, 0x0B, 0x11, 0x0A, 0x35, 0x1E, 0x10, 0xC3, 0xF0, 0xC0, 0x02}},
-      },
-      /* 20 fps */
-      {
-         {6, 776,    0, {0x0A, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x08, 0x3F, 0xC0, 0x02}},
-         {4, 591,  804, {0x0A, 0xF4, 0x05, 0x19, 0x1E, 0x18, 0x42, 0x0F, 0x18, 0x4F, 0x4E, 0xC0, 0x02}},
-         {3, 447,  608, {0x0A, 0xF4, 0x05, 0x12, 0xFD, 0x12, 0x21, 0x15, 0x18, 0xBF, 0x69, 0xC0, 0x02}},
-         {2, 291,  396, {0x0A, 0xF4, 0x15, 0x0C, 0x5E, 0x0B, 0x82, 0x1E, 0x18, 0x23, 0xA1, 0xC0, 0x02}},
-      },
-      /* 25 fps */
-      {
-         {9, 928,    0, {0x09, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0xA0, 0x33, 0xC0, 0x02}},
-         {5, 703,  800, {0x09, 0xF4, 0x05, 0x18, 0xF4, 0x18, 0x18, 0x10, 0x18, 0xBF, 0x42, 0xC0, 0x02}},
-         {3, 447,  508, {0x09, 0xF4, 0x0D, 0x0F, 0xD2, 0x0E, 0xF6, 0x1B, 0x18, 0xBF, 0x69, 0xC0, 0x02}},
-         {2, 292,  332, {0x09, 0xF4, 0x1D, 0x0A, 0x5A, 0x09, 0x7E, 0x1E, 0x18, 0x24, 0xA1, 0xC0, 0x02}},
-      },
-      /* 30 fps */
-      {
-         {0, },
-         {9, 956,  876, {0x08, 0xF4, 0x05, 0x1B, 0x58, 0x1A, 0x7C, 0x0E, 0x20, 0xBC, 0x33, 0x10, 0x02}},
-         {4, 592,  542, {0x08, 0xF4, 0x05, 0x10, 0xE4, 0x10, 0x08, 0x17, 0x20, 0x50, 0x4E, 0x10, 0x02}},
-         {2, 291,  266, {0x08, 0xF4, 0x25, 0x08, 0x48, 0x07, 0x6C, 0x1E, 0x20, 0x23, 0xA1, 0x10, 0x02}},
-      },
-   },
-   /* SIF */
-   {
-      /* 5 fps */
-      {
-         {4, 582,    0, {0x35, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x46, 0x52, 0x60, 0x02}},
-         {3, 387, 1276, {0x35, 0xF4, 0x05, 0x27, 0xD8, 0x26, 0x48, 0x03, 0x10, 0x83, 0x79, 0x60, 0x02}},
-         {2, 291,  960, {0x35, 0xF4, 0x0D, 0x1D, 0xF2, 0x1C, 0x62, 0x04, 0x10, 0x23, 0xA1, 0x60, 0x02}},
-         {1, 191,  630, {0x35, 0xF4, 0x1D, 0x13, 0xA9, 0x12, 0x19, 0x05, 0x08, 0xBF, 0xF4, 0x60, 0x02}},
-      },
-      /* 10 fps */
-      {
-         {0, },
-         {6, 775, 1278, {0x34, 0xF4, 0x05, 0x27, 0xE8, 0x26, 0x58, 0x05, 0x30, 0x07, 0x3F, 0x10, 0x02}},
-         {3, 447,  736, {0x34, 0xF4, 0x15, 0x16, 0xFB, 0x15, 0x6B, 0x05, 0x18, 0xBF, 0x69, 0x10, 0x02}},
-         {2, 291,  480, {0x34, 0xF4, 0x2D, 0x0E, 0xF9, 0x0D, 0x69, 0x09, 0x18, 0x23, 0xA1, 0x10, 0x02}},
-      },
-      /* 15 fps */
-      {
-         {0, },
-         {9, 955, 1050, {0x33, 0xF4, 0x05, 0x20, 0xCF, 0x1F, 0x3F, 0x06, 0x48, 0xBB, 0x33, 0x10, 0x02}},
-         {4, 591,  650, {0x33, 0xF4, 0x15, 0x14, 0x44, 0x12, 0xB4, 0x08, 0x30, 0x4F, 0x4E, 0x10, 0x02}},
-         {3, 448,  492, {0x33, 0xF4, 0x25, 0x0F, 0x52, 0x0D, 0xC2, 0x09, 0x28, 0xC0, 0x69, 0x10, 0x02}},
-      },
-      /* 20 fps */
-      {
-         {0, },
-         {9, 958,  782, {0x32, 0xF4, 0x0D, 0x18, 0x6A, 0x16, 0xDA, 0x0B, 0x58, 0xBE, 0x33, 0xD0, 0x02}},
-         {5, 703,  574, {0x32, 0xF4, 0x1D, 0x11, 0xE7, 0x10, 0x57, 0x0B, 0x40, 0xBF, 0x42, 0xD0, 0x02}},
-         {3, 446,  364, {0x32, 0xF4, 0x3D, 0x0B, 0x5C, 0x09, 0xCC, 0x0E, 0x30, 0xBE, 0x69, 0xD0, 0x02}},
-      },
-      /* 25 fps */
-      {
-         {0, },
-         {9, 958,  654, {0x31, 0xF4, 0x15, 0x14, 0x66, 0x12, 0xD6, 0x0B, 0x50, 0xBE, 0x33, 0x90, 0x02}},
-         {6, 776,  530, {0x31, 0xF4, 0x25, 0x10, 0x8C, 0x0E, 0xFC, 0x0C, 0x48, 0x08, 0x3F, 0x90, 0x02}},
-         {4, 592,  404, {0x31, 0xF4, 0x35, 0x0C, 0x96, 0x0B, 0x06, 0x0B, 0x38, 0x50, 0x4E, 0x90, 0x02}},
-      },
-      /* 30 fps */
-      {
-         {0, },
-         {9, 957,  526, {0x30, 0xF4, 0x25, 0x10, 0x68, 0x0E, 0xD8, 0x0D, 0x58, 0xBD, 0x33, 0x60, 0x02}},
-         {6, 775,  426, {0x30, 0xF4, 0x35, 0x0D, 0x48, 0x0B, 0xB8, 0x0F, 0x50, 0x07, 0x3F, 0x60, 0x02}},
-         {4, 590,  324, {0x30, 0x7A, 0x4B, 0x0A, 0x1C, 0x08, 0xB4, 0x0E, 0x40, 0x4E, 0x52, 0x60, 0x02}},
-      },
-   },
-   /* CIF */
-   {
-      /* 5 fps */
-      {
-         {6, 771,    0, {0x15, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x3F, 0x80, 0x02}},
-         {4, 465, 1278, {0x15, 0xF4, 0x05, 0x27, 0xEE, 0x26, 0x36, 0x03, 0x18, 0xD1, 0x65, 0x80, 0x02}},
-         {2, 291,  800, {0x15, 0xF4, 0x15, 0x18, 0xF4, 0x17, 0x3C, 0x05, 0x18, 0x23, 0xA1, 0x80, 0x02}},
-         {1, 193,  528, {0x15, 0xF4, 0x2D, 0x10, 0x7E, 0x0E, 0xC6, 0x0A, 0x18, 0xC1, 0xF4, 0x80, 0x02}},
-      },
-      /* 10 fps */
-      {
-         {0, },
-         {9, 932, 1278, {0x14, 0xF4, 0x05, 0x27, 0xEE, 0x26, 0x36, 0x04, 0x30, 0xA4, 0x33, 0x10, 0x02}},
-         {4, 591,  812, {0x14, 0xF4, 0x15, 0x19, 0x56, 0x17, 0x9E, 0x06, 0x28, 0x4F, 0x4E, 0x10, 0x02}},
-         {2, 291,  400, {0x14, 0xF4, 0x3D, 0x0C, 0x7A, 0x0A, 0xC2, 0x0E, 0x28, 0x23, 0xA1, 0x10, 0x02}},
-      },
-      /* 15 fps */
-      {
-         {0, },
-         {9, 956,  876, {0x13, 0xF4, 0x0D, 0x1B, 0x58, 0x19, 0xA0, 0x05, 0x38, 0xBC, 0x33, 0x60, 0x02}},
-         {5, 703,  644, {0x13, 0xF4, 0x1D, 0x14, 0x1C, 0x12, 0x64, 0x08, 0x38, 0xBF, 0x42, 0x60, 0x02}},
-         {3, 448,  410, {0x13, 0xF4, 0x3D, 0x0C, 0xC4, 0x0B, 0x0C, 0x0E, 0x38, 0xC0, 0x69, 0x60, 0x02}},
-      },
-      /* 20 fps */
-      {
-         {0, },
-         {9, 956,  650, {0x12, 0xF4, 0x1D, 0x14, 0x4A, 0x12, 0x92, 0x09, 0x48, 0xBC, 0x33, 0x10, 0x03}},
-         {6, 776,  528, {0x12, 0xF4, 0x2D, 0x10, 0x7E, 0x0E, 0xC6, 0x0A, 0x40, 0x08, 0x3F, 0x10, 0x03}},
-         {4, 591,  402, {0x12, 0xF4, 0x3D, 0x0C, 0x8F, 0x0A, 0xD7, 0x0E, 0x40, 0x4F, 0x4E, 0x10, 0x03}},
-      },
-      /* 25 fps */
-      {
-         {0, },
-         {9, 956,  544, {0x11, 0xF4, 0x25, 0x10, 0xF4, 0x0F, 0x3C, 0x0A, 0x48, 0xBC, 0x33, 0xC0, 0x02}},
-         {7, 840,  478, {0x11, 0xF4, 0x2D, 0x0E, 0xEB, 0x0D, 0x33, 0x0B, 0x48, 0x48, 0x3B, 0xC0, 0x02}},
-         {5, 703,  400, {0x11, 0xF4, 0x3D, 0x0C, 0x7A, 0x0A, 0xC2, 0x0E, 0x48, 0xBF, 0x42, 0xC0, 0x02}},
-      },
-      /* 30 fps */
-      {
-         {0, },
-         {9, 956,  438, {0x10, 0xF4, 0x35, 0x0D, 0xAC, 0x0B, 0xF4, 0x0D, 0x50, 0xBC, 0x33, 0x10, 0x02}},
-         {7, 838,  384, {0x10, 0xF4, 0x45, 0x0B, 0xFD, 0x0A, 0x45, 0x0F, 0x50, 0x46, 0x3B, 0x10, 0x02}},
-         {6, 773,  354, {0x10, 0x7A, 0x4B, 0x0B, 0x0C, 0x09, 0x80, 0x10, 0x50, 0x05, 0x3F, 0x10, 0x02}},
-      },
-   },
-   /* VGA */
-   {
-      /* 5 fps */
-      {
-         {0, },
-         {6, 773, 1272, {0x1D, 0xF4, 0x15, 0x27, 0xB6, 0x24, 0x96, 0x02, 0x30, 0x05, 0x3F, 0x10, 0x02}},
-         {4, 592,  976, {0x1D, 0xF4, 0x25, 0x1E, 0x78, 0x1B, 0x58, 0x03, 0x30, 0x50, 0x4E, 0x10, 0x02}},
-         {3, 448,  738, {0x1D, 0xF4, 0x3D, 0x17, 0x0C, 0x13, 0xEC, 0x04, 0x30, 0xC0, 0x69, 0x10, 0x02}},
-      },
-      /* 10 fps */
-      {
-         {0, },
-         {9, 956,  788, {0x1C, 0xF4, 0x35, 0x18, 0x9C, 0x15, 0x7C, 0x03, 0x48, 0xBC, 0x33, 0x10, 0x02}},
-         {6, 776,  640, {0x1C, 0x7A, 0x53, 0x13, 0xFC, 0x11, 0x2C, 0x04, 0x48, 0x08, 0x3F, 0x10, 0x02}},
-         {4, 592,  488, {0x1C, 0x7A, 0x6B, 0x0F, 0x3C, 0x0C, 0x6C, 0x06, 0x48, 0x50, 0x4E, 0x10, 0x02}},
-      },
-      /* 15 fps */
-      {
-         {0, },
-         {9, 957,  526, {0x1B, 0x7A, 0x63, 0x10, 0x68, 0x0D, 0x98, 0x06, 0x58, 0xBD, 0x33, 0x80, 0x02}},
-         {9, 957,  526, {0x1B, 0x7A, 0x63, 0x10, 0x68, 0x0D, 0x98, 0x06, 0x58, 0xBD, 0x33, 0x80, 0x02}},
-         {8, 895,  492, {0x1B, 0x7A, 0x6B, 0x0F, 0x5D, 0x0C, 0x8D, 0x06, 0x58, 0x7F, 0x37, 0x80, 0x02}},
-      },
-      /* 20 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-      /* 25 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-      /* 30 fps */
-      {
-         {0, },
-         {0, },
-         {0, },
-         {0, },
-      },
-   },
-};
-
diff --git a/drivers/usb/net/zaurus.c b/drivers/usb/net/zaurus.c
index 9c5ab25137..f7ac9d6b98 100644
--- a/drivers/usb/net/zaurus.c
+++ b/drivers/usb/net/zaurus.c
@@ -217,7 +217,7 @@ static int blan_mdlm_bind(struct usbnet *dev, struct usb_interface *intf)
                          * with devices that use it and those that don't.
                          */
                         if ((detail->bDetailData[1] & ~0x02) != 0x01) {
-                                /* bmDataCapabilites == 0 would be fine too,
+                                /* bmDataCapabilities == 0 would be fine too,
                                  * but framing is minidriver-coupled for now.
                                  */
 bad_detail:
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index a8455c9e79..495db5755d 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -102,7 +102,7 @@ static struct usb_driver option_driver = {
         .no_dynamic_id =        1,
 };
 
-/* The card has three separate interfaces, wich the serial driver
+/* The card has three separate interfaces, which the serial driver
  * recognizes separately, thus num_port=1.
  */
 static struct usb_serial_driver option_3port_device = {
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index fdebd60a32..22e9d696fd 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -70,6 +70,22 @@ config FB_MACMODES
        depends on FB
        default n
 
+config FB_FIRMWARE_EDID
+       bool "Enable firmware EDID"
+       depends on FB
+       default y
+       ---help---
+         This enables access to the EDID transferred from the firmware.
+         On the i386, this is from the Video BIOS. Enable this if DDC/I2C
+         transfers do not work for your driver and if you are using
+         nvidiafb, i810fb or savagefb.
+
+         In general, choosing Y for this option is safe.  If you
+         experience extremely long delays while booting before you get
+         something on your display, try setting this to N.  Matrox cards in
+         combination with certain motherboards and monitors are known to
+         suffer from this problem.
+
 config FB_MODE_HELPERS
         bool "Enable Video Mode Handling Helpers"
         depends on FB
@@ -1202,6 +1218,17 @@ config FB_AU1100
         bool "Au1100 LCD Driver"
         depends on (FB = y) && EXPERIMENTAL && PCI && MIPS && MIPS_PB1100=y
 
+config FB_AU1200
+        bool "Au1200 LCD Driver"
+        depends on FB && MIPS && SOC_AU1200
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        help
+          This is the framebuffer driver for the AMD Au1200 SOC.  It can drive
+          various panels and CRTs by passing in kernel cmd line option
+          au1200fb:panel=<name>.
+
 source "drivers/video/geode/Kconfig"
 
 config FB_FFB
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index aa434e725c..cb90218515 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -86,6 +86,7 @@ obj-$(CONFIG_FB_ASILIANT)	  += asiliantfb.o
 obj-$(CONFIG_FB_PXA)              += pxafb.o
 obj-$(CONFIG_FB_W100)             += w100fb.o
 obj-$(CONFIG_FB_AU1100)           += au1100fb.o
+obj-$(CONFIG_FB_AU1200)           += au1200fb.o
 obj-$(CONFIG_FB_PMAG_AA)          += pmag-aa-fb.o
 obj-$(CONFIG_FB_PMAG_BA)          += pmag-ba-fb.o
 obj-$(CONFIG_FB_PMAGB_B)          += pmagb-b-fb.o
diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c
index 76448d6ae8..98baecccb3 100644
--- a/drivers/video/acornfb.c
+++ b/drivers/video/acornfb.c
@@ -1308,7 +1308,7 @@ static int __init acornfb_probe(struct platform_device *dev)
         /*
          * Try to select a suitable default mode
          */
-        for (i = 0; i < sizeof(modedb) / sizeof(*modedb); i++) {
+        for (i = 0; i < ARRAY_SIZE(modedb); i++) {
                 unsigned long hs;
 
                 hs = modedb[i].refresh *
@@ -1380,7 +1380,7 @@ static int __init acornfb_probe(struct platform_device *dev)
          */
         free_unused_pages(PAGE_OFFSET + size, PAGE_OFFSET + MAX_SIZE);
 #endif
-        
+
         fb_info.fix.smem_len = size;
         current_par.palette_size   = VIDC_PALETTE_SIZE;
 
@@ -1391,7 +1391,7 @@ static int __init acornfb_probe(struct platform_device *dev)
          */
         do {
                 rc = fb_find_mode(&fb_info.var, &fb_info, NULL, modedb,
-                                 sizeof(modedb) / sizeof(*modedb),
+                                 ARRAY_SIZE(modedb),
                                  &acornfb_default_mode, DEFAULT_BPP);
                 /*
                  * If we found an exact match, all ok.
@@ -1408,7 +1408,7 @@ static int __init acornfb_probe(struct platform_device *dev)
                         break;
 
                 rc = fb_find_mode(&fb_info.var, &fb_info, NULL, modedb,
-                                 sizeof(modedb) / sizeof(*modedb),
+                                 ARRAY_SIZE(modedb),
                                  &acornfb_default_mode, DEFAULT_BPP);
                 if (rc)
                         break;
diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c
index c924d81f79..29f9f0dfe3 100644
--- a/drivers/video/asiliantfb.c
+++ b/drivers/video/asiliantfb.c
@@ -353,8 +353,6 @@ struct chips_init_reg {
         unsigned char data;
 };
 
-#define N_ELTS(x)       (sizeof(x) / sizeof(x[0]))
-
 static struct chips_init_reg chips_init_sr[] =
 {
         {0x00, 0x03},           /* Reset register */
@@ -460,22 +458,22 @@ static void __devinit chips_hw_init(struct fb_info *p)
 {
         int i;
 
-        for (i = 0; i < N_ELTS(chips_init_xr); ++i)
+        for (i = 0; i < ARRAY_SIZE(chips_init_xr); ++i)
                 write_xr(chips_init_xr[i].addr, chips_init_xr[i].data);
         write_xr(0x81, 0x12);
         write_xr(0x82, 0x08);
         write_xr(0x20, 0x00);
-        for (i = 0; i < N_ELTS(chips_init_sr); ++i)
+        for (i = 0; i < ARRAY_SIZE(chips_init_sr); ++i)
                 write_sr(chips_init_sr[i].addr, chips_init_sr[i].data);
-        for (i = 0; i < N_ELTS(chips_init_gr); ++i)
+        for (i = 0; i < ARRAY_SIZE(chips_init_gr); ++i)
                 write_gr(chips_init_gr[i].addr, chips_init_gr[i].data);
-        for (i = 0; i < N_ELTS(chips_init_ar); ++i)
+        for (i = 0; i < ARRAY_SIZE(chips_init_ar); ++i)
                 write_ar(chips_init_ar[i].addr, chips_init_ar[i].data);
         /* Enable video output in attribute index register */
         writeb(0x20, mmio_base + 0x780);
-        for (i = 0; i < N_ELTS(chips_init_cr); ++i)
+        for (i = 0; i < ARRAY_SIZE(chips_init_cr); ++i)
                 write_cr(chips_init_cr[i].addr, chips_init_cr[i].data);
-        for (i = 0; i < N_ELTS(chips_init_fr); ++i)
+        for (i = 0; i < ARRAY_SIZE(chips_init_fr); ++i)
                 write_fr(chips_init_fr[i].addr, chips_init_fr[i].data);
 }
 
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 620c9a934e..f7bbff4ddc 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -67,6 +67,7 @@
 #include <asm/io.h>
 
 #ifdef CONFIG_PPC_PMAC
+#include <asm/machdep.h>
 #include <asm/pmac_feature.h>
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
@@ -1725,9 +1726,9 @@ static int __init aty128_init(struct pci_dev *pdev, const struct pci_device_id *
         strcpy(video_card, "Rage128 XX ");
         video_card[8] = ent->device >> 8;
         video_card[9] = ent->device & 0xFF;
-            
+
         /* range check to make sure */
-        if (ent->driver_data < (sizeof(r128_family)/sizeof(char *)))
+        if (ent->driver_data < ARRAY_SIZE(r128_family))
             strncat(video_card, r128_family[ent->driver_data], sizeof(video_card));
 
         printk(KERN_INFO "aty128fb: %s [chip rev 0x%x] ", video_card, chip_rev);
@@ -1748,7 +1749,7 @@ static int __init aty128_init(struct pci_dev *pdev, const struct pci_device_id *
 
         var = default_var;
 #ifdef CONFIG_PPC_PMAC
-        if (_machine == _MACH_Pmac) {
+        if (machine_is(powermac)) {
                 /* Indicate sleep capability */
                 if (par->chip_gen == rage_M3) {
                         pmac_call_feature(PMAC_FTR_DEVICE_CAN_WAKE, NULL, 0, 1);
@@ -2011,7 +2012,7 @@ static int aty128fb_blank(int blank, struct fb_info *fb)
                 return 0;
 
 #ifdef CONFIG_PMAC_BACKLIGHT
-        if ((_machine == _MACH_Pmac) && blank)
+        if (machine_is(powermac) && blank)
                 set_backlight_enable(0);
 #endif /* CONFIG_PMAC_BACKLIGHT */
 
@@ -2029,7 +2030,7 @@ static int aty128fb_blank(int blank, struct fb_info *fb)
                 aty128_set_lcd_enable(par, par->lcd_on && !blank);
         }
 #ifdef CONFIG_PMAC_BACKLIGHT
-        if ((_machine == _MACH_Pmac) && !blank)
+        if (machine_is(powermac) && !blank)
                 set_backlight_enable(1);
 #endif /* CONFIG_PMAC_BACKLIGHT */
         return 0;
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 485be386a8..b39e72d541 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -75,6 +75,7 @@
 #include "ati_ids.h"
 
 #ifdef __powerpc__
+#include <asm/machdep.h>
 #include <asm/prom.h>
 #include "../macmodes.h"
 #endif
@@ -434,7 +435,7 @@ static int __devinit correct_chipset(struct atyfb_par *par)
         const char *name;
         int i;
 
-        for (i = sizeof(aty_chips) / sizeof(*aty_chips) - 1; i >= 0; i--)
+        for (i = ARRAY_SIZE(aty_chips) - 1; i >= 0; i--)
                 if (par->pci_id == aty_chips[i].pci_id)
                         break;
 
@@ -2168,10 +2169,10 @@ static void __init aty_calc_mem_refresh(struct atyfb_par *par, int xclk)
 
         if (IS_XL(par->pci_id) || IS_MOBILITY(par->pci_id)) {
                 refresh_tbl = ragexl_tbl;
-                size = sizeof(ragexl_tbl)/sizeof(int);
+                size = ARRAY_SIZE(ragexl_tbl);
         } else {
                 refresh_tbl = ragepro_tbl;
-                size = sizeof(ragepro_tbl)/sizeof(int);
+                size = ARRAY_SIZE(ragepro_tbl);
         }
 
         for (i=0; i < size; i++) {
@@ -2298,6 +2299,10 @@ static int __init aty_init(struct fb_info *info, const char *name)
                 case CLK_ATI18818_1:
                         par->pll_ops = &aty_pll_ati18818_1;
                         break;
+                case CLK_IBMRGB514:
+                        par->pll_ops = &aty_pll_ibm514;
+                        break;
+#if 0 /* dead code */
                 case CLK_STG1703:
                         par->pll_ops = &aty_pll_stg1703;
                         break;
@@ -2307,9 +2312,7 @@ static int __init aty_init(struct fb_info *info, const char *name)
                 case CLK_ATT20C408:
                         par->pll_ops = &aty_pll_att20c408;
                         break;
-                case CLK_IBMRGB514:
-                        par->pll_ops = &aty_pll_ibm514;
-                        break;
+#endif
                 default:
                         PRINTKI("aty_init: CLK type not implemented yet!");
                         par->pll_ops = &aty_pll_unsupported;
@@ -2516,7 +2519,7 @@ static int __init aty_init(struct fb_info *info, const char *name)
 
         memset(&var, 0, sizeof(var));
 #ifdef CONFIG_PPC
-        if (_machine == _MACH_Pmac) {
+        if (machine_is(powermac)) {
                 /*
                  *  FIXME: The NVRAM stuff should be put in a Mac-specific file, as it
                  *         applies to all Mac video cards
@@ -2671,7 +2674,7 @@ static int atyfb_blank(int blank, struct fb_info *info)
                 return 0;
 
 #ifdef CONFIG_PMAC_BACKLIGHT
-        if ((_machine == _MACH_Pmac) && blank > FB_BLANK_NORMAL)
+        if (machine_is(powermac) && blank > FB_BLANK_NORMAL)
                 set_backlight_enable(0);
 #elif defined(CONFIG_FB_ATY_GENERIC_LCD)
         if (par->lcd_table && blank > FB_BLANK_NORMAL &&
@@ -2703,7 +2706,7 @@ static int atyfb_blank(int blank, struct fb_info *info)
         aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par);
 
 #ifdef CONFIG_PMAC_BACKLIGHT
-        if ((_machine == _MACH_Pmac) && blank <= FB_BLANK_NORMAL)
+        if (machine_is(powermac) && blank <= FB_BLANK_NORMAL)
                 set_backlight_enable(1);
 #elif defined(CONFIG_FB_ATY_GENERIC_LCD)
         if (par->lcd_table && blank <= FB_BLANK_NORMAL &&
@@ -3397,7 +3400,7 @@ static int __devinit atyfb_pci_probe(struct pci_dev *pdev, const struct pci_devi
         struct atyfb_par *par;
         int i, rc = -ENOMEM;
 
-        for (i = sizeof(aty_chips) / sizeof(*aty_chips) - 1; i >= 0; i--)
+        for (i = ARRAY_SIZE(aty_chips); i >= 0; i--)
                 if (pdev->device == aty_chips[i].pci_id)
                         break;
 
diff --git a/drivers/video/aty/mach64_gx.c b/drivers/video/aty/mach64_gx.c
index 01fdff7948..2045639cb6 100644
--- a/drivers/video/aty/mach64_gx.c
+++ b/drivers/video/aty/mach64_gx.c
@@ -149,8 +149,7 @@ static int aty_var_to_pll_514(const struct fb_info *info, u32 vclk_per,
         };
         int i;
 
-        for (i = 0; i < sizeof(RGB514_clocks) / sizeof(*RGB514_clocks);
-             i++)
+        for (i = 0; i < ARRAY_SIZE(RGB514_clocks); i++)
                 if (vclk_per <= RGB514_clocks[i].limit) {
                         pll->ibm514.m = RGB514_clocks[i].m;
                         pll->ibm514.n = RGB514_clocks[i].n;
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index c9f0c5a07e..9a6b5b39b8 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -1067,7 +1067,7 @@ static int radeon_setcolreg (unsigned regno, unsigned red, unsigned green,
 
 
         if (regno > 255)
-                return 1;
+                return -EINVAL;
 
         red >>= 8;
         green >>= 8;
@@ -1086,9 +1086,9 @@ static int radeon_setcolreg (unsigned regno, unsigned red, unsigned green,
                         pindex = regno * 8;
 
                         if (rinfo->depth == 16 && regno > 63)
-                                return 1;
+                                return -EINVAL;
                         if (rinfo->depth == 15 && regno > 31)
-                                return 1;
+                                return -EINVAL;
 
                         /* For 565, the green component is mixed one order
                          * below
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index 5886a2f132..c7091761ce 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -20,7 +20,7 @@
 #include <linux/agp_backend.h>
 
 #ifdef CONFIG_PPC_PMAC
-#include <asm/processor.h>
+#include <asm/machdep.h>
 #include <asm/prom.h>
 #include <asm/pmac_feature.h>
 #endif
@@ -2745,7 +2745,7 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk)
                 rinfo->pm_mode |= radeon_pm_off;
         }
 #if defined(CONFIG_PPC_PMAC)
-        if (_machine == _MACH_Pmac && rinfo->of_node) {
+        if (machine_is(powermac) && rinfo->of_node) {
                 if (rinfo->is_mobility && rinfo->pm_reg &&
                     rinfo->family <= CHIP_FAMILY_RV250)
                         rinfo->pm_mode |= radeon_pm_d2;
diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c
new file mode 100644
index 0000000000..b367de30b9
--- /dev/null
+++ b/drivers/video/au1200fb.c
@@ -0,0 +1,3844 @@
+/*
+ * BRIEF MODULE DESCRIPTION
+ *      Au1200 LCD Driver.
+ *
+ * Copyright 2004-2005 AMD
+ * Author: AMD
+ *
+ * Based on:
+ * linux/drivers/video/skeletonfb.c -- Skeleton for a frame buffer device
+ *  Created 28 Dec 1997 by Geert Uytterhoeven
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/ctype.h>
+#include <linux/dma-mapping.h>
+
+#include <asm/mach-au1x00/au1000.h>
+#include "au1200fb.h"
+
+#ifdef CONFIG_PM
+#include <asm/mach-au1x00/au1xxx_pm.h>
+#endif
+
+#ifndef CONFIG_FB_AU1200_DEVS
+#define CONFIG_FB_AU1200_DEVS 4
+#endif
+
+#define DRIVER_NAME "au1200fb"
+#define DRIVER_DESC "LCD controller driver for AU1200 processors"
+
+#define DEBUG 1
+
+#define print_err(f, arg...) printk(KERN_ERR DRIVER_NAME ": " f "\n", ## arg)
+#define print_warn(f, arg...) printk(KERN_WARNING DRIVER_NAME ": " f "\n", ## arg)
+#define print_info(f, arg...) printk(KERN_INFO DRIVER_NAME ": " f "\n", ## arg)
+
+#if DEBUG
+#define print_dbg(f, arg...) printk(KERN_DEBUG __FILE__ ": " f "\n", ## arg)
+#else
+#define print_dbg(f, arg...) do {} while (0)
+#endif
+
+
+#define AU1200_LCD_FB_IOCTL 0x46FF
+
+#define AU1200_LCD_SET_SCREEN 1
+#define AU1200_LCD_GET_SCREEN 2
+#define AU1200_LCD_SET_WINDOW 3
+#define AU1200_LCD_GET_WINDOW 4
+#define AU1200_LCD_SET_PANEL  5
+#define AU1200_LCD_GET_PANEL  6
+
+#define SCREEN_SIZE                 (1<< 1)
+#define SCREEN_BACKCOLOR    (1<< 2)
+#define SCREEN_BRIGHTNESS   (1<< 3)
+#define SCREEN_COLORKEY     (1<< 4)
+#define SCREEN_MASK         (1<< 5)
+
+struct au1200_lcd_global_regs_t {
+        unsigned int flags;
+        unsigned int xsize;
+        unsigned int ysize;
+        unsigned int backcolor;
+        unsigned int brightness;
+        unsigned int colorkey;
+        unsigned int mask;
+        unsigned int panel_choice;
+        char panel_desc[80];
+
+};
+
+#define WIN_POSITION            (1<< 0)
+#define WIN_ALPHA_COLOR         (1<< 1)
+#define WIN_ALPHA_MODE          (1<< 2)
+#define WIN_PRIORITY            (1<< 3)
+#define WIN_CHANNEL             (1<< 4)
+#define WIN_BUFFER_FORMAT       (1<< 5)
+#define WIN_COLOR_ORDER         (1<< 6)
+#define WIN_PIXEL_ORDER         (1<< 7)
+#define WIN_SIZE                (1<< 8)
+#define WIN_COLORKEY_MODE       (1<< 9)
+#define WIN_DOUBLE_BUFFER_MODE  (1<< 10)
+#define WIN_RAM_ARRAY_MODE      (1<< 11)
+#define WIN_BUFFER_SCALE        (1<< 12)
+#define WIN_ENABLE                  (1<< 13)
+
+struct au1200_lcd_window_regs_t {
+        unsigned int flags;
+        unsigned int xpos;
+        unsigned int ypos;
+        unsigned int alpha_color;
+        unsigned int alpha_mode;
+        unsigned int priority;
+        unsigned int channel;
+        unsigned int buffer_format;
+        unsigned int color_order;
+        unsigned int pixel_order;
+        unsigned int xsize;
+        unsigned int ysize;
+        unsigned int colorkey_mode;
+        unsigned int double_buffer_mode;
+        unsigned int ram_array_mode;
+        unsigned int xscale;
+        unsigned int yscale;
+        unsigned int enable;
+};
+
+
+struct au1200_lcd_iodata_t {
+        unsigned int subcmd;
+        struct au1200_lcd_global_regs_t global;
+        struct au1200_lcd_window_regs_t window;
+};
+
+#if defined(__BIG_ENDIAN)
+#define LCD_CONTROL_DEFAULT_PO LCD_CONTROL_PO_11
+#else
+#define LCD_CONTROL_DEFAULT_PO LCD_CONTROL_PO_00
+#endif
+#define LCD_CONTROL_DEFAULT_SBPPF LCD_CONTROL_SBPPF_565
+
+/* Private, per-framebuffer management information (independent of the panel itself) */
+struct au1200fb_device {
+        struct fb_info fb_info;                 /* FB driver info record */
+
+        int                                     plane;
+        unsigned char*          fb_mem;         /* FrameBuffer memory map */
+        unsigned int            fb_len;
+        dma_addr_t              fb_phys;
+};
+
+static struct au1200fb_device _au1200fb_devices[CONFIG_FB_AU1200_DEVS];
+/********************************************************************/
+
+/* LCD controller restrictions */
+#define AU1200_LCD_MAX_XRES     1280
+#define AU1200_LCD_MAX_YRES     1024
+#define AU1200_LCD_MAX_BPP      32
+#define AU1200_LCD_MAX_CLK      96000000 /* fixme: this needs to go away ? */
+#define AU1200_LCD_NBR_PALETTE_ENTRIES 256
+
+/* Default number of visible screen buffer to allocate */
+#define AU1200FB_NBR_VIDEO_BUFFERS 1
+
+/********************************************************************/
+
+static struct au1200_lcd *lcd = (struct au1200_lcd *) AU1200_LCD_ADDR;
+static int window_index = 2; /* default is zero */
+static int panel_index = 2; /* default is zero */
+static struct window_settings *win;
+static struct panel_settings *panel;
+static int noblanking = 1;
+static int nohwcursor = 0;
+
+struct window_settings {
+        unsigned char name[64];
+        uint32 mode_backcolor;
+        uint32 mode_colorkey;
+        uint32 mode_colorkeymsk;
+        struct {
+                int xres;
+                int yres;
+                int xpos;
+                int ypos;
+                uint32 mode_winctrl1; /* winctrl1[FRM,CCO,PO,PIPE] */
+                uint32 mode_winenable;
+        } w[4];
+};
+
+#if defined(__BIG_ENDIAN)
+#define LCD_WINCTRL1_PO_16BPP LCD_WINCTRL1_PO_00
+#else
+#define LCD_WINCTRL1_PO_16BPP LCD_WINCTRL1_PO_01
+#endif
+
+extern int board_au1200fb_panel_init (void);
+extern int board_au1200fb_panel_shutdown (void);
+
+#ifdef CONFIG_PM
+int au1200fb_pm_callback(au1xxx_power_dev_t *dev,
+                au1xxx_request_t request, void *data);
+au1xxx_power_dev_t *LCD_pm_dev;
+#endif
+
+/*
+ * Default window configurations
+ */
+static struct window_settings windows[] = {
+        { /* Index 0 */
+                "0-FS gfx, 1-video, 2-ovly gfx, 3-ovly gfx",
+                /* mode_backcolor       */ 0x006600ff,
+                /* mode_colorkey,msk*/ 0, 0,
+                {
+                        {
+                        /* xres, yres, xpos, ypos */ 0, 0, 0, 0,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565 |
+                                LCD_WINCTRL1_PO_16BPP,
+                        /* mode_winenable*/ LCD_WINENABLE_WEN0,
+                        },
+                        {
+                        /* xres, yres, xpos, ypos */ 100, 100, 100, 100,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565 |
+                                LCD_WINCTRL1_PO_16BPP |
+                                LCD_WINCTRL1_PIPE,
+                        /* mode_winenable*/ LCD_WINENABLE_WEN1,
+                        },
+                        {
+                        /* xres, yres, xpos, ypos */ 0, 0, 0, 0,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565 |
+                                LCD_WINCTRL1_PO_16BPP,
+                        /* mode_winenable*/ 0,
+                        },
+                        {
+                        /* xres, yres, xpos, ypos */ 0, 0, 0, 0,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565 |
+                                LCD_WINCTRL1_PO_16BPP |
+                                LCD_WINCTRL1_PIPE,
+                        /* mode_winenable*/ 0,
+                        },
+                },
+        },
+
+        { /* Index 1 */
+                "0-FS gfx, 1-video, 2-ovly gfx, 3-ovly gfx",
+                /* mode_backcolor       */ 0x006600ff,
+                /* mode_colorkey,msk*/ 0, 0,
+                {
+                        {
+                        /* xres, yres, xpos, ypos */ 320, 240, 5, 5,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_24BPP |
+                                LCD_WINCTRL1_PO_00,
+                        /* mode_winenable*/ LCD_WINENABLE_WEN0,
+                        },
+                        {
+                        /* xres, yres, xpos, ypos */ 0, 0, 0, 0,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565
+                                | LCD_WINCTRL1_PO_16BPP,
+                        /* mode_winenable*/ 0,
+                        },
+                        {
+                        /* xres, yres, xpos, ypos */ 100, 100, 0, 0,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565 |
+                                LCD_WINCTRL1_PO_16BPP |
+                                LCD_WINCTRL1_PIPE,
+                        /* mode_winenable*/ 0/*LCD_WINENABLE_WEN2*/,
+                        },
+                        {
+                        /* xres, yres, xpos, ypos */ 200, 25, 0, 0,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565 |
+                                LCD_WINCTRL1_PO_16BPP |
+                                LCD_WINCTRL1_PIPE,
+                        /* mode_winenable*/ 0,
+                        },
+                },
+        },
+        { /* Index 2 */
+                "0-FS gfx, 1-video, 2-ovly gfx, 3-ovly gfx",
+                /* mode_backcolor       */ 0x006600ff,
+                /* mode_colorkey,msk*/ 0, 0,
+                {
+                        {
+                        /* xres, yres, xpos, ypos */ 0, 0, 0, 0,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565 |
+                                LCD_WINCTRL1_PO_16BPP,
+                        /* mode_winenable*/ LCD_WINENABLE_WEN0,
+                        },
+                        {
+                        /* xres, yres, xpos, ypos */ 0, 0, 0, 0,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565 |
+                                LCD_WINCTRL1_PO_16BPP,
+                        /* mode_winenable*/ 0,
+                        },
+                        {
+                        /* xres, yres, xpos, ypos */ 0, 0, 0, 0,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_32BPP |
+                                LCD_WINCTRL1_PO_00|LCD_WINCTRL1_PIPE,
+                        /* mode_winenable*/ 0/*LCD_WINENABLE_WEN2*/,
+                        },
+                        {
+                        /* xres, yres, xpos, ypos */ 0, 0, 0, 0,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565 |
+                                LCD_WINCTRL1_PO_16BPP |
+                                LCD_WINCTRL1_PIPE,
+                        /* mode_winenable*/ 0,
+                        },
+                },
+        },
+        /* Need VGA 640 @ 24bpp, @ 32bpp */
+        /* Need VGA 800 @ 24bpp, @ 32bpp */
+        /* Need VGA 1024 @ 24bpp, @ 32bpp */
+};
+
+/*
+ * Controller configurations for various panels.
+ */
+
+struct panel_settings
+{
+        const char name[25];            /* Full name <vendor>_<model> */
+
+        struct  fb_monspecs monspecs;   /* FB monitor specs */
+
+        /* panel timings */
+        uint32 mode_screen;
+        uint32 mode_horztiming;
+        uint32 mode_verttiming;
+        uint32 mode_clkcontrol;
+        uint32 mode_pwmdiv;
+        uint32 mode_pwmhi;
+        uint32 mode_outmask;
+        uint32 mode_fifoctrl;
+        uint32 mode_toyclksrc;
+        uint32 mode_backlight;
+        uint32 mode_auxpll;
+        int (*device_init)(void);
+        int (*device_shutdown)(void);
+#define Xres min_xres
+#define Yres min_yres
+        u32     min_xres;               /* Minimum horizontal resolution */
+        u32     max_xres;               /* Maximum horizontal resolution */
+        u32     min_yres;               /* Minimum vertical resolution */
+        u32     max_yres;               /* Maximum vertical resolution */
+};
+
+/********************************************************************/
+/* fixme: Maybe a modedb for the CRT ? otherwise panels should be as-is */
+
+/* List of panels known to work with the AU1200 LCD controller.
+ * To add a new panel, enter the same specifications as the
+ * Generic_TFT one, and MAKE SURE that it doesn't conflicts
+ * with the controller restrictions. Restrictions are:
+ *
+ * STN color panels: max_bpp <= 12
+ * STN mono panels: max_bpp <= 4
+ * TFT panels: max_bpp <= 16
+ * max_xres <= 800
+ * max_yres <= 600
+ */
+static struct panel_settings known_lcd_panels[] =
+{
+        [0] = { /* QVGA 320x240 H:33.3kHz V:110Hz */
+                .name = "QVGA_320x240",
+                .monspecs = {
+                        .modedb = NULL,
+                        .modedb_len = 0,
+                        .hfmin = 30000,
+                        .hfmax = 70000,
+                        .vfmin = 60,
+                        .vfmax = 60,
+                        .dclkmin = 6000000,
+                        .dclkmax = 28000000,
+                        .input = FB_DISP_RGB,
+                },
+                .mode_screen            = LCD_SCREEN_SX_N(320) |
+                        LCD_SCREEN_SY_N(240),
+                .mode_horztiming        = 0x00c4623b,
+                .mode_verttiming        = 0x00502814,
+                .mode_clkcontrol        = 0x00020002, /* /4=24Mhz */
+                .mode_pwmdiv            = 0x00000000,
+                .mode_pwmhi             = 0x00000000,
+                .mode_outmask   = 0x00FFFFFF,
+                .mode_fifoctrl  = 0x2f2f2f2f,
+                .mode_toyclksrc = 0x00000004, /* AUXPLL directly */
+                .mode_backlight = 0x00000000,
+                .mode_auxpll            = 8, /* 96MHz AUXPLL */
+                .device_init            = NULL,
+                .device_shutdown        = NULL,
+                320, 320,
+                240, 240,
+        },
+
+        [1] = { /* VGA 640x480 H:30.3kHz V:58Hz */
+                .name = "VGA_640x480",
+                .monspecs = {
+                        .modedb = NULL,
+                        .modedb_len = 0,
+                        .hfmin = 30000,
+                        .hfmax = 70000,
+                        .vfmin = 60,
+                        .vfmax = 60,
+                        .dclkmin = 6000000,
+                        .dclkmax = 28000000,
+                        .input = FB_DISP_RGB,
+                },
+                .mode_screen            = 0x13f9df80,
+                .mode_horztiming        = 0x003c5859,
+                .mode_verttiming        = 0x00741201,
+                .mode_clkcontrol        = 0x00020001, /* /4=24Mhz */
+                .mode_pwmdiv            = 0x00000000,
+                .mode_pwmhi             = 0x00000000,
+                .mode_outmask   = 0x00FFFFFF,
+                .mode_fifoctrl  = 0x2f2f2f2f,
+                .mode_toyclksrc = 0x00000004, /* AUXPLL directly */
+                .mode_backlight = 0x00000000,
+                .mode_auxpll            = 8, /* 96MHz AUXPLL */
+                .device_init            = NULL,
+                .device_shutdown        = NULL,
+                640, 480,
+                640, 480,
+        },
+
+        [2] = { /* SVGA 800x600 H:46.1kHz V:69Hz */
+                .name = "SVGA_800x600",
+                .monspecs = {
+                        .modedb = NULL,
+                        .modedb_len = 0,
+                        .hfmin = 30000,
+                        .hfmax = 70000,
+                        .vfmin = 60,
+                        .vfmax = 60,
+                        .dclkmin = 6000000,
+                        .dclkmax = 28000000,
+                        .input = FB_DISP_RGB,
+                },
+                .mode_screen            = 0x18fa5780,
+                .mode_horztiming        = 0x00dc7e77,
+                .mode_verttiming        = 0x00584805,
+                .mode_clkcontrol        = 0x00020000, /* /2=48Mhz */
+                .mode_pwmdiv            = 0x00000000,
+                .mode_pwmhi             = 0x00000000,
+                .mode_outmask   = 0x00FFFFFF,
+                .mode_fifoctrl  = 0x2f2f2f2f,
+                .mode_toyclksrc = 0x00000004, /* AUXPLL directly */
+                .mode_backlight = 0x00000000,
+                .mode_auxpll            = 8, /* 96MHz AUXPLL */
+                .device_init            = NULL,
+                .device_shutdown        = NULL,
+                800, 800,
+                600, 600,
+        },
+
+        [3] = { /* XVGA 1024x768 H:56.2kHz V:70Hz */
+                .name = "XVGA_1024x768",
+                .monspecs = {
+                        .modedb = NULL,
+                        .modedb_len = 0,
+                        .hfmin = 30000,
+                        .hfmax = 70000,
+                        .vfmin = 60,
+                        .vfmax = 60,
+                        .dclkmin = 6000000,
+                        .dclkmax = 28000000,
+                        .input = FB_DISP_RGB,
+                },
+                .mode_screen            = 0x1ffaff80,
+                .mode_horztiming        = 0x007d0e57,
+                .mode_verttiming        = 0x00740a01,
+                .mode_clkcontrol        = 0x000A0000, /* /1 */
+                .mode_pwmdiv            = 0x00000000,
+                .mode_pwmhi             = 0x00000000,
+                .mode_outmask   = 0x00FFFFFF,
+                .mode_fifoctrl  = 0x2f2f2f2f,
+                .mode_toyclksrc = 0x00000004, /* AUXPLL directly */
+                .mode_backlight = 0x00000000,
+                .mode_auxpll            = 6, /* 72MHz AUXPLL */
+                .device_init            = NULL,
+                .device_shutdown        = NULL,
+                1024, 1024,
+                768, 768,
+        },
+
+        [4] = { /* XVGA XVGA 1280x1024 H:68.5kHz V:65Hz */
+                .name = "XVGA_1280x1024",
+                .monspecs = {
+                        .modedb = NULL,
+                        .modedb_len = 0,
+                        .hfmin = 30000,
+                        .hfmax = 70000,
+                        .vfmin = 60,
+                        .vfmax = 60,
+                        .dclkmin = 6000000,
+                        .dclkmax = 28000000,
+                        .input = FB_DISP_RGB,
+                },
+                .mode_screen            = 0x27fbff80,
+                .mode_horztiming        = 0x00cdb2c7,
+                .mode_verttiming        = 0x00600002,
+                .mode_clkcontrol        = 0x000A0000, /* /1 */
+                .mode_pwmdiv            = 0x00000000,
+                .mode_pwmhi             = 0x00000000,
+                .mode_outmask   = 0x00FFFFFF,
+                .mode_fifoctrl  = 0x2f2f2f2f,
+                .mode_toyclksrc = 0x00000004, /* AUXPLL directly */
+                .mode_backlight = 0x00000000,
+                .mode_auxpll            = 10, /* 120MHz AUXPLL */
+                .device_init            = NULL,
+                .device_shutdown        = NULL,
+                1280, 1280,
+                1024, 1024,
+        },
+
+        [5] = { /* Samsung 1024x768 TFT */
+                .name = "Samsung_1024x768_TFT",
+                .monspecs = {
+                        .modedb = NULL,
+                        .modedb_len = 0,
+                        .hfmin = 30000,
+                        .hfmax = 70000,
+                        .vfmin = 60,
+                        .vfmax = 60,
+                        .dclkmin = 6000000,
+                        .dclkmax = 28000000,
+                        .input = FB_DISP_RGB,
+                },
+                .mode_screen            = 0x1ffaff80,
+                .mode_horztiming        = 0x018cc677,
+                .mode_verttiming        = 0x00241217,
+                .mode_clkcontrol        = 0x00000000, /* SCB 0x1 /4=24Mhz */
+                .mode_pwmdiv            = 0x8000063f, /* SCB 0x0 */
+                .mode_pwmhi             = 0x03400000, /* SCB 0x0 */
+                .mode_outmask   = 0x00FFFFFF,
+                .mode_fifoctrl  = 0x2f2f2f2f,
+                .mode_toyclksrc = 0x00000004, /* AUXPLL directly */
+                .mode_backlight = 0x00000000,
+                .mode_auxpll            = 8, /* 96MHz AUXPLL */
+                .device_init            = board_au1200fb_panel_init,
+                .device_shutdown        = board_au1200fb_panel_shutdown,
+                1024, 1024,
+                768, 768,
+        },
+
+        [6] = { /* Toshiba 640x480 TFT */
+                .name = "Toshiba_640x480_TFT",
+                .monspecs = {
+                        .modedb = NULL,
+                        .modedb_len = 0,
+                        .hfmin = 30000,
+                        .hfmax = 70000,
+                        .vfmin = 60,
+                        .vfmax = 60,
+                        .dclkmin = 6000000,
+                        .dclkmax = 28000000,
+                        .input = FB_DISP_RGB,
+                },
+                .mode_screen            = LCD_SCREEN_SX_N(640) |
+                        LCD_SCREEN_SY_N(480),
+                .mode_horztiming        = LCD_HORZTIMING_HPW_N(96) |
+                        LCD_HORZTIMING_HND1_N(13) | LCD_HORZTIMING_HND2_N(51),
+                .mode_verttiming        = LCD_VERTTIMING_VPW_N(2) |
+                        LCD_VERTTIMING_VND1_N(11) | LCD_VERTTIMING_VND2_N(32),
+                .mode_clkcontrol        = 0x00000000, /* /4=24Mhz */
+                .mode_pwmdiv            = 0x8000063f,
+                .mode_pwmhi             = 0x03400000,
+                .mode_outmask   = 0x00fcfcfc,
+                .mode_fifoctrl  = 0x2f2f2f2f,
+                .mode_toyclksrc = 0x00000004, /* AUXPLL directly */
+                .mode_backlight = 0x00000000,
+                .mode_auxpll            = 8, /* 96MHz AUXPLL */
+                .device_init            = board_au1200fb_panel_init,
+                .device_shutdown        = board_au1200fb_panel_shutdown,
+                640, 480,
+                640, 480,
+        },
+
+        [7] = { /* Sharp 320x240 TFT */
+                .name = "Sharp_320x240_TFT",
+                .monspecs = {
+                        .modedb = NULL,
+                        .modedb_len = 0,
+                        .hfmin = 12500,
+                        .hfmax = 20000,
+                        .vfmin = 38,
+                        .vfmax = 81,
+                        .dclkmin = 4500000,
+                        .dclkmax = 6800000,
+                        .input = FB_DISP_RGB,
+                },
+                .mode_screen            = LCD_SCREEN_SX_N(320) |
+                        LCD_SCREEN_SY_N(240),
+                .mode_horztiming        = LCD_HORZTIMING_HPW_N(60) |
+                        LCD_HORZTIMING_HND1_N(13) | LCD_HORZTIMING_HND2_N(2),
+                .mode_verttiming        = LCD_VERTTIMING_VPW_N(2) |
+                        LCD_VERTTIMING_VND1_N(2) | LCD_VERTTIMING_VND2_N(5),
+                .mode_clkcontrol        = LCD_CLKCONTROL_PCD_N(7), /*16=6Mhz*/
+                .mode_pwmdiv            = 0x8000063f,
+                .mode_pwmhi             = 0x03400000,
+                .mode_outmask   = 0x00fcfcfc,
+                .mode_fifoctrl  = 0x2f2f2f2f,
+                .mode_toyclksrc = 0x00000004, /* AUXPLL directly */
+                .mode_backlight = 0x00000000,
+                .mode_auxpll            = 8, /* 96MHz AUXPLL */
+                .device_init            = board_au1200fb_panel_init,
+                .device_shutdown        = board_au1200fb_panel_shutdown,
+                320, 320,
+                240, 240,
+        },
+
+        [8] = { /* Toppoly TD070WGCB2 7" 856x480 TFT */
+                .name = "Toppoly_TD070WGCB2",
+                .monspecs = {
+                        .modedb = NULL,
+                        .modedb_len = 0,
+                        .hfmin = 30000,
+                        .hfmax = 70000,
+                        .vfmin = 60,
+                        .vfmax = 60,
+                        .dclkmin = 6000000,
+                        .dclkmax = 28000000,
+                        .input = FB_DISP_RGB,
+                },
+                .mode_screen            = LCD_SCREEN_SX_N(856) |
+                        LCD_SCREEN_SY_N(480),
+                .mode_horztiming        = LCD_HORZTIMING_HND2_N(43) |
+                        LCD_HORZTIMING_HND1_N(43) | LCD_HORZTIMING_HPW_N(114),
+                .mode_verttiming        = LCD_VERTTIMING_VND2_N(20) |
+                        LCD_VERTTIMING_VND1_N(21) | LCD_VERTTIMING_VPW_N(4),
+                .mode_clkcontrol        = 0x00020001, /* /4=24Mhz */
+                .mode_pwmdiv            = 0x8000063f,
+                .mode_pwmhi             = 0x03400000,
+                .mode_outmask   = 0x00fcfcfc,
+                .mode_fifoctrl  = 0x2f2f2f2f,
+                .mode_toyclksrc = 0x00000004, /* AUXPLL directly */
+                .mode_backlight = 0x00000000,
+                .mode_auxpll            = 8, /* 96MHz AUXPLL */
+                .device_init            = board_au1200fb_panel_init,
+                .device_shutdown        = board_au1200fb_panel_shutdown,
+                856, 856,
+                480, 480,
+        },
+};
+
+#define NUM_PANELS (ARRAY_SIZE(known_lcd_panels))
+
+/********************************************************************/
+
+#ifdef CONFIG_PM
+static int set_brightness(unsigned int brightness)
+{
+        unsigned int hi1, divider;
+
+        /* limit brightness pwm duty to >= 30/1600 */
+        if (brightness < 30) {
+                brightness = 30;
+        }
+        divider = (lcd->pwmdiv & 0x3FFFF) + 1;
+        hi1 = (lcd->pwmhi >> 16) + 1;
+        hi1 = (((brightness & 0xFF) + 1) * divider >> 8);
+        lcd->pwmhi &= 0xFFFF;
+        lcd->pwmhi |= (hi1 << 16);
+
+        return brightness;
+}
+#endif /* CONFIG_PM */
+
+static int winbpp (unsigned int winctrl1)
+{
+        int bits = 0;
+
+        /* how many bits are needed for each pixel format */
+        switch (winctrl1 & LCD_WINCTRL1_FRM) {
+        case LCD_WINCTRL1_FRM_1BPP:
+                bits = 1;
+                break;
+        case LCD_WINCTRL1_FRM_2BPP:
+                bits = 2;
+                break;
+        case LCD_WINCTRL1_FRM_4BPP:
+                bits = 4;
+                break;
+        case LCD_WINCTRL1_FRM_8BPP:
+                bits = 8;
+                break;
+        case LCD_WINCTRL1_FRM_12BPP:
+        case LCD_WINCTRL1_FRM_16BPP655:
+        case LCD_WINCTRL1_FRM_16BPP565:
+        case LCD_WINCTRL1_FRM_16BPP556:
+        case LCD_WINCTRL1_FRM_16BPPI1555:
+        case LCD_WINCTRL1_FRM_16BPPI5551:
+        case LCD_WINCTRL1_FRM_16BPPA1555:
+        case LCD_WINCTRL1_FRM_16BPPA5551:
+                bits = 16;
+                break;
+        case LCD_WINCTRL1_FRM_24BPP:
+        case LCD_WINCTRL1_FRM_32BPP:
+                bits = 32;
+                break;
+        }
+
+        return bits;
+}
+
+static int fbinfo2index (struct fb_info *fb_info)
+{
+        int i;
+
+        for (i = 0; i < CONFIG_FB_AU1200_DEVS; ++i) {
+                if (fb_info == (struct fb_info *)(&_au1200fb_devices[i].fb_info))
+                        return i;
+        }
+        printk("au1200fb: ERROR: fbinfo2index failed!\n");
+        return -1;
+}
+
+static int au1200_setlocation (struct au1200fb_device *fbdev, int plane,
+        int xpos, int ypos)
+{
+        uint32 winctrl0, winctrl1, winenable, fb_offset = 0;
+        int xsz, ysz;
+
+        /* FIX!!! NOT CHECKING FOR COMPLETE OFFSCREEN YET */
+
+        winctrl0 = lcd->window[plane].winctrl0;
+        winctrl1 = lcd->window[plane].winctrl1;
+        winctrl0 &= (LCD_WINCTRL0_A | LCD_WINCTRL0_AEN);
+        winctrl1 &= ~(LCD_WINCTRL1_SZX | LCD_WINCTRL1_SZY);
+
+        /* Check for off-screen adjustments */
+        xsz = win->w[plane].xres;
+        ysz = win->w[plane].yres;
+        if ((xpos + win->w[plane].xres) > panel->Xres) {
+                /* Off-screen to the right */
+                xsz = panel->Xres - xpos; /* off by 1 ??? */
+                /*printk("off screen right\n");*/
+        }
+
+        if ((ypos + win->w[plane].yres) > panel->Yres) {
+                /* Off-screen to the bottom */
+                ysz = panel->Yres - ypos; /* off by 1 ??? */
+                /*printk("off screen bottom\n");*/
+        }
+
+        if (xpos < 0) {
+                /* Off-screen to the left */
+                xsz = win->w[plane].xres + xpos;
+                fb_offset += (((0 - xpos) * winbpp(lcd->window[plane].winctrl1))/8);
+                xpos = 0;
+                /*printk("off screen left\n");*/
+        }
+
+        if (ypos < 0) {
+                /* Off-screen to the top */
+                ysz = win->w[plane].yres + ypos;
+                /* fixme: fb_offset += ((0-ypos)*fb_pars[plane].line_length); */
+                ypos = 0;
+                /*printk("off screen top\n");*/
+        }
+
+        /* record settings */
+        win->w[plane].xpos = xpos;
+        win->w[plane].ypos = ypos;
+
+        xsz -= 1;
+        ysz -= 1;
+        winctrl0 |= (xpos << 21);
+        winctrl0 |= (ypos << 10);
+        winctrl1 |= (xsz << 11);
+        winctrl1 |= (ysz << 0);
+
+        /* Disable the window while making changes, then restore WINEN */
+        winenable = lcd->winenable & (1 << plane);
+        au_sync();
+        lcd->winenable &= ~(1 << plane);
+        lcd->window[plane].winctrl0 = winctrl0;
+        lcd->window[plane].winctrl1 = winctrl1;
+        lcd->window[plane].winbuf0 =
+        lcd->window[plane].winbuf1 = fbdev->fb_phys;
+        lcd->window[plane].winbufctrl = 0; /* select winbuf0 */
+        lcd->winenable |= winenable;
+        au_sync();
+
+        return 0;
+}
+
+static void au1200_setpanel (struct panel_settings *newpanel)
+{
+        /*
+         * Perform global setup/init of LCD controller
+         */
+        uint32 winenable;
+
+        /* Make sure all windows disabled */
+        winenable = lcd->winenable;
+        lcd->winenable = 0;
+        au_sync();
+        /*
+         * Ensure everything is disabled before reconfiguring
+         */
+        if (lcd->screen & LCD_SCREEN_SEN) {
+                /* Wait for vertical sync period */
+                lcd->intstatus = LCD_INT_SS;
+                while ((lcd->intstatus & LCD_INT_SS) == 0) {
+                        au_sync();
+                }
+
+                lcd->screen &= ~LCD_SCREEN_SEN; /*disable the controller*/
+
+                do {
+                        lcd->intstatus = lcd->intstatus; /*clear interrupts*/
+                        au_sync();
+                /*wait for controller to shut down*/
+                } while ((lcd->intstatus & LCD_INT_SD) == 0);
+
+                /* Call shutdown of current panel (if up) */
+                /* this must occur last, because if an external clock is driving
+                    the controller, the clock cannot be turned off before first
+                        shutting down the controller.
+                 */
+                if (panel->device_shutdown != NULL)
+                        panel->device_shutdown();
+        }
+
+        /* Newpanel == NULL indicates a shutdown operation only */
+        if (newpanel == NULL)
+                return;
+
+        panel = newpanel;
+
+        printk("Panel(%s), %dx%d\n", panel->name, panel->Xres, panel->Yres);
+
+        /*
+         * Setup clocking if internal LCD clock source (assumes sys_auxpll valid)
+         */
+        if (!(panel->mode_clkcontrol & LCD_CLKCONTROL_EXT))
+        {
+                uint32 sys_clksrc;
+                au_writel(panel->mode_auxpll, SYS_AUXPLL);
+                sys_clksrc = au_readl(SYS_CLKSRC) & ~0x0000001f;
+                sys_clksrc |= panel->mode_toyclksrc;
+                au_writel(sys_clksrc, SYS_CLKSRC);
+        }
+
+        /*
+         * Configure panel timings
+         */
+        lcd->screen = panel->mode_screen;
+        lcd->horztiming = panel->mode_horztiming;
+        lcd->verttiming = panel->mode_verttiming;
+        lcd->clkcontrol = panel->mode_clkcontrol;
+        lcd->pwmdiv = panel->mode_pwmdiv;
+        lcd->pwmhi = panel->mode_pwmhi;
+        lcd->outmask = panel->mode_outmask;
+        lcd->fifoctrl = panel->mode_fifoctrl;
+        au_sync();
+
+        /* fixme: Check window settings to make sure still valid
+         * for new geometry */
+#if 0
+        au1200_setlocation(fbdev, 0, win->w[0].xpos, win->w[0].ypos);
+        au1200_setlocation(fbdev, 1, win->w[1].xpos, win->w[1].ypos);
+        au1200_setlocation(fbdev, 2, win->w[2].xpos, win->w[2].ypos);
+        au1200_setlocation(fbdev, 3, win->w[3].xpos, win->w[3].ypos);
+#endif
+        lcd->winenable = winenable;
+
+        /*
+         * Re-enable screen now that it is configured
+         */
+        lcd->screen |= LCD_SCREEN_SEN;
+        au_sync();
+
+        /* Call init of panel */
+        if (panel->device_init != NULL) panel->device_init();
+
+        /* FIX!!!! not appropriate on panel change!!! Global setup/init */
+        lcd->intenable = 0;
+        lcd->intstatus = ~0;
+        lcd->backcolor = win->mode_backcolor;
+
+        /* Setup Color Key - FIX!!! */
+        lcd->colorkey = win->mode_colorkey;
+        lcd->colorkeymsk = win->mode_colorkeymsk;
+
+        /* Setup HWCursor - FIX!!! Need to support this eventually */
+        lcd->hwc.cursorctrl = 0;
+        lcd->hwc.cursorpos = 0;
+        lcd->hwc.cursorcolor0 = 0;
+        lcd->hwc.cursorcolor1 = 0;
+        lcd->hwc.cursorcolor2 = 0;
+        lcd->hwc.cursorcolor3 = 0;
+
+
+#if 0
+#define D(X) printk("%25s: %08X\n", #X, X)
+        D(lcd->screen);
+        D(lcd->horztiming);
+        D(lcd->verttiming);
+        D(lcd->clkcontrol);
+        D(lcd->pwmdiv);
+        D(lcd->pwmhi);
+        D(lcd->outmask);
+        D(lcd->fifoctrl);
+        D(lcd->window[0].winctrl0);
+        D(lcd->window[0].winctrl1);
+        D(lcd->window[0].winctrl2);
+        D(lcd->window[0].winbuf0);
+        D(lcd->window[0].winbuf1);
+        D(lcd->window[0].winbufctrl);
+        D(lcd->window[1].winctrl0);
+        D(lcd->window[1].winctrl1);
+        D(lcd->window[1].winctrl2);
+        D(lcd->window[1].winbuf0);
+        D(lcd->window[1].winbuf1);
+        D(lcd->window[1].winbufctrl);
+        D(lcd->window[2].winctrl0);
+        D(lcd->window[2].winctrl1);
+        D(lcd->window[2].winctrl2);
+        D(lcd->window[2].winbuf0);
+        D(lcd->window[2].winbuf1);
+        D(lcd->window[2].winbufctrl);
+        D(lcd->window[3].winctrl0);
+        D(lcd->window[3].winctrl1);
+        D(lcd->window[3].winctrl2);
+        D(lcd->window[3].winbuf0);
+        D(lcd->window[3].winbuf1);
+        D(lcd->window[3].winbufctrl);
+        D(lcd->winenable);
+        D(lcd->intenable);
+        D(lcd->intstatus);
+        D(lcd->backcolor);
+        D(lcd->winenable);
+        D(lcd->colorkey);
+    D(lcd->colorkeymsk);
+        D(lcd->hwc.cursorctrl);
+        D(lcd->hwc.cursorpos);
+        D(lcd->hwc.cursorcolor0);
+        D(lcd->hwc.cursorcolor1);
+        D(lcd->hwc.cursorcolor2);
+        D(lcd->hwc.cursorcolor3);
+#endif
+}
+
+static void au1200_setmode(struct au1200fb_device *fbdev)
+{
+        int plane = fbdev->plane;
+        /* Window/plane setup */
+        lcd->window[plane].winctrl1 = ( 0
+                | LCD_WINCTRL1_PRI_N(plane)
+                | win->w[plane].mode_winctrl1 /* FRM,CCO,PO,PIPE */
+                ) ;
+
+        au1200_setlocation(fbdev, plane, win->w[plane].xpos, win->w[plane].ypos);
+
+        lcd->window[plane].winctrl2 = ( 0
+                | LCD_WINCTRL2_CKMODE_00
+                | LCD_WINCTRL2_DBM
+                | LCD_WINCTRL2_BX_N( fbdev->fb_info.fix.line_length)
+                | LCD_WINCTRL2_SCX_1
+                | LCD_WINCTRL2_SCY_1
+                ) ;
+        lcd->winenable |= win->w[plane].mode_winenable;
+        au_sync();
+}
+
+
+/* Inline helpers */
+
+/*#define panel_is_dual(panel)  ((panel->mode_screen & LCD_SCREEN_PT) == LCD_SCREEN_PT_010)*/
+/*#define panel_is_active(panel)((panel->mode_screen & LCD_SCREEN_PT) == LCD_SCREEN_PT_010)*/
+
+#define panel_is_color(panel) ((panel->mode_screen & LCD_SCREEN_PT) <= LCD_SCREEN_PT_CDSTN)
+
+/* Bitfields format supported by the controller. */
+static struct fb_bitfield rgb_bitfields[][4] = {
+        /*     Red,        Green,        Blue,       Transp   */
+        [LCD_WINCTRL1_FRM_16BPP655 >> 25] =
+                { { 10, 6, 0 }, { 5, 5, 0 }, { 0, 5, 0 }, { 0, 0, 0 } },
+
+        [LCD_WINCTRL1_FRM_16BPP565 >> 25] =
+                { { 11, 5, 0 }, { 5, 6, 0 }, { 0, 5, 0 }, { 0, 0, 0 } },
+
+        [LCD_WINCTRL1_FRM_16BPP556 >> 25] =
+                { { 11, 5, 0 }, { 6, 5, 0 }, { 0, 6, 0 }, { 0, 0, 0 } },
+
+        [LCD_WINCTRL1_FRM_16BPPI1555 >> 25] =
+                { { 10, 5, 0 }, { 5, 5, 0 }, { 0, 5, 0 }, { 0, 0, 0 } },
+
+        [LCD_WINCTRL1_FRM_16BPPI5551 >> 25] =
+                { { 11, 5, 0 }, { 6, 5, 0 }, { 1, 5, 0 }, { 0, 0, 0 } },
+
+        [LCD_WINCTRL1_FRM_16BPPA1555 >> 25] =
+                { { 10, 5, 0 }, { 5, 5, 0 }, { 0, 5, 0 }, { 15, 1, 0 } },
+
+        [LCD_WINCTRL1_FRM_16BPPA5551 >> 25] =
+                { { 11, 5, 0 }, { 6, 5, 0 }, { 1, 5, 0 }, { 0, 1, 0 } },
+
+        [LCD_WINCTRL1_FRM_24BPP >> 25] =
+                { { 16, 8, 0 }, { 8, 8, 0 }, { 0, 8, 0 }, { 0, 0, 0 } },
+
+        [LCD_WINCTRL1_FRM_32BPP >> 25] =
+                { { 16, 8, 0 }, { 8, 8, 0 }, { 0, 8, 0 }, { 24, 0, 0 } },
+};
+
+/*-------------------------------------------------------------------------*/
+
+/* Helpers */
+
+static void au1200fb_update_fbinfo(struct fb_info *fbi)
+{
+        /* FIX!!!! This also needs to take the window pixel format into account!!! */
+
+        /* Update var-dependent FB info */
+        if (panel_is_color(panel)) {
+                if (fbi->var.bits_per_pixel <= 8) {
+                        /* palettized */
+                        fbi->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+                        fbi->fix.line_length = fbi->var.xres_virtual /
+                                (8/fbi->var.bits_per_pixel);
+                } else {
+                        /* non-palettized */
+                        fbi->fix.visual = FB_VISUAL_TRUECOLOR;
+                        fbi->fix.line_length = fbi->var.xres_virtual * (fbi->var.bits_per_pixel / 8);
+                }
+        } else {
+                /* mono FIX!!! mono 8 and 4 bits */
+                fbi->fix.visual = FB_VISUAL_MONO10;
+                fbi->fix.line_length = fbi->var.xres_virtual / 8;
+        }
+
+        fbi->screen_size = fbi->fix.line_length * fbi->var.yres_virtual;
+        print_dbg("line length: %d\n", fbi->fix.line_length);
+        print_dbg("bits_per_pixel: %d\n", fbi->var.bits_per_pixel);
+}
+
+/*-------------------------------------------------------------------------*/
+
+/* AU1200 framebuffer driver */
+
+/* fb_check_var
+ * Validate var settings with hardware restrictions and modify it if necessary
+ */
+static int au1200fb_fb_check_var(struct fb_var_screeninfo *var,
+        struct fb_info *fbi)
+{
+        struct au1200fb_device *fbdev = (struct au1200fb_device *)fbi;
+        u32 pixclock;
+        int screen_size, plane;
+
+        plane = fbdev->plane;
+
+        /* Make sure that the mode respect all LCD controller and
+         * panel restrictions. */
+        var->xres = win->w[plane].xres;
+        var->yres = win->w[plane].yres;
+
+        /* No need for virtual resolution support */
+        var->xres_virtual = var->xres;
+        var->yres_virtual = var->yres;
+
+        var->bits_per_pixel = winbpp(win->w[plane].mode_winctrl1);
+
+        screen_size = var->xres_virtual * var->yres_virtual;
+        if (var->bits_per_pixel > 8) screen_size *= (var->bits_per_pixel / 8);
+        else screen_size /= (8/var->bits_per_pixel);
+
+        if (fbdev->fb_len < screen_size)
+                return -EINVAL; /* Virtual screen is to big, abort */
+
+        /* FIX!!!! what are the implicaitons of ignoring this for windows ??? */
+        /* The max LCD clock is fixed to 48MHz (value of AUX_CLK). The pixel
+         * clock can only be obtain by dividing this value by an even integer.
+         * Fallback to a slower pixel clock if necessary. */
+        pixclock = max((u32)(PICOS2KHZ(var->pixclock) * 1000), fbi->monspecs.dclkmin);
+        pixclock = min(pixclock, min(fbi->monspecs.dclkmax, (u32)AU1200_LCD_MAX_CLK/2));
+
+        if (AU1200_LCD_MAX_CLK % pixclock) {
+                int diff = AU1200_LCD_MAX_CLK % pixclock;
+                pixclock -= diff;
+        }
+
+        var->pixclock = KHZ2PICOS(pixclock/1000);
+#if 0
+        if (!panel_is_active(panel)) {
+                int pcd = AU1200_LCD_MAX_CLK / (pixclock * 2) - 1;
+
+                if (!panel_is_color(panel)
+                        && (panel->control_base & LCD_CONTROL_MPI) && (pcd < 3)) {
+                        /* STN 8bit mono panel support is up to 6MHz pixclock */
+                        var->pixclock = KHZ2PICOS(6000);
+                } else if (!pcd) {
+                        /* Other STN panel support is up to 12MHz  */
+                        var->pixclock = KHZ2PICOS(12000);
+                }
+        }
+#endif
+        /* Set bitfield accordingly */
+        switch (var->bits_per_pixel) {
+                case 16:
+                {
+                        /* 16bpp True color.
+                         * These must be set to MATCH WINCTRL[FORM] */
+                        int idx;
+                        idx = (win->w[0].mode_winctrl1 & LCD_WINCTRL1_FRM) >> 25;
+                        var->red    = rgb_bitfields[idx][0];
+                        var->green  = rgb_bitfields[idx][1];
+                        var->blue   = rgb_bitfields[idx][2];
+                        var->transp = rgb_bitfields[idx][3];
+                        break;
+                }
+
+                case 32:
+                {
+                        /* 32bpp True color.
+                         * These must be set to MATCH WINCTRL[FORM] */
+                        int idx;
+                        idx = (win->w[0].mode_winctrl1 & LCD_WINCTRL1_FRM) >> 25;
+                        var->red    = rgb_bitfields[idx][0];
+                        var->green  = rgb_bitfields[idx][1];
+                        var->blue   = rgb_bitfields[idx][2];
+                        var->transp = rgb_bitfields[idx][3];
+                        break;
+                }
+                default:
+                        print_dbg("Unsupported depth %dbpp", var->bits_per_pixel);
+                        return -EINVAL;
+        }
+
+        return 0;
+}
+
+/* fb_set_par
+ * Set hardware with var settings. This will enable the controller with a
+ * specific mode, normally validated with the fb_check_var method
+ */
+static int au1200fb_fb_set_par(struct fb_info *fbi)
+{
+        struct au1200fb_device *fbdev = (struct au1200fb_device *)fbi;
+
+        au1200fb_update_fbinfo(fbi);
+        au1200_setmode(fbdev);
+
+        return 0;
+}
+
+/* fb_setcolreg
+ * Set color in LCD palette.
+ */
+static int au1200fb_fb_setcolreg(unsigned regno, unsigned red, unsigned green,
+        unsigned blue, unsigned transp, struct fb_info *fbi)
+{
+        volatile u32 *palette = lcd->palette;
+        u32 value;
+
+        if (regno > (AU1200_LCD_NBR_PALETTE_ENTRIES - 1))
+                return -EINVAL;
+
+        if (fbi->var.grayscale) {
+                /* Convert color to grayscale */
+                red = green = blue =
+                        (19595 * red + 38470 * green + 7471 * blue) >> 16;
+        }
+
+        if (fbi->fix.visual == FB_VISUAL_TRUECOLOR) {
+                /* Place color in the pseudopalette */
+                if (regno > 16)
+                        return -EINVAL;
+
+                palette = (u32*) fbi->pseudo_palette;
+
+                red   >>= (16 - fbi->var.red.length);
+                green >>= (16 - fbi->var.green.length);
+                blue  >>= (16 - fbi->var.blue.length);
+
+                value = (red   << fbi->var.red.offset)  |
+                        (green << fbi->var.green.offset)|
+                        (blue  << fbi->var.blue.offset);
+                value &= 0xFFFF;
+
+        } else if (1 /*FIX!!! panel_is_active(fbdev->panel)*/) {
+                /* COLOR TFT PALLETTIZED (use RGB 565) */
+                value = (red & 0xF800)|((green >> 5) &
+                                0x07E0)|((blue >> 11) & 0x001F);
+                value &= 0xFFFF;
+
+        } else if (0 /*panel_is_color(fbdev->panel)*/) {
+                /* COLOR STN MODE */
+                value = 0x1234;
+                value &= 0xFFF;
+        } else {
+                /* MONOCHROME MODE */
+                value = (green >> 12) & 0x000F;
+                value &= 0xF;
+        }
+
+        palette[regno] = value;
+
+        return 0;
+}
+
+/* fb_blank
+ * Blank the screen. Depending on the mode, the screen will be
+ * activated with the backlight color, or desactivated
+ */
+static int au1200fb_fb_blank(int blank_mode, struct fb_info *fbi)
+{
+        /* Short-circuit screen blanking */
+        if (noblanking)
+                return 0;
+
+        switch (blank_mode) {
+
+        case FB_BLANK_UNBLANK:
+        case FB_BLANK_NORMAL:
+                /* printk("turn on panel\n"); */
+                au1200_setpanel(panel);
+                break;
+        case FB_BLANK_VSYNC_SUSPEND:
+        case FB_BLANK_HSYNC_SUSPEND:
+        case FB_BLANK_POWERDOWN:
+                /* printk("turn off panel\n"); */
+                au1200_setpanel(NULL);
+                break;
+        default:
+                break;
+
+        }
+
+        /* FB_BLANK_NORMAL is a soft blank */
+        return (blank_mode == FB_BLANK_NORMAL) ? -EINVAL : 0;
+}
+
+/* fb_mmap
+ * Map video memory in user space. We don't use the generic fb_mmap
+ * method mainly to allow the use of the TLB streaming flag (CCA=6)
+ */
+static int au1200fb_fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
+
+{
+        unsigned int len;
+        unsigned long start=0, off;
+        struct au1200fb_device *fbdev = (struct au1200fb_device *) info;
+
+#ifdef CONFIG_PM
+        au1xxx_pm_access(LCD_pm_dev);
+#endif
+
+        if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT)) {
+                return -EINVAL;
+        }
+
+        start = fbdev->fb_phys & PAGE_MASK;
+        len = PAGE_ALIGN((start & ~PAGE_MASK) + fbdev->fb_len);
+
+        off = vma->vm_pgoff << PAGE_SHIFT;
+
+        if ((vma->vm_end - vma->vm_start + off) > len) {
+                return -EINVAL;
+        }
+
+        off += start;
+        vma->vm_pgoff = off >> PAGE_SHIFT;
+
+        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+        pgprot_val(vma->vm_page_prot) |= _CACHE_MASK; /* CCA=7 */
+
+        vma->vm_flags |= VM_IO;
+
+        return io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
+                                  vma->vm_end - vma->vm_start,
+                                  vma->vm_page_prot);
+
+        return 0;
+}
+
+static void set_global(u_int cmd, struct au1200_lcd_global_regs_t *pdata)
+{
+
+        unsigned int hi1, divider;
+
+        /* SCREEN_SIZE: user cannot reset size, must switch panel choice */
+
+        if (pdata->flags & SCREEN_BACKCOLOR)
+                lcd->backcolor = pdata->backcolor;
+
+        if (pdata->flags & SCREEN_BRIGHTNESS) {
+
+                // limit brightness pwm duty to >= 30/1600
+                if (pdata->brightness < 30) {
+                        pdata->brightness = 30;
+                }
+                divider = (lcd->pwmdiv & 0x3FFFF) + 1;
+                hi1 = (lcd->pwmhi >> 16) + 1;
+                hi1 = (((pdata->brightness & 0xFF)+1) * divider >> 8);
+                lcd->pwmhi &= 0xFFFF;
+                lcd->pwmhi |= (hi1 << 16);
+        }
+
+        if (pdata->flags & SCREEN_COLORKEY)
+                lcd->colorkey = pdata->colorkey;
+
+        if (pdata->flags & SCREEN_MASK)
+                lcd->colorkeymsk = pdata->mask;
+        au_sync();
+}
+
+static void get_global(u_int cmd, struct au1200_lcd_global_regs_t *pdata)
+{
+        unsigned int hi1, divider;
+
+        pdata->xsize = ((lcd->screen & LCD_SCREEN_SX) >> 19) + 1;
+        pdata->ysize = ((lcd->screen & LCD_SCREEN_SY) >> 8) + 1;
+
+        pdata->backcolor = lcd->backcolor;
+        pdata->colorkey = lcd->colorkey;
+        pdata->mask = lcd->colorkeymsk;
+
+        // brightness
+        hi1 = (lcd->pwmhi >> 16) + 1;
+        divider = (lcd->pwmdiv & 0x3FFFF) + 1;
+        pdata->brightness = ((hi1 << 8) / divider) - 1;
+        au_sync();
+}
+
+static void set_window(unsigned int plane,
+        struct au1200_lcd_window_regs_t *pdata)
+{
+        unsigned int val, bpp;
+
+        /* Window control register 0 */
+        if (pdata->flags & WIN_POSITION) {
+                val = lcd->window[plane].winctrl0 & ~(LCD_WINCTRL0_OX |
+                                LCD_WINCTRL0_OY);
+                val |= ((pdata->xpos << 21) & LCD_WINCTRL0_OX);
+                val |= ((pdata->ypos << 10) & LCD_WINCTRL0_OY);
+                lcd->window[plane].winctrl0 = val;
+        }
+        if (pdata->flags & WIN_ALPHA_COLOR) {
+                val = lcd->window[plane].winctrl0 & ~(LCD_WINCTRL0_A);
+                val |= ((pdata->alpha_color << 2) & LCD_WINCTRL0_A);
+                lcd->window[plane].winctrl0 = val;
+        }
+        if (pdata->flags & WIN_ALPHA_MODE) {
+                val = lcd->window[plane].winctrl0 & ~(LCD_WINCTRL0_AEN);
+                val |= ((pdata->alpha_mode << 1) & LCD_WINCTRL0_AEN);
+                lcd->window[plane].winctrl0 = val;
+        }
+
+        /* Window control register 1 */
+        if (pdata->flags & WIN_PRIORITY) {
+                val = lcd->window[plane].winctrl1 & ~(LCD_WINCTRL1_PRI);
+                val |= ((pdata->priority << 30) & LCD_WINCTRL1_PRI);
+                lcd->window[plane].winctrl1 = val;
+        }
+        if (pdata->flags & WIN_CHANNEL) {
+                val = lcd->window[plane].winctrl1 & ~(LCD_WINCTRL1_PIPE);
+                val |= ((pdata->channel << 29) & LCD_WINCTRL1_PIPE);
+                lcd->window[plane].winctrl1 = val;
+        }
+        if (pdata->flags & WIN_BUFFER_FORMAT) {
+                val = lcd->window[plane].winctrl1 & ~(LCD_WINCTRL1_FRM);
+                val |= ((pdata->buffer_format << 25) & LCD_WINCTRL1_FRM);
+                lcd->window[plane].winctrl1 = val;
+        }
+        if (pdata->flags & WIN_COLOR_ORDER) {
+                val = lcd->window[plane].winctrl1 & ~(LCD_WINCTRL1_CCO);
+                val |= ((pdata->color_order << 24) & LCD_WINCTRL1_CCO);
+                lcd->window[plane].winctrl1 = val;
+        }
+        if (pdata->flags & WIN_PIXEL_ORDER) {
+                val = lcd->window[plane].winctrl1 & ~(LCD_WINCTRL1_PO);
+                val |= ((pdata->pixel_order << 22) & LCD_WINCTRL1_PO);
+                lcd->window[plane].winctrl1 = val;
+        }
+        if (pdata->flags & WIN_SIZE) {
+                val = lcd->window[plane].winctrl1 & ~(LCD_WINCTRL1_SZX |
+                                LCD_WINCTRL1_SZY);
+                val |= (((pdata->xsize << 11) - 1) & LCD_WINCTRL1_SZX);
+                val |= (((pdata->ysize) - 1) & LCD_WINCTRL1_SZY);
+                lcd->window[plane].winctrl1 = val;
+                /* program buffer line width */
+                bpp = winbpp(val) / 8;
+                val = lcd->window[plane].winctrl2 & ~(LCD_WINCTRL2_BX);
+                val |= (((pdata->xsize * bpp) << 8) & LCD_WINCTRL2_BX);
+                lcd->window[plane].winctrl2 = val;
+        }
+
+        /* Window control register 2 */
+        if (pdata->flags & WIN_COLORKEY_MODE) {
+                val = lcd->window[plane].winctrl2 & ~(LCD_WINCTRL2_CKMODE);
+                val |= ((pdata->colorkey_mode << 24) & LCD_WINCTRL2_CKMODE);
+                lcd->window[plane].winctrl2 = val;
+        }
+        if (pdata->flags & WIN_DOUBLE_BUFFER_MODE) {
+                val = lcd->window[plane].winctrl2 & ~(LCD_WINCTRL2_DBM);
+                val |= ((pdata->double_buffer_mode << 23) & LCD_WINCTRL2_DBM);
+                lcd->window[plane].winctrl2 = val;
+        }
+        if (pdata->flags & WIN_RAM_ARRAY_MODE) {
+                val = lcd->window[plane].winctrl2 & ~(LCD_WINCTRL2_RAM);
+                val |= ((pdata->ram_array_mode << 21) & LCD_WINCTRL2_RAM);
+                lcd->window[plane].winctrl2 = val;
+        }
+
+        /* Buffer line width programmed with WIN_SIZE */
+
+        if (pdata->flags & WIN_BUFFER_SCALE) {
+                val = lcd->window[plane].winctrl2 & ~(LCD_WINCTRL2_SCX |
+                                LCD_WINCTRL2_SCY);
+                val |= ((pdata->xsize << 11) & LCD_WINCTRL2_SCX);
+                val |= ((pdata->ysize) & LCD_WINCTRL2_SCY);
+                lcd->window[plane].winctrl2 = val;
+        }
+
+        if (pdata->flags & WIN_ENABLE) {
+                val = lcd->winenable;
+                val &= ~(1<<plane);
+                val |= (pdata->enable & 1) << plane;
+                lcd->winenable = val;
+        }
+        au_sync();
+}
+
+static void get_window(unsigned int plane,
+        struct au1200_lcd_window_regs_t *pdata)
+{
+        /* Window control register 0 */
+        pdata->xpos = (lcd->window[plane].winctrl0 & LCD_WINCTRL0_OX) >> 21;
+        pdata->ypos = (lcd->window[plane].winctrl0 & LCD_WINCTRL0_OY) >> 10;
+        pdata->alpha_color = (lcd->window[plane].winctrl0 & LCD_WINCTRL0_A) >> 2;
+        pdata->alpha_mode = (lcd->window[plane].winctrl0 & LCD_WINCTRL0_AEN) >> 1;
+
+        /* Window control register 1 */
+        pdata->priority = (lcd->window[plane].winctrl1& LCD_WINCTRL1_PRI) >> 30;
+        pdata->channel = (lcd->window[plane].winctrl1 & LCD_WINCTRL1_PIPE) >> 29;
+        pdata->buffer_format = (lcd->window[plane].winctrl1 & LCD_WINCTRL1_FRM) >> 25;
+        pdata->color_order = (lcd->window[plane].winctrl1 & LCD_WINCTRL1_CCO) >> 24;
+        pdata->pixel_order = (lcd->window[plane].winctrl1 & LCD_WINCTRL1_PO) >> 22;
+        pdata->xsize = ((lcd->window[plane].winctrl1 & LCD_WINCTRL1_SZX) >> 11) + 1;
+        pdata->ysize = (lcd->window[plane].winctrl1 & LCD_WINCTRL1_SZY) + 1;
+
+        /* Window control register 2 */
+        pdata->colorkey_mode = (lcd->window[plane].winctrl2 & LCD_WINCTRL2_CKMODE) >> 24;
+        pdata->double_buffer_mode = (lcd->window[plane].winctrl2 & LCD_WINCTRL2_DBM) >> 23;
+        pdata->ram_array_mode = (lcd->window[plane].winctrl2 & LCD_WINCTRL2_RAM) >> 21;
+
+        pdata->enable = (lcd->winenable >> plane) & 1;
+        au_sync();
+}
+
+static int au1200fb_ioctl(struct fb_info *info, unsigned int cmd,
+                          unsigned long arg)
+{
+        int plane;
+        int val;
+
+#ifdef CONFIG_PM
+        au1xxx_pm_access(LCD_pm_dev);
+#endif
+
+        plane = fbinfo2index(info);
+        print_dbg("au1200fb: ioctl %d on plane %d\n", cmd, plane);
+
+        if (cmd == AU1200_LCD_FB_IOCTL) {
+                struct au1200_lcd_iodata_t iodata;
+
+                if (copy_from_user(&iodata, (void __user *) arg, sizeof(iodata)))
+                        return -EFAULT;
+
+                print_dbg("FB IOCTL called\n");
+
+                switch (iodata.subcmd) {
+                case AU1200_LCD_SET_SCREEN:
+                        print_dbg("AU1200_LCD_SET_SCREEN\n");
+                        set_global(cmd, &iodata.global);
+                        break;
+
+                case AU1200_LCD_GET_SCREEN:
+                        print_dbg("AU1200_LCD_GET_SCREEN\n");
+                        get_global(cmd, &iodata.global);
+                        break;
+
+                case AU1200_LCD_SET_WINDOW:
+                        print_dbg("AU1200_LCD_SET_WINDOW\n");
+                        set_window(plane, &iodata.window);
+                        break;
+
+                case AU1200_LCD_GET_WINDOW:
+                        print_dbg("AU1200_LCD_GET_WINDOW\n");
+                        get_window(plane, &iodata.window);
+                        break;
+
+                case AU1200_LCD_SET_PANEL:
+                        print_dbg("AU1200_LCD_SET_PANEL\n");
+                        if ((iodata.global.panel_choice >= 0) &&
+                                        (iodata.global.panel_choice <
+                                         NUM_PANELS))
+                        {
+                                struct panel_settings *newpanel;
+                                panel_index = iodata.global.panel_choice;
+                                newpanel = &known_lcd_panels[panel_index];
+                                au1200_setpanel(newpanel);
+                        }
+                        break;
+
+                case AU1200_LCD_GET_PANEL:
+                        print_dbg("AU1200_LCD_GET_PANEL\n");
+                        iodata.global.panel_choice = panel_index;
+                        break;
+
+                default:
+                        return -EINVAL;
+                }
+
+                val = copy_to_user((void __user *) arg, &iodata, sizeof(iodata));
+                if (val) {
+                        print_dbg("error: could not copy %d bytes\n", val);
+                        return -EFAULT;
+                }
+        }
+
+        return 0;
+}
+
+
+static struct fb_ops au1200fb_fb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_check_var   = au1200fb_fb_check_var,
+        .fb_set_par     = au1200fb_fb_set_par,
+        .fb_setcolreg   = au1200fb_fb_setcolreg,
+        .fb_blank       = au1200fb_fb_blank,
+        .fb_fillrect    = cfb_fillrect,
+        .fb_copyarea    = cfb_copyarea,
+        .fb_imageblit   = cfb_imageblit,
+        .fb_sync        = NULL,
+        .fb_ioctl       = au1200fb_ioctl,
+        .fb_mmap        = au1200fb_fb_mmap,
+};
+
+/*-------------------------------------------------------------------------*/
+
+static irqreturn_t au1200fb_handle_irq(int irq, void* dev_id, struct pt_regs *regs)
+{
+        /* Nothing to do for now, just clear any pending interrupt */
+        lcd->intstatus = lcd->intstatus;
+        au_sync();
+
+        return IRQ_HANDLED;
+}
+
+/*-------------------------------------------------------------------------*/
+
+/* AU1200 LCD device probe helpers */
+
+static int au1200fb_init_fbinfo(struct au1200fb_device *fbdev)
+{
+        struct fb_info *fbi = &fbdev->fb_info;
+        int bpp;
+
+        memset(fbi, 0, sizeof(struct fb_info));
+        fbi->fbops = &au1200fb_fb_ops;
+
+        bpp = winbpp(win->w[fbdev->plane].mode_winctrl1);
+
+        /* Copy monitor specs from panel data */
+        /* fixme: we're setting up LCD controller windows, so these dont give a
+        damn as to what the monitor specs are (the panel itself does, but that
+        isnt done here...so maybe need a generic catchall monitor setting??? */
+        memcpy(&fbi->monspecs, &panel->monspecs, sizeof(struct fb_monspecs));
+
+        /* We first try the user mode passed in argument. If that failed,
+         * or if no one has been specified, we default to the first mode of the
+         * panel list. Note that after this call, var data will be set */
+        if (!fb_find_mode(&fbi->var,
+                          fbi,
+                          NULL, /* drv_info.opt_mode, */
+                          fbi->monspecs.modedb,
+                          fbi->monspecs.modedb_len,
+                          fbi->monspecs.modedb,
+                          bpp)) {
+
+                print_err("Cannot find valid mode for panel %s", panel->name);
+                return -EFAULT;
+        }
+
+        fbi->pseudo_palette = kmalloc(sizeof(u32) * 16, GFP_KERNEL);
+        if (!fbi->pseudo_palette) {
+                return -ENOMEM;
+        }
+        memset(fbi->pseudo_palette, 0, sizeof(u32) * 16);
+
+        if (fb_alloc_cmap(&fbi->cmap, AU1200_LCD_NBR_PALETTE_ENTRIES, 0) < 0) {
+                print_err("Fail to allocate colormap (%d entries)",
+                           AU1200_LCD_NBR_PALETTE_ENTRIES);
+                kfree(fbi->pseudo_palette);
+                return -EFAULT;
+        }
+
+        strncpy(fbi->fix.id, "AU1200", sizeof(fbi->fix.id));
+        fbi->fix.smem_start = fbdev->fb_phys;
+        fbi->fix.smem_len = fbdev->fb_len;
+        fbi->fix.type = FB_TYPE_PACKED_PIXELS;
+        fbi->fix.xpanstep = 0;
+        fbi->fix.ypanstep = 0;
+        fbi->fix.mmio_start = 0;
+        fbi->fix.mmio_len = 0;
+        fbi->fix.accel = FB_ACCEL_NONE;
+
+        fbi->screen_base = (char __iomem *) fbdev->fb_mem;
+
+        au1200fb_update_fbinfo(fbi);
+
+        return 0;
+}
+
+/*-------------------------------------------------------------------------*/
+
+/* AU1200 LCD controller device driver */
+
+static int au1200fb_drv_probe(struct device *dev)
+{
+        struct au1200fb_device *fbdev;
+        unsigned long page;
+        int bpp, plane, ret;
+
+        if (!dev)
+                return -EINVAL;
+
+        for (plane = 0; plane < CONFIG_FB_AU1200_DEVS; ++plane) {
+                bpp = winbpp(win->w[plane].mode_winctrl1);
+                if (win->w[plane].xres == 0)
+                        win->w[plane].xres = panel->Xres;
+                if (win->w[plane].yres == 0)
+                        win->w[plane].yres = panel->Yres;
+
+                fbdev = &_au1200fb_devices[plane];
+                memset(fbdev, 0, sizeof(struct au1200fb_device));
+                fbdev->plane = plane;
+
+                /* Allocate the framebuffer to the maximum screen size */
+                fbdev->fb_len = (win->w[plane].xres * win->w[plane].yres * bpp) / 8;
+
+                fbdev->fb_mem = dma_alloc_noncoherent(dev,
+                                PAGE_ALIGN(fbdev->fb_len),
+                                &fbdev->fb_phys, GFP_KERNEL);
+                if (!fbdev->fb_mem) {
+                        print_err("fail to allocate frambuffer (size: %dK))",
+                                  fbdev->fb_len / 1024);
+                        return -ENOMEM;
+                }
+
+                /*
+                 * Set page reserved so that mmap will work. This is necessary
+                 * since we'll be remapping normal memory.
+                 */
+                for (page = (unsigned long)fbdev->fb_phys;
+                     page < PAGE_ALIGN((unsigned long)fbdev->fb_phys +
+                             fbdev->fb_len);
+                     page += PAGE_SIZE) {
+                        SetPageReserved(pfn_to_page(page >> PAGE_SHIFT)); /* LCD DMA is NOT coherent on Au1200 */
+                }
+                print_dbg("Framebuffer memory map at %p", fbdev->fb_mem);
+                print_dbg("phys=0x%08x, size=%dK", fbdev->fb_phys, fbdev->fb_len / 1024);
+
+                /* Init FB data */
+                if ((ret = au1200fb_init_fbinfo(fbdev)) < 0)
+                        goto failed;
+
+                /* Register new framebuffer */
+                if ((ret = register_framebuffer(&fbdev->fb_info)) < 0) {
+                        print_err("cannot register new framebuffer");
+                        goto failed;
+                }
+
+                au1200fb_fb_set_par(&fbdev->fb_info);
+
+#if !defined(CONFIG_FRAMEBUFFER_CONSOLE) && defined(CONFIG_LOGO)
+                if (plane == 0)
+                        if (fb_prepare_logo(&fbdev->fb_info, FB_ROTATE_UR)) {
+                                /* Start display and show logo on boot */
+                                fb_set_cmap(&fbdev->fb_info.cmap,
+                                                &fbdev->fb_info);
+
+                                fb_show_logo(&fbdev->fb_info, FB_ROTATE_UR);
+                        }
+#endif
+        }
+
+        /* Now hook interrupt too */
+        if ((ret = request_irq(AU1200_LCD_INT, au1200fb_handle_irq,
+                          SA_INTERRUPT | SA_SHIRQ, "lcd", (void *)dev)) < 0) {
+                print_err("fail to request interrupt line %d (err: %d)",
+                          AU1200_LCD_INT, ret);
+                goto failed;
+        }
+
+        return 0;
+
+failed:
+        /* NOTE: This only does the current plane/window that failed; others are still active */
+        if (fbdev->fb_mem)
+                dma_free_noncoherent(dev, PAGE_ALIGN(fbdev->fb_len),
+                                fbdev->fb_mem, fbdev->fb_phys);
+        if (fbdev->fb_info.cmap.len != 0)
+                fb_dealloc_cmap(&fbdev->fb_info.cmap);
+        if (fbdev->fb_info.pseudo_palette)
+                kfree(fbdev->fb_info.pseudo_palette);
+        if (plane == 0)
+                free_irq(AU1200_LCD_INT, (void*)dev);
+        return ret;
+}
+
+static int au1200fb_drv_remove(struct device *dev)
+{
+        struct au1200fb_device *fbdev;
+        int plane;
+
+        if (!dev)
+                return -ENODEV;
+
+        /* Turn off the panel */
+        au1200_setpanel(NULL);
+
+        for (plane = 0; plane < CONFIG_FB_AU1200_DEVS; ++plane)
+        {
+                fbdev = &_au1200fb_devices[plane];
+
+                /* Clean up all probe data */
+                unregister_framebuffer(&fbdev->fb_info);
+                if (fbdev->fb_mem)
+                        dma_free_noncoherent(dev, PAGE_ALIGN(fbdev->fb_len),
+                                        fbdev->fb_mem, fbdev->fb_phys);
+                if (fbdev->fb_info.cmap.len != 0)
+                        fb_dealloc_cmap(&fbdev->fb_info.cmap);
+                if (fbdev->fb_info.pseudo_palette)
+                        kfree(fbdev->fb_info.pseudo_palette);
+        }
+
+        free_irq(AU1200_LCD_INT, (void *)dev);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int au1200fb_drv_suspend(struct device *dev, u32 state, u32 level)
+{
+        /* TODO */
+        return 0;
+}
+
+static int au1200fb_drv_resume(struct device *dev, u32 level)
+{
+        /* TODO */
+        return 0;
+}
+#endif /* CONFIG_PM */
+
+static struct device_driver au1200fb_driver = {
+        .name           = "au1200-lcd",
+        .bus            = &platform_bus_type,
+        .probe          = au1200fb_drv_probe,
+        .remove         = au1200fb_drv_remove,
+#ifdef CONFIG_PM
+        .suspend        = au1200fb_drv_suspend,
+        .resume         = au1200fb_drv_resume,
+#endif
+};
+
+/*-------------------------------------------------------------------------*/
+
+/* Kernel driver */
+
+static void au1200fb_setup(void)
+{
+        char* options = NULL;
+        char* this_opt;
+        int num_panels = ARRAY_SIZE(known_lcd_panels);
+        int panel_idx = -1;
+
+        fb_get_options(DRIVER_NAME, &options);
+
+        if (options) {
+                while ((this_opt = strsep(&options,",")) != NULL) {
+                        /* Panel option - can be panel name,
+                         * "bs" for board-switch, or number/index */
+                        if (!strncmp(this_opt, "panel:", 6)) {
+                                int i;
+                                long int li;
+                                char *endptr;
+                                this_opt += 6;
+                                /* First check for index, which allows
+                                 * to short circuit this mess */
+                                li = simple_strtol(this_opt, &endptr, 0);
+                                if (*endptr == '\0') {
+                                        panel_idx = (int)li;
+                                }
+                                else if (strcmp(this_opt, "bs") == 0) {
+                                        extern int board_au1200fb_panel(void);
+                                        panel_idx = board_au1200fb_panel();
+                                }
+
+                                else
+                                for (i = 0; i < num_panels; i++) {
+                                        if (!strcmp(this_opt, known_lcd_panels[i].name)) {
+                                                panel_idx = i;
+                                                break;
+                                        }
+                                }
+
+                                if ((panel_idx < 0) || (panel_idx >= num_panels)) {
+                                                print_warn("Panel %s not supported!", this_opt);
+                                }
+                                else
+                                        panel_index = panel_idx;
+                        }
+
+                        else if (strncmp(this_opt, "nohwcursor", 10) == 0) {
+                                nohwcursor = 1;
+                        }
+
+                        /* Unsupported option */
+                        else {
+                                print_warn("Unsupported option \"%s\"", this_opt);
+                        }
+                }
+        }
+}
+
+#ifdef CONFIG_PM
+static int au1200fb_pm_callback(au1xxx_power_dev_t *dev,
+                au1xxx_request_t request, void *data) {
+        int retval = -1;
+        unsigned int d = 0;
+        unsigned int brightness = 0;
+
+        if (request == AU1XXX_PM_SLEEP) {
+                board_au1200fb_panel_shutdown();
+        }
+        else if (request == AU1XXX_PM_WAKEUP) {
+                if(dev->prev_state == SLEEP_STATE)
+                {
+                        int plane;
+                        au1200_setpanel(panel);
+                        for (plane = 0; plane < CONFIG_FB_AU1200_DEVS; ++plane)         {
+                                struct au1200fb_device *fbdev;
+                                fbdev = &_au1200fb_devices[plane];
+                                au1200fb_fb_set_par(&fbdev->fb_info);
+                        }
+                }
+
+                d = *((unsigned int*)data);
+                if(d <=10) brightness = 26;
+                else if(d<=20) brightness = 51;
+                else if(d<=30) brightness = 77;
+                else if(d<=40) brightness = 102;
+                else if(d<=50) brightness = 128;
+                else if(d<=60) brightness = 153;
+                else if(d<=70) brightness = 179;
+                else if(d<=80) brightness = 204;
+                else if(d<=90) brightness = 230;
+                else brightness = 255;
+                set_brightness(brightness);
+        } else if (request == AU1XXX_PM_GETSTATUS) {
+                return dev->cur_state;
+        } else if (request == AU1XXX_PM_ACCESS) {
+                if (dev->cur_state != SLEEP_STATE)
+                        return retval;
+                else {
+                        au1200_setpanel(panel);
+                }
+        } else if (request == AU1XXX_PM_IDLE) {
+        } else if (request == AU1XXX_PM_CLEANUP) {
+        }
+
+        return retval;
+}
+#endif
+
+static int __init au1200fb_init(void)
+{
+        print_info("" DRIVER_DESC "");
+
+        /* Setup driver with options */
+        au1200fb_setup();
+
+        /* Point to the panel selected */
+        panel = &known_lcd_panels[panel_index];
+        win = &windows[window_index];
+
+        printk(DRIVER_NAME ": Panel %d %s\n", panel_index, panel->name);
+        printk(DRIVER_NAME ": Win %d %s\n", window_index, win->name);
+
+        /* Kickstart the panel, the framebuffers/windows come soon enough */
+        au1200_setpanel(panel);
+
+        #ifdef CONFIG_PM
+        LCD_pm_dev = new_au1xxx_power_device("LCD", &au1200fb_pm_callback, NULL);
+        if ( LCD_pm_dev == NULL)
+                printk(KERN_INFO "Unable to create a power management device entry for the au1200fb.\n");
+        else
+                printk(KERN_INFO "Power management device entry for the au1200fb loaded.\n");
+        #endif
+
+        return driver_register(&au1200fb_driver);
+}
+
+static void __exit au1200fb_cleanup(void)
+{
+        driver_unregister(&au1200fb_driver);
+}
+
+module_init(au1200fb_init);
+module_exit(au1200fb_cleanup);
+
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
+/*
+ * BRIEF MODULE DESCRIPTION
+ *      Au1200 LCD Driver.
+ *
+ * Copyright 2004-2005 AMD
+ * Author: AMD
+ *
+ * Based on:
+ * linux/drivers/video/skeletonfb.c -- Skeleton for a frame buffer device
+ *  Created 28 Dec 1997 by Geert Uytterhoeven
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/ctype.h>
+#include <linux/dma-mapping.h>
+
+#include <asm/mach-au1x00/au1000.h>
+#include "au1200fb.h"
+
+#ifdef CONFIG_PM
+#include <asm/mach-au1x00/au1xxx_pm.h>
+#endif
+
+#ifndef CONFIG_FB_AU1200_DEVS
+#define CONFIG_FB_AU1200_DEVS 4
+#endif
+
+#define DRIVER_NAME "au1200fb"
+#define DRIVER_DESC "LCD controller driver for AU1200 processors"
+
+#define DEBUG 1
+
+#define print_err(f, arg...) printk(KERN_ERR DRIVER_NAME ": " f "\n", ## arg)
+#define print_warn(f, arg...) printk(KERN_WARNING DRIVER_NAME ": " f "\n", ## arg)
+#define print_info(f, arg...) printk(KERN_INFO DRIVER_NAME ": " f "\n", ## arg)
+
+#if DEBUG
+#define print_dbg(f, arg...) printk(KERN_DEBUG __FILE__ ": " f "\n", ## arg)
+#else
+#define print_dbg(f, arg...) do {} while (0)
+#endif
+
+
+#define AU1200_LCD_FB_IOCTL 0x46FF
+
+#define AU1200_LCD_SET_SCREEN 1
+#define AU1200_LCD_GET_SCREEN 2
+#define AU1200_LCD_SET_WINDOW 3
+#define AU1200_LCD_GET_WINDOW 4
+#define AU1200_LCD_SET_PANEL  5
+#define AU1200_LCD_GET_PANEL  6
+
+#define SCREEN_SIZE                 (1<< 1)
+#define SCREEN_BACKCOLOR    (1<< 2)
+#define SCREEN_BRIGHTNESS   (1<< 3)
+#define SCREEN_COLORKEY     (1<< 4)
+#define SCREEN_MASK         (1<< 5)
+
+struct au1200_lcd_global_regs_t {
+        unsigned int flags;
+        unsigned int xsize;
+        unsigned int ysize;
+        unsigned int backcolor;
+        unsigned int brightness;
+        unsigned int colorkey;
+        unsigned int mask;
+        unsigned int panel_choice;
+        char panel_desc[80];
+
+};
+
+#define WIN_POSITION            (1<< 0)
+#define WIN_ALPHA_COLOR         (1<< 1)
+#define WIN_ALPHA_MODE          (1<< 2)
+#define WIN_PRIORITY            (1<< 3)
+#define WIN_CHANNEL             (1<< 4)
+#define WIN_BUFFER_FORMAT       (1<< 5)
+#define WIN_COLOR_ORDER         (1<< 6)
+#define WIN_PIXEL_ORDER         (1<< 7)
+#define WIN_SIZE                (1<< 8)
+#define WIN_COLORKEY_MODE       (1<< 9)
+#define WIN_DOUBLE_BUFFER_MODE  (1<< 10)
+#define WIN_RAM_ARRAY_MODE      (1<< 11)
+#define WIN_BUFFER_SCALE        (1<< 12)
+#define WIN_ENABLE                  (1<< 13)
+
+struct au1200_lcd_window_regs_t {
+        unsigned int flags;
+        unsigned int xpos;
+        unsigned int ypos;
+        unsigned int alpha_color;
+        unsigned int alpha_mode;
+        unsigned int priority;
+        unsigned int channel;
+        unsigned int buffer_format;
+        unsigned int color_order;
+        unsigned int pixel_order;
+        unsigned int xsize;
+        unsigned int ysize;
+        unsigned int colorkey_mode;
+        unsigned int double_buffer_mode;
+        unsigned int ram_array_mode;
+        unsigned int xscale;
+        unsigned int yscale;
+        unsigned int enable;
+};
+
+
+struct au1200_lcd_iodata_t {
+        unsigned int subcmd;
+        struct au1200_lcd_global_regs_t global;
+        struct au1200_lcd_window_regs_t window;
+};
+
+#if defined(__BIG_ENDIAN)
+#define LCD_CONTROL_DEFAULT_PO LCD_CONTROL_PO_11
+#else
+#define LCD_CONTROL_DEFAULT_PO LCD_CONTROL_PO_00
+#endif
+#define LCD_CONTROL_DEFAULT_SBPPF LCD_CONTROL_SBPPF_565
+
+/* Private, per-framebuffer management information (independent of the panel itself) */
+struct au1200fb_device {
+        struct fb_info fb_info;                 /* FB driver info record */
+
+        int                                     plane;
+        unsigned char*          fb_mem;         /* FrameBuffer memory map */
+        unsigned int            fb_len;
+        dma_addr_t              fb_phys;
+};
+
+static struct au1200fb_device _au1200fb_devices[CONFIG_FB_AU1200_DEVS];
+/********************************************************************/
+
+/* LCD controller restrictions */
+#define AU1200_LCD_MAX_XRES     1280
+#define AU1200_LCD_MAX_YRES     1024
+#define AU1200_LCD_MAX_BPP      32
+#define AU1200_LCD_MAX_CLK      96000000 /* fixme: this needs to go away ? */
+#define AU1200_LCD_NBR_PALETTE_ENTRIES 256
+
+/* Default number of visible screen buffer to allocate */
+#define AU1200FB_NBR_VIDEO_BUFFERS 1
+
+/********************************************************************/
+
+static struct au1200_lcd *lcd = (struct au1200_lcd *) AU1200_LCD_ADDR;
+static int window_index = 2; /* default is zero */
+static int panel_index = 2; /* default is zero */
+static struct window_settings *win;
+static struct panel_settings *panel;
+static int noblanking = 1;
+static int nohwcursor = 0;
+
+struct window_settings {
+        unsigned char name[64];
+        uint32 mode_backcolor;
+        uint32 mode_colorkey;
+        uint32 mode_colorkeymsk;
+        struct {
+                int xres;
+                int yres;
+                int xpos;
+                int ypos;
+                uint32 mode_winctrl1; /* winctrl1[FRM,CCO,PO,PIPE] */
+                uint32 mode_winenable;
+        } w[4];
+};
+
+#if defined(__BIG_ENDIAN)
+#define LCD_WINCTRL1_PO_16BPP LCD_WINCTRL1_PO_00
+#else
+#define LCD_WINCTRL1_PO_16BPP LCD_WINCTRL1_PO_01
+#endif
+
+extern int board_au1200fb_panel_init (void);
+extern int board_au1200fb_panel_shutdown (void);
+
+#ifdef CONFIG_PM
+int au1200fb_pm_callback(au1xxx_power_dev_t *dev,
+                au1xxx_request_t request, void *data);
+au1xxx_power_dev_t *LCD_pm_dev;
+#endif
+
+/*
+ * Default window configurations
+ */
+static struct window_settings windows[] = {
+        { /* Index 0 */
+                "0-FS gfx, 1-video, 2-ovly gfx, 3-ovly gfx",
+                /* mode_backcolor       */ 0x006600ff,
+                /* mode_colorkey,msk*/ 0, 0,
+                {
+                        {
+                        /* xres, yres, xpos, ypos */ 0, 0, 0, 0,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565 |
+                                LCD_WINCTRL1_PO_16BPP,
+                        /* mode_winenable*/ LCD_WINENABLE_WEN0,
+                        },
+                        {
+                        /* xres, yres, xpos, ypos */ 100, 100, 100, 100,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565 |
+                                LCD_WINCTRL1_PO_16BPP |
+                                LCD_WINCTRL1_PIPE,
+                        /* mode_winenable*/ LCD_WINENABLE_WEN1,
+                        },
+                        {
+                        /* xres, yres, xpos, ypos */ 0, 0, 0, 0,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565 |
+                                LCD_WINCTRL1_PO_16BPP,
+                        /* mode_winenable*/ 0,
+                        },
+                        {
+                        /* xres, yres, xpos, ypos */ 0, 0, 0, 0,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565 |
+                                LCD_WINCTRL1_PO_16BPP |
+                                LCD_WINCTRL1_PIPE,
+                        /* mode_winenable*/ 0,
+                        },
+                },
+        },
+
+        { /* Index 1 */
+                "0-FS gfx, 1-video, 2-ovly gfx, 3-ovly gfx",
+                /* mode_backcolor       */ 0x006600ff,
+                /* mode_colorkey,msk*/ 0, 0,
+                {
+                        {
+                        /* xres, yres, xpos, ypos */ 320, 240, 5, 5,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_24BPP |
+                                LCD_WINCTRL1_PO_00,
+                        /* mode_winenable*/ LCD_WINENABLE_WEN0,
+                        },
+                        {
+                        /* xres, yres, xpos, ypos */ 0, 0, 0, 0,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565
+                                | LCD_WINCTRL1_PO_16BPP,
+                        /* mode_winenable*/ 0,
+                        },
+                        {
+                        /* xres, yres, xpos, ypos */ 100, 100, 0, 0,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565 |
+                                LCD_WINCTRL1_PO_16BPP |
+                                LCD_WINCTRL1_PIPE,
+                        /* mode_winenable*/ 0/*LCD_WINENABLE_WEN2*/,
+                        },
+                        {
+                        /* xres, yres, xpos, ypos */ 200, 25, 0, 0,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565 |
+                                LCD_WINCTRL1_PO_16BPP |
+                                LCD_WINCTRL1_PIPE,
+                        /* mode_winenable*/ 0,
+                        },
+                },
+        },
+        { /* Index 2 */
+                "0-FS gfx, 1-video, 2-ovly gfx, 3-ovly gfx",
+                /* mode_backcolor       */ 0x006600ff,
+                /* mode_colorkey,msk*/ 0, 0,
+                {
+                        {
+                        /* xres, yres, xpos, ypos */ 0, 0, 0, 0,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565 |
+                                LCD_WINCTRL1_PO_16BPP,
+                        /* mode_winenable*/ LCD_WINENABLE_WEN0,
+                        },
+                        {
+                        /* xres, yres, xpos, ypos */ 0, 0, 0, 0,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565 |
+                                LCD_WINCTRL1_PO_16BPP,
+                        /* mode_winenable*/ 0,
+                        },
+                        {
+                        /* xres, yres, xpos, ypos */ 0, 0, 0, 0,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_32BPP |
+                                LCD_WINCTRL1_PO_00|LCD_WINCTRL1_PIPE,
+                        /* mode_winenable*/ 0/*LCD_WINENABLE_WEN2*/,
+                        },
+                        {
+                        /* xres, yres, xpos, ypos */ 0, 0, 0, 0,
+                        /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565 |
+                                LCD_WINCTRL1_PO_16BPP |
+                                LCD_WINCTRL1_PIPE,
+                        /* mode_winenable*/ 0,
+                        },
+                },
+        },
+        /* Need VGA 640 @ 24bpp, @ 32bpp */
+        /* Need VGA 800 @ 24bpp, @ 32bpp */
+        /* Need VGA 1024 @ 24bpp, @ 32bpp */
+};
+
+/*
+ * Controller configurations for various panels.
+ */
+
+struct panel_settings
+{
+        const char name[25];            /* Full name <vendor>_<model> */
+
+        struct  fb_monspecs monspecs;   /* FB monitor specs */
+
+        /* panel timings */
+        uint32 mode_screen;
+        uint32 mode_horztiming;
+        uint32 mode_verttiming;
+        uint32 mode_clkcontrol;
+        uint32 mode_pwmdiv;
+        uint32 mode_pwmhi;
+        uint32 mode_outmask;
+        uint32 mode_fifoctrl;
+        uint32 mode_toyclksrc;
+        uint32 mode_backlight;
+        uint32 mode_auxpll;
+        int (*device_init)(void);
+        int (*device_shutdown)(void);
+#define Xres min_xres
+#define Yres min_yres
+        u32     min_xres;               /* Minimum horizontal resolution */
+        u32     max_xres;               /* Maximum horizontal resolution */
+        u32     min_yres;               /* Minimum vertical resolution */
+        u32     max_yres;               /* Maximum vertical resolution */
+};
+
+/********************************************************************/
+/* fixme: Maybe a modedb for the CRT ? otherwise panels should be as-is */
+
+/* List of panels known to work with the AU1200 LCD controller.
+ * To add a new panel, enter the same specifications as the
+ * Generic_TFT one, and MAKE SURE that it doesn't conflicts
+ * with the controller restrictions. Restrictions are:
+ *
+ * STN color panels: max_bpp <= 12
+ * STN mono panels: max_bpp <= 4
+ * TFT panels: max_bpp <= 16
+ * max_xres <= 800
+ * max_yres <= 600
+ */
+static struct panel_settings known_lcd_panels[] =
+{
+        [0] = { /* QVGA 320x240 H:33.3kHz V:110Hz */
+                .name = "QVGA_320x240",
+                .monspecs = {
+                        .modedb = NULL,
+                        .modedb_len = 0,
+                        .hfmin = 30000,
+                        .hfmax = 70000,
+                        .vfmin = 60,
+                        .vfmax = 60,
+                        .dclkmin = 6000000,
+                        .dclkmax = 28000000,
+                        .input = FB_DISP_RGB,
+                },
+                .mode_screen            = LCD_SCREEN_SX_N(320) |
+                        LCD_SCREEN_SY_N(240),
+                .mode_horztiming        = 0x00c4623b,
+                .mode_verttiming        = 0x00502814,
+                .mode_clkcontrol        = 0x00020002, /* /4=24Mhz */
+                .mode_pwmdiv            = 0x00000000,
+                .mode_pwmhi             = 0x00000000,
+                .mode_outmask   = 0x00FFFFFF,
+                .mode_fifoctrl  = 0x2f2f2f2f,
+                .mode_toyclksrc = 0x00000004, /* AUXPLL directly */
+                .mode_backlight = 0x00000000,
+                .mode_auxpll            = 8, /* 96MHz AUXPLL */
+                .device_init            = NULL,
+                .device_shutdown        = NULL,
+                320, 320,
+                240, 240,
+        },
+
+        [1] = { /* VGA 640x480 H:30.3kHz V:58Hz */
+                .name = "VGA_640x480",
+                .monspecs = {
+                        .modedb = NULL,
+                        .modedb_len = 0,
+                        .hfmin = 30000,
+                        .hfmax = 70000,
+                        .vfmin = 60,
+                        .vfmax = 60,
+                        .dclkmin = 6000000,
+                        .dclkmax = 28000000,
+                        .input = FB_DISP_RGB,
+                },
+                .mode_screen            = 0x13f9df80,
+                .mode_horztiming        = 0x003c5859,
+                .mode_verttiming        = 0x00741201,
+                .mode_clkcontrol        = 0x00020001, /* /4=24Mhz */
+                .mode_pwmdiv            = 0x00000000,
+                .mode_pwmhi             = 0x00000000,
+                .mode_outmask   = 0x00FFFFFF,
+                .mode_fifoctrl  = 0x2f2f2f2f,
+                .mode_toyclksrc = 0x00000004, /* AUXPLL directly */
+                .mode_backlight = 0x00000000,
+                .mode_auxpll            = 8, /* 96MHz AUXPLL */
+                .device_init            = NULL,
+                .device_shutdown        = NULL,
+                640, 480,
+                640, 480,
+        },
+
+        [2] = { /* SVGA 800x600 H:46.1kHz V:69Hz */
+                .name = "SVGA_800x600",
+                .monspecs = {
+                        .modedb = NULL,
+                        .modedb_len = 0,
+                        .hfmin = 30000,
+                        .hfmax = 70000,
+                        .vfmin = 60,
+                        .vfmax = 60,
+                        .dclkmin = 6000000,
+                        .dclkmax = 28000000,
+                        .input = FB_DISP_RGB,
+                },
+                .mode_screen            = 0x18fa5780,
+                .mode_horztiming        = 0x00dc7e77,
+                .mode_verttiming        = 0x00584805,
+                .mode_clkcontrol        = 0x00020000, /* /2=48Mhz */
+                .mode_pwmdiv            = 0x00000000,
+                .mode_pwmhi             = 0x00000000,
+                .mode_outmask   = 0x00FFFFFF,
+                .mode_fifoctrl  = 0x2f2f2f2f,
+                .mode_toyclksrc = 0x00000004, /* AUXPLL directly */
+                .mode_backlight = 0x00000000,
+                .mode_auxpll            = 8, /* 96MHz AUXPLL */
+                .device_init            = NULL,
+                .device_shutdown        = NULL,
+                800, 800,
+                600, 600,
+        },
+
+        [3] = { /* XVGA 1024x768 H:56.2kHz V:70Hz */
+                .name = "XVGA_1024x768",
+                .monspecs = {
+                        .modedb = NULL,
+                        .modedb_len = 0,
+                        .hfmin = 30000,
+                        .hfmax = 70000,
+                        .vfmin = 60,
+                        .vfmax = 60,
+                        .dclkmin = 6000000,
+                        .dclkmax = 28000000,
+                        .input = FB_DISP_RGB,
+                },
+                .mode_screen            = 0x1ffaff80,
+                .mode_horztiming        = 0x007d0e57,
+                .mode_verttiming        = 0x00740a01,
+                .mode_clkcontrol        = 0x000A0000, /* /1 */
+                .mode_pwmdiv            = 0x00000000,
+                .mode_pwmhi             = 0x00000000,
+                .mode_outmask   = 0x00FFFFFF,
+                .mode_fifoctrl  = 0x2f2f2f2f,
+                .mode_toyclksrc = 0x00000004, /* AUXPLL directly */
+                .mode_backlight = 0x00000000,
+                .mode_auxpll            = 6, /* 72MHz AUXPLL */
+                .device_init            = NULL,
+                .device_shutdown        = NULL,
+                1024, 1024,
+                768, 768,
+        },
+
+        [4] = { /* XVGA XVGA 1280x1024 H:68.5kHz V:65Hz */
+                .name = "XVGA_1280x1024",
+                .monspecs = {
+                        .modedb = NULL,
+                        .modedb_len = 0,
+                        .hfmin = 30000,
+                        .hfmax = 70000,
+                        .vfmin = 60,
+                        .vfmax = 60,
+                        .dclkmin = 6000000,
+                        .dclkmax = 28000000,
+                        .input = FB_DISP_RGB,
+                },
+                .mode_screen            = 0x27fbff80,
+                .mode_horztiming        = 0x00cdb2c7,
+                .mode_verttiming        = 0x00600002,
+                .mode_clkcontrol        = 0x000A0000, /* /1 */
+                .mode_pwmdiv            = 0x00000000,
+                .mode_pwmhi             = 0x00000000,
+                .mode_outmask   = 0x00FFFFFF,
+                .mode_fifoctrl  = 0x2f2f2f2f,
+                .mode_toyclksrc = 0x00000004, /* AUXPLL directly */
+                .mode_backlight = 0x00000000,
+                .mode_auxpll            = 10, /* 120MHz AUXPLL */
+                .device_init            = NULL,
+                .device_shutdown        = NULL,
+                1280, 1280,
+                1024, 1024,
+        },
+
+        [5] = { /* Samsung 1024x768 TFT */
+                .name = "Samsung_1024x768_TFT",
+                .monspecs = {
+                        .modedb = NULL,
+                        .modedb_len = 0,
+                        .hfmin = 30000,
+                        .hfmax = 70000,
+                        .vfmin = 60,
+                        .vfmax = 60,
+                        .dclkmin = 6000000,
+                        .dclkmax = 28000000,
+                        .input = FB_DISP_RGB,
+                },
+                .mode_screen            = 0x1ffaff80,
+                .mode_horztiming        = 0x018cc677,
+                .mode_verttiming        = 0x00241217,
+                .mode_clkcontrol        = 0x00000000, /* SCB 0x1 /4=24Mhz */
+                .mode_pwmdiv            = 0x8000063f, /* SCB 0x0 */
+                .mode_pwmhi             = 0x03400000, /* SCB 0x0 */
+                .mode_outmask   = 0x00FFFFFF,
+                .mode_fifoctrl  = 0x2f2f2f2f,
+                .mode_toyclksrc = 0x00000004, /* AUXPLL directly */
+                .mode_backlight = 0x00000000,
+                .mode_auxpll            = 8, /* 96MHz AUXPLL */
+                .device_init            = board_au1200fb_panel_init,
+                .device_shutdown        = board_au1200fb_panel_shutdown,
+                1024, 1024,
+                768, 768,
+        },
+
+        [6] = { /* Toshiba 640x480 TFT */
+                .name = "Toshiba_640x480_TFT",
+                .monspecs = {
+                        .modedb = NULL,
+                        .modedb_len = 0,
+                        .hfmin = 30000,
+                        .hfmax = 70000,
+                        .vfmin = 60,
+                        .vfmax = 60,
+                        .dclkmin = 6000000,
+                        .dclkmax = 28000000,
+                        .input = FB_DISP_RGB,
+                },
+                .mode_screen            = LCD_SCREEN_SX_N(640) |
+                        LCD_SCREEN_SY_N(480),
+                .mode_horztiming        = LCD_HORZTIMING_HPW_N(96) |
+                        LCD_HORZTIMING_HND1_N(13) | LCD_HORZTIMING_HND2_N(51),
+                .mode_verttiming        = LCD_VERTTIMING_VPW_N(2) |
+                        LCD_VERTTIMING_VND1_N(11) | LCD_VERTTIMING_VND2_N(32),
+                .mode_clkcontrol        = 0x00000000, /* /4=24Mhz */
+                .mode_pwmdiv            = 0x8000063f,
+                .mode_pwmhi             = 0x03400000,
+                .mode_outmask   = 0x00fcfcfc,
+                .mode_fifoctrl  = 0x2f2f2f2f,
+                .mode_toyclksrc = 0x00000004, /* AUXPLL directly */
+                .mode_backlight = 0x00000000,
+                .mode_auxpll            = 8, /* 96MHz AUXPLL */
+                .device_init            = board_au1200fb_panel_init,
+                .device_shutdown        = board_au1200fb_panel_shutdown,
+                640, 480,
+                640, 480,
+        },
+
+        [7] = { /* Sharp 320x240 TFT */
+                .name = "Sharp_320x240_TFT",
+                .monspecs = {
+                        .modedb = NULL,
+                        .modedb_len = 0,
+                        .hfmin = 12500,
+                        .hfmax = 20000,
+                        .vfmin = 38,
+                        .vfmax = 81,
+                        .dclkmin = 4500000,
+                        .dclkmax = 6800000,
+                        .input = FB_DISP_RGB,
+                },
+                .mode_screen            = LCD_SCREEN_SX_N(320) |
+                        LCD_SCREEN_SY_N(240),
+                .mode_horztiming        = LCD_HORZTIMING_HPW_N(60) |
+                        LCD_HORZTIMING_HND1_N(13) | LCD_HORZTIMING_HND2_N(2),
+                .mode_verttiming        = LCD_VERTTIMING_VPW_N(2) |
+                        LCD_VERTTIMING_VND1_N(2) | LCD_VERTTIMING_VND2_N(5),
+                .mode_clkcontrol        = LCD_CLKCONTROL_PCD_N(7), /*16=6Mhz*/
+                .mode_pwmdiv            = 0x8000063f,
+                .mode_pwmhi             = 0x03400000,
+                .mode_outmask   = 0x00fcfcfc,
+                .mode_fifoctrl  = 0x2f2f2f2f,
+                .mode_toyclksrc = 0x00000004, /* AUXPLL directly */
+                .mode_backlight = 0x00000000,
+                .mode_auxpll            = 8, /* 96MHz AUXPLL */
+                .device_init            = board_au1200fb_panel_init,
+                .device_shutdown        = board_au1200fb_panel_shutdown,
+                320, 320,
+                240, 240,
+        },
+
+        [8] = { /* Toppoly TD070WGCB2 7" 856x480 TFT */
+                .name = "Toppoly_TD070WGCB2",
+                .monspecs = {
+                        .modedb = NULL,
+                        .modedb_len = 0,
+                        .hfmin = 30000,
+                        .hfmax = 70000,
+                        .vfmin = 60,
+                        .vfmax = 60,
+                        .dclkmin = 6000000,
+                        .dclkmax = 28000000,
+                        .input = FB_DISP_RGB,
+                },
+                .mode_screen            = LCD_SCREEN_SX_N(856) |
+                        LCD_SCREEN_SY_N(480),
+                .mode_horztiming        = LCD_HORZTIMING_HND2_N(43) |
+                        LCD_HORZTIMING_HND1_N(43) | LCD_HORZTIMING_HPW_N(114),
+                .mode_verttiming        = LCD_VERTTIMING_VND2_N(20) |
+                        LCD_VERTTIMING_VND1_N(21) | LCD_VERTTIMING_VPW_N(4),
+                .mode_clkcontrol        = 0x00020001, /* /4=24Mhz */
+                .mode_pwmdiv            = 0x8000063f,
+                .mode_pwmhi             = 0x03400000,
+                .mode_outmask   = 0x00fcfcfc,
+                .mode_fifoctrl  = 0x2f2f2f2f,
+                .mode_toyclksrc = 0x00000004, /* AUXPLL directly */
+                .mode_backlight = 0x00000000,
+                .mode_auxpll            = 8, /* 96MHz AUXPLL */
+                .device_init            = board_au1200fb_panel_init,
+                .device_shutdown        = board_au1200fb_panel_shutdown,
+                856, 856,
+                480, 480,
+        },
+};
+
+#define NUM_PANELS (ARRAY_SIZE(known_lcd_panels))
+
+/********************************************************************/
+
+#ifdef CONFIG_PM
+static int set_brightness(unsigned int brightness)
+{
+        unsigned int hi1, divider;
+
+        /* limit brightness pwm duty to >= 30/1600 */
+        if (brightness < 30) {
+                brightness = 30;
+        }
+        divider = (lcd->pwmdiv & 0x3FFFF) + 1;
+        hi1 = (lcd->pwmhi >> 16) + 1;
+        hi1 = (((brightness & 0xFF) + 1) * divider >> 8);
+        lcd->pwmhi &= 0xFFFF;
+        lcd->pwmhi |= (hi1 << 16);
+
+        return brightness;
+}
+#endif /* CONFIG_PM */
+
+static int winbpp (unsigned int winctrl1)
+{
+        int bits = 0;
+
+        /* how many bits are needed for each pixel format */
+        switch (winctrl1 & LCD_WINCTRL1_FRM) {
+        case LCD_WINCTRL1_FRM_1BPP:
+                bits = 1;
+                break;
+        case LCD_WINCTRL1_FRM_2BPP:
+                bits = 2;
+                break;
+        case LCD_WINCTRL1_FRM_4BPP:
+                bits = 4;
+                break;
+        case LCD_WINCTRL1_FRM_8BPP:
+                bits = 8;
+                break;
+        case LCD_WINCTRL1_FRM_12BPP:
+        case LCD_WINCTRL1_FRM_16BPP655:
+        case LCD_WINCTRL1_FRM_16BPP565:
+        case LCD_WINCTRL1_FRM_16BPP556:
+        case LCD_WINCTRL1_FRM_16BPPI1555:
+        case LCD_WINCTRL1_FRM_16BPPI5551:
+        case LCD_WINCTRL1_FRM_16BPPA1555:
+        case LCD_WINCTRL1_FRM_16BPPA5551:
+                bits = 16;
+                break;
+        case LCD_WINCTRL1_FRM_24BPP:
+        case LCD_WINCTRL1_FRM_32BPP:
+                bits = 32;
+                break;
+        }
+
+        return bits;
+}
+
+static int fbinfo2index (struct fb_info *fb_info)
+{
+        int i;
+
+        for (i = 0; i < CONFIG_FB_AU1200_DEVS; ++i) {
+                if (fb_info == (struct fb_info *)(&_au1200fb_devices[i].fb_info))
+                        return i;
+        }
+        printk("au1200fb: ERROR: fbinfo2index failed!\n");
+        return -1;
+}
+
+static int au1200_setlocation (struct au1200fb_device *fbdev, int plane,
+        int xpos, int ypos)
+{
+        uint32 winctrl0, winctrl1, winenable, fb_offset = 0;
+        int xsz, ysz;
+
+        /* FIX!!! NOT CHECKING FOR COMPLETE OFFSCREEN YET */
+
+        winctrl0 = lcd->window[plane].winctrl0;
+        winctrl1 = lcd->window[plane].winctrl1;
+        winctrl0 &= (LCD_WINCTRL0_A | LCD_WINCTRL0_AEN);
+        winctrl1 &= ~(LCD_WINCTRL1_SZX | LCD_WINCTRL1_SZY);
+
+        /* Check for off-screen adjustments */
+        xsz = win->w[plane].xres;
+        ysz = win->w[plane].yres;
+        if ((xpos + win->w[plane].xres) > panel->Xres) {
+                /* Off-screen to the right */
+                xsz = panel->Xres - xpos; /* off by 1 ??? */
+                /*printk("off screen right\n");*/
+        }
+
+        if ((ypos + win->w[plane].yres) > panel->Yres) {
+                /* Off-screen to the bottom */
+                ysz = panel->Yres - ypos; /* off by 1 ??? */
+                /*printk("off screen bottom\n");*/
+        }
+
+        if (xpos < 0) {
+                /* Off-screen to the left */
+                xsz = win->w[plane].xres + xpos;
+                fb_offset += (((0 - xpos) * winbpp(lcd->window[plane].winctrl1))/8);
+                xpos = 0;
+                /*printk("off screen left\n");*/
+        }
+
+        if (ypos < 0) {
+                /* Off-screen to the top */
+                ysz = win->w[plane].yres + ypos;
+                /* fixme: fb_offset += ((0-ypos)*fb_pars[plane].line_length); */
+                ypos = 0;
+                /*printk("off screen top\n");*/
+        }
+
+        /* record settings */
+        win->w[plane].xpos = xpos;
+        win->w[plane].ypos = ypos;
+
+        xsz -= 1;
+        ysz -= 1;
+        winctrl0 |= (xpos << 21);
+        winctrl0 |= (ypos << 10);
+        winctrl1 |= (xsz << 11);
+        winctrl1 |= (ysz << 0);
+
+        /* Disable the window while making changes, then restore WINEN */
+        winenable = lcd->winenable & (1 << plane);
+        au_sync();
+        lcd->winenable &= ~(1 << plane);
+        lcd->window[plane].winctrl0 = winctrl0;
+        lcd->window[plane].winctrl1 = winctrl1;
+        lcd->window[plane].winbuf0 =
+        lcd->window[plane].winbuf1 = fbdev->fb_phys;
+        lcd->window[plane].winbufctrl = 0; /* select winbuf0 */
+        lcd->winenable |= winenable;
+        au_sync();
+
+        return 0;
+}
+
+static void au1200_setpanel (struct panel_settings *newpanel)
+{
+        /*
+         * Perform global setup/init of LCD controller
+         */
+        uint32 winenable;
+
+        /* Make sure all windows disabled */
+        winenable = lcd->winenable;
+        lcd->winenable = 0;
+        au_sync();
+        /*
+         * Ensure everything is disabled before reconfiguring
+         */
+        if (lcd->screen & LCD_SCREEN_SEN) {
+                /* Wait for vertical sync period */
+                lcd->intstatus = LCD_INT_SS;
+                while ((lcd->intstatus & LCD_INT_SS) == 0) {
+                        au_sync();
+                }
+
+                lcd->screen &= ~LCD_SCREEN_SEN; /*disable the controller*/
+
+                do {
+                        lcd->intstatus = lcd->intstatus; /*clear interrupts*/
+                        au_sync();
+                /*wait for controller to shut down*/
+                } while ((lcd->intstatus & LCD_INT_SD) == 0);
+
+                /* Call shutdown of current panel (if up) */
+                /* this must occur last, because if an external clock is driving
+                    the controller, the clock cannot be turned off before first
+                        shutting down the controller.
+                 */
+                if (panel->device_shutdown != NULL)
+                        panel->device_shutdown();
+        }
+
+        /* Newpanel == NULL indicates a shutdown operation only */
+        if (newpanel == NULL)
+                return;
+
+        panel = newpanel;
+
+        printk("Panel(%s), %dx%d\n", panel->name, panel->Xres, panel->Yres);
+
+        /*
+         * Setup clocking if internal LCD clock source (assumes sys_auxpll valid)
+         */
+        if (!(panel->mode_clkcontrol & LCD_CLKCONTROL_EXT))
+        {
+                uint32 sys_clksrc;
+                au_writel(panel->mode_auxpll, SYS_AUXPLL);
+                sys_clksrc = au_readl(SYS_CLKSRC) & ~0x0000001f;
+                sys_clksrc |= panel->mode_toyclksrc;
+                au_writel(sys_clksrc, SYS_CLKSRC);
+        }
+
+        /*
+         * Configure panel timings
+         */
+        lcd->screen = panel->mode_screen;
+        lcd->horztiming = panel->mode_horztiming;
+        lcd->verttiming = panel->mode_verttiming;
+        lcd->clkcontrol = panel->mode_clkcontrol;
+        lcd->pwmdiv = panel->mode_pwmdiv;
+        lcd->pwmhi = panel->mode_pwmhi;
+        lcd->outmask = panel->mode_outmask;
+        lcd->fifoctrl = panel->mode_fifoctrl;
+        au_sync();
+
+        /* fixme: Check window settings to make sure still valid
+         * for new geometry */
+#if 0
+        au1200_setlocation(fbdev, 0, win->w[0].xpos, win->w[0].ypos);
+        au1200_setlocation(fbdev, 1, win->w[1].xpos, win->w[1].ypos);
+        au1200_setlocation(fbdev, 2, win->w[2].xpos, win->w[2].ypos);
+        au1200_setlocation(fbdev, 3, win->w[3].xpos, win->w[3].ypos);
+#endif
+        lcd->winenable = winenable;
+
+        /*
+         * Re-enable screen now that it is configured
+         */
+        lcd->screen |= LCD_SCREEN_SEN;
+        au_sync();
+
+        /* Call init of panel */
+        if (panel->device_init != NULL) panel->device_init();
+
+        /* FIX!!!! not appropriate on panel change!!! Global setup/init */
+        lcd->intenable = 0;
+        lcd->intstatus = ~0;
+        lcd->backcolor = win->mode_backcolor;
+
+        /* Setup Color Key - FIX!!! */
+        lcd->colorkey = win->mode_colorkey;
+        lcd->colorkeymsk = win->mode_colorkeymsk;
+
+        /* Setup HWCursor - FIX!!! Need to support this eventually */
+        lcd->hwc.cursorctrl = 0;
+        lcd->hwc.cursorpos = 0;
+        lcd->hwc.cursorcolor0 = 0;
+        lcd->hwc.cursorcolor1 = 0;
+        lcd->hwc.cursorcolor2 = 0;
+        lcd->hwc.cursorcolor3 = 0;
+
+
+#if 0
+#define D(X) printk("%25s: %08X\n", #X, X)
+        D(lcd->screen);
+        D(lcd->horztiming);
+        D(lcd->verttiming);
+        D(lcd->clkcontrol);
+        D(lcd->pwmdiv);
+        D(lcd->pwmhi);
+        D(lcd->outmask);
+        D(lcd->fifoctrl);
+        D(lcd->window[0].winctrl0);
+        D(lcd->window[0].winctrl1);
+        D(lcd->window[0].winctrl2);
+        D(lcd->window[0].winbuf0);
+        D(lcd->window[0].winbuf1);
+        D(lcd->window[0].winbufctrl);
+        D(lcd->window[1].winctrl0);
+        D(lcd->window[1].winctrl1);
+        D(lcd->window[1].winctrl2);
+        D(lcd->window[1].winbuf0);
+        D(lcd->window[1].winbuf1);
+        D(lcd->window[1].winbufctrl);
+        D(lcd->window[2].winctrl0);
+        D(lcd->window[2].winctrl1);
+        D(lcd->window[2].winctrl2);
+        D(lcd->window[2].winbuf0);
+        D(lcd->window[2].winbuf1);
+        D(lcd->window[2].winbufctrl);
+        D(lcd->window[3].winctrl0);
+        D(lcd->window[3].winctrl1);
+        D(lcd->window[3].winctrl2);
+        D(lcd->window[3].winbuf0);
+        D(lcd->window[3].winbuf1);
+        D(lcd->window[3].winbufctrl);
+        D(lcd->winenable);
+        D(lcd->intenable);
+        D(lcd->intstatus);
+        D(lcd->backcolor);
+        D(lcd->winenable);
+        D(lcd->colorkey);
+    D(lcd->colorkeymsk);
+        D(lcd->hwc.cursorctrl);
+        D(lcd->hwc.cursorpos);
+        D(lcd->hwc.cursorcolor0);
+        D(lcd->hwc.cursorcolor1);
+        D(lcd->hwc.cursorcolor2);
+        D(lcd->hwc.cursorcolor3);
+#endif
+}
+
+static void au1200_setmode(struct au1200fb_device *fbdev)
+{
+        int plane = fbdev->plane;
+        /* Window/plane setup */
+        lcd->window[plane].winctrl1 = ( 0
+                | LCD_WINCTRL1_PRI_N(plane)
+                | win->w[plane].mode_winctrl1 /* FRM,CCO,PO,PIPE */
+                ) ;
+
+        au1200_setlocation(fbdev, plane, win->w[plane].xpos, win->w[plane].ypos);
+
+        lcd->window[plane].winctrl2 = ( 0
+                | LCD_WINCTRL2_CKMODE_00
+                | LCD_WINCTRL2_DBM
+                | LCD_WINCTRL2_BX_N( fbdev->fb_info.fix.line_length)
+                | LCD_WINCTRL2_SCX_1
+                | LCD_WINCTRL2_SCY_1
+                ) ;
+        lcd->winenable |= win->w[plane].mode_winenable;
+        au_sync();
+}
+
+
+/* Inline helpers */
+
+/*#define panel_is_dual(panel)  ((panel->mode_screen & LCD_SCREEN_PT) == LCD_SCREEN_PT_010)*/
+/*#define panel_is_active(panel)((panel->mode_screen & LCD_SCREEN_PT) == LCD_SCREEN_PT_010)*/
+
+#define panel_is_color(panel) ((panel->mode_screen & LCD_SCREEN_PT) <= LCD_SCREEN_PT_CDSTN)
+
+/* Bitfields format supported by the controller. */
+static struct fb_bitfield rgb_bitfields[][4] = {
+        /*     Red,        Green,        Blue,       Transp   */
+        [LCD_WINCTRL1_FRM_16BPP655 >> 25] =
+                { { 10, 6, 0 }, { 5, 5, 0 }, { 0, 5, 0 }, { 0, 0, 0 } },
+
+        [LCD_WINCTRL1_FRM_16BPP565 >> 25] =
+                { { 11, 5, 0 }, { 5, 6, 0 }, { 0, 5, 0 }, { 0, 0, 0 } },
+
+        [LCD_WINCTRL1_FRM_16BPP556 >> 25] =
+                { { 11, 5, 0 }, { 6, 5, 0 }, { 0, 6, 0 }, { 0, 0, 0 } },
+
+        [LCD_WINCTRL1_FRM_16BPPI1555 >> 25] =
+                { { 10, 5, 0 }, { 5, 5, 0 }, { 0, 5, 0 }, { 0, 0, 0 } },
+
+        [LCD_WINCTRL1_FRM_16BPPI5551 >> 25] =
+                { { 11, 5, 0 }, { 6, 5, 0 }, { 1, 5, 0 }, { 0, 0, 0 } },
+
+        [LCD_WINCTRL1_FRM_16BPPA1555 >> 25] =
+                { { 10, 5, 0 }, { 5, 5, 0 }, { 0, 5, 0 }, { 15, 1, 0 } },
+
+        [LCD_WINCTRL1_FRM_16BPPA5551 >> 25] =
+                { { 11, 5, 0 }, { 6, 5, 0 }, { 1, 5, 0 }, { 0, 1, 0 } },
+
+        [LCD_WINCTRL1_FRM_24BPP >> 25] =
+                { { 16, 8, 0 }, { 8, 8, 0 }, { 0, 8, 0 }, { 0, 0, 0 } },
+
+        [LCD_WINCTRL1_FRM_32BPP >> 25] =
+                { { 16, 8, 0 }, { 8, 8, 0 }, { 0, 8, 0 }, { 24, 0, 0 } },
+};
+
+/*-------------------------------------------------------------------------*/
+
+/* Helpers */
+
+static void au1200fb_update_fbinfo(struct fb_info *fbi)
+{
+        /* FIX!!!! This also needs to take the window pixel format into account!!! */
+
+        /* Update var-dependent FB info */
+        if (panel_is_color(panel)) {
+                if (fbi->var.bits_per_pixel <= 8) {
+                        /* palettized */
+                        fbi->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+                        fbi->fix.line_length = fbi->var.xres_virtual /
+                                (8/fbi->var.bits_per_pixel);
+                } else {
+                        /* non-palettized */
+                        fbi->fix.visual = FB_VISUAL_TRUECOLOR;
+                        fbi->fix.line_length = fbi->var.xres_virtual * (fbi->var.bits_per_pixel / 8);
+                }
+        } else {
+                /* mono FIX!!! mono 8 and 4 bits */
+                fbi->fix.visual = FB_VISUAL_MONO10;
+                fbi->fix.line_length = fbi->var.xres_virtual / 8;
+        }
+
+        fbi->screen_size = fbi->fix.line_length * fbi->var.yres_virtual;
+        print_dbg("line length: %d\n", fbi->fix.line_length);
+        print_dbg("bits_per_pixel: %d\n", fbi->var.bits_per_pixel);
+}
+
+/*-------------------------------------------------------------------------*/
+
+/* AU1200 framebuffer driver */
+
+/* fb_check_var
+ * Validate var settings with hardware restrictions and modify it if necessary
+ */
+static int au1200fb_fb_check_var(struct fb_var_screeninfo *var,
+        struct fb_info *fbi)
+{
+        struct au1200fb_device *fbdev = (struct au1200fb_device *)fbi;
+        u32 pixclock;
+        int screen_size, plane;
+
+        plane = fbdev->plane;
+
+        /* Make sure that the mode respect all LCD controller and
+         * panel restrictions. */
+        var->xres = win->w[plane].xres;
+        var->yres = win->w[plane].yres;
+
+        /* No need for virtual resolution support */
+        var->xres_virtual = var->xres;
+        var->yres_virtual = var->yres;
+
+        var->bits_per_pixel = winbpp(win->w[plane].mode_winctrl1);
+
+        screen_size = var->xres_virtual * var->yres_virtual;
+        if (var->bits_per_pixel > 8) screen_size *= (var->bits_per_pixel / 8);
+        else screen_size /= (8/var->bits_per_pixel);
+
+        if (fbdev->fb_len < screen_size)
+                return -EINVAL; /* Virtual screen is to big, abort */
+
+        /* FIX!!!! what are the implicaitons of ignoring this for windows ??? */
+        /* The max LCD clock is fixed to 48MHz (value of AUX_CLK). The pixel
+         * clock can only be obtain by dividing this value by an even integer.
+         * Fallback to a slower pixel clock if necessary. */
+        pixclock = max((u32)(PICOS2KHZ(var->pixclock) * 1000), fbi->monspecs.dclkmin);
+        pixclock = min(pixclock, min(fbi->monspecs.dclkmax, (u32)AU1200_LCD_MAX_CLK/2));
+
+        if (AU1200_LCD_MAX_CLK % pixclock) {
+                int diff = AU1200_LCD_MAX_CLK % pixclock;
+                pixclock -= diff;
+        }
+
+        var->pixclock = KHZ2PICOS(pixclock/1000);
+#if 0
+        if (!panel_is_active(panel)) {
+                int pcd = AU1200_LCD_MAX_CLK / (pixclock * 2) - 1;
+
+                if (!panel_is_color(panel)
+                        && (panel->control_base & LCD_CONTROL_MPI) && (pcd < 3)) {
+                        /* STN 8bit mono panel support is up to 6MHz pixclock */
+                        var->pixclock = KHZ2PICOS(6000);
+                } else if (!pcd) {
+                        /* Other STN panel support is up to 12MHz  */
+                        var->pixclock = KHZ2PICOS(12000);
+                }
+        }
+#endif
+        /* Set bitfield accordingly */
+        switch (var->bits_per_pixel) {
+                case 16:
+                {
+                        /* 16bpp True color.
+                         * These must be set to MATCH WINCTRL[FORM] */
+                        int idx;
+                        idx = (win->w[0].mode_winctrl1 & LCD_WINCTRL1_FRM) >> 25;
+                        var->red    = rgb_bitfields[idx][0];
+                        var->green  = rgb_bitfields[idx][1];
+                        var->blue   = rgb_bitfields[idx][2];
+                        var->transp = rgb_bitfields[idx][3];
+                        break;
+                }
+
+                case 32:
+                {
+                        /* 32bpp True color.
+                         * These must be set to MATCH WINCTRL[FORM] */
+                        int idx;
+                        idx = (win->w[0].mode_winctrl1 & LCD_WINCTRL1_FRM) >> 25;
+                        var->red    = rgb_bitfields[idx][0];
+                        var->green  = rgb_bitfields[idx][1];
+                        var->blue   = rgb_bitfields[idx][2];
+                        var->transp = rgb_bitfields[idx][3];
+                        break;
+                }
+                default:
+                        print_dbg("Unsupported depth %dbpp", var->bits_per_pixel);
+                        return -EINVAL;
+        }
+
+        return 0;
+}
+
+/* fb_set_par
+ * Set hardware with var settings. This will enable the controller with a
+ * specific mode, normally validated with the fb_check_var method
+ */
+static int au1200fb_fb_set_par(struct fb_info *fbi)
+{
+        struct au1200fb_device *fbdev = (struct au1200fb_device *)fbi;
+
+        au1200fb_update_fbinfo(fbi);
+        au1200_setmode(fbdev);
+
+        return 0;
+}
+
+/* fb_setcolreg
+ * Set color in LCD palette.
+ */
+static int au1200fb_fb_setcolreg(unsigned regno, unsigned red, unsigned green,
+        unsigned blue, unsigned transp, struct fb_info *fbi)
+{
+        volatile u32 *palette = lcd->palette;
+        u32 value;
+
+        if (regno > (AU1200_LCD_NBR_PALETTE_ENTRIES - 1))
+                return -EINVAL;
+
+        if (fbi->var.grayscale) {
+                /* Convert color to grayscale */
+                red = green = blue =
+                        (19595 * red + 38470 * green + 7471 * blue) >> 16;
+        }
+
+        if (fbi->fix.visual == FB_VISUAL_TRUECOLOR) {
+                /* Place color in the pseudopalette */
+                if (regno > 16)
+                        return -EINVAL;
+
+                palette = (u32*) fbi->pseudo_palette;
+
+                red   >>= (16 - fbi->var.red.length);
+                green >>= (16 - fbi->var.green.length);
+                blue  >>= (16 - fbi->var.blue.length);
+
+                value = (red   << fbi->var.red.offset)  |
+                        (green << fbi->var.green.offset)|
+                        (blue  << fbi->var.blue.offset);
+                value &= 0xFFFF;
+
+        } else if (1 /*FIX!!! panel_is_active(fbdev->panel)*/) {
+                /* COLOR TFT PALLETTIZED (use RGB 565) */
+                value = (red & 0xF800)|((green >> 5) &
+                                0x07E0)|((blue >> 11) & 0x001F);
+                value &= 0xFFFF;
+
+        } else if (0 /*panel_is_color(fbdev->panel)*/) {
+                /* COLOR STN MODE */
+                value = 0x1234;
+                value &= 0xFFF;
+        } else {
+                /* MONOCHROME MODE */
+                value = (green >> 12) & 0x000F;
+                value &= 0xF;
+        }
+
+        palette[regno] = value;
+
+        return 0;
+}
+
+/* fb_blank
+ * Blank the screen. Depending on the mode, the screen will be
+ * activated with the backlight color, or desactivated
+ */
+static int au1200fb_fb_blank(int blank_mode, struct fb_info *fbi)
+{
+        /* Short-circuit screen blanking */
+        if (noblanking)
+                return 0;
+
+        switch (blank_mode) {
+
+        case FB_BLANK_UNBLANK:
+        case FB_BLANK_NORMAL:
+                /* printk("turn on panel\n"); */
+                au1200_setpanel(panel);
+                break;
+        case FB_BLANK_VSYNC_SUSPEND:
+        case FB_BLANK_HSYNC_SUSPEND:
+        case FB_BLANK_POWERDOWN:
+                /* printk("turn off panel\n"); */
+                au1200_setpanel(NULL);
+                break;
+        default:
+                break;
+
+        }
+
+        /* FB_BLANK_NORMAL is a soft blank */
+        return (blank_mode == FB_BLANK_NORMAL) ? -EINVAL : 0;
+}
+
+/* fb_mmap
+ * Map video memory in user space. We don't use the generic fb_mmap
+ * method mainly to allow the use of the TLB streaming flag (CCA=6)
+ */
+static int au1200fb_fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
+
+{
+        unsigned int len;
+        unsigned long start=0, off;
+        struct au1200fb_device *fbdev = (struct au1200fb_device *) info;
+
+#ifdef CONFIG_PM
+        au1xxx_pm_access(LCD_pm_dev);
+#endif
+
+        if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT)) {
+                return -EINVAL;
+        }
+
+        start = fbdev->fb_phys & PAGE_MASK;
+        len = PAGE_ALIGN((start & ~PAGE_MASK) + fbdev->fb_len);
+
+        off = vma->vm_pgoff << PAGE_SHIFT;
+
+        if ((vma->vm_end - vma->vm_start + off) > len) {
+                return -EINVAL;
+        }
+
+        off += start;
+        vma->vm_pgoff = off >> PAGE_SHIFT;
+
+        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+        pgprot_val(vma->vm_page_prot) |= _CACHE_MASK; /* CCA=7 */
+
+        vma->vm_flags |= VM_IO;
+
+        return io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
+                                  vma->vm_end - vma->vm_start,
+                                  vma->vm_page_prot);
+
+        return 0;
+}
+
+static void set_global(u_int cmd, struct au1200_lcd_global_regs_t *pdata)
+{
+
+        unsigned int hi1, divider;
+
+        /* SCREEN_SIZE: user cannot reset size, must switch panel choice */
+
+        if (pdata->flags & SCREEN_BACKCOLOR)
+                lcd->backcolor = pdata->backcolor;
+
+        if (pdata->flags & SCREEN_BRIGHTNESS) {
+
+                // limit brightness pwm duty to >= 30/1600
+                if (pdata->brightness < 30) {
+                        pdata->brightness = 30;
+                }
+                divider = (lcd->pwmdiv & 0x3FFFF) + 1;
+                hi1 = (lcd->pwmhi >> 16) + 1;
+                hi1 = (((pdata->brightness & 0xFF)+1) * divider >> 8);
+                lcd->pwmhi &= 0xFFFF;
+                lcd->pwmhi |= (hi1 << 16);
+        }
+
+        if (pdata->flags & SCREEN_COLORKEY)
+                lcd->colorkey = pdata->colorkey;
+
+        if (pdata->flags & SCREEN_MASK)
+                lcd->colorkeymsk = pdata->mask;
+        au_sync();
+}
+
+static void get_global(u_int cmd, struct au1200_lcd_global_regs_t *pdata)
+{
+        unsigned int hi1, divider;
+
+        pdata->xsize = ((lcd->screen & LCD_SCREEN_SX) >> 19) + 1;
+        pdata->ysize = ((lcd->screen & LCD_SCREEN_SY) >> 8) + 1;
+
+        pdata->backcolor = lcd->backcolor;
+        pdata->colorkey = lcd->colorkey;
+        pdata->mask = lcd->colorkeymsk;
+
+        // brightness
+        hi1 = (lcd->pwmhi >> 16) + 1;
+        divider = (lcd->pwmdiv & 0x3FFFF) + 1;
+        pdata->brightness = ((hi1 << 8) / divider) - 1;
+        au_sync();
+}
+
+static void set_window(unsigned int plane,
+        struct au1200_lcd_window_regs_t *pdata)
+{
+        unsigned int val, bpp;
+
+        /* Window control register 0 */
+        if (pdata->flags & WIN_POSITION) {
+                val = lcd->window[plane].winctrl0 & ~(LCD_WINCTRL0_OX |
+                                LCD_WINCTRL0_OY);
+                val |= ((pdata->xpos << 21) & LCD_WINCTRL0_OX);
+                val |= ((pdata->ypos << 10) & LCD_WINCTRL0_OY);
+                lcd->window[plane].winctrl0 = val;
+        }
+        if (pdata->flags & WIN_ALPHA_COLOR) {
+                val = lcd->window[plane].winctrl0 & ~(LCD_WINCTRL0_A);
+                val |= ((pdata->alpha_color << 2) & LCD_WINCTRL0_A);
+                lcd->window[plane].winctrl0 = val;
+        }
+        if (pdata->flags & WIN_ALPHA_MODE) {
+                val = lcd->window[plane].winctrl0 & ~(LCD_WINCTRL0_AEN);
+                val |= ((pdata->alpha_mode << 1) & LCD_WINCTRL0_AEN);
+                lcd->window[plane].winctrl0 = val;
+        }
+
+        /* Window control register 1 */
+        if (pdata->flags & WIN_PRIORITY) {
+                val = lcd->window[plane].winctrl1 & ~(LCD_WINCTRL1_PRI);
+                val |= ((pdata->priority << 30) & LCD_WINCTRL1_PRI);
+                lcd->window[plane].winctrl1 = val;
+        }
+        if (pdata->flags & WIN_CHANNEL) {
+                val = lcd->window[plane].winctrl1 & ~(LCD_WINCTRL1_PIPE);
+                val |= ((pdata->channel << 29) & LCD_WINCTRL1_PIPE);
+                lcd->window[plane].winctrl1 = val;
+        }
+        if (pdata->flags & WIN_BUFFER_FORMAT) {
+                val = lcd->window[plane].winctrl1 & ~(LCD_WINCTRL1_FRM);
+                val |= ((pdata->buffer_format << 25) & LCD_WINCTRL1_FRM);
+                lcd->window[plane].winctrl1 = val;
+        }
+        if (pdata->flags & WIN_COLOR_ORDER) {
+                val = lcd->window[plane].winctrl1 & ~(LCD_WINCTRL1_CCO);
+                val |= ((pdata->color_order << 24) & LCD_WINCTRL1_CCO);
+                lcd->window[plane].winctrl1 = val;
+        }
+        if (pdata->flags & WIN_PIXEL_ORDER) {
+                val = lcd->window[plane].winctrl1 & ~(LCD_WINCTRL1_PO);
+                val |= ((pdata->pixel_order << 22) & LCD_WINCTRL1_PO);
+                lcd->window[plane].winctrl1 = val;
+        }
+        if (pdata->flags & WIN_SIZE) {
+                val = lcd->window[plane].winctrl1 & ~(LCD_WINCTRL1_SZX |
+                                LCD_WINCTRL1_SZY);
+                val |= (((pdata->xsize << 11) - 1) & LCD_WINCTRL1_SZX);
+                val |= (((pdata->ysize) - 1) & LCD_WINCTRL1_SZY);
+                lcd->window[plane].winctrl1 = val;
+                /* program buffer line width */
+                bpp = winbpp(val) / 8;
+                val = lcd->window[plane].winctrl2 & ~(LCD_WINCTRL2_BX);
+                val |= (((pdata->xsize * bpp) << 8) & LCD_WINCTRL2_BX);
+                lcd->window[plane].winctrl2 = val;
+        }
+
+        /* Window control register 2 */
+        if (pdata->flags & WIN_COLORKEY_MODE) {
+                val = lcd->window[plane].winctrl2 & ~(LCD_WINCTRL2_CKMODE);
+                val |= ((pdata->colorkey_mode << 24) & LCD_WINCTRL2_CKMODE);
+                lcd->window[plane].winctrl2 = val;
+        }
+        if (pdata->flags & WIN_DOUBLE_BUFFER_MODE) {
+                val = lcd->window[plane].winctrl2 & ~(LCD_WINCTRL2_DBM);
+                val |= ((pdata->double_buffer_mode << 23) & LCD_WINCTRL2_DBM);
+                lcd->window[plane].winctrl2 = val;
+        }
+        if (pdata->flags & WIN_RAM_ARRAY_MODE) {
+                val = lcd->window[plane].winctrl2 & ~(LCD_WINCTRL2_RAM);
+                val |= ((pdata->ram_array_mode << 21) & LCD_WINCTRL2_RAM);
+                lcd->window[plane].winctrl2 = val;
+        }
+
+        /* Buffer line width programmed with WIN_SIZE */
+
+        if (pdata->flags & WIN_BUFFER_SCALE) {
+                val = lcd->window[plane].winctrl2 & ~(LCD_WINCTRL2_SCX |
+                                LCD_WINCTRL2_SCY);
+                val |= ((pdata->xsize << 11) & LCD_WINCTRL2_SCX);
+                val |= ((pdata->ysize) & LCD_WINCTRL2_SCY);
+                lcd->window[plane].winctrl2 = val;
+        }
+
+        if (pdata->flags & WIN_ENABLE) {
+                val = lcd->winenable;
+                val &= ~(1<<plane);
+                val |= (pdata->enable & 1) << plane;
+                lcd->winenable = val;
+        }
+        au_sync();
+}
+
+static void get_window(unsigned int plane,
+        struct au1200_lcd_window_regs_t *pdata)
+{
+        /* Window control register 0 */
+        pdata->xpos = (lcd->window[plane].winctrl0 & LCD_WINCTRL0_OX) >> 21;
+        pdata->ypos = (lcd->window[plane].winctrl0 & LCD_WINCTRL0_OY) >> 10;
+        pdata->alpha_color = (lcd->window[plane].winctrl0 & LCD_WINCTRL0_A) >> 2;
+        pdata->alpha_mode = (lcd->window[plane].winctrl0 & LCD_WINCTRL0_AEN) >> 1;
+
+        /* Window control register 1 */
+        pdata->priority = (lcd->window[plane].winctrl1& LCD_WINCTRL1_PRI) >> 30;
+        pdata->channel = (lcd->window[plane].winctrl1 & LCD_WINCTRL1_PIPE) >> 29;
+        pdata->buffer_format = (lcd->window[plane].winctrl1 & LCD_WINCTRL1_FRM) >> 25;
+        pdata->color_order = (lcd->window[plane].winctrl1 & LCD_WINCTRL1_CCO) >> 24;
+        pdata->pixel_order = (lcd->window[plane].winctrl1 & LCD_WINCTRL1_PO) >> 22;
+        pdata->xsize = ((lcd->window[plane].winctrl1 & LCD_WINCTRL1_SZX) >> 11) + 1;
+        pdata->ysize = (lcd->window[plane].winctrl1 & LCD_WINCTRL1_SZY) + 1;
+
+        /* Window control register 2 */
+        pdata->colorkey_mode = (lcd->window[plane].winctrl2 & LCD_WINCTRL2_CKMODE) >> 24;
+        pdata->double_buffer_mode = (lcd->window[plane].winctrl2 & LCD_WINCTRL2_DBM) >> 23;
+        pdata->ram_array_mode = (lcd->window[plane].winctrl2 & LCD_WINCTRL2_RAM) >> 21;
+
+        pdata->enable = (lcd->winenable >> plane) & 1;
+        au_sync();
+}
+
+static int au1200fb_ioctl(struct fb_info *info, unsigned int cmd,
+                          unsigned long arg)
+{
+        int plane;
+        int val;
+
+#ifdef CONFIG_PM
+        au1xxx_pm_access(LCD_pm_dev);
+#endif
+
+        plane = fbinfo2index(info);
+        print_dbg("au1200fb: ioctl %d on plane %d\n", cmd, plane);
+
+        if (cmd == AU1200_LCD_FB_IOCTL) {
+                struct au1200_lcd_iodata_t iodata;
+
+                if (copy_from_user(&iodata, (void __user *) arg, sizeof(iodata)))
+                        return -EFAULT;
+
+                print_dbg("FB IOCTL called\n");
+
+                switch (iodata.subcmd) {
+                case AU1200_LCD_SET_SCREEN:
+                        print_dbg("AU1200_LCD_SET_SCREEN\n");
+                        set_global(cmd, &iodata.global);
+                        break;
+
+                case AU1200_LCD_GET_SCREEN:
+                        print_dbg("AU1200_LCD_GET_SCREEN\n");
+                        get_global(cmd, &iodata.global);
+                        break;
+
+                case AU1200_LCD_SET_WINDOW:
+                        print_dbg("AU1200_LCD_SET_WINDOW\n");
+                        set_window(plane, &iodata.window);
+                        break;
+
+                case AU1200_LCD_GET_WINDOW:
+                        print_dbg("AU1200_LCD_GET_WINDOW\n");
+                        get_window(plane, &iodata.window);
+                        break;
+
+                case AU1200_LCD_SET_PANEL:
+                        print_dbg("AU1200_LCD_SET_PANEL\n");
+                        if ((iodata.global.panel_choice >= 0) &&
+                                        (iodata.global.panel_choice <
+                                         NUM_PANELS))
+                        {
+                                struct panel_settings *newpanel;
+                                panel_index = iodata.global.panel_choice;
+                                newpanel = &known_lcd_panels[panel_index];
+                                au1200_setpanel(newpanel);
+                        }
+                        break;
+
+                case AU1200_LCD_GET_PANEL:
+                        print_dbg("AU1200_LCD_GET_PANEL\n");
+                        iodata.global.panel_choice = panel_index;
+                        break;
+
+                default:
+                        return -EINVAL;
+                }
+
+                val = copy_to_user((void __user *) arg, &iodata, sizeof(iodata));
+                if (val) {
+                        print_dbg("error: could not copy %d bytes\n", val);
+                        return -EFAULT;
+                }
+        }
+
+        return 0;
+}
+
+
+static struct fb_ops au1200fb_fb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_check_var   = au1200fb_fb_check_var,
+        .fb_set_par     = au1200fb_fb_set_par,
+        .fb_setcolreg   = au1200fb_fb_setcolreg,
+        .fb_blank       = au1200fb_fb_blank,
+        .fb_fillrect    = cfb_fillrect,
+        .fb_copyarea    = cfb_copyarea,
+        .fb_imageblit   = cfb_imageblit,
+        .fb_sync        = NULL,
+        .fb_ioctl       = au1200fb_ioctl,
+        .fb_mmap        = au1200fb_fb_mmap,
+};
+
+/*-------------------------------------------------------------------------*/
+
+static irqreturn_t au1200fb_handle_irq(int irq, void* dev_id, struct pt_regs *regs)
+{
+        /* Nothing to do for now, just clear any pending interrupt */
+        lcd->intstatus = lcd->intstatus;
+        au_sync();
+
+        return IRQ_HANDLED;
+}
+
+/*-------------------------------------------------------------------------*/
+
+/* AU1200 LCD device probe helpers */
+
+static int au1200fb_init_fbinfo(struct au1200fb_device *fbdev)
+{
+        struct fb_info *fbi = &fbdev->fb_info;
+        int bpp;
+
+        memset(fbi, 0, sizeof(struct fb_info));
+        fbi->fbops = &au1200fb_fb_ops;
+
+        bpp = winbpp(win->w[fbdev->plane].mode_winctrl1);
+
+        /* Copy monitor specs from panel data */
+        /* fixme: we're setting up LCD controller windows, so these dont give a
+        damn as to what the monitor specs are (the panel itself does, but that
+        isnt done here...so maybe need a generic catchall monitor setting??? */
+        memcpy(&fbi->monspecs, &panel->monspecs, sizeof(struct fb_monspecs));
+
+        /* We first try the user mode passed in argument. If that failed,
+         * or if no one has been specified, we default to the first mode of the
+         * panel list. Note that after this call, var data will be set */
+        if (!fb_find_mode(&fbi->var,
+                          fbi,
+                          NULL, /* drv_info.opt_mode, */
+                          fbi->monspecs.modedb,
+                          fbi->monspecs.modedb_len,
+                          fbi->monspecs.modedb,
+                          bpp)) {
+
+                print_err("Cannot find valid mode for panel %s", panel->name);
+                return -EFAULT;
+        }
+
+        fbi->pseudo_palette = kmalloc(sizeof(u32) * 16, GFP_KERNEL);
+        if (!fbi->pseudo_palette) {
+                return -ENOMEM;
+        }
+        memset(fbi->pseudo_palette, 0, sizeof(u32) * 16);
+
+        if (fb_alloc_cmap(&fbi->cmap, AU1200_LCD_NBR_PALETTE_ENTRIES, 0) < 0) {
+                print_err("Fail to allocate colormap (%d entries)",
+                           AU1200_LCD_NBR_PALETTE_ENTRIES);
+                kfree(fbi->pseudo_palette);
+                return -EFAULT;
+        }
+
+        strncpy(fbi->fix.id, "AU1200", sizeof(fbi->fix.id));
+        fbi->fix.smem_start = fbdev->fb_phys;
+        fbi->fix.smem_len = fbdev->fb_len;
+        fbi->fix.type = FB_TYPE_PACKED_PIXELS;
+        fbi->fix.xpanstep = 0;
+        fbi->fix.ypanstep = 0;
+        fbi->fix.mmio_start = 0;
+        fbi->fix.mmio_len = 0;
+        fbi->fix.accel = FB_ACCEL_NONE;
+
+        fbi->screen_base = (char __iomem *) fbdev->fb_mem;
+
+        au1200fb_update_fbinfo(fbi);
+
+        return 0;
+}
+
+/*-------------------------------------------------------------------------*/
+
+/* AU1200 LCD controller device driver */
+
+static int au1200fb_drv_probe(struct device *dev)
+{
+        struct au1200fb_device *fbdev;
+        unsigned long page;
+        int bpp, plane, ret;
+
+        if (!dev)
+                return -EINVAL;
+
+        for (plane = 0; plane < CONFIG_FB_AU1200_DEVS; ++plane) {
+                bpp = winbpp(win->w[plane].mode_winctrl1);
+                if (win->w[plane].xres == 0)
+                        win->w[plane].xres = panel->Xres;
+                if (win->w[plane].yres == 0)
+                        win->w[plane].yres = panel->Yres;
+
+                fbdev = &_au1200fb_devices[plane];
+                memset(fbdev, 0, sizeof(struct au1200fb_device));
+                fbdev->plane = plane;
+
+                /* Allocate the framebuffer to the maximum screen size */
+                fbdev->fb_len = (win->w[plane].xres * win->w[plane].yres * bpp) / 8;
+
+                fbdev->fb_mem = dma_alloc_noncoherent(dev,
+                                PAGE_ALIGN(fbdev->fb_len),
+                                &fbdev->fb_phys, GFP_KERNEL);
+                if (!fbdev->fb_mem) {
+                        print_err("fail to allocate frambuffer (size: %dK))",
+                                  fbdev->fb_len / 1024);
+                        return -ENOMEM;
+                }
+
+                /*
+                 * Set page reserved so that mmap will work. This is necessary
+                 * since we'll be remapping normal memory.
+                 */
+                for (page = (unsigned long)fbdev->fb_phys;
+                     page < PAGE_ALIGN((unsigned long)fbdev->fb_phys +
+                             fbdev->fb_len);
+                     page += PAGE_SIZE) {
+                        SetPageReserved(pfn_to_page(page >> PAGE_SHIFT)); /* LCD DMA is NOT coherent on Au1200 */
+                }
+                print_dbg("Framebuffer memory map at %p", fbdev->fb_mem);
+                print_dbg("phys=0x%08x, size=%dK", fbdev->fb_phys, fbdev->fb_len / 1024);
+
+                /* Init FB data */
+                if ((ret = au1200fb_init_fbinfo(fbdev)) < 0)
+                        goto failed;
+
+                /* Register new framebuffer */
+                if ((ret = register_framebuffer(&fbdev->fb_info)) < 0) {
+                        print_err("cannot register new framebuffer");
+                        goto failed;
+                }
+
+                au1200fb_fb_set_par(&fbdev->fb_info);
+
+#if !defined(CONFIG_FRAMEBUFFER_CONSOLE) && defined(CONFIG_LOGO)
+                if (plane == 0)
+                        if (fb_prepare_logo(&fbdev->fb_info, FB_ROTATE_UR)) {
+                                /* Start display and show logo on boot */
+                                fb_set_cmap(&fbdev->fb_info.cmap,
+                                                &fbdev->fb_info);
+
+                                fb_show_logo(&fbdev->fb_info, FB_ROTATE_UR);
+                        }
+#endif
+        }
+
+        /* Now hook interrupt too */
+        if ((ret = request_irq(AU1200_LCD_INT, au1200fb_handle_irq,
+                          SA_INTERRUPT | SA_SHIRQ, "lcd", (void *)dev)) < 0) {
+                print_err("fail to request interrupt line %d (err: %d)",
+                          AU1200_LCD_INT, ret);
+                goto failed;
+        }
+
+        return 0;
+
+failed:
+        /* NOTE: This only does the current plane/window that failed; others are still active */
+        if (fbdev->fb_mem)
+                dma_free_noncoherent(dev, PAGE_ALIGN(fbdev->fb_len),
+                                fbdev->fb_mem, fbdev->fb_phys);
+        if (fbdev->fb_info.cmap.len != 0)
+                fb_dealloc_cmap(&fbdev->fb_info.cmap);
+        if (fbdev->fb_info.pseudo_palette)
+                kfree(fbdev->fb_info.pseudo_palette);
+        if (plane == 0)
+                free_irq(AU1200_LCD_INT, (void*)dev);
+        return ret;
+}
+
+static int au1200fb_drv_remove(struct device *dev)
+{
+        struct au1200fb_device *fbdev;
+        int plane;
+
+        if (!dev)
+                return -ENODEV;
+
+        /* Turn off the panel */
+        au1200_setpanel(NULL);
+
+        for (plane = 0; plane < CONFIG_FB_AU1200_DEVS; ++plane)
+        {
+                fbdev = &_au1200fb_devices[plane];
+
+                /* Clean up all probe data */
+                unregister_framebuffer(&fbdev->fb_info);
+                if (fbdev->fb_mem)
+                        dma_free_noncoherent(dev, PAGE_ALIGN(fbdev->fb_len),
+                                        fbdev->fb_mem, fbdev->fb_phys);
+                if (fbdev->fb_info.cmap.len != 0)
+                        fb_dealloc_cmap(&fbdev->fb_info.cmap);
+                if (fbdev->fb_info.pseudo_palette)
+                        kfree(fbdev->fb_info.pseudo_palette);
+        }
+
+        free_irq(AU1200_LCD_INT, (void *)dev);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int au1200fb_drv_suspend(struct device *dev, u32 state, u32 level)
+{
+        /* TODO */
+        return 0;
+}
+
+static int au1200fb_drv_resume(struct device *dev, u32 level)
+{
+        /* TODO */
+        return 0;
+}
+#endif /* CONFIG_PM */
+
+static struct device_driver au1200fb_driver = {
+        .name           = "au1200-lcd",
+        .bus            = &platform_bus_type,
+        .probe          = au1200fb_drv_probe,
+        .remove         = au1200fb_drv_remove,
+#ifdef CONFIG_PM
+        .suspend        = au1200fb_drv_suspend,
+        .resume         = au1200fb_drv_resume,
+#endif
+};
+
+/*-------------------------------------------------------------------------*/
+
+/* Kernel driver */
+
+static void au1200fb_setup(void)
+{
+        char* options = NULL;
+        char* this_opt;
+        int num_panels = ARRAY_SIZE(known_lcd_panels);
+        int panel_idx = -1;
+
+        fb_get_options(DRIVER_NAME, &options);
+
+        if (options) {
+                while ((this_opt = strsep(&options,",")) != NULL) {
+                        /* Panel option - can be panel name,
+                         * "bs" for board-switch, or number/index */
+                        if (!strncmp(this_opt, "panel:", 6)) {
+                                int i;
+                                long int li;
+                                char *endptr;
+                                this_opt += 6;
+                                /* First check for index, which allows
+                                 * to short circuit this mess */
+                                li = simple_strtol(this_opt, &endptr, 0);
+                                if (*endptr == '\0') {
+                                        panel_idx = (int)li;
+                                }
+                                else if (strcmp(this_opt, "bs") == 0) {
+                                        extern int board_au1200fb_panel(void);
+                                        panel_idx = board_au1200fb_panel();
+                                }
+
+                                else
+                                for (i = 0; i < num_panels; i++) {
+                                        if (!strcmp(this_opt, known_lcd_panels[i].name)) {
+                                                panel_idx = i;
+                                                break;
+                                        }
+                                }
+
+                                if ((panel_idx < 0) || (panel_idx >= num_panels)) {
+                                                print_warn("Panel %s not supported!", this_opt);
+                                }
+                                else
+                                        panel_index = panel_idx;
+                        }
+
+                        else if (strncmp(this_opt, "nohwcursor", 10) == 0) {
+                                nohwcursor = 1;
+                        }
+
+                        /* Unsupported option */
+                        else {
+                                print_warn("Unsupported option \"%s\"", this_opt);
+                        }
+                }
+        }
+}
+
+#ifdef CONFIG_PM
+static int au1200fb_pm_callback(au1xxx_power_dev_t *dev,
+                au1xxx_request_t request, void *data) {
+        int retval = -1;
+        unsigned int d = 0;
+        unsigned int brightness = 0;
+
+        if (request == AU1XXX_PM_SLEEP) {
+                board_au1200fb_panel_shutdown();
+        }
+        else if (request == AU1XXX_PM_WAKEUP) {
+                if(dev->prev_state == SLEEP_STATE)
+                {
+                        int plane;
+                        au1200_setpanel(panel);
+                        for (plane = 0; plane < CONFIG_FB_AU1200_DEVS; ++plane)         {
+                                struct au1200fb_device *fbdev;
+                                fbdev = &_au1200fb_devices[plane];
+                                au1200fb_fb_set_par(&fbdev->fb_info);
+                        }
+                }
+
+                d = *((unsigned int*)data);
+                if(d <=10) brightness = 26;
+                else if(d<=20) brightness = 51;
+                else if(d<=30) brightness = 77;
+                else if(d<=40) brightness = 102;
+                else if(d<=50) brightness = 128;
+                else if(d<=60) brightness = 153;
+                else if(d<=70) brightness = 179;
+                else if(d<=80) brightness = 204;
+                else if(d<=90) brightness = 230;
+                else brightness = 255;
+                set_brightness(brightness);
+        } else if (request == AU1XXX_PM_GETSTATUS) {
+                return dev->cur_state;
+        } else if (request == AU1XXX_PM_ACCESS) {
+                if (dev->cur_state != SLEEP_STATE)
+                        return retval;
+                else {
+                        au1200_setpanel(panel);
+                }
+        } else if (request == AU1XXX_PM_IDLE) {
+        } else if (request == AU1XXX_PM_CLEANUP) {
+        }
+
+        return retval;
+}
+#endif
+
+static int __init au1200fb_init(void)
+{
+        print_info("" DRIVER_DESC "");
+
+        /* Setup driver with options */
+        au1200fb_setup();
+
+        /* Point to the panel selected */
+        panel = &known_lcd_panels[panel_index];
+        win = &windows[window_index];
+
+        printk(DRIVER_NAME ": Panel %d %s\n", panel_index, panel->name);
+        printk(DRIVER_NAME ": Win %d %s\n", window_index, win->name);
+
+        /* Kickstart the panel, the framebuffers/windows come soon enough */
+        au1200_setpanel(panel);
+
+        #ifdef CONFIG_PM
+        LCD_pm_dev = new_au1xxx_power_device("LCD", &au1200fb_pm_callback, NULL);
+        if ( LCD_pm_dev == NULL)
+                printk(KERN_INFO "Unable to create a power management device entry for the au1200fb.\n");
+        else
+                printk(KERN_INFO "Power management device entry for the au1200fb loaded.\n");
+        #endif
+
+        return driver_register(&au1200fb_driver);
+}
+
+static void __exit au1200fb_cleanup(void)
+{
+        driver_unregister(&au1200fb_driver);
+}
+
+module_init(au1200fb_init);
+module_exit(au1200fb_cleanup);
+
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/au1200fb.h b/drivers/video/au1200fb.h
new file mode 100644
index 0000000000..e2672714d8
--- /dev/null
+++ b/drivers/video/au1200fb.h
@@ -0,0 +1,572 @@
+/*
+ * BRIEF MODULE DESCRIPTION
+ *      Hardware definitions for the Au1200 LCD controller
+ *
+ * Copyright 2004 AMD
+ * Author:      AMD
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _AU1200LCD_H
+#define _AU1200LCD_H
+
+/********************************************************************/
+#define AU1200_LCD_ADDR         0xB5000000
+
+#define uint8 unsigned char
+#define uint32 unsigned int
+
+struct au1200_lcd {
+        volatile uint32 reserved0;
+        volatile uint32 screen;
+        volatile uint32 backcolor;
+        volatile uint32 horztiming;
+        volatile uint32 verttiming;
+        volatile uint32 clkcontrol;
+        volatile uint32 pwmdiv;
+        volatile uint32 pwmhi;
+        volatile uint32 reserved1;
+        volatile uint32 winenable;
+        volatile uint32 colorkey;
+        volatile uint32 colorkeymsk;
+        struct
+        {
+                volatile uint32 cursorctrl;
+                volatile uint32 cursorpos;
+                volatile uint32 cursorcolor0;
+                volatile uint32 cursorcolor1;
+                volatile uint32 cursorcolor2;
+                uint32  cursorcolor3;
+        } hwc;
+        volatile uint32 intstatus;
+        volatile uint32 intenable;
+        volatile uint32 outmask;
+        volatile uint32 fifoctrl;
+        uint32  reserved2[(0x0100-0x0058)/4];
+        struct
+        {
+                volatile uint32 winctrl0;
+                volatile uint32 winctrl1;
+                volatile uint32 winctrl2;
+                volatile uint32 winbuf0;
+                volatile uint32 winbuf1;
+                volatile uint32 winbufctrl;
+                uint32  winreserved0;
+                uint32  winreserved1;
+        } window[4];
+
+        uint32  reserved3[(0x0400-0x0180)/4];
+
+        volatile uint32 palette[(0x0800-0x0400)/4];
+
+        volatile uint8  cursorpattern[256];
+};
+
+/* lcd_screen */
+#define LCD_SCREEN_SEN          (1<<31)
+#define LCD_SCREEN_SX           (0x07FF<<19)
+#define LCD_SCREEN_SY           (0x07FF<< 8)
+#define LCD_SCREEN_SWP          (1<<7)
+#define LCD_SCREEN_SWD          (1<<6)
+#define LCD_SCREEN_PT           (7<<0)
+#define LCD_SCREEN_PT_TFT       (0<<0)
+#define LCD_SCREEN_SX_N(WIDTH)  ((WIDTH-1)<<19)
+#define LCD_SCREEN_SY_N(HEIGHT) ((HEIGHT-1)<<8)
+#define LCD_SCREEN_PT_CSTN      (1<<0)
+#define LCD_SCREEN_PT_CDSTN     (2<<0)
+#define LCD_SCREEN_PT_M8STN     (3<<0)
+#define LCD_SCREEN_PT_M4STN     (4<<0)
+
+/* lcd_backcolor */
+#define LCD_BACKCOLOR_SBGR              (0xFF<<16)
+#define LCD_BACKCOLOR_SBGG              (0xFF<<8)
+#define LCD_BACKCOLOR_SBGB              (0xFF<<0)
+#define LCD_BACKCOLOR_SBGR_N(N) ((N)<<16)
+#define LCD_BACKCOLOR_SBGG_N(N) ((N)<<8)
+#define LCD_BACKCOLOR_SBGB_N(N) ((N)<<0)
+
+/* lcd_winenable */
+#define LCD_WINENABLE_WEN3              (1<<3)
+#define LCD_WINENABLE_WEN2              (1<<2)
+#define LCD_WINENABLE_WEN1              (1<<1)
+#define LCD_WINENABLE_WEN0              (1<<0)
+
+/* lcd_colorkey */
+#define LCD_COLORKEY_CKR                (0xFF<<16)
+#define LCD_COLORKEY_CKG                (0xFF<<8)
+#define LCD_COLORKEY_CKB                (0xFF<<0)
+#define LCD_COLORKEY_CKR_N(N)   ((N)<<16)
+#define LCD_COLORKEY_CKG_N(N)   ((N)<<8)
+#define LCD_COLORKEY_CKB_N(N)   ((N)<<0)
+
+/* lcd_colorkeymsk */
+#define LCD_COLORKEYMSK_CKMR            (0xFF<<16)
+#define LCD_COLORKEYMSK_CKMG            (0xFF<<8)
+#define LCD_COLORKEYMSK_CKMB            (0xFF<<0)
+#define LCD_COLORKEYMSK_CKMR_N(N)       ((N)<<16)
+#define LCD_COLORKEYMSK_CKMG_N(N)       ((N)<<8)
+#define LCD_COLORKEYMSK_CKMB_N(N)       ((N)<<0)
+
+/* lcd windows control 0 */
+#define LCD_WINCTRL0_OX         (0x07FF<<21)
+#define LCD_WINCTRL0_OY         (0x07FF<<10)
+#define LCD_WINCTRL0_A          (0x00FF<<2)
+#define LCD_WINCTRL0_AEN        (1<<1)
+#define LCD_WINCTRL0_OX_N(N) ((N)<<21)
+#define LCD_WINCTRL0_OY_N(N) ((N)<<10)
+#define LCD_WINCTRL0_A_N(N) ((N)<<2)
+
+/* lcd windows control 1 */
+#define LCD_WINCTRL1_PRI        (3<<30)
+#define LCD_WINCTRL1_PIPE       (1<<29)
+#define LCD_WINCTRL1_FRM        (0xF<<25)
+#define LCD_WINCTRL1_CCO        (1<<24)
+#define LCD_WINCTRL1_PO         (3<<22)
+#define LCD_WINCTRL1_SZX        (0x07FF<<11)
+#define LCD_WINCTRL1_SZY        (0x07FF<<0)
+#define LCD_WINCTRL1_FRM_1BPP   (0<<25)
+#define LCD_WINCTRL1_FRM_2BPP   (1<<25)
+#define LCD_WINCTRL1_FRM_4BPP   (2<<25)
+#define LCD_WINCTRL1_FRM_8BPP   (3<<25)
+#define LCD_WINCTRL1_FRM_12BPP  (4<<25)
+#define LCD_WINCTRL1_FRM_16BPP655       (5<<25)
+#define LCD_WINCTRL1_FRM_16BPP565       (6<<25)
+#define LCD_WINCTRL1_FRM_16BPP556       (7<<25)
+#define LCD_WINCTRL1_FRM_16BPPI1555     (8<<25)
+#define LCD_WINCTRL1_FRM_16BPPI5551     (9<<25)
+#define LCD_WINCTRL1_FRM_16BPPA1555     (10<<25)
+#define LCD_WINCTRL1_FRM_16BPPA5551     (11<<25)
+#define LCD_WINCTRL1_FRM_24BPP          (12<<25)
+#define LCD_WINCTRL1_FRM_32BPP          (13<<25)
+#define LCD_WINCTRL1_PRI_N(N)   ((N)<<30)
+#define LCD_WINCTRL1_PO_00              (0<<22)
+#define LCD_WINCTRL1_PO_01              (1<<22)
+#define LCD_WINCTRL1_PO_10              (2<<22)
+#define LCD_WINCTRL1_PO_11              (3<<22)
+#define LCD_WINCTRL1_SZX_N(N)   ((N-1)<<11)
+#define LCD_WINCTRL1_SZY_N(N)   ((N-1)<<0)
+
+/* lcd windows control 2 */
+#define LCD_WINCTRL2_CKMODE             (3<<24)
+#define LCD_WINCTRL2_DBM                (1<<23)
+#define LCD_WINCTRL2_RAM                (3<<21)
+#define LCD_WINCTRL2_BX                 (0x1FFF<<8)
+#define LCD_WINCTRL2_SCX                (0xF<<4)
+#define LCD_WINCTRL2_SCY                (0xF<<0)
+#define LCD_WINCTRL2_CKMODE_00          (0<<24)
+#define LCD_WINCTRL2_CKMODE_01          (1<<24)
+#define LCD_WINCTRL2_CKMODE_10          (2<<24)
+#define LCD_WINCTRL2_CKMODE_11          (3<<24)
+#define LCD_WINCTRL2_RAM_NONE           (0<<21)
+#define LCD_WINCTRL2_RAM_PALETTE        (1<<21)
+#define LCD_WINCTRL2_RAM_GAMMA          (2<<21)
+#define LCD_WINCTRL2_RAM_BUFFER         (3<<21)
+#define LCD_WINCTRL2_BX_N(N)    ((N)<<8)
+#define LCD_WINCTRL2_SCX_1              (0<<4)
+#define LCD_WINCTRL2_SCX_2              (1<<4)
+#define LCD_WINCTRL2_SCX_4              (2<<4)
+#define LCD_WINCTRL2_SCY_1              (0<<0)
+#define LCD_WINCTRL2_SCY_2              (1<<0)
+#define LCD_WINCTRL2_SCY_4              (2<<0)
+
+/* lcd windows buffer control */
+#define LCD_WINBUFCTRL_DB               (1<<1)
+#define LCD_WINBUFCTRL_DBN              (1<<0)
+
+/* lcd_intstatus, lcd_intenable */
+#define LCD_INT_IFO                             (0xF<<14)
+#define LCD_INT_IFU                             (0xF<<10)
+#define LCD_INT_OFO                             (1<<9)
+#define LCD_INT_OFU                             (1<<8)
+#define LCD_INT_WAIT                    (1<<3)
+#define LCD_INT_SD                              (1<<2)
+#define LCD_INT_SA                              (1<<1)
+#define LCD_INT_SS                              (1<<0)
+
+/* lcd_horztiming */
+#define LCD_HORZTIMING_HND2             (0x1FF<<18)
+#define LCD_HORZTIMING_HND1             (0x1FF<<9)
+#define LCD_HORZTIMING_HPW              (0x1FF<<0)
+#define LCD_HORZTIMING_HND2_N(N)(((N)-1)<<18)
+#define LCD_HORZTIMING_HND1_N(N)(((N)-1)<<9)
+#define LCD_HORZTIMING_HPW_N(N) (((N)-1)<<0)
+
+/* lcd_verttiming */
+#define LCD_VERTTIMING_VND2             (0x1FF<<18)
+#define LCD_VERTTIMING_VND1             (0x1FF<<9)
+#define LCD_VERTTIMING_VPW              (0x1FF<<0)
+#define LCD_VERTTIMING_VND2_N(N)(((N)-1)<<18)
+#define LCD_VERTTIMING_VND1_N(N)(((N)-1)<<9)
+#define LCD_VERTTIMING_VPW_N(N) (((N)-1)<<0)
+
+/* lcd_clkcontrol */
+#define LCD_CLKCONTROL_EXT              (1<<22)
+#define LCD_CLKCONTROL_DELAY    (3<<20)
+#define LCD_CLKCONTROL_CDD              (1<<19)
+#define LCD_CLKCONTROL_IB               (1<<18)
+#define LCD_CLKCONTROL_IC               (1<<17)
+#define LCD_CLKCONTROL_IH               (1<<16)
+#define LCD_CLKCONTROL_IV               (1<<15)
+#define LCD_CLKCONTROL_BF               (0x1F<<10)
+#define LCD_CLKCONTROL_PCD              (0x3FF<<0)
+#define LCD_CLKCONTROL_BF_N(N)  (((N)-1)<<10)
+#define LCD_CLKCONTROL_PCD_N(N) ((N)<<0)
+
+/* lcd_pwmdiv */
+#define LCD_PWMDIV_EN                   (1<<31)
+#define LCD_PWMDIV_PWMDIV               (0x1FFFF<<0)
+#define LCD_PWMDIV_PWMDIV_N(N)  ((N)<<0)
+
+/* lcd_pwmhi */
+#define LCD_PWMHI_PWMHI1                (0xFFFF<<16)
+#define LCD_PWMHI_PWMHI0                (0xFFFF<<0)
+#define LCD_PWMHI_PWMHI1_N(N)   ((N)<<16)
+#define LCD_PWMHI_PWMHI0_N(N)   ((N)<<0)
+
+/* lcd_hwccon */
+#define LCD_HWCCON_EN                   (1<<0)
+
+/* lcd_cursorpos */
+#define LCD_CURSORPOS_HWCXOFF           (0x1F<<27)
+#define LCD_CURSORPOS_HWCXPOS           (0x07FF<<16)
+#define LCD_CURSORPOS_HWCYOFF           (0x1F<<11)
+#define LCD_CURSORPOS_HWCYPOS           (0x07FF<<0)
+#define LCD_CURSORPOS_HWCXOFF_N(N)      ((N)<<27)
+#define LCD_CURSORPOS_HWCXPOS_N(N)      ((N)<<16)
+#define LCD_CURSORPOS_HWCYOFF_N(N)      ((N)<<11)
+#define LCD_CURSORPOS_HWCYPOS_N(N)      ((N)<<0)
+
+/* lcd_cursorcolor */
+#define LCD_CURSORCOLOR_HWCA            (0xFF<<24)
+#define LCD_CURSORCOLOR_HWCR            (0xFF<<16)
+#define LCD_CURSORCOLOR_HWCG            (0xFF<<8)
+#define LCD_CURSORCOLOR_HWCB            (0xFF<<0)
+#define LCD_CURSORCOLOR_HWCA_N(N)       ((N)<<24)
+#define LCD_CURSORCOLOR_HWCR_N(N)       ((N)<<16)
+#define LCD_CURSORCOLOR_HWCG_N(N)       ((N)<<8)
+#define LCD_CURSORCOLOR_HWCB_N(N)       ((N)<<0)
+
+/* lcd_fifoctrl */
+#define LCD_FIFOCTRL_F3IF               (1<<29)
+#define LCD_FIFOCTRL_F3REQ              (0x1F<<24)
+#define LCD_FIFOCTRL_F2IF               (1<<29)
+#define LCD_FIFOCTRL_F2REQ              (0x1F<<16)
+#define LCD_FIFOCTRL_F1IF               (1<<29)
+#define LCD_FIFOCTRL_F1REQ              (0x1F<<8)
+#define LCD_FIFOCTRL_F0IF               (1<<29)
+#define LCD_FIFOCTRL_F0REQ              (0x1F<<0)
+#define LCD_FIFOCTRL_F3REQ_N(N) ((N-1)<<24)
+#define LCD_FIFOCTRL_F2REQ_N(N) ((N-1)<<16)
+#define LCD_FIFOCTRL_F1REQ_N(N) ((N-1)<<8)
+#define LCD_FIFOCTRL_F0REQ_N(N) ((N-1)<<0)
+
+/* lcd_outmask */
+#define LCD_OUTMASK_MASK                (0x00FFFFFF)
+
+/********************************************************************/
+#endif /* _AU1200LCD_H */
+/*
+ * BRIEF MODULE DESCRIPTION
+ *      Hardware definitions for the Au1200 LCD controller
+ *
+ * Copyright 2004 AMD
+ * Author:      AMD
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _AU1200LCD_H
+#define _AU1200LCD_H
+
+/********************************************************************/
+#define AU1200_LCD_ADDR         0xB5000000
+
+#define uint8 unsigned char
+#define uint32 unsigned int
+
+struct au1200_lcd {
+        volatile uint32 reserved0;
+        volatile uint32 screen;
+        volatile uint32 backcolor;
+        volatile uint32 horztiming;
+        volatile uint32 verttiming;
+        volatile uint32 clkcontrol;
+        volatile uint32 pwmdiv;
+        volatile uint32 pwmhi;
+        volatile uint32 reserved1;
+        volatile uint32 winenable;
+        volatile uint32 colorkey;
+        volatile uint32 colorkeymsk;
+        struct
+        {
+                volatile uint32 cursorctrl;
+                volatile uint32 cursorpos;
+                volatile uint32 cursorcolor0;
+                volatile uint32 cursorcolor1;
+                volatile uint32 cursorcolor2;
+                uint32  cursorcolor3;
+        } hwc;
+        volatile uint32 intstatus;
+        volatile uint32 intenable;
+        volatile uint32 outmask;
+        volatile uint32 fifoctrl;
+        uint32  reserved2[(0x0100-0x0058)/4];
+        struct
+        {
+                volatile uint32 winctrl0;
+                volatile uint32 winctrl1;
+                volatile uint32 winctrl2;
+                volatile uint32 winbuf0;
+                volatile uint32 winbuf1;
+                volatile uint32 winbufctrl;
+                uint32  winreserved0;
+                uint32  winreserved1;
+        } window[4];
+
+        uint32  reserved3[(0x0400-0x0180)/4];
+
+        volatile uint32 palette[(0x0800-0x0400)/4];
+
+        volatile uint8  cursorpattern[256];
+};
+
+/* lcd_screen */
+#define LCD_SCREEN_SEN          (1<<31)
+#define LCD_SCREEN_SX           (0x07FF<<19)
+#define LCD_SCREEN_SY           (0x07FF<< 8)
+#define LCD_SCREEN_SWP          (1<<7)
+#define LCD_SCREEN_SWD          (1<<6)
+#define LCD_SCREEN_PT           (7<<0)
+#define LCD_SCREEN_PT_TFT       (0<<0)
+#define LCD_SCREEN_SX_N(WIDTH)  ((WIDTH-1)<<19)
+#define LCD_SCREEN_SY_N(HEIGHT) ((HEIGHT-1)<<8)
+#define LCD_SCREEN_PT_CSTN      (1<<0)
+#define LCD_SCREEN_PT_CDSTN     (2<<0)
+#define LCD_SCREEN_PT_M8STN     (3<<0)
+#define LCD_SCREEN_PT_M4STN     (4<<0)
+
+/* lcd_backcolor */
+#define LCD_BACKCOLOR_SBGR              (0xFF<<16)
+#define LCD_BACKCOLOR_SBGG              (0xFF<<8)
+#define LCD_BACKCOLOR_SBGB              (0xFF<<0)
+#define LCD_BACKCOLOR_SBGR_N(N) ((N)<<16)
+#define LCD_BACKCOLOR_SBGG_N(N) ((N)<<8)
+#define LCD_BACKCOLOR_SBGB_N(N) ((N)<<0)
+
+/* lcd_winenable */
+#define LCD_WINENABLE_WEN3              (1<<3)
+#define LCD_WINENABLE_WEN2              (1<<2)
+#define LCD_WINENABLE_WEN1              (1<<1)
+#define LCD_WINENABLE_WEN0              (1<<0)
+
+/* lcd_colorkey */
+#define LCD_COLORKEY_CKR                (0xFF<<16)
+#define LCD_COLORKEY_CKG                (0xFF<<8)
+#define LCD_COLORKEY_CKB                (0xFF<<0)
+#define LCD_COLORKEY_CKR_N(N)   ((N)<<16)
+#define LCD_COLORKEY_CKG_N(N)   ((N)<<8)
+#define LCD_COLORKEY_CKB_N(N)   ((N)<<0)
+
+/* lcd_colorkeymsk */
+#define LCD_COLORKEYMSK_CKMR            (0xFF<<16)
+#define LCD_COLORKEYMSK_CKMG            (0xFF<<8)
+#define LCD_COLORKEYMSK_CKMB            (0xFF<<0)
+#define LCD_COLORKEYMSK_CKMR_N(N)       ((N)<<16)
+#define LCD_COLORKEYMSK_CKMG_N(N)       ((N)<<8)
+#define LCD_COLORKEYMSK_CKMB_N(N)       ((N)<<0)
+
+/* lcd windows control 0 */
+#define LCD_WINCTRL0_OX         (0x07FF<<21)
+#define LCD_WINCTRL0_OY         (0x07FF<<10)
+#define LCD_WINCTRL0_A          (0x00FF<<2)
+#define LCD_WINCTRL0_AEN        (1<<1)
+#define LCD_WINCTRL0_OX_N(N) ((N)<<21)
+#define LCD_WINCTRL0_OY_N(N) ((N)<<10)
+#define LCD_WINCTRL0_A_N(N) ((N)<<2)
+
+/* lcd windows control 1 */
+#define LCD_WINCTRL1_PRI        (3<<30)
+#define LCD_WINCTRL1_PIPE       (1<<29)
+#define LCD_WINCTRL1_FRM        (0xF<<25)
+#define LCD_WINCTRL1_CCO        (1<<24)
+#define LCD_WINCTRL1_PO         (3<<22)
+#define LCD_WINCTRL1_SZX        (0x07FF<<11)
+#define LCD_WINCTRL1_SZY        (0x07FF<<0)
+#define LCD_WINCTRL1_FRM_1BPP   (0<<25)
+#define LCD_WINCTRL1_FRM_2BPP   (1<<25)
+#define LCD_WINCTRL1_FRM_4BPP   (2<<25)
+#define LCD_WINCTRL1_FRM_8BPP   (3<<25)
+#define LCD_WINCTRL1_FRM_12BPP  (4<<25)
+#define LCD_WINCTRL1_FRM_16BPP655       (5<<25)
+#define LCD_WINCTRL1_FRM_16BPP565       (6<<25)
+#define LCD_WINCTRL1_FRM_16BPP556       (7<<25)
+#define LCD_WINCTRL1_FRM_16BPPI1555     (8<<25)
+#define LCD_WINCTRL1_FRM_16BPPI5551     (9<<25)
+#define LCD_WINCTRL1_FRM_16BPPA1555     (10<<25)
+#define LCD_WINCTRL1_FRM_16BPPA5551     (11<<25)
+#define LCD_WINCTRL1_FRM_24BPP          (12<<25)
+#define LCD_WINCTRL1_FRM_32BPP          (13<<25)
+#define LCD_WINCTRL1_PRI_N(N)   ((N)<<30)
+#define LCD_WINCTRL1_PO_00              (0<<22)
+#define LCD_WINCTRL1_PO_01              (1<<22)
+#define LCD_WINCTRL1_PO_10              (2<<22)
+#define LCD_WINCTRL1_PO_11              (3<<22)
+#define LCD_WINCTRL1_SZX_N(N)   ((N-1)<<11)
+#define LCD_WINCTRL1_SZY_N(N)   ((N-1)<<0)
+
+/* lcd windows control 2 */
+#define LCD_WINCTRL2_CKMODE             (3<<24)
+#define LCD_WINCTRL2_DBM                (1<<23)
+#define LCD_WINCTRL2_RAM                (3<<21)
+#define LCD_WINCTRL2_BX                 (0x1FFF<<8)
+#define LCD_WINCTRL2_SCX                (0xF<<4)
+#define LCD_WINCTRL2_SCY                (0xF<<0)
+#define LCD_WINCTRL2_CKMODE_00          (0<<24)
+#define LCD_WINCTRL2_CKMODE_01          (1<<24)
+#define LCD_WINCTRL2_CKMODE_10          (2<<24)
+#define LCD_WINCTRL2_CKMODE_11          (3<<24)
+#define LCD_WINCTRL2_RAM_NONE           (0<<21)
+#define LCD_WINCTRL2_RAM_PALETTE        (1<<21)
+#define LCD_WINCTRL2_RAM_GAMMA          (2<<21)
+#define LCD_WINCTRL2_RAM_BUFFER         (3<<21)
+#define LCD_WINCTRL2_BX_N(N)    ((N)<<8)
+#define LCD_WINCTRL2_SCX_1              (0<<4)
+#define LCD_WINCTRL2_SCX_2              (1<<4)
+#define LCD_WINCTRL2_SCX_4              (2<<4)
+#define LCD_WINCTRL2_SCY_1              (0<<0)
+#define LCD_WINCTRL2_SCY_2              (1<<0)
+#define LCD_WINCTRL2_SCY_4              (2<<0)
+
+/* lcd windows buffer control */
+#define LCD_WINBUFCTRL_DB               (1<<1)
+#define LCD_WINBUFCTRL_DBN              (1<<0)
+
+/* lcd_intstatus, lcd_intenable */
+#define LCD_INT_IFO                             (0xF<<14)
+#define LCD_INT_IFU                             (0xF<<10)
+#define LCD_INT_OFO                             (1<<9)
+#define LCD_INT_OFU                             (1<<8)
+#define LCD_INT_WAIT                    (1<<3)
+#define LCD_INT_SD                              (1<<2)
+#define LCD_INT_SA                              (1<<1)
+#define LCD_INT_SS                              (1<<0)
+
+/* lcd_horztiming */
+#define LCD_HORZTIMING_HND2             (0x1FF<<18)
+#define LCD_HORZTIMING_HND1             (0x1FF<<9)
+#define LCD_HORZTIMING_HPW              (0x1FF<<0)
+#define LCD_HORZTIMING_HND2_N(N)(((N)-1)<<18)
+#define LCD_HORZTIMING_HND1_N(N)(((N)-1)<<9)
+#define LCD_HORZTIMING_HPW_N(N) (((N)-1)<<0)
+
+/* lcd_verttiming */
+#define LCD_VERTTIMING_VND2             (0x1FF<<18)
+#define LCD_VERTTIMING_VND1             (0x1FF<<9)
+#define LCD_VERTTIMING_VPW              (0x1FF<<0)
+#define LCD_VERTTIMING_VND2_N(N)(((N)-1)<<18)
+#define LCD_VERTTIMING_VND1_N(N)(((N)-1)<<9)
+#define LCD_VERTTIMING_VPW_N(N) (((N)-1)<<0)
+
+/* lcd_clkcontrol */
+#define LCD_CLKCONTROL_EXT              (1<<22)
+#define LCD_CLKCONTROL_DELAY    (3<<20)
+#define LCD_CLKCONTROL_CDD              (1<<19)
+#define LCD_CLKCONTROL_IB               (1<<18)
+#define LCD_CLKCONTROL_IC               (1<<17)
+#define LCD_CLKCONTROL_IH               (1<<16)
+#define LCD_CLKCONTROL_IV               (1<<15)
+#define LCD_CLKCONTROL_BF               (0x1F<<10)
+#define LCD_CLKCONTROL_PCD              (0x3FF<<0)
+#define LCD_CLKCONTROL_BF_N(N)  (((N)-1)<<10)
+#define LCD_CLKCONTROL_PCD_N(N) ((N)<<0)
+
+/* lcd_pwmdiv */
+#define LCD_PWMDIV_EN                   (1<<31)
+#define LCD_PWMDIV_PWMDIV               (0x1FFFF<<0)
+#define LCD_PWMDIV_PWMDIV_N(N)  ((N)<<0)
+
+/* lcd_pwmhi */
+#define LCD_PWMHI_PWMHI1                (0xFFFF<<16)
+#define LCD_PWMHI_PWMHI0                (0xFFFF<<0)
+#define LCD_PWMHI_PWMHI1_N(N)   ((N)<<16)
+#define LCD_PWMHI_PWMHI0_N(N)   ((N)<<0)
+
+/* lcd_hwccon */
+#define LCD_HWCCON_EN                   (1<<0)
+
+/* lcd_cursorpos */
+#define LCD_CURSORPOS_HWCXOFF           (0x1F<<27)
+#define LCD_CURSORPOS_HWCXPOS           (0x07FF<<16)
+#define LCD_CURSORPOS_HWCYOFF           (0x1F<<11)
+#define LCD_CURSORPOS_HWCYPOS           (0x07FF<<0)
+#define LCD_CURSORPOS_HWCXOFF_N(N)      ((N)<<27)
+#define LCD_CURSORPOS_HWCXPOS_N(N)      ((N)<<16)
+#define LCD_CURSORPOS_HWCYOFF_N(N)      ((N)<<11)
+#define LCD_CURSORPOS_HWCYPOS_N(N)      ((N)<<0)
+
+/* lcd_cursorcolor */
+#define LCD_CURSORCOLOR_HWCA            (0xFF<<24)
+#define LCD_CURSORCOLOR_HWCR            (0xFF<<16)
+#define LCD_CURSORCOLOR_HWCG            (0xFF<<8)
+#define LCD_CURSORCOLOR_HWCB            (0xFF<<0)
+#define LCD_CURSORCOLOR_HWCA_N(N)       ((N)<<24)
+#define LCD_CURSORCOLOR_HWCR_N(N)       ((N)<<16)
+#define LCD_CURSORCOLOR_HWCG_N(N)       ((N)<<8)
+#define LCD_CURSORCOLOR_HWCB_N(N)       ((N)<<0)
+
+/* lcd_fifoctrl */
+#define LCD_FIFOCTRL_F3IF               (1<<29)
+#define LCD_FIFOCTRL_F3REQ              (0x1F<<24)
+#define LCD_FIFOCTRL_F2IF               (1<<29)
+#define LCD_FIFOCTRL_F2REQ              (0x1F<<16)
+#define LCD_FIFOCTRL_F1IF               (1<<29)
+#define LCD_FIFOCTRL_F1REQ              (0x1F<<8)
+#define LCD_FIFOCTRL_F0IF               (1<<29)
+#define LCD_FIFOCTRL_F0REQ              (0x1F<<0)
+#define LCD_FIFOCTRL_F3REQ_N(N) ((N-1)<<24)
+#define LCD_FIFOCTRL_F2REQ_N(N) ((N-1)<<16)
+#define LCD_FIFOCTRL_F1REQ_N(N) ((N-1)<<8)
+#define LCD_FIFOCTRL_F0REQ_N(N) ((N-1)<<0)
+
+/* lcd_outmask */
+#define LCD_OUTMASK_MASK                (0x00FFFFFF)
+
+/********************************************************************/
+#endif /* _AU1200LCD_H */
diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
index ada6e75eb0..60831bb236 100644
--- a/drivers/video/backlight/locomolcd.c
+++ b/drivers/video/backlight/locomolcd.c
@@ -20,14 +20,10 @@
 
 #include <asm/hardware/locomo.h>
 #include <asm/irq.h>
+#include <asm/mach/sharpsl_param.h>
+#include <asm/mach-types.h>
 
-#ifdef CONFIG_SA1100_COLLIE
-#include <asm/arch/collie.h>
-#else
-#include <asm/arch/poodle.h>
-#endif
-
-extern void (*sa1100fb_lcd_power)(int on);
+#include "../../../arch/arm/mach-sa1100/generic.h"
 
 static struct locomo_dev *locomolcd_dev;
 
@@ -82,7 +78,7 @@ static void locomolcd_off(int comadj)
 
 void locomolcd_power(int on)
 {
-        int comadj = 118;
+        int comadj = sharpsl_param.comadj;
         unsigned long flags;
 
         local_irq_save(flags);
@@ -93,11 +89,12 @@ void locomolcd_power(int on)
         }
 
         /* read comadj */
-#ifdef CONFIG_MACH_POODLE
-        comadj = 118;
-#else
-        comadj = 128;
-#endif
+        if (comadj == -1) {
+                if (machine_is_poodle())
+                        comadj = 118;
+                if (machine_is_collie())
+                        comadj = 128;
+        }
 
         if (on)
                 locomolcd_on(comadj);
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index c029db4646..6577fdfdfc 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -327,8 +327,7 @@ static void bw2_init_one(struct sbus_dev *sdev)
         } else
 #else
         {
-                if (!sdev)
-                        BUG();
+                BUG_ON(!sdev);
                 all->par.physbase = sdev->reg_addrs[0].phys_addr;
                 resp = &sdev->resource[0];
                 sbusfb_fill_var(&all->info.var, (sdev ? sdev->prom_node : 0), 1);
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index bc061d4ec7..72ff6bf75e 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -178,8 +178,6 @@ struct chips_init_reg {
         unsigned char data;
 };
 
-#define N_ELTS(x)       (sizeof(x) / sizeof(x[0]))
-
 static struct chips_init_reg chips_init_sr[] = {
         { 0x00, 0x03 },
         { 0x01, 0x01 },
@@ -287,18 +285,18 @@ static void __init chips_hw_init(void)
 {
         int i;
 
-        for (i = 0; i < N_ELTS(chips_init_xr); ++i)
+        for (i = 0; i < ARRAY_SIZE(chips_init_xr); ++i)
                 write_xr(chips_init_xr[i].addr, chips_init_xr[i].data);
         outb(0x29, 0x3c2); /* set misc output reg */
-        for (i = 0; i < N_ELTS(chips_init_sr); ++i)
+        for (i = 0; i < ARRAY_SIZE(chips_init_sr); ++i)
                 write_sr(chips_init_sr[i].addr, chips_init_sr[i].data);
-        for (i = 0; i < N_ELTS(chips_init_gr); ++i)
+        for (i = 0; i < ARRAY_SIZE(chips_init_gr); ++i)
                 write_gr(chips_init_gr[i].addr, chips_init_gr[i].data);
-        for (i = 0; i < N_ELTS(chips_init_ar); ++i)
+        for (i = 0; i < ARRAY_SIZE(chips_init_ar); ++i)
                 write_ar(chips_init_ar[i].addr, chips_init_ar[i].data);
-        for (i = 0; i < N_ELTS(chips_init_cr); ++i)
+        for (i = 0; i < ARRAY_SIZE(chips_init_cr); ++i)
                 write_cr(chips_init_cr[i].addr, chips_init_cr[i].data);
-        for (i = 0; i < N_ELTS(chips_init_fr); ++i)
+        for (i = 0; i < ARRAY_SIZE(chips_init_fr); ++i)
                 write_fr(chips_init_fr[i].addr, chips_init_fr[i].data);
 }
 
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index e0dbdfc0c8..1103010af5 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -60,8 +60,8 @@
 #include <asm/amigahw.h>
 #endif
 #ifdef CONFIG_PPC_PREP
-#include <asm/processor.h>
-#define isPReP (_machine == _MACH_prep)
+#include <asm/machdep.h>
+#define isPReP (machine_is(prep))
 #else
 #define isPReP 0
 #endif
@@ -2622,7 +2622,7 @@ static int __init cirrusfb_init(void)
 #endif
 
 #ifdef CONFIG_ZORRO
-        error |= zorro_module_init(&cirrusfb_zorro_driver);
+        error |= zorro_register_driver(&cirrusfb_zorro_driver);
 #endif
 #ifdef CONFIG_PCI
         error |= pci_register_driver(&cirrusfb_pci_driver);
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 6ee449858a..4444bef68f 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -26,6 +26,30 @@ config VGA_CONSOLE
 #          fi
 #       fi
 
+config VGACON_SOFT_SCROLLBACK
+       bool "Enable Scrollback Buffer in System RAM"
+       depends on VGA_CONSOLE
+       default n
+       help
+         The scrollback buffer of the standard VGA console is located in
+         the VGA RAM.  The size of this RAM is fixed and is quite small.
+         If you require a larger scrollback buffer, this can be placed in
+         System RAM which is dynamically allocated during intialization.
+         Placing the scrollback buffer in System RAM will slightly slow
+         down the console.
+
+         If you want this feature, say 'Y' here and enter the amount of
+         RAM to allocate for this buffer.  If unsure, say 'N'.
+
+config VGACON_SOFT_SCROLLBACK_SIZE
+       int "Scrollback Buffer Size (in KB)"
+       depends on VGACON_SOFT_SCROLLBACK
+       default "64"
+       help
+         Enter the amount of System RAM to allocate for the scrollback
+         buffer.  Each 64KB will give you approximately 16 80x25
+         screenfuls of scrollback buffer
+
 config VIDEO_SELECT
         bool "Video mode selection support"
         depends on  X86 && VGA_CONSOLE
diff --git a/drivers/video/console/fonts.c b/drivers/video/console/fonts.c
index 4fd07d9eca..0cc1bfda76 100644
--- a/drivers/video/console/fonts.c
+++ b/drivers/video/console/fonts.c
@@ -66,7 +66,7 @@ static const struct font_desc *fonts[] = {
 #endif
 };
 
-#define num_fonts (sizeof(fonts)/sizeof(*fonts))
+#define num_fonts ARRAY_SIZE(fonts)
 
 #ifdef NO_FONTS
 #error No fonts configured.
diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c
index 762c7a5931..e99fe30e56 100644
--- a/drivers/video/console/newport_con.c
+++ b/drivers/video/console/newport_con.c
@@ -149,7 +149,7 @@ static inline void newport_clear_lines(int ystart, int yend, int ci)
         newport_clear_screen(0, ystart, 1280 + 63, yend, ci);
 }
 
-void newport_reset(void)
+static void newport_reset(void)
 {
         unsigned short treg;
         int i;
@@ -193,7 +193,7 @@ void newport_reset(void)
  * calculate the actual screen size by reading
  * the video timing out of the VC2
  */
-void newport_get_screensize(void)
+static void newport_get_screensize(void)
 {
         int i, cols;
         unsigned short ventry, treg;
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 5a86978537..d5a04b68c4 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -93,7 +93,6 @@ static u8 vgacon_build_attr(struct vc_data *c, u8 color, u8 intensity,
 static void vgacon_invert_region(struct vc_data *c, u16 * p, int count);
 static unsigned long vgacon_uni_pagedir[2];
 
-
 /* Description of the hardware situation */
 static unsigned long    vga_vram_base;          /* Base of video memory */
 static unsigned long    vga_vram_end;           /* End of video memory */
@@ -161,6 +160,201 @@ static inline void write_vga(unsigned char reg, unsigned int val)
         spin_unlock_irqrestore(&vga_lock, flags);
 }
 
+static inline void vga_set_mem_top(struct vc_data *c)
+{
+        write_vga(12, (c->vc_visible_origin - vga_vram_base) / 2);
+}
+
+#ifdef CONFIG_VGACON_SOFT_SCROLLBACK
+#include <linux/bootmem.h>
+/* software scrollback */
+static void *vgacon_scrollback;
+static int vgacon_scrollback_tail;
+static int vgacon_scrollback_size;
+static int vgacon_scrollback_rows;
+static int vgacon_scrollback_cnt;
+static int vgacon_scrollback_cur;
+static int vgacon_scrollback_save;
+static int vgacon_scrollback_restore;
+
+static void vgacon_scrollback_init(int pitch)
+{
+        int rows = CONFIG_VGACON_SOFT_SCROLLBACK_SIZE * 1024/pitch;
+
+        if (vgacon_scrollback) {
+                vgacon_scrollback_cnt  = 0;
+                vgacon_scrollback_tail = 0;
+                vgacon_scrollback_cur  = 0;
+                vgacon_scrollback_rows = rows - 1;
+                vgacon_scrollback_size = rows * pitch;
+        }
+}
+
+static void __init vgacon_scrollback_startup(void)
+{
+        vgacon_scrollback = alloc_bootmem(CONFIG_VGACON_SOFT_SCROLLBACK_SIZE
+                                          * 1024);
+        vgacon_scrollback_init(vga_video_num_columns * 2);
+}
+
+static void vgacon_scrollback_update(struct vc_data *c, int t, int count)
+{
+        void *p;
+
+        if (!vgacon_scrollback_size || c->vc_num != fg_console)
+                return;
+
+        p = (void *) (c->vc_origin + t * c->vc_size_row);
+
+        while (count--) {
+                scr_memcpyw(vgacon_scrollback + vgacon_scrollback_tail,
+                            p, c->vc_size_row);
+                vgacon_scrollback_cnt++;
+                p += c->vc_size_row;
+                vgacon_scrollback_tail += c->vc_size_row;
+
+                if (vgacon_scrollback_tail >= vgacon_scrollback_size)
+                        vgacon_scrollback_tail = 0;
+
+                if (vgacon_scrollback_cnt > vgacon_scrollback_rows)
+                        vgacon_scrollback_cnt = vgacon_scrollback_rows;
+
+                vgacon_scrollback_cur = vgacon_scrollback_cnt;
+        }
+}
+
+static void vgacon_restore_screen(struct vc_data *c)
+{
+        vgacon_scrollback_save = 0;
+
+        if (!vga_is_gfx && !vgacon_scrollback_restore) {
+                scr_memcpyw((u16 *) c->vc_origin, (u16 *) c->vc_screenbuf,
+                            c->vc_screenbuf_size > vga_vram_size ?
+                            vga_vram_size : c->vc_screenbuf_size);
+                vgacon_scrollback_restore = 1;
+                vgacon_scrollback_cur = vgacon_scrollback_cnt;
+        }
+}
+
+static int vgacon_scrolldelta(struct vc_data *c, int lines)
+{
+        int start, end, count, soff, diff;
+        void *d, *s;
+
+        if (!lines) {
+                c->vc_visible_origin = c->vc_origin;
+                vga_set_mem_top(c);
+                return 1;
+        }
+
+        if (!vgacon_scrollback)
+                return 1;
+
+        if (!vgacon_scrollback_save) {
+                vgacon_cursor(c, CM_ERASE);
+                vgacon_save_screen(c);
+                vgacon_scrollback_save = 1;
+        }
+
+        vgacon_scrollback_restore = 0;
+        start = vgacon_scrollback_cur + lines;
+        end = start + abs(lines);
+
+        if (start < 0)
+                start = 0;
+
+        if (start > vgacon_scrollback_cnt)
+                start = vgacon_scrollback_cnt;
+
+        if (end < 0)
+                end = 0;
+
+        if (end > vgacon_scrollback_cnt)
+                end = vgacon_scrollback_cnt;
+
+        vgacon_scrollback_cur = start;
+        count = end - start;
+        soff = vgacon_scrollback_tail - ((vgacon_scrollback_cnt - end) *
+                                         c->vc_size_row);
+        soff -= count * c->vc_size_row;
+
+        if (soff < 0)
+                soff += vgacon_scrollback_size;
+
+        count = vgacon_scrollback_cnt - start;
+
+        if (count > c->vc_rows)
+                count = c->vc_rows;
+
+        diff = c->vc_rows - count;
+
+        d = (void *) c->vc_origin;
+        s = (void *) c->vc_screenbuf;
+
+        while (count--) {
+                scr_memcpyw(d, vgacon_scrollback + soff, c->vc_size_row);
+                d += c->vc_size_row;
+                soff += c->vc_size_row;
+
+                if (soff >= vgacon_scrollback_size)
+                        soff = 0;
+        }
+
+        if (diff == c->vc_rows) {
+                vgacon_cursor(c, CM_MOVE);
+        } else {
+                while (diff--) {
+                        scr_memcpyw(d, s, c->vc_size_row);
+                        d += c->vc_size_row;
+                        s += c->vc_size_row;
+                }
+        }
+
+        return 1;
+}
+#else
+#define vgacon_scrollback_startup(...) do { } while (0)
+#define vgacon_scrollback_init(...)    do { } while (0)
+#define vgacon_scrollback_update(...)  do { } while (0)
+
+static void vgacon_restore_screen(struct vc_data *c)
+{
+        if (c->vc_origin != c->vc_visible_origin)
+                vgacon_scrolldelta(c, 0);
+}
+
+static int vgacon_scrolldelta(struct vc_data *c, int lines)
+{
+        if (!lines)             /* Turn scrollback off */
+                c->vc_visible_origin = c->vc_origin;
+        else {
+                int margin = c->vc_size_row * 4;
+                int ul, we, p, st;
+
+                if (vga_rolled_over >
+                    (c->vc_scr_end - vga_vram_base) + margin) {
+                        ul = c->vc_scr_end - vga_vram_base;
+                        we = vga_rolled_over + c->vc_size_row;
+                } else {
+                        ul = 0;
+                        we = vga_vram_size;
+                }
+                p = (c->vc_visible_origin - vga_vram_base - ul + we) % we +
+                    lines * c->vc_size_row;
+                st = (c->vc_origin - vga_vram_base - ul + we) % we;
+                if (st < 2 * margin)
+                        margin = 0;
+                if (p < margin)
+                        p = 0;
+                if (p > st - margin)
+                        p = st;
+                c->vc_visible_origin = vga_vram_base + (p + ul) % we;
+        }
+        vga_set_mem_top(c);
+        return 1;
+}
+#endif /* CONFIG_VGACON_SOFT_SCROLLBACK */
+
 static const char __init *vgacon_startup(void)
 {
         const char *display_desc = NULL;
@@ -330,7 +524,7 @@ static const char __init *vgacon_startup(void)
 
         vgacon_xres = ORIG_VIDEO_COLS * VGA_FONTWIDTH;
         vgacon_yres = vga_scan_lines;
-
+        vgacon_scrollback_startup();
         return display_desc;
 }
 
@@ -357,11 +551,6 @@ static void vgacon_init(struct vc_data *c, int init)
                 con_set_default_unimap(c);
 }
 
-static inline void vga_set_mem_top(struct vc_data *c)
-{
-        write_vga(12, (c->vc_visible_origin - vga_vram_base) / 2);
-}
-
 static void vgacon_deinit(struct vc_data *c)
 {
         /* When closing the last console, reset video origin */
@@ -433,29 +622,37 @@ static void vgacon_set_cursor_size(int xpos, int from, int to)
         cursor_size_lastto = to;
 
         spin_lock_irqsave(&vga_lock, flags);
-        outb_p(0x0a, vga_video_port_reg);       /* Cursor start */
-        curs = inb_p(vga_video_port_val);
-        outb_p(0x0b, vga_video_port_reg);       /* Cursor end */
-        cure = inb_p(vga_video_port_val);
+        if (vga_video_type >= VIDEO_TYPE_VGAC) {
+                outb_p(VGA_CRTC_CURSOR_START, vga_video_port_reg);
+                curs = inb_p(vga_video_port_val);
+                outb_p(VGA_CRTC_CURSOR_END, vga_video_port_reg);
+                cure = inb_p(vga_video_port_val);
+        } else {
+                curs = 0;
+                cure = 0;
+        }
 
         curs = (curs & 0xc0) | from;
         cure = (cure & 0xe0) | to;
 
-        outb_p(0x0a, vga_video_port_reg);       /* Cursor start */
+        outb_p(VGA_CRTC_CURSOR_START, vga_video_port_reg);
         outb_p(curs, vga_video_port_val);
-        outb_p(0x0b, vga_video_port_reg);       /* Cursor end */
+        outb_p(VGA_CRTC_CURSOR_END, vga_video_port_reg);
         outb_p(cure, vga_video_port_val);
         spin_unlock_irqrestore(&vga_lock, flags);
 }
 
 static void vgacon_cursor(struct vc_data *c, int mode)
 {
-        if (c->vc_origin != c->vc_visible_origin)
-                vgacon_scrolldelta(c, 0);
+        vgacon_restore_screen(c);
+
         switch (mode) {
         case CM_ERASE:
                 write_vga(14, (c->vc_pos - vga_vram_base) / 2);
-                vgacon_set_cursor_size(c->vc_x, 31, 30);
+                if (vga_video_type >= VIDEO_TYPE_VGAC)
+                        vgacon_set_cursor_size(c->vc_x, 31, 30);
+                else
+                        vgacon_set_cursor_size(c->vc_x, 31, 31);
                 break;
 
         case CM_MOVE:
@@ -493,7 +690,10 @@ static void vgacon_cursor(struct vc_data *c, int mode)
                                                 10 ? 1 : 2));
                         break;
                 case CUR_NONE:
-                        vgacon_set_cursor_size(c->vc_x, 31, 30);
+                        if (vga_video_type >= VIDEO_TYPE_VGAC)
+                                vgacon_set_cursor_size(c->vc_x, 31, 30);
+                        else
+                                vgacon_set_cursor_size(c->vc_x, 31, 31);
                         break;
                 default:
                         vgacon_set_cursor_size(c->vc_x, 1,
@@ -595,6 +795,7 @@ static int vgacon_switch(struct vc_data *c)
                         vgacon_doresize(c, c->vc_cols, c->vc_rows);
         }
 
+        vgacon_scrollback_init(c->vc_size_row);
         return 0;               /* Redrawing not needed */
 }
 
@@ -1062,37 +1263,6 @@ static int vgacon_resize(struct vc_data *c, unsigned int width,
         return 0;
 }
 
-static int vgacon_scrolldelta(struct vc_data *c, int lines)
-{
-        if (!lines)             /* Turn scrollback off */
-                c->vc_visible_origin = c->vc_origin;
-        else {
-                int margin = c->vc_size_row * 4;
-                int ul, we, p, st;
-
-                if (vga_rolled_over >
-                    (c->vc_scr_end - vga_vram_base) + margin) {
-                        ul = c->vc_scr_end - vga_vram_base;
-                        we = vga_rolled_over + c->vc_size_row;
-                } else {
-                        ul = 0;
-                        we = vga_vram_size;
-                }
-                p = (c->vc_visible_origin - vga_vram_base - ul + we) % we +
-                    lines * c->vc_size_row;
-                st = (c->vc_origin - vga_vram_base - ul + we) % we;
-                if (st < 2 * margin)
-                        margin = 0;
-                if (p < margin)
-                        p = 0;
-                if (p > st - margin)
-                        p = st;
-                c->vc_visible_origin = vga_vram_base + (p + ul) % we;
-        }
-        vga_set_mem_top(c);
-        return 1;
-}
-
 static int vgacon_set_origin(struct vc_data *c)
 {
         if (vga_is_gfx ||       /* We don't play origin tricks in graphic modes */
@@ -1135,15 +1305,14 @@ static int vgacon_scroll(struct vc_data *c, int t, int b, int dir,
         if (t || b != c->vc_rows || vga_is_gfx)
                 return 0;
 
-        if (c->vc_origin != c->vc_visible_origin)
-                vgacon_scrolldelta(c, 0);
-
         if (!vga_hardscroll_enabled || lines >= c->vc_rows / 2)
                 return 0;
 
+        vgacon_restore_screen(c);
         oldo = c->vc_origin;
         delta = lines * c->vc_size_row;
         if (dir == SM_UP) {
+                vgacon_scrollback_update(c, t, lines);
                 if (c->vc_scr_end + delta >= vga_vram_end) {
                         scr_memcpyw((u16 *) vga_vram_base,
                                     (u16 *) (oldo + delta),
diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
index c32a2a50bf..1f98392a43 100644
--- a/drivers/video/fbcmap.c
+++ b/drivers/video/fbcmap.c
@@ -85,7 +85,7 @@ static struct fb_cmap default_16_colors = {
  *      Allocates memory for a colormap @cmap.  @len is the
  *      number of entries in the palette.
  *
- *      Returns -1 errno on error, or zero on success.
+ *      Returns negative errno on error, or zero on success.
  *
  */
 
@@ -116,7 +116,7 @@ int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp)
 
 fail:
     fb_dealloc_cmap(cmap);
-    return -1;
+    return -ENOMEM;
 }
 
 /**
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 07d882b143..b1a8dca764 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -55,7 +55,7 @@
 
 #define FBPIXMAPSIZE    (1024 * 8)
 
-static struct notifier_block *fb_notifier_list;
+static BLOCKING_NOTIFIER_HEAD(fb_notifier_list);
 struct fb_info *registered_fb[FB_MAX];
 int num_registered_fb;
 
@@ -784,7 +784,7 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
 
                     event.info = info;
                     event.data = &mode1;
-                    ret = notifier_call_chain(&fb_notifier_list,
+                    ret = blocking_notifier_call_chain(&fb_notifier_list,
                                               FB_EVENT_MODE_DELETE, &event);
                 }
 
@@ -830,8 +830,8 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
 
                                 info->flags &= ~FBINFO_MISC_USEREVENT;
                                 event.info = info;
-                                notifier_call_chain(&fb_notifier_list, evnt,
-                                                    &event);
+                                blocking_notifier_call_chain(&fb_notifier_list,
+                                                evnt, &event);
                         }
                 }
         }
@@ -854,7 +854,8 @@ fb_blank(struct fb_info *info, int blank)
 
                 event.info = info;
                 event.data = &blank;
-                notifier_call_chain(&fb_notifier_list, FB_EVENT_BLANK, &event);
+                blocking_notifier_call_chain(&fb_notifier_list,
+                                FB_EVENT_BLANK, &event);
         }
 
         return ret;
@@ -925,7 +926,7 @@ fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                 con2fb.framebuffer = -1;
                 event.info = info;
                 event.data = &con2fb;
-                notifier_call_chain(&fb_notifier_list,
+                blocking_notifier_call_chain(&fb_notifier_list,
                                     FB_EVENT_GET_CONSOLE_MAP, &event);
                 return copy_to_user(argp, &con2fb,
                                     sizeof(con2fb)) ? -EFAULT : 0;
@@ -944,7 +945,7 @@ fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                     return -EINVAL;
                 event.info = info;
                 event.data = &con2fb;
-                return notifier_call_chain(&fb_notifier_list,
+                return blocking_notifier_call_chain(&fb_notifier_list,
                                            FB_EVENT_SET_CONSOLE_MAP,
                                            &event);
         case FBIOBLANK:
@@ -1324,7 +1325,7 @@ register_framebuffer(struct fb_info *fb_info)
         devfs_mk_cdev(MKDEV(FB_MAJOR, i),
                         S_IFCHR | S_IRUGO | S_IWUGO, "fb/%d", i);
         event.info = fb_info;
-        notifier_call_chain(&fb_notifier_list,
+        blocking_notifier_call_chain(&fb_notifier_list,
                             FB_EVENT_FB_REGISTERED, &event);
         return 0;
 }
@@ -1366,7 +1367,7 @@ unregister_framebuffer(struct fb_info *fb_info)
  */
 int fb_register_client(struct notifier_block *nb)
 {
-        return notifier_chain_register(&fb_notifier_list, nb);
+        return blocking_notifier_chain_register(&fb_notifier_list, nb);
 }
 
 /**
@@ -1375,7 +1376,7 @@ int fb_register_client(struct notifier_block *nb)
  */
 int fb_unregister_client(struct notifier_block *nb)
 {
-        return notifier_chain_unregister(&fb_notifier_list, nb);
+        return blocking_notifier_chain_unregister(&fb_notifier_list, nb);
 }
 
 /**
@@ -1393,11 +1394,13 @@ void fb_set_suspend(struct fb_info *info, int state)
 
         event.info = info;
         if (state) {
-                notifier_call_chain(&fb_notifier_list, FB_EVENT_SUSPEND, &event);
+                blocking_notifier_call_chain(&fb_notifier_list,
+                                FB_EVENT_SUSPEND, &event);
                 info->state = FBINFO_STATE_SUSPENDED;
         } else {
                 info->state = FBINFO_STATE_RUNNING;
-                notifier_call_chain(&fb_notifier_list, FB_EVENT_RESUME, &event);
+                blocking_notifier_call_chain(&fb_notifier_list,
+                                FB_EVENT_RESUME, &event);
         }
 }
 
@@ -1469,7 +1472,7 @@ int fb_new_modelist(struct fb_info *info)
 
         if (!list_empty(&info->modelist)) {
                 event.info = info;
-                err = notifier_call_chain(&fb_notifier_list,
+                err = blocking_notifier_call_chain(&fb_notifier_list,
                                            FB_EVENT_NEW_MODELIST,
                                            &event);
         }
@@ -1495,7 +1498,7 @@ int fb_con_duit(struct fb_info *info, int event, void *data)
         evnt.info = info;
         evnt.data = data;
 
-        return notifier_call_chain(&fb_notifier_list, event, &evnt);
+        return blocking_notifier_call_chain(&fb_notifier_list, event, &evnt);
 }
 EXPORT_SYMBOL(fb_con_duit);
 
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
index 7c74e7325d..53beeb4a99 100644
--- a/drivers/video/fbmon.c
+++ b/drivers/video/fbmon.c
@@ -1281,7 +1281,7 @@ int fb_validate_mode(const struct fb_var_screeninfo *var, struct fb_info *info)
                 -EINVAL : 0;
 }
 
-#if defined(__i386__)
+#if defined(CONFIG_FB_FIRMWARE_EDID) && defined(__i386__)
 #include <linux/pci.h>
 
 /*
@@ -1311,11 +1311,11 @@ const unsigned char *fb_firmware_edid(struct device *device)
 {
         return NULL;
 }
-#endif /* _i386_ */
+#endif
+EXPORT_SYMBOL(fb_firmware_edid);
 
 EXPORT_SYMBOL(fb_parse_edid);
 EXPORT_SYMBOL(fb_edid_to_monspecs);
-EXPORT_SYMBOL(fb_firmware_edid);
 EXPORT_SYMBOL(fb_get_mode);
 EXPORT_SYMBOL(fb_validate_mode);
 EXPORT_SYMBOL(fb_destroy_modedb);
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index 6d26057337..b72b05250a 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -348,7 +348,7 @@ static ssize_t store_cmap(struct class_device *class_device, const char *buf,
                 fb_copy_cmap(&umap, &fb_info->cmap);
                 fb_dealloc_cmap(&umap);
 
-                return rc;
+                return rc ?: count;
         }
         for (i = 0; i < length; i++) {
                 u16 red, blue, green, tsp;
@@ -367,7 +367,7 @@ static ssize_t store_cmap(struct class_device *class_device, const char *buf,
                 if (transp)
                         fb_info->cmap.transp[i] = tsp;
         }
-        return 0;
+        return count;
 }
 
 static ssize_t show_cmap(struct class_device *class_device, char *buf)
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index 9c9b21d469..7633e41add 100644
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -466,8 +466,7 @@ static void ffb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
         unsigned long flags;
         u32 fg;
 
-        if (rect->rop != ROP_COPY && rect->rop != ROP_XOR)
-                BUG();
+        BUG_ON(rect->rop != ROP_COPY && rect->rop != ROP_XOR);
 
         fg = ((u32 *)info->pseudo_palette)[rect->color];
 
diff --git a/drivers/video/geode/Kconfig b/drivers/video/geode/Kconfig
index 42fb9a89a7..4e173ef20a 100644
--- a/drivers/video/geode/Kconfig
+++ b/drivers/video/geode/Kconfig
@@ -8,9 +8,24 @@ config FB_GEODE
           Say 'Y' here to allow you to select framebuffer drivers for
           the AMD Geode family of processors.
 
+config FB_GEODE_GX
+        tristate "AMD Geode GX framebuffer support (EXPERIMENTAL)"
+        depends on FB && FB_GEODE && EXPERIMENTAL
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        ---help---
+          Framebuffer driver for the display controller integrated into the
+          AMD Geode GX processors.
+
+          To compile this driver as a module, choose M here: the module will be
+          called gxfb.
+
+          If unsure, say N.
+
 config FB_GEODE_GX1
         tristate "AMD Geode GX1 framebuffer support (EXPERIMENTAL)"
-        depends on FB_GEODE && EXPERIMENTAL
+        depends on FB && FB_GEODE && EXPERIMENTAL
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
diff --git a/drivers/video/geode/Makefile b/drivers/video/geode/Makefile
index 13ad501ea9..f896565bc3 100644
--- a/drivers/video/geode/Makefile
+++ b/drivers/video/geode/Makefile
@@ -1,5 +1,7 @@
 # Makefile for the Geode family framebuffer drivers
 
 obj-$(CONFIG_FB_GEODE_GX1) += gx1fb.o
+obj-$(CONFIG_FB_GEODE_GX)  += gxfb.o
 
-gx1fb-objs              := gx1fb_core.o display_gx1.o video_cs5530.o
+gx1fb-objs := gx1fb_core.o display_gx1.o video_cs5530.o
+gxfb-objs  := gxfb_core.o display_gx.o video_gx.o
diff --git a/drivers/video/geode/display_gx.c b/drivers/video/geode/display_gx.c
new file mode 100644
index 0000000000..825c3405f5
--- /dev/null
+++ b/drivers/video/geode/display_gx.c
@@ -0,0 +1,156 @@
+/*
+ * Geode GX display controller.
+ *
+ *   Copyright (C) 2005 Arcom Control Systems Ltd.
+ *
+ *   Portions from AMD's original 2.4 driver:
+ *     Copyright (C) 2004 Advanced Micro Devices, Inc.
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by * the
+ *   Free Software Foundation; either version 2 of the License, or * (at your
+ *   option) any later version.
+ */
+#include <linux/spinlock.h>
+#include <linux/fb.h>
+#include <linux/delay.h>
+#include <asm/io.h>
+#include <asm/div64.h>
+#include <asm/delay.h>
+
+#include "geodefb.h"
+#include "display_gx.h"
+
+int gx_frame_buffer_size(void)
+{
+        /* Assuming 16 MiB. */
+        return 16*1024*1024;
+}
+
+int gx_line_delta(int xres, int bpp)
+{
+        /* Must be a multiple of 8 bytes. */
+        return (xres * (bpp >> 3) + 7) & ~0x7;
+}
+
+static void gx_set_mode(struct fb_info *info)
+{
+        struct geodefb_par *par = info->par;
+        u32 gcfg, dcfg;
+        int hactive, hblankstart, hsyncstart, hsyncend, hblankend, htotal;
+        int vactive, vblankstart, vsyncstart, vsyncend, vblankend, vtotal;
+
+        /* Unlock the display controller registers. */
+        readl(par->dc_regs + DC_UNLOCK);
+        writel(DC_UNLOCK_CODE, par->dc_regs + DC_UNLOCK);
+
+        gcfg = readl(par->dc_regs + DC_GENERAL_CFG);
+        dcfg = readl(par->dc_regs + DC_DISPLAY_CFG);
+
+        /* Disable the timing generator. */
+        dcfg &= ~(DC_DCFG_TGEN);
+        writel(dcfg, par->dc_regs + DC_DISPLAY_CFG);
+
+        /* Wait for pending memory requests before disabling the FIFO load. */
+        udelay(100);
+
+        /* Disable FIFO load and compression. */
+        gcfg &= ~(DC_GCFG_DFLE | DC_GCFG_CMPE | DC_GCFG_DECE);
+        writel(gcfg, par->dc_regs + DC_GENERAL_CFG);
+
+        /* Setup DCLK and its divisor. */
+        par->vid_ops->set_dclk(info);
+
+        /*
+         * Setup new mode.
+         */
+
+        /* Clear all unused feature bits. */
+        gcfg &= DC_GCFG_YUVM | DC_GCFG_VDSE;
+        dcfg = 0;
+
+        /* Set FIFO priority (default 6/5) and enable. */
+        /* FIXME: increase fifo priority for 1280x1024 and higher modes? */
+        gcfg |= (6 << DC_GCFG_DFHPEL_POS) | (5 << DC_GCFG_DFHPSL_POS) | DC_GCFG_DFLE;
+
+        /* Framebuffer start offset. */
+        writel(0, par->dc_regs + DC_FB_ST_OFFSET);
+
+        /* Line delta and line buffer length. */
+        writel(info->fix.line_length >> 3, par->dc_regs + DC_GFX_PITCH);
+        writel(((info->var.xres * info->var.bits_per_pixel/8) >> 3) + 2,
+               par->dc_regs + DC_LINE_SIZE);
+
+        /* Enable graphics and video data and unmask address lines. */
+        dcfg |= DC_DCFG_GDEN | DC_DCFG_VDEN | DC_DCFG_A20M | DC_DCFG_A18M;
+
+        /* Set pixel format. */
+        switch (info->var.bits_per_pixel) {
+        case 8:
+                dcfg |= DC_DCFG_DISP_MODE_8BPP;
+                break;
+        case 16:
+                dcfg |= DC_DCFG_DISP_MODE_16BPP;
+                dcfg |= DC_DCFG_16BPP_MODE_565;
+                break;
+        case 32:
+                dcfg |= DC_DCFG_DISP_MODE_24BPP;
+                dcfg |= DC_DCFG_PALB;
+                break;
+        }
+
+        /* Enable timing generator. */
+        dcfg |= DC_DCFG_TGEN;
+
+        /* Horizontal and vertical timings. */
+        hactive = info->var.xres;
+        hblankstart = hactive;
+        hsyncstart = hblankstart + info->var.right_margin;
+        hsyncend =  hsyncstart + info->var.hsync_len;
+        hblankend = hsyncend + info->var.left_margin;
+        htotal = hblankend;
+
+        vactive = info->var.yres;
+        vblankstart = vactive;
+        vsyncstart = vblankstart + info->var.lower_margin;
+        vsyncend =  vsyncstart + info->var.vsync_len;
+        vblankend = vsyncend + info->var.upper_margin;
+        vtotal = vblankend;
+
+        writel((hactive - 1)     | ((htotal - 1) << 16),    par->dc_regs + DC_H_ACTIVE_TIMING);
+        writel((hblankstart - 1) | ((hblankend - 1) << 16), par->dc_regs + DC_H_BLANK_TIMING);
+        writel((hsyncstart - 1)  | ((hsyncend - 1) << 16),  par->dc_regs + DC_H_SYNC_TIMING);
+
+        writel((vactive - 1)     | ((vtotal - 1) << 16),    par->dc_regs + DC_V_ACTIVE_TIMING);
+        writel((vblankstart - 1) | ((vblankend - 1) << 16), par->dc_regs + DC_V_BLANK_TIMING);
+        writel((vsyncstart - 1)  | ((vsyncend - 1) << 16),  par->dc_regs + DC_V_SYNC_TIMING);
+
+        /* Write final register values. */
+        writel(dcfg, par->dc_regs + DC_DISPLAY_CFG);
+        writel(gcfg, par->dc_regs + DC_GENERAL_CFG);
+
+        par->vid_ops->configure_display(info);
+
+        /* Relock display controller registers */
+        writel(0, par->dc_regs + DC_UNLOCK);
+}
+
+static void gx_set_hw_palette_reg(struct fb_info *info, unsigned regno,
+                                   unsigned red, unsigned green, unsigned blue)
+{
+        struct geodefb_par *par = info->par;
+        int val;
+
+        /* Hardware palette is in RGB 8-8-8 format. */
+        val  = (red   << 8) & 0xff0000;
+        val |= (green)      & 0x00ff00;
+        val |= (blue  >> 8) & 0x0000ff;
+
+        writel(regno, par->dc_regs + DC_PAL_ADDRESS);
+        writel(val, par->dc_regs + DC_PAL_DATA);
+}
+
+struct geode_dc_ops gx_dc_ops = {
+        .set_mode        = gx_set_mode,
+        .set_palette_reg = gx_set_hw_palette_reg,
+};
diff --git a/drivers/video/geode/display_gx.h b/drivers/video/geode/display_gx.h
new file mode 100644
index 0000000000..86c6233613
--- /dev/null
+++ b/drivers/video/geode/display_gx.h
@@ -0,0 +1,96 @@
+/*
+ * Geode GX display controller
+ *
+ * Copyright (C) 2006 Arcom Control Systems Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#ifndef __DISPLAY_GX_H__
+#define __DISPLAY_GX_H__
+
+int gx_frame_buffer_size(void);
+int gx_line_delta(int xres, int bpp);
+
+extern struct geode_dc_ops gx_dc_ops;
+
+/* Display controller registers */
+
+#define DC_UNLOCK 0x00
+#  define DC_UNLOCK_CODE 0x00004758
+
+#define DC_GENERAL_CFG 0x04
+#  define DC_GCFG_DFLE        0x00000001
+#  define DC_GCFG_CURE        0x00000002
+#  define DC_GCFG_ICNE        0x00000004
+#  define DC_GCFG_VIDE        0x00000008
+#  define DC_GCFG_CMPE        0x00000020
+#  define DC_GCFG_DECE        0x00000040
+#  define DC_GCFG_VGAE        0x00000080
+#  define DC_GCFG_DFHPSL_MASK 0x00000F00
+#  define DC_GCFG_DFHPSL_POS           8
+#  define DC_GCFG_DFHPEL_MASK 0x0000F000
+#  define DC_GCFG_DFHPEL_POS          12
+#  define DC_GCFG_STFM        0x00010000
+#  define DC_GCFG_FDTY        0x00020000
+#  define DC_GCFG_VGAFT       0x00040000
+#  define DC_GCFG_VDSE        0x00080000
+#  define DC_GCFG_YUVM        0x00100000
+#  define DC_GCFG_VFSL        0x00800000
+#  define DC_GCFG_SIGE        0x01000000
+#  define DC_GCFG_SGRE        0x02000000
+#  define DC_GCFG_SGFR        0x04000000
+#  define DC_GCFG_CRC_MODE    0x08000000
+#  define DC_GCFG_DIAG        0x10000000
+#  define DC_GCFG_CFRW        0x20000000
+
+#define DC_DISPLAY_CFG 0x08
+#  define DC_DCFG_TGEN            0x00000001
+#  define DC_DCFG_GDEN            0x00000008
+#  define DC_DCFG_VDEN            0x00000010
+#  define DC_DCFG_TRUP            0x00000040
+#  define DC_DCFG_DISP_MODE_MASK  0x00000300
+#  define DC_DCFG_DISP_MODE_8BPP  0x00000000
+#  define DC_DCFG_DISP_MODE_16BPP 0x00000100
+#  define DC_DCFG_DISP_MODE_24BPP 0x00000200
+#  define DC_DCFG_16BPP_MODE_MASK 0x00000c00
+#  define DC_DCFG_16BPP_MODE_565  0x00000000
+#  define DC_DCFG_16BPP_MODE_555  0x00000100
+#  define DC_DCFG_16BPP_MODE_444  0x00000200
+#  define DC_DCFG_DCEN            0x00080000
+#  define DC_DCFG_PALB            0x02000000
+#  define DC_DCFG_FRLK            0x04000000
+#  define DC_DCFG_VISL            0x08000000
+#  define DC_DCFG_FRSL            0x20000000
+#  define DC_DCFG_A18M            0x40000000
+#  define DC_DCFG_A20M            0x80000000
+
+#define DC_FB_ST_OFFSET 0x10
+
+#define DC_LINE_SIZE 0x30
+#  define DC_LINE_SIZE_FB_LINE_SIZE_MASK  0x000007ff
+#  define DC_LINE_SIZE_FB_LINE_SIZE_POS            0
+#  define DC_LINE_SIZE_CB_LINE_SIZE_MASK  0x007f0000
+#  define DC_LINE_SIZE_CB_LINE_SIZE_POS           16
+#  define DC_LINE_SIZE_VID_LINE_SIZE_MASK 0xff000000
+#  define DC_LINE_SIZE_VID_LINE_SIZE_POS          24
+
+#define DC_GFX_PITCH 0x34
+#  define DC_GFX_PITCH_FB_PITCH_MASK 0x0000ffff
+#  define DC_GFX_PITCH_FB_PITCH_POS           0
+#  define DC_GFX_PITCH_CB_PITCH_MASK 0xffff0000
+#  define DC_GFX_PITCH_CB_PITCH_POS          16
+
+#define DC_H_ACTIVE_TIMING 0x40
+#define DC_H_BLANK_TIMING  0x44
+#define DC_H_SYNC_TIMING   0x48
+#define DC_V_ACTIVE_TIMING 0x50
+#define DC_V_BLANK_TIMING  0x54
+#define DC_V_SYNC_TIMING   0x58
+
+#define DC_PAL_ADDRESS 0x70
+#define DC_PAL_DATA    0x74
+
+#endif /* !__DISPLAY_GX1_H__ */
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
new file mode 100644
index 0000000000..89c34b15f5
--- /dev/null
+++ b/drivers/video/geode/gxfb_core.c
@@ -0,0 +1,423 @@
+/*
+ * Geode GX framebuffer driver.
+ *
+ *   Copyright (C) 2006 Arcom Control Systems Ltd.
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the
+ *   Free Software Foundation; either version 2 of the License, or (at your
+ *   option) any later version.
+ *
+ *
+ * This driver assumes that the BIOS has created a virtual PCI device header
+ * for the video device. The PCI header is assumed to contain the following
+ * BARs:
+ *
+ *    BAR0 - framebuffer memory
+ *    BAR1 - graphics processor registers
+ *    BAR2 - display controller registers
+ *    BAR3 - video processor and flat panel control registers.
+ *
+ * 16 MiB of framebuffer memory is assumed to be available.
+ */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/tty.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+
+#include "geodefb.h"
+#include "display_gx.h"
+#include "video_gx.h"
+
+static char mode_option[32] = "640x480-16@60";
+
+/* Modes relevant to the GX (taken from modedb.c) */
+static const struct fb_videomode __initdata gx_modedb[] = {
+        /* 640x480-60 VESA */
+        { NULL, 60, 640, 480, 39682,  48, 16, 33, 10, 96, 2,
+          0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+        /* 640x480-75 VESA */
+        { NULL, 75, 640, 480, 31746, 120, 16, 16, 01, 64, 3,
+          0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+        /* 640x480-85 VESA */
+        { NULL, 85, 640, 480, 27777, 80, 56, 25, 01, 56, 3,
+          0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+        /* 800x600-60 VESA */
+        { NULL, 60, 800, 600, 25000, 88, 40, 23, 01, 128, 4,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+        /* 800x600-75 VESA */
+        { NULL, 75, 800, 600, 20202, 160, 16, 21, 01, 80, 3,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+        /* 800x600-85 VESA */
+        { NULL, 85, 800, 600, 17761, 152, 32, 27, 01, 64, 3,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+        /* 1024x768-60 VESA */
+        { NULL, 60, 1024, 768, 15384, 160, 24, 29, 3, 136, 6,
+          0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+        /* 1024x768-75 VESA */
+        { NULL, 75, 1024, 768, 12690, 176, 16, 28, 1, 96, 3,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+        /* 1024x768-85 VESA */
+        { NULL, 85, 1024, 768, 10582, 208, 48, 36, 1, 96, 3,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+        /* 1280x960-60 VESA */
+        { NULL, 60, 1280, 960, 9259, 312, 96, 36, 1, 112, 3,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+        /* 1280x960-85 VESA */
+        { NULL, 85, 1280, 960, 6734, 224, 64, 47, 1, 160, 3,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+        /* 1280x1024-60 VESA */
+        { NULL, 60, 1280, 1024, 9259, 248, 48, 38, 1, 112, 3,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+        /* 1280x1024-75 VESA */
+        { NULL, 75, 1280, 1024, 7407, 248, 16, 38, 1, 144, 3,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+        /* 1280x1024-85 VESA */
+        { NULL, 85, 1280, 1024, 6349, 224, 64, 44, 1, 160, 3,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+        /* 1600x1200-60 VESA */
+        { NULL, 60, 1600, 1200, 6172, 304, 64, 46, 1, 192, 3,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+        /* 1600x1200-75 VESA */
+        { NULL, 75, 1600, 1200, 4938, 304, 64, 46, 1, 192, 3,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+        /* 1600x1200-85 VESA */
+        { NULL, 85, 1600, 1200, 4357, 304, 64, 46, 1, 192, 3,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+};
+
+static int gxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        if (var->xres > 1600 || var->yres > 1200)
+                return -EINVAL;
+        if ((var->xres > 1280 || var->yres > 1024) && var->bits_per_pixel > 16)
+                return -EINVAL;
+
+        if (var->bits_per_pixel == 32) {
+                var->red.offset   = 16; var->red.length   = 8;
+                var->green.offset =  8; var->green.length = 8;
+                var->blue.offset  =  0; var->blue.length  = 8;
+        } else if (var->bits_per_pixel == 16) {
+                var->red.offset   = 11; var->red.length   = 5;
+                var->green.offset =  5; var->green.length = 6;
+                var->blue.offset  =  0; var->blue.length  = 5;
+        } else if (var->bits_per_pixel == 8) {
+                var->red.offset   = 0; var->red.length   = 8;
+                var->green.offset = 0; var->green.length = 8;
+                var->blue.offset  = 0; var->blue.length  = 8;
+        } else
+                return -EINVAL;
+        var->transp.offset = 0; var->transp.length = 0;
+
+        /* Enough video memory? */
+        if (gx_line_delta(var->xres, var->bits_per_pixel) * var->yres > info->fix.smem_len)
+                return -EINVAL;
+
+        /* FIXME: Check timing parameters here? */
+
+        return 0;
+}
+
+static int gxfb_set_par(struct fb_info *info)
+{
+        struct geodefb_par *par = info->par;
+
+        if (info->var.bits_per_pixel > 8) {
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
+                fb_dealloc_cmap(&info->cmap);
+        } else {
+                info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+                fb_alloc_cmap(&info->cmap, 1<<info->var.bits_per_pixel, 0);
+        }
+
+        info->fix.line_length = gx_line_delta(info->var.xres, info->var.bits_per_pixel);
+
+        par->dc_ops->set_mode(info);
+
+        return 0;
+}
+
+static inline u_int chan_to_field(u_int chan, struct fb_bitfield *bf)
+{
+        chan &= 0xffff;
+        chan >>= 16 - bf->length;
+        return chan << bf->offset;
+}
+
+static int gxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
+                           unsigned blue, unsigned transp,
+                           struct fb_info *info)
+{
+        struct geodefb_par *par = info->par;
+
+        if (info->var.grayscale) {
+                /* grayscale = 0.30*R + 0.59*G + 0.11*B */
+                red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8;
+        }
+
+        /* Truecolor has hardware independent palette */
+        if (info->fix.visual == FB_VISUAL_TRUECOLOR) {
+                u32 *pal = info->pseudo_palette;
+                u32 v;
+
+                if (regno >= 16)
+                        return -EINVAL;
+
+                v  = chan_to_field(red, &info->var.red);
+                v |= chan_to_field(green, &info->var.green);
+                v |= chan_to_field(blue, &info->var.blue);
+
+                pal[regno] = v;
+        } else {
+                if (regno >= 256)
+                        return -EINVAL;
+
+                par->dc_ops->set_palette_reg(info, regno, red, green, blue);
+        }
+
+        return 0;
+}
+
+static int gxfb_blank(int blank_mode, struct fb_info *info)
+{
+        struct geodefb_par *par = info->par;
+
+        return par->vid_ops->blank_display(info, blank_mode);
+}
+
+static int __init gxfb_map_video_memory(struct fb_info *info, struct pci_dev *dev)
+{
+        struct geodefb_par *par = info->par;
+        int fb_len;
+        int ret;
+
+        ret = pci_enable_device(dev);
+        if (ret < 0)
+                return ret;
+
+        ret = pci_request_region(dev, 3, "gxfb (video processor)");
+        if (ret < 0)
+                return ret;
+        par->vid_regs = ioremap(pci_resource_start(dev, 3),
+                                pci_resource_len(dev, 3));
+        if (!par->vid_regs)
+                return -ENOMEM;
+
+        ret = pci_request_region(dev, 2, "gxfb (display controller)");
+        if (ret < 0)
+                return ret;
+        par->dc_regs = ioremap(pci_resource_start(dev, 2), pci_resource_len(dev, 2));
+        if (!par->dc_regs)
+                return -ENOMEM;
+
+        ret = pci_request_region(dev, 0, "gxfb (framebuffer)");
+        if (ret < 0)
+                return ret;
+        if ((fb_len = gx_frame_buffer_size()) < 0)
+                return -ENOMEM;
+        info->fix.smem_start = pci_resource_start(dev, 0);
+        info->fix.smem_len = fb_len;
+        info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);
+        if (!info->screen_base)
+                return -ENOMEM;
+
+        dev_info(&dev->dev, "%d Kibyte of video memory at 0x%lx\n",
+                 info->fix.smem_len / 1024, info->fix.smem_start);
+
+        return 0;
+}
+
+static struct fb_ops gxfb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_check_var   = gxfb_check_var,
+        .fb_set_par     = gxfb_set_par,
+        .fb_setcolreg   = gxfb_setcolreg,
+        .fb_blank       = gxfb_blank,
+        /* No HW acceleration for now. */
+        .fb_fillrect    = cfb_fillrect,
+        .fb_copyarea    = cfb_copyarea,
+        .fb_imageblit   = cfb_imageblit,
+};
+
+static struct fb_info * __init gxfb_init_fbinfo(struct device *dev)
+{
+        struct geodefb_par *par;
+        struct fb_info *info;
+
+        /* Alloc enough space for the pseudo palette. */
+        info = framebuffer_alloc(sizeof(struct geodefb_par) + sizeof(u32) * 16, dev);
+        if (!info)
+                return NULL;
+
+        par = info->par;
+
+        strcpy(info->fix.id, "Geode GX");
+
+        info->fix.type          = FB_TYPE_PACKED_PIXELS;
+        info->fix.type_aux      = 0;
+        info->fix.xpanstep      = 0;
+        info->fix.ypanstep      = 0;
+        info->fix.ywrapstep     = 0;
+        info->fix.accel         = FB_ACCEL_NONE;
+
+        info->var.nonstd        = 0;
+        info->var.activate      = FB_ACTIVATE_NOW;
+        info->var.height        = -1;
+        info->var.width = -1;
+        info->var.accel_flags = 0;
+        info->var.vmode = FB_VMODE_NONINTERLACED;
+
+        info->fbops             = &gxfb_ops;
+        info->flags             = FBINFO_DEFAULT;
+        info->node              = -1;
+
+        info->pseudo_palette    = (void *)par + sizeof(struct geodefb_par);
+
+        info->var.grayscale     = 0;
+
+        return info;
+}
+
+static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+{
+        struct geodefb_par *par;
+        struct fb_info *info;
+        int ret;
+
+        info = gxfb_init_fbinfo(&pdev->dev);
+        if (!info)
+                return -ENOMEM;
+        par = info->par;
+
+        /* GX display controller and GX video device. */
+        par->dc_ops  = &gx_dc_ops;
+        par->vid_ops = &gx_vid_ops;
+
+        if ((ret = gxfb_map_video_memory(info, pdev)) < 0) {
+                dev_err(&pdev->dev, "failed to map frame buffer or controller registers\n");
+                goto err;
+        }
+
+        ret = fb_find_mode(&info->var, info, mode_option,
+                           gx_modedb, ARRAY_SIZE(gx_modedb), NULL, 16);
+        if (ret == 0 || ret == 4) {
+                dev_err(&pdev->dev, "could not find valid video mode\n");
+                ret = -EINVAL;
+                goto err;
+        }
+
+        /* Clear the frame buffer of garbage. */
+        memset_io(info->screen_base, 0, info->fix.smem_len);
+
+        gxfb_check_var(&info->var, info);
+        gxfb_set_par(info);
+
+        if (register_framebuffer(info) < 0) {
+                ret = -EINVAL;
+                goto err;
+        }
+        pci_set_drvdata(pdev, info);
+        printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, info->fix.id);
+        return 0;
+
+  err:
+        if (info->screen_base) {
+                iounmap(info->screen_base);
+                pci_release_region(pdev, 0);
+        }
+        if (par->vid_regs) {
+                iounmap(par->vid_regs);
+                pci_release_region(pdev, 3);
+        }
+        if (par->dc_regs) {
+                iounmap(par->dc_regs);
+                pci_release_region(pdev, 2);
+        }
+
+        pci_disable_device(pdev);
+
+        if (info)
+                framebuffer_release(info);
+        return ret;
+}
+
+static void gxfb_remove(struct pci_dev *pdev)
+{
+        struct fb_info *info = pci_get_drvdata(pdev);
+        struct geodefb_par *par = info->par;
+
+        unregister_framebuffer(info);
+
+        iounmap((void __iomem *)info->screen_base);
+        pci_release_region(pdev, 0);
+
+        iounmap(par->vid_regs);
+        pci_release_region(pdev, 3);
+
+        iounmap(par->dc_regs);
+        pci_release_region(pdev, 2);
+
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
+
+        framebuffer_release(info);
+}
+
+static struct pci_device_id gxfb_id_table[] = {
+        { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_VIDEO,
+          PCI_ANY_ID, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY << 16,
+          0xff0000, 0 },
+        { 0, }
+};
+
+MODULE_DEVICE_TABLE(pci, gxfb_id_table);
+
+static struct pci_driver gxfb_driver = {
+        .name           = "gxfb",
+        .id_table       = gxfb_id_table,
+        .probe          = gxfb_probe,
+        .remove         = gxfb_remove,
+};
+
+static int __init gxfb_init(void)
+{
+#ifndef MODULE
+        if (fb_get_options("gxfb", NULL))
+                return -ENODEV;
+#endif
+        return pci_register_driver(&gxfb_driver);
+}
+
+static void __exit gxfb_cleanup(void)
+{
+        pci_unregister_driver(&gxfb_driver);
+}
+
+module_init(gxfb_init);
+module_exit(gxfb_cleanup);
+
+module_param_string(mode, mode_option, sizeof(mode_option), 0444);
+MODULE_PARM_DESC(mode, "video mode (<x>x<y>[-<bpp>][@<refr>])");
+
+MODULE_DESCRIPTION("Framebuffer driver for the AMD Geode GX");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/geode/video_gx.c b/drivers/video/geode/video_gx.c
new file mode 100644
index 0000000000..2b2a7880ea
--- /dev/null
+++ b/drivers/video/geode/video_gx.c
@@ -0,0 +1,262 @@
+/*
+ * Geode GX video processor device.
+ *
+ *   Copyright (C) 2006 Arcom Control Systems Ltd.
+ *
+ *   Portions from AMD's original 2.4 driver:
+ *     Copyright (C) 2004 Advanced Micro Devices, Inc.
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the
+ *   Free Software Foundation; either version 2 of the License, or (at your
+ *   option) any later version.
+ */
+#include <linux/fb.h>
+#include <linux/delay.h>
+#include <asm/io.h>
+#include <asm/delay.h>
+#include <asm/msr.h>
+
+#include "geodefb.h"
+#include "video_gx.h"
+
+
+/*
+ * Tables of register settings for various DOTCLKs.
+ */
+struct gx_pll_entry {
+        long pixclock; /* ps */
+        u32 sys_rstpll_bits;
+        u32 dotpll_value;
+};
+
+#define POSTDIV3 ((u32)MSR_GLCP_SYS_RSTPLL_DOTPOSTDIV3)
+#define PREMULT2 ((u32)MSR_GLCP_SYS_RSTPLL_DOTPREMULT2)
+#define PREDIV2  ((u32)MSR_GLCP_SYS_RSTPLL_DOTPOSTDIV3)
+
+static const struct gx_pll_entry gx_pll_table_48MHz[] = {
+        { 40123, POSTDIV3,          0x00000BF2 },       /*  24.9230 */
+        { 39721, 0,                 0x00000037 },       /*  25.1750 */
+        { 35308, POSTDIV3|PREMULT2, 0x00000B1A },       /*  28.3220 */
+        { 31746, POSTDIV3,          0x000002D2 },       /*  31.5000 */
+        { 27777, POSTDIV3|PREMULT2, 0x00000FE2 },       /*  36.0000 */
+        { 26666, POSTDIV3,          0x0000057A },       /*  37.5000 */
+        { 25000, POSTDIV3,          0x0000030A },       /*  40.0000 */
+        { 22271, 0,                 0x00000063 },       /*  44.9000 */
+        { 20202, 0,                 0x0000054B },       /*  49.5000 */
+        { 20000, 0,                 0x0000026E },       /*  50.0000 */
+        { 19860, PREMULT2,          0x00000037 },       /*  50.3500 */
+        { 18518, POSTDIV3|PREMULT2, 0x00000B0D },       /*  54.0000 */
+        { 17777, 0,                 0x00000577 },       /*  56.2500 */
+        { 17733, 0,                 0x000007F7 },       /*  56.3916 */
+        { 17653, 0,                 0x0000057B },       /*  56.6444 */
+        { 16949, PREMULT2,          0x00000707 },       /*  59.0000 */
+        { 15873, POSTDIV3|PREMULT2, 0x00000B39 },       /*  63.0000 */
+        { 15384, POSTDIV3|PREMULT2, 0x00000B45 },       /*  65.0000 */
+        { 14814, POSTDIV3|PREMULT2, 0x00000FC1 },       /*  67.5000 */
+        { 14124, POSTDIV3,          0x00000561 },       /*  70.8000 */
+        { 13888, POSTDIV3,          0x000007E1 },       /*  72.0000 */
+        { 13426, PREMULT2,          0x00000F4A },       /*  74.4810 */
+        { 13333, 0,                 0x00000052 },       /*  75.0000 */
+        { 12698, 0,                 0x00000056 },       /*  78.7500 */
+        { 12500, POSTDIV3|PREMULT2, 0x00000709 },       /*  80.0000 */
+        { 11135, PREMULT2,          0x00000262 },       /*  89.8000 */
+        { 10582, 0,                 0x000002D2 },       /*  94.5000 */
+        { 10101, PREMULT2,          0x00000B4A },       /*  99.0000 */
+        { 10000, PREMULT2,          0x00000036 },       /* 100.0000 */
+        {  9259, 0,                 0x000007E2 },       /* 108.0000 */
+        {  8888, 0,                 0x000007F6 },       /* 112.5000 */
+        {  7692, POSTDIV3|PREMULT2, 0x00000FB0 },       /* 130.0000 */
+        {  7407, POSTDIV3|PREMULT2, 0x00000B50 },       /* 135.0000 */
+        {  6349, 0,                 0x00000055 },       /* 157.5000 */
+        {  6172, 0,                 0x000009C1 },       /* 162.0000 */
+        {  5787, PREMULT2,          0x0000002D },       /* 172.798  */
+        {  5698, 0,                 0x000002C1 },       /* 175.5000 */
+        {  5291, 0,                 0x000002D1 },       /* 189.0000 */
+        {  4938, 0,                 0x00000551 },       /* 202.5000 */
+        {  4357, 0,                 0x0000057D },       /* 229.5000 */
+};
+
+static const struct gx_pll_entry gx_pll_table_14MHz[] = {
+        { 39721, 0, 0x00000037 },       /*  25.1750 */
+        { 35308, 0, 0x00000B7B },       /*  28.3220 */
+        { 31746, 0, 0x000004D3 },       /*  31.5000 */
+        { 27777, 0, 0x00000BE3 },       /*  36.0000 */
+        { 26666, 0, 0x0000074F },       /*  37.5000 */
+        { 25000, 0, 0x0000050B },       /*  40.0000 */
+        { 22271, 0, 0x00000063 },       /*  44.9000 */
+        { 20202, 0, 0x0000054B },       /*  49.5000 */
+        { 20000, 0, 0x0000026E },       /*  50.0000 */
+        { 19860, 0, 0x000007C3 },       /*  50.3500 */
+        { 18518, 0, 0x000007E3 },       /*  54.0000 */
+        { 17777, 0, 0x00000577 },       /*  56.2500 */
+        { 17733, 0, 0x000002FB },       /*  56.3916 */
+        { 17653, 0, 0x0000057B },       /*  56.6444 */
+        { 16949, 0, 0x0000058B },       /*  59.0000 */
+        { 15873, 0, 0x0000095E },       /*  63.0000 */
+        { 15384, 0, 0x0000096A },       /*  65.0000 */
+        { 14814, 0, 0x00000BC2 },       /*  67.5000 */
+        { 14124, 0, 0x0000098A },       /*  70.8000 */
+        { 13888, 0, 0x00000BE2 },       /*  72.0000 */
+        { 13333, 0, 0x00000052 },       /*  75.0000 */
+        { 12698, 0, 0x00000056 },       /*  78.7500 */
+        { 12500, 0, 0x0000050A },       /*  80.0000 */
+        { 11135, 0, 0x0000078E },       /*  89.8000 */
+        { 10582, 0, 0x000002D2 },       /*  94.5000 */
+        { 10101, 0, 0x000011F6 },       /*  99.0000 */
+        { 10000, 0, 0x0000054E },       /* 100.0000 */
+        {  9259, 0, 0x000007E2 },       /* 108.0000 */
+        {  8888, 0, 0x000002FA },       /* 112.5000 */
+        {  7692, 0, 0x00000BB1 },       /* 130.0000 */
+        {  7407, 0, 0x00000975 },       /* 135.0000 */
+        {  6349, 0, 0x00000055 },       /* 157.5000 */
+        {  6172, 0, 0x000009C1 },       /* 162.0000 */
+        {  5698, 0, 0x000002C1 },       /* 175.5000 */
+        {  5291, 0, 0x00000539 },       /* 189.0000 */
+        {  4938, 0, 0x00000551 },       /* 202.5000 */
+        {  4357, 0, 0x0000057D },       /* 229.5000 */
+};
+
+static void gx_set_dclk_frequency(struct fb_info *info)
+{
+        const struct gx_pll_entry *pll_table;
+        int pll_table_len;
+        int i, best_i;
+        long min, diff;
+        u64 dotpll, sys_rstpll;
+        int timeout = 1000;
+
+        /* Rev. 1 Geode GXs use a 14 MHz reference clock instead of 48 MHz. */
+        if (cpu_data->x86_mask == 1) {
+                pll_table = gx_pll_table_14MHz;
+                pll_table_len = ARRAY_SIZE(gx_pll_table_14MHz);
+        } else {
+                pll_table = gx_pll_table_48MHz;
+                pll_table_len = ARRAY_SIZE(gx_pll_table_48MHz);
+        }
+
+        /* Search the table for the closest pixclock. */
+        best_i = 0;
+        min = abs(pll_table[0].pixclock - info->var.pixclock);
+        for (i = 1; i < pll_table_len; i++) {
+                diff = abs(pll_table[i].pixclock - info->var.pixclock);
+                if (diff < min) {
+                        min = diff;
+                        best_i = i;
+                }
+        }
+
+        rdmsrl(MSR_GLCP_SYS_RSTPLL, sys_rstpll);
+        rdmsrl(MSR_GLCP_DOTPLL, dotpll);
+
+        /* Program new M, N and P. */
+        dotpll &= 0x00000000ffffffffull;
+        dotpll |= (u64)pll_table[best_i].dotpll_value << 32;
+        dotpll |= MSR_GLCP_DOTPLL_DOTRESET;
+        dotpll &= ~MSR_GLCP_DOTPLL_BYPASS;
+
+        wrmsrl(MSR_GLCP_DOTPLL, dotpll);
+
+        /* Program dividers. */
+        sys_rstpll &= ~( MSR_GLCP_SYS_RSTPLL_DOTPREDIV2
+                         | MSR_GLCP_SYS_RSTPLL_DOTPREMULT2
+                         | MSR_GLCP_SYS_RSTPLL_DOTPOSTDIV3 );
+        sys_rstpll |= pll_table[best_i].sys_rstpll_bits;
+
+        wrmsrl(MSR_GLCP_SYS_RSTPLL, sys_rstpll);
+
+        /* Clear reset bit to start PLL. */
+        dotpll &= ~(MSR_GLCP_DOTPLL_DOTRESET);
+        wrmsrl(MSR_GLCP_DOTPLL, dotpll);
+
+        /* Wait for LOCK bit. */
+        do {
+                rdmsrl(MSR_GLCP_DOTPLL, dotpll);
+        } while (timeout-- && !(dotpll & MSR_GLCP_DOTPLL_LOCK));
+}
+
+static void gx_configure_display(struct fb_info *info)
+{
+        struct geodefb_par *par = info->par;
+        u32 dcfg, fp_pm;
+
+        dcfg = readl(par->vid_regs + GX_DCFG);
+
+        /* Clear bits from existing mode. */
+        dcfg &= ~(GX_DCFG_CRT_SYNC_SKW_MASK
+                  | GX_DCFG_CRT_HSYNC_POL   | GX_DCFG_CRT_VSYNC_POL
+                  | GX_DCFG_VSYNC_EN        | GX_DCFG_HSYNC_EN);
+
+        /* Set default sync skew.  */
+        dcfg |= GX_DCFG_CRT_SYNC_SKW_DFLT;
+
+        /* Enable hsync and vsync. */
+        dcfg |= GX_DCFG_HSYNC_EN | GX_DCFG_VSYNC_EN;
+
+        /* Sync polarities. */
+        if (info->var.sync & FB_SYNC_HOR_HIGH_ACT)
+                dcfg |= GX_DCFG_CRT_HSYNC_POL;
+        if (info->var.sync & FB_SYNC_VERT_HIGH_ACT)
+                dcfg |= GX_DCFG_CRT_VSYNC_POL;
+
+        writel(dcfg, par->vid_regs + GX_DCFG);
+
+        /* Power on flat panel. */
+        fp_pm = readl(par->vid_regs + GX_FP_PM);
+        fp_pm |= GX_FP_PM_P;
+        writel(fp_pm, par->vid_regs + GX_FP_PM);
+}
+
+static int gx_blank_display(struct fb_info *info, int blank_mode)
+{
+        struct geodefb_par *par = info->par;
+        u32 dcfg, fp_pm;
+        int blank, hsync, vsync;
+
+        /* CRT power saving modes. */
+        switch (blank_mode) {
+        case FB_BLANK_UNBLANK:
+                blank = 0; hsync = 1; vsync = 1;
+                break;
+        case FB_BLANK_NORMAL:
+                blank = 1; hsync = 1; vsync = 1;
+                break;
+        case FB_BLANK_VSYNC_SUSPEND:
+                blank = 1; hsync = 1; vsync = 0;
+                break;
+        case FB_BLANK_HSYNC_SUSPEND:
+                blank = 1; hsync = 0; vsync = 1;
+                break;
+        case FB_BLANK_POWERDOWN:
+                blank = 1; hsync = 0; vsync = 0;
+                break;
+        default:
+                return -EINVAL;
+        }
+        dcfg = readl(par->vid_regs + GX_DCFG);
+        dcfg &= ~(GX_DCFG_DAC_BL_EN
+                  | GX_DCFG_HSYNC_EN | GX_DCFG_VSYNC_EN);
+        if (!blank)
+                dcfg |= GX_DCFG_DAC_BL_EN;
+        if (hsync)
+                dcfg |= GX_DCFG_HSYNC_EN;
+        if (vsync)
+                dcfg |= GX_DCFG_VSYNC_EN;
+        writel(dcfg, par->vid_regs + GX_DCFG);
+
+        /* Power on/off flat panel. */
+        fp_pm = readl(par->vid_regs + GX_FP_PM);
+        if (blank_mode == FB_BLANK_POWERDOWN)
+                fp_pm &= ~GX_FP_PM_P;
+        else
+                fp_pm |= GX_FP_PM_P;
+        writel(fp_pm, par->vid_regs + GX_FP_PM);
+
+        return 0;
+}
+
+struct geode_vid_ops gx_vid_ops = {
+        .set_dclk          = gx_set_dclk_frequency,
+        .configure_display = gx_configure_display,
+        .blank_display     = gx_blank_display,
+};
diff --git a/drivers/video/geode/video_gx.h b/drivers/video/geode/video_gx.h
new file mode 100644
index 0000000000..2d9211f3ed
--- /dev/null
+++ b/drivers/video/geode/video_gx.h
@@ -0,0 +1,47 @@
+/*
+ * Geode GX video device
+ *
+ * Copyright (C) 2006 Arcom Control Systems Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#ifndef __VIDEO_GX_H__
+#define __VIDEO_GX_H__
+
+extern struct geode_vid_ops gx_vid_ops;
+
+/* Geode GX video processor registers */
+
+#define GX_DCFG         0x0008
+#  define GX_DCFG_CRT_EN                0x00000001
+#  define GX_DCFG_HSYNC_EN              0x00000002
+#  define GX_DCFG_VSYNC_EN              0x00000004
+#  define GX_DCFG_DAC_BL_EN             0x00000008
+#  define GX_DCFG_CRT_HSYNC_POL         0x00000100
+#  define GX_DCFG_CRT_VSYNC_POL         0x00000200
+#  define GX_DCFG_CRT_SYNC_SKW_MASK     0x0001C000
+#  define GX_DCFG_CRT_SYNC_SKW_DFLT     0x00010000
+#  define GX_DCFG_VG_CK                 0x00100000
+#  define GX_DCFG_GV_GAM                0x00200000
+#  define GX_DCFG_DAC_VREF              0x04000000
+
+/* Geode GX flat panel display control registers */
+#define GX_FP_PM 0x410
+#  define GX_FP_PM_P 0x01000000
+
+/* Geode GX clock control MSRs */
+
+#define MSR_GLCP_SYS_RSTPLL     0x4c000014
+#  define MSR_GLCP_SYS_RSTPLL_DOTPREDIV2        (0x0000000000000002ull)
+#  define MSR_GLCP_SYS_RSTPLL_DOTPREMULT2       (0x0000000000000004ull)
+#  define MSR_GLCP_SYS_RSTPLL_DOTPOSTDIV3       (0x0000000000000008ull)
+
+#define MSR_GLCP_DOTPLL         0x4c000015
+#  define MSR_GLCP_DOTPLL_DOTRESET              (0x0000000000000001ull)
+#  define MSR_GLCP_DOTPLL_BYPASS                (0x0000000000008000ull)
+#  define MSR_GLCP_DOTPLL_LOCK                  (0x0000000002000000ull)
+
+#endif /* !__VIDEO_GX_H__ */
diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c
index bebdac59d2..abd920a663 100644
--- a/drivers/video/hpfb.c
+++ b/drivers/video/hpfb.c
@@ -386,7 +386,9 @@ int __init hpfb_init(void)
         if (fb_get_options("hpfb", NULL))
                 return -ENODEV;
 
-        dio_module_init(&hpfb_driver);
+        err = dio_register_driver(&hpfb_driver);
+        if (err)
+                return err;
 
         fs = get_fs();
         set_fs(KERNEL_DS);
diff --git a/drivers/video/i810/i810-i2c.c b/drivers/video/i810/i810-i2c.c
index e3c8b5f1ca..3fe3ae1aff 100644
--- a/drivers/video/i810/i810-i2c.c
+++ b/drivers/video/i810/i810-i2c.c
@@ -210,8 +210,7 @@ int i810_probe_i2c_connector(struct fb_info *info, u8 **out_edid, int conn)
                 }
         }
 
-        if (out_edid)
-                *out_edid = edid;
+        *out_edid = edid;
 
         return (edid) ? 0 : 1;
 }
diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c
index 7db42542eb..f73c642b50 100644
--- a/drivers/video/imsttfb.c
+++ b/drivers/video/imsttfb.c
@@ -440,9 +440,9 @@ getclkMHz(struct imstt_par *par)
 static void
 setclkMHz(struct imstt_par *par, __u32 MHz)
 {
-        __u32 clk_m, clk_n, clk_p, x, stage, spilled;
+        __u32 clk_m, clk_n, x, stage, spilled;
 
-        clk_m = clk_n = clk_p = 0;
+        clk_m = clk_n = 0;
         stage = spilled = 0;
         for (;;) {
                 switch (stage) {
@@ -453,7 +453,7 @@ setclkMHz(struct imstt_par *par, __u32 MHz)
                                 clk_n++;
                                 break;
                 }
-                x = 20 * (clk_m + 1) / ((clk_n + 1) * (clk_p ? 2 * clk_p : 1));
+                x = 20 * (clk_m + 1) / (clk_n + 1);
                 if (x == MHz)
                         break;
                 if (x > MHz) {
@@ -466,7 +466,7 @@ setclkMHz(struct imstt_par *par, __u32 MHz)
 
         par->init.pclk_m = clk_m;
         par->init.pclk_n = clk_n;
-        par->init.pclk_p = clk_p;
+        par->init.pclk_p = 0;
 }
 
 static struct imstt_regvals *
@@ -1372,18 +1372,24 @@ init_imstt(struct fb_info *info)
         write_reg_le32(par->dc_regs, STGCTL, tmp & ~0x1);
         write_reg_le32(par->dc_regs, SSR, 0);
 
-        /* set default values for DAC registers */ 
+        /* set default values for DAC registers */
         if (par->ramdac == IBM) {
-                par->cmap_regs[PPMASK] = 0xff;  eieio();
-                par->cmap_regs[PIDXHI] = 0;     eieio();
-                for (i = 0; i < sizeof(ibm_initregs) / sizeof(*ibm_initregs); i++) {
-                        par->cmap_regs[PIDXLO] = ibm_initregs[i].addr;  eieio();
-                        par->cmap_regs[PIDXDATA] = ibm_initregs[i].value;       eieio();
+                par->cmap_regs[PPMASK] = 0xff;
+                eieio();
+                par->cmap_regs[PIDXHI] = 0;
+                eieio();
+                for (i = 0; i < ARRAY_SIZE(ibm_initregs); i++) {
+                        par->cmap_regs[PIDXLO] = ibm_initregs[i].addr;
+                        eieio();
+                        par->cmap_regs[PIDXDATA] = ibm_initregs[i].value;
+                        eieio();
                 }
         } else {
-                for (i = 0; i < sizeof(tvp_initregs) / sizeof(*tvp_initregs); i++) {
-                        par->cmap_regs[TVPADDRW] = tvp_initregs[i].addr;        eieio();
-                        par->cmap_regs[TVPIDATA] = tvp_initregs[i].value;       eieio();
+                for (i = 0; i < ARRAY_SIZE(tvp_initregs); i++) {
+                        par->cmap_regs[TVPADDRW] = tvp_initregs[i].addr;
+                        eieio();
+                        par->cmap_regs[TVPIDATA] = tvp_initregs[i].value;
+                        eieio();
                 }
         }
 
diff --git a/drivers/video/macmodes.c b/drivers/video/macmodes.c
index 2fc71081f7..c0385c6f7d 100644
--- a/drivers/video/macmodes.c
+++ b/drivers/video/macmodes.c
@@ -380,7 +380,7 @@ int __init mac_find_mode(struct fb_var_screeninfo *var, struct fb_info *info,
     if (mode_option && !strncmp(mode_option, "mac", 3)) {
         mode_option += 3;
         db = mac_modedb;
-        dbsize = sizeof(mac_modedb)/sizeof(*mac_modedb);
+        dbsize = ARRAY_SIZE(mac_modedb);
     }
     return fb_find_mode(var, info, mode_option, db, dbsize,
                         &mac_modedb[DEFAULT_MODEDB_INDEX], default_bpp);
diff --git a/drivers/video/matrox/matroxfb_DAC1064.c b/drivers/video/matrox/matroxfb_DAC1064.c
index 0fbd9b5149..a456e67a5b 100644
--- a/drivers/video/matrox/matroxfb_DAC1064.c
+++ b/drivers/video/matrox/matroxfb_DAC1064.c
@@ -12,7 +12,6 @@
  *
  */
 
-/* make checkconfig does not walk through include tree :-( */
 #include <linux/config.h>
 
 #include "matroxfb_DAC1064.h"
diff --git a/drivers/video/matrox/matroxfb_DAC1064.h b/drivers/video/matrox/matroxfb_DAC1064.h
index a6a4701272..2e7238aa24 100644
--- a/drivers/video/matrox/matroxfb_DAC1064.h
+++ b/drivers/video/matrox/matroxfb_DAC1064.h
@@ -1,7 +1,6 @@
 #ifndef __MATROXFB_DAC1064_H__
 #define __MATROXFB_DAC1064_H__
 
-/* make checkconfig does not walk through include tree */
 #include <linux/config.h>
 
 #include "matroxfb_base.h"
diff --git a/drivers/video/matrox/matroxfb_Ti3026.c b/drivers/video/matrox/matroxfb_Ti3026.c
index 537ade5d8b..23ebad0a12 100644
--- a/drivers/video/matrox/matroxfb_Ti3026.c
+++ b/drivers/video/matrox/matroxfb_Ti3026.c
@@ -78,7 +78,6 @@
  *
  */
 
-/* make checkconfig does not verify included files... */
 #include <linux/config.h>
 
 #include "matroxfb_Ti3026.h"
diff --git a/drivers/video/matrox/matroxfb_Ti3026.h b/drivers/video/matrox/matroxfb_Ti3026.h
index 541933d7e4..536e5f69de 100644
--- a/drivers/video/matrox/matroxfb_Ti3026.h
+++ b/drivers/video/matrox/matroxfb_Ti3026.h
@@ -1,7 +1,6 @@
 #ifndef __MATROXFB_TI3026_H__
 #define __MATROXFB_TI3026_H__
 
-/* make checkconfig does not walk through whole include tree */
 #include <linux/config.h>
 
 #include "matroxfb_base.h"
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index 4055ff6f5a..23c1827b2d 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -99,7 +99,6 @@
  *
  */
 
-/* make checkconfig does not check included files... */
 #include <linux/config.h>
 #include <linux/version.h>
 
@@ -116,6 +115,7 @@
 #include <asm/uaccess.h>
 
 #ifdef CONFIG_PPC_PMAC
+#include <asm/machdep.h>
 unsigned char nvram_read_byte(int);
 static int default_vmode = VMODE_NVRAM;
 static int default_cmode = CMODE_NVRAM;
@@ -1834,7 +1834,7 @@ static int initMatrox2(WPMINFO struct board* b){
         /* FIXME: Where to move this?! */
 #if defined(CONFIG_PPC_PMAC)
 #ifndef MODULE
-        if (_machine == _MACH_Pmac) {
+        if (machine_is(powermac)) {
                 struct fb_var_screeninfo var;
                 if (default_vmode <= 0 || default_vmode > VMODE_MAX)
                         default_vmode = VMODE_640_480_60;
diff --git a/drivers/video/matrox/matroxfb_g450.c b/drivers/video/matrox/matroxfb_g450.c
index c122d8743d..4d610b405d 100644
--- a/drivers/video/matrox/matroxfb_g450.c
+++ b/drivers/video/matrox/matroxfb_g450.c
@@ -59,7 +59,7 @@ static const struct mctl g450_controls[] =
         }, offsetof(struct matrox_fb_info, altout.tvo_params.testout) },
 };
 
-#define G450CTRLS (sizeof(g450_controls)/sizeof(g450_controls[0]))
+#define G450CTRLS ARRAY_SIZE(g450_controls)
 
 /* Return: positive number: id found
            -EINVAL:         id not found, return failure
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index 6019710dc2..5d29a26b8c 100644
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@@ -89,12 +89,12 @@ static const struct mctl maven_controls[] =
         }, offsetof(struct matrox_fb_info, altout.tvo_params.hue) },
         { { V4L2_CID_GAMMA, V4L2_CTRL_TYPE_INTEGER,
           "gamma",
-          0, sizeof(maven_gamma)/sizeof(maven_gamma[0])-1, 1, 3,
+          0, ARRAY_SIZE(maven_gamma) - 1, 1, 3,
           0,
         }, offsetof(struct matrox_fb_info, altout.tvo_params.gamma) },
         { { MATROXFB_CID_TESTOUT, V4L2_CTRL_TYPE_BOOLEAN,
           "test output",
-          0, 1, 1, 0, 
+          0, 1, 1, 0,
           0,
         }, offsetof(struct matrox_fb_info, altout.tvo_params.testout) },
         { { MATROXFB_CID_DEFLICKER, V4L2_CTRL_TYPE_INTEGER,
@@ -105,7 +105,7 @@ static const struct mctl maven_controls[] =
 
 };
 
-#define MAVCTRLS (sizeof(maven_controls)/sizeof(maven_controls[0]))
+#define MAVCTRLS ARRAY_SIZE(maven_controls)
 
 /* Return: positive number: id found
            -EINVAL:         id not found, return failure
@@ -129,7 +129,7 @@ static int get_ctrl_id(__u32 v4l2_id) {
 
 struct maven_data {
         struct matrox_fb_info*          primary_head;
-        struct i2c_client*              client;
+        struct i2c_client               client;
         int                             version;
 };
 
@@ -970,7 +970,7 @@ static inline int maven_compute_timming(struct maven_data* md,
 
 static int maven_program_timming(struct maven_data* md,
                 const struct mavenregs* m) {
-        struct i2c_client* c = md->client;
+        struct i2c_client* c = &md->client;
 
         if (m->mode == MATROXFB_OUTPUT_MODE_MONITOR) {
                 LR(0x80);
@@ -1007,7 +1007,7 @@ static int maven_program_timming(struct maven_data* md,
 }
 
 static inline int maven_resync(struct maven_data* md) {
-        struct i2c_client* c = md->client;
+        struct i2c_client* c = &md->client;
         maven_set_reg(c, 0x95, 0x20);   /* start whole thing */
         return 0;
 }
@@ -1065,48 +1065,48 @@ static int maven_set_control (struct maven_data* md,
                   maven_compute_bwlevel(md, &blacklevel, &whitelevel);
                   blacklevel = (blacklevel >> 2) | ((blacklevel & 3) << 8);
                   whitelevel = (whitelevel >> 2) | ((whitelevel & 3) << 8);
-                  maven_set_reg_pair(md->client, 0x0e, blacklevel);
-                  maven_set_reg_pair(md->client, 0x1e, whitelevel);
+                  maven_set_reg_pair(&md->client, 0x0e, blacklevel);
+                  maven_set_reg_pair(&md->client, 0x1e, whitelevel);
                 }
                 break;
                 case V4L2_CID_SATURATION:
                 {
-                  maven_set_reg(md->client, 0x20, p->value);
-                  maven_set_reg(md->client, 0x22, p->value);
+                  maven_set_reg(&md->client, 0x20, p->value);
+                  maven_set_reg(&md->client, 0x22, p->value);
                 }
                 break;
                 case V4L2_CID_HUE:
                 {
-                  maven_set_reg(md->client, 0x25, p->value);
+                  maven_set_reg(&md->client, 0x25, p->value);
                 }
                 break;
                 case V4L2_CID_GAMMA:
                 {
                   const struct maven_gamma* g;
                   g = maven_compute_gamma(md);
-                  maven_set_reg(md->client, 0x83, g->reg83);
-                  maven_set_reg(md->client, 0x84, g->reg84);
-                  maven_set_reg(md->client, 0x85, g->reg85);
-                  maven_set_reg(md->client, 0x86, g->reg86);
-                  maven_set_reg(md->client, 0x87, g->reg87);
-                  maven_set_reg(md->client, 0x88, g->reg88);
-                  maven_set_reg(md->client, 0x89, g->reg89);
-                  maven_set_reg(md->client, 0x8a, g->reg8a);
-                  maven_set_reg(md->client, 0x8b, g->reg8b);
+                  maven_set_reg(&md->client, 0x83, g->reg83);
+                  maven_set_reg(&md->client, 0x84, g->reg84);
+                  maven_set_reg(&md->client, 0x85, g->reg85);
+                  maven_set_reg(&md->client, 0x86, g->reg86);
+                  maven_set_reg(&md->client, 0x87, g->reg87);
+                  maven_set_reg(&md->client, 0x88, g->reg88);
+                  maven_set_reg(&md->client, 0x89, g->reg89);
+                  maven_set_reg(&md->client, 0x8a, g->reg8a);
+                  maven_set_reg(&md->client, 0x8b, g->reg8b);
                 }
                 break;
                 case MATROXFB_CID_TESTOUT:
                 {
                         unsigned char val 
-                          = maven_get_reg (md->client,0x8d);
+                          = maven_get_reg(&md->client,0x8d);
                         if (p->value) val |= 0x10;
                         else          val &= ~0x10;
-                        maven_set_reg (md->client, 0x8d, val);
+                        maven_set_reg(&md->client, 0x8d, val);
                 }
                 break;
                 case MATROXFB_CID_DEFLICKER:
                 {
-                  maven_set_reg(md->client, 0x93, maven_compute_deflicker(md));
+                  maven_set_reg(&md->client, 0x93, maven_compute_deflicker(md));
                 }
                 break;
         }
@@ -1185,7 +1185,6 @@ static int maven_init_client(struct i2c_client* clnt) {
         MINFO_FROM(container_of(clnt->adapter, struct i2c_bit_adapter, adapter)->minfo);
 
         md->primary_head = MINFO;
-        md->client = clnt;
         down_write(&ACCESS_FBINFO(altout.lock));
         ACCESS_FBINFO(outputs[1]).output = &maven_altout;
         ACCESS_FBINFO(outputs[1]).src = ACCESS_FBINFO(outputs[1]).default_src;
@@ -1243,19 +1242,17 @@ static int maven_detect_client(struct i2c_adapter* adapter, int address, int kin
                                               I2C_FUNC_SMBUS_BYTE_DATA |
                                               I2C_FUNC_PROTOCOL_MANGLING))
                 goto ERROR0;
-        if (!(new_client = (struct i2c_client*)kmalloc(sizeof(*new_client) + sizeof(*data),
-                        GFP_KERNEL))) {
+        if (!(data = kzalloc(sizeof(*data), GFP_KERNEL))) {
                 err = -ENOMEM;
                 goto ERROR0;
         }
-        memset(new_client, 0, sizeof(*new_client) + sizeof(*data));
-        data = (struct maven_data*)(new_client + 1);
+        new_client = &data->client;
         i2c_set_clientdata(new_client, data);
         new_client->addr = address;
         new_client->adapter = adapter;
         new_client->driver = &maven_driver;
         new_client->flags = 0;
-        strcpy(new_client->name, "maven client");
+        strlcpy(new_client->name, "maven", I2C_NAME_SIZE);
         if ((err = i2c_attach_client(new_client)))
                 goto ERROR3;
         err = maven_init_client(new_client);
@@ -1279,12 +1276,10 @@ static int maven_attach_adapter(struct i2c_adapter* adapter) {
 static int maven_detach_client(struct i2c_client* client) {
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                printk(KERN_ERR "maven: Cannot deregister client\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
         maven_shutdown_client(client);
-        kfree(client);
+        kfree(i2c_get_clientdata(client));
         return 0;
 }
 
@@ -1297,20 +1292,13 @@ static struct i2c_driver maven_driver={
         .detach_client  = maven_detach_client,
 };
 
-/* ************************** */
-
-static int matroxfb_maven_init(void) {
-        int err;
-
-        err = i2c_add_driver(&maven_driver);
-        if (err) {
-                printk(KERN_ERR "maven: Maven driver failed to register (%d).\n", err);
-                return err;
-        }
-        return 0;
+static int __init matroxfb_maven_init(void)
+{
+        return i2c_add_driver(&maven_driver);
 }
 
-static void matroxfb_maven_exit(void) {
+static void __exit matroxfb_maven_exit(void)
+{
         i2c_del_driver(&maven_driver);
 }
 
diff --git a/drivers/video/matrox/matroxfb_misc.c b/drivers/video/matrox/matroxfb_misc.c
index 455a46ce84..263d801ef7 100644
--- a/drivers/video/matrox/matroxfb_misc.c
+++ b/drivers/video/matrox/matroxfb_misc.c
@@ -84,7 +84,6 @@
  *
  */
 
-/* make checkconfig does not check includes for this... */
 #include <linux/config.h>
 
 #include "matroxfb_misc.h"
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 1da2f84bdc..26a1c618a2 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -183,6 +183,10 @@ static const struct fb_videomode modedb[] = {
         NULL, 75, 1600, 1200, 4938, 304, 64, 46, 1, 192, 3,
         FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
     }, {
+        /* 1680x1050 @ 60 Hz, 65.191 kHz hsync */
+        NULL, 60, 1680, 1050, 6848, 280, 104, 30, 3, 176, 6,
+        FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
+    }, {
         /* 1600x1200 @ 85 Hz, 105.77 kHz hsync */
         NULL, 85, 1600, 1200, 4545, 272, 16, 37, 4, 192, 3,
         FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
@@ -496,7 +500,7 @@ int fb_find_mode(struct fb_var_screeninfo *var,
     /* Set up defaults */
     if (!db) {
         db = modedb;
-        dbsize = sizeof(modedb)/sizeof(*modedb);
+        dbsize = ARRAY_SIZE(modedb);
     }
     if (!default_mode)
         default_mode = &modedb[DEFAULT_MODEDB_INDEX];
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c
index b961d5601b..24b12f71d5 100644
--- a/drivers/video/neofb.c
+++ b/drivers/video/neofb.c
@@ -165,20 +165,20 @@ static int neoFindMode(int xres, int yres, int depth)
 
         switch (depth) {
         case 8:
-                size = sizeof(bios8) / sizeof(biosMode);
+                size = ARRAY_SIZE(bios8);
                 mode = bios8;
                 break;
         case 16:
-                size = sizeof(bios16) / sizeof(biosMode);
+                size = ARRAY_SIZE(bios16);
                 mode = bios16;
                 break;
         case 24:
-                size = sizeof(bios24) / sizeof(biosMode);
+                size = ARRAY_SIZE(bios24);
                 mode = bios24;
                 break;
 #ifdef NO_32BIT_SUPPORT_YET
         case 32:
-                size = sizeof(bios32) / sizeof(biosMode);
+                size = ARRAY_SIZE(bios32);
                 mode = bios32;
                 break;
 #endif
diff --git a/drivers/video/nvidia/nv_accel.c b/drivers/video/nvidia/nv_accel.c
index f377a29ec9..4aefb8f416 100644
--- a/drivers/video/nvidia/nv_accel.c
+++ b/drivers/video/nvidia/nv_accel.c
@@ -300,6 +300,9 @@ int nvidiafb_sync(struct fb_info *info)
 {
         struct nvidia_par *par = info->par;
 
+        if (info->state != FBINFO_STATE_RUNNING)
+                return 0;
+
         if (!par->lockup)
                 NVFlush(par);
 
@@ -313,6 +316,9 @@ void nvidiafb_copyarea(struct fb_info *info, const struct fb_copyarea *region)
 {
         struct nvidia_par *par = info->par;
 
+        if (info->state != FBINFO_STATE_RUNNING)
+                return;
+
         if (par->lockup)
                 return cfb_copyarea(info, region);
 
@@ -329,6 +335,9 @@ void nvidiafb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
         struct nvidia_par *par = info->par;
         u32 color;
 
+        if (info->state != FBINFO_STATE_RUNNING)
+                return;
+
         if (par->lockup)
                 return cfb_fillrect(info, rect);
 
@@ -412,6 +421,9 @@ void nvidiafb_imageblit(struct fb_info *info, const struct fb_image *image)
 {
         struct nvidia_par *par = info->par;
 
+        if (info->state != FBINFO_STATE_RUNNING)
+                return;
+
         if (image->depth == 1 && !par->lockup)
                 nvidiafb_mono_color_expand(info, image);
         else
diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c
index bd9eca05e1..1edb1c432b 100644
--- a/drivers/video/nvidia/nv_i2c.c
+++ b/drivers/video/nvidia/nv_i2c.c
@@ -218,8 +218,7 @@ int nvidia_probe_i2c_connector(struct fb_info *info, int conn, u8 **out_edid)
                 }
         }
 
-        if (out_edid)
-                *out_edid = edid;
+        *out_edid = edid;
 
         return (edid) ? 0 : 1;
 }
diff --git a/drivers/video/nvidia/nv_type.h b/drivers/video/nvidia/nv_type.h
index e4a5b1da71..acdc266934 100644
--- a/drivers/video/nvidia/nv_type.h
+++ b/drivers/video/nvidia/nv_type.h
@@ -129,6 +129,7 @@ struct nvidia_par {
         int fpHeight;
         int PanelTweak;
         int paneltweak;
+        int pm_state;
         u32 crtcSync_read;
         u32 fpSyncs;
         u32 dmaPut;
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index a7c4e5e8ea..093ab9977c 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -21,6 +21,7 @@
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/pci.h>
+#include <linux/console.h>
 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
 #endif
@@ -29,6 +30,7 @@
 #include <asm/pci-bridge.h>
 #endif
 #ifdef CONFIG_PMAC_BACKLIGHT
+#include <asm/machdep.h>
 #include <asm/backlight.h>
 #endif
 
@@ -296,6 +298,8 @@ static struct pci_device_id nvidiafb_pci_tbl[] = {
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         {PCI_VENDOR_ID_NVIDIA, PCIE_DEVICE_ID_NVIDIA_GEFORCE_6800_GT,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_VENDOR_ID_NVIDIA, PCIE_DEVICE_ID_NVIDIA_QUADRO_NVS280,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         {PCI_VENDOR_ID_NVIDIA, 0x0252,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         {PCI_VENDOR_ID_NVIDIA, 0x0313,
@@ -615,6 +619,30 @@ static int nvidia_panel_tweak(struct nvidia_par *par,
    return tweak;
 }
 
+static void nvidia_vga_protect(struct nvidia_par *par, int on)
+{
+        unsigned char tmp;
+
+        if (on) {
+                /*
+                 * Turn off screen and disable sequencer.
+                 */
+                tmp = NVReadSeq(par, 0x01);
+
+                NVWriteSeq(par, 0x00, 0x01);            /* Synchronous Reset */
+                NVWriteSeq(par, 0x01, tmp | 0x20);      /* disable the display */
+        } else {
+                /*
+                 * Reenable sequencer, then turn on screen.
+                 */
+
+                tmp = NVReadSeq(par, 0x01);
+
+                NVWriteSeq(par, 0x01, tmp & ~0x20);     /* reenable display */
+                NVWriteSeq(par, 0x00, 0x03);            /* End Reset */
+        }
+}
+
 static void nvidia_save_vga(struct nvidia_par *par,
                             struct _riva_hw_state *state)
 {
@@ -643,9 +671,9 @@ static void nvidia_save_vga(struct nvidia_par *par,
 
 #undef DUMP_REG
 
-static void nvidia_write_regs(struct nvidia_par *par)
+static void nvidia_write_regs(struct nvidia_par *par,
+                              struct _riva_hw_state *state)
 {
-        struct _riva_hw_state *state = &par->ModeReg;
         int i;
 
         NVTRACE_ENTER();
@@ -694,32 +722,6 @@ static void nvidia_write_regs(struct nvidia_par *par)
         NVTRACE_LEAVE();
 }
 
-static void nvidia_vga_protect(struct nvidia_par *par, int on)
-{
-        unsigned char tmp;
-
-        if (on) {
-                /*
-                 * Turn off screen and disable sequencer.
-                 */
-                tmp = NVReadSeq(par, 0x01);
-
-                NVWriteSeq(par, 0x00, 0x01);            /* Synchronous Reset */
-                NVWriteSeq(par, 0x01, tmp | 0x20);      /* disable the display */
-        } else {
-                /*
-                 * Reenable sequencer, then turn on screen.
-                 */
-
-                tmp = NVReadSeq(par, 0x01);
-
-                NVWriteSeq(par, 0x01, tmp & ~0x20);     /* reenable display */
-                NVWriteSeq(par, 0x00, 0x03);            /* End Reset */
-        }
-}
-
-
-
 static int nvidia_calc_regs(struct fb_info *info)
 {
         struct nvidia_par *par = info->par;
@@ -1068,7 +1070,8 @@ static int nvidiafb_set_par(struct fb_info *info)
 
         nvidia_vga_protect(par, 1);
 
-        nvidia_write_regs(par);
+        nvidia_write_regs(par, &par->ModeReg);
+        NVSetStartAddress(par, 0);
 
 #if defined (__BIG_ENDIAN)
         /* turn on LFB swapping */
@@ -1353,7 +1356,7 @@ static int nvidiafb_blank(int blank, struct fb_info *info)
         NVWriteCrtc(par, 0x1a, vesa);
 
 #ifdef CONFIG_PMAC_BACKLIGHT
-        if (par->FlatPanel && _machine == _MACH_Pmac) {
+        if (par->FlatPanel && machine_is(powermac)) {
                 set_backlight_enable(!blank);
         }
 #endif
@@ -1377,6 +1380,57 @@ static struct fb_ops nvidia_fb_ops = {
         .fb_sync        = nvidiafb_sync,
 };
 
+#ifdef CONFIG_PM
+static int nvidiafb_suspend(struct pci_dev *dev, pm_message_t state)
+{
+        struct fb_info *info = pci_get_drvdata(dev);
+        struct nvidia_par *par = info->par;
+
+        acquire_console_sem();
+        par->pm_state = state.event;
+
+        if (state.event == PM_EVENT_FREEZE) {
+                dev->dev.power.power_state = state;
+        } else {
+                fb_set_suspend(info, 1);
+                nvidiafb_blank(FB_BLANK_POWERDOWN, info);
+                nvidia_write_regs(par, &par->SavedReg);
+                pci_save_state(dev);
+                pci_disable_device(dev);
+                pci_set_power_state(dev, pci_choose_state(dev, state));
+        }
+
+        release_console_sem();
+        return 0;
+}
+
+static int nvidiafb_resume(struct pci_dev *dev)
+{
+        struct fb_info *info = pci_get_drvdata(dev);
+        struct nvidia_par *par = info->par;
+
+        acquire_console_sem();
+        pci_set_power_state(dev, PCI_D0);
+
+        if (par->pm_state != PM_EVENT_FREEZE) {
+                pci_restore_state(dev);
+                pci_enable_device(dev);
+                pci_set_master(dev);
+        }
+
+        par->pm_state = PM_EVENT_ON;
+        nvidiafb_set_par(info);
+        fb_set_suspend (info, 0);
+        nvidiafb_blank(FB_BLANK_UNBLANK, info);
+
+        release_console_sem();
+        return 0;
+}
+#else
+#define nvidiafb_suspend NULL
+#define nvidiafb_resume NULL
+#endif
+
 static int __devinit nvidia_set_fbinfo(struct fb_info *info)
 {
         struct fb_monspecs *specs = &info->monspecs;
@@ -1688,7 +1742,7 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,
                info->fix.id,
                par->FbMapSize / (1024 * 1024), info->fix.smem_start);
 #ifdef CONFIG_PMAC_BACKLIGHT
-        if (par->FlatPanel && _machine == _MACH_Pmac)
+        if (par->FlatPanel && machine_is(powermac))
                 register_backlight_controller(&nvidia_backlight_controller,
                                               par, "mnca");
 #endif
@@ -1720,8 +1774,6 @@ static void __exit nvidiafb_remove(struct pci_dev *pd)
         struct nvidia_par *par = info->par;
 
         NVTRACE_ENTER();
-        if (!info)
-                return;
 
         unregister_framebuffer(info);
 #ifdef CONFIG_MTRR
@@ -1798,8 +1850,10 @@ static int __devinit nvidiafb_setup(char *options)
 static struct pci_driver nvidiafb_driver = {
         .name = "nvidiafb",
         .id_table = nvidiafb_pci_tbl,
-        .probe = nvidiafb_probe,
-        .remove = __exit_p(nvidiafb_remove),
+        .probe    = nvidiafb_probe,
+        .suspend  = nvidiafb_suspend,
+        .resume   = nvidiafb_resume,
+        .remove   = __exit_p(nvidiafb_remove),
 };
 
 /* ------------------------------------------------------------------------- *
diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c
index 0e78ddc815..52c18a35fb 100644
--- a/drivers/video/pm3fb.c
+++ b/drivers/video/pm3fb.c
@@ -3532,26 +3532,26 @@ int __init pm3fb_init(void)
 MODULE_AUTHOR("Romain Dolbeau");
 MODULE_DESCRIPTION("Permedia3 framebuffer device driver");
 static char *mode[PM3_MAX_BOARD];
-MODULE_PARM(mode,PM3_MAX_BOARD_MODULE_ARRAY_STRING);
+module_param_array(mode, charp, NULL, 0);
 MODULE_PARM_DESC(mode,"video mode");
-MODULE_PARM(disable,PM3_MAX_BOARD_MODULE_ARRAY_SHORT);
+module_param_array(disable, short, NULL, 0);
 MODULE_PARM_DESC(disable,"disable board");
 static short off[PM3_MAX_BOARD];
-MODULE_PARM(off,PM3_MAX_BOARD_MODULE_ARRAY_SHORT);
+module_param_array(off, short, NULL, 0);
 MODULE_PARM_DESC(off,"disable board");
 static char *pciid[PM3_MAX_BOARD];
-MODULE_PARM(pciid,PM3_MAX_BOARD_MODULE_ARRAY_STRING);
+module_param_array(pciid, charp, NULL, 0);
 MODULE_PARM_DESC(pciid,"board PCI Id");
-MODULE_PARM(noaccel,PM3_MAX_BOARD_MODULE_ARRAY_SHORT);
+module_param_array(noaccel, short, NULL, 0);
 MODULE_PARM_DESC(noaccel,"disable accel");
 static char *font[PM3_MAX_BOARD];
-MODULE_PARM(font,PM3_MAX_BOARD_MODULE_ARRAY_STRING);
+module_param_array(font, charp, NULL, 0);
 MODULE_PARM_DESC(font,"choose font");
-MODULE_PARM(depth,PM3_MAX_BOARD_MODULE_ARRAY_SHORT);
+module_param(depth, short, NULL, 0);
 MODULE_PARM_DESC(depth,"boot-time depth");
-MODULE_PARM(printtimings, "h");
+module_param(printtimings, short, NULL, 0);
 MODULE_PARM_DESC(printtimings, "print the memory timings of the card(s)");
-MODULE_PARM(forcesize, PM3_MAX_BOARD_MODULE_ARRAY_SHORT);
+module_param(forcesize, short, NULL, 0);
 MODULE_PARM_DESC(forcesize, "force specified memory size");
 /*
 MODULE_SUPPORTED_DEVICE("Permedia3 PCI boards")
diff --git a/drivers/video/pmagb-b-fb.c b/drivers/video/pmagb-b-fb.c
index eeeac924b5..73e2d7d166 100644
--- a/drivers/video/pmagb-b-fb.c
+++ b/drivers/video/pmagb-b-fb.c
@@ -228,7 +228,7 @@ static void __init pmagbbfb_osc_setup(struct fb_info *info)
 
         freq1 = (par->osc0 * count1 + count0 / 2) / count0;
         par->osc1 = freq1;
-        for (i = 0; i < sizeof(pmagbbfb_freqs) / sizeof(*pmagbbfb_freqs); i++)
+        for (i = 0; i < ARRAY_SIZE(pmagbbfb_freqs); i++)
                 if (freq1 >= pmagbbfb_freqs[i] -
                              (pmagbbfb_freqs[i] + 128) / 256 &&
                     freq1 <= pmagbbfb_freqs[i] +
diff --git a/drivers/video/radeonfb.c b/drivers/video/radeonfb.c
index db9fb9074d..afb6c2ead5 100644
--- a/drivers/video/radeonfb.c
+++ b/drivers/video/radeonfb.c
@@ -759,7 +759,7 @@ static void __iomem *radeon_find_rom(struct radeonfb_info *rinfo)
                 rom = rom_base;
         
                 for (i = 0; (i < 512) && (stage != 4); i++) {
-                    for(j = 0;j < sizeof(radeon_sig)/sizeof(char *);j++) {
+                    for (j = 0; j < ARRAY_SIZE(radeon_sig); j++) {
                         if (radeon_sig[j][0] == *rom)
                                 if (strncmp(radeon_sig[j], rom,
                                             strlen(radeon_sig[j])) == 0) {
@@ -1596,7 +1596,7 @@ static int radeonfb_blank (int blank, struct fb_info *info)
                 return 0;
                 
 #ifdef CONFIG_PMAC_BACKLIGHT
-        if (rinfo->dviDisp_type == MT_LCD && _machine == _MACH_Pmac) {
+        if (rinfo->dviDisp_type == MT_LCD && machine_is(powermac)) {
                 set_backlight_enable(!blank);
                 return 0;
         }
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 6c19ab6afb..3e9308f0f1 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -49,6 +49,7 @@
 #include <asm/pci-bridge.h>
 #endif
 #ifdef CONFIG_PMAC_BACKLIGHT
+#include <asm/machdep.h>
 #include <asm/backlight.h>
 #endif
 
@@ -1247,7 +1248,7 @@ static int rivafb_blank(int blank, struct fb_info *info)
         CRTCout(par, 0x1a, vesa);
 
 #ifdef CONFIG_PMAC_BACKLIGHT
-        if ( par->FlatPanel && _machine == _MACH_Pmac) {
+        if ( par->FlatPanel && machine_is(powermac)) {
                 set_backlight_enable(!blank);
         }
 #endif
@@ -2037,9 +2038,9 @@ static int __devinit rivafb_probe(struct pci_dev *pd,
                 info->fix.smem_len / (1024 * 1024),
                 info->fix.smem_start);
 #ifdef CONFIG_PMAC_BACKLIGHT
-        if (default_par->FlatPanel && _machine == _MACH_Pmac)
-        register_backlight_controller(&riva_backlight_controller,
-                                                default_par, "mnca");
+        if (default_par->FlatPanel && machine_is(powermac))
+                register_backlight_controller(&riva_backlight_controller,
+                                              default_par, "mnca");
 #endif
         NVTRACE_LEAVE();
         return 0;
@@ -2072,8 +2073,6 @@ static void __exit rivafb_remove(struct pci_dev *pd)
         struct riva_par *par = info->par;
         
         NVTRACE_ENTER();
-        if (!info)
-                return;
 
 #ifdef CONFIG_FB_RIVA_I2C
         riva_delete_i2c_busses(par);
diff --git a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c
index 00719a9147..21debed863 100644
--- a/drivers/video/savage/savagefb-i2c.c
+++ b/drivers/video/savage/savagefb-i2c.c
@@ -273,8 +273,7 @@ int savagefb_probe_i2c_connector(struct fb_info *info, u8 **out_edid)
                 }
         }
 
-        if (out_edid)
-                *out_edid = edid;
+        *out_edid = edid;
 
         return (edid) ? 0 : 1;
 }
diff --git a/drivers/video/sis/init301.c b/drivers/video/sis/init301.c
index 2d88f90817..c3e070a6ef 100644
--- a/drivers/video/sis/init301.c
+++ b/drivers/video/sis/init301.c
@@ -8564,11 +8564,9 @@ SiS_ChrontelDoSomething3(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
 static void
 SiS_ChrontelDoSomething2(struct SiS_Private *SiS_Pr)
 {
-     unsigned short temp,tempcl,tempch;
+     unsigned short temp;
 
      SiS_LongDelay(SiS_Pr, 1);
-     tempcl = 3;
-     tempch = 0;
 
      do {
        temp = SiS_GetCH701x(SiS_Pr,0x66);
@@ -8582,13 +8580,6 @@ SiS_ChrontelDoSomething2(struct SiS_Private *SiS_Pr)
 
        SiS_SetCH701xForLCD(SiS_Pr);
 
-       if(tempcl == 0) {
-           if(tempch == 3) break;
-           SiS_ChrontelResetDB(SiS_Pr);
-           tempcl = 3;
-           tempch++;
-       }
-       tempcl--;
        temp = SiS_GetCH701x(SiS_Pr,0x76);
        temp &= 0xfb;  /* Reset PLL */
        SiS_SetCH701x(SiS_Pr,0x76,temp);
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c
index 99921df354..c44de90ca1 100644
--- a/drivers/video/sstfb.c
+++ b/drivers/video/sstfb.c
@@ -32,7 +32,7 @@
 
 -TODO: at one time or another test that the mode is acceptable by the monitor
 -ASK: Can I choose different ordering for the color bitfields (rgba argb ...)
-      wich one should i use ? is there any preferred one ? It seems ARGB is
+      which one should i use ? is there any preferred one ? It seems ARGB is
       the one ...
 -TODO: in  set_var check the validity of timings (hsync vsync)...
 -TODO: check and recheck the use of sst_wait_idle : we don't flush the fifo via
@@ -1194,10 +1194,11 @@ static struct dac_switch dacs[] __devinitdata = {
 static int __devinit sst_detect_dactype(struct fb_info *info, struct sstfb_par *par)
 {
         int i, ret = 0;
-        
-        for (i=0; i<sizeof(dacs)/sizeof(dacs[0]); i++) {
+
+        for (i = 0; i < ARRAY_SIZE(dacs); i++) {
                 ret = dacs[i].detect(info);
-                if (ret) break;
+                if (ret)
+                        break;
         }
         if (!ret)
                 return 0;
@@ -1604,8 +1605,8 @@ static int sstfb_dump_regs(struct fb_info *info)
                 {FBZMODE,"fbzmode"},
         };
 
-        const int pci_s = sizeof(pci_regs)/sizeof(pci_regs[0]);
-        const int sst_s = sizeof(sst_regs)/sizeof(sst_regs[0]);
+        const int pci_s = ARRAY_SIZE(pci_regs);
+        const int sst_s = ARRAY_SIZE(sst_regs);
         struct sstfb_par *par = info->par;
         struct pci_dev *dev = par->dev;
         u32 pci_res[pci_s];
diff --git a/drivers/video/virgefb.c b/drivers/video/virgefb.c
index ed78747487..5ea2345dab 100644
--- a/drivers/video/virgefb.c
+++ b/drivers/video/virgefb.c
@@ -616,8 +616,7 @@ static struct {
 #endif
 };
 
-#define arraysize(x)    (sizeof(x)/sizeof(*(x)))
-#define NUM_TOTAL_MODES arraysize(virgefb_predefined)
+#define NUM_TOTAL_MODES ARRAY_SIZE(virgefb_predefined)
 
 /*
  *    Default to 800x600 for video=virge8:, virge16: or virge32:
diff --git a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c
index 591809cbbb..2788b8ca9b 100644
--- a/drivers/w1/masters/matrox_w1.c
+++ b/drivers/w1/masters/matrox_w1.c
@@ -98,7 +98,7 @@ static void matrox_w1_write_ddc_bit(void *, u8);
  *
  * Using tristate pins, since i can't find any open-drain pin in whole motherboard.
  * Unfortunately we can't connect to Intel's 82801xx IO controller
- * since we don't know motherboard schema, wich has pretty unused(may be not) GPIO.
+ * since we don't know motherboard schema, which has pretty unused(may be not) GPIO.
  *
  * I've heard that PIIX also has open drain pin.
  *
diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c
index fcbee748c5..067c07be92 100644
--- a/drivers/zorro/zorro-driver.c
+++ b/drivers/zorro/zorro-driver.c
@@ -65,22 +65,17 @@ static int zorro_device_probe(struct device *dev)
      *  @drv: the driver structure to register
      *
      *  Adds the driver structure to the list of registered drivers
-     *  Returns the number of Zorro devices which were claimed by the driver
-     *  during registration.  The driver remains registered even if the
-     *  return value is zero.
+     *  Returns zero or a negative error value.
      */
 
 int zorro_register_driver(struct zorro_driver *drv)
 {
-        int count = 0;
-
         /* initialize common driver fields */
         drv->driver.name = drv->name;
         drv->driver.bus = &zorro_bus_type;
 
         /* register with core */
-        count = driver_register(&drv->driver);
-        return count ? count : 1;
+        return driver_register(&drv->driver);
 }