264 files changed, 1655 insertions, 1210 deletions
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 58c3f74bd84c..6512b20aeccd 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -89,7 +89,7 @@ struct acpi_ac {
        unsigned long long state;
 };
-#define to_acpi_ac(x) container_of(x, struct acpi_ac, charger);
+#define to_acpi_ac(x) container_of(x, struct acpi_ac, charger)
 #ifdef CONFIG_ACPI_PROCFS_POWER
 static const struct file_operations acpi_ac_fops = {
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index fcc13ac0aa18..2c661353e8f2 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -132,7 +132,7 @@ struct acpi_battery {
        unsigned long flags;
 };
-#define to_acpi_battery(x) container_of(x, struct acpi_battery, bat);
+#define to_acpi_battery(x) container_of(x, struct acpi_battery, bat)
 inline int acpi_battery_present(struct acpi_battery *battery)
 {
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index 51ae3794ec7f..50658ff887d9 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -112,7 +112,7 @@ struct acpi_battery {
        u8 have_sysfs_alarm:1;
 };
-#define to_acpi_battery(x) container_of(x, struct acpi_battery, bat);
+#define to_acpi_battery(x) container_of(x, struct acpi_battery, bat)
 struct acpi_sbs {
        struct power_supply charger;
diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
index 6d678c99512e..b89fffc1d777 100644
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
@@ -406,9 +406,10 @@ static int devtmpfsd(void *p)
                        requests = NULL;
                        spin_unlock(&req_lock);
                        while (req) {
+                                struct req *next = req->next;
                                req->err = handle(req->name, req->mode, req->dev);
                                complete(&req->done);
-                                req = req->next;
+                                req = next;
                        }
                        spin_lock(&req_lock);
                }
diff --git a/drivers/bcma/driver_chipcommon.c b/drivers/bcma/driver_chipcommon.c
index fb543024df2f..851e05bc948a 100644
--- a/drivers/bcma/driver_chipcommon.c
+++ b/drivers/bcma/driver_chipcommon.c
@@ -3,7 +3,7 @@
 * ChipCommon core driver
 *
 * Copyright 2005, Broadcom Corporation
- * Copyright 2006, 2007, Michael Buesch <mb@bu3sch.de>
+ * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
 *
 * Licensed under the GNU/GPL. See COPYING for details.
 */
diff --git a/drivers/bcma/driver_chipcommon_pmu.c b/drivers/bcma/driver_chipcommon_pmu.c
index dd5846bef029..fcc63db0ce75 100644
--- a/drivers/bcma/driver_chipcommon_pmu.c
+++ b/drivers/bcma/driver_chipcommon_pmu.c
@@ -2,7 +2,7 @@
 * Broadcom specific AMBA
 * ChipCommon Power Management Unit driver
 *
- * Copyright 2009, Michael Buesch <mb@bu3sch.de>
+ * Copyright 2009, Michael Buesch <m@bues.ch>
 * Copyright 2007, Broadcom Corporation
 *
 * Licensed under the GNU/GPL. See COPYING for details.
diff --git a/drivers/bcma/driver_pci.c b/drivers/bcma/driver_pci.c
index 745d26491291..25f3ddf33823 100644
--- a/drivers/bcma/driver_pci.c
+++ b/drivers/bcma/driver_pci.c
@@ -3,7 +3,7 @@
 * PCI Core
 *
 * Copyright 2005, Broadcom Corporation
- * Copyright 2006, 2007, Michael Buesch <mb@bu3sch.de>
+ * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
 *
 * Licensed under the GNU/GPL. See COPYING for details.
 */
diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
index 16b4d58d84dd..c049548e68b7 100644
--- a/drivers/block/cciss.h
+++ b/drivers/block/cciss.h
@@ -223,7 +223,7 @@ static void SA5_submit_command( ctlr_info_t *h, CommandList_struct *c)
                        h->ctlr, c->busaddr);
 #endif /* CCISS_DEBUG */
         writel(c->busaddr, h->vaddr + SA5_REQUEST_PORT_OFFSET);
-        readl(h->vaddr + SA5_REQUEST_PORT_OFFSET);
+        readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
         h->commands_outstanding++;
         if ( h->commands_outstanding > h->max_outstanding)
                h->max_outstanding = h->commands_outstanding;
diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c
index 5cf2993a8338..2330a9ad5e95 100644
--- a/drivers/block/xen-blkback/blkback.c
+++ b/drivers/block/xen-blkback/blkback.c
@@ -458,7 +458,8 @@ static void end_block_io_op(struct bio *bio, int error)
 * (which has the sectors we want, number of them, grant references, etc),
 * and transmute  it to the block API to hand it over to the proper block disk.
 */
-static int do_block_io_op(struct xen_blkif *blkif)
+static int
+__do_block_io_op(struct xen_blkif *blkif)
 {
        union blkif_back_rings *blk_rings = &blkif->blk_rings;
        struct blkif_request req;
@@ -515,6 +516,23 @@ static int do_block_io_op(struct xen_blkif *blkif)
        return more_to_do;
 }
+static int
+do_block_io_op(struct xen_blkif *blkif)
+{
+        union blkif_back_rings *blk_rings = &blkif->blk_rings;
+        int more_to_do;
+        do {
+                more_to_do = __do_block_io_op(blkif);
+                if (more_to_do)
+                        break;
+                RING_FINAL_CHECK_FOR_REQUESTS(&blk_rings->common, more_to_do);
+        } while (more_to_do);
+        return more_to_do;
+}
 /*
 * Transmutation of the 'struct blkif_request' to a proper 'struct bio'
 * and call the 'submit_bio' to pass it to the underlying storage.
@@ -700,7 +718,6 @@ static void make_response(struct xen_blkif *blkif, u64 id,
        struct blkif_response  resp;
        unsigned long     flags;
        union blkif_back_rings *blk_rings = &blkif->blk_rings;
-        int more_to_do = 0;
        int notify;
        resp.id        = id;
@@ -727,22 +744,7 @@ static void make_response(struct xen_blkif *blkif, u64 id,
        }
        blk_rings->common.rsp_prod_pvt++;
        RING_PUSH_RESPONSES_AND_CHECK_NOTIFY(&blk_rings->common, notify);
-        if (blk_rings->common.rsp_prod_pvt == blk_rings->common.req_cons) {
-                /*
-                 * Tail check for pending requests. Allows frontend to avoid
-                 * notifications if requests are already in flight (lower
-                 * overheads and promotes batching).
-                 */
-                RING_FINAL_CHECK_FOR_REQUESTS(&blk_rings->common, more_to_do);
-        } else if (RING_HAS_UNCONSUMED_REQUESTS(&blk_rings->common)) {
-                more_to_do = 1;
-        }
        spin_unlock_irqrestore(&blkif->blk_ring_lock, flags);
-        if (more_to_do)
-                blkif_notify_work(blkif);
        if (notify)
                notify_remote_via_irq(blkif->irq);
 }
@@ -824,3 +826,4 @@ static int __init xen_blkif_init(void)
 module_init(xen_blkif_init);
 MODULE_LICENSE("Dual BSD/GPL");
+MODULE_ALIAS("xen-backend:vbd");
diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c
index cf39bc08ce08..0c688232aab3 100644
--- a/drivers/char/bsr.c
+++ b/drivers/char/bsr.c
@@ -212,7 +212,7 @@ static int bsr_add_node(struct device_node *bn)
                cur->bsr_minor  = i + total_bsr_devs;
                cur->bsr_addr   = res.start;
-                cur->bsr_len    = res.end - res.start + 1;
+                cur->bsr_len    = resource_size(&res);
                cur->bsr_bytes  = bsr_bytes[i];
                cur->bsr_stride = bsr_stride[i];
                cur->bsr_dev    = MKDEV(bsr_major, i + total_bsr_devs);
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index 2016aad85203..1bafb40ec8a2 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -19,7 +19,7 @@
        Copyright 2000,2001 Philipp Rumpf <prumpf@mandrakesoft.com>
        Added generic RNG API
-        Copyright 2006 Michael Buesch <mbuesch@freenet.de>
+        Copyright 2006 Michael Buesch <m@bues.ch>
        Copyright 2005 (c) MontaVista Software, Inc.
        Please read Documentation/hw_random.txt for details on use.
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index 39ccdeada791..e90e1c74fd4c 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -621,7 +621,7 @@ static int __devinit hwicap_setup(struct device *dev, int id,
        drvdata->mem_start = regs_res->start;
        drvdata->mem_end = regs_res->end;
-        drvdata->mem_size = regs_res->end - regs_res->start + 1;
+        drvdata->mem_size = resource_size(regs_res);
        if (!request_mem_region(drvdata->mem_start,
                                        drvdata->mem_size, DRIVER_NAME)) {
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index fc2d9ed22470..73988bb7322a 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -166,52 +166,52 @@ static int caam_probe(struct platform_device *pdev)
        /* Controller-level - performance monitor counters */
        ctrlpriv->ctl_rq_dequeued =
                debugfs_create_u64("rq_dequeued",
-                                   S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
+                                   S_IRUSR | S_IRGRP | S_IROTH,
                                   ctrlpriv->ctl, &perfmon->req_dequeued);
        ctrlpriv->ctl_ob_enc_req =
                debugfs_create_u64("ob_rq_encrypted",
-                                   S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
+                                   S_IRUSR | S_IRGRP | S_IROTH,
                                   ctrlpriv->ctl, &perfmon->ob_enc_req);
        ctrlpriv->ctl_ib_dec_req =
                debugfs_create_u64("ib_rq_decrypted",
-                                   S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
+                                   S_IRUSR | S_IRGRP | S_IROTH,
                                   ctrlpriv->ctl, &perfmon->ib_dec_req);
        ctrlpriv->ctl_ob_enc_bytes =
                debugfs_create_u64("ob_bytes_encrypted",
-                                   S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
+                                   S_IRUSR | S_IRGRP | S_IROTH,
                                   ctrlpriv->ctl, &perfmon->ob_enc_bytes);
        ctrlpriv->ctl_ob_prot_bytes =
                debugfs_create_u64("ob_bytes_protected",
-                                   S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
+                                   S_IRUSR | S_IRGRP | S_IROTH,
                                   ctrlpriv->ctl, &perfmon->ob_prot_bytes);
        ctrlpriv->ctl_ib_dec_bytes =
                debugfs_create_u64("ib_bytes_decrypted",
-                                   S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
+                                   S_IRUSR | S_IRGRP | S_IROTH,
                                   ctrlpriv->ctl, &perfmon->ib_dec_bytes);
        ctrlpriv->ctl_ib_valid_bytes =
                debugfs_create_u64("ib_bytes_validated",
-                                   S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
+                                   S_IRUSR | S_IRGRP | S_IROTH,
                                   ctrlpriv->ctl, &perfmon->ib_valid_bytes);
        /* Controller level - global status values */
        ctrlpriv->ctl_faultaddr =
                debugfs_create_u64("fault_addr",
-                                   S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
+                                   S_IRUSR | S_IRGRP | S_IROTH,
                                   ctrlpriv->ctl, &perfmon->faultaddr);
        ctrlpriv->ctl_faultdetail =
                debugfs_create_u32("fault_detail",
-                                   S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
+                                   S_IRUSR | S_IRGRP | S_IROTH,
                                   ctrlpriv->ctl, &perfmon->faultdetail);
        ctrlpriv->ctl_faultstatus =
                debugfs_create_u32("fault_status",
-                                   S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
+                                   S_IRUSR | S_IRGRP | S_IROTH,
                                   ctrlpriv->ctl, &perfmon->status);
        /* Internal covering keys (useful in non-secure mode only) */
        ctrlpriv->ctl_kek_wrap.data = &ctrlpriv->ctrl->kek[0];
        ctrlpriv->ctl_kek_wrap.size = KEK_KEY_SIZE * sizeof(u32);
        ctrlpriv->ctl_kek = debugfs_create_blob("kek",
-                                                S_IFCHR | S_IRUSR |
+                                                S_IRUSR |
                                                S_IRGRP | S_IROTH,
                                                ctrlpriv->ctl,
                                                &ctrlpriv->ctl_kek_wrap);
@@ -219,7 +219,7 @@ static int caam_probe(struct platform_device *pdev)
        ctrlpriv->ctl_tkek_wrap.data = &ctrlpriv->ctrl->tkek[0];
        ctrlpriv->ctl_tkek_wrap.size = KEK_KEY_SIZE * sizeof(u32);
        ctrlpriv->ctl_tkek = debugfs_create_blob("tkek",
-                                                 S_IFCHR | S_IRUSR |
+                                                 S_IRUSR |
                                                 S_IRGRP | S_IROTH,
                                                 ctrlpriv->ctl,
                                                 &ctrlpriv->ctl_tkek_wrap);
@@ -227,7 +227,7 @@ static int caam_probe(struct platform_device *pdev)
        ctrlpriv->ctl_tdsk_wrap.data = &ctrlpriv->ctrl->tdsk[0];
        ctrlpriv->ctl_tdsk_wrap.size = KEK_KEY_SIZE * sizeof(u32);
        ctrlpriv->ctl_tdsk = debugfs_create_blob("tdsk",
-                                                 S_IFCHR | S_IRUSR |
+                                                 S_IRUSR |
                                                 S_IRGRP | S_IROTH,
                                                 ctrlpriv->ctl,
                                                 &ctrlpriv->ctl_tdsk_wrap);
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index e18eaabe92b9..d99f71c356b5 100644
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -135,7 +135,8 @@ static int imxdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
                if (ret)
                        return ret;
-                imx_dma_config_burstlen(imxdmac->imxdma_channel, imxdmac->watermark_level);
+                imx_dma_config_burstlen(imxdmac->imxdma_channel,
+                                imxdmac->watermark_level * imxdmac->word_size);
                return 0;
        default:
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index 954e334e01bb..06f9f27dbe7c 100644
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -1304,8 +1304,7 @@ static int mv_xor_shared_probe(struct platform_device *pdev)
        if (!res)
                return -ENODEV;
-        msp->xor_base = devm_ioremap(&pdev->dev, res->start,
+        msp->xor_base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
-                                     res->end - res->start + 1);
        if (!msp->xor_base)
                return -EBUSY;
@@ -1314,7 +1313,7 @@ static int mv_xor_shared_probe(struct platform_device *pdev)
                return -ENODEV;
        msp->xor_high_base = devm_ioremap(&pdev->dev, res->start,
-                                          res->end - res->start + 1);
+                                          resource_size(res));
        if (!msp->xor_high_base)
                return -EBUSY;
diff --git a/drivers/edac/cell_edac.c b/drivers/edac/cell_edac.c
index db1df59ae2b6..9a6a274e6925 100644
--- a/drivers/edac/cell_edac.c
+++ b/drivers/edac/cell_edac.c
@@ -140,7 +140,7 @@ static void __devinit cell_edac_init_csrows(struct mem_ctl_info *mci)
                if (of_node_to_nid(np) != priv->node)
                        continue;
                csrow->first_page = r.start >> PAGE_SHIFT;
-                csrow->nr_pages = (r.end - r.start + 1) >> PAGE_SHIFT;
+                csrow->nr_pages = resource_size(&r) >> PAGE_SHIFT;
                csrow->last_page = csrow->first_page + csrow->nr_pages - 1;
                csrow->mtype = MEM_XDR;
                csrow->edac_mode = EDAC_SECDED;
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index 38ab8e2cd7f4..11e1a5dad96f 100644
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -538,15 +538,15 @@ static int __devinit mpc85xx_l2_err_probe(struct platform_device *op)
        /* we only need the error registers */
        r.start += 0xe00;
-        if (!devm_request_mem_region(&op->dev, r.start,
+        if (!devm_request_mem_region(&op->dev, r.start, resource_size(&r),
-                                     r.end - r.start + 1, pdata->name)) {
+                                     pdata->name)) {
                printk(KERN_ERR "%s: Error while requesting mem region\n",
                       __func__);
                res = -EBUSY;
                goto err;
        }
-        pdata->l2_vbase = devm_ioremap(&op->dev, r.start, r.end - r.start + 1);
+        pdata->l2_vbase = devm_ioremap(&op->dev, r.start, resource_size(&r));
        if (!pdata->l2_vbase) {
                printk(KERN_ERR "%s: Unable to setup L2 err regs\n", __func__);
                res = -ENOMEM;
@@ -987,15 +987,15 @@ static int __devinit mpc85xx_mc_err_probe(struct platform_device *op)
                goto err;
        }
-        if (!devm_request_mem_region(&op->dev, r.start,
+        if (!devm_request_mem_region(&op->dev, r.start, resource_size(&r),
-                                     r.end - r.start + 1, pdata->name)) {
+                                     pdata->name)) {
                printk(KERN_ERR "%s: Error while requesting mem region\n",
                       __func__);
                res = -EBUSY;
                goto err;
        }
-        pdata->mc_vbase = devm_ioremap(&op->dev, r.start, r.end - r.start + 1);
+        pdata->mc_vbase = devm_ioremap(&op->dev, r.start, resource_size(&r));
        if (!pdata->mc_vbase) {
                printk(KERN_ERR "%s: Unable to setup MC err regs\n", __func__);
                res = -ENOMEM;
diff --git a/drivers/gpio/gpio-ab8500.c b/drivers/gpio/gpio-ab8500.c
index 970053c89ff7..ed795e64eea7 100644
--- a/drivers/gpio/gpio-ab8500.c
+++ b/drivers/gpio/gpio-ab8500.c
@@ -15,7 +15,6 @@
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
-#include <linux/slab.h>
 #include <linux/gpio.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
diff --git a/drivers/gpio/gpio-bt8xx.c b/drivers/gpio/gpio-bt8xx.c
index aa4f09ad3ced..ec57936aef62 100644
--- a/drivers/gpio/gpio-bt8xx.c
+++ b/drivers/gpio/gpio-bt8xx.c
@@ -2,7 +2,7 @@
    bt8xx GPIO abuser
-    Copyright (C) 2008 Michael Buesch <mb@bu3sch.de>
+    Copyright (C) 2008 Michael Buesch <m@bues.ch>
    Please do _only_ contact the people listed _above_ with issues related to this driver.
    All the other people listed below are not related to this driver. Their names
diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c
index 3bfd3417ab11..72fb9c665320 100644
--- a/drivers/gpio/gpio-ep93xx.c
+++ b/drivers/gpio/gpio-ep93xx.c
@@ -1,7 +1,7 @@
 /*
 * Generic EP93xx GPIO handling
 *
- * Copyright (c) 2008 Ryan Mallon <ryan@bluewatersys.com>
+ * Copyright (c) 2008 Ryan Mallon
 * Copyright (c) 2011 H Hartley Sweeten <hsweeten@visionengravers.com>
 *
 * Based on code originally from:
diff --git a/drivers/gpio/gpio-u300.c b/drivers/gpio/gpio-u300.c
index fd2dfeeefdf3..53e8255cb0ba 100644
--- a/drivers/gpio/gpio-u300.c
+++ b/drivers/gpio/gpio-u300.c
@@ -578,8 +578,8 @@ static int __init gpio_probe(struct platform_device *pdev)
        if (!memres)
                goto err_no_resource;
-        if (request_mem_region(memres->start, memres->end - memres->start, "GPIO Controller")
+        if (!request_mem_region(memres->start, resource_size(memres),
-            == NULL) {
+                                "GPIO Controller")) {
                err = -ENODEV;
                goto err_no_ioregion;
        }
@@ -637,7 +637,7 @@ static int __init gpio_probe(struct platform_device *pdev)
                free_irq(gpio_ports[i].irq, &gpio_ports[i]);
        iounmap(virtbase);
 err_no_ioremap:
-        release_mem_region(memres->start, memres->end - memres->start);
+        release_mem_region(memres->start, resource_size(memres));
 err_no_ioregion:
 err_no_resource:
        clk_disable(clk);
@@ -657,7 +657,7 @@ static int __exit gpio_remove(struct platform_device *pdev)
        for (i = 0 ; i < U300_GPIO_NUM_PORTS; i++)
                free_irq(gpio_ports[i].irq, &gpio_ports[i]);
        iounmap(virtbase);
-        release_mem_region(memres->start, memres->end - memres->start);
+        release_mem_region(memres->start, resource_size(memres));
        clk_disable(clk);
        clk_put(clk);
        return 0;
diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
index e25cbb46789a..40680f2b4231 100644
--- a/drivers/gpu/drm/nouveau/nv50_graph.c
+++ b/drivers/gpu/drm/nouveau/nv50_graph.c
@@ -31,7 +31,6 @@
 #include "nouveau_grctx.h"
 #include "nouveau_dma.h"
 #include "nouveau_vm.h"
-#include "nouveau_ramht.h"
 #include "nv50_evo.h"
 struct nv50_graph_engine {
diff --git a/drivers/gpu/drm/sis/sis_drv.h b/drivers/gpu/drm/sis/sis_drv.h
index ef940bad63f7..194303c177ad 100644
--- a/drivers/gpu/drm/sis/sis_drv.h
+++ b/drivers/gpu/drm/sis/sis_drv.h
@@ -48,8 +48,8 @@ enum sis_family {
 #define SIS_BASE (dev_priv->mmio)
-#define SIS_READ(reg)         DRM_READ32(SIS_BASE, reg);
+#define SIS_READ(reg)         DRM_READ32(SIS_BASE, reg)
-#define SIS_WRITE(reg, val)   DRM_WRITE32(SIS_BASE, reg, val);
+#define SIS_WRITE(reg, val)   DRM_WRITE32(SIS_BASE, reg, val)
 typedef struct drm_sis_private {
        drm_local_map_t *mmio;
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 5f888f7e7dcb..0598cd22edf2 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -1041,8 +1041,13 @@ config SENSORS_SMSC47B397
          This driver can also be built as a module.  If so, the module
          will be called smsc47b397.
+config SENSORS_SCH56XX_COMMON
+        tristate
+        default n
 config SENSORS_SCH5627
        tristate "SMSC SCH5627"
+        select SENSORS_SCH56XX_COMMON
        help
          If you say yes here you get support for the hardware monitoring
          features of the SMSC SCH5627 Super-I/O chip.
@@ -1050,6 +1055,21 @@ config SENSORS_SCH5627
          This driver can also be built as a module.  If so, the module
          will be called sch5627.
+config SENSORS_SCH5636
+        tristate "SMSC SCH5636"
+        select SENSORS_SCH56XX_COMMON
+        help
+          SMSC SCH5636 Super I/O chips include an embedded microcontroller for
+          hardware monitoring solutions, allowing motherboard manufacturers to
+          create their own custom hwmon solution based upon the SCH5636.
+          Currently this driver only supports the Fujitsu Theseus SCH5636 based
+          hwmon solution. Say yes here if you want support for the Fujitsu
+          Theseus' hardware monitoring features.
+          This driver can also be built as a module.  If so, the module
+          will be called sch5636.
 config SENSORS_ADS1015
        tristate "Texas Instruments ADS1015"
        depends on I2C
@@ -1142,6 +1162,7 @@ config SENSORS_TWL4030_MADC
 config SENSORS_VIA_CPUTEMP
        tristate "VIA CPU temperature sensor"
        depends on X86
+        select HWMON_VID
        help
          If you say yes here you get support for the temperature
          sensor inside your CPU. Supported are all known variants of
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 28061cfa0cdb..d7995a1d0784 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -95,7 +95,9 @@ obj-$(CONFIG_SENSORS_PC87360)	+= pc87360.o
 obj-$(CONFIG_SENSORS_PC87427)   += pc87427.o
 obj-$(CONFIG_SENSORS_PCF8591)   += pcf8591.o
 obj-$(CONFIG_SENSORS_S3C)       += s3c-hwmon.o
+obj-$(CONFIG_SENSORS_SCH56XX_COMMON)+= sch56xx-common.o
 obj-$(CONFIG_SENSORS_SCH5627)   += sch5627.o
+obj-$(CONFIG_SENSORS_SCH5636)   += sch5636.o
 obj-$(CONFIG_SENSORS_SHT15)     += sht15.o
 obj-$(CONFIG_SENSORS_SHT21)     += sht21.o
 obj-$(CONFIG_SENSORS_SIS5595)   += sis5595.o
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index ec588026f0a9..131ea8625f08 100644
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -273,7 +273,7 @@ static SENSOR_DEVICE_ATTR(in4_max, S_IRUGO | S_IWUSR,
 #define DIV_FROM_REG(val) (1 << (val))
 #define FAN_FROM_REG(val,div) ((val)==0 ? 0 : (480000/((val) << (div))))
-#define FAN_TO_REG(val,div) ((val)<=0?0:SENSORS_LIMIT((480000 + ((val) << ((div)-1))) / ((val) << (div)), 1, 255));
+#define FAN_TO_REG(val,div) ((val)<=0?0:SENSORS_LIMIT((480000 + ((val) << ((div)-1))) / ((val) << (div)), 1, 255))
 static ssize_t get_fan_input(struct device *dev, struct device_attribute *attr,
                             char *buf)
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c
index c8195a077da3..932da8a5aaf4 100644
--- a/drivers/hwmon/hwmon-vid.c
+++ b/drivers/hwmon/hwmon-vid.c
@@ -140,7 +140,11 @@ int vid_from_reg(int val, u8 vrm)
                return(val & 0x10 ? 975 - (val & 0xF) * 25 :
                                    1750 - val * 50);
        case 13:
+        case 131:
                val &= 0x3f;
+                /* Exception for Eden ULV 500 MHz */
+                if (vrm == 131 && val == 0x3f)
+                        val++;
                return(1708 - val * 16);
        case 14:                /* Intel Core */
                                /* compute in uV, round to mV */
@@ -205,11 +209,45 @@ static struct vrm_model vrm_models[] = {
        {X86_VENDOR_CENTAUR, 0x6, 0x9, 0x7, 85},        /* Nehemiah */
        {X86_VENDOR_CENTAUR, 0x6, 0x9, ANY, 17},        /* C3-M, Eden-N */
        {X86_VENDOR_CENTAUR, 0x6, 0xA, 0x7, 0},         /* No information */
-        {X86_VENDOR_CENTAUR, 0x6, 0xA, ANY, 13},        /* C7, Esther */
+        {X86_VENDOR_CENTAUR, 0x6, 0xA, ANY, 13},        /* C7-M, C7, Eden (Esther) */
+        {X86_VENDOR_CENTAUR, 0x6, 0xD, ANY, 134},       /* C7-D, C7-M, C7, Eden (Esther) */
        {X86_VENDOR_UNKNOWN, ANY, ANY, ANY, 0}          /* stop here */
 };
+/*
+ * Special case for VIA model D: there are two different possible
+ * VID tables, so we have to figure out first, which one must be
+ * used. This resolves temporary drm value 134 to 14 (Intel Core
+ * 7-bit VID), 13 (Pentium M 6-bit VID) or 131 (Pentium M 6-bit VID
+ * + quirk for Eden ULV 500 MHz).
+ * Note: something similar might be needed for model A, I'm not sure.
+ */
+static u8 get_via_model_d_vrm(void)
+{
+        unsigned int vid, brand, dummy;
+        static const char *brands[4] = {
+                "C7-M", "C7", "Eden", "C7-D"
+        };
+        rdmsr(0x198, dummy, vid);
+        vid &= 0xff;
+        rdmsr(0x1154, brand, dummy);
+        brand = ((brand >> 4) ^ (brand >> 2)) & 0x03;
+        if (vid > 0x3f) {
+                pr_info("Using %d-bit VID table for VIA %s CPU\n",
+                        7, brands[brand]);
+                return 14;
+        } else {
+                pr_info("Using %d-bit VID table for VIA %s CPU\n",
+                        6, brands[brand]);
+                /* Enable quirk for Eden */
+                return brand == 2 ? 131 : 13;
+        }
+}
 static u8 find_vrm(u8 eff_family, u8 eff_model, u8 eff_stepping, u8 vendor)
 {
        int i = 0;
@@ -247,6 +285,8 @@ u8 vid_which_vrm(void)
                eff_model += ((eax & 0x000F0000)>>16)<<4;
        }
        vrm_ret = find_vrm(eff_family, eff_model, eff_stepping, c->x86_vendor);
+        if (vrm_ret == 134)
+                vrm_ret = get_via_model_d_vrm();
        if (vrm_ret == 0)
                pr_info("Unknown VRM version of your x86 CPU\n");
        return vrm_ret;
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index 5f5247750430..d912649fac50 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -1172,6 +1172,32 @@ static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,
        struct it87_data *data = it87_update_device(dev);
        return sprintf(buf, "%u\n", (data->alarms >> bitnr) & 1);
 }
+static ssize_t clear_intrusion(struct device *dev, struct device_attribute
+                *attr, const char *buf, size_t count)
+{
+        struct it87_data *data = dev_get_drvdata(dev);
+        long val;
+        int config;
+        if (strict_strtol(buf, 10, &val) < 0 || val != 0)
+                return -EINVAL;
+        mutex_lock(&data->update_lock);
+        config = it87_read_value(data, IT87_REG_CONFIG);
+        if (config < 0) {
+                count = config;
+        } else {
+                config |= 1 << 5;
+                it87_write_value(data, IT87_REG_CONFIG, config);
+                /* Invalidate cache to force re-read */
+                data->valid = 0;
+        }
+        mutex_unlock(&data->update_lock);
+        return count;
+}
 static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 8);
 static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 9);
 static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 10);
@@ -1188,6 +1214,8 @@ static SENSOR_DEVICE_ATTR(fan5_alarm, S_IRUGO, show_alarm, NULL, 6);
 static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 16);
 static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 17);
 static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 18);
+static SENSOR_DEVICE_ATTR(intrusion0_alarm, S_IRUGO | S_IWUSR,
+                          show_alarm, clear_intrusion, 4);
 static ssize_t show_beep(struct device *dev, struct device_attribute *attr,
                char *buf)
@@ -1350,6 +1378,7 @@ static struct attribute *it87_attributes[] = {
        &sensor_dev_attr_temp3_alarm.dev_attr.attr,
        &dev_attr_alarms.attr,
+        &sensor_dev_attr_intrusion0_alarm.dev_attr.attr,
        &dev_attr_name.attr,
        NULL
 };
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 4cb24eafe318..6df0b4681710 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -2,7 +2,7 @@
    lm78.c - Part of lm_sensors, Linux kernel modules for hardware
             monitoring
    Copyright (c) 1998, 1999  Frodo Looijaard <frodol@dds.nl> 
-    Copyright (c) 2007        Jean Delvare <khali@linux-fr.org>
+    Copyright (c) 2007, 2011  Jean Delvare <khali@linux-fr.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
@@ -26,23 +26,21 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/platform_device.h>
-#include <linux/ioport.h>
 #include <linux/hwmon.h>
 #include <linux/hwmon-vid.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
-#include <linux/io.h>
-/* ISA device, if found */
+#ifdef CONFIG_ISA
-static struct platform_device *pdev;
+#include <linux/platform_device.h>
+#include <linux/ioport.h>
+#include <linux/io.h>
+#endif
 /* Addresses to scan */
 static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
                                                0x2e, 0x2f, I2C_CLIENT_END };
-static unsigned short isa_address = 0x290;
 enum chips { lm78, lm79 };
 /* Many LM78 constants specified below */
@@ -143,50 +141,12 @@ struct lm78_data {
 };
-static int lm78_i2c_detect(struct i2c_client *client,
-                           struct i2c_board_info *info);
-static int lm78_i2c_probe(struct i2c_client *client,
-                          const struct i2c_device_id *id);
-static int lm78_i2c_remove(struct i2c_client *client);
-static int __devinit lm78_isa_probe(struct platform_device *pdev);
-static int __devexit lm78_isa_remove(struct platform_device *pdev);
 static int lm78_read_value(struct lm78_data *data, u8 reg);
 static int lm78_write_value(struct lm78_data *data, u8 reg, u8 value);
 static struct lm78_data *lm78_update_device(struct device *dev);
 static void lm78_init_device(struct lm78_data *data);
-static const struct i2c_device_id lm78_i2c_id[] = {
-        { "lm78", lm78 },
-        { "lm79", lm79 },
-        { }
-};
-MODULE_DEVICE_TABLE(i2c, lm78_i2c_id);
-static struct i2c_driver lm78_driver = {
-        .class          = I2C_CLASS_HWMON,
-        .driver = {
-                .name   = "lm78",
-        },
-        .probe          = lm78_i2c_probe,
-        .remove         = lm78_i2c_remove,
-        .id_table       = lm78_i2c_id,
-        .detect         = lm78_i2c_detect,
-        .address_list   = normal_i2c,
-};
-static struct platform_driver lm78_isa_driver = {
-        .driver = {
-                .owner  = THIS_MODULE,
-                .name   = "lm78",
-        },
-        .probe          = lm78_isa_probe,
-        .remove         = __devexit_p(lm78_isa_remove),
-};
 /* 7 Voltages */
 static ssize_t show_in(struct device *dev, struct device_attribute *da,
                       char *buf)
@@ -514,6 +474,16 @@ static const struct attribute_group lm78_group = {
        .attrs = lm78_attributes,
 };
+/*
+ * ISA related code
+ */
+#ifdef CONFIG_ISA
+/* ISA device, if found */
+static struct platform_device *pdev;
+static unsigned short isa_address = 0x290;
 /* I2C devices get this name attribute automatically, but for ISA devices
   we must create it by ourselves. */
 static ssize_t show_name(struct device *dev, struct device_attribute
@@ -525,6 +495,11 @@ static ssize_t show_name(struct device *dev, struct device_attribute
 }
 static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
+static struct lm78_data *lm78_data_if_isa(void)
+{
+        return pdev ? platform_get_drvdata(pdev) : NULL;
+}
 /* Returns 1 if the I2C chip appears to be an alias of the ISA chip */
 static int lm78_alias_detect(struct i2c_client *client, u8 chipid)
 {
@@ -558,12 +533,24 @@ static int lm78_alias_detect(struct i2c_client *client, u8 chipid)
        return 1;
 }
+#else /* !CONFIG_ISA */
+static int lm78_alias_detect(struct i2c_client *client, u8 chipid)
+{
+        return 0;
+}
+static struct lm78_data *lm78_data_if_isa(void)
+{
+        return NULL;
+}
+#endif /* CONFIG_ISA */
 static int lm78_i2c_detect(struct i2c_client *client,
                           struct i2c_board_info *info)
 {
        int i;
-        struct lm78_data *isa = pdev ? platform_get_drvdata(pdev) : NULL;
+        struct lm78_data *isa = lm78_data_if_isa();
        const char *client_name;
        struct i2c_adapter *adapter = client->adapter;
        int address = client->addr;
@@ -663,76 +650,24 @@ static int lm78_i2c_remove(struct i2c_client *client)
        return 0;
 }
-static int __devinit lm78_isa_probe(struct platform_device *pdev)
+static const struct i2c_device_id lm78_i2c_id[] = {
-{
+        { "lm78", lm78 },
-        int err;
+        { "lm79", lm79 },
-        struct lm78_data *data;
+        { }
-        struct resource *res;
+};
+MODULE_DEVICE_TABLE(i2c, lm78_i2c_id);
-        /* Reserve the ISA region */
-        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
-        if (!request_region(res->start + LM78_ADDR_REG_OFFSET, 2, "lm78")) {
-                err = -EBUSY;
-                goto exit;
-        }
-        if (!(data = kzalloc(sizeof(struct lm78_data), GFP_KERNEL))) {
-                err = -ENOMEM;
-                goto exit_release_region;
-        }
-        mutex_init(&data->lock);
-        data->isa_addr = res->start;
-        platform_set_drvdata(pdev, data);
-        if (lm78_read_value(data, LM78_REG_CHIPID) & 0x80) {
-                data->type = lm79;
-                data->name = "lm79";
-        } else {
-                data->type = lm78;
-                data->name = "lm78";
-        }
-        /* Initialize the LM78 chip */
-        lm78_init_device(data);
-        /* Register sysfs hooks */
-        if ((err = sysfs_create_group(&pdev->dev.kobj, &lm78_group))
-         || (err = device_create_file(&pdev->dev, &dev_attr_name)))
-                goto exit_remove_files;
-        data->hwmon_dev = hwmon_device_register(&pdev->dev);
-        if (IS_ERR(data->hwmon_dev)) {
-                err = PTR_ERR(data->hwmon_dev);
-                goto exit_remove_files;
-        }
-        return 0;
- exit_remove_files:
-        sysfs_remove_group(&pdev->dev.kobj, &lm78_group);
-        device_remove_file(&pdev->dev, &dev_attr_name);
-        kfree(data);
- exit_release_region:
-        release_region(res->start + LM78_ADDR_REG_OFFSET, 2);
- exit:
-        return err;
-}
-static int __devexit lm78_isa_remove(struct platform_device *pdev)
-{
-        struct lm78_data *data = platform_get_drvdata(pdev);
-        struct resource *res;
-        hwmon_device_unregister(data->hwmon_dev);
-        sysfs_remove_group(&pdev->dev.kobj, &lm78_group);
-        device_remove_file(&pdev->dev, &dev_attr_name);
-        kfree(data);
-        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
-        release_region(res->start + LM78_ADDR_REG_OFFSET, 2);
-        return 0;
+static struct i2c_driver lm78_driver = {
-}
+        .class          = I2C_CLASS_HWMON,
+        .driver = {
+                .name   = "lm78",
+        },
+        .probe          = lm78_i2c_probe,
+        .remove         = lm78_i2c_remove,
+        .id_table       = lm78_i2c_id,
+        .detect         = lm78_i2c_detect,
+        .address_list   = normal_i2c,
+};
 /* The SMBus locks itself, but ISA access must be locked explicitly! 
   We don't want to lock the whole ISA bus, so we lock each client
@@ -743,6 +678,7 @@ static int lm78_read_value(struct lm78_data *data, u8 reg)
 {
        struct i2c_client *client = data->client;
+#ifdef CONFIG_ISA
        if (!client) { /* ISA device */
                int res;
                mutex_lock(&data->lock);
@@ -751,6 +687,7 @@ static int lm78_read_value(struct lm78_data *data, u8 reg)
                mutex_unlock(&data->lock);
                return res;
        } else
+#endif
                return i2c_smbus_read_byte_data(client, reg);
 }
@@ -765,6 +702,7 @@ static int lm78_write_value(struct lm78_data *data, u8 reg, u8 value)
 {
        struct i2c_client *client = data->client;
+#ifdef CONFIG_ISA
        if (!client) { /* ISA device */
                mutex_lock(&data->lock);
                outb_p(reg, data->isa_addr + LM78_ADDR_REG_OFFSET);
@@ -772,6 +710,7 @@ static int lm78_write_value(struct lm78_data *data, u8 reg, u8 value)
                mutex_unlock(&data->lock);
                return 0;
        } else
+#endif
                return i2c_smbus_write_byte_data(client, reg, value);
 }
@@ -849,6 +788,88 @@ static struct lm78_data *lm78_update_device(struct device *dev)
        return data;
 }
+#ifdef CONFIG_ISA
+static int __devinit lm78_isa_probe(struct platform_device *pdev)
+{
+        int err;
+        struct lm78_data *data;
+        struct resource *res;
+        /* Reserve the ISA region */
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        if (!request_region(res->start + LM78_ADDR_REG_OFFSET, 2, "lm78")) {
+                err = -EBUSY;
+                goto exit;
+        }
+        data = kzalloc(sizeof(struct lm78_data), GFP_KERNEL);
+        if (!data) {
+                err = -ENOMEM;
+                goto exit_release_region;
+        }
+        mutex_init(&data->lock);
+        data->isa_addr = res->start;
+        platform_set_drvdata(pdev, data);
+        if (lm78_read_value(data, LM78_REG_CHIPID) & 0x80) {
+                data->type = lm79;
+                data->name = "lm79";
+        } else {
+                data->type = lm78;
+                data->name = "lm78";
+        }
+        /* Initialize the LM78 chip */
+        lm78_init_device(data);
+        /* Register sysfs hooks */
+        if ((err = sysfs_create_group(&pdev->dev.kobj, &lm78_group))
+         || (err = device_create_file(&pdev->dev, &dev_attr_name)))
+                goto exit_remove_files;
+        data->hwmon_dev = hwmon_device_register(&pdev->dev);
+        if (IS_ERR(data->hwmon_dev)) {
+                err = PTR_ERR(data->hwmon_dev);
+                goto exit_remove_files;
+        }
+        return 0;
+ exit_remove_files:
+        sysfs_remove_group(&pdev->dev.kobj, &lm78_group);
+        device_remove_file(&pdev->dev, &dev_attr_name);
+        kfree(data);
+ exit_release_region:
+        release_region(res->start + LM78_ADDR_REG_OFFSET, 2);
+ exit:
+        return err;
+}
+static int __devexit lm78_isa_remove(struct platform_device *pdev)
+{
+        struct lm78_data *data = platform_get_drvdata(pdev);
+        struct resource *res;
+        hwmon_device_unregister(data->hwmon_dev);
+        sysfs_remove_group(&pdev->dev.kobj, &lm78_group);
+        device_remove_file(&pdev->dev, &dev_attr_name);
+        kfree(data);
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        release_region(res->start + LM78_ADDR_REG_OFFSET, 2);
+        return 0;
+}
+static struct platform_driver lm78_isa_driver = {
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "lm78",
+        },
+        .probe          = lm78_isa_probe,
+        .remove         = __devexit_p(lm78_isa_remove),
+};
 /* return 1 if a supported chip is found, 0 otherwise */
 static int __init lm78_isa_found(unsigned short address)
 {
@@ -969,12 +990,10 @@ static int __init lm78_isa_device_add(unsigned short address)
        return err;
 }
-static int __init sm_lm78_init(void)
+static int __init lm78_isa_register(void)
 {
        int res;
-        /* We register the ISA device first, so that we can skip the
-         * registration of an I2C interface to the same device. */
        if (lm78_isa_found(isa_address)) {
                res = platform_driver_register(&lm78_isa_driver);
                if (res)
@@ -986,32 +1005,62 @@ static int __init sm_lm78_init(void)
                        goto exit_unreg_isa_driver;
        }
-        res = i2c_add_driver(&lm78_driver);
-        if (res)
-                goto exit_unreg_isa_device;
        return 0;
- exit_unreg_isa_device:
-        platform_device_unregister(pdev);
 exit_unreg_isa_driver:
        platform_driver_unregister(&lm78_isa_driver);
 exit:
        return res;
 }
-static void __exit sm_lm78_exit(void)
+static void lm78_isa_unregister(void)
 {
        if (pdev) {
                platform_device_unregister(pdev);
                platform_driver_unregister(&lm78_isa_driver);
        }
-        i2c_del_driver(&lm78_driver);
 }
+#else /* !CONFIG_ISA */
+static int __init lm78_isa_register(void)
+{
+        return 0;
+}
+static void lm78_isa_unregister(void)
+{
+}
+#endif /* CONFIG_ISA */
+static int __init sm_lm78_init(void)
+{
+        int res;
+        /* We register the ISA device first, so that we can skip the
+         * registration of an I2C interface to the same device. */
+        res = lm78_isa_register();
+        if (res)
+                goto exit;
+        res = i2c_add_driver(&lm78_driver);
+        if (res)
+                goto exit_unreg_isa_device;
+        return 0;
+ exit_unreg_isa_device:
+        lm78_isa_unregister();
+ exit:
+        return res;
+}
+static void __exit sm_lm78_exit(void)
+{
+        lm78_isa_unregister();
+        i2c_del_driver(&lm78_driver);
+}
-MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>");
+MODULE_AUTHOR("Frodo Looijaard, Jean Delvare <khali@linux-fr.org>");
 MODULE_DESCRIPTION("LM78/LM79 driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/hwmon/max1111.c b/drivers/hwmon/max1111.c
index 14335bbc9bdc..c97b78ef9116 100644
--- a/drivers/hwmon/max1111.c
+++ b/drivers/hwmon/max1111.c
@@ -38,8 +38,8 @@ struct max1111_data {
        struct device           *hwmon_dev;
        struct spi_message      msg;
        struct spi_transfer     xfer[2];
-        uint8_t *tx_buf;
+        uint8_t tx_buf[MAX1111_TX_BUF_SIZE];
-        uint8_t *rx_buf;
+        uint8_t rx_buf[MAX1111_RX_BUF_SIZE];
        struct mutex            drvdata_lock;
        /* protect msg, xfer and buffers from multiple access */
 };
@@ -131,33 +131,23 @@ static const struct attribute_group max1111_attr_group = {
        .attrs  = max1111_attributes,
 };
-static int setup_transfer(struct max1111_data *data)
+static int __devinit setup_transfer(struct max1111_data *data)
 {
        struct spi_message *m;
        struct spi_transfer *x;
-        data->tx_buf = kmalloc(MAX1111_TX_BUF_SIZE, GFP_KERNEL);
-        if (!data->tx_buf)
-                return -ENOMEM;
-        data->rx_buf = kmalloc(MAX1111_RX_BUF_SIZE, GFP_KERNEL);
-        if (!data->rx_buf) {
-                kfree(data->tx_buf);
-                return -ENOMEM;
-        }
        m = &data->msg;
        x = &data->xfer[0];
        spi_message_init(m);
        x->tx_buf = &data->tx_buf[0];
-        x->len = 1;
+        x->len = MAX1111_TX_BUF_SIZE;
        spi_message_add_tail(x, m);
        x++;
        x->rx_buf = &data->rx_buf[0];
-        x->len = 2;
+        x->len = MAX1111_RX_BUF_SIZE;
        spi_message_add_tail(x, m);
        return 0;
@@ -192,7 +182,7 @@ static int __devinit max1111_probe(struct spi_device *spi)
        err = sysfs_create_group(&spi->dev.kobj, &max1111_attr_group);
        if (err) {
                dev_err(&spi->dev, "failed to create attribute group\n");
-                goto err_free_all;
+                goto err_free_data;
        }
        data->hwmon_dev = hwmon_device_register(&spi->dev);
@@ -209,9 +199,6 @@ static int __devinit max1111_probe(struct spi_device *spi)
 err_remove:
        sysfs_remove_group(&spi->dev.kobj, &max1111_attr_group);
-err_free_all:
-        kfree(data->rx_buf);
-        kfree(data->tx_buf);
 err_free_data:
        kfree(data);
        return err;
@@ -224,8 +211,6 @@ static int __devexit max1111_remove(struct spi_device *spi)
        hwmon_device_unregister(data->hwmon_dev);
        sysfs_remove_group(&spi->dev.kobj, &max1111_attr_group);
        mutex_destroy(&data->drvdata_lock);
-        kfree(data->rx_buf);
-        kfree(data->tx_buf);
        kfree(data);
        return 0;
 }
diff --git a/drivers/hwmon/sch5627.c b/drivers/hwmon/sch5627.c
index 3494a4cce414..e3b5c6039c25 100644
--- a/drivers/hwmon/sch5627.c
+++ b/drivers/hwmon/sch5627.c
@@ -28,33 +28,15 @@
 #include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
-#include <linux/io.h>
+#include "sch56xx-common.h"
-#include <linux/acpi.h>
-#include <linux/delay.h>
 #define DRVNAME "sch5627"
 #define DEVNAME DRVNAME /* We only support one model */
-#define SIO_SCH5627_EM_LD       0x0C    /* Embedded Microcontroller LD */
-#define SIO_UNLOCK_KEY          0x55    /* Key to enable Super-I/O */
-#define SIO_LOCK_KEY            0xAA    /* Key to disable Super-I/O */
-#define SIO_REG_LDSEL           0x07    /* Logical device select */
-#define SIO_REG_DEVID           0x20    /* Device ID */
-#define SIO_REG_ENABLE          0x30    /* Logical device enable */
-#define SIO_REG_ADDR            0x66    /* Logical device address (2 bytes) */
-#define SIO_SCH5627_ID          0xC6    /* Chipset ID */
-#define REGION_LENGTH           9
 #define SCH5627_HWMON_ID                0xa5
 #define SCH5627_COMPANY_ID              0x5c
 #define SCH5627_PRIMARY_ID              0xa0
-#define SCH5627_CMD_READ                0x02
-#define SCH5627_CMD_WRITE               0x03
 #define SCH5627_REG_BUILD_CODE          0x39
 #define SCH5627_REG_BUILD_ID            0x3a
 #define SCH5627_REG_HWMON_ID            0x3c
@@ -111,182 +93,6 @@ struct sch5627_data {
        u16 in[SCH5627_NO_IN];
 };
-static struct platform_device *sch5627_pdev;
-/* Super I/O functions */
-static inline int superio_inb(int base, int reg)
-{
-        outb(reg, base);
-        return inb(base + 1);
-}
-static inline int superio_enter(int base)
-{
-        /* Don't step on other drivers' I/O space by accident */
-        if (!request_muxed_region(base, 2, DRVNAME)) {
-                pr_err("I/O address 0x%04x already in use\n", base);
-                return -EBUSY;
-        }
-        outb(SIO_UNLOCK_KEY, base);
-        return 0;
-}
-static inline void superio_select(int base, int ld)
-{
-        outb(SIO_REG_LDSEL, base);
-        outb(ld, base + 1);
-}
-static inline void superio_exit(int base)
-{
-        outb(SIO_LOCK_KEY, base);
-        release_region(base, 2);
-}
-static int sch5627_send_cmd(struct sch5627_data *data, u8 cmd, u16 reg, u8 v)
-{
-        u8 val;
-        int i;
-        /*
-         * According to SMSC for the commands we use the maximum time for
-         * the EM to respond is 15 ms, but testing shows in practice it
-         * responds within 15-32 reads, so we first busy poll, and if
-         * that fails sleep a bit and try again until we are way past
-         * the 15 ms maximum response time.
-         */
-        const int max_busy_polls = 64;
-        const int max_lazy_polls = 32;
-        /* (Optional) Write-Clear the EC to Host Mailbox Register */
-        val = inb(data->addr + 1);
-        outb(val, data->addr + 1);
-        /* Set Mailbox Address Pointer to first location in Region 1 */
-        outb(0x00, data->addr + 2);
-        outb(0x80, data->addr + 3);
-        /* Write Request Packet Header */
-        outb(cmd, data->addr + 4); /* VREG Access Type read:0x02 write:0x03 */
-        outb(0x01, data->addr + 5); /* # of Entries: 1 Byte (8-bit) */
-        outb(0x04, data->addr + 2); /* Mailbox AP to first data entry loc. */
-        /* Write Value field */
-        if (cmd == SCH5627_CMD_WRITE)
-                outb(v, data->addr + 4);
-        /* Write Address field */
-        outb(reg & 0xff, data->addr + 6);
-        outb(reg >> 8, data->addr + 7);
-        /* Execute the Random Access Command */
-        outb(0x01, data->addr); /* Write 01h to the Host-to-EC register */
-        /* EM Interface Polling "Algorithm" */
-        for (i = 0; i < max_busy_polls + max_lazy_polls; i++) {
-                if (i >= max_busy_polls)
-                        msleep(1);
-                /* Read Interrupt source Register */
-                val = inb(data->addr + 8);
-                /* Write Clear the interrupt source bits */
-                if (val)
-                        outb(val, data->addr + 8);
-                /* Command Completed ? */
-                if (val & 0x01)
-                        break;
-        }
-        if (i == max_busy_polls + max_lazy_polls) {
-                pr_err("Max retries exceeded reading virtual "
-                       "register 0x%04hx (%d)\n", reg, 1);
-                return -EIO;
-        }
-        /*
-         * According to SMSC we may need to retry this, but sofar I've always
-         * seen this succeed in 1 try.
-         */
-        for (i = 0; i < max_busy_polls; i++) {
-                /* Read EC-to-Host Register */
-                val = inb(data->addr + 1);
-                /* Command Completed ? */
-                if (val == 0x01)
-                        break;
-                if (i == 0)
-                        pr_warn("EC reports: 0x%02x reading virtual register "
-                                "0x%04hx\n", (unsigned int)val, reg);
-        }
-        if (i == max_busy_polls) {
-                pr_err("Max retries exceeded reading virtual "
-                       "register 0x%04hx (%d)\n", reg, 2);
-                return -EIO;
-        }
-        /*
-         * According to the SMSC app note we should now do:
-         *
-         * Set Mailbox Address Pointer to first location in Region 1 *
-         * outb(0x00, data->addr + 2);
-         * outb(0x80, data->addr + 3);
-         *
-         * But if we do that things don't work, so let's not.
-         */
-        /* Read Value field */
-        if (cmd == SCH5627_CMD_READ)
-                return inb(data->addr + 4);
-        return 0;
-}
-static int sch5627_read_virtual_reg(struct sch5627_data *data, u16 reg)
-{
-        return sch5627_send_cmd(data, SCH5627_CMD_READ, reg, 0);
-}
-static int sch5627_write_virtual_reg(struct sch5627_data *data,
-                                     u16 reg, u8 val)
-{
-        return sch5627_send_cmd(data, SCH5627_CMD_WRITE, reg, val);
-}
-static int sch5627_read_virtual_reg16(struct sch5627_data *data, u16 reg)
-{
-        int lsb, msb;
-        /* Read LSB first, this will cause the matching MSB to be latched */
-        lsb = sch5627_read_virtual_reg(data, reg);
-        if (lsb < 0)
-                return lsb;
-        msb = sch5627_read_virtual_reg(data, reg + 1);
-        if (msb < 0)
-                return msb;
-        return lsb | (msb << 8);
-}
-static int sch5627_read_virtual_reg12(struct sch5627_data *data, u16 msb_reg,
-                                      u16 lsn_reg, int high_nibble)
-{
-        int msb, lsn;
-        /* Read MSB first, this will cause the matching LSN to be latched */
-        msb = sch5627_read_virtual_reg(data, msb_reg);
-        if (msb < 0)
-                return msb;
-        lsn = sch5627_read_virtual_reg(data, lsn_reg);
-        if (lsn < 0)
-                return lsn;
-        if (high_nibble)
-                return (msb << 4) | (lsn >> 4);
-        else
-                return (msb << 4) | (lsn & 0x0f);
-}
 static struct sch5627_data *sch5627_update_device(struct device *dev)
 {
        struct sch5627_data *data = dev_get_drvdata(dev);
@@ -297,7 +103,7 @@ static struct sch5627_data *sch5627_update_device(struct device *dev)
        /* Trigger a Vbat voltage measurement every 5 minutes */
        if (time_after(jiffies, data->last_battery + 300 * HZ)) {
-                sch5627_write_virtual_reg(data, SCH5627_REG_CTRL,
+                sch56xx_write_virtual_reg(data->addr, SCH5627_REG_CTRL,
                                          data->control | 0x10);
                data->last_battery = jiffies;
        }
@@ -305,7 +111,7 @@ static struct sch5627_data *sch5627_update_device(struct device *dev)
        /* Cache the values for 1 second */
        if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {
                for (i = 0; i < SCH5627_NO_TEMPS; i++) {
-                        val = sch5627_read_virtual_reg12(data,
+                        val = sch56xx_read_virtual_reg12(data->addr,
                                SCH5627_REG_TEMP_MSB[i],
                                SCH5627_REG_TEMP_LSN[i],
                                SCH5627_REG_TEMP_HIGH_NIBBLE[i]);
@@ -317,7 +123,7 @@ static struct sch5627_data *sch5627_update_device(struct device *dev)
                }
                for (i = 0; i < SCH5627_NO_FANS; i++) {
-                        val = sch5627_read_virtual_reg16(data,
+                        val = sch56xx_read_virtual_reg16(data->addr,
                                                         SCH5627_REG_FAN[i]);
                        if (unlikely(val < 0)) {
                                ret = ERR_PTR(val);
@@ -327,7 +133,7 @@ static struct sch5627_data *sch5627_update_device(struct device *dev)
                }
                for (i = 0; i < SCH5627_NO_IN; i++) {
-                        val = sch5627_read_virtual_reg12(data,
+                        val = sch56xx_read_virtual_reg12(data->addr,
                                SCH5627_REG_IN_MSB[i],
                                SCH5627_REG_IN_LSN[i],
                                SCH5627_REG_IN_HIGH_NIBBLE[i]);
@@ -355,18 +161,21 @@ static int __devinit sch5627_read_limits(struct sch5627_data *data)
                 * Note what SMSC calls ABS, is what lm_sensors calls max
                 * (aka high), and HIGH is what lm_sensors calls crit.
                 */
-                val = sch5627_read_virtual_reg(data, SCH5627_REG_TEMP_ABS[i]);
+                val = sch56xx_read_virtual_reg(data->addr,
+                                               SCH5627_REG_TEMP_ABS[i]);
                if (val < 0)
                        return val;
                data->temp_max[i] = val;
-                val = sch5627_read_virtual_reg(data, SCH5627_REG_TEMP_HIGH[i]);
+                val = sch56xx_read_virtual_reg(data->addr,
+                                               SCH5627_REG_TEMP_HIGH[i]);
                if (val < 0)
                        return val;
                data->temp_crit[i] = val;
        }
        for (i = 0; i < SCH5627_NO_FANS; i++) {
-                val = sch5627_read_virtual_reg16(data, SCH5627_REG_FAN_MIN[i]);
+                val = sch56xx_read_virtual_reg16(data->addr,
+                                                 SCH5627_REG_FAN_MIN[i]);
                if (val < 0)
                        return val;
                data->fan_min[i] = val;
@@ -667,7 +476,7 @@ static int __devinit sch5627_probe(struct platform_device *pdev)
        mutex_init(&data->update_lock);
        platform_set_drvdata(pdev, data);
-        val = sch5627_read_virtual_reg(data, SCH5627_REG_HWMON_ID);
+        val = sch56xx_read_virtual_reg(data->addr, SCH5627_REG_HWMON_ID);
        if (val < 0) {
                err = val;
                goto error;
@@ -679,7 +488,7 @@ static int __devinit sch5627_probe(struct platform_device *pdev)
                goto error;
        }
-        val = sch5627_read_virtual_reg(data, SCH5627_REG_COMPANY_ID);
+        val = sch56xx_read_virtual_reg(data->addr, SCH5627_REG_COMPANY_ID);
        if (val < 0) {
                err = val;
                goto error;
@@ -691,7 +500,7 @@ static int __devinit sch5627_probe(struct platform_device *pdev)
                goto error;
        }
-        val = sch5627_read_virtual_reg(data, SCH5627_REG_PRIMARY_ID);
+        val = sch56xx_read_virtual_reg(data->addr, SCH5627_REG_PRIMARY_ID);
        if (val < 0) {
                err = val;
                goto error;
@@ -703,25 +512,28 @@ static int __devinit sch5627_probe(struct platform_device *pdev)
                goto error;
        }
-        build_code = sch5627_read_virtual_reg(data, SCH5627_REG_BUILD_CODE);
+        build_code = sch56xx_read_virtual_reg(data->addr,
+                                              SCH5627_REG_BUILD_CODE);
        if (build_code < 0) {
                err = build_code;
                goto error;
        }
-        build_id = sch5627_read_virtual_reg16(data, SCH5627_REG_BUILD_ID);
+        build_id = sch56xx_read_virtual_reg16(data->addr,
+                                              SCH5627_REG_BUILD_ID);
        if (build_id < 0) {
                err = build_id;
                goto error;
        }
-        hwmon_rev = sch5627_read_virtual_reg(data, SCH5627_REG_HWMON_REV);
+        hwmon_rev = sch56xx_read_virtual_reg(data->addr,
+                                             SCH5627_REG_HWMON_REV);
        if (hwmon_rev < 0) {
                err = hwmon_rev;
                goto error;
        }
-        val = sch5627_read_virtual_reg(data, SCH5627_REG_CTRL);
+        val = sch56xx_read_virtual_reg(data->addr, SCH5627_REG_CTRL);
        if (val < 0) {
                err = val;
                goto error;
@@ -734,7 +546,7 @@ static int __devinit sch5627_probe(struct platform_device *pdev)
        }
        /* Trigger a Vbat voltage measurement, so that we get a valid reading
           the first time we read Vbat */
-        sch5627_write_virtual_reg(data, SCH5627_REG_CTRL,
+        sch56xx_write_virtual_reg(data->addr, SCH5627_REG_CTRL,
                                  data->control | 0x10);
        data->last_battery = jiffies;
@@ -746,6 +558,7 @@ static int __devinit sch5627_probe(struct platform_device *pdev)
        if (err)
                goto error;
+        pr_info("found %s chip at %#hx\n", DEVNAME, data->addr);
        pr_info("firmware build: code 0x%02X, id 0x%04X, hwmon: rev 0x%02X\n",
                build_code, build_id, hwmon_rev);
@@ -768,85 +581,6 @@ error:
        return err;
 }
-static int __init sch5627_find(int sioaddr, unsigned short *address)
-{
-        u8 devid;
-        int err = superio_enter(sioaddr);
-        if (err)
-                return err;
-        devid = superio_inb(sioaddr, SIO_REG_DEVID);
-        if (devid != SIO_SCH5627_ID) {
-                pr_debug("Unsupported device id: 0x%02x\n",
-                         (unsigned int)devid);
-                err = -ENODEV;
-                goto exit;
-        }
-        superio_select(sioaddr, SIO_SCH5627_EM_LD);
-        if (!(superio_inb(sioaddr, SIO_REG_ENABLE) & 0x01)) {
-                pr_warn("Device not activated\n");
-                err = -ENODEV;
-                goto exit;
-        }
-        /*
-         * Warning the order of the low / high byte is the other way around
-         * as on most other superio devices!!
-         */
-        *address = superio_inb(sioaddr, SIO_REG_ADDR) |
-                   superio_inb(sioaddr, SIO_REG_ADDR + 1) << 8;
-        if (*address == 0) {
-                pr_warn("Base address not set\n");
-                err = -ENODEV;
-                goto exit;
-        }
-        pr_info("Found %s chip at %#hx\n", DEVNAME, *address);
-exit:
-        superio_exit(sioaddr);
-        return err;
-}
-static int __init sch5627_device_add(unsigned short address)
-{
-        struct resource res = {
-                .start  = address,
-                .end    = address + REGION_LENGTH - 1,
-                .flags  = IORESOURCE_IO,
-        };
-        int err;
-        sch5627_pdev = platform_device_alloc(DRVNAME, address);
-        if (!sch5627_pdev)
-                return -ENOMEM;
-        res.name = sch5627_pdev->name;
-        err = acpi_check_resource_conflict(&res);
-        if (err)
-                goto exit_device_put;
-        err = platform_device_add_resources(sch5627_pdev, &res, 1);
-        if (err) {
-                pr_err("Device resource addition failed\n");
-                goto exit_device_put;
-        }
-        err = platform_device_add(sch5627_pdev);
-        if (err) {
-                pr_err("Device addition failed\n");
-                goto exit_device_put;
-        }
-        return 0;
-exit_device_put:
-        platform_device_put(sch5627_pdev);
-        return err;
-}
 static struct platform_driver sch5627_driver = {
        .driver = {
                .owner  = THIS_MODULE,
@@ -858,31 +592,11 @@ static struct platform_driver sch5627_driver = {
 static int __init sch5627_init(void)
 {
-        int err = -ENODEV;
+        return platform_driver_register(&sch5627_driver);
-        unsigned short address;
-        if (sch5627_find(0x4e, &address) && sch5627_find(0x2e, &address))
-                goto exit;
-        err = platform_driver_register(&sch5627_driver);
-        if (err)
-                goto exit;
-        err = sch5627_device_add(address);
-        if (err)
-                goto exit_driver;
-        return 0;
-exit_driver:
-        platform_driver_unregister(&sch5627_driver);
-exit:
-        return err;
 }
 static void __exit sch5627_exit(void)
 {
-        platform_device_unregister(sch5627_pdev);
        platform_driver_unregister(&sch5627_driver);
 }
diff --git a/drivers/hwmon/sch5636.c b/drivers/hwmon/sch5636.c
new file mode 100644
index 000000000000..244407aa79fc
--- /dev/null
+++ b/drivers/hwmon/sch5636.c
@@ -0,0 +1,539 @@
+/***************************************************************************
+ *   Copyright (C) 2011 Hans de Goede <hdegoede@redhat.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.                                   *
+ *                                                                         *
+ *   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.             *
+ ***************************************************************************/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/jiffies.h>
+#include <linux/platform_device.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include "sch56xx-common.h"
+#define DRVNAME "sch5636"
+#define DEVNAME "theseus" /* We only support one model for now */
+#define SCH5636_REG_FUJITSU_ID          0x780
+#define SCH5636_REG_FUJITSU_REV         0x783
+#define SCH5636_NO_INS                  5
+#define SCH5636_NO_TEMPS                16
+#define SCH5636_NO_FANS                 8
+static const u16 SCH5636_REG_IN_VAL[SCH5636_NO_INS] = {
+        0x22, 0x23, 0x24, 0x25, 0x189 };
+static const u16 SCH5636_REG_IN_FACTORS[SCH5636_NO_INS] = {
+        4400, 1500, 4000, 4400, 16000 };
+static const char * const SCH5636_IN_LABELS[SCH5636_NO_INS] = {
+        "3.3V", "VREF", "VBAT", "3.3AUX", "12V" };
+static const u16 SCH5636_REG_TEMP_VAL[SCH5636_NO_TEMPS] = {
+        0x2B, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x180, 0x181,
+        0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C };
+#define SCH5636_REG_TEMP_CTRL(i)        (0x790 + (i))
+#define SCH5636_TEMP_WORKING            0x01
+#define SCH5636_TEMP_ALARM              0x02
+#define SCH5636_TEMP_DEACTIVATED        0x80
+static const u16 SCH5636_REG_FAN_VAL[SCH5636_NO_FANS] = {
+        0x2C, 0x2E, 0x30, 0x32, 0x62, 0x64, 0x66, 0x68 };
+#define SCH5636_REG_FAN_CTRL(i)         (0x880 + (i))
+/* FAULT in datasheet, but acts as an alarm */
+#define SCH5636_FAN_ALARM               0x04
+#define SCH5636_FAN_NOT_PRESENT         0x08
+#define SCH5636_FAN_DEACTIVATED         0x80
+struct sch5636_data {
+        unsigned short addr;
+        struct device *hwmon_dev;
+        struct mutex update_lock;
+        char valid;                     /* !=0 if following fields are valid */
+        unsigned long last_updated;     /* In jiffies */
+        u8 in[SCH5636_NO_INS];
+        u8 temp_val[SCH5636_NO_TEMPS];
+        u8 temp_ctrl[SCH5636_NO_TEMPS];
+        u16 fan_val[SCH5636_NO_FANS];
+        u8 fan_ctrl[SCH5636_NO_FANS];
+};
+static struct sch5636_data *sch5636_update_device(struct device *dev)
+{
+        struct sch5636_data *data = dev_get_drvdata(dev);
+        struct sch5636_data *ret = data;
+        int i, val;
+        mutex_lock(&data->update_lock);
+        /* Cache the values for 1 second */
+        if (data->valid && !time_after(jiffies, data->last_updated + HZ))
+                goto abort;
+        for (i = 0; i < SCH5636_NO_INS; i++) {
+                val = sch56xx_read_virtual_reg(data->addr,
+                                               SCH5636_REG_IN_VAL[i]);
+                if (unlikely(val < 0)) {
+                        ret = ERR_PTR(val);
+                        goto abort;
+                }
+                data->in[i] = val;
+        }
+        for (i = 0; i < SCH5636_NO_TEMPS; i++) {
+                if (data->temp_ctrl[i] & SCH5636_TEMP_DEACTIVATED)
+                        continue;
+                val = sch56xx_read_virtual_reg(data->addr,
+                                               SCH5636_REG_TEMP_VAL[i]);
+                if (unlikely(val < 0)) {
+                        ret = ERR_PTR(val);
+                        goto abort;
+                }
+                data->temp_val[i] = val;
+                val = sch56xx_read_virtual_reg(data->addr,
+                                               SCH5636_REG_TEMP_CTRL(i));
+                if (unlikely(val < 0)) {
+                        ret = ERR_PTR(val);
+                        goto abort;
+                }
+                data->temp_ctrl[i] = val;
+                /* Alarms need to be explicitly write-cleared */
+                if (val & SCH5636_TEMP_ALARM) {
+                        sch56xx_write_virtual_reg(data->addr,
+                                                SCH5636_REG_TEMP_CTRL(i), val);
+                }
+        }
+        for (i = 0; i < SCH5636_NO_FANS; i++) {
+                if (data->fan_ctrl[i] & SCH5636_FAN_DEACTIVATED)
+                        continue;
+                val = sch56xx_read_virtual_reg16(data->addr,
+                                                 SCH5636_REG_FAN_VAL[i]);
+                if (unlikely(val < 0)) {
+                        ret = ERR_PTR(val);
+                        goto abort;
+                }
+                data->fan_val[i] = val;
+                val = sch56xx_read_virtual_reg(data->addr,
+                                               SCH5636_REG_FAN_CTRL(i));
+                if (unlikely(val < 0)) {
+                        ret = ERR_PTR(val);
+                        goto abort;
+                }
+                data->fan_ctrl[i] = val;
+                /* Alarms need to be explicitly write-cleared */
+                if (val & SCH5636_FAN_ALARM) {
+                        sch56xx_write_virtual_reg(data->addr,
+                                                SCH5636_REG_FAN_CTRL(i), val);
+                }
+        }
+        data->last_updated = jiffies;
+        data->valid = 1;
+abort:
+        mutex_unlock(&data->update_lock);
+        return ret;
+}
+static int reg_to_rpm(u16 reg)
+{
+        if (reg == 0)
+                return -EIO;
+        if (reg == 0xffff)
+                return 0;
+        return 5400540 / reg;
+}
+static ssize_t show_name(struct device *dev, struct device_attribute *devattr,
+        char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%s\n", DEVNAME);
+}
+static ssize_t show_in_value(struct device *dev, struct device_attribute
+        *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct sch5636_data *data = sch5636_update_device(dev);
+        int val;
+        if (IS_ERR(data))
+                return PTR_ERR(data);
+        val = DIV_ROUND_CLOSEST(
+                data->in[attr->index] * SCH5636_REG_IN_FACTORS[attr->index],
+                255);
+        return snprintf(buf, PAGE_SIZE, "%d\n", val);
+}
+static ssize_t show_in_label(struct device *dev, struct device_attribute
+        *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        return snprintf(buf, PAGE_SIZE, "%s\n",
+                        SCH5636_IN_LABELS[attr->index]);
+}
+static ssize_t show_temp_value(struct device *dev, struct device_attribute
+        *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct sch5636_data *data = sch5636_update_device(dev);
+        int val;
+        if (IS_ERR(data))
+                return PTR_ERR(data);
+        val = (data->temp_val[attr->index] - 64) * 1000;
+        return snprintf(buf, PAGE_SIZE, "%d\n", val);
+}
+static ssize_t show_temp_fault(struct device *dev, struct device_attribute
+        *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct sch5636_data *data = sch5636_update_device(dev);
+        int val;
+        if (IS_ERR(data))
+                return PTR_ERR(data);
+        val = (data->temp_ctrl[attr->index] & SCH5636_TEMP_WORKING) ? 0 : 1;
+        return snprintf(buf, PAGE_SIZE, "%d\n", val);
+}
+static ssize_t show_temp_alarm(struct device *dev, struct device_attribute
+        *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct sch5636_data *data = sch5636_update_device(dev);
+        int val;
+        if (IS_ERR(data))
+                return PTR_ERR(data);
+        val = (data->temp_ctrl[attr->index] & SCH5636_TEMP_ALARM) ? 1 : 0;
+        return snprintf(buf, PAGE_SIZE, "%d\n", val);
+}
+static ssize_t show_fan_value(struct device *dev, struct device_attribute
+        *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct sch5636_data *data = sch5636_update_device(dev);
+        int val;
+        if (IS_ERR(data))
+                return PTR_ERR(data);
+        val = reg_to_rpm(data->fan_val[attr->index]);
+        if (val < 0)
+                return val;
+        return snprintf(buf, PAGE_SIZE, "%d\n", val);
+}
+static ssize_t show_fan_fault(struct device *dev, struct device_attribute
+        *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct sch5636_data *data = sch5636_update_device(dev);
+        int val;
+        if (IS_ERR(data))
+                return PTR_ERR(data);
+        val = (data->fan_ctrl[attr->index] & SCH5636_FAN_NOT_PRESENT) ? 1 : 0;
+        return snprintf(buf, PAGE_SIZE, "%d\n", val);
+}
+static ssize_t show_fan_alarm(struct device *dev, struct device_attribute
+        *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct sch5636_data *data = sch5636_update_device(dev);
+        int val;
+        if (IS_ERR(data))
+                return PTR_ERR(data);
+        val = (data->fan_ctrl[attr->index] & SCH5636_FAN_ALARM) ? 1 : 0;
+        return snprintf(buf, PAGE_SIZE, "%d\n", val);
+}
+static struct sensor_device_attribute sch5636_attr[] = {
+        SENSOR_ATTR(name, 0444, show_name, NULL, 0),
+        SENSOR_ATTR(in0_input, 0444, show_in_value, NULL, 0),
+        SENSOR_ATTR(in0_label, 0444, show_in_label, NULL, 0),
+        SENSOR_ATTR(in1_input, 0444, show_in_value, NULL, 1),
+        SENSOR_ATTR(in1_label, 0444, show_in_label, NULL, 1),
+        SENSOR_ATTR(in2_input, 0444, show_in_value, NULL, 2),
+        SENSOR_ATTR(in2_label, 0444, show_in_label, NULL, 2),
+        SENSOR_ATTR(in3_input, 0444, show_in_value, NULL, 3),
+        SENSOR_ATTR(in3_label, 0444, show_in_label, NULL, 3),
+        SENSOR_ATTR(in4_input, 0444, show_in_value, NULL, 4),
+        SENSOR_ATTR(in4_label, 0444, show_in_label, NULL, 4),
+};
+static struct sensor_device_attribute sch5636_temp_attr[] = {
+        SENSOR_ATTR(temp1_input, 0444, show_temp_value, NULL, 0),
+        SENSOR_ATTR(temp1_fault, 0444, show_temp_fault, NULL, 0),
+        SENSOR_ATTR(temp1_alarm, 0444, show_temp_alarm, NULL, 0),
+        SENSOR_ATTR(temp2_input, 0444, show_temp_value, NULL, 1),
+        SENSOR_ATTR(temp2_fault, 0444, show_temp_fault, NULL, 1),
+        SENSOR_ATTR(temp2_alarm, 0444, show_temp_alarm, NULL, 1),
+        SENSOR_ATTR(temp3_input, 0444, show_temp_value, NULL, 2),
+        SENSOR_ATTR(temp3_fault, 0444, show_temp_fault, NULL, 2),
+        SENSOR_ATTR(temp3_alarm, 0444, show_temp_alarm, NULL, 2),
+        SENSOR_ATTR(temp4_input, 0444, show_temp_value, NULL, 3),
+        SENSOR_ATTR(temp4_fault, 0444, show_temp_fault, NULL, 3),
+        SENSOR_ATTR(temp4_alarm, 0444, show_temp_alarm, NULL, 3),
+        SENSOR_ATTR(temp5_input, 0444, show_temp_value, NULL, 4),
+        SENSOR_ATTR(temp5_fault, 0444, show_temp_fault, NULL, 4),
+        SENSOR_ATTR(temp5_alarm, 0444, show_temp_alarm, NULL, 4),
+        SENSOR_ATTR(temp6_input, 0444, show_temp_value, NULL, 5),
+        SENSOR_ATTR(temp6_fault, 0444, show_temp_fault, NULL, 5),
+        SENSOR_ATTR(temp6_alarm, 0444, show_temp_alarm, NULL, 5),
+        SENSOR_ATTR(temp7_input, 0444, show_temp_value, NULL, 6),
+        SENSOR_ATTR(temp7_fault, 0444, show_temp_fault, NULL, 6),
+        SENSOR_ATTR(temp7_alarm, 0444, show_temp_alarm, NULL, 6),
+        SENSOR_ATTR(temp8_input, 0444, show_temp_value, NULL, 7),
+        SENSOR_ATTR(temp8_fault, 0444, show_temp_fault, NULL, 7),
+        SENSOR_ATTR(temp8_alarm, 0444, show_temp_alarm, NULL, 7),
+        SENSOR_ATTR(temp9_input, 0444, show_temp_value, NULL, 8),
+        SENSOR_ATTR(temp9_fault, 0444, show_temp_fault, NULL, 8),
+        SENSOR_ATTR(temp9_alarm, 0444, show_temp_alarm, NULL, 8),
+        SENSOR_ATTR(temp10_input, 0444, show_temp_value, NULL, 9),
+        SENSOR_ATTR(temp10_fault, 0444, show_temp_fault, NULL, 9),
+        SENSOR_ATTR(temp10_alarm, 0444, show_temp_alarm, NULL, 9),
+        SENSOR_ATTR(temp11_input, 0444, show_temp_value, NULL, 10),
+        SENSOR_ATTR(temp11_fault, 0444, show_temp_fault, NULL, 10),
+        SENSOR_ATTR(temp11_alarm, 0444, show_temp_alarm, NULL, 10),
+        SENSOR_ATTR(temp12_input, 0444, show_temp_value, NULL, 11),
+        SENSOR_ATTR(temp12_fault, 0444, show_temp_fault, NULL, 11),
+        SENSOR_ATTR(temp12_alarm, 0444, show_temp_alarm, NULL, 11),
+        SENSOR_ATTR(temp13_input, 0444, show_temp_value, NULL, 12),
+        SENSOR_ATTR(temp13_fault, 0444, show_temp_fault, NULL, 12),
+        SENSOR_ATTR(temp13_alarm, 0444, show_temp_alarm, NULL, 12),
+        SENSOR_ATTR(temp14_input, 0444, show_temp_value, NULL, 13),
+        SENSOR_ATTR(temp14_fault, 0444, show_temp_fault, NULL, 13),
+        SENSOR_ATTR(temp14_alarm, 0444, show_temp_alarm, NULL, 13),
+        SENSOR_ATTR(temp15_input, 0444, show_temp_value, NULL, 14),
+        SENSOR_ATTR(temp15_fault, 0444, show_temp_fault, NULL, 14),
+        SENSOR_ATTR(temp15_alarm, 0444, show_temp_alarm, NULL, 14),
+        SENSOR_ATTR(temp16_input, 0444, show_temp_value, NULL, 15),
+        SENSOR_ATTR(temp16_fault, 0444, show_temp_fault, NULL, 15),
+        SENSOR_ATTR(temp16_alarm, 0444, show_temp_alarm, NULL, 15),
+};
+static struct sensor_device_attribute sch5636_fan_attr[] = {
+        SENSOR_ATTR(fan1_input, 0444, show_fan_value, NULL, 0),
+        SENSOR_ATTR(fan1_fault, 0444, show_fan_fault, NULL, 0),
+        SENSOR_ATTR(fan1_alarm, 0444, show_fan_alarm, NULL, 0),
+        SENSOR_ATTR(fan2_input, 0444, show_fan_value, NULL, 1),
+        SENSOR_ATTR(fan2_fault, 0444, show_fan_fault, NULL, 1),
+        SENSOR_ATTR(fan2_alarm, 0444, show_fan_alarm, NULL, 1),
+        SENSOR_ATTR(fan3_input, 0444, show_fan_value, NULL, 2),
+        SENSOR_ATTR(fan3_fault, 0444, show_fan_fault, NULL, 2),
+        SENSOR_ATTR(fan3_alarm, 0444, show_fan_alarm, NULL, 2),
+        SENSOR_ATTR(fan4_input, 0444, show_fan_value, NULL, 3),
+        SENSOR_ATTR(fan4_fault, 0444, show_fan_fault, NULL, 3),
+        SENSOR_ATTR(fan4_alarm, 0444, show_fan_alarm, NULL, 3),
+        SENSOR_ATTR(fan5_input, 0444, show_fan_value, NULL, 4),
+        SENSOR_ATTR(fan5_fault, 0444, show_fan_fault, NULL, 4),
+        SENSOR_ATTR(fan5_alarm, 0444, show_fan_alarm, NULL, 4),
+        SENSOR_ATTR(fan6_input, 0444, show_fan_value, NULL, 5),
+        SENSOR_ATTR(fan6_fault, 0444, show_fan_fault, NULL, 5),
+        SENSOR_ATTR(fan6_alarm, 0444, show_fan_alarm, NULL, 5),
+        SENSOR_ATTR(fan7_input, 0444, show_fan_value, NULL, 6),
+        SENSOR_ATTR(fan7_fault, 0444, show_fan_fault, NULL, 6),
+        SENSOR_ATTR(fan7_alarm, 0444, show_fan_alarm, NULL, 6),
+        SENSOR_ATTR(fan8_input, 0444, show_fan_value, NULL, 7),
+        SENSOR_ATTR(fan8_fault, 0444, show_fan_fault, NULL, 7),
+        SENSOR_ATTR(fan8_alarm, 0444, show_fan_alarm, NULL, 7),
+};
+static int sch5636_remove(struct platform_device *pdev)
+{
+        struct sch5636_data *data = platform_get_drvdata(pdev);
+        int i;
+        if (data->hwmon_dev)
+                hwmon_device_unregister(data->hwmon_dev);
+        for (i = 0; i < ARRAY_SIZE(sch5636_attr); i++)
+                device_remove_file(&pdev->dev, &sch5636_attr[i].dev_attr);
+        for (i = 0; i < SCH5636_NO_TEMPS * 3; i++)
+                device_remove_file(&pdev->dev,
+                                   &sch5636_temp_attr[i].dev_attr);
+        for (i = 0; i < SCH5636_NO_FANS * 3; i++)
+                device_remove_file(&pdev->dev,
+                                   &sch5636_fan_attr[i].dev_attr);
+        platform_set_drvdata(pdev, NULL);
+        kfree(data);
+        return 0;
+}
+static int __devinit sch5636_probe(struct platform_device *pdev)
+{
+        struct sch5636_data *data;
+        int i, err, val, revision[2];
+        char id[4];
+        data = kzalloc(sizeof(struct sch5636_data), GFP_KERNEL);
+        if (!data)
+                return -ENOMEM;
+        data->addr = platform_get_resource(pdev, IORESOURCE_IO, 0)->start;
+        mutex_init(&data->update_lock);
+        platform_set_drvdata(pdev, data);
+        for (i = 0; i < 3; i++) {
+                val = sch56xx_read_virtual_reg(data->addr,
+                                               SCH5636_REG_FUJITSU_ID + i);
+                if (val < 0) {
+                        pr_err("Could not read Fujitsu id byte at %#x\n",
+                                SCH5636_REG_FUJITSU_ID + i);
+                        err = val;
+                        goto error;
+                }
+                id[i] = val;
+        }
+        id[i] = '\0';
+        if (strcmp(id, "THS")) {
+                pr_err("Unknown Fujitsu id: %02x%02x%02x\n",
+                       id[0], id[1], id[2]);
+                err = -ENODEV;
+                goto error;
+        }
+        for (i = 0; i < 2; i++) {
+                val = sch56xx_read_virtual_reg(data->addr,
+                                               SCH5636_REG_FUJITSU_REV + i);
+                if (val < 0) {
+                        err = val;
+                        goto error;
+                }
+                revision[i] = val;
+        }
+        pr_info("Found %s chip at %#hx, revison: %d.%02d\n", DEVNAME,
+                data->addr, revision[0], revision[1]);
+        /* Read all temp + fan ctrl registers to determine which are active */
+        for (i = 0; i < SCH5636_NO_TEMPS; i++) {
+                val = sch56xx_read_virtual_reg(data->addr,
+                                               SCH5636_REG_TEMP_CTRL(i));
+                if (unlikely(val < 0)) {
+                        err = val;
+                        goto error;
+                }
+                data->temp_ctrl[i] = val;
+        }
+        for (i = 0; i < SCH5636_NO_FANS; i++) {
+                val = sch56xx_read_virtual_reg(data->addr,
+                                               SCH5636_REG_FAN_CTRL(i));
+                if (unlikely(val < 0)) {
+                        err = val;
+                        goto error;
+                }
+                data->fan_ctrl[i] = val;
+        }
+        for (i = 0; i < ARRAY_SIZE(sch5636_attr); i++) {
+                err = device_create_file(&pdev->dev,
+                                         &sch5636_attr[i].dev_attr);
+                if (err)
+                        goto error;
+        }
+        for (i = 0; i < (SCH5636_NO_TEMPS * 3); i++) {
+                if (data->temp_ctrl[i/3] & SCH5636_TEMP_DEACTIVATED)
+                        continue;
+                err = device_create_file(&pdev->dev,
+                                        &sch5636_temp_attr[i].dev_attr);
+                if (err)
+                        goto error;
+        }
+        for (i = 0; i < (SCH5636_NO_FANS * 3); i++) {
+                if (data->fan_ctrl[i/3] & SCH5636_FAN_DEACTIVATED)
+                        continue;
+                err = device_create_file(&pdev->dev,
+                                        &sch5636_fan_attr[i].dev_attr);
+                if (err)
+                        goto error;
+        }
+        data->hwmon_dev = hwmon_device_register(&pdev->dev);
+        if (IS_ERR(data->hwmon_dev)) {
+                err = PTR_ERR(data->hwmon_dev);
+                data->hwmon_dev = NULL;
+                goto error;
+        }
+        return 0;
+error:
+        sch5636_remove(pdev);
+        return err;
+}
+static struct platform_driver sch5636_driver = {
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = DRVNAME,
+        },
+        .probe          = sch5636_probe,
+        .remove         = sch5636_remove,
+};
+static int __init sch5636_init(void)
+{
+        return platform_driver_register(&sch5636_driver);
+}
+static void __exit sch5636_exit(void)
+{
+        platform_driver_unregister(&sch5636_driver);
+}
+MODULE_DESCRIPTION("SMSC SCH5636 Hardware Monitoring Driver");
+MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
+MODULE_LICENSE("GPL");
+module_init(sch5636_init);
+module_exit(sch5636_exit);
diff --git a/drivers/hwmon/sch56xx-common.c b/drivers/hwmon/sch56xx-common.c
new file mode 100644
index 000000000000..fac32ee0b10e
--- /dev/null
+++ b/drivers/hwmon/sch56xx-common.c
@@ -0,0 +1,340 @@
+/***************************************************************************
+ *   Copyright (C) 2010-2011 Hans de Goede <hdegoede@redhat.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.                                   *
+ *                                                                         *
+ *   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.             *
+ ***************************************************************************/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/acpi.h>
+#include <linux/delay.h>
+#include "sch56xx-common.h"
+#define SIO_SCH56XX_LD_EM       0x0C    /* Embedded uController Logical Dev */
+#define SIO_UNLOCK_KEY          0x55    /* Key to enable Super-I/O */
+#define SIO_LOCK_KEY            0xAA    /* Key to disable Super-I/O */
+#define SIO_REG_LDSEL           0x07    /* Logical device select */
+#define SIO_REG_DEVID           0x20    /* Device ID */
+#define SIO_REG_ENABLE          0x30    /* Logical device enable */
+#define SIO_REG_ADDR            0x66    /* Logical device address (2 bytes) */
+#define SIO_SCH5627_ID          0xC6    /* Chipset ID */
+#define SIO_SCH5636_ID          0xC7    /* Chipset ID */
+#define REGION_LENGTH           9
+#define SCH56XX_CMD_READ        0x02
+#define SCH56XX_CMD_WRITE       0x03
+static struct platform_device *sch56xx_pdev;
+/* Super I/O functions */
+static inline int superio_inb(int base, int reg)
+{
+        outb(reg, base);
+        return inb(base + 1);
+}
+static inline int superio_enter(int base)
+{
+        /* Don't step on other drivers' I/O space by accident */
+        if (!request_muxed_region(base, 2, "sch56xx")) {
+                pr_err("I/O address 0x%04x already in use\n", base);
+                return -EBUSY;
+        }
+        outb(SIO_UNLOCK_KEY, base);
+        return 0;
+}
+static inline void superio_select(int base, int ld)
+{
+        outb(SIO_REG_LDSEL, base);
+        outb(ld, base + 1);
+}
+static inline void superio_exit(int base)
+{
+        outb(SIO_LOCK_KEY, base);
+        release_region(base, 2);
+}
+static int sch56xx_send_cmd(u16 addr, u8 cmd, u16 reg, u8 v)
+{
+        u8 val;
+        int i;
+        /*
+         * According to SMSC for the commands we use the maximum time for
+         * the EM to respond is 15 ms, but testing shows in practice it
+         * responds within 15-32 reads, so we first busy poll, and if
+         * that fails sleep a bit and try again until we are way past
+         * the 15 ms maximum response time.
+         */
+        const int max_busy_polls = 64;
+        const int max_lazy_polls = 32;
+        /* (Optional) Write-Clear the EC to Host Mailbox Register */
+        val = inb(addr + 1);
+        outb(val, addr + 1);
+        /* Set Mailbox Address Pointer to first location in Region 1 */
+        outb(0x00, addr + 2);
+        outb(0x80, addr + 3);
+        /* Write Request Packet Header */
+        outb(cmd, addr + 4); /* VREG Access Type read:0x02 write:0x03 */
+        outb(0x01, addr + 5); /* # of Entries: 1 Byte (8-bit) */
+        outb(0x04, addr + 2); /* Mailbox AP to first data entry loc. */
+        /* Write Value field */
+        if (cmd == SCH56XX_CMD_WRITE)
+                outb(v, addr + 4);
+        /* Write Address field */
+        outb(reg & 0xff, addr + 6);
+        outb(reg >> 8, addr + 7);
+        /* Execute the Random Access Command */
+        outb(0x01, addr); /* Write 01h to the Host-to-EC register */
+        /* EM Interface Polling "Algorithm" */
+        for (i = 0; i < max_busy_polls + max_lazy_polls; i++) {
+                if (i >= max_busy_polls)
+                        msleep(1);
+                /* Read Interrupt source Register */
+                val = inb(addr + 8);
+                /* Write Clear the interrupt source bits */
+                if (val)
+                        outb(val, addr + 8);
+                /* Command Completed ? */
+                if (val & 0x01)
+                        break;
+        }
+        if (i == max_busy_polls + max_lazy_polls) {
+                pr_err("Max retries exceeded reading virtual "
+                       "register 0x%04hx (%d)\n", reg, 1);
+                return -EIO;
+        }
+        /*
+         * According to SMSC we may need to retry this, but sofar I've always
+         * seen this succeed in 1 try.
+         */
+        for (i = 0; i < max_busy_polls; i++) {
+                /* Read EC-to-Host Register */
+                val = inb(addr + 1);
+                /* Command Completed ? */
+                if (val == 0x01)
+                        break;
+                if (i == 0)
+                        pr_warn("EC reports: 0x%02x reading virtual register "
+                                "0x%04hx\n", (unsigned int)val, reg);
+        }
+        if (i == max_busy_polls) {
+                pr_err("Max retries exceeded reading virtual "
+                       "register 0x%04hx (%d)\n", reg, 2);
+                return -EIO;
+        }
+        /*
+         * According to the SMSC app note we should now do:
+         *
+         * Set Mailbox Address Pointer to first location in Region 1 *
+         * outb(0x00, addr + 2);
+         * outb(0x80, addr + 3);
+         *
+         * But if we do that things don't work, so let's not.
+         */
+        /* Read Value field */
+        if (cmd == SCH56XX_CMD_READ)
+                return inb(addr + 4);
+        return 0;
+}
+int sch56xx_read_virtual_reg(u16 addr, u16 reg)
+{
+        return sch56xx_send_cmd(addr, SCH56XX_CMD_READ, reg, 0);
+}
+EXPORT_SYMBOL(sch56xx_read_virtual_reg);
+int sch56xx_write_virtual_reg(u16 addr, u16 reg, u8 val)
+{
+        return sch56xx_send_cmd(addr, SCH56XX_CMD_WRITE, reg, val);
+}
+EXPORT_SYMBOL(sch56xx_write_virtual_reg);
+int sch56xx_read_virtual_reg16(u16 addr, u16 reg)
+{
+        int lsb, msb;
+        /* Read LSB first, this will cause the matching MSB to be latched */
+        lsb = sch56xx_read_virtual_reg(addr, reg);
+        if (lsb < 0)
+                return lsb;
+        msb = sch56xx_read_virtual_reg(addr, reg + 1);
+        if (msb < 0)
+                return msb;
+        return lsb | (msb << 8);
+}
+EXPORT_SYMBOL(sch56xx_read_virtual_reg16);
+int sch56xx_read_virtual_reg12(u16 addr, u16 msb_reg, u16 lsn_reg,
+                               int high_nibble)
+{
+        int msb, lsn;
+        /* Read MSB first, this will cause the matching LSN to be latched */
+        msb = sch56xx_read_virtual_reg(addr, msb_reg);
+        if (msb < 0)
+                return msb;
+        lsn = sch56xx_read_virtual_reg(addr, lsn_reg);
+        if (lsn < 0)
+                return lsn;
+        if (high_nibble)
+                return (msb << 4) | (lsn >> 4);
+        else
+                return (msb << 4) | (lsn & 0x0f);
+}
+EXPORT_SYMBOL(sch56xx_read_virtual_reg12);
+static int __init sch56xx_find(int sioaddr, unsigned short *address,
+                               const char **name)
+{
+        u8 devid;
+        int err;
+        err = superio_enter(sioaddr);
+        if (err)
+                return err;
+        devid = superio_inb(sioaddr, SIO_REG_DEVID);
+        switch (devid) {
+        case SIO_SCH5627_ID:
+                *name = "sch5627";
+                break;
+        case SIO_SCH5636_ID:
+                *name = "sch5636";
+                break;
+        default:
+                pr_debug("Unsupported device id: 0x%02x\n",
+                         (unsigned int)devid);
+                err = -ENODEV;
+                goto exit;
+        }
+        superio_select(sioaddr, SIO_SCH56XX_LD_EM);
+        if (!(superio_inb(sioaddr, SIO_REG_ENABLE) & 0x01)) {
+                pr_warn("Device not activated\n");
+                err = -ENODEV;
+                goto exit;
+        }
+        /*
+         * Warning the order of the low / high byte is the other way around
+         * as on most other superio devices!!
+         */
+        *address = superio_inb(sioaddr, SIO_REG_ADDR) |
+                   superio_inb(sioaddr, SIO_REG_ADDR + 1) << 8;
+        if (*address == 0) {
+                pr_warn("Base address not set\n");
+                err = -ENODEV;
+                goto exit;
+        }
+exit:
+        superio_exit(sioaddr);
+        return err;
+}
+static int __init sch56xx_device_add(unsigned short address, const char *name)
+{
+        struct resource res = {
+                .start  = address,
+                .end    = address + REGION_LENGTH - 1,
+                .flags  = IORESOURCE_IO,
+        };
+        int err;
+        sch56xx_pdev = platform_device_alloc(name, address);
+        if (!sch56xx_pdev)
+                return -ENOMEM;
+        res.name = sch56xx_pdev->name;
+        err = acpi_check_resource_conflict(&res);
+        if (err)
+                goto exit_device_put;
+        err = platform_device_add_resources(sch56xx_pdev, &res, 1);
+        if (err) {
+                pr_err("Device resource addition failed\n");
+                goto exit_device_put;
+        }
+        err = platform_device_add(sch56xx_pdev);
+        if (err) {
+                pr_err("Device addition failed\n");
+                goto exit_device_put;
+        }
+        return 0;
+exit_device_put:
+        platform_device_put(sch56xx_pdev);
+        return err;
+}
+static int __init sch56xx_init(void)
+{
+        int err;
+        unsigned short address;
+        const char *name;
+        err = sch56xx_find(0x4e, &address, &name);
+        if (err)
+                err = sch56xx_find(0x2e, &address, &name);
+        if (err)
+                return err;
+        return sch56xx_device_add(address, name);
+}
+static void __exit sch56xx_exit(void)
+{
+        platform_device_unregister(sch56xx_pdev);
+}
+MODULE_DESCRIPTION("SMSC SCH56xx Hardware Monitoring Common Code");
+MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
+MODULE_LICENSE("GPL");
+module_init(sch56xx_init);
+module_exit(sch56xx_exit);
diff --git a/drivers/hwmon/sch56xx-common.h b/drivers/hwmon/sch56xx-common.h
new file mode 100644
index 000000000000..d5eaf3b9ebf5
--- /dev/null
+++ b/drivers/hwmon/sch56xx-common.h
@@ -0,0 +1,24 @@
+/***************************************************************************
+ *   Copyright (C) 2010-2011 Hans de Goede <hdegoede@redhat.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.                                   *
+ *                                                                         *
+ *   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.             *
+ ***************************************************************************/
+int sch56xx_read_virtual_reg(u16 addr, u16 reg);
+int sch56xx_write_virtual_reg(u16 addr, u16 reg, u8 val);
+int sch56xx_read_virtual_reg16(u16 addr, u16 reg);
+int sch56xx_read_virtual_reg12(u16 addr, u16 msb_reg, u16 lsn_reg,
+                               int high_nibble);
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
index cf4330b352ef..7d231cf5d2ce 100644
--- a/drivers/hwmon/sht15.c
+++ b/drivers/hwmon/sht15.c
@@ -671,7 +671,7 @@ static ssize_t sht15_show_status(struct device *dev,
 * @buf:        sysfs buffer to read the new heater state from.
 * @count:      length of the data.
 *
- * Will be called on read access to heater_enable sysfs attribute.
+ * Will be called on write access to heater_enable sysfs attribute.
 * Returns number of bytes actually decoded, negative errno on error.
 */
 static ssize_t sht15_store_heater(struct device *dev,
diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
index 0d18de424c66..8eac67d769fa 100644
--- a/drivers/hwmon/via-cputemp.c
+++ b/drivers/hwmon/via-cputemp.c
@@ -27,6 +27,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
 #include <linux/sysfs.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
@@ -48,8 +49,10 @@ enum { SHOW_TEMP, SHOW_LABEL, SHOW_NAME };
 struct via_cputemp_data {
        struct device *hwmon_dev;
        const char *name;
+        u8 vrm;
        u32 id;
-        u32 msr;
+        u32 msr_temp;
+        u32 msr_vid;
 };
 /*
@@ -77,13 +80,27 @@ static ssize_t show_temp(struct device *dev,
        u32 eax, edx;
        int err;
-        err = rdmsr_safe_on_cpu(data->id, data->msr, &eax, &edx);
+        err = rdmsr_safe_on_cpu(data->id, data->msr_temp, &eax, &edx);
        if (err)
                return -EAGAIN;
        return sprintf(buf, "%lu\n", ((unsigned long)eax & 0xffffff) * 1000);
 }
+static ssize_t show_cpu_vid(struct device *dev,
+                            struct device_attribute *devattr, char *buf)
+{
+        struct via_cputemp_data *data = dev_get_drvdata(dev);
+        u32 eax, edx;
+        int err;
+        err = rdmsr_safe_on_cpu(data->id, data->msr_vid, &eax, &edx);
+        if (err)
+                return -EAGAIN;
+        return sprintf(buf, "%d\n", vid_from_reg(~edx & 0x7f, data->vrm));
+}
 static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL,
                          SHOW_TEMP);
 static SENSOR_DEVICE_ATTR(temp1_label, S_IRUGO, show_name, NULL, SHOW_LABEL);
@@ -100,6 +117,9 @@ static const struct attribute_group via_cputemp_group = {
        .attrs = via_cputemp_attributes,
 };
+/* Optional attributes */
+static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_cpu_vid, NULL);
 static int __devinit via_cputemp_probe(struct platform_device *pdev)
 {
        struct via_cputemp_data *data;
@@ -122,11 +142,12 @@ static int __devinit via_cputemp_probe(struct platform_device *pdev)
                /* C7 A */
        case 0xD:
                /* C7 D */
-                data->msr = 0x1169;
+                data->msr_temp = 0x1169;
+                data->msr_vid = 0x198;
                break;
        case 0xF:
                /* Nano */
-                data->msr = 0x1423;
+                data->msr_temp = 0x1423;
                break;
        default:
                err = -ENODEV;
@@ -134,7 +155,7 @@ static int __devinit via_cputemp_probe(struct platform_device *pdev)
        }
        /* test if we can access the TEMPERATURE MSR */
-        err = rdmsr_safe_on_cpu(data->id, data->msr, &eax, &edx);
+        err = rdmsr_safe_on_cpu(data->id, data->msr_temp, &eax, &edx);
        if (err) {
                dev_err(&pdev->dev,
                        "Unable to access TEMPERATURE MSR, giving up\n");
@@ -147,6 +168,15 @@ static int __devinit via_cputemp_probe(struct platform_device *pdev)
        if (err)
                goto exit_free;
+        if (data->msr_vid)
+                data->vrm = vid_which_vrm();
+        if (data->vrm) {
+                err = device_create_file(&pdev->dev, &dev_attr_cpu0_vid);
+                if (err)
+                        goto exit_remove;
+        }
        data->hwmon_dev = hwmon_device_register(&pdev->dev);
        if (IS_ERR(data->hwmon_dev)) {
                err = PTR_ERR(data->hwmon_dev);
@@ -158,6 +188,8 @@ static int __devinit via_cputemp_probe(struct platform_device *pdev)
        return 0;
 exit_remove:
+        if (data->vrm)
+                device_remove_file(&pdev->dev, &dev_attr_cpu0_vid);
        sysfs_remove_group(&pdev->dev.kobj, &via_cputemp_group);
 exit_free:
        platform_set_drvdata(pdev, NULL);
@@ -171,6 +203,8 @@ static int __devexit via_cputemp_remove(struct platform_device *pdev)
        struct via_cputemp_data *data = platform_get_drvdata(pdev);
        hwmon_device_unregister(data->hwmon_dev);
+        if (data->vrm)
+                device_remove_file(&pdev->dev, &dev_attr_cpu0_vid);
        sysfs_remove_group(&pdev->dev.kobj, &via_cputemp_group);
        platform_set_drvdata(pdev, NULL);
        kfree(data);
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 30f06e956bfb..5f13c62e64b4 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -7,7 +7,7 @@ menuconfig I2C
        depends on HAS_IOMEM
        select RT_MUTEXES
        ---help---
-          I2C (pronounce: I-square-C) is a slow serial bus protocol used in
+          I2C (pronounce: I-squared-C) is a slow serial bus protocol used in
          many micro controller applications and developed by Philips.  SMBus,
          or System Management Bus is a subset of the I2C protocol.  More
          information is contained in the directory <file:Documentation/i2c/>,
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index dd364171f9c5..b6807db7b36f 100644
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -1,23 +1,23 @@
 /*
-    Copyright (c) 2000  Frodo Looijaard <frodol@dds.nl>, 
+ * Copyright (c) 2000  Frodo Looijaard <frodol@dds.nl>,
-                        Philip Edelbrock <phil@netroedge.com>, 
+ *                      Philip Edelbrock <phil@netroedge.com>,
-                        Mark D. Studebaker <mdsxyz123@yahoo.com>,
+ *                      Mark D. Studebaker <mdsxyz123@yahoo.com>,
-                        Dan Eaton <dan.eaton@rocketlogix.com> and 
+ *                      Dan Eaton <dan.eaton@rocketlogix.com> and
-                        Stephen Rousset<stephen.rousset@rocketlogix.com> 
+ *                      Stephen Rousset <stephen.rousset@rocketlogix.com>
+ *
-    This program is free software; you can redistribute it and/or modify
+ *  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
+ *  it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+ *  (at your option) any later version.
+ *
-    This program is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+ *  GNU General Public License for more details.
+ *
-    You should have received a copy of the GNU General Public License
+ *  You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 /*
@@ -254,8 +254,8 @@ static int ali1535_transaction(struct i2c_adapter *adap)
        if (temp & (ALI1535_STS_ERR | ALI1535_STS_BUSY)) {
                /* do a clear-on-write */
                outb_p(0xFF, SMBHSTSTS);
-                if ((temp = inb_p(SMBHSTSTS)) &
+                temp = inb_p(SMBHSTSTS);
-                    (ALI1535_STS_ERR | ALI1535_STS_BUSY)) {
+                if (temp & (ALI1535_STS_ERR | ALI1535_STS_BUSY)) {
                        /* This is probably going to be correctable only by a
                         * power reset as one of the bits now appears to be
                         * stuck */
@@ -267,9 +267,8 @@ static int ali1535_transaction(struct i2c_adapter *adap)
                }
        } else {
                /* check and clear done bit */
-                if (temp & ALI1535_STS_DONE) {
+                if (temp & ALI1535_STS_DONE)
                        outb_p(temp, SMBHSTSTS);
-                }
        }
        /* start the transaction by writing anything to the start register */
@@ -278,7 +277,7 @@ static int ali1535_transaction(struct i2c_adapter *adap)
        /* We will always wait for a fraction of a second! */
        timeout = 0;
        do {
-                msleep(1);
+                usleep_range(1000, 2000);
                temp = inb_p(SMBHSTSTS);
        } while (((temp & ALI1535_STS_BUSY) && !(temp & ALI1535_STS_IDLE))
                 && (timeout++ < MAX_TIMEOUT));
@@ -325,12 +324,12 @@ static int ali1535_transaction(struct i2c_adapter *adap)
        /* take consequent actions for error conditions */
        if (!(temp & ALI1535_STS_DONE)) {
                /* issue "kill" to reset host controller */
-                outb_p(ALI1535_KILL,SMBHSTTYP);
+                outb_p(ALI1535_KILL, SMBHSTTYP);
-                outb_p(0xFF,SMBHSTSTS);
+                outb_p(0xFF, SMBHSTSTS);
        } else if (temp & ALI1535_STS_ERR) {
                /* issue "timeout" to reset all devices on bus */
-                outb_p(ALI1535_T_OUT,SMBHSTTYP);
+                outb_p(ALI1535_T_OUT, SMBHSTTYP);
-                outb_p(0xFF,SMBHSTSTS);
+                outb_p(0xFF, SMBHSTSTS);
        }
        return result;
@@ -351,7 +350,7 @@ static s32 ali1535_access(struct i2c_adapter *adap, u16 addr,
        for (timeout = 0;
             (timeout < MAX_TIMEOUT) && !(temp & ALI1535_STS_IDLE);
             timeout++) {
-                msleep(1);
+                usleep_range(1000, 2000);
                temp = inb_p(SMBHSTSTS);
        }
        if (timeout >= MAX_TIMEOUT)
@@ -480,12 +479,12 @@ static struct i2c_adapter ali1535_adapter = {
        .algo           = &smbus_algorithm,
 };
-static const struct pci_device_id ali1535_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(ali1535_ids) = {
        { PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101) },
        { },
 };
-MODULE_DEVICE_TABLE (pci, ali1535_ids);
+MODULE_DEVICE_TABLE(pci, ali1535_ids);
 static int __devinit ali1535_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index 3a20961bef1e..b1d9cd28d8da 100644
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -662,11 +662,8 @@ static int __devinit cpm_i2c_probe(struct platform_device *ofdev)
        /* register new adapter to i2c module... */
        data = of_get_property(ofdev->dev.of_node, "linux,i2c-index", &len);
-        if (data && len == 4) {
+        cpm->adap.nr = (data && len == 4) ? be32_to_cpup(data) : -1;
-                cpm->adap.nr = *data;
+        result = i2c_add_numbered_adapter(&cpm->adap);
-                result = i2c_add_numbered_adapter(&cpm->adap);
-        } else
-                result = i2c_add_adapter(&cpm->adap);
        if (result < 0) {
                dev_err(&ofdev->dev, "Unable to register with I2C\n");
diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c
index 3df1bc80f37a..3876a2478bd7 100644
--- a/drivers/i2c/busses/i2c-highlander.c
+++ b/drivers/i2c/busses/i2c-highlander.c
@@ -227,7 +227,7 @@ static int highlander_i2c_read(struct highlander_i2c_dev *dev)
        /*
         * The R0P7780LC0011RL FPGA needs a significant delay between
-         * data read cycles, otherwise the transciever gets confused and
+         * data read cycles, otherwise the transceiver gets confused and
         * garbage is returned when the read is subsequently aborted.
         *
         * It is not sufficient to wait for BBSY.
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 58a58c7eaa17..1a766cf74f6b 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -204,7 +204,7 @@ struct omap_i2c_dev {
        u16                     errata;
 };
-const static u8 reg_map[] = {
+static const u8 reg_map[] = {
        [OMAP_I2C_REV_REG] = 0x00,
        [OMAP_I2C_IE_REG] = 0x01,
        [OMAP_I2C_STAT_REG] = 0x02,
@@ -225,7 +225,7 @@ const static u8 reg_map[] = {
        [OMAP_I2C_BUFSTAT_REG] = 0x10,
 };
-const static u8 omap4_reg_map[] = {
+static const u8 omap4_reg_map[] = {
        [OMAP_I2C_REV_REG] = 0x04,
        [OMAP_I2C_IE_REG] = 0x2c,
        [OMAP_I2C_STAT_REG] = 0x28,
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index f59224a5c761..d60364650990 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1079,7 +1079,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
         * The reason to do so is to avoid sysfs names that only make
         * sense when there are multiple adapters.
         */
-        i2c->adap.nr = dev->id != -1 ? dev->id : 0;
+        i2c->adap.nr = dev->id;
        snprintf(i2c->adap.name, sizeof(i2c->adap.name), "pxa_i2c-i2c.%u",
                 i2c->adap.nr);
@@ -1142,10 +1142,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
        i2c->adap.dev.of_node = dev->dev.of_node;
 #endif
-        if (i2c_type == REGS_CE4100)
+        ret = i2c_add_numbered_adapter(&i2c->adap);
-                ret = i2c_add_adapter(&i2c->adap);
-        else
-                ret = i2c_add_numbered_adapter(&i2c->adap);
        if (ret < 0) {
                printk(KERN_INFO "I2C: Failed to add bus\n");
                goto eadapt;
diff --git a/drivers/i2c/busses/i2c-s6000.c b/drivers/i2c/busses/i2c-s6000.c
index cb5d01e279c6..c64ba736f480 100644
--- a/drivers/i2c/busses/i2c-s6000.c
+++ b/drivers/i2c/busses/i2c-s6000.c
@@ -341,10 +341,7 @@ static int __devinit s6i2c_probe(struct platform_device *dev)
        i2c_wr16(iface, S6_I2C_TXTL, 0);
        platform_set_drvdata(dev, iface);
-        if (bus_num < 0)
+        rc = i2c_add_numbered_adapter(p_adap);
-                rc = i2c_add_adapter(p_adap);
-        else
-                rc = i2c_add_numbered_adapter(p_adap);
        if (rc)
                goto err_irq_free;
        return 0;
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 9a58994ff7ea..131079a3e292 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -925,6 +925,9 @@ EXPORT_SYMBOL(i2c_add_adapter);
 * or otherwise built in to the system's mainboard, and where i2c_board_info
 * is used to properly configure I2C devices.
 *
+ * If the requested bus number is set to -1, then this function will behave
+ * identically to i2c_add_adapter, and will dynamically assign a bus number.
+ *
 * If no devices have pre-been declared for this bus, then be sure to
 * register the adapter before any dynamically allocated ones.  Otherwise
 * the required bus ID may not be available.
@@ -940,6 +943,8 @@ int i2c_add_numbered_adapter(struct i2c_adapter *adap)
        int     id;
        int     status;
+        if (adap->nr == -1) /* -1 means dynamically assign bus id */
+                return i2c_add_adapter(adap);
        if (adap->nr & ~MAX_ID_MASK)
                return -EINVAL;
diff --git a/drivers/ide/palm_bk3710.c b/drivers/ide/palm_bk3710.c
index 9e8f4e1b0cc9..712c7904d03e 100644
--- a/drivers/ide/palm_bk3710.c
+++ b/drivers/ide/palm_bk3710.c
@@ -342,7 +342,7 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)
                return -ENODEV;
        }
-        mem_size = mem->end - mem->start + 1;
+        mem_size = resource_size(mem);
        if (request_mem_region(mem->start, mem_size, "palm_bk3710") == NULL) {
                printk(KERN_ERR "failed to request memory region\n");
                return -EBUSY;
diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index bed3e39aac96..71c231954972 100644
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -551,10 +551,10 @@ static int __init tx4939ide_probe(struct platform_device *pdev)
                return -ENODEV;
        if (!devm_request_mem_region(&pdev->dev, res->start,
-                                     res->end - res->start + 1, "tx4938ide"))
+                                     resource_size(res), "tx4938ide"))
                return -EBUSY;
        mapbase = (unsigned long)devm_ioremap(&pdev->dev, res->start,
-                                              res->end - res->start + 1);
+                                              resource_size(res));
        if (!mapbase)
                return -EBUSY;
        memset(&hw, 0, sizeof(hw));
diff --git a/drivers/input/serio/libps2.c b/drivers/input/serio/libps2.c
index 980af94ba9c8..07a8363f3c5c 100644
--- a/drivers/input/serio/libps2.c
+++ b/drivers/input/serio/libps2.c
@@ -210,7 +210,7 @@ int __ps2_command(struct ps2dev *ps2dev, unsigned char *param, int command)
        /*
         * Some devices (Synaptics) peform the reset before
         * ACKing the reset command, and so it can take a long
-         * time before the ACK arrrives.
+         * time before the ACK arrives.
         */
        if (ps2_sendbyte(ps2dev, command & 0xff,
                         command == PS2_CMD_RESET_BAT ? 1000 : 200))
diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c
index d55874e5d1c2..44fc8b4bcd81 100644
--- a/drivers/input/serio/sa1111ps2.c
+++ b/drivers/input/serio/sa1111ps2.c
@@ -300,8 +300,7 @@ static int __devinit ps2_probe(struct sa1111_dev *dev)
 out:
        sa1111_disable_device(ps2if->dev);
-        release_mem_region(dev->res.start,
+        release_mem_region(dev->res.start, resource_size(&dev->res));
-                           dev->res.end - dev->res.start + 1);
 free:
        sa1111_set_drvdata(dev, NULL);
        kfree(ps2if);
@@ -317,8 +316,7 @@ static int __devexit ps2_remove(struct sa1111_dev *dev)
        struct ps2if *ps2if = sa1111_get_drvdata(dev);
        serio_unregister_port(ps2if->io);
-        release_mem_region(dev->res.start,
+        release_mem_region(dev->res.start, resource_size(&dev->res));
-                           dev->res.end - dev->res.start + 1);
        sa1111_set_drvdata(dev, NULL);
        kfree(ps2if);
diff --git a/drivers/isdn/i4l/isdn_bsdcomp.c b/drivers/isdn/i4l/isdn_bsdcomp.c
index 02d9918705dd..aa0b6a6f5ef4 100644
--- a/drivers/isdn/i4l/isdn_bsdcomp.c
+++ b/drivers/isdn/i4l/isdn_bsdcomp.c
@@ -155,7 +155,7 @@ struct bsd_db {
 #define LAST    255
 #define MAXCODE(b)      ((1 << (b)) - 1)
-#define BADCODEM1       MAXCODE(MAX_BSD_BITS);
+#define BADCODEM1       MAXCODE(MAX_BSD_BITS)
 #define BSD_HASH(prefix,suffix,hshift) ((((unsigned long)(suffix))<<(hshift)) \
                                         ^ (unsigned long)(prefix))
diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
index ecd3d0280768..d20168fe4c40 100644
--- a/drivers/media/rc/ite-cir.c
+++ b/drivers/media/rc/ite-cir.c
@@ -42,7 +42,6 @@
 #include <linux/bitops.h>
 #include <media/rc-core.h>
 #include <linux/pci_ids.h>
-#include <linux/delay.h>
 #include "ite-cir.h"
diff --git a/drivers/media/video/davinci/vpif.c b/drivers/media/video/davinci/vpif.c
index 9f3bfc1eb240..af9680273ff9 100644
--- a/drivers/media/video/davinci/vpif.c
+++ b/drivers/media/video/davinci/vpif.c
@@ -422,7 +422,7 @@ static int __init vpif_probe(struct platform_device *pdev)
        if (!res)
                return -ENOENT;
-        res_len = res->end - res->start + 1;
+        res_len = resource_size(res);
        res = request_mem_region(res->start, res_len, res->name);
        if (!res)
diff --git a/drivers/media/video/m5mols/m5mols_capture.c b/drivers/media/video/m5mols/m5mols_capture.c
index d9471928369d..a45d8f098e02 100644
--- a/drivers/media/video/m5mols/m5mols_capture.c
+++ b/drivers/media/video/m5mols/m5mols_capture.c
@@ -22,7 +22,6 @@
 #include <linux/gpio.h>
 #include <linux/regulator/consumer.h>
 #include <linux/videodev2.h>
-#include <linux/version.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-subdev.h>
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
index 4d07c5844402..a647894d3a71 100644
--- a/drivers/media/video/omap/omap_vout.c
+++ b/drivers/media/video/omap/omap_vout.c
@@ -129,7 +129,7 @@ module_param(debug, bool, S_IRUGO);
 MODULE_PARM_DESC(debug, "Debug level (0-1)");
 /* list of image formats supported by OMAP2 video pipelines */
-const static struct v4l2_fmtdesc omap_formats[] = {
+static const struct v4l2_fmtdesc omap_formats[] = {
        {
                /* Note:  V4L2 defines RGB565 as:
                 *
diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c
index f6626e87dbc5..69b60ba5dd7a 100644
--- a/drivers/media/video/omap24xxcam.c
+++ b/drivers/media/video/omap24xxcam.c
@@ -1768,14 +1768,13 @@ static int __devinit omap24xxcam_probe(struct platform_device *pdev)
                dev_err(cam->dev, "no mem resource?\n");
                goto err;
        }
-        if (!request_mem_region(mem->start, (mem->end - mem->start) + 1,
+        if (!request_mem_region(mem->start, resource_size(mem), pdev->name)) {
-                                pdev->name)) {
                dev_err(cam->dev,
                        "cannot reserve camera register I/O region\n");
                goto err;
        }
        cam->mmio_base_phys = mem->start;
-        cam->mmio_size = (mem->end - mem->start) + 1;
+        cam->mmio_size = resource_size(mem);
        /* map the region */
        cam->mmio_base = (unsigned long)
diff --git a/drivers/media/video/videobuf2-memops.c b/drivers/media/video/videobuf2-memops.c
index 5370a3a7ee25..b03c3aea5bea 100644
--- a/drivers/media/video/videobuf2-memops.c
+++ b/drivers/media/video/videobuf2-memops.c
@@ -18,7 +18,6 @@
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/file.h>
-#include <linux/slab.h>
 #include <media/videobuf2-core.h>
 #include <media/videobuf2-memops.h>
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
index 090d2a3a6548..a8c08f332da0 100644
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -681,11 +681,11 @@ static int i2o_iop_systab_set(struct i2o_controller *c)
                if (root && allocate_resource(root, res, sb->desired_mem_size, sb->desired_mem_size, sb->desired_mem_size, 1 << 20,     /* Unspecified, so use 1Mb and play safe */
                                              NULL, NULL) >= 0) {
                        c->mem_alloc = 1;
-                        sb->current_mem_size = 1 + res->end - res->start;
+                        sb->current_mem_size = resource_size(res);
                        sb->current_mem_base = res->start;
                        osm_info("%s: allocated %llu bytes of PCI memory at "
                                "0x%016llX.\n", c->name,
-                                (unsigned long long)(1 + res->end - res->start),
+                                (unsigned long long)resource_size(res),
                                (unsigned long long)res->start);
                }
        }
@@ -703,11 +703,11 @@ static int i2o_iop_systab_set(struct i2o_controller *c)
                if (root && allocate_resource(root, res, sb->desired_io_size, sb->desired_io_size, sb->desired_io_size, 1 << 20,        /* Unspecified, so use 1Mb and play safe */
                                              NULL, NULL) >= 0) {
                        c->io_alloc = 1;
-                        sb->current_io_size = 1 + res->end - res->start;
+                        sb->current_io_size = resource_size(res);
                        sb->current_mem_base = res->start;
                        osm_info("%s: allocated %llu bytes of PCI I/O at "
                                "0x%016llX.\n", c->name,
-                                (unsigned long long)(1 + res->end - res->start),
+                                (unsigned long long)resource_size(res),
                                (unsigned long long)res->start);
                }
        }
diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c
index ad715bf49cac..71bc835324d8 100644
--- a/drivers/mfd/tc6387xb.c
+++ b/drivers/mfd/tc6387xb.c
@@ -177,7 +177,7 @@ static int __devinit tc6387xb_probe(struct platform_device *dev)
        if (ret)
                goto err_resource;
-        tc6387xb->scr = ioremap(rscr->start, rscr->end - rscr->start + 1);
+        tc6387xb->scr = ioremap(rscr->start, resource_size(rscr));
        if (!tc6387xb->scr) {
                ret = -ENOMEM;
                goto err_ioremap;
diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c
index 4afffe610f99..769a4e8e10dc 100644
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@ -95,7 +95,7 @@ static int __init ssc_probe(struct platform_device *pdev)
        }
        ssc->pdev = pdev;
-        ssc->regs = ioremap(regs->start, regs->end - regs->start + 1);
+        ssc->regs = ioremap(regs->start, resource_size(regs));
        if (!ssc->regs) {
                dev_dbg(&pdev->dev, "ioremap failed\n");
                retval = -EINVAL;
diff --git a/drivers/misc/atmel_pwm.c b/drivers/misc/atmel_pwm.c
index 0f3fb4f03bdf..28f5aaa19d4a 100644
--- a/drivers/misc/atmel_pwm.c
+++ b/drivers/misc/atmel_pwm.c
@@ -329,7 +329,7 @@ static int __init pwm_probe(struct platform_device *pdev)
        p->pdev = pdev;
        p->mask = *mp;
        p->irq = irq;
-        p->base = ioremap(r->start, r->end - r->start + 1);
+        p->base = ioremap(r->start, resource_size(r));
        if (!p->base)
                goto fail;
        p->clk = clk_get(&pdev->dev, "pwm_clk");
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 0c839d3338db..77f0b6b1681d 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -1825,7 +1825,7 @@ static int dw_mci_probe(struct platform_device *pdev)
        INIT_LIST_HEAD(&host->queue);
        ret = -ENOMEM;
-        host->regs = ioremap(regs->start, regs->end - regs->start + 1);
+        host->regs = ioremap(regs->start, resource_size(regs));
        if (!host->regs)
                goto err_freehost;
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index cc20e0259325..14aa213b00da 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -715,13 +715,13 @@ static void mxcmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
        int burstlen, ret;
        /*
-         * use burstlen of 64 in 4 bit mode (--> reg value  0)
+         * use burstlen of 64 (16 words) in 4 bit mode (--> reg value  0)
-         * use burstlen of 16 in 1 bit mode (--> reg value 16)
+         * use burstlen of 16 (4 words) in 1 bit mode (--> reg value 16)
         */
        if (ios->bus_width == MMC_BUS_WIDTH_4)
-                burstlen = 64;
-        else
                burstlen = 16;
+        else
+                burstlen = 4;
        if (mxcmci_use_dma(host) && burstlen != host->burstlen) {
                host->burstlen = burstlen;
diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c
index d4455ffbefd8..e8f6e65183d7 100644
--- a/drivers/mmc/host/vub300.c
+++ b/drivers/mmc/host/vub300.c
@@ -1625,8 +1625,8 @@ static void __vub300_command_response(struct vub300_mmc_host *vub300,
                cmd->error = respretval;
        } else if (cmd->error) {
                /*
-                 * the error occured sending the command
+                 * the error occurred sending the command
-                 * or recieving the response
+                 * or receiving the response
                 */
        } else if (vub300->command_out_urb->status) {
                vub300->usb_transport_fail = vub300->command_out_urb->status;
diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c
index 1e2c430aaad2..83e80c65d6e7 100644
--- a/drivers/mtd/devices/sst25l.c
+++ b/drivers/mtd/devices/sst25l.c
@@ -5,7 +5,7 @@
 *
 * Copyright © 2009 Bluewater Systems Ltd
 * Author: Andre Renaud <andre@bluewatersys.com>
- * Author: Ryan Mallon <ryan@bluewatersys.com>
+ * Author: Ryan Mallon
 *
 * Based on m25p80.c
 *
@@ -498,5 +498,5 @@ module_exit(sst25l_exit);
 MODULE_DESCRIPTION("MTD SPI driver for SST25L Flash chips");
 MODULE_AUTHOR("Andre Renaud <andre@bluewatersys.com>, "
-              "Ryan Mallon <ryan@bluewatersys.com>");
+              "Ryan Mallon");
 MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c
index d4297a97e100..67815eed2f00 100644
--- a/drivers/mtd/maps/bfin-async-flash.c
+++ b/drivers/mtd/maps/bfin-async-flash.c
@@ -142,7 +142,7 @@ static int __devinit bfin_flash_probe(struct platform_device *pdev)
        state->map.write      = bfin_flash_write;
        state->map.copy_to    = bfin_flash_copy_to;
        state->map.bankwidth  = pdata->width;
-        state->map.size       = memory->end - memory->start + 1;
+        state->map.size       = resource_size(memory);
        state->map.virt       = (void __iomem *)memory->start;
        state->map.phys       = memory->start;
        state->map.map_priv_1 = (unsigned long)state;
diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c
index c00b9175ba9e..1594a802631d 100644
--- a/drivers/mtd/maps/ixp2000.c
+++ b/drivers/mtd/maps/ixp2000.c
@@ -155,7 +155,7 @@ static int ixp2000_flash_probe(struct platform_device *dev)
        if (!plat)
                return -ENODEV;
-        window_size = dev->resource->end - dev->resource->start + 1;
+        window_size = resource_size(dev->resource);
        dev_info(&dev->dev, "Probe of IXP2000 flash(%d banks x %dMiB)\n",
                 ixp_data->nr_banks, ((u32)window_size >> 20));
@@ -194,16 +194,17 @@ static int ixp2000_flash_probe(struct platform_device *dev)
        info->map.copy_to = ixp2000_flash_copy_to;
        info->res = request_mem_region(dev->resource->start,
-                        dev->resource->end - dev->resource->start + 1,
+                                       resource_size(dev->resource),
-                        dev_name(&dev->dev));
+                                       dev_name(&dev->dev));
        if (!info->res) {
                dev_err(&dev->dev, "Could not reserve memory region\n");
                err = -ENOMEM;
                goto Error;
        }
-        info->map.map_priv_1 = (unsigned long) ioremap(dev->resource->start,
+        info->map.map_priv_1 =
-                                dev->resource->end - dev->resource->start + 1);
+                (unsigned long)ioremap(dev->resource->start,
+                                       resource_size(dev->resource));
        if (!info->map.map_priv_1) {
                dev_err(&dev->dev, "Failed to ioremap flash region\n");
                err = -EIO;
diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index f59d62f74d44..7ae137d4b998 100644
--- a/drivers/mtd/maps/pxa2xx-flash.c
+++ b/drivers/mtd/maps/pxa2xx-flash.c
@@ -70,7 +70,7 @@ static int __devinit pxa2xx_flash_probe(struct platform_device *pdev)
        info->map.name = (char *) flash->name;
        info->map.bankwidth = flash->width;
        info->map.phys = res->start;
-        info->map.size = res->end - res->start + 1;
+        info->map.size = resource_size(res);
        info->parts = flash->parts;
        info->nr_parts = flash->nr_parts;
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 3f92731a5b9e..f1af2228a1b1 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -1192,7 +1192,7 @@ err_unregister_chdev:
 static void __exit cleanup_mtdchar(void)
 {
        unregister_mtd_user(&mtdchar_notifier);
-        mntput(mtd_inode_mnt);
+        kern_unmount(mtd_inode_mnt);
        unregister_filesystem(&mtd_inodefs_type);
        __unregister_chrdev(MTD_CHAR_MAJOR, 0, 1 << MINORBITS, "mtd");
 }
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 1b90fd56bef1..55da20ccc7a8 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -514,7 +514,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
        host->io_phys = (dma_addr_t)mem->start;
-        host->io_base = ioremap(mem->start, mem->end - mem->start + 1);
+        host->io_base = ioremap(mem->start, resource_size(mem));
        if (host->io_base == NULL) {
                printk(KERN_ERR "atmel_nand: ioremap failed\n");
                res = -EIO;
@@ -548,7 +548,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
        if (no_ecc)
                nand_chip->ecc.mode = NAND_ECC_NONE;
        if (hard_ecc && regs) {
-                host->ecc = ioremap(regs->start, regs->end - regs->start + 1);
+                host->ecc = ioremap(regs->start, resource_size(regs));
                if (host->ecc == NULL) {
                        printk(KERN_ERR "atmel_nand: ioremap failed\n");
                        res = -EIO;
diff --git a/drivers/mtd/nand/bcm_umi_nand.c b/drivers/mtd/nand/bcm_umi_nand.c
index 9ec280738a9a..8c569e454dc5 100644
--- a/drivers/mtd/nand/bcm_umi_nand.c
+++ b/drivers/mtd/nand/bcm_umi_nand.c
@@ -380,7 +380,7 @@ static int __devinit bcm_umi_nand_probe(struct platform_device *pdev)
                return -ENXIO;
        /* map physical address */
-        bcm_umi_io_base = ioremap(r->start, r->end - r->start + 1);
+        bcm_umi_io_base = ioremap(r->start, resource_size(r));
        if (!bcm_umi_io_base) {
                printk(KERN_ERR "ioremap to access BCM UMI NAND chip failed\n");
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index 2f7c930872f9..eb1fbac63eb6 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -713,7 +713,7 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op)
        }
        regs_paddr = res.start;
-        regs_size = res.end - res.start + 1;
+        regs_size = resource_size(&res);
        if (!devm_request_mem_region(dev, regs_paddr, regs_size, DRV_NAME)) {
                dev_err(dev, "Error requesting memory region!\n");
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 6c4ef966ca58..41ea84e3f69c 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -5,7 +5,7 @@
 * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
 * Copyright (C) 2006 Felix Fietkau (nbd@openwrt.org)
 * Copyright (C) 2006 Broadcom Corporation.
- * Copyright (C) 2007 Michael Buesch <mb@bu3sch.de>
+ * Copyright (C) 2007 Michael Buesch <m@bues.ch>
 *
 * Distribute under GPL.
 */
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c
index 4753bb9731f5..1d9b9858067c 100644
--- a/drivers/net/bcm63xx_enet.c
+++ b/drivers/net/bcm63xx_enet.c
@@ -1647,7 +1647,7 @@ static int __devinit bcm_enet_probe(struct platform_device *pdev)
        if (ret)
                goto out;
-        iomem_size = res_mem->end - res_mem->start + 1;
+        iomem_size = resource_size(res_mem);
        if (!request_mem_region(res_mem->start, iomem_size, "bcm63xx_enet")) {
                ret = -EBUSY;
                goto out;
@@ -1862,7 +1862,7 @@ static int __devexit bcm_enet_remove(struct platform_device *pdev)
        /* release device resources */
        iounmap(priv->base);
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(res->start, res->end - res->start + 1);
+        release_mem_region(res->start, resource_size(res));
        /* disable hw block clocks */
        if (priv->phy_clk) {
@@ -1898,7 +1898,7 @@ static int __devinit bcm_enet_shared_probe(struct platform_device *pdev)
        if (!res)
                return -ENODEV;
-        iomem_size = res->end - res->start + 1;
+        iomem_size = resource_size(res);
        if (!request_mem_region(res->start, iomem_size, "bcm63xx_enet_dma"))
                return -EBUSY;
@@ -1916,7 +1916,7 @@ static int __devexit bcm_enet_shared_remove(struct platform_device *pdev)
        iounmap(bcm_enet_shared_base);
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(res->start, res->end - res->start + 1);
+        release_mem_region(res->start, resource_size(res));
        return 0;
 }
diff --git a/drivers/net/bsd_comp.c b/drivers/net/bsd_comp.c
index 6e99d80ec409..a9b759add187 100644
--- a/drivers/net/bsd_comp.c
+++ b/drivers/net/bsd_comp.c
@@ -201,7 +201,7 @@ extern void ppp_unregister_compressor (struct compressor *cp);
 #define LAST    255
 #define MAXCODE(b)      ((1 << (b)) - 1)
-#define BADCODEM1       MAXCODE(MAX_BSD_BITS);
+#define BADCODEM1       MAXCODE(MAX_BSD_BITS)
 #define BSD_HASH(prefix,suffix,hshift) ((((unsigned long)(suffix))<<(hshift)) \
                                         ^ (unsigned long)(prefix))
diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
index a79925e72d66..09a8b86cf1ac 100644
--- a/drivers/net/can/softing/softing_main.c
+++ b/drivers/net/can/softing/softing_main.c
@@ -799,7 +799,7 @@ static __devinit int softing_pdev_probe(struct platform_device *pdev)
        if (!pres)
                goto platform_resource_failed;
        card->dpram_phys = pres->start;
-        card->dpram_size = pres->end - pres->start + 1;
+        card->dpram_size = resource_size(pres);
        card->dpram = ioremap_nocache(card->dpram_phys, card->dpram_size);
        if (!card->dpram) {
                dev_alert(&card->pdev->dev, "dpram ioremap failed\n");
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index acef7e96c9fd..3f451e4d8361 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -1822,7 +1822,7 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev)
        }
        priv->emac_base_phys = res->start + pdata->ctrl_reg_offset;
-        size = res->end - res->start + 1;
+        size = resource_size(res);
        if (!request_mem_region(res->start, size, ndev->name)) {
                dev_err(&pdev->dev, "failed request_mem_region() for regs\n");
                rc = -ENXIO;
@@ -1927,7 +1927,7 @@ no_irq_res:
        cpdma_ctlr_destroy(priv->dma);
 no_dma:
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(res->start, res->end - res->start + 1);
+        release_mem_region(res->start, resource_size(res));
        iounmap(priv->remap_addr);
 probe_quit:
@@ -1961,7 +1961,7 @@ static int __devexit davinci_emac_remove(struct platform_device *pdev)
                cpdma_chan_destroy(priv->rxchan);
        cpdma_ctlr_destroy(priv->dma);
-        release_mem_region(res->start, res->end - res->start + 1);
+        release_mem_region(res->start, resource_size(res));
        unregister_netdev(ndev);
        iounmap(priv->remap_addr);
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 48ee51bb9e50..a19228563efd 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -365,7 +365,7 @@ static int __init do_express_probe(struct net_device *dev)
                        dev->irq = mca_irqmap[(pos1>>4)&0x7];
                        /*
-                         * XXX: Transciever selection is done
+                         * XXX: Transceiver selection is done
                         * differently on the MCA version.
                         * How to get it to select something
                         * other than external/AUI is currently
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index 0da6295d9da6..8abbe1d82826 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -968,7 +968,7 @@ static int __devinit ethoc_probe(struct platform_device *pdev)
        priv = netdev_priv(netdev);
        priv->netdev = netdev;
        priv->dma_alloc = 0;
-        priv->io_region_size = mmio->end - mmio->start + 1;
+        priv->io_region_size = resource_size(mmio);
        priv->iobase = devm_ioremap_nocache(&pdev->dev, netdev->base_addr,
                        resource_size(mmio));
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index 381bdea97d5f..cb4416e591f1 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -871,10 +871,11 @@ static int __devinit mpc52xx_fec_probe(struct platform_device *op)
                                "Error while parsing device node resource\n" );
                goto err_netdev;
        }
-        if ((mem.end - mem.start + 1) < sizeof(struct mpc52xx_fec)) {
+        if (resource_size(&mem) < sizeof(struct mpc52xx_fec)) {
                printk(KERN_ERR DRIVER_NAME
-                        " - invalid resource size (%lx < %x), check mpc52xx_devices.c\n",
+                       " - invalid resource size (%lx < %x), check mpc52xx_devices.c\n",
-                        (unsigned long)(mem.end - mem.start + 1), sizeof(struct mpc52xx_fec));
+                       (unsigned long)resource_size(&mem),
+                       sizeof(struct mpc52xx_fec));
                rv = -EINVAL;
                goto err_netdev;
        }
diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/fs_enet/mii-bitbang.c
index ad2975440719..b09270b5d0a5 100644
--- a/drivers/net/fs_enet/mii-bitbang.c
+++ b/drivers/net/fs_enet/mii-bitbang.c
@@ -120,7 +120,7 @@ static int __devinit fs_mii_bitbang_init(struct mii_bus *bus,
        if (ret)
                return ret;
-        if (res.end - res.start < 13)
+        if (resource_size(&res) <= 13)
                return -ENODEV;
        /* This should really encode the pin number as well, but all
@@ -139,7 +139,7 @@ static int __devinit fs_mii_bitbang_init(struct mii_bus *bus,
                return -ENODEV;
        mdc_pin = *data;
-        bitbang->dir = ioremap(res.start, res.end - res.start + 1);
+        bitbang->dir = ioremap(res.start, resource_size(&res));
        if (!bitbang->dir)
                return -ENOMEM;
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c
index 6a2e150e75bb..e0e9d6c35d83 100644
--- a/drivers/net/fs_enet/mii-fec.c
+++ b/drivers/net/fs_enet/mii-fec.c
@@ -136,7 +136,7 @@ static int __devinit fs_enet_mdio_probe(struct platform_device *ofdev)
        snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", res.start);
-        fec->fecp = ioremap(res.start, res.end - res.start + 1);
+        fec->fecp = ioremap(res.start, resource_size(&res));
        if (!fec->fecp)
                goto out_fec;
diff --git a/drivers/net/gianfar_ptp.c b/drivers/net/gianfar_ptp.c
index d8e175382d1d..1c97861596f0 100644
--- a/drivers/net/gianfar_ptp.c
+++ b/drivers/net/gianfar_ptp.c
@@ -491,7 +491,7 @@ static int gianfar_ptp_probe(struct platform_device *dev)
        spin_lock_init(&etsects->lock);
        etsects->regs = ioremap(etsects->rsrc->start,
-                                1 + etsects->rsrc->end - etsects->rsrc->start);
+                                resource_size(etsects->rsrc));
        if (!etsects->regs) {
                pr_err("ioremap ptp registers failed\n");
                goto no_ioremap;
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 079450fe5e96..725399ea0690 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -2770,7 +2770,7 @@ static int __devinit emac_probe(struct platform_device *ofdev)
        }
        // TODO : request_mem_region
        dev->emacp = ioremap(dev->rsrc_regs.start,
-                             dev->rsrc_regs.end - dev->rsrc_regs.start + 1);
+                             resource_size(&dev->rsrc_regs));
        if (dev->emacp == NULL) {
                printk(KERN_ERR "%s: Can't map device registers!\n",
                       np->full_name);
diff --git a/drivers/net/irda/toim3232-sir.c b/drivers/net/irda/toim3232-sir.c
index 99e1ec02a011..19ad4606b799 100644
--- a/drivers/net/irda/toim3232-sir.c
+++ b/drivers/net/irda/toim3232-sir.c
@@ -78,7 +78,7 @@
 * Target hardware: IRWave IR320ST-2
 *
 *      The IRWave IR320ST-2 is a simple dongle based on the Vishay/Temic
- *      TOIM3232 SIR Endec and the Vishay/Temic TFDS4500 SIR IRDA transciever.
+ *      TOIM3232 SIR Endec and the Vishay/Temic TFDS4500 SIR IRDA transceiver.
 *      It uses a hex inverter and some discrete components to buffer and
 *      line convert the RS232 down to 5V.
 *
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index dcf6011b136c..0fcdc25699d8 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -1172,7 +1172,7 @@ static int __init macb_probe(struct platform_device *pdev)
        clk_enable(bp->hclk);
 #endif
-        bp->regs = ioremap(regs->start, regs->end - regs->start + 1);
+        bp->regs = ioremap(regs->start, resource_size(regs));
        if (!bp->regs) {
                dev_err(&pdev->dev, "failed to map registers, aborting.\n");
                err = -ENOMEM;
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 77dc6abe1867..259699983ca5 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -2597,7 +2597,7 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
        if (msp == NULL)
                goto out;
-        msp->base = ioremap(res->start, res->end - res->start + 1);
+        msp->base = ioremap(res->start, resource_size(res));
        if (msp->base == NULL)
                goto out_free;
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 60f46bc2bf64..2962cc695ce3 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -1382,7 +1382,7 @@ static int find_mii(struct net_device *dev)
 /* WCSR bits [0:4] [9:10] */
 #define WCSR_RESET_SAVE 0x61f
 /* RFCR bits [20] [22] [27:31] */
-#define RFCR_RESET_SAVE 0xf8500000;
+#define RFCR_RESET_SAVE 0xf8500000
 static void natsemi_reset(struct net_device *dev)
 {
@@ -2920,7 +2920,7 @@ static int netdev_set_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd)
        /*
         * If we're ignoring the PHY then autoneg and the internal
-         * transciever are really not going to work so don't let the
+         * transceiver are really not going to work so don't let the
         * user select them.
         */
        if (np->ignore_phy && (ecmd->autoneg == AUTONEG_ENABLE ||
diff --git a/drivers/net/pxa168_eth.c b/drivers/net/pxa168_eth.c
index c1bb05be7a7c..1a3033d8e7ed 100644
--- a/drivers/net/pxa168_eth.c
+++ b/drivers/net/pxa168_eth.c
@@ -1505,7 +1505,7 @@ static int pxa168_eth_probe(struct platform_device *pdev)
                err = -ENODEV;
                goto err_netdev;
        }
-        pep->base = ioremap(res->start, res->end - res->start + 1);
+        pep->base = ioremap(res->start, resource_size(res));
        if (pep->base == NULL) {
                err = -ENOMEM;
                goto err_netdev;
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 4e2d1448093c..7d9c650f395e 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -694,7 +694,7 @@ struct rtl8169_private {
                        size_t size;
                } phy_action;
        } *rtl_fw;
-#define RTL_FIRMWARE_UNKNOWN    ERR_PTR(-EAGAIN);
+#define RTL_FIRMWARE_UNKNOWN    ERR_PTR(-EAGAIN)
 };
 MODULE_AUTHOR("Realtek and the Linux r8169 crew <netdev@vger.kernel.org>");
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index ae3c8e79b32f..d5596926a1ef 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -967,8 +967,8 @@ struct s2io_nic {
        u8  serial_num[VPD_STRING_LEN];
 };
-#define RESET_ERROR 1;
+#define RESET_ERROR 1
-#define CMD_ERROR   2;
+#define CMD_ERROR   2
 /*  OS related system calls */
 #ifndef readq
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c
index 68d50429ddf3..ea65f7ec360a 100644
--- a/drivers/net/sb1250-mac.c
+++ b/drivers/net/sb1250-mac.c
@@ -2597,7 +2597,7 @@ static int __devinit sbmac_probe(struct platform_device *pldev)
        res = platform_get_resource(pldev, IORESOURCE_MEM, 0);
        BUG_ON(!res);
-        sbm_base = ioremap_nocache(res->start, res->end - res->start + 1);
+        sbm_base = ioremap_nocache(res->start, resource_size(res));
        if (!sbm_base) {
                printk(KERN_ERR "%s: unable to map device registers\n",
                       dev_name(&pldev->dev));
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index ade35dde5b51..be745ae8f4e3 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -46,15 +46,14 @@
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>
 #include <asm/irq.h>
+#include <asm/prom.h>
 #ifdef CONFIG_SPARC
 #include <asm/idprom.h>
-#include <asm/prom.h>
 #endif
 #ifdef CONFIG_PPC_PMAC
 #include <asm/pci-bridge.h>
-#include <asm/prom.h>
 #include <asm/machdep.h>
 #include <asm/pmac_feature.h>
 #endif
diff --git a/drivers/net/wan/lmc/lmc_var.h b/drivers/net/wan/lmc/lmc_var.h
index 01ad45218d19..a1d202d8ad67 100644
--- a/drivers/net/wan/lmc/lmc_var.h
+++ b/drivers/net/wan/lmc/lmc_var.h
@@ -380,7 +380,7 @@ struct lmc___softc {
 /* CSR6 settings */
 #define OPERATION_MODE  0x00000200 /* Full Duplex      */
 #define PROMISC_MODE    0x00000040 /* Promiscuous Mode */
-#define RECIEVE_ALL     0x40000000 /* Receive All      */
+#define RECEIVE_ALL     0x40000000 /* Receive All      */
 #define PASS_BAD_FRAMES 0x00000008 /* Pass Bad Frames  */
 /* Dec control registers  CSR6 as well */
diff --git a/drivers/net/wireless/ath/ath5k/ahb.c b/drivers/net/wireless/ath/ath5k/ahb.c
index 9f69a4c9a3f3..a2a167363dbf 100644
--- a/drivers/net/wireless/ath/ath5k/ahb.c
+++ b/drivers/net/wireless/ath/ath5k/ahb.c
@@ -24,7 +24,6 @@
 #include "debug.h"
 #include "base.h"
 #include "reg.h"
-#include "debug.h"
 /* return bus cachesize in 4B word units */
 static void ath5k_ahb_read_cachesize(struct ath_common *common, int *csz)
diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c
index 59f59fa40334..e751fdee89b2 100644
--- a/drivers/net/wireless/b43/debugfs.c
+++ b/drivers/net/wireless/b43/debugfs.c
@@ -4,7 +4,7 @@
  debugfs driver debugging code
-  Copyright (c) 2005-2007 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2005-2007 Michael Buesch <m@bues.ch>
  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
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
index 0953ce1ac1b0..83cba22ac6e8 100644
--- a/drivers/net/wireless/b43/dma.c
+++ b/drivers/net/wireless/b43/dma.c
@@ -4,7 +4,7 @@
  DMA ringbuffer and descriptor allocation/management
-  Copyright (c) 2005, 2006 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2005, 2006 Michael Buesch <m@bues.ch>
  Some code in this file is derived from the b44.c driver
  Copyright (C) 2002 David S. Miller
diff --git a/drivers/net/wireless/b43/leds.c b/drivers/net/wireless/b43/leds.c
index b56ed41fc1bd..a38c1c6446ad 100644
--- a/drivers/net/wireless/b43/leds.c
+++ b/drivers/net/wireless/b43/leds.c
@@ -5,7 +5,7 @@
  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
  Copyright (c) 2005 Stefano Brivio <stefano.brivio@polimi.it>
-  Copyright (c) 2005-2007 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2005-2007 Michael Buesch <m@bues.ch>
  Copyright (c) 2005 Danny van Dyk <kugelfang@gentoo.org>
  Copyright (c) 2005 Andreas Jaggi <andreas.jaggi@waterwave.ch>
diff --git a/drivers/net/wireless/b43/lo.c b/drivers/net/wireless/b43/lo.c
index a3dc8bb8ca95..4c82d582a524 100644
--- a/drivers/net/wireless/b43/lo.c
+++ b/drivers/net/wireless/b43/lo.c
@@ -6,7 +6,7 @@
  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
  Copyright (c) 2005, 2006 Stefano Brivio <stefano.brivio@polimi.it>
-  Copyright (c) 2005-2007 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2005-2007 Michael Buesch <m@bues.ch>
  Copyright (c) 2005, 2006 Danny van Dyk <kugelfang@gentoo.org>
  Copyright (c) 2005, 2006 Andreas Jaggi <andreas.jaggi@waterwave.ch>
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 73fbf0358f96..032d46674f6b 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4,7 +4,7 @@
  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>
  Copyright (c) 2005 Stefano Brivio <stefano.brivio@polimi.it>
-  Copyright (c) 2005-2009 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2005-2009 Michael Buesch <m@bues.ch>
  Copyright (c) 2005 Danny van Dyk <kugelfang@gentoo.org>
  Copyright (c) 2005 Andreas Jaggi <andreas.jaggi@waterwave.ch>
diff --git a/drivers/net/wireless/b43/main.h b/drivers/net/wireless/b43/main.h
index e4ebce9be592..8c684cd33529 100644
--- a/drivers/net/wireless/b43/main.h
+++ b/drivers/net/wireless/b43/main.h
@@ -4,7 +4,7 @@
  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
                     Stefano Brivio <stefano.brivio@polimi.it>
-                     Michael Buesch <mb@bu3sch.de>
+                     Michael Buesch <m@bues.ch>
                     Danny van Dyk <kugelfang@gentoo.org>
                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c
index 2c8461dcf1b0..12b6b4067a39 100644
--- a/drivers/net/wireless/b43/pcmcia.c
+++ b/drivers/net/wireless/b43/pcmcia.c
@@ -2,7 +2,7 @@
  Broadcom B43 wireless driver
-  Copyright (c) 2007 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2007 Michael Buesch <m@bues.ch>
  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
diff --git a/drivers/net/wireless/b43/phy_a.c b/drivers/net/wireless/b43/phy_a.c
index 73ace5552bad..a6c38104693d 100644
--- a/drivers/net/wireless/b43/phy_a.c
+++ b/drivers/net/wireless/b43/phy_a.c
@@ -5,7 +5,7 @@
  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
  Copyright (c) 2005-2007 Stefano Brivio <stefano.brivio@polimi.it>
-  Copyright (c) 2005-2008 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2005-2008 Michael Buesch <m@bues.ch>
  Copyright (c) 2005, 2006 Danny van Dyk <kugelfang@gentoo.org>
  Copyright (c) 2005, 2006 Andreas Jaggi <andreas.jaggi@waterwave.ch>
diff --git a/drivers/net/wireless/b43/phy_common.c b/drivers/net/wireless/b43/phy_common.c
index 101957512bcc..07f009ff5ee2 100644
--- a/drivers/net/wireless/b43/phy_common.c
+++ b/drivers/net/wireless/b43/phy_common.c
@@ -5,7 +5,7 @@
  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
  Copyright (c) 2005-2007 Stefano Brivio <stefano.brivio@polimi.it>
-  Copyright (c) 2005-2008 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2005-2008 Michael Buesch <m@bues.ch>
  Copyright (c) 2005, 2006 Danny van Dyk <kugelfang@gentoo.org>
  Copyright (c) 2005, 2006 Andreas Jaggi <andreas.jaggi@waterwave.ch>
diff --git a/drivers/net/wireless/b43/phy_g.c b/drivers/net/wireless/b43/phy_g.c
index 83532d19347f..8e157bc213f3 100644
--- a/drivers/net/wireless/b43/phy_g.c
+++ b/drivers/net/wireless/b43/phy_g.c
@@ -5,7 +5,7 @@
  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
  Copyright (c) 2005-2007 Stefano Brivio <stefano.brivio@polimi.it>
-  Copyright (c) 2005-2008 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2005-2008 Michael Buesch <m@bues.ch>
  Copyright (c) 2005, 2006 Danny van Dyk <kugelfang@gentoo.org>
  Copyright (c) 2005, 2006 Andreas Jaggi <andreas.jaggi@waterwave.ch>
diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
index daec1d9e4a18..f93d66b1817b 100644
--- a/drivers/net/wireless/b43/phy_lp.c
+++ b/drivers/net/wireless/b43/phy_lp.c
@@ -3,7 +3,7 @@
  Broadcom B43 wireless driver
  IEEE 802.11a/g LP-PHY driver
-  Copyright (c) 2008-2009 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2008-2009 Michael Buesch <m@bues.ch>
  Copyright (c) 2009 Gábor Stefanik <netrolller.3d@gmail.com>
  This program is free software; you can redistribute it and/or modify
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 1ae1e84cb4d1..3b46360da99b 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -3,7 +3,7 @@
  Broadcom B43 wireless driver
  IEEE 802.11n PHY support
-  Copyright (c) 2008 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2008 Michael Buesch <m@bues.ch>
  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
diff --git a/drivers/net/wireless/b43/pio.c b/drivers/net/wireless/b43/pio.c
index 44da620d9cc2..6e4228c3ed1b 100644
--- a/drivers/net/wireless/b43/pio.c
+++ b/drivers/net/wireless/b43/pio.c
@@ -4,7 +4,7 @@
  PIO data transfer
-  Copyright (c) 2005-2008 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2005-2008 Michael Buesch <m@bues.ch>
  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
diff --git a/drivers/net/wireless/b43/radio_2055.c b/drivers/net/wireless/b43/radio_2055.c
index 44c6dea66882..93643f18c2b3 100644
--- a/drivers/net/wireless/b43/radio_2055.c
+++ b/drivers/net/wireless/b43/radio_2055.c
@@ -3,7 +3,7 @@
  Broadcom B43 wireless driver
  IEEE 802.11n PHY and radio device data tables
-  Copyright (c) 2008 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2008 Michael Buesch <m@bues.ch>
  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
diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c
index 59c3afe047af..70c2fcedd1bb 100644
--- a/drivers/net/wireless/b43/rfkill.c
+++ b/drivers/net/wireless/b43/rfkill.c
@@ -3,7 +3,7 @@
  Broadcom B43 wireless driver
  RFKILL support
-  Copyright (c) 2007 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2007 Michael Buesch <m@bues.ch>
  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
diff --git a/drivers/net/wireless/b43/sdio.c b/drivers/net/wireless/b43/sdio.c
index 4fd6775b8c33..80b0755ed3af 100644
--- a/drivers/net/wireless/b43/sdio.c
+++ b/drivers/net/wireless/b43/sdio.c
@@ -4,7 +4,7 @@
 * SDIO over Sonics Silicon Backplane bus glue for b43.
 *
 * Copyright (C) 2009 Albert Herranz
- * Copyright (C) 2009 Michael Buesch <mb@bu3sch.de>
+ * Copyright (C) 2009 Michael Buesch <m@bues.ch>
 *
 * 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
diff --git a/drivers/net/wireless/b43/sysfs.c b/drivers/net/wireless/b43/sysfs.c
index f1ae4e05a32c..8e8431d4eb0c 100644
--- a/drivers/net/wireless/b43/sysfs.c
+++ b/drivers/net/wireless/b43/sysfs.c
@@ -4,7 +4,7 @@
  SYSFS support routines
-  Copyright (c) 2006 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2006 Michael Buesch <m@bues.ch>
  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
diff --git a/drivers/net/wireless/b43/tables.c b/drivers/net/wireless/b43/tables.c
index 1ef9a6463ec6..ea288df8aee9 100644
--- a/drivers/net/wireless/b43/tables.c
+++ b/drivers/net/wireless/b43/tables.c
@@ -4,7 +4,7 @@
  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
  Copyright (c) 2005-2007 Stefano Brivio <stefano.brivio@polimi.it>
-  Copyright (c) 2006, 2006 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2006, 2006 Michael Buesch <m@bues.ch>
  Copyright (c) 2005 Danny van Dyk <kugelfang@gentoo.org>
  Copyright (c) 2005 Andreas Jaggi <andreas.jaggi@waterwave.ch>
diff --git a/drivers/net/wireless/b43/tables_lpphy.c b/drivers/net/wireless/b43/tables_lpphy.c
index 6748c5a196e9..cff187c5616d 100644
--- a/drivers/net/wireless/b43/tables_lpphy.c
+++ b/drivers/net/wireless/b43/tables_lpphy.c
@@ -3,7 +3,7 @@
  Broadcom B43 wireless driver
  IEEE 802.11a/g LP-PHY and radio device data tables
-  Copyright (c) 2009 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2009 Michael Buesch <m@bues.ch>
  Copyright (c) 2009 Gábor Stefanik <netrolller.3d@gmail.com>
  This program is free software; you can redistribute it and/or modify
diff --git a/drivers/net/wireless/b43/tables_nphy.c b/drivers/net/wireless/b43/tables_nphy.c
index 2de483b3d3ba..916f238a71df 100644
--- a/drivers/net/wireless/b43/tables_nphy.c
+++ b/drivers/net/wireless/b43/tables_nphy.c
@@ -3,7 +3,7 @@
  Broadcom B43 wireless driver
  IEEE 802.11n PHY data tables
-  Copyright (c) 2008 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2008 Michael Buesch <m@bues.ch>
  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
diff --git a/drivers/net/wireless/b43/wa.c b/drivers/net/wireless/b43/wa.c
index 5d00d0eaf2e7..9b1a038be08b 100644
--- a/drivers/net/wireless/b43/wa.c
+++ b/drivers/net/wireless/b43/wa.c
@@ -5,7 +5,7 @@
  PHY workarounds.
  Copyright (c) 2005-2007 Stefano Brivio <stefano.brivio@polimi.it>
-  Copyright (c) 2005-2007 Michael Buesch <mbuesch@freenet.de>
+  Copyright (c) 2005-2007 Michael Buesch <m@bues.ch>
  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
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
index 82bcf7595139..b74f25ec1ab4 100644
--- a/drivers/net/wireless/b43/xmit.c
+++ b/drivers/net/wireless/b43/xmit.c
@@ -6,7 +6,7 @@
  Copyright (C) 2005 Martin Langer <martin-langer@gmx.de>
  Copyright (C) 2005 Stefano Brivio <stefano.brivio@polimi.it>
-  Copyright (C) 2005, 2006 Michael Buesch <mb@bu3sch.de>
+  Copyright (C) 2005, 2006 Michael Buesch <m@bues.ch>
  Copyright (C) 2005 Danny van Dyk <kugelfang@gentoo.org>
  Copyright (C) 2005 Andreas Jaggi <andreas.jaggi@waterwave.ch>
diff --git a/drivers/net/wireless/b43legacy/debugfs.c b/drivers/net/wireless/b43legacy/debugfs.c
index f232618f2cd1..5e28ad0d6d17 100644
--- a/drivers/net/wireless/b43legacy/debugfs.c
+++ b/drivers/net/wireless/b43legacy/debugfs.c
@@ -4,7 +4,7 @@
  debugfs driver debugging code
-  Copyright (c) 2005-2007 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2005-2007 Michael Buesch <m@bues.ch>
  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
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c
index 704ee62101bd..5010c477abdf 100644
--- a/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
@@ -4,7 +4,7 @@
  DMA ringbuffer and descriptor allocation/management
-  Copyright (c) 2005, 2006 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2005, 2006 Michael Buesch <m@bues.ch>
  Some code in this file is derived from the b44.c driver
  Copyright (C) 2002 David S. Miller
diff --git a/drivers/net/wireless/b43legacy/ilt.c b/drivers/net/wireless/b43legacy/ilt.c
index a849078aea69..ee5682e54204 100644
--- a/drivers/net/wireless/b43legacy/ilt.c
+++ b/drivers/net/wireless/b43legacy/ilt.c
@@ -4,7 +4,7 @@
  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
                     Stefano Brivio <stefano.brivio@polimi.it>
-                     Michael Buesch <mbuesch@freenet.de>
+                     Michael Buesch <m@bues.ch>
                     Danny van Dyk <kugelfang@gentoo.org>
                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
diff --git a/drivers/net/wireless/b43legacy/leds.c b/drivers/net/wireless/b43legacy/leds.c
index 37e9be893560..2f1bfdc44f94 100644
--- a/drivers/net/wireless/b43legacy/leds.c
+++ b/drivers/net/wireless/b43legacy/leds.c
@@ -5,7 +5,7 @@
  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
  Copyright (c) 2005 Stefano Brivio <stefano.brivio@polimi.it>
-  Copyright (c) 2005-2007 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2005-2007 Michael Buesch <m@bues.ch>
  Copyright (c) 2005 Danny van Dyk <kugelfang@gentoo.org>
  Copyright (c) 2005 Andreas Jaggi <andreas.jaggi@waterwave.ch>
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index d6db6c17da4f..04c03b212a5e 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -4,7 +4,7 @@
 *
 *  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>
 *  Copyright (c) 2005-2008 Stefano Brivio <stefano.brivio@polimi.it>
- *  Copyright (c) 2005, 2006 Michael Buesch <mb@bu3sch.de>
+ *  Copyright (c) 2005, 2006 Michael Buesch <m@bues.ch>
 *  Copyright (c) 2005 Danny van Dyk <kugelfang@gentoo.org>
 *  Copyright (c) 2005 Andreas Jaggi <andreas.jaggi@waterwave.ch>
 *  Copyright (c) 2007 Larry Finger <Larry.Finger@lwfinger.net>
diff --git a/drivers/net/wireless/b43legacy/main.h b/drivers/net/wireless/b43legacy/main.h
index 1f0e2e379b02..b74a058d7bac 100644
--- a/drivers/net/wireless/b43legacy/main.h
+++ b/drivers/net/wireless/b43legacy/main.h
@@ -4,7 +4,7 @@
  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
  Copyright (c) 2005 Stefano Brivio <stefano.brivio@polimi.it>
-  Copyright (c) 2005, 2006 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2005, 2006 Michael Buesch <m@bues.ch>
  Copyright (c) 2005  Danny van Dyk <kugelfang@gentoo.org>
  Copyright (c) 2005  Andreas Jaggi <andreas.jaggi@waterwave.ch>
  Copyright (c) 2007  Larry Finger <Larry.Finger@lwfinger.net>
diff --git a/drivers/net/wireless/b43legacy/phy.c b/drivers/net/wireless/b43legacy/phy.c
index 28e477d01587..96faaef3661b 100644
--- a/drivers/net/wireless/b43legacy/phy.c
+++ b/drivers/net/wireless/b43legacy/phy.c
@@ -4,7 +4,7 @@
  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
                     Stefano Brivio <stefano.brivio@polimi.it>
-                     Michael Buesch <mbuesch@freenet.de>
+                     Michael Buesch <m@bues.ch>
                     Danny van Dyk <kugelfang@gentoo.org>
     Andreas Jaggi <andreas.jaggi@waterwave.ch>
  Copyright (c) 2007 Larry Finger <Larry.Finger@lwfinger.net>
diff --git a/drivers/net/wireless/b43legacy/phy.h b/drivers/net/wireless/b43legacy/phy.h
index ecbe409f9a94..831a7a4760e5 100644
--- a/drivers/net/wireless/b43legacy/phy.h
+++ b/drivers/net/wireless/b43legacy/phy.h
@@ -4,7 +4,7 @@
  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
                     Stefano Brivio <stefano.brivio@polimi.it>
-                     Michael Buesch <mbuesch@freenet.de>
+                     Michael Buesch <m@bues.ch>
                     Danny van Dyk <kugelfang@gentoo.org>
                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
  Copyright (c) 2007 Larry Finger <Larry.Finger@lwfinger.net>
diff --git a/drivers/net/wireless/b43legacy/pio.c b/drivers/net/wireless/b43legacy/pio.c
index b033b0ed4ca0..192251adf986 100644
--- a/drivers/net/wireless/b43legacy/pio.c
+++ b/drivers/net/wireless/b43legacy/pio.c
@@ -4,7 +4,7 @@
  PIO Transmission
-  Copyright (c) 2005 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2005 Michael Buesch <m@bues.ch>
  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
diff --git a/drivers/net/wireless/b43legacy/radio.c b/drivers/net/wireless/b43legacy/radio.c
index 2df545cfad14..475eb14e665b 100644
--- a/drivers/net/wireless/b43legacy/radio.c
+++ b/drivers/net/wireless/b43legacy/radio.c
@@ -4,7 +4,7 @@
  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
                     Stefano Brivio <stefano.brivio@polimi.it>
-                     Michael Buesch <mbuesch@freenet.de>
+                     Michael Buesch <m@bues.ch>
                     Danny van Dyk <kugelfang@gentoo.org>
                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
  Copyright (c) 2007 Larry Finger <Larry.Finger@lwfinger.net>
diff --git a/drivers/net/wireless/b43legacy/radio.h b/drivers/net/wireless/b43legacy/radio.h
index ec4de2811c52..bccb3d7da682 100644
--- a/drivers/net/wireless/b43legacy/radio.h
+++ b/drivers/net/wireless/b43legacy/radio.h
@@ -4,7 +4,7 @@
  Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
                     Stefano Brivio <stefano.brivio@polimi.it>
-                     Michael Buesch <mbuesch@freenet.de>
+                     Michael Buesch <m@bues.ch>
                     Danny van Dyk <kugelfang@gentoo.org>
                     Andreas Jaggi <andreas.jaggi@waterwave.ch>
diff --git a/drivers/net/wireless/b43legacy/rfkill.c b/drivers/net/wireless/b43legacy/rfkill.c
index b90f223fb31c..c4559bcbc707 100644
--- a/drivers/net/wireless/b43legacy/rfkill.c
+++ b/drivers/net/wireless/b43legacy/rfkill.c
@@ -3,7 +3,7 @@
  Broadcom B43 wireless driver
  RFKILL support
-  Copyright (c) 2007 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2007 Michael Buesch <m@bues.ch>
  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
diff --git a/drivers/net/wireless/b43legacy/sysfs.c b/drivers/net/wireless/b43legacy/sysfs.c
index 56c384fa9b1f..57f8b089767c 100644
--- a/drivers/net/wireless/b43legacy/sysfs.c
+++ b/drivers/net/wireless/b43legacy/sysfs.c
@@ -4,7 +4,7 @@
  SYSFS support routines
-  Copyright (c) 2006 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2006 Michael Buesch <m@bues.ch>
  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
diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c
index 6c174f38ca3c..5188fab0b377 100644
--- a/drivers/net/wireless/b43legacy/xmit.c
+++ b/drivers/net/wireless/b43legacy/xmit.c
@@ -6,7 +6,7 @@
  Copyright (C) 2005 Martin Langer <martin-langer@gmx.de>
  Copyright (C) 2005 Stefano Brivio <stefano.brivio@polimi.it>
-  Copyright (C) 2005, 2006 Michael Buesch <mb@bu3sch.de>
+  Copyright (C) 2005, 2006 Michael Buesch <m@bues.ch>
  Copyright (C) 2005 Danny van Dyk <kugelfang@gentoo.org>
  Copyright (C) 2005 Andreas Jaggi <andreas.jaggi@waterwave.ch>
  Copyright (C) 2007 Larry Finger <Larry.Finger@lwfinger.net>
diff --git a/drivers/net/wireless/iwlegacy/iwl-commands.h b/drivers/net/wireless/iwlegacy/iwl-commands.h
index ee21210bea9c..89904054473f 100644
--- a/drivers/net/wireless/iwlegacy/iwl-commands.h
+++ b/drivers/net/wireless/iwlegacy/iwl-commands.h
@@ -2617,8 +2617,8 @@ struct iwl_scanstart_notification {
        __le32 status;
 } __packed;
-#define  SCAN_OWNER_STATUS 0x1;
+#define  SCAN_OWNER_STATUS 0x1
-#define  MEASURE_OWNER_STATUS 0x2;
+#define  MEASURE_OWNER_STATUS 0x2
 #define IWL_PROBE_STATUS_OK             0
 #define IWL_PROBE_STATUS_TX_FAILED      BIT(0)
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index 5769ca5cebca..e9e9d1d1778d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -2468,8 +2468,8 @@ struct iwl_scanstart_notification {
        __le32 status;
 } __packed;
-#define  SCAN_OWNER_STATUS 0x1;
+#define  SCAN_OWNER_STATUS 0x1
-#define  MEASURE_OWNER_STATUS 0x2;
+#define  MEASURE_OWNER_STATUS 0x2
 #define IWL_PROBE_STATUS_OK             0
 #define IWL_PROBE_STATUS_TX_FAILED      BIT(0)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h b/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
index 72a3d5497547..ba5ff0411f0a 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
@@ -1074,10 +1074,10 @@
 #define _SRL(x)                                 (((x) & 0x3F) << 8)
 #define _SIFS_CCK_CTX(x)                        ((x) & 0xFF)
-#define _SIFS_CCK_TRX(x)                        (((x) & 0xFF) << 8);
+#define _SIFS_CCK_TRX(x)                        (((x) & 0xFF) << 8)
 #define _SIFS_OFDM_CTX(x)                       ((x) & 0xFF)
-#define _SIFS_OFDM_TRX(x)                       (((x) & 0xFF) << 8);
+#define _SIFS_OFDM_TRX(x)                       (((x) & 0xFF) << 8)
 #define _TBTT_PROHIBIT_HOLD(x)                  (((x) & 0xFF) << 8)
diff --git a/drivers/parport/parport_ax88796.c b/drivers/parport/parport_ax88796.c
index 2c5ac2bf5c56..844f6137970a 100644
--- a/drivers/parport/parport_ax88796.c
+++ b/drivers/parport/parport_ax88796.c
@@ -293,7 +293,7 @@ static int parport_ax88796_probe(struct platform_device *pdev)
                goto exit_mem;
        }
-        size = (res->end - res->start) + 1;
+        size = resource_size(res);
        spacing = size / 3;
        dd->io = request_mem_region(res->start, size, pdev->name);
diff --git a/drivers/pci/hotplug/shpchp_sysfs.c b/drivers/pci/hotplug/shpchp_sysfs.c
index 071b7dc0094b..efa30da1ae8f 100644
--- a/drivers/pci/hotplug/shpchp_sysfs.c
+++ b/drivers/pci/hotplug/shpchp_sysfs.c
@@ -50,29 +50,26 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha
        pci_bus_for_each_resource(bus, res, index) {
                if (res && (res->flags & IORESOURCE_MEM) &&
                                !(res->flags & IORESOURCE_PREFETCH)) {
-                        out += sprintf(out, "start = %8.8llx, "
+                        out += sprintf(out, "start = %8.8llx, length = %8.8llx\n",
-                                        "length = %8.8llx\n",
+                                       (unsigned long long)res->start,
-                                        (unsigned long long)res->start,
+                                       (unsigned long long)resource_size(res));
-                                        (unsigned long long)(res->end - res->start));
                }
        }
        out += sprintf(out, "Free resources: prefetchable memory\n");
        pci_bus_for_each_resource(bus, res, index) {
                if (res && (res->flags & IORESOURCE_MEM) &&
                               (res->flags & IORESOURCE_PREFETCH)) {
-                        out += sprintf(out, "start = %8.8llx, "
+                        out += sprintf(out, "start = %8.8llx, length = %8.8llx\n",
-                                        "length = %8.8llx\n",
+                                       (unsigned long long)res->start,
-                                        (unsigned long long)res->start,
+                                       (unsigned long long)resource_size(res));
-                                        (unsigned long long)(res->end - res->start));
                }
        }
        out += sprintf(out, "Free resources: IO\n");
        pci_bus_for_each_resource(bus, res, index) {
                if (res && (res->flags & IORESOURCE_IO)) {
-                        out += sprintf(out, "start = %8.8llx, "
+                        out += sprintf(out, "start = %8.8llx, length = %8.8llx\n",
-                                        "length = %8.8llx\n",
+                                       (unsigned long long)res->start,
-                                        (unsigned long long)res->start,
+                                       (unsigned long long)resource_size(res));
-                                        (unsigned long long)(res->end - res->start));
                }
        }
        out += sprintf(out, "Free resources: bus numbers\n");
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 6892601fc76f..cbfbab18be91 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -940,7 +940,7 @@ static int __init pcie_aspm_disable(char *str)
                printk(KERN_INFO "PCIe ASPM is disabled\n");
        } else if (!strcmp(str, "force")) {
                aspm_force = 1;
-                printk(KERN_INFO "PCIe ASPM is forcedly enabled\n");
+                printk(KERN_INFO "PCIe ASPM is forcibly enabled\n");
        }
        return 1;
 }
diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c
index fb33fa42d249..4902206f53d9 100644
--- a/drivers/pcmcia/at91_cf.c
+++ b/drivers/pcmcia/at91_cf.c
@@ -283,8 +283,7 @@ static int __init at91_cf_probe(struct platform_device *pdev)
        }
        /* reserve chip-select regions */
-        if (!request_mem_region(io->start, io->end + 1 - io->start,
+        if (!request_mem_region(io->start, resource_size(io), driver_name)) {
-                                driver_name)) {
                status = -ENXIO;
                goto fail1;
        }
@@ -308,7 +307,7 @@ static int __init at91_cf_probe(struct platform_device *pdev)
        return 0;
 fail2:
-        release_mem_region(io->start, io->end + 1 - io->start);
+        release_mem_region(io->start, resource_size(io));
 fail1:
        if (cf->socket.io_offset)
                iounmap((void __iomem *) cf->socket.io_offset);
@@ -339,7 +338,7 @@ static int __exit at91_cf_remove(struct platform_device *pdev)
        struct resource         *io = cf->socket.io[0].res;
        pcmcia_unregister_socket(&cf->socket);
-        release_mem_region(io->start, io->end + 1 - io->start);
+        release_mem_region(io->start, resource_size(io));
        iounmap((void __iomem *) cf->socket.io_offset);
        if (board->irq_pin) {
                free_irq(board->irq_pin, cf);
diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c
index 6defd4a8168e..06ad3e5e7d3d 100644
--- a/drivers/pcmcia/electra_cf.c
+++ b/drivers/pcmcia/electra_cf.c
@@ -209,9 +209,9 @@ static int __devinit electra_cf_probe(struct platform_device *ofdev)
        cf->ofdev = ofdev;
        cf->mem_phys = mem.start;
-        cf->mem_size = PAGE_ALIGN(mem.end - mem.start);
+        cf->mem_size = PAGE_ALIGN(resource_size(&mem));
        cf->mem_base = ioremap(cf->mem_phys, cf->mem_size);
-        cf->io_size = PAGE_ALIGN(io.end - io.start);
+        cf->io_size = PAGE_ALIGN(resource_size(&io));
        area = __get_vm_area(cf->io_size, 0, PHB_IO_BASE, PHB_IO_END);
        if (area == NULL)
diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c
index 81af2b3bcc00..69ae2fd22400 100644
--- a/drivers/pcmcia/pxa2xx_sharpsl.c
+++ b/drivers/pcmcia/pxa2xx_sharpsl.c
@@ -48,9 +48,6 @@ static int sharpsl_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
        int ret;
-        if (platform_scoop_config->pcmcia_init)
-                platform_scoop_config->pcmcia_init();
        /* Register interrupts */
        if (SCOOP_DEV[skt->nr].cd_irq >= 0) {
                struct pcmcia_irqs cd_irq;
diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c
index b829e655457b..57ddb969d888 100644
--- a/drivers/pcmcia/pxa2xx_trizeps4.c
+++ b/drivers/pcmcia/pxa2xx_trizeps4.c
@@ -55,10 +55,6 @@ static int trizeps_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
                }
                skt->socket.pci_irq = IRQ_GPIO(GPIO_PRDY);
                break;
-#ifndef CONFIG_MACH_TRIZEPS_CONXS
-        case 1:
-#endif
        default:
                break;
        }
diff --git a/drivers/pcmcia/rsrc_iodyn.c b/drivers/pcmcia/rsrc_iodyn.c
index 523eb691c30b..f53c237bda2f 100644
--- a/drivers/pcmcia/rsrc_iodyn.c
+++ b/drivers/pcmcia/rsrc_iodyn.c
@@ -135,7 +135,7 @@ static int iodyn_find_io(struct pcmcia_socket *s, unsigned int attr,
                try = res->end + 1;
                if ((*base == 0) || (*base == try)) {
                        if (adjust_resource(s->io[i].res, res->start,
-                                        res->end - res->start + num + 1))
+                                            resource_size(res) + num))
                                continue;
                        *base = try;
                        s->io[i].InUse += num;
@@ -147,8 +147,8 @@ static int iodyn_find_io(struct pcmcia_socket *s, unsigned int attr,
                try = res->start - num;
                if ((*base == 0) || (*base == try)) {
                        if (adjust_resource(s->io[i].res,
-                                        res->start - num,
+                                            res->start - num,
-                                        res->end - res->start + num + 1))
+                                            resource_size(res) + num))
                                continue;
                        *base = try;
                        s->io[i].InUse += num;
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
index b187555d4388..9da9656242af 100644
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -770,7 +770,7 @@ static int nonstatic_find_io(struct pcmcia_socket *s, unsigned int attr,
                                                        res->end + num);
                        if (!ret) {
                                ret = adjust_resource(s->io[i].res, res->start,
-                                               res->end - res->start + num + 1);
+                                                      resource_size(res) + num);
                                if (ret)
                                        continue;
                                *base = try;
@@ -788,8 +788,8 @@ static int nonstatic_find_io(struct pcmcia_socket *s, unsigned int attr,
                                                        res->end);
                        if (!ret) {
                                ret = adjust_resource(s->io[i].res,
-                                               res->start - num,
+                                                      res->start - num,
-                                               res->end - res->start + num + 1);
+                                                      resource_size(res) + num);
                                if (ret)
                                        continue;
                                *base = try;
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 3c7857c71a23..65b66aa44c78 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -857,7 +857,7 @@ static mode_t asus_hwmon_sysfs_is_visible(struct kobject *kobj,
                int err = asus_wmi_get_devstate(asus, dev_id, &value);
                if (err < 0)
-                        return err;
+                        return 0; /* can't return negative here */
        }
        if (dev_id == ASUS_WMI_DEVID_FAN_CTRL) {
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 4a07cd96f787..bbf3edd85beb 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -1020,7 +1020,7 @@ static void pnpacpi_encode_io(struct pnp_dev *dev,
                io->minimum = p->start;
                io->maximum = p->end;
                io->alignment = 0;      /* Correct? */
-                io->address_length = p->end - p->start + 1;
+                io->address_length = resource_size(p);
        } else {
                io->minimum = 0;
                io->address_length = 0;
@@ -1038,7 +1038,7 @@ static void pnpacpi_encode_fixed_io(struct pnp_dev *dev,
        if (pnp_resource_enabled(p)) {
                fixed_io->address = p->start;
-                fixed_io->address_length = p->end - p->start + 1;
+                fixed_io->address_length = resource_size(p);
        } else {
                fixed_io->address = 0;
                fixed_io->address_length = 0;
@@ -1061,7 +1061,7 @@ static void pnpacpi_encode_mem24(struct pnp_dev *dev,
                memory24->minimum = p->start;
                memory24->maximum = p->end;
                memory24->alignment = 0;
-                memory24->address_length = p->end - p->start + 1;
+                memory24->address_length = resource_size(p);
        } else {
                memory24->minimum = 0;
                memory24->address_length = 0;
@@ -1085,7 +1085,7 @@ static void pnpacpi_encode_mem32(struct pnp_dev *dev,
                memory32->minimum = p->start;
                memory32->maximum = p->end;
                memory32->alignment = 0;
-                memory32->address_length = p->end - p->start + 1;
+                memory32->address_length = resource_size(p);
        } else {
                memory32->minimum = 0;
                memory32->alignment = 0;
@@ -1108,7 +1108,7 @@ static void pnpacpi_encode_fixed_mem32(struct pnp_dev *dev,
                    p->flags & IORESOURCE_MEM_WRITEABLE ?
                    ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY;
                fixed_memory32->address = p->start;
-                fixed_memory32->address_length = p->end - p->start + 1;
+                fixed_memory32->address_length = resource_size(p);
        } else {
                fixed_memory32->address = 0;
                fixed_memory32->address_length = 0;
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c
index cb1f47bfee96..cca2f9f9f3e3 100644
--- a/drivers/pnp/pnpbios/rsparser.c
+++ b/drivers/pnp/pnpbios/rsparser.c
@@ -505,7 +505,7 @@ static void pnpbios_encode_mem(struct pnp_dev *dev, unsigned char *p,
        if (pnp_resource_enabled(res)) {
                base = res->start;
-                len = res->end - res->start + 1;
+                len = resource_size(res);
        } else {
                base = 0;
                len = 0;
@@ -529,7 +529,7 @@ static void pnpbios_encode_mem32(struct pnp_dev *dev, unsigned char *p,
        if (pnp_resource_enabled(res)) {
                base = res->start;
-                len = res->end - res->start + 1;
+                len = resource_size(res);
        } else {
                base = 0;
                len = 0;
@@ -559,7 +559,7 @@ static void pnpbios_encode_fixed_mem32(struct pnp_dev *dev, unsigned char *p,
        if (pnp_resource_enabled(res)) {
                base = res->start;
-                len = res->end - res->start + 1;
+                len = resource_size(res);
        } else {
                base = 0;
                len = 0;
@@ -617,7 +617,7 @@ static void pnpbios_encode_port(struct pnp_dev *dev, unsigned char *p,
        if (pnp_resource_enabled(res)) {
                base = res->start;
-                len = res->end - res->start + 1;
+                len = resource_size(res);
        } else {
                base = 0;
                len = 0;
@@ -636,11 +636,11 @@ static void pnpbios_encode_fixed_port(struct pnp_dev *dev, unsigned char *p,
                                      struct resource *res)
 {
        unsigned long base = res->start;
-        unsigned long len = res->end - res->start + 1;
+        unsigned long len = resource_size(res);
        if (pnp_resource_enabled(res)) {
                base = res->start;
-                len = res->end - res->start + 1;
+                len = resource_size(res);
        } else {
                base = 0;
                len = 0;
diff --git a/drivers/power/ds2782_battery.c b/drivers/power/ds2782_battery.c
index 4d2dc4fa2888..bfbce5de49da 100644
--- a/drivers/power/ds2782_battery.c
+++ b/drivers/power/ds2782_battery.c
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2009 Bluewater Systems Ltd
 *
- * Author: Ryan Mallon <ryan@bluewatersys.com>
+ * Author: Ryan Mallon
 *
 * DS2786 added by Yulia Vilensky <vilensky@compulab.co.il>
 *
@@ -416,6 +416,6 @@ static void __exit ds278x_exit(void)
 }
 module_exit(ds278x_exit);
-MODULE_AUTHOR("Ryan Mallon <ryan@bluewatersys.com>");
+MODULE_AUTHOR("Ryan Mallon");
 MODULE_DESCRIPTION("Maxim/Dallas DS2782 Stand-Alone Fuel Gauage IC driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-at32ap700x.c b/drivers/rtc/rtc-at32ap700x.c
index e725d51e773d..8dd08305aae1 100644
--- a/drivers/rtc/rtc-at32ap700x.c
+++ b/drivers/rtc/rtc-at32ap700x.c
@@ -223,7 +223,7 @@ static int __init at32_rtc_probe(struct platform_device *pdev)
        }
        rtc->irq = irq;
-        rtc->regs = ioremap(regs->start, regs->end - regs->start + 1);
+        rtc->regs = ioremap(regs->start, resource_size(regs));
        if (!rtc->regs) {
                ret = -ENOMEM;
                dev_dbg(&pdev->dev, "could not map I/O memory\n");
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 911e75cdc125..05beb6c1ca79 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -606,7 +606,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
         * (needing ioremap etc), not i/o space resources like this ...
         */
        ports = request_region(ports->start,
-                        ports->end + 1 - ports->start,
+                        resource_size(ports),
                        driver_name);
        if (!ports) {
                dev_dbg(dev, "i/o registers already in use\n");
@@ -750,7 +750,7 @@ cleanup1:
        cmos_rtc.dev = NULL;
        rtc_device_unregister(cmos_rtc.rtc);
 cleanup0:
-        release_region(ports->start, ports->end + 1 - ports->start);
+        release_region(ports->start, resource_size(ports));
        return retval;
 }
@@ -779,7 +779,7 @@ static void __exit cmos_do_remove(struct device *dev)
        cmos->rtc = NULL;
        ports = cmos->iomem;
-        release_region(ports->start, ports->end + 1 - ports->start);
+        release_region(ports->start, resource_size(ports));
        cmos->iomem = NULL;
        cmos->dev = NULL;
diff --git a/drivers/rtc/rtc-ds1286.c b/drivers/rtc/rtc-ds1286.c
index 47e681df31e2..68e6caf25496 100644
--- a/drivers/rtc/rtc-ds1286.c
+++ b/drivers/rtc/rtc-ds1286.c
@@ -343,7 +343,7 @@ static int __devinit ds1286_probe(struct platform_device *pdev)
        if (!priv)
                return -ENOMEM;
-        priv->size = res->end - res->start + 1;
+        priv->size = resource_size(res);
        if (!request_mem_region(res->start, priv->size, pdev->name)) {
                ret = -EBUSY;
                goto out;
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
index fbabc773dded..568ad30617e7 100644
--- a/drivers/rtc/rtc-ds1511.c
+++ b/drivers/rtc/rtc-ds1511.c
@@ -490,7 +490,7 @@ ds1511_rtc_probe(struct platform_device *pdev)
        pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
        if (!pdata)
                return -ENOMEM;
-        pdata->size = res->end - res->start + 1;
+        pdata->size = resource_size(res);
        if (!devm_request_mem_region(&pdev->dev, res->start, pdata->size,
                        pdev->name))
                return -EBUSY;
diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c
index 042630c90dd3..d84a448dd754 100644
--- a/drivers/rtc/rtc-ds1742.c
+++ b/drivers/rtc/rtc-ds1742.c
@@ -173,7 +173,7 @@ static int __devinit ds1742_rtc_probe(struct platform_device *pdev)
        pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
        if (!pdata)
                return -ENOMEM;
-        pdata->size = res->end - res->start + 1;
+        pdata->size = resource_size(res);
        if (!devm_request_mem_region(&pdev->dev, res->start, pdata->size,
                pdev->name))
                return -EBUSY;
diff --git a/drivers/rtc/rtc-m48t35.c b/drivers/rtc/rtc-m48t35.c
index 7410875e5838..8e2a24e33ed6 100644
--- a/drivers/rtc/rtc-m48t35.c
+++ b/drivers/rtc/rtc-m48t35.c
@@ -154,7 +154,7 @@ static int __devinit m48t35_probe(struct platform_device *pdev)
        if (!priv)
                return -ENOMEM;
-        priv->size = res->end - res->start + 1;
+        priv->size = resource_size(res);
        /*
         * kludge: remove the #ifndef after ioc3 resource
         * conflicts are resolved
diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
index 3978f4caf724..28365388fb6c 100644
--- a/drivers/rtc/rtc-m48t59.c
+++ b/drivers/rtc/rtc-m48t59.c
@@ -433,7 +433,7 @@ static int __devinit m48t59_rtc_probe(struct platform_device *pdev)
        if (!m48t59->ioaddr) {
                /* ioaddr not mapped externally */
-                m48t59->ioaddr = ioremap(res->start, res->end - res->start + 1);
+                m48t59->ioaddr = ioremap(res->start, resource_size(res));
                if (!m48t59->ioaddr)
                        goto out;
        }
diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c
index 0cec5650d56a..d33544802a2e 100644
--- a/drivers/rtc/rtc-mrst.c
+++ b/drivers/rtc/rtc-mrst.c
@@ -332,9 +332,8 @@ vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, int rtc_irq)
        if (!iomem)
                return -ENODEV;
-        iomem = request_mem_region(iomem->start,
+        iomem = request_mem_region(iomem->start, resource_size(iomem),
-                        iomem->end + 1 - iomem->start,
+                                   driver_name);
-                        driver_name);
        if (!iomem) {
                dev_dbg(dev, "i/o mem already in use.\n");
                return -EBUSY;
diff --git a/drivers/rtc/rtc-puv3.c b/drivers/rtc/rtc-puv3.c
index 46f14b82f3ab..b3eba3cddd42 100644
--- a/drivers/rtc/rtc-puv3.c
+++ b/drivers/rtc/rtc-puv3.c
@@ -267,9 +267,8 @@ static int puv3_rtc_probe(struct platform_device *pdev)
                return -ENOENT;
        }
-        puv3_rtc_mem = request_mem_region(res->start,
+        puv3_rtc_mem = request_mem_region(res->start, resource_size(res),
-                                         res->end-res->start+1,
+                                          pdev->name);
-                                         pdev->name);
        if (puv3_rtc_mem == NULL) {
                dev_err(&pdev->dev, "failed to reserve memory region\n");
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 53c99b1a3c92..9329dbb9ebab 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -474,8 +474,7 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
                return -ENOENT;
        }
-        s3c_rtc_mem = request_mem_region(res->start,
+        s3c_rtc_mem = request_mem_region(res->start, resource_size(res),
-                                         res->end-res->start+1,
                                         pdev->name);
        if (s3c_rtc_mem == NULL) {
@@ -484,7 +483,7 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
                goto err_nores;
        }
-        s3c_rtc_base = ioremap(res->start, res->end - res->start + 1);
+        s3c_rtc_base = ioremap(res->start, resource_size(res));
        if (s3c_rtc_base == NULL) {
                dev_err(&pdev->dev, "failed ioremap()\n");
                ret = -EINVAL;
diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c
index e7fc70d6b478..2e7c136bb805 100644
--- a/drivers/scsi/device_handler/scsi_dh_rdac.c
+++ b/drivers/scsi/device_handler/scsi_dh_rdac.c
@@ -35,7 +35,7 @@
 * mode page were taken from the LSI RDAC 2.4 GPL'd
 * driver, and then converted to Linux conventions.
 */
-#define RDAC_QUIESCENCE_TIME 20;
+#define RDAC_QUIESCENCE_TIME 20
 /*
 * Page Codes
 */
diff --git a/drivers/scsi/lpfc/lpfc_hw.h b/drivers/scsi/lpfc/lpfc_hw.h
index 9059524cf225..ab4c4d651d0c 100644
--- a/drivers/scsi/lpfc/lpfc_hw.h
+++ b/drivers/scsi/lpfc/lpfc_hw.h
@@ -2955,18 +2955,18 @@ typedef struct _SLI2_RDSC {
 typedef struct _PCB {
 #ifdef __BIG_ENDIAN_BITFIELD
        uint32_t type:8;
-#define TYPE_NATIVE_SLI2       0x01;
+#define TYPE_NATIVE_SLI2       0x01
        uint32_t feature:8;
-#define FEATURE_INITIAL_SLI2   0x01;
+#define FEATURE_INITIAL_SLI2   0x01
        uint32_t rsvd:12;
        uint32_t maxRing:4;
 #else   /*  __LITTLE_ENDIAN_BITFIELD */
        uint32_t maxRing:4;
        uint32_t rsvd:12;
        uint32_t feature:8;
-#define FEATURE_INITIAL_SLI2   0x01;
+#define FEATURE_INITIAL_SLI2   0x01
        uint32_t type:8;
-#define TYPE_NATIVE_SLI2       0x01;
+#define TYPE_NATIVE_SLI2       0x01
 #endif
        uint32_t mailBoxSize;
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 1b60a95adb50..ae8e298746ba 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -63,7 +63,7 @@ qla2100_intr_handler(int irq, void *dev_id)
                        /*
                         * Issue a "HARD" reset in order for the RISC interrupt
-                         * bit to be cleared.  Schedule a big hammmer to get
+                         * bit to be cleared.  Schedule a big hammer to get
                         * out of the RISC PAUSED state.
                         */
                        WRT_REG_WORD(&reg->hccr, HCCR_RESET_RISC);
@@ -169,7 +169,7 @@ qla2300_intr_handler(int irq, void *dev_id)
                        /*
                         * Issue a "HARD" reset in order for the RISC
                         * interrupt bit to be cleared.  Schedule a big
-                         * hammmer to get out of the RISC PAUSED state.
+                         * hammer to get out of the RISC PAUSED state.
                         */
                        WRT_REG_WORD(&reg->hccr, HCCR_RESET_RISC);
                        RD_REG_WORD(&reg->hccr);
diff --git a/drivers/ssb/b43_pci_bridge.c b/drivers/ssb/b43_pci_bridge.c
index 744d3f6e4709..bf53e44c82a1 100644
--- a/drivers/ssb/b43_pci_bridge.c
+++ b/drivers/ssb/b43_pci_bridge.c
@@ -5,7 +5,7 @@
 * because of its small size we include it in the SSB core
 * instead of creating a standalone module.
 *
- * Copyright 2007  Michael Buesch <mb@bu3sch.de>
+ * Copyright 2007  Michael Buesch <m@bues.ch>
 *
 * Licensed under the GNU/GPL. See COPYING for details.
 */
diff --git a/drivers/ssb/driver_chipcommon.c b/drivers/ssb/driver_chipcommon.c
index 06d15b6f2215..5d9c97c24797 100644
--- a/drivers/ssb/driver_chipcommon.c
+++ b/drivers/ssb/driver_chipcommon.c
@@ -3,7 +3,7 @@
 * Broadcom ChipCommon core driver
 *
 * Copyright 2005, Broadcom Corporation
- * Copyright 2006, 2007, Michael Buesch <mb@bu3sch.de>
+ * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
 *
 * Licensed under the GNU/GPL. See COPYING for details.
 */
diff --git a/drivers/ssb/driver_chipcommon_pmu.c b/drivers/ssb/driver_chipcommon_pmu.c
index a7aef47bf739..52901c14c68b 100644
--- a/drivers/ssb/driver_chipcommon_pmu.c
+++ b/drivers/ssb/driver_chipcommon_pmu.c
@@ -2,7 +2,7 @@
 * Sonics Silicon Backplane
 * Broadcom ChipCommon Power Management Unit driver
 *
- * Copyright 2009, Michael Buesch <mb@bu3sch.de>
+ * Copyright 2009, Michael Buesch <m@bues.ch>
 * Copyright 2007, Broadcom Corporation
 *
 * Licensed under the GNU/GPL. See COPYING for details.
diff --git a/drivers/ssb/driver_extif.c b/drivers/ssb/driver_extif.c
index c3e1d3e6d610..dc47f30e9cf7 100644
--- a/drivers/ssb/driver_extif.c
+++ b/drivers/ssb/driver_extif.c
@@ -3,7 +3,7 @@
 * Broadcom EXTIF core driver
 *
 * Copyright 2005, Broadcom Corporation
- * Copyright 2006, 2007, Michael Buesch <mb@bu3sch.de>
+ * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
 * Copyright 2006, 2007, Felix Fietkau <nbd@openwrt.org>
 * Copyright 2007, Aurelien Jarno <aurelien@aurel32.net>
 *
diff --git a/drivers/ssb/driver_gige.c b/drivers/ssb/driver_gige.c
index d75890909222..3adb98dad70c 100644
--- a/drivers/ssb/driver_gige.c
+++ b/drivers/ssb/driver_gige.c
@@ -3,7 +3,7 @@
 * Broadcom Gigabit Ethernet core driver
 *
 * Copyright 2008, Broadcom Corporation
- * Copyright 2008, Michael Buesch <mb@bu3sch.de>
+ * Copyright 2008, Michael Buesch <m@bues.ch>
 *
 * Licensed under the GNU/GPL. See COPYING for details.
 */
diff --git a/drivers/ssb/driver_mipscore.c b/drivers/ssb/driver_mipscore.c
index 97efce184a8f..ced501568594 100644
--- a/drivers/ssb/driver_mipscore.c
+++ b/drivers/ssb/driver_mipscore.c
@@ -3,7 +3,7 @@
 * Broadcom MIPS core driver
 *
 * Copyright 2005, Broadcom Corporation
- * Copyright 2006, 2007, Michael Buesch <mb@bu3sch.de>
+ * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
 *
 * Licensed under the GNU/GPL. See COPYING for details.
 */
diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c
index 11d85bfd774e..e6ac3177fbbe 100644
--- a/drivers/ssb/driver_pcicore.c
+++ b/drivers/ssb/driver_pcicore.c
@@ -3,7 +3,7 @@
 * Broadcom PCI-core driver
 *
 * Copyright 2005, Broadcom Corporation
- * Copyright 2006, 2007, Michael Buesch <mb@bu3sch.de>
+ * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
 *
 * Licensed under the GNU/GPL. See COPYING for details.
 */
diff --git a/drivers/ssb/embedded.c b/drivers/ssb/embedded.c
index a0e0d246b592..eec3e267be4d 100644
--- a/drivers/ssb/embedded.c
+++ b/drivers/ssb/embedded.c
@@ -3,7 +3,7 @@
 * Embedded systems support code
 *
 * Copyright 2005-2008, Broadcom Corporation
- * Copyright 2006-2008, Michael Buesch <mb@bu3sch.de>
+ * Copyright 2006-2008, Michael Buesch <m@bues.ch>
 *
 * Licensed under the GNU/GPL. See COPYING for details.
 */
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index 6ec6e099fe04..29c7d4f9d1ae 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -3,7 +3,7 @@
 * Subsystem core
 *
 * Copyright 2005, Broadcom Corporation
- * Copyright 2006, 2007, Michael Buesch <mb@bu3sch.de>
+ * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
 *
 * Licensed under the GNU/GPL. See COPYING for details.
 */
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index a00b35f03084..34c3bab90b9a 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -1,7 +1,7 @@
 /*
 * Sonics Silicon Backplane PCI-Hostbus related functions.
 *
- * Copyright (C) 2005-2006 Michael Buesch <mb@bu3sch.de>
+ * Copyright (C) 2005-2006 Michael Buesch <m@bues.ch>
 * Copyright (C) 2005 Martin Langer <martin-langer@gmx.de>
 * Copyright (C) 2005 Stefano Brivio <st3@riseup.net>
 * Copyright (C) 2005 Danny van Dyk <kugelfang@gentoo.org>
diff --git a/drivers/ssb/pcihost_wrapper.c b/drivers/ssb/pcihost_wrapper.c
index d7a98131ebf3..116a8116984b 100644
--- a/drivers/ssb/pcihost_wrapper.c
+++ b/drivers/ssb/pcihost_wrapper.c
@@ -6,7 +6,7 @@
 * Copyright (c) 2005 Stefano Brivio <st3@riseup.net>
 * Copyright (c) 2005 Danny van Dyk <kugelfang@gentoo.org>
 * Copyright (c) 2005 Andreas Jaggi <andreas.jaggi@waterwave.ch>
- * Copyright (c) 2005-2007 Michael Buesch <mbuesch@freenet.de>
+ * Copyright (c) 2005-2007 Michael Buesch <m@bues.ch>
 *
 * Licensed under the GNU/GPL. See COPYING for details.
 */
diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c
index f8533795ee7f..c821c6b2a6a0 100644
--- a/drivers/ssb/pcmcia.c
+++ b/drivers/ssb/pcmcia.c
@@ -3,7 +3,7 @@
 * PCMCIA-Hostbus related functions
 *
 * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
- * Copyright 2007-2008 Michael Buesch <mb@bu3sch.de>
+ * Copyright 2007-2008 Michael Buesch <m@bues.ch>
 *
 * Licensed under the GNU/GPL. See COPYING for details.
 */
diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c
index 8047f9aaa4b2..3e844874631f 100644
--- a/drivers/ssb/scan.c
+++ b/drivers/ssb/scan.c
@@ -2,7 +2,7 @@
 * Sonics Silicon Backplane
 * Bus scanning
 *
- * Copyright (C) 2005-2007 Michael Buesch <mb@bu3sch.de>
+ * Copyright (C) 2005-2007 Michael Buesch <m@bues.ch>
 * Copyright (C) 2005 Martin Langer <martin-langer@gmx.de>
 * Copyright (C) 2005 Stefano Brivio <st3@riseup.net>
 * Copyright (C) 2005 Danny van Dyk <kugelfang@gentoo.org>
diff --git a/drivers/ssb/sdio.c b/drivers/ssb/sdio.c
index 65a6080cb02a..63fd709038ca 100644
--- a/drivers/ssb/sdio.c
+++ b/drivers/ssb/sdio.c
@@ -6,7 +6,7 @@
 *
 * Based on drivers/ssb/pcmcia.c
 * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
- * Copyright 2007-2008 Michael Buesch <mb@bu3sch.de>
+ * Copyright 2007-2008 Michael Buesch <m@bues.ch>
 *
 * Licensed under the GNU/GPL. See COPYING for details.
 *
diff --git a/drivers/ssb/sprom.c b/drivers/ssb/sprom.c
index 45ff0e3a3828..80d366fcf8d3 100644
--- a/drivers/ssb/sprom.c
+++ b/drivers/ssb/sprom.c
@@ -2,7 +2,7 @@
 * Sonics Silicon Backplane
 * Common SPROM support routines
 *
- * Copyright (C) 2005-2008 Michael Buesch <mb@bu3sch.de>
+ * Copyright (C) 2005-2008 Michael Buesch <m@bues.ch>
 * Copyright (C) 2005 Martin Langer <martin-langer@gmx.de>
 * Copyright (C) 2005 Stefano Brivio <st3@riseup.net>
 * Copyright (C) 2005 Danny van Dyk <kugelfang@gentoo.org>
diff --git a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
index 22453b0873e4..11dc39c6987a 100644
--- a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
+++ b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
@@ -52,7 +52,6 @@
 #include "aggr_recv_api.h"
 #include <host_version.h>
 #include <linux/rtnetlink.h>
-#include <linux/init.h>
 #include <linux/moduleparam.h>
 #include "ar6000_api.h"
 #ifdef CONFIG_HOST_TCMD_SUPPORT
diff --git a/drivers/staging/bcm/headers.h b/drivers/staging/bcm/headers.h
index 1148e5e22eb9..8fe8d2b1f627 100644
--- a/drivers/staging/bcm/headers.h
+++ b/drivers/staging/bcm/headers.h
@@ -20,25 +20,23 @@
 #include <linux/file.h>
 #include <linux/string.h>
 #include <linux/etherdevice.h>
-#include <net/ip.h>
 #include <linux/wait.h>
 #include <linux/proc_fs.h>
 #include <linux/interrupt.h>
 #include <linux/version.h>
 #include <linux/stddef.h>
-#include <linux/kernel.h>
 #include <linux/stat.h>
 #include <linux/fcntl.h>
 #include <linux/unistd.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/pagemap.h>
-#include <asm/uaccess.h>
 #include <linux/kthread.h>
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/usb.h>
+#include <asm/uaccess.h>
+#include <net/ip.h>
 #include "Typedefs.h"
 #include "Version.h"
@@ -61,7 +59,6 @@
 #include "Queue.h"
 #include "vendorspecificextn.h"
 #include "InterfaceMacros.h"
 #include "InterfaceAdapter.h"
 #include "InterfaceIsr.h"
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index a71c6f8ee8a3..8cbfeae464b1 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -26,7 +26,6 @@
 #include BCMEMBEDIMAGE
 #endif                          /* BCMEMBEDIMAGE */
-#include <bcmdefs.h>
 #include <bcmutils.h>
 #include <bcmdevs.h>
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
index 996033cf9b09..d4bcc1edddb2 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
+++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
@@ -18,7 +18,6 @@
 #define _wl_cfg80211_h_
 #include <linux/wireless.h>
-#include <linux/wireless.h>
 #include <net/cfg80211.h>
 #include <wlioctl.h>
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
index 35eec917f232..53e6a10655e1 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
@@ -20,21 +20,16 @@
 #include <linux/netdevice.h>
 #include <linux/hardirq.h>
 #include <wlioctl.h>
 #include <bcmutils.h>
 #include <linux/if_arp.h>
 #include <asm/uaccess.h>
+#include <linux/ieee80211.h>
 #include <dngl_stats.h>
 #include <dhd.h>
 #include <dhdioctl.h>
-#include <linux/ieee80211.h>
-typedef const struct si_pub si_t;
-#include <wlioctl.h>
-#include <dngl_stats.h>
+typedef const struct si_pub si_t;
-#include <dhd.h>
 #define WL_ERROR(fmt, args...)  printk(fmt, ##args)
 #define WL_TRACE(fmt, args...)  no_printk(fmt, ##args)
diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c
index 359e73741c48..b3324d609c8b 100644
--- a/drivers/staging/hv/hv_mouse.c
+++ b/drivers/staging/hv/hv_mouse.c
@@ -24,7 +24,6 @@
 #include <linux/hiddev.h>
 #include <linux/pci.h>
 #include <linux/dmi.h>
-#include <linux/delay.h>
 #include "hyperv.h"
diff --git a/drivers/staging/hv/tools/hv_kvp_daemon.c b/drivers/staging/hv/tools/hv_kvp_daemon.c
index 33f0f1c8ad73..a4a407f7052a 100644
--- a/drivers/staging/hv/tools/hv_kvp_daemon.c
+++ b/drivers/staging/hv/tools/hv_kvp_daemon.c
@@ -35,7 +35,6 @@
 #include <arpa/inet.h>
 #include <linux/connector.h>
 #include <linux/netlink.h>
-#include <sys/socket.h>
 #include <ifaddrs.h>
 #include <netdb.h>
 #include <syslog.h>
diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c
index 1a94364c48b5..72258e8c64ca 100644
--- a/drivers/staging/nvec/nvec.c
+++ b/drivers/staging/nvec/nvec.c
@@ -21,7 +21,6 @@
 #include <linux/semaphore.h>
 #include <linux/list.h>
 #include <linux/notifier.h>
-#include <linux/workqueue.h>
 #include <linux/platform_device.h>
 #include "nvec.h"
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index bae7d85fe831..4c6651aac307 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -307,7 +307,7 @@ static int proc_get_stats_tx(char *page, char **start,
 void rtl8180_proc_module_init(void)
 {
        DMESG("Initializing proc filesystem");
-        rtl8180_proc = create_proc_entry(RTL8180_MODULE_NAME, S_IFDIR, init_net.proc_net);
+        rtl8180_proc = proc_mkdir(RTL8180_MODULE_NAME, init_net.proc_net);
 }
 void rtl8180_proc_module_remove(void)
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
index 663b0b8e1095..c2901b50dbfe 100644
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
@@ -311,7 +311,7 @@ int __init ieee80211_rtl_init(void)
        }
        ieee80211_debug_level = debug;
-        ieee80211_proc = create_proc_entry(DRV_NAME, S_IFDIR, init_net.proc_net);
+        ieee80211_proc = proc_mkdir(DRV_NAME, init_net.proc_net);
        if (ieee80211_proc == NULL) {
                IEEE80211_ERROR("Unable to create " DRV_NAME
                                " proc directory\n");
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index 19a9a07224a2..8550794c6b91 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -508,7 +508,7 @@ static int proc_get_stats_rx(char *page, char **start,
 static void rtl8192_proc_module_init(void)
 {
        RT_TRACE(COMP_INIT, "Initializing proc filesystem\n");
-        rtl8192_proc=create_proc_entry(RTL819xE_MODULE_NAME, S_IFDIR, init_net.proc_net);
+        rtl8192_proc = proc_mkdir(RTL819xE_MODULE_NAME, init_net.proc_net);
 }
@@ -540,9 +540,7 @@ static void rtl8192_proc_init_one(struct r8192_priv *priv)
        struct net_device *dev = priv->ieee80211->dev;
        struct proc_dir_entry *e;
-        priv->dir_dev = create_proc_entry(dev->name,
+        priv->dir_dev = proc_mkdir(dev->name, rtl8192_proc);
-                                          S_IFDIR | S_IRUGO | S_IXUGO,
-                                          rtl8192_proc);
        if (!priv->dir_dev) {
                RT_TRACE(COMP_ERR, "Unable to initialize /proc/net/rtl8192/%s\n",
                      dev->name);
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
index fe978f359f91..d315b256b7a7 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
@@ -283,7 +283,7 @@ int __init ieee80211_debug_init(void)
        ieee80211_debug_level = debug;
-        ieee80211_proc = create_proc_entry(DRV_NAME, S_IFDIR, init_net.proc_net);
+        ieee80211_proc = proc_mkdir(DRV_NAME, init_net.proc_net);
        if (ieee80211_proc == NULL) {
                IEEE80211_ERROR("Unable to create " DRV_NAME
                                " proc directory\n");
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index e81b8ab6aa9d..6a1b5c179027 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -671,7 +671,7 @@ static int proc_get_stats_rx(char *page, char **start,
 void rtl8192_proc_module_init(void)
 {
        RT_TRACE(COMP_INIT, "Initializing proc filesystem");
-        rtl8192_proc=create_proc_entry(RTL819xU_MODULE_NAME, S_IFDIR, init_net.proc_net);
+        rtl8192_proc = proc_mkdir(RTL819xU_MODULE_NAME, init_net.proc_net);
 }
@@ -706,9 +706,7 @@ void rtl8192_proc_init_one(struct net_device *dev)
 {
        struct proc_dir_entry *e;
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
-        priv->dir_dev = create_proc_entry(dev->name,
+        priv->dir_dev = proc_mkdir(dev->name, rtl8192_proc);
-                                          S_IFDIR | S_IRUGO | S_IXUGO,
-                                          rtl8192_proc);
        if (!priv->dir_dev) {
                RT_TRACE(COMP_ERR, "Unable to initialize /proc/net/rtl8192/%s\n",
                      dev->name);
diff --git a/drivers/staging/rtl8712/drv_types.h b/drivers/staging/rtl8712/drv_types.h
index 3bb66dc2eb2c..4f380a64aa85 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -29,7 +29,6 @@ struct	qos_priv	{
 #include "rtl871x_ht.h"
 #include "rtl871x_cmd.h"
-#include "wlan_bssdef.h"
 #include "rtl871x_xmit.h"
 #include "rtl871x_recv.h"
 #include "rtl871x_security.h"
diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h
index 3d3f73c5cd5b..505395cff282 100644
--- a/drivers/staging/rtl8712/osdep_service.h
+++ b/drivers/staging/rtl8712/osdep_service.h
@@ -22,7 +22,6 @@
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/kref.h>
-#include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <linux/usb.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c
index 52342c17eadd..848b4c57531d 100644
--- a/drivers/staging/sep/sep_driver.c
+++ b/drivers/staging/sep/sep_driver.c
@@ -50,7 +50,6 @@
 #include <linux/interrupt.h>
 #include <linux/pagemap.h>
 #include <asm/cacheflush.h>
-#include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/jiffies.h>
 #include <linux/rar_register.h>
diff --git a/drivers/staging/usbip/userspace/src/utils.h b/drivers/staging/usbip/userspace/src/utils.h
index 6c29ae945212..991f662720bb 100644
--- a/drivers/staging/usbip/userspace/src/utils.h
+++ b/drivers/staging/usbip/userspace/src/utils.h
@@ -13,7 +13,6 @@
 #include <glib.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdlib.h>
diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c
index a6bfb6deba94..09df38b4610c 100644
--- a/drivers/target/tcm_fc/tfc_cmd.c
+++ b/drivers/target/tcm_fc/tfc_cmd.c
@@ -45,7 +45,6 @@
 #include <target/target_core_device.h>
 #include <target/target_core_tpg.h>
 #include <target/target_core_configfs.h>
-#include <target/target_core_base.h>
 #include <target/target_core_tmr.h>
 #include <target/configfs_macros.h>
diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c
index d63e3dd3b180..8781d1e423df 100644
--- a/drivers/target/tcm_fc/tfc_conf.c
+++ b/drivers/target/tcm_fc/tfc_conf.c
@@ -48,7 +48,6 @@
 #include <target/target_core_device.h>
 #include <target/target_core_tpg.h>
 #include <target/target_core_configfs.h>
-#include <target/target_core_base.h>
 #include <target/configfs_macros.h>
 #include "tcm_fc.h"
diff --git a/drivers/target/tcm_fc/tfc_io.c b/drivers/target/tcm_fc/tfc_io.c
index 11e6483fc127..8e2a46ddcccb 100644
--- a/drivers/target/tcm_fc/tfc_io.c
+++ b/drivers/target/tcm_fc/tfc_io.c
@@ -54,7 +54,6 @@
 #include <target/target_core_device.h>
 #include <target/target_core_tpg.h>
 #include <target/target_core_configfs.h>
-#include <target/target_core_base.h>
 #include <target/configfs_macros.h>
 #include "tcm_fc.h"
diff --git a/drivers/target/tcm_fc/tfc_sess.c b/drivers/target/tcm_fc/tfc_sess.c
index fbcbb3d1d06b..dbb5eaeee399 100644
--- a/drivers/target/tcm_fc/tfc_sess.c
+++ b/drivers/target/tcm_fc/tfc_sess.c
@@ -46,10 +46,8 @@
 #include <target/target_core_device.h>
 #include <target/target_core_tpg.h>
 #include <target/target_core_configfs.h>
-#include <target/target_core_base.h>
 #include <target/configfs_macros.h>
-#include <scsi/libfc.h>
 #include "tcm_fc.h"
 static void ft_sess_delete_all(struct ft_tport *);
diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c
index f41b4259ecdd..cf35e0dc5085 100644
--- a/drivers/tty/serial/8250_pci.c
+++ b/drivers/tty/serial/8250_pci.c
@@ -743,7 +743,7 @@ pci_ni8430_setup(struct serial_private *priv,
        len =  pci_resource_len(priv->dev, bar);
        p = ioremap_nocache(base, len);
-        /* enable the transciever */
+        /* enable the transceiver */
        writeb(readb(p + offset + NI8430_PORTCON) | NI8430_PORTCON_TXVR_ENABLE,
               p + offset + NI8430_PORTCON);
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 636144cea932..8f41e1123461 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -457,7 +457,6 @@ config SERIAL_SAMSUNG_UARTS_4
 config SERIAL_SAMSUNG_UARTS
        int
        depends on ARM && PLAT_SAMSUNG
-        default 2 if ARCH_S3C2400
        default 6 if ARCH_S5P6450
        default 4 if SERIAL_SAMSUNG_UARTS_4
        default 3
@@ -489,13 +488,6 @@ config SERIAL_SAMSUNG_CONSOLE
          your boot loader about how to pass options to the kernel at
          boot time.)
-config SERIAL_S3C2400
-        tristate "Samsung S3C2410 Serial port support"
-        depends on ARM && SERIAL_SAMSUNG && CPU_S3C2400
-        default y if CPU_S3C2400
-        help
-          Serial port support for the Samsung S3C2400 SoC
 config SERIAL_S3C2410
        tristate "Samsung S3C2410 Serial port support"
        depends on SERIAL_SAMSUNG && CPU_S3C2410
@@ -519,13 +511,6 @@ config SERIAL_S3C2440
        help
          Serial port support for the Samsung S3C2440, S3C2416 and S3C2442 SoC
-config SERIAL_S3C24A0
-        tristate "Samsung S3C24A0 Serial port support"
-        depends on SERIAL_SAMSUNG && CPU_S3C24A0
-        default y if CPU_S3C24A0
-        help
-          Serial port support for the Samsung S3C24A0 SoC
 config SERIAL_S3C6400
        tristate "Samsung S3C6400/S3C6410/S5P6440/S5P6450/S5PC100 Serial port support"
        depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410 || CPU_S5P6440 || CPU_S5P6450 || CPU_S5PC100)
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
index cb2628fee4c7..83b4da6a1062 100644
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@ -38,11 +38,9 @@ obj-$(CONFIG_SERIAL_BCM63XX) += bcm63xx_uart.o
 obj-$(CONFIG_SERIAL_BFIN) += bfin_5xx.o
 obj-$(CONFIG_SERIAL_BFIN_SPORT) += bfin_sport_uart.o
 obj-$(CONFIG_SERIAL_SAMSUNG) += samsung.o
-obj-$(CONFIG_SERIAL_S3C2400) += s3c2400.o
 obj-$(CONFIG_SERIAL_S3C2410) += s3c2410.o
 obj-$(CONFIG_SERIAL_S3C2412) += s3c2412.o
 obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o
-obj-$(CONFIG_SERIAL_S3C24A0) += s3c24a0.o
 obj-$(CONFIG_SERIAL_S3C6400) += s3c6400.o
 obj-$(CONFIG_SERIAL_S5PV210) += s5pv210.o
 obj-$(CONFIG_SERIAL_MAX3100) += max3100.o
diff --git a/drivers/tty/serial/bfin_5xx.c b/drivers/tty/serial/bfin_5xx.c
index 9b1ff2b6bb37..ff6979181ac5 100644
--- a/drivers/tty/serial/bfin_5xx.c
+++ b/drivers/tty/serial/bfin_5xx.c
@@ -1304,8 +1304,7 @@ static int bfin_serial_probe(struct platform_device *pdev)
                        goto out_error_free_peripherals;
                }
-                uart->port.membase = ioremap(res->start,
+                uart->port.membase = ioremap(res->start, resource_size(res));
-                        res->end - res->start);
                if (!uart->port.membase) {
                        dev_err(&pdev->dev, "Cannot map uart IO\n");
                        ret = -ENXIO;
@@ -1483,7 +1482,7 @@ static int bfin_earlyprintk_probe(struct platform_device *pdev)
        }
        bfin_earlyprintk_port.port.membase = ioremap(res->start,
-                        res->end - res->start);
+                                                     resource_size(res));
        if (!bfin_earlyprintk_port.port.membase) {
                dev_err(&pdev->dev, "Cannot map uart IO\n");
                ret = -ENXIO;
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index a54473123e0a..22fe801cce31 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -954,7 +954,7 @@ static void imx_release_port(struct uart_port *port)
        struct resource *mmres;
        mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(mmres->start, mmres->end - mmres->start + 1);
+        release_mem_region(mmres->start, resource_size(mmres));
 }
 /*
@@ -970,8 +970,7 @@ static int imx_request_port(struct uart_port *port)
        if (!mmres)
                return -ENODEV;
-        ret = request_mem_region(mmres->start, mmres->end - mmres->start + 1,
+        ret = request_mem_region(mmres->start, resource_size(mmres), "imx-uart");
-                        "imx-uart");
        return  ret ? 0 : -EBUSY;
 }
diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
index 84db7321cce8..8e07517f8acd 100644
--- a/drivers/tty/serial/m32r_sio.c
+++ b/drivers/tty/serial/m32r_sio.c
@@ -892,7 +892,7 @@ static int m32r_sio_request_port(struct uart_port *port)
         * 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;
+                int size = resource_size(res);
                up->port.membase = ioremap(up->port.mapbase, size);
                if (!up->port.membase)
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 47cadf474149..c37df8d0fa28 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -1241,8 +1241,8 @@ static int serial_omap_probe(struct platform_device *pdev)
                return -ENODEV;
        }
-        if (!request_mem_region(mem->start, (mem->end - mem->start) + 1,
+        if (!request_mem_region(mem->start, resource_size(mem),
-                                     pdev->dev.driver->name)) {
+                                pdev->dev.driver->name)) {
                dev_err(&pdev->dev, "memory region already claimed\n");
                return -EBUSY;
        }
@@ -1308,7 +1308,7 @@ err:
        dev_err(&pdev->dev, "[UART%d]: failure [%s]: %d\n",
                                pdev->id, __func__, ret);
 do_release_region:
-        release_mem_region(mem->start, (mem->end - mem->start) + 1);
+        release_mem_region(mem->start, resource_size(mem));
        return ret;
 }
diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c
index 4302e6e3768e..531931c1b250 100644
--- a/drivers/tty/serial/pxa.c
+++ b/drivers/tty/serial/pxa.c
@@ -803,7 +803,7 @@ static int serial_pxa_probe(struct platform_device *dev)
                break;
        }
-        sport->port.membase = ioremap(mmres->start, mmres->end - mmres->start + 1);
+        sport->port.membase = ioremap(mmres->start, resource_size(mmres));
        if (!sport->port.membase) {
                ret = -ENOMEM;
                goto err_clk;
diff --git a/drivers/tty/serial/s3c2400.c b/drivers/tty/serial/s3c2400.c
deleted file mode 100644
index d13051b3df87..000000000000
--- a/drivers/tty/serial/s3c2400.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Driver for Samsung SoC onboard UARTs.
- *
- * Ben Dooks, Copyright (c) 2003-2005 Simtec Electronics
- *      http://armlinux.simtec.co.uk/
- *
- * 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/ioport.h>
-#include <linux/io.h>
-#include <linux/platform_device.h>
-#include <asm/irq.h>
-#include <mach/hardware.h>
-#include <plat/regs-serial.h>
-#include <mach/regs-gpio.h>
-#include "samsung.h"
-static int s3c2400_serial_getsource(struct uart_port *port,
-                                    struct s3c24xx_uart_clksrc *clk)
-{
-        clk->divisor = 1;
-        clk->name = "pclk";
-        return 0;
-}
-static int s3c2400_serial_setsource(struct uart_port *port,
-                                    struct s3c24xx_uart_clksrc *clk)
-{
-        return 0;
-}
-static int s3c2400_serial_resetport(struct uart_port *port,
-                                    struct s3c2410_uartcfg *cfg)
-{
-        dbg("s3c2400_serial_resetport: port=%p (%08lx), cfg=%p\n",
-            port, port->mapbase, cfg);
-        wr_regl(port, S3C2410_UCON,  cfg->ucon);
-        wr_regl(port, S3C2410_ULCON, cfg->ulcon);
-        /* reset both fifos */
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon);
-        return 0;
-}
-static struct s3c24xx_uart_info s3c2400_uart_inf = {
-        .name           = "Samsung S3C2400 UART",
-        .type           = PORT_S3C2400,
-        .fifosize       = 16,
-        .rx_fifomask    = S3C2410_UFSTAT_RXMASK,
-        .rx_fifoshift   = S3C2410_UFSTAT_RXSHIFT,
-        .rx_fifofull    = S3C2410_UFSTAT_RXFULL,
-        .tx_fifofull    = S3C2410_UFSTAT_TXFULL,
-        .tx_fifomask    = S3C2410_UFSTAT_TXMASK,
-        .tx_fifoshift   = S3C2410_UFSTAT_TXSHIFT,
-        .get_clksrc     = s3c2400_serial_getsource,
-        .set_clksrc     = s3c2400_serial_setsource,
-        .reset_port     = s3c2400_serial_resetport,
-};
-static int s3c2400_serial_probe(struct platform_device *dev)
-{
-        return s3c24xx_serial_probe(dev, &s3c2400_uart_inf);
-}
-static struct platform_driver s3c2400_serial_driver = {
-        .probe          = s3c2400_serial_probe,
-        .remove         = __devexit_p(s3c24xx_serial_remove),
-        .driver         = {
-                .name   = "s3c2400-uart",
-                .owner  = THIS_MODULE,
-        },
-};
-s3c24xx_console_init(&s3c2400_serial_driver, &s3c2400_uart_inf);
-static inline int s3c2400_serial_init(void)
-{
-        return s3c24xx_serial_init(&s3c2400_serial_driver, &s3c2400_uart_inf);
-}
-static inline void s3c2400_serial_exit(void)
-{
-        platform_driver_unregister(&s3c2400_serial_driver);
-}
-module_init(s3c2400_serial_init);
-module_exit(s3c2400_serial_exit);
-MODULE_LICENSE("GPL v2");
-MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
-MODULE_DESCRIPTION("Samsung S3C2400 SoC Serial port driver");
-MODULE_ALIAS("platform:s3c2400-uart");
diff --git a/drivers/tty/serial/s3c2410.c b/drivers/tty/serial/s3c2410.c
index bffe6ff9b158..b1d7e7c1849d 100644
--- a/drivers/tty/serial/s3c2410.c
+++ b/drivers/tty/serial/s3c2410.c
@@ -96,8 +96,6 @@ static struct platform_driver s3c2410_serial_driver = {
        },
 };
-s3c24xx_console_init(&s3c2410_serial_driver, &s3c2410_uart_inf);
 static int __init s3c2410_serial_init(void)
 {
        return s3c24xx_serial_init(&s3c2410_serial_driver, &s3c2410_uart_inf);
diff --git a/drivers/tty/serial/s3c2412.c b/drivers/tty/serial/s3c2412.c
index 7e2b9504a687..2234bf9ced45 100644
--- a/drivers/tty/serial/s3c2412.c
+++ b/drivers/tty/serial/s3c2412.c
@@ -130,8 +130,6 @@ static struct platform_driver s3c2412_serial_driver = {
        },
 };
-s3c24xx_console_init(&s3c2412_serial_driver, &s3c2412_uart_inf);
 static inline int s3c2412_serial_init(void)
 {
        return s3c24xx_serial_init(&s3c2412_serial_driver, &s3c2412_uart_inf);
diff --git a/drivers/tty/serial/s3c2440.c b/drivers/tty/serial/s3c2440.c
index 9e10d415d5fd..1d0c324b813f 100644
--- a/drivers/tty/serial/s3c2440.c
+++ b/drivers/tty/serial/s3c2440.c
@@ -159,8 +159,6 @@ static struct platform_driver s3c2440_serial_driver = {
        },
 };
-s3c24xx_console_init(&s3c2440_serial_driver, &s3c2440_uart_inf);
 static int __init s3c2440_serial_init(void)
 {
        return s3c24xx_serial_init(&s3c2440_serial_driver, &s3c2440_uart_inf);
diff --git a/drivers/tty/serial/s3c24a0.c b/drivers/tty/serial/s3c24a0.c
deleted file mode 100644
index 914eff22e499..000000000000
--- a/drivers/tty/serial/s3c24a0.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Driver for Samsung S3C24A0 SoC onboard UARTs.
- *
- * Based on drivers/serial/s3c2410.c
- *
- * Author: Sandeep Patil <sandeep.patil@azingo.com>
- *
- * Ben Dooks, Copyright (c) 2003-2008 Simtec Electronics
- *      http://armlinux.simtec.co.uk/
- *
- * 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/ioport.h>
-#include <linux/platform_device.h>
-#include <linux/init.h>
-#include <linux/serial_core.h>
-#include <linux/serial.h>
-#include <linux/io.h>
-#include <linux/irq.h>
-#include <mach/hardware.h>
-#include <plat/regs-serial.h>
-#include <mach/regs-gpio.h>
-#include "samsung.h"
-static int s3c24a0_serial_setsource(struct uart_port *port,
-                                    struct s3c24xx_uart_clksrc *clk)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-        if (strcmp(clk->name, "uclk") == 0)
-                ucon |= S3C2410_UCON_UCLK;
-        else
-                ucon &= ~S3C2410_UCON_UCLK;
-        wr_regl(port, S3C2410_UCON, ucon);
-        return 0;
-}
-static int s3c24a0_serial_getsource(struct uart_port *port,
-                                    struct s3c24xx_uart_clksrc *clk)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-        clk->divisor = 1;
-        clk->name = (ucon & S3C2410_UCON_UCLK) ? "uclk" : "pclk";
-        return 0;
-}
-static int s3c24a0_serial_resetport(struct uart_port *port,
-                                    struct s3c2410_uartcfg *cfg)
-{
-        dbg("s3c24a0_serial_resetport: port=%p (%08lx), cfg=%p\n",
-            port, port->mapbase, cfg);
-        wr_regl(port, S3C2410_UCON,  cfg->ucon);
-        wr_regl(port, S3C2410_ULCON, cfg->ulcon);
-        /* reset both fifos */
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon);
-        return 0;
-}
-static struct s3c24xx_uart_info s3c24a0_uart_inf = {
-        .name           = "Samsung S3C24A0 UART",
-        .type           = PORT_S3C2410,
-        .fifosize       = 16,
-        .rx_fifomask    = S3C24A0_UFSTAT_RXMASK,
-        .rx_fifoshift   = S3C24A0_UFSTAT_RXSHIFT,
-        .rx_fifofull    = S3C24A0_UFSTAT_RXFULL,
-        .tx_fifofull    = S3C24A0_UFSTAT_TXFULL,
-        .tx_fifomask    = S3C24A0_UFSTAT_TXMASK,
-        .tx_fifoshift   = S3C24A0_UFSTAT_TXSHIFT,
-        .get_clksrc     = s3c24a0_serial_getsource,
-        .set_clksrc     = s3c24a0_serial_setsource,
-        .reset_port     = s3c24a0_serial_resetport,
-};
-static int s3c24a0_serial_probe(struct platform_device *dev)
-{
-        return s3c24xx_serial_probe(dev, &s3c24a0_uart_inf);
-}
-static struct platform_driver s3c24a0_serial_driver = {
-        .probe          = s3c24a0_serial_probe,
-        .remove         = __devexit_p(s3c24xx_serial_remove),
-        .driver         = {
-                .name   = "s3c24a0-uart",
-                .owner  = THIS_MODULE,
-        },
-};
-s3c24xx_console_init(&s3c24a0_serial_driver, &s3c24a0_uart_inf);
-static int __init s3c24a0_serial_init(void)
-{
-        return s3c24xx_serial_init(&s3c24a0_serial_driver, &s3c24a0_uart_inf);
-}
-static void __exit s3c24a0_serial_exit(void)
-{
-        platform_driver_unregister(&s3c24a0_serial_driver);
-}
-module_init(s3c24a0_serial_init);
-module_exit(s3c24a0_serial_exit);
diff --git a/drivers/tty/serial/s3c6400.c b/drivers/tty/serial/s3c6400.c
index ded26c42ff37..e2f6913d84d5 100644
--- a/drivers/tty/serial/s3c6400.c
+++ b/drivers/tty/serial/s3c6400.c
@@ -130,8 +130,6 @@ static struct platform_driver s3c6400_serial_driver = {
        },
 };
-s3c24xx_console_init(&s3c6400_serial_driver, &s3c6400_uart_inf);
 static int __init s3c6400_serial_init(void)
 {
        return s3c24xx_serial_init(&s3c6400_serial_driver, &s3c6400_uart_inf);
diff --git a/drivers/tty/serial/s5pv210.c b/drivers/tty/serial/s5pv210.c
index dd194dc80ee9..8dd160c96e87 100644
--- a/drivers/tty/serial/s5pv210.c
+++ b/drivers/tty/serial/s5pv210.c
@@ -135,13 +135,6 @@ static struct platform_driver s5p_serial_driver = {
        },
 };
-static int __init s5pv210_serial_console_init(void)
-{
-        return s3c24xx_serial_initconsole(&s5p_serial_driver, s5p_uart_inf);
-}
-console_initcall(s5pv210_serial_console_init);
 static int __init s5p_serial_init(void)
 {
        return s3c24xx_serial_init(&s5p_serial_driver, *s5p_uart_inf);
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index f66f64829303..7ead42104c67 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -1416,10 +1416,8 @@ s3c24xx_serial_console_setup(struct console *co, char *options)
        /* is the port configured? */
-        if (port->mapbase == 0x0) {
+        if (port->mapbase == 0x0)
-                co->index = 0;
+                return -ENODEV;
-                port = &s3c24xx_serial_ports[co->index].port;
-        }
        cons_uart = port;
@@ -1451,7 +1449,8 @@ static struct console s3c24xx_serial_console = {
        .flags          = CON_PRINTBUFFER,
        .index          = -1,
        .write          = s3c24xx_serial_console_write,
-        .setup          = s3c24xx_serial_console_setup
+        .setup          = s3c24xx_serial_console_setup,
+        .data           = &s3c24xx_uart_drv,
 };
 int s3c24xx_serial_initconsole(struct platform_driver *drv,
diff --git a/drivers/tty/serial/samsung.h b/drivers/tty/serial/samsung.h
index 5b098cd76040..a69d9a54be94 100644
--- a/drivers/tty/serial/samsung.h
+++ b/drivers/tty/serial/samsung.h
@@ -79,25 +79,6 @@ extern int s3c24xx_serial_initconsole(struct platform_driver *drv,
 extern int s3c24xx_serial_init(struct platform_driver *drv,
                               struct s3c24xx_uart_info *info);
-#ifdef CONFIG_SERIAL_SAMSUNG_CONSOLE
-#define s3c24xx_console_init(__drv, __inf)                              \
-static int __init s3c_serial_console_init(void)                         \
-{                                                                       \
-        struct s3c24xx_uart_info *uinfo[CONFIG_SERIAL_SAMSUNG_UARTS];   \
-        int i;                                                          \
-                                                                        \
-        for (i = 0; i < CONFIG_SERIAL_SAMSUNG_UARTS; i++)               \
-                uinfo[i] = __inf;                                       \
-        return s3c24xx_serial_initconsole(__drv, uinfo);                \
-}                                                                       \
-                                                                        \
-console_initcall(s3c_serial_console_init)
-#else
-#define s3c24xx_console_init(drv, inf) extern void no_console(void)
-#endif
 #ifdef CONFIG_SERIAL_SAMSUNG_DEBUG
 extern void printascii(const char *);
diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c
index 92aa54550e84..ad0f8f5f6ea1 100644
--- a/drivers/tty/serial/sunsu.c
+++ b/drivers/tty/serial/sunsu.c
@@ -1435,7 +1435,7 @@ static int __devinit su_probe(struct platform_device *op)
        rp = &op->resource[0];
        up->port.mapbase = rp->start;
-        up->reg_size = (rp->end - rp->start) + 1;
+        up->reg_size = resource_size(rp);
        up->port.membase = of_ioremap(rp, 0, up->reg_size, "su");
        if (!up->port.membase) {
                if (type != SU_PORT_PORT)
diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c
index 37fc4e3d487c..026cb9ea5cd1 100644
--- a/drivers/tty/serial/vt8500_serial.c
+++ b/drivers/tty/serial/vt8500_serial.c
@@ -573,8 +573,7 @@ static int __init vt8500_serial_probe(struct platform_device *pdev)
        snprintf(vt8500_port->name, sizeof(vt8500_port->name),
                 "VT8500 UART%d", pdev->id);
-        vt8500_port->uart.membase = ioremap(mmres->start,
+        vt8500_port->uart.membase = ioremap(mmres->start, resource_size(mmres));
-                                            mmres->end - mmres->start + 1);
        if (!vt8500_port->uart.membase) {
                ret = -ENOMEM;
                goto err;
diff --git a/drivers/uio/uio_pdrv.c b/drivers/uio/uio_pdrv.c
index 7d3e469b9904..bdc3db946122 100644
--- a/drivers/uio/uio_pdrv.c
+++ b/drivers/uio/uio_pdrv.c
@@ -58,7 +58,7 @@ static int uio_pdrv_probe(struct platform_device *pdev)
                uiomem->memtype = UIO_MEM_PHYS;
                uiomem->addr = r->start;
-                uiomem->size = r->end - r->start + 1;
+                uiomem->size = resource_size(r);
                ++uiomem;
        }
diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index 0f424af7f109..31e799d9efe5 100644
--- a/drivers/uio/uio_pdrv_genirq.c
+++ b/drivers/uio/uio_pdrv_genirq.c
@@ -137,7 +137,7 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
                uiomem->memtype = UIO_MEM_PHYS;
                uiomem->addr = r->start;
-                uiomem->size = r->end - r->start + 1;
+                uiomem->size = resource_size(r);
                ++uiomem;
        }
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index db1a659702ba..f045c8968a6e 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -272,7 +272,7 @@ static void usba_init_debugfs(struct usba_udc *udc)
        regs_resource = platform_get_resource(udc->pdev, IORESOURCE_MEM,
                                CTRL_IOMEM_ID);
-        regs->d_inode->i_size = regs_resource->end - regs_resource->start + 1;
+        regs->d_inode->i_size = resource_size(regs_resource);
        udc->debugfs_regs = regs;
        usba_ep_init_debugfs(udc, to_usba_ep(udc->gadget.ep0));
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index 4e4833168087..3e59035e6de8 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -2463,7 +2463,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
        }
        if (pdata->operating_mode == FSL_USB2_DR_DEVICE) {
-                if (!request_mem_region(res->start, res->end - res->start + 1,
+                if (!request_mem_region(res->start, resource_size(res),
                                        driver_name)) {
                        ERR("request mem region for %s failed\n", pdev->name);
                        ret = -EBUSY;
@@ -2605,7 +2605,7 @@ err_iounmap_noclk:
        iounmap(dr_regs);
 err_release_mem_region:
        if (pdata->operating_mode == FSL_USB2_DR_DEVICE)
-                release_mem_region(res->start, res->end - res->start + 1);
+                release_mem_region(res->start, resource_size(res));
 err_kfree:
        kfree(udc_controller);
        udc_controller = NULL;
@@ -2640,7 +2640,7 @@ static int __exit fsl_udc_remove(struct platform_device *pdev)
        free_irq(udc_controller->irq, udc_controller);
        iounmap(dr_regs);
        if (pdata->operating_mode == FSL_USB2_DR_DEVICE)
-                release_mem_region(res->start, res->end - res->start + 1);
+                release_mem_region(res->start, resource_size(res));
        device_unregister(&udc_controller->gadget.dev);
        /* free udc --wait for the release() finished */
diff --git a/drivers/usb/gadget/pxa27x_udc.h b/drivers/usb/gadget/pxa27x_udc.h
index cd16231d8c73..b01696eab068 100644
--- a/drivers/usb/gadget/pxa27x_udc.h
+++ b/drivers/usb/gadget/pxa27x_udc.h
@@ -88,9 +88,9 @@
 #define UDCISR_INT_MASK (UDCICR_FIFOERR | UDCICR_PKTCOMPL)
 #define UDCOTGICR_IESF  (1 << 24)       /* OTG SET_FEATURE command recvd */
-#define UDCOTGICR_IEXR  (1 << 17)       /* Extra Transciever Interrupt
+#define UDCOTGICR_IEXR  (1 << 17)       /* Extra Transceiver Interrupt
                                           Rising Edge Interrupt Enable */
-#define UDCOTGICR_IEXF  (1 << 16)       /* Extra Transciever Interrupt
+#define UDCOTGICR_IEXF  (1 << 16)       /* Extra Transceiver Interrupt
                                           Falling Edge Interrupt Enable */
 #define UDCOTGICR_IEVV40R (1 << 9)      /* OTG Vbus Valid 4.0V Rising Edge
                                           Interrupt Enable */
diff --git a/drivers/usb/host/ehci-ath79.c b/drivers/usb/host/ehci-ath79.c
index aa248c2f2c60..4d2e88d04dab 100644
--- a/drivers/usb/host/ehci-ath79.c
+++ b/drivers/usb/host/ehci-ath79.c
@@ -148,7 +148,7 @@ static int ehci_ath79_probe(struct platform_device *pdev)
                return -ENOMEM;
        hcd->rsrc_start = res->start;
-        hcd->rsrc_len   = res->end - res->start + 1;
+        hcd->rsrc_len   = resource_size(res);
        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                dev_dbg(&pdev->dev, "controller already in use\n");
diff --git a/drivers/usb/host/ehci-cns3xxx.c b/drivers/usb/host/ehci-cns3xxx.c
index d41745c6f0c4..6536abdea6e6 100644
--- a/drivers/usb/host/ehci-cns3xxx.c
+++ b/drivers/usb/host/ehci-cns3xxx.c
@@ -107,7 +107,7 @@ static int cns3xxx_ehci_probe(struct platform_device *pdev)
        }
        hcd->rsrc_start = res->start;
-        hcd->rsrc_len = res->end - res->start + 1;
+        hcd->rsrc_len = resource_size(res);
        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
                                driver->description)) {
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index f380bf97e5af..34a3140d1e5f 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -100,7 +100,7 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver,
                goto err2;
        }
        hcd->rsrc_start = res->start;
-        hcd->rsrc_len = res->end - res->start + 1;
+        hcd->rsrc_len = resource_size(res);
        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
                                driver->description)) {
                dev_dbg(&pdev->dev, "controller already in use\n");
diff --git a/drivers/usb/host/ehci-grlib.c b/drivers/usb/host/ehci-grlib.c
index 93b230dc51a2..fdfd8c5b639b 100644
--- a/drivers/usb/host/ehci-grlib.c
+++ b/drivers/usb/host/ehci-grlib.c
@@ -130,7 +130,7 @@ static int __devinit ehci_hcd_grlib_probe(struct platform_device *op)
                return -ENOMEM;
        hcd->rsrc_start = res.start;
-        hcd->rsrc_len = res.end - res.start + 1;
+        hcd->rsrc_len = resource_size(&res);
        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                printk(KERN_ERR "%s: request_mem_region failed\n", __FILE__);
diff --git a/drivers/usb/host/ehci-ixp4xx.c b/drivers/usb/host/ehci-ixp4xx.c
index 50e600d26e28..c4460f3d009f 100644
--- a/drivers/usb/host/ehci-ixp4xx.c
+++ b/drivers/usb/host/ehci-ixp4xx.c
@@ -100,7 +100,7 @@ static int ixp4xx_ehci_probe(struct platform_device *pdev)
                goto fail_request_resource;
        }
        hcd->rsrc_start = res->start;
-        hcd->rsrc_len = res->end - res->start + 1;
+        hcd->rsrc_len = resource_size(res);
        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
                                driver->description)) {
diff --git a/drivers/usb/host/ehci-octeon.c b/drivers/usb/host/ehci-octeon.c
index ff55757ba7d8..c3ba3ed5f3a6 100644
--- a/drivers/usb/host/ehci-octeon.c
+++ b/drivers/usb/host/ehci-octeon.c
@@ -124,7 +124,7 @@ static int ehci_octeon_drv_probe(struct platform_device *pdev)
                return -ENOMEM;
        hcd->rsrc_start = res_mem->start;
-        hcd->rsrc_len = res_mem->end - res_mem->start + 1;
+        hcd->rsrc_len = resource_size(res_mem);
        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
                                OCTEON_EHCI_HCD_NAME)) {
diff --git a/drivers/usb/host/ehci-pmcmsp.c b/drivers/usb/host/ehci-pmcmsp.c
index cd69099cda19..e8d54de44acc 100644
--- a/drivers/usb/host/ehci-pmcmsp.c
+++ b/drivers/usb/host/ehci-pmcmsp.c
@@ -124,7 +124,7 @@ static int usb_hcd_msp_map_regs(struct mspusb_device *dev)
        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
        if (res == NULL)
                return -ENOMEM;
-        res_len = res->end - res->start + 1;
+        res_len = resource_size(res);
        if (!request_mem_region(res->start, res_len, "mab regs"))
                return -EBUSY;
@@ -140,7 +140,7 @@ static int usb_hcd_msp_map_regs(struct mspusb_device *dev)
                retval = -ENOMEM;
                goto err2;
        }
-        res_len = res->end - res->start + 1;
+        res_len = resource_size(res);
        if (!request_mem_region(res->start, res_len, "usbid regs")) {
                retval = -EBUSY;
                goto err2;
@@ -154,13 +154,13 @@ static int usb_hcd_msp_map_regs(struct mspusb_device *dev)
        return 0;
 err3:
        res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
-        res_len = res->end - res->start + 1;
+        res_len = resource_size(res);
        release_mem_region(res->start, res_len);
 err2:
        iounmap(dev->mab_regs);
 err1:
        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-        res_len = res->end - res->start + 1;
+        res_len = resource_size(res);
        release_mem_region(res->start, res_len);
        dev_err(&pdev->dev, "Failed to map non-EHCI regs.\n");
        return retval;
@@ -194,7 +194,7 @@ int usb_hcd_msp_probe(const struct hc_driver *driver,
                goto err1;
        }
        hcd->rsrc_start = res->start;
-        hcd->rsrc_len = res->end - res->start + 1;
+        hcd->rsrc_len = resource_size(res);
        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, dev->name)) {
                retval = -EBUSY;
                goto err1;
diff --git a/drivers/usb/host/ehci-ppc-of.c b/drivers/usb/host/ehci-ppc-of.c
index 8552db6c29c9..41d11fe14252 100644
--- a/drivers/usb/host/ehci-ppc-of.c
+++ b/drivers/usb/host/ehci-ppc-of.c
@@ -130,7 +130,7 @@ static int __devinit ehci_hcd_ppc_of_probe(struct platform_device *op)
                return -ENOMEM;
        hcd->rsrc_start = res.start;
-        hcd->rsrc_len = res.end - res.start + 1;
+        hcd->rsrc_len = resource_size(&res);
        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                printk(KERN_ERR "%s: request_mem_region failed\n", __FILE__);
diff --git a/drivers/usb/host/ehci-w90x900.c b/drivers/usb/host/ehci-w90x900.c
index 52a027aaa370..d661cf7de140 100644
--- a/drivers/usb/host/ehci-w90x900.c
+++ b/drivers/usb/host/ehci-w90x900.c
@@ -41,7 +41,7 @@ static int __devinit usb_w90x900_probe(const struct hc_driver *driver,
        }
        hcd->rsrc_start = res->start;
-        hcd->rsrc_len = res->end - res->start + 1;
+        hcd->rsrc_len = resource_size(res);
        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                retval = -EBUSY;
diff --git a/drivers/usb/host/ehci-xilinx-of.c b/drivers/usb/host/ehci-xilinx-of.c
index a64d6d66d760..32793ce3d9e9 100644
--- a/drivers/usb/host/ehci-xilinx-of.c
+++ b/drivers/usb/host/ehci-xilinx-of.c
@@ -174,7 +174,7 @@ static int __devinit ehci_hcd_xilinx_of_probe(struct platform_device *op)
                return -ENOMEM;
        hcd->rsrc_start = res.start;
-        hcd->rsrc_len = res.end - res.start + 1;
+        hcd->rsrc_len = resource_size(&res);
        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                printk(KERN_ERR "%s: request_mem_region failed\n", __FILE__);
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c
index 19223c7449e1..572ea53b0226 100644
--- a/drivers/usb/host/fhci-hcd.c
+++ b/drivers/usb/host/fhci-hcd.c
@@ -605,7 +605,7 @@ static int __devinit of_fhci_probe(struct platform_device *ofdev)
                goto err_regs;
        }
-        hcd->regs = ioremap(usb_regs.start, usb_regs.end - usb_regs.start + 1);
+        hcd->regs = ioremap(usb_regs.start, resource_size(&usb_regs));
        if (!hcd->regs) {
                dev_err(dev, "could not ioremap regs\n");
                ret = -ENOMEM;
diff --git a/drivers/usb/host/ohci-ath79.c b/drivers/usb/host/ohci-ath79.c
index ffea3e7cb0a8..c620c50f6770 100644
--- a/drivers/usb/host/ohci-ath79.c
+++ b/drivers/usb/host/ohci-ath79.c
@@ -93,8 +93,8 @@ static int ohci_ath79_probe(struct platform_device *pdev)
                ret = -ENODEV;
                goto err_put_hcd;
        }
-        hcd->rsrc_start = res->start;
+        hcd->rsrc_start = res->start;
-        hcd->rsrc_len   = res->end - res->start + 1;
+        hcd->rsrc_len = resource_size(res);
        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                dev_dbg(&pdev->dev, "controller already in use\n");
diff --git a/drivers/usb/host/ohci-cns3xxx.c b/drivers/usb/host/ohci-cns3xxx.c
index f05ef87e934c..5a00a1e1c6ca 100644
--- a/drivers/usb/host/ohci-cns3xxx.c
+++ b/drivers/usb/host/ohci-cns3xxx.c
@@ -100,7 +100,7 @@ static int cns3xxx_ohci_probe(struct platform_device *pdev)
                goto err1;
        }
        hcd->rsrc_start = res->start;
-        hcd->rsrc_len = res->end - res->start + 1;
+        hcd->rsrc_len = resource_size(res);
        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
                        driver->description)) {
diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
index d22fb4d577b7..6aca2c4453f7 100644
--- a/drivers/usb/host/ohci-da8xx.c
+++ b/drivers/usb/host/ohci-da8xx.c
@@ -322,7 +322,7 @@ static int usb_hcd_da8xx_probe(const struct hc_driver *driver,
                goto err2;
        }
        hcd->rsrc_start = mem->start;
-        hcd->rsrc_len = mem->end - mem->start + 1;
+        hcd->rsrc_len = resource_size(mem);
        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                dev_dbg(&pdev->dev, "request_mem_region failed\n");
diff --git a/drivers/usb/host/ohci-octeon.c b/drivers/usb/host/ohci-octeon.c
index e4ddfaf8870f..d8b45647d1dc 100644
--- a/drivers/usb/host/ohci-octeon.c
+++ b/drivers/usb/host/ohci-octeon.c
@@ -135,7 +135,7 @@ static int ohci_octeon_drv_probe(struct platform_device *pdev)
                return -ENOMEM;
        hcd->rsrc_start = res_mem->start;
-        hcd->rsrc_len = res_mem->end - res_mem->start + 1;
+        hcd->rsrc_len = resource_size(res_mem);
        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
                                OCTEON_OHCI_HCD_NAME)) {
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c
index 1ca1821320f4..0c12f4e14dcd 100644
--- a/drivers/usb/host/ohci-ppc-of.c
+++ b/drivers/usb/host/ohci-ppc-of.c
@@ -110,7 +110,7 @@ static int __devinit ohci_hcd_ppc_of_probe(struct platform_device *op)
                return -ENOMEM;
        hcd->rsrc_start = res.start;
-        hcd->rsrc_len = res.end - res.start + 1;
+        hcd->rsrc_len = resource_size(&res);
        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                printk(KERN_ERR "%s: request_mem_region failed\n", __FILE__);
diff --git a/drivers/usb/host/ohci-ppc-soc.c b/drivers/usb/host/ohci-ppc-soc.c
index 89e670e38c10..c0f595c44487 100644
--- a/drivers/usb/host/ohci-ppc-soc.c
+++ b/drivers/usb/host/ohci-ppc-soc.c
@@ -56,7 +56,7 @@ static int usb_hcd_ppc_soc_probe(const struct hc_driver *driver,
        if (!hcd)
                return -ENOMEM;
        hcd->rsrc_start = res->start;
-        hcd->rsrc_len = res->end - res->start + 1;
+        hcd->rsrc_len = resource_size(res);
        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                pr_debug("%s: request_mem_region failed\n", __FILE__);
diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c
index d8eb3bdafabb..4204d9720d23 100644
--- a/drivers/usb/host/ohci-sa1111.c
+++ b/drivers/usb/host/ohci-sa1111.c
@@ -131,7 +131,7 @@ int usb_hcd_sa1111_probe (const struct hc_driver *driver,
        if (!hcd)
                return -ENOMEM;
        hcd->rsrc_start = dev->res.start;
-        hcd->rsrc_len = dev->res.end - dev->res.start + 1;
+        hcd->rsrc_len = resource_size(&dev->res);
        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                dbg("request_mem_region failed");
diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c
index 041d30f30c10..78918ca0da23 100644
--- a/drivers/usb/host/ohci-sm501.c
+++ b/drivers/usb/host/ohci-sm501.c
@@ -103,8 +103,7 @@ static int ohci_hcd_sm501_drv_probe(struct platform_device *pdev)
                goto err0;
        }
-        if (!request_mem_region(mem->start, mem->end - mem->start + 1,
+        if (!request_mem_region(mem->start, resource_size(mem), pdev->name)) {
-                                pdev->name)) {
                dev_err(dev, "request_mem_region failed\n");
                retval = -EBUSY;
                goto err0;
@@ -126,7 +125,7 @@ static int ohci_hcd_sm501_drv_probe(struct platform_device *pdev)
        if (!dma_declare_coherent_memory(dev, mem->start,
                                         mem->start - mem->parent->start,
-                                         (mem->end - mem->start) + 1,
+                                         resource_size(mem),
                                         DMA_MEMORY_MAP |
                                         DMA_MEMORY_EXCLUSIVE)) {
                dev_err(dev, "cannot declare coherent memory\n");
@@ -149,7 +148,7 @@ static int ohci_hcd_sm501_drv_probe(struct platform_device *pdev)
        }
        hcd->rsrc_start = res->start;
-        hcd->rsrc_len = res->end - res->start + 1;
+        hcd->rsrc_len = resource_size(res);
        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, pdev->name)) {
                dev_err(dev, "request_mem_region failed\n");
@@ -185,7 +184,7 @@ err3:
 err2:
        dma_release_declared_memory(dev);
 err1:
-        release_mem_region(mem->start, mem->end - mem->start + 1);
+        release_mem_region(mem->start, resource_size(mem));
 err0:
        return retval;
 }
@@ -201,7 +200,7 @@ static int ohci_hcd_sm501_drv_remove(struct platform_device *pdev)
        dma_release_declared_memory(&pdev->dev);
        mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
        if (mem)
-                release_mem_region(mem->start, mem->end - mem->start + 1);
+                release_mem_region(mem->start, resource_size(mem));
        /* mask interrupts and disable power */
diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c
index 48ee6943bf35..c4aea3b8315e 100644
--- a/drivers/usb/host/ohci-ssb.c
+++ b/drivers/usb/host/ohci-ssb.c
@@ -2,7 +2,7 @@
 * Sonics Silicon Backplane
 * Broadcom USB-core OHCI driver
 *
- * Copyright 2007 Michael Buesch <mb@bu3sch.de>
+ * Copyright 2007 Michael Buesch <m@bues.ch>
 *
 * Derived from the OHCI-PCI driver
 * Copyright 1999 Roman Weissgaerber
diff --git a/drivers/usb/host/ohci-tmio.c b/drivers/usb/host/ohci-tmio.c
index 3558491dd87d..57ad1271fc9b 100644
--- a/drivers/usb/host/ohci-tmio.c
+++ b/drivers/usb/host/ohci-tmio.c
@@ -208,13 +208,13 @@ static int __devinit ohci_hcd_tmio_drv_probe(struct platform_device *dev)
        }
        hcd->rsrc_start = regs->start;
-        hcd->rsrc_len = regs->end - regs->start + 1;
+        hcd->rsrc_len = resource_size(regs);
        tmio = hcd_to_tmio(hcd);
        spin_lock_init(&tmio->lock);
-        tmio->ccr = ioremap(config->start, config->end - config->start + 1);
+        tmio->ccr = ioremap(config->start, resource_size(config));
        if (!tmio->ccr) {
                ret = -ENOMEM;
                goto err_ioremap_ccr;
@@ -228,7 +228,7 @@ static int __devinit ohci_hcd_tmio_drv_probe(struct platform_device *dev)
        if (!dma_declare_coherent_memory(&dev->dev, sram->start,
                                sram->start,
-                                sram->end - sram->start + 1,
+                                resource_size(sram),
                                DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE)) {
                ret = -EBUSY;
                goto err_dma_declare;
diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
index 5fbe997dc6df..dcd889803f0f 100644
--- a/drivers/usb/host/oxu210hp-hcd.c
+++ b/drivers/usb/host/oxu210hp-hcd.c
@@ -3828,7 +3828,7 @@ static int oxu_drv_probe(struct platform_device *pdev)
                return -ENODEV;
        }
        memstart = res->start;
-        memlen = res->end - res->start + 1;
+        memlen = resource_size(res);
        dev_dbg(&pdev->dev, "MEM resource %lx-%lx\n", memstart, memlen);
        if (!request_mem_region(memstart, memlen,
                                oxu_hc_driver.description)) {
diff --git a/drivers/usb/host/uhci-grlib.c b/drivers/usb/host/uhci-grlib.c
index d01c1e227681..f7a62138e3e0 100644
--- a/drivers/usb/host/uhci-grlib.c
+++ b/drivers/usb/host/uhci-grlib.c
@@ -111,7 +111,7 @@ static int __devinit uhci_hcd_grlib_probe(struct platform_device *op)
                return -ENOMEM;
        hcd->rsrc_start = res.start;
-        hcd->rsrc_len = res.end - res.start + 1;
+        hcd->rsrc_len = resource_size(&res);
        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                printk(KERN_ERR "%s: request_mem_region failed\n", __FILE__);
diff --git a/drivers/usb/host/whci/init.c b/drivers/usb/host/whci/init.c
index f7582e8e2169..d3e13b640d4b 100644
--- a/drivers/usb/host/whci/init.c
+++ b/drivers/usb/host/whci/init.c
@@ -178,7 +178,7 @@ void whc_clean_up(struct whc *whc)
        if (whc->qset_pool)
                dma_pool_destroy(whc->qset_pool);
-        len   = whc->umc->resource.end - whc->umc->resource.start + 1;
+        len   = resource_size(&whc->umc->resource);
        if (whc->base)
                iounmap(whc->base);
        if (whc->base_phys)
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c
index b16bd3ce3915..2f41089cd854 100644
--- a/drivers/usb/misc/ftdi-elan.c
+++ b/drivers/usb/misc/ftdi-elan.c
@@ -187,7 +187,7 @@ struct usb_ftdi {
        u32 controlreg;
        u8 response[4 + 1024];
        int expected;
-        int recieved;
+        int received;
        int ed_found;
 };
 #define kref_to_usb_ftdi(d) container_of(d, struct usb_ftdi, kref)
@@ -353,7 +353,7 @@ static void ftdi_elan_abandon_targets(struct usb_ftdi *ftdi)
                        mutex_lock(&ftdi->u132_lock);
                }
        }
-        ftdi->recieved = 0;
+        ftdi->received = 0;
        ftdi->expected = 4;
        ftdi->ed_found = 0;
        mutex_unlock(&ftdi->u132_lock);
@@ -411,7 +411,7 @@ static void ftdi_elan_flush_targets(struct usb_ftdi *ftdi)
                        }
                }
        }
-        ftdi->recieved = 0;
+        ftdi->received = 0;
        ftdi->expected = 4;
        ftdi->ed_found = 0;
        mutex_unlock(&ftdi->u132_lock);
@@ -447,7 +447,7 @@ static void ftdi_elan_cancel_targets(struct usb_ftdi *ftdi)
                        }
                }
        }
-        ftdi->recieved = 0;
+        ftdi->received = 0;
        ftdi->expected = 4;
        ftdi->ed_found = 0;
        mutex_unlock(&ftdi->u132_lock);
@@ -874,7 +874,7 @@ static char *have_ed_set_response(struct usb_ftdi *ftdi,
                        mutex_unlock(&ftdi->u132_lock);
                        ftdi_elan_do_callback(ftdi, target, 4 + ftdi->response,
                                payload);
-                        ftdi->recieved = 0;
+                        ftdi->received = 0;
                        ftdi->expected = 4;
                        ftdi->ed_found = 0;
                        return ftdi->response;
@@ -890,7 +890,7 @@ static char *have_ed_set_response(struct usb_ftdi *ftdi,
                        mutex_unlock(&ftdi->u132_lock);
                        ftdi_elan_do_callback(ftdi, target, 4 + ftdi->response,
                                payload);
-                        ftdi->recieved = 0;
+                        ftdi->received = 0;
                        ftdi->expected = 4;
                        ftdi->ed_found = 0;
                        return ftdi->response;
@@ -905,7 +905,7 @@ static char *have_ed_set_response(struct usb_ftdi *ftdi,
                mutex_unlock(&ftdi->u132_lock);
                ftdi_elan_do_callback(ftdi, target, 4 + ftdi->response,
                        payload);
-                ftdi->recieved = 0;
+                ftdi->received = 0;
                ftdi->expected = 4;
                ftdi->ed_found = 0;
                return ftdi->response;
@@ -914,7 +914,7 @@ static char *have_ed_set_response(struct usb_ftdi *ftdi,
                mutex_unlock(&ftdi->u132_lock);
                ftdi_elan_do_callback(ftdi, target, 4 + ftdi->response,
                        payload);
-                ftdi->recieved = 0;
+                ftdi->received = 0;
                ftdi->expected = 4;
                ftdi->ed_found = 0;
                return ftdi->response;
@@ -934,7 +934,7 @@ static char *have_ed_get_response(struct usb_ftdi *ftdi,
        if (target->active)
                ftdi_elan_do_callback(ftdi, target, NULL, 0);
        target->abandoning = 0;
-        ftdi->recieved = 0;
+        ftdi->received = 0;
        ftdi->expected = 4;
        ftdi->ed_found = 0;
        return ftdi->response;
@@ -951,7 +951,7 @@ static char *have_ed_get_response(struct usb_ftdi *ftdi,
 */
 static int ftdi_elan_respond_engine(struct usb_ftdi *ftdi)
 {
-        u8 *b = ftdi->response + ftdi->recieved;
+        u8 *b = ftdi->response + ftdi->received;
        int bytes_read = 0;
        int retry_on_empty = 1;
        int retry_on_timeout = 3;
@@ -1043,11 +1043,11 @@ static int ftdi_elan_respond_engine(struct usb_ftdi *ftdi)
                u8 c = ftdi->bulk_in_buffer[++ftdi->bulk_in_last];
                bytes_read += 1;
                ftdi->bulk_in_left -= 1;
-                if (ftdi->recieved == 0 && c == 0xFF) {
+                if (ftdi->received == 0 && c == 0xFF) {
                        goto have;
                } else
                        *b++ = c;
-                if (++ftdi->recieved < ftdi->expected) {
+                if (++ftdi->received < ftdi->expected) {
                        goto have;
                } else if (ftdi->ed_found) {
                        int ed_number = (ftdi->response[0] >> 5) & 0x03;
@@ -1069,7 +1069,7 @@ static int ftdi_elan_respond_engine(struct usb_ftdi *ftdi)
                        }
                        ftdi_elan_do_callback(ftdi, target, 4 + ftdi->response,
                                payload);
-                        ftdi->recieved = 0;
+                        ftdi->received = 0;
                        ftdi->expected = 4;
                        ftdi->ed_found = 0;
                        b = ftdi->response;
@@ -1089,7 +1089,7 @@ static int ftdi_elan_respond_engine(struct usb_ftdi *ftdi)
                        *respond->value = data;
                        *respond->result = 0;
                        complete(&respond->wait_completion);
-                        ftdi->recieved = 0;
+                        ftdi->received = 0;
                        ftdi->expected = 4;
                        ftdi->ed_found = 0;
                        b = ftdi->response;
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index c71b0372786e..bcbd1aba961a 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1955,7 +1955,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
         *   - initializes musb->xceiv, usually by otg_get_transceiver()
         *   - stops powering VBUS
         *
-         * There are various transciever configurations.  Blackfin,
+         * There are various transceiver configurations.  Blackfin,
         * DaVinci, TUSB60x0, and others integrate them.  OMAP3 uses
         * external/discrete ones in various flavors (twl4030 family,
         * isp1504, non-OTG, etc) mostly hooking up through ULPI.
diff --git a/drivers/usb/otg/isp1301_omap.c b/drivers/usb/otg/isp1301_omap.c
index 8c282258e1bd..ca9b690a7e40 100644
--- a/drivers/usb/otg/isp1301_omap.c
+++ b/drivers/usb/otg/isp1301_omap.c
@@ -660,7 +660,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
        int             ret = IRQ_NONE;
        struct isp1301  *isp = _isp;
-        /* update ISP1301 transciever from OTG controller */
+        /* update ISP1301 transceiver from OTG controller */
        if (otg_irq & OPRT_CHG) {
                omap_writew(OPRT_CHG, OTG_IRQ_SRC);
                isp1301_defer_work(isp, WORK_UPDATE_ISP);
@@ -755,7 +755,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
                omap_writew(A_VBUS_ERR, OTG_IRQ_SRC);
                ret = IRQ_HANDLED;
-        /* switch driver; the transciever code activates it,
+        /* switch driver; the transceiver code activates it,
         * ungating the udc clock or resuming OHCI.
         */
        } else if (otg_irq & DRIVER_SWITCH) {
diff --git a/drivers/usb/otg/otg_fsm.c b/drivers/usb/otg/otg_fsm.c
index b0cc422f2ff9..09117387d2a4 100644
--- a/drivers/usb/otg/otg_fsm.c
+++ b/drivers/usb/otg/otg_fsm.c
@@ -28,7 +28,6 @@
 #include <linux/usb.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/otg.h>
-#include <linux/types.h>
 #include "otg_fsm.h"
diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c
index efeb4d1517ff..14f66c358629 100644
--- a/drivers/usb/otg/twl4030-usb.c
+++ b/drivers/usb/otg/twl4030-usb.c
@@ -166,7 +166,7 @@ struct twl4030_usb {
 };
 /* internal define on top of container_of */
-#define xceiv_to_twl(x)         container_of((x), struct twl4030_usb, otg);
+#define xceiv_to_twl(x)         container_of((x), struct twl4030_usb, otg)
 /*-------------------------------------------------------------------------*/
diff --git a/drivers/uwb/uwbd.c b/drivers/uwb/uwbd.c
index 001c8b4020a8..bdcb13cc1d54 100644
--- a/drivers/uwb/uwbd.c
+++ b/drivers/uwb/uwbd.c
@@ -256,7 +256,7 @@ static void uwbd_event_handle(struct uwb_event *evt)
 * UWB Daemon
 *
 * Listens to all UWB notifications and takes care to track the state
- * of the UWB neighboorhood for the kernel. When we do a run, we
+ * of the UWB neighbourhood for the kernel. When we do a run, we
 * spinlock, move the list to a private copy and release the
 * lock. Hold it as little as possible. Not a conflict: it is
 * guaranteed we own the events in the private list.
diff --git a/drivers/uwb/whc-rc.c b/drivers/uwb/whc-rc.c
index 70a004aa19db..3ae3c702500d 100644
--- a/drivers/uwb/whc-rc.c
+++ b/drivers/uwb/whc-rc.c
@@ -222,7 +222,7 @@ int whcrc_setup_rc_umc(struct whcrc *whcrc)
        struct umc_dev *umc_dev = whcrc->umc_dev;
        whcrc->area = umc_dev->resource.start;
-        whcrc->rc_len = umc_dev->resource.end - umc_dev->resource.start + 1;
+        whcrc->rc_len = resource_size(&umc_dev->resource);
        result = -EBUSY;
        if (request_mem_region(whcrc->area, whcrc->rc_len, KBUILD_MODNAME) == NULL) {
                dev_err(dev, "can't request URC region (%zu bytes @ 0x%lx): %d\n",
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 4484c721f0f9..817ab60f7537 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -906,7 +906,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
        if (map) {
                /* use a pre-allocated memory buffer */
                info->fix.smem_start = map->start;
-                info->fix.smem_len = map->end - map->start + 1;
+                info->fix.smem_len = resource_size(map);
                if (!request_mem_region(info->fix.smem_start,
                                        info->fix.smem_len, pdev->name)) {
                        ret = -EBUSY;
@@ -932,7 +932,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
        /* LCDC registers */
        info->fix.mmio_start = regs->start;
-        info->fix.mmio_len = regs->end - regs->start + 1;
+        info->fix.mmio_len = resource_size(regs);
        if (!request_mem_region(info->fix.mmio_start,
                                info->fix.mmio_len, pdev->name)) {
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index d7aaec5667bf..44bdce4242ad 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -3458,9 +3458,10 @@ static int __devinit atyfb_setup_generic(struct pci_dev *pdev,
        raddr = addr + 0x7ff000UL;
        rrp = &pdev->resource[2];
-        if ((rrp->flags & IORESOURCE_MEM) && request_mem_region(rrp->start, rrp->end - rrp->start + 1, "atyfb")) {
+        if ((rrp->flags & IORESOURCE_MEM) &&
+            request_mem_region(rrp->start, resource_size(rrp), "atyfb")) {
                par->aux_start = rrp->start;
-                par->aux_size = rrp->end - rrp->start + 1;
+                par->aux_size = resource_size(rrp);
                raddr = rrp->start;
                PRINTKI("using auxiliary register aperture\n");
        }
@@ -3550,7 +3551,7 @@ static int __devinit atyfb_pci_probe(struct pci_dev *pdev,
        /* Reserve space */
        res_start = rp->start;
-        res_size = rp->end - rp->start + 1;
+        res_size = resource_size(rp);
        if (!request_mem_region(res_start, res_size, "atyfb"))
                return -EBUSY;
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index 34b2fc472fe8..01a8fde67f20 100644
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -486,7 +486,7 @@ static int __devinit au1100fb_drv_probe(struct platform_device *dev)
        }
        au1100fb_fix.mmio_start = regs_res->start;
-        au1100fb_fix.mmio_len = regs_res->end - regs_res->start + 1;
+        au1100fb_fix.mmio_len = resource_size(regs_res);
        if (!request_mem_region(au1100fb_fix.mmio_start, au1100fb_fix.mmio_len,
                                DRIVER_NAME)) {
diff --git a/drivers/video/cobalt_lcdfb.c b/drivers/video/cobalt_lcdfb.c
index 42fe155aba0e..e02764319ff7 100644
--- a/drivers/video/cobalt_lcdfb.c
+++ b/drivers/video/cobalt_lcdfb.c
@@ -303,7 +303,7 @@ static int __devinit cobalt_lcdfb_probe(struct platform_device *dev)
                return -EBUSY;
        }
-        info->screen_size = res->end - res->start + 1;
+        info->screen_size = resource_size(res);
        info->screen_base = ioremap(res->start, info->screen_size);
        info->fbops = &cobalt_lcd_fbops;
        info->fix = cobalt_lcdfb_fix;
diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c
index c225dcce89e7..9075bea55879 100644
--- a/drivers/video/controlfb.c
+++ b/drivers/video/controlfb.c
@@ -709,11 +709,11 @@ static int __init control_of_init(struct device_node *dp)
        /* Map in frame buffer and registers */
        p->fb_orig_base = fb_res.start;
-        p->fb_orig_size = fb_res.end - fb_res.start + 1;
+        p->fb_orig_size = resource_size(&fb_res);
        /* use the big-endian aperture (??) */
        p->frame_buffer_phys = fb_res.start + 0x800000;
        p->control_regs_phys = reg_res.start;
-        p->control_regs_size = reg_res.end - reg_res.start + 1;
+        p->control_regs_size = resource_size(&reg_res);
        if (!p->fb_orig_base ||
            !request_mem_region(p->fb_orig_base,p->fb_orig_size,"controlfb")) {
diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c
index cbdb1bd77c21..40e5f17d1e4b 100644
--- a/drivers/video/ep93xx-fb.c
+++ b/drivers/video/ep93xx-fb.c
@@ -4,7 +4,7 @@
 * Framebuffer support for the EP93xx series.
 *
 * Copyright (C) 2007 Bluewater Systems Ltd
- * Author: Ryan Mallon <ryan@bluewatersys.com>
+ * Author: Ryan Mallon
 *
 * Copyright (c) 2009 H Hartley Sweeten <hsweeten@visionengravers.com>
 *
@@ -644,6 +644,6 @@ module_exit(ep93xxfb_exit);
 MODULE_DESCRIPTION("EP93XX Framebuffer Driver");
 MODULE_ALIAS("platform:ep93xx-fb");
-MODULE_AUTHOR("Ryan Mallon <ryan&bluewatersys.com>, "
+MODULE_AUTHOR("Ryan Mallon, "
              "H Hartley Sweeten <hsweeten@visionengravers.com");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/i810/i810.h b/drivers/video/i810/i810.h
index f37de60ecc59..1414b73ac55b 100644
--- a/drivers/video/i810/i810.h
+++ b/drivers/video/i810/i810.h
@@ -137,7 +137,7 @@
 #define DRAM_ON                     0x08            
 #define DRAM_OFF                    0xE7
 #define PG_ENABLE_MASK              0x01
-#define RING_SIZE_MASK              (RINGBUFFER_SIZE - 1);
+#define RING_SIZE_MASK              (RINGBUFFER_SIZE - 1)
 /* defines for restoring registers partially */
 #define ADDR_MAP_MASK               (0x07 << 5)
diff --git a/drivers/video/mb862xx/mb862xxfbdrv.c b/drivers/video/mb862xx/mb862xxfbdrv.c
index f70bd63b0187..ee1de3e26dec 100644
--- a/drivers/video/mb862xx/mb862xxfbdrv.c
+++ b/drivers/video/mb862xx/mb862xxfbdrv.c
@@ -697,7 +697,7 @@ static int __devinit of_platform_mb862xx_probe(struct platform_device *ofdev)
                goto fbrel;
        }
-        res_size = 1 + res.end - res.start;
+        res_size = resource_size(&res);
        par->res = request_mem_region(res.start, res_size, DRV_NAME);
        if (par->res == NULL) {
                dev_err(dev, "Cannot claim framebuffer/mmio\n");
@@ -787,7 +787,7 @@ static int __devexit of_platform_mb862xx_remove(struct platform_device *ofdev)
 {
        struct fb_info *fbi = dev_get_drvdata(&ofdev->dev);
        struct mb862xxfb_par *par = fbi->par;
-        resource_size_t res_size = 1 + par->res->end - par->res->start;
+        resource_size_t res_size = resource_size(par->res);
        unsigned long reg;
        dev_dbg(fbi->dev, "%s release\n", fbi->fix.id);
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
index c3636d55a3c5..243d16f09b8a 100644
--- a/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@ -406,8 +406,7 @@ int mdp_probe(struct platform_device *pdev)
                goto error_get_irq;
        }
-        mdp->base = ioremap(resource->start,
+        mdp->base = ioremap(resource->start, resource_size(resource));
-                            resource->end - resource->start);
        if (mdp->base == 0) {
                printk(KERN_ERR "msmfb: cannot allocate mdp regs!\n");
                ret = -ENOMEM;
diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c
index ec351309e607..c6e3b4fcdd68 100644
--- a/drivers/video/msm/msm_fb.c
+++ b/drivers/video/msm/msm_fb.c
@@ -525,10 +525,9 @@ static int setup_fbmem(struct msmfb_info *msmfb, struct platform_device *pdev)
                return -ENOMEM;
        }
        fb->fix.smem_start = resource->start;
-        fb->fix.smem_len = resource->end - resource->start;
+        fb->fix.smem_len = resource_size(resource);
-        fbram = ioremap(resource->start,
+        fbram = ioremap(resource->start, resource_size(resource));
-                        resource->end - resource->start);
+        if (fbram == NULL) {
-        if (fbram == 0) {
                printk(KERN_ERR "msmfb: cannot allocate fbram!\n");
                return -ENOMEM;
        }
diff --git a/drivers/video/nuc900fb.c b/drivers/video/nuc900fb.c
index f838d9e277f0..0fff59782e45 100644
--- a/drivers/video/nuc900fb.c
+++ b/drivers/video/nuc900fb.c
@@ -551,7 +551,7 @@ static int __devinit nuc900fb_probe(struct platform_device *pdev)
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        size = (res->end - res->start) + 1;
+        size = resource_size(res);
        fbi->mem = request_mem_region(res->start, size, pdev->name);
        if (fbi->mem == NULL) {
                dev_err(&pdev->dev, "failed to alloc memory region\n");
diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
index ef532d9d3c99..f27ae16ead2e 100644
--- a/drivers/video/platinumfb.c
+++ b/drivers/video/platinumfb.c
@@ -567,7 +567,7 @@ static int __devinit platinumfb_probe(struct platform_device* odev)
         * northbridge and that can fail. Only request framebuffer
         */
        if (!request_mem_region(pinfo->rsrc_fb.start,
-                                pinfo->rsrc_fb.end - pinfo->rsrc_fb.start + 1,
+                                resource_size(&pinfo->rsrc_fb),
                                "platinumfb framebuffer")) {
                printk(KERN_ERR "platinumfb: Can't request framebuffer !\n");
                framebuffer_release(info);
@@ -658,8 +658,7 @@ static int __devexit platinumfb_remove(struct platform_device* odev)
        iounmap(pinfo->cmap_regs);
        release_mem_region(pinfo->rsrc_fb.start,
-                           pinfo->rsrc_fb.end -
+                           resource_size(&pinfo->rsrc_fb));
-                           pinfo->rsrc_fb.start + 1);
        release_mem_region(pinfo->cmap_regs_phys, 0x1000);
diff --git a/drivers/video/pxa168fb.c b/drivers/video/pxa168fb.c
index bb95ec56d25d..18ead6f0184d 100644
--- a/drivers/video/pxa168fb.c
+++ b/drivers/video/pxa168fb.c
@@ -662,7 +662,7 @@ static int __devinit pxa168fb_probe(struct platform_device *pdev)
        info->fix.ypanstep = 0;
        info->fix.ywrapstep = 0;
        info->fix.mmio_start = res->start;
-        info->fix.mmio_len = res->end - res->start + 1;
+        info->fix.mmio_len = resource_size(res);
        info->fix.accel = FB_ACCEL_NONE;
        info->fbops = &pxa168fb_ops;
        info->pseudo_palette = fbi->pseudo_palette;
diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
index 816a4fda04f5..087fc9960bb9 100644
--- a/drivers/video/udlfb.c
+++ b/drivers/video/udlfb.c
@@ -29,7 +29,6 @@
 #include <linux/slab.h>
 #include <linux/prefetch.h>
 #include <linux/delay.h>
-#include <linux/prefetch.h>
 #include <video/udlfb.h>
 #include "edid.h"
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index cf43c80d27f6..53aa4430d86e 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -2016,7 +2016,7 @@ static int __init viafb_setup(void)
 int __init viafb_init(void)
 {
        u32 dummy_x, dummy_y;
-        int r;
+        int r = 0;
        if (machine_is_olpc())
                /* Apply XO-1.5-specific configuration. */
@@ -2039,7 +2039,7 @@ int __init viafb_init(void)
        printk(KERN_INFO
       "VIA Graphics Integration Chipset framebuffer %d.%d initializing\n",
               VERSION_MAJOR, VERSION_MINOR);
-        return 0;
+        return r;
 }
 void __exit viafb_exit(void)