198 files changed, 2567 insertions, 2091 deletions
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index 5c5d1624fa2c..05306a59aedc 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -677,10 +677,9 @@ void acpi_irq_stats_init(void)
                else
                        sprintf(buffer, "bug%02X", i);
-                name = kzalloc(strlen(buffer) + 1, GFP_KERNEL);
+                name = kstrdup(buffer, GFP_KERNEL);
                if (name == NULL)
                        goto fail;
-                strncpy(name, buffer, strlen(buffer) + 1);
                sysfs_attr_init(&counter_attrs[i].attr);
                counter_attrs[i].attr.name = name;
diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index d78b204e65c1..ecc1929d7f6a 100644
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -167,7 +167,7 @@ attribute_container_add_device(struct device *dev,
                ic->classdev.parent = get_device(dev);
                ic->classdev.class = cont->class;
                cont->class->dev_release = attribute_container_release;
-                dev_set_name(&ic->classdev, dev_name(dev));
+                dev_set_name(&ic->classdev, "%s", dev_name(dev));
                if (fn)
                        fn(cont, dev, &ic->classdev);
                else
diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
index 175649468c95..025c41d3cb33 100644
--- a/drivers/block/aoe/aoe.h
+++ b/drivers/block/aoe/aoe.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2012 Coraid, Inc.  See COPYING for GPL terms. */
+/* Copyright (c) 2013 Coraid, Inc.  See COPYING for GPL terms. */
-#define VERSION "81"
+#define VERSION "83"
 #define AOE_MAJOR 152
 #define DEVICE_NAME "aoe"
@@ -196,9 +196,11 @@ struct ktstate {
        struct completion rendez;
        struct task_struct *task;
        wait_queue_head_t *waitq;
-        int (*fn) (void);
+        int (*fn) (int);
-        char *name;
+        char name[12];
        spinlock_t *lock;
+        int id;
+        int active;
 };
 int aoeblk_init(void);
@@ -222,6 +224,7 @@ int aoecmd_init(void);
 struct sk_buff *aoecmd_ata_id(struct aoedev *);
 void aoe_freetframe(struct frame *);
 void aoe_flush_iocq(void);
+void aoe_flush_iocq_by_index(int);
 void aoe_end_request(struct aoedev *, struct request *, int);
 int aoe_ktstart(struct ktstate *k);
 void aoe_ktstop(struct ktstate *k);
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index fc803ecbbce4..99cb944a002d 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 Coraid, Inc.  See COPYING for GPL terms. */
+/* Copyright (c) 2013 Coraid, Inc.  See COPYING for GPL terms. */
 /*
 * aoecmd.c
 * Filesystem request handling methods
@@ -35,14 +35,27 @@ module_param(aoe_maxout, int, 0644);
 MODULE_PARM_DESC(aoe_maxout,
        "Only aoe_maxout outstanding packets for every MAC on eX.Y.");
-static wait_queue_head_t ktiowq;
+/* The number of online cpus during module initialization gives us a
-static struct ktstate kts;
+ * convenient heuristic cap on the parallelism used for ktio threads
+ * doing I/O completion.  It is not important that the cap equal the
+ * actual number of running CPUs at any given time, but because of CPU
+ * hotplug, we take care to use ncpus instead of using
+ * num_online_cpus() after module initialization.
+ */
+static int ncpus;
+/* mutex lock used for synchronization while thread spawning */
+static DEFINE_MUTEX(ktio_spawn_lock);
+static wait_queue_head_t *ktiowq;
+static struct ktstate *kts;
 /* io completion queue */
-static struct {
+struct iocq_ktio {
        struct list_head head;
        spinlock_t lock;
-} iocq;
+};
+static struct iocq_ktio *iocq;
 static struct page *empty_page;
@@ -1278,23 +1291,36 @@ out:
 * Returns true iff responses needing processing remain.
 */
 static int
-ktio(void)
+ktio(int id)
 {
        struct frame *f;
        struct list_head *pos;
        int i;
+        int actual_id;
        for (i = 0; ; ++i) {
                if (i == MAXIOC)
                        return 1;
-                if (list_empty(&iocq.head))
+                if (list_empty(&iocq[id].head))
                        return 0;
-                pos = iocq.head.next;
+                pos = iocq[id].head.next;
                list_del(pos);
-                spin_unlock_irq(&iocq.lock);
                f = list_entry(pos, struct frame, head);
+                spin_unlock_irq(&iocq[id].lock);
                ktiocomplete(f);
-                spin_lock_irq(&iocq.lock);
+                /* Figure out if extra threads are required. */
+                actual_id = f->t->d->aoeminor % ncpus;
+                if (!kts[actual_id].active) {
+                        BUG_ON(id != 0);
+                        mutex_lock(&ktio_spawn_lock);
+                        if (!kts[actual_id].active
+                                && aoe_ktstart(&kts[actual_id]) == 0)
+                                kts[actual_id].active = 1;
+                        mutex_unlock(&ktio_spawn_lock);
+                }
+                spin_lock_irq(&iocq[id].lock);
        }
 }
@@ -1311,7 +1337,7 @@ kthread(void *vp)
        complete(&k->rendez);   /* tell spawner we're running */
        do {
                spin_lock_irq(k->lock);
-                more = k->fn();
+                more = k->fn(k->id);
                if (!more) {
                        add_wait_queue(k->waitq, &wait);
                        __set_current_state(TASK_INTERRUPTIBLE);
@@ -1340,7 +1366,7 @@ aoe_ktstart(struct ktstate *k)
        struct task_struct *task;
        init_completion(&k->rendez);
-        task = kthread_run(kthread, k, k->name);
+        task = kthread_run(kthread, k, "%s", k->name);
        if (task == NULL || IS_ERR(task))
                return -ENOMEM;
        k->task = task;
@@ -1353,13 +1379,24 @@ aoe_ktstart(struct ktstate *k)
 static void
 ktcomplete(struct frame *f, struct sk_buff *skb)
 {
+        int id;
        ulong flags;
        f->r_skb = skb;
-        spin_lock_irqsave(&iocq.lock, flags);
+        id = f->t->d->aoeminor % ncpus;
-        list_add_tail(&f->head, &iocq.head);
+        spin_lock_irqsave(&iocq[id].lock, flags);
-        spin_unlock_irqrestore(&iocq.lock, flags);
+        if (!kts[id].active) {
-        wake_up(&ktiowq);
+                spin_unlock_irqrestore(&iocq[id].lock, flags);
+                /* The thread with id has not been spawned yet,
+                 * so delegate the work to the main thread and
+                 * try spawning a new thread.
+                 */
+                id = 0;
+                spin_lock_irqsave(&iocq[id].lock, flags);
+        }
+        list_add_tail(&f->head, &iocq[id].head);
+        spin_unlock_irqrestore(&iocq[id].lock, flags);
+        wake_up(&ktiowq[id]);
 }
 struct sk_buff *
@@ -1706,6 +1743,17 @@ aoe_failbuf(struct aoedev *d, struct buf *buf)
 void
 aoe_flush_iocq(void)
 {
+        int i;
+        for (i = 0; i < ncpus; i++) {
+                if (kts[i].active)
+                        aoe_flush_iocq_by_index(i);
+        }
+}
+void
+aoe_flush_iocq_by_index(int id)
+{
        struct frame *f;
        struct aoedev *d;
        LIST_HEAD(flist);
@@ -1713,9 +1761,9 @@ aoe_flush_iocq(void)
        struct sk_buff *skb;
        ulong flags;
-        spin_lock_irqsave(&iocq.lock, flags);
+        spin_lock_irqsave(&iocq[id].lock, flags);
-        list_splice_init(&iocq.head, &flist);
+        list_splice_init(&iocq[id].head, &flist);
-        spin_unlock_irqrestore(&iocq.lock, flags);
+        spin_unlock_irqrestore(&iocq[id].lock, flags);
        while (!list_empty(&flist)) {
                pos = flist.next;
                list_del(pos);
@@ -1738,6 +1786,8 @@ int __init
 aoecmd_init(void)
 {
        void *p;
+        int i;
+        int ret;
        /* get_zeroed_page returns page with ref count 1 */
        p = (void *) get_zeroed_page(GFP_KERNEL | __GFP_REPEAT);
@@ -1745,22 +1795,72 @@ aoecmd_init(void)
                return -ENOMEM;
        empty_page = virt_to_page(p);
-        INIT_LIST_HEAD(&iocq.head);
+        ncpus = num_online_cpus();
-        spin_lock_init(&iocq.lock);
-        init_waitqueue_head(&ktiowq);
+        iocq = kcalloc(ncpus, sizeof(struct iocq_ktio), GFP_KERNEL);
-        kts.name = "aoe_ktio";
+        if (!iocq)
-        kts.fn = ktio;
+                return -ENOMEM;
-        kts.waitq = &ktiowq;
-        kts.lock = &iocq.lock;
+        kts = kcalloc(ncpus, sizeof(struct ktstate), GFP_KERNEL);
-        return aoe_ktstart(&kts);
+        if (!kts) {
+                ret = -ENOMEM;
+                goto kts_fail;
+        }
+        ktiowq = kcalloc(ncpus, sizeof(wait_queue_head_t), GFP_KERNEL);
+        if (!ktiowq) {
+                ret = -ENOMEM;
+                goto ktiowq_fail;
+        }
+        mutex_init(&ktio_spawn_lock);
+        for (i = 0; i < ncpus; i++) {
+                INIT_LIST_HEAD(&iocq[i].head);
+                spin_lock_init(&iocq[i].lock);
+                init_waitqueue_head(&ktiowq[i]);
+                snprintf(kts[i].name, sizeof(kts[i].name), "aoe_ktio%d", i);
+                kts[i].fn = ktio;
+                kts[i].waitq = &ktiowq[i];
+                kts[i].lock = &iocq[i].lock;
+                kts[i].id = i;
+                kts[i].active = 0;
+        }
+        kts[0].active = 1;
+        if (aoe_ktstart(&kts[0])) {
+                ret = -ENOMEM;
+                goto ktstart_fail;
+        }
+        return 0;
+ktstart_fail:
+        kfree(ktiowq);
+ktiowq_fail:
+        kfree(kts);
+kts_fail:
+        kfree(iocq);
+        return ret;
 }
 void
 aoecmd_exit(void)
 {
-        aoe_ktstop(&kts);
+        int i;
+        for (i = 0; i < ncpus; i++)
+                if (kts[i].active)
+                        aoe_ktstop(&kts[i]);
        aoe_flush_iocq();
+        /* Free up the iocq and thread speicific configuration
+        * allocated during startup.
+        */
+        kfree(iocq);
+        kfree(kts);
+        kfree(ktiowq);
        free_page((unsigned long) page_address(empty_page));
        empty_page = NULL;
 }
diff --git a/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c
index 98f2965778b9..784c92e038d1 100644
--- a/drivers/block/aoe/aoedev.c
+++ b/drivers/block/aoe/aoedev.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 Coraid, Inc.  See COPYING for GPL terms. */
+/* Copyright (c) 2013 Coraid, Inc.  See COPYING for GPL terms. */
 /*
 * aoedev.c
 * AoE device utility functions; maintains device list.
@@ -518,7 +518,6 @@ void
 aoedev_exit(void)
 {
        flush_scheduled_work();
-        aoe_flush_iocq();
        flush(NULL, 0, EXITING);
 }
diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c
index 71d3ea8d3006..63773a90581d 100644
--- a/drivers/block/aoe/aoenet.c
+++ b/drivers/block/aoe/aoenet.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 Coraid, Inc.  See COPYING for GPL terms. */
+/* Copyright (c) 2013 Coraid, Inc.  See COPYING for GPL terms. */
 /*
 * aoenet.c
 * Ethernet portion of AoE driver
@@ -52,7 +52,7 @@ static struct sk_buff_head skbtxq;
 /* enters with txlock held */
 static int
-tx(void) __must_hold(&txlock)
+tx(int id) __must_hold(&txlock)
 {
        struct sk_buff *skb;
        struct net_device *ifp;
@@ -205,7 +205,8 @@ aoenet_init(void)
        kts.lock = &txlock;
        kts.fn = tx;
        kts.waitq = &txwq;
-        kts.name = "aoe_tx";
+        kts.id = 0;
+        snprintf(kts.name, sizeof(kts.name), "aoe_tx%d", kts.id);
        if (aoe_ktstart(&kts))
                return -EAGAIN;
        dev_add_pack(&aoe_pt);
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 20dd52a2f92f..952dbfe22126 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -4087,7 +4087,8 @@ skip_create_disk:
 start_service_thread:
        sprintf(thd_name, "mtip_svc_thd_%02d", index);
        dd->mtip_svc_handler = kthread_create_on_node(mtip_service_thread,
-                                                dd, dd->numa_node, thd_name);
+                                                dd, dd->numa_node, "%s",
+                                                thd_name);
        if (IS_ERR(dd->mtip_svc_handler)) {
                dev_err(&dd->pdev->dev, "service thread failed to start\n");
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 037288e7874d..2dc3b5153f0d 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -623,8 +623,10 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
                if (!nbd->sock)
                        return -EINVAL;
+                nbd->disconnect = 1;
                nbd_send_req(nbd, &sreq);
-                return 0;
+                return 0;
        }
 
        case NBD_CLEAR_SOCK: {
@@ -654,6 +656,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
                                nbd->sock = SOCKET_I(inode);
                                if (max_part > 0)
                                        bdev->bd_invalidated = 1;
+                                nbd->disconnect = 0; /* we're connected now */
                                return 0;
                        } else {
                                fput(file);
@@ -714,7 +717,8 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
                else
                        blk_queue_flush(nbd->disk->queue, 0);
-                thread = kthread_create(nbd_thread, nbd, nbd->disk->disk_name);
+                thread = kthread_create(nbd_thread, nbd, "%s",
+                                        nbd->disk->disk_name);
                if (IS_ERR(thread)) {
                        mutex_lock(&nbd->tx_lock);
                        return PTR_ERR(thread);
@@ -742,6 +746,8 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
                set_capacity(nbd->disk, 0);
                if (max_part > 0)
                        ioctl_by_bdev(bdev, BLKRRPART, 0);
+                if (nbd->disconnect) /* user requested, ignore socket errors */
+                        return 0;
                return nbd->harderror;
        }
@@ -750,7 +756,6 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
                 * This is for compatibility only.  The queue is always cleared
                 * by NBD_DO_IT or NBD_CLEAR_SOCK.
                 */
-                BUG_ON(!nbd->sock && !list_empty(&nbd->queue_head));
                return 0;
        case NBD_PRINT_DEBUG:
diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
index 8bfd1bcf95ec..04608a6502d7 100644
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
@@ -93,7 +93,7 @@ static void xen_update_blkif_status(struct xen_blkif *blkif)
        }
        invalidate_inode_pages2(blkif->vbd.bdev->bd_inode->i_mapping);
-        blkif->xenblkd = kthread_run(xen_blkif_schedule, blkif, name);
+        blkif->xenblkd = kthread_run(xen_blkif_schedule, blkif, "%s", name);
        if (IS_ERR(blkif->xenblkd)) {
                err = PTR_ERR(blkif->xenblkd);
                blkif->xenblkd = NULL;
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index d620b4495745..8a3aff724d98 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -2882,7 +2882,7 @@ static noinline int mmc_ioctl_cdrom_read_data(struct cdrom_device_info *cdi,
        if (lba < 0)
                return -EINVAL;
-        cgc->buffer = kmalloc(blocksize, GFP_KERNEL);
+        cgc->buffer = kzalloc(blocksize, GFP_KERNEL);
        if (cgc->buffer == NULL)
                return -ENOMEM;
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 4afcb65cc623..5980cb9af857 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -830,9 +830,9 @@ probe_fail_cdrom_register:
        del_gendisk(gd.disk);
 probe_fail_no_disk:
        kfree(gd.cd_info);
+probe_fail_no_mem:
        unregister_blkdev(gdrom_major, GDROM_DEV_NAME);
        gdrom_major = 0;
-probe_fail_no_mem:
        pr_warning("Probe failed - error is 0x%X\n", err);
        return err;
 }
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 2ca6d7844ad9..f895a8c8a244 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -21,7 +21,6 @@
 #include <linux/ptrace.h>
 #include <linux/device.h>
 #include <linux/highmem.h>
-#include <linux/crash_dump.h>
 #include <linux/backing-dev.h>
 #include <linux/bootmem.h>
 #include <linux/splice.h>
@@ -357,40 +356,6 @@ static int mmap_kmem(struct file *file, struct vm_area_struct *vma)
 }
 #endif
-#ifdef CONFIG_CRASH_DUMP
-/*
- * Read memory corresponding to the old kernel.
- */
-static ssize_t read_oldmem(struct file *file, char __user *buf,
-                                size_t count, loff_t *ppos)
-{
-        unsigned long pfn, offset;
-        size_t read = 0, csize;
-        int rc = 0;
-        while (count) {
-                pfn = *ppos / PAGE_SIZE;
-                if (pfn > saved_max_pfn)
-                        return read;
-                offset = (unsigned long)(*ppos % PAGE_SIZE);
-                if (count > PAGE_SIZE - offset)
-                        csize = PAGE_SIZE - offset;
-                else
-                        csize = count;
-                rc = copy_oldmem_page(pfn, buf, csize, offset, 1);
-                if (rc < 0)
-                        return rc;
-                buf += csize;
-                *ppos += csize;
-                read += csize;
-                count -= csize;
-        }
-        return read;
-}
-#endif
 #ifdef CONFIG_DEVKMEM
 /*
 * This function reads the *virtual* memory as seen by the kernel.
@@ -772,7 +737,6 @@ static int open_port(struct inode *inode, struct file *filp)
 #define aio_write_zero  aio_write_null
 #define open_mem        open_port
 #define open_kmem       open_mem
-#define open_oldmem     open_mem
 static const struct file_operations mem_fops = {
        .llseek         = memory_lseek,
@@ -837,14 +801,6 @@ static const struct file_operations full_fops = {
        .write          = write_full,
 };
-#ifdef CONFIG_CRASH_DUMP
-static const struct file_operations oldmem_fops = {
-        .read   = read_oldmem,
-        .open   = open_oldmem,
-        .llseek = default_llseek,
-};
-#endif
 static const struct memdev {
        const char *name;
        umode_t mode;
@@ -866,9 +822,6 @@ static const struct memdev {
 #ifdef CONFIG_PRINTK
        [11] = { "kmsg", 0644, &kmsg_fops, NULL },
 #endif
-#ifdef CONFIG_CRASH_DUMP
-        [12] = { "oldmem", 0, &oldmem_fops, NULL },
-#endif
 };
 static int memory_open(struct inode *inode, struct file *filp)
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index 44c407986f64..e94e619fe050 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -486,7 +486,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
                                                GFP_KERNEL);
        devfreq->last_stat_updated = jiffies;
-        dev_set_name(&devfreq->dev, dev_name(dev));
+        dev_set_name(&devfreq->dev, "%s", dev_name(dev));
        err = device_register(&devfreq->dev);
        if (err) {
                put_device(&devfreq->dev);
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index 93f7992bee5c..9e56745f87bf 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -663,11 +663,6 @@ static bool device_has_all_tx_types(struct dma_device *device)
                return false;
        #endif
-        #if defined(CONFIG_ASYNC_MEMSET) || defined(CONFIG_ASYNC_MEMSET_MODULE)
-        if (!dma_has_cap(DMA_MEMSET, device->cap_mask))
-                return false;
-        #endif
        #if defined(CONFIG_ASYNC_XOR) || defined(CONFIG_ASYNC_XOR_MODULE)
        if (!dma_has_cap(DMA_XOR, device->cap_mask))
                return false;
@@ -729,8 +724,6 @@ int dma_async_device_register(struct dma_device *device)
                !device->device_prep_dma_pq);
        BUG_ON(dma_has_cap(DMA_PQ_VAL, device->cap_mask) &&
                !device->device_prep_dma_pq_val);
-        BUG_ON(dma_has_cap(DMA_MEMSET, device->cap_mask) &&
-                !device->device_prep_dma_memset);
        BUG_ON(dma_has_cap(DMA_INTERRUPT, device->cap_mask) &&
                !device->device_prep_dma_interrupt);
        BUG_ON(dma_has_cap(DMA_SG, device->cap_mask) &&
diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c
index 17a2393b3e25..5ff6fc1819dc 100644
--- a/drivers/dma/ioat/dma.c
+++ b/drivers/dma/ioat/dma.c
@@ -1105,12 +1105,11 @@ static ssize_t cap_show(struct dma_chan *c, char *page)
 {
        struct dma_device *dma = c->device;
-        return sprintf(page, "copy%s%s%s%s%s%s\n",
+        return sprintf(page, "copy%s%s%s%s%s\n",
                       dma_has_cap(DMA_PQ, dma->cap_mask) ? " pq" : "",
                       dma_has_cap(DMA_PQ_VAL, dma->cap_mask) ? " pq_val" : "",
                       dma_has_cap(DMA_XOR, dma->cap_mask) ? " xor" : "",
                       dma_has_cap(DMA_XOR_VAL, dma->cap_mask) ? " xor_val" : "",
-                       dma_has_cap(DMA_MEMSET, dma->cap_mask)  ? " fill" : "",
                       dma_has_cap(DMA_INTERRUPT, dma->cap_mask) ? " intr" : "");
 }
diff --git a/drivers/dma/ioat/dma_v2.h b/drivers/dma/ioat/dma_v2.h
index 29bf9448035d..212d584fe427 100644
--- a/drivers/dma/ioat/dma_v2.h
+++ b/drivers/dma/ioat/dma_v2.h
@@ -123,7 +123,6 @@ static inline u16 ioat2_xferlen_to_descs(struct ioat2_dma_chan *ioat, size_t len
 struct ioat_ring_ent {
        union {
                struct ioat_dma_descriptor *hw;
-                struct ioat_fill_descriptor *fill;
                struct ioat_xor_descriptor *xor;
                struct ioat_xor_ext_descriptor *xor_ex;
                struct ioat_pq_descriptor *pq;
diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c
index ca6ea9b3551b..b642e035579b 100644
--- a/drivers/dma/ioat/dma_v3.c
+++ b/drivers/dma/ioat/dma_v3.c
@@ -311,14 +311,6 @@ static void ioat3_dma_unmap(struct ioat2_dma_chan *ioat,
                if (!desc->hw->ctl_f.null) /* skip 'interrupt' ops */
                        ioat_dma_unmap(chan, flags, len, desc->hw);
                break;
-        case IOAT_OP_FILL: {
-                struct ioat_fill_descriptor *hw = desc->fill;
-                if (!(flags & DMA_COMPL_SKIP_DEST_UNMAP))
-                        ioat_unmap(pdev, hw->dst_addr - offset, len,
-                                   PCI_DMA_FROMDEVICE, flags, 1);
-                break;
-        }
        case IOAT_OP_XOR_VAL:
        case IOAT_OP_XOR: {
                struct ioat_xor_descriptor *xor = desc->xor;
@@ -824,51 +816,6 @@ ioat3_tx_status(struct dma_chan *c, dma_cookie_t cookie,
 }
 static struct dma_async_tx_descriptor *
-ioat3_prep_memset_lock(struct dma_chan *c, dma_addr_t dest, int value,
-                       size_t len, unsigned long flags)
-{
-        struct ioat2_dma_chan *ioat = to_ioat2_chan(c);
-        struct ioat_ring_ent *desc;
-        size_t total_len = len;
-        struct ioat_fill_descriptor *fill;
-        u64 src_data = (0x0101010101010101ULL) * (value & 0xff);
-        int num_descs, idx, i;
-        num_descs = ioat2_xferlen_to_descs(ioat, len);
-        if (likely(num_descs) && ioat2_check_space_lock(ioat, num_descs) == 0)
-                idx = ioat->head;
-        else
-                return NULL;
-        i = 0;
-        do {
-                size_t xfer_size = min_t(size_t, len, 1 << ioat->xfercap_log);
-                desc = ioat2_get_ring_ent(ioat, idx + i);
-                fill = desc->fill;
-                fill->size = xfer_size;
-                fill->src_data = src_data;
-                fill->dst_addr = dest;
-                fill->ctl = 0;
-                fill->ctl_f.op = IOAT_OP_FILL;
-                len -= xfer_size;
-                dest += xfer_size;
-                dump_desc_dbg(ioat, desc);
-        } while (++i < num_descs);
-        desc->txd.flags = flags;
-        desc->len = total_len;
-        fill->ctl_f.int_en = !!(flags & DMA_PREP_INTERRUPT);
-        fill->ctl_f.fence = !!(flags & DMA_PREP_FENCE);
-        fill->ctl_f.compl_write = 1;
-        dump_desc_dbg(ioat, desc);
-        /* we leave the channel locked to ensure in order submission */
-        return &desc->txd;
-}
-static struct dma_async_tx_descriptor *
 __ioat3_prep_xor_lock(struct dma_chan *c, enum sum_check_flags *result,
                      dma_addr_t dest, dma_addr_t *src, unsigned int src_cnt,
                      size_t len, unsigned long flags)
@@ -1431,7 +1378,7 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device)
        struct page *xor_srcs[IOAT_NUM_SRC_TEST];
        struct page *xor_val_srcs[IOAT_NUM_SRC_TEST + 1];
        dma_addr_t dma_srcs[IOAT_NUM_SRC_TEST + 1];
-        dma_addr_t dma_addr, dest_dma;
+        dma_addr_t dest_dma;
        struct dma_async_tx_descriptor *tx;
        struct dma_chan *dma_chan;
        dma_cookie_t cookie;
@@ -1598,56 +1545,6 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device)
                goto free_resources;
        }
-        /* skip memset if the capability is not present */
-        if (!dma_has_cap(DMA_MEMSET, dma_chan->device->cap_mask))
-                goto free_resources;
-        /* test memset */
-        op = IOAT_OP_FILL;
-        dma_addr = dma_map_page(dev, dest, 0,
-                        PAGE_SIZE, DMA_FROM_DEVICE);
-        tx = dma->device_prep_dma_memset(dma_chan, dma_addr, 0, PAGE_SIZE,
-                                         DMA_PREP_INTERRUPT |
-                                         DMA_COMPL_SKIP_SRC_UNMAP |
-                                         DMA_COMPL_SKIP_DEST_UNMAP);
-        if (!tx) {
-                dev_err(dev, "Self-test memset prep failed\n");
-                err = -ENODEV;
-                goto dma_unmap;
-        }
-        async_tx_ack(tx);
-        init_completion(&cmp);
-        tx->callback = ioat3_dma_test_callback;
-        tx->callback_param = &cmp;
-        cookie = tx->tx_submit(tx);
-        if (cookie < 0) {
-                dev_err(dev, "Self-test memset setup failed\n");
-                err = -ENODEV;
-                goto dma_unmap;
-        }
-        dma->device_issue_pending(dma_chan);
-        tmo = wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000));
-        if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_SUCCESS) {
-                dev_err(dev, "Self-test memset timed out\n");
-                err = -ENODEV;
-                goto dma_unmap;
-        }
-        dma_unmap_page(dev, dma_addr, PAGE_SIZE, DMA_FROM_DEVICE);
-        for (i = 0; i < PAGE_SIZE/sizeof(u32); i++) {
-                u32 *ptr = page_address(dest);
-                if (ptr[i]) {
-                        dev_err(dev, "Self-test memset failed compare\n");
-                        err = -ENODEV;
-                        goto free_resources;
-                }
-        }
        /* test for non-zero parity sum */
        op = IOAT_OP_XOR_VAL;
@@ -1706,8 +1603,7 @@ dma_unmap:
                for (i = 0; i < IOAT_NUM_SRC_TEST + 1; i++)
                        dma_unmap_page(dev, dma_srcs[i], PAGE_SIZE,
                                       DMA_TO_DEVICE);
-        } else if (op == IOAT_OP_FILL)
+        }
-                dma_unmap_page(dev, dma_addr, PAGE_SIZE, DMA_FROM_DEVICE);
 free_resources:
        dma->device_free_chan_resources(dma_chan);
 out:
@@ -1944,12 +1840,6 @@ int ioat3_dma_probe(struct ioatdma_device *device, int dca)
                }
        }
-        if (is_raid_device && (device->cap & IOAT_CAP_FILL_BLOCK)) {
-                dma_cap_set(DMA_MEMSET, dma->cap_mask);
-                dma->device_prep_dma_memset = ioat3_prep_memset_lock;
-        }
        dma->device_tx_status = ioat3_tx_status;
        device->cleanup_fn = ioat3_cleanup_event;
        device->timer_fn = ioat3_timer_event;
diff --git a/drivers/dma/ioat/hw.h b/drivers/dma/ioat/hw.h
index 5ee57d402a6e..62f83e983d8d 100644
--- a/drivers/dma/ioat/hw.h
+++ b/drivers/dma/ioat/hw.h
@@ -100,33 +100,6 @@ struct ioat_dma_descriptor {
        uint64_t        user2;
 };
-struct ioat_fill_descriptor {
-        uint32_t        size;
-        union {
-                uint32_t ctl;
-                struct {
-                        unsigned int int_en:1;
-                        unsigned int rsvd:1;
-                        unsigned int dest_snoop_dis:1;
-                        unsigned int compl_write:1;
-                        unsigned int fence:1;
-                        unsigned int rsvd2:2;
-                        unsigned int dest_brk:1;
-                        unsigned int bundle:1;
-                        unsigned int rsvd4:15;
-                        #define IOAT_OP_FILL 0x01
-                        unsigned int op:8;
-                } ctl_f;
-        };
-        uint64_t        src_data;
-        uint64_t        dst_addr;
-        uint64_t        next;
-        uint64_t        rsv1;
-        uint64_t        next_dst_addr;
-        uint64_t        user1;
-        uint64_t        user2;
-};
 struct ioat_xor_descriptor {
        uint32_t        size;
        union {
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index 7dafb9f3785f..c9cc08c2dbba 100644
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -633,39 +633,6 @@ iop_adma_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dma_dest,
 }
 static struct dma_async_tx_descriptor *
-iop_adma_prep_dma_memset(struct dma_chan *chan, dma_addr_t dma_dest,
-                         int value, size_t len, unsigned long flags)
-{
-        struct iop_adma_chan *iop_chan = to_iop_adma_chan(chan);
-        struct iop_adma_desc_slot *sw_desc, *grp_start;
-        int slot_cnt, slots_per_op;
-        if (unlikely(!len))
-                return NULL;
-        BUG_ON(len > IOP_ADMA_MAX_BYTE_COUNT);
-        dev_dbg(iop_chan->device->common.dev, "%s len: %u\n",
-                __func__, len);
-        spin_lock_bh(&iop_chan->lock);
-        slot_cnt = iop_chan_memset_slot_count(len, &slots_per_op);
-        sw_desc = iop_adma_alloc_slots(iop_chan, slot_cnt, slots_per_op);
-        if (sw_desc) {
-                grp_start = sw_desc->group_head;
-                iop_desc_init_memset(grp_start, flags);
-                iop_desc_set_byte_count(grp_start, iop_chan, len);
-                iop_desc_set_block_fill_val(grp_start, value);
-                iop_desc_set_dest_addr(grp_start, iop_chan, dma_dest);
-                sw_desc->unmap_src_cnt = 1;
-                sw_desc->unmap_len = len;
-                sw_desc->async_tx.flags = flags;
-        }
-        spin_unlock_bh(&iop_chan->lock);
-        return sw_desc ? &sw_desc->async_tx : NULL;
-}
-static struct dma_async_tx_descriptor *
 iop_adma_prep_dma_xor(struct dma_chan *chan, dma_addr_t dma_dest,
                      dma_addr_t *dma_src, unsigned int src_cnt, size_t len,
                      unsigned long flags)
@@ -1176,33 +1143,6 @@ iop_adma_xor_val_self_test(struct iop_adma_device *device)
                goto free_resources;
        }
-        /* test memset */
-        dma_addr = dma_map_page(dma_chan->device->dev, dest, 0,
-                        PAGE_SIZE, DMA_FROM_DEVICE);
-        tx = iop_adma_prep_dma_memset(dma_chan, dma_addr, 0, PAGE_SIZE,
-                                      DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
-        cookie = iop_adma_tx_submit(tx);
-        iop_adma_issue_pending(dma_chan);
-        msleep(8);
-        if (iop_adma_status(dma_chan, cookie, NULL) != DMA_SUCCESS) {
-                dev_err(dma_chan->device->dev,
-                        "Self-test memset timed out, disabling\n");
-                err = -ENODEV;
-                goto free_resources;
-        }
-        for (i = 0; i < PAGE_SIZE/sizeof(u32); i++) {
-                u32 *ptr = page_address(dest);
-                if (ptr[i]) {
-                        dev_err(dma_chan->device->dev,
-                                "Self-test memset failed compare, disabling\n");
-                        err = -ENODEV;
-                        goto free_resources;
-                }
-        }
        /* test for non-zero parity sum */
        zero_sum_result = 0;
        for (i = 0; i < IOP_ADMA_NUM_SRC_TEST + 1; i++)
@@ -1487,8 +1427,6 @@ static int iop_adma_probe(struct platform_device *pdev)
        /* set prep routines based on capability */
        if (dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask))
                dma_dev->device_prep_dma_memcpy = iop_adma_prep_dma_memcpy;
-        if (dma_has_cap(DMA_MEMSET, dma_dev->cap_mask))
-                dma_dev->device_prep_dma_memset = iop_adma_prep_dma_memset;
        if (dma_has_cap(DMA_XOR, dma_dev->cap_mask)) {
                dma_dev->max_xor = iop_adma_get_max_xor();
                dma_dev->device_prep_dma_xor = iop_adma_prep_dma_xor;
@@ -1556,8 +1494,7 @@ static int iop_adma_probe(struct platform_device *pdev)
                        goto err_free_iop_chan;
        }
-        if (dma_has_cap(DMA_XOR, dma_dev->cap_mask) ||
+        if (dma_has_cap(DMA_XOR, dma_dev->cap_mask)) {
-            dma_has_cap(DMA_MEMSET, dma_dev->cap_mask)) {
                ret = iop_adma_xor_val_self_test(adev);
                dev_dbg(&pdev->dev, "xor self test returned %d\n", ret);
                if (ret)
@@ -1584,7 +1521,6 @@ static int iop_adma_probe(struct platform_device *pdev)
                 dma_has_cap(DMA_PQ_VAL, dma_dev->cap_mask) ? "pq_val " : "",
                 dma_has_cap(DMA_XOR, dma_dev->cap_mask) ? "xor " : "",
                 dma_has_cap(DMA_XOR_VAL, dma_dev->cap_mask) ? "xor_val " : "",
-                 dma_has_cap(DMA_MEMSET, dma_dev->cap_mask)  ? "fill " : "",
                 dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask) ? "cpy " : "",
                 dma_has_cap(DMA_INTERRUPT, dma_dev->cap_mask) ? "intr " : "");
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index d64ae14f2706..200f1a3c9a44 100644
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -89,11 +89,6 @@ static void mv_desc_clear_next_desc(struct mv_xor_desc_slot *desc)
        hw_desc->phy_next_desc = 0;
 }
-static void mv_desc_set_block_fill_val(struct mv_xor_desc_slot *desc, u32 val)
-{
-        desc->value = val;
-}
 static void mv_desc_set_dest_addr(struct mv_xor_desc_slot *desc,
                                  dma_addr_t addr)
 {
@@ -128,22 +123,6 @@ static void mv_chan_set_next_descriptor(struct mv_xor_chan *chan,
        __raw_writel(next_desc_addr, XOR_NEXT_DESC(chan));
 }
-static void mv_chan_set_dest_pointer(struct mv_xor_chan *chan, u32 desc_addr)
-{
-        __raw_writel(desc_addr, XOR_DEST_POINTER(chan));
-}
-static void mv_chan_set_block_size(struct mv_xor_chan *chan, u32 block_size)
-{
-        __raw_writel(block_size, XOR_BLOCK_SIZE(chan));
-}
-static void mv_chan_set_value(struct mv_xor_chan *chan, u32 value)
-{
-        __raw_writel(value, XOR_INIT_VALUE_LOW(chan));
-        __raw_writel(value, XOR_INIT_VALUE_HIGH(chan));
-}
 static void mv_chan_unmask_interrupts(struct mv_xor_chan *chan)
 {
        u32 val = __raw_readl(XOR_INTR_MASK(chan));
@@ -186,8 +165,6 @@ static int mv_can_chain(struct mv_xor_desc_slot *desc)
        if (chain_old_tail->type != desc->type)
                return 0;
-        if (desc->type == DMA_MEMSET)
-                return 0;
        return 1;
 }
@@ -205,9 +182,6 @@ static void mv_set_mode(struct mv_xor_chan *chan,
        case DMA_MEMCPY:
                op_mode = XOR_OPERATION_MODE_MEMCPY;
                break;
-        case DMA_MEMSET:
-                op_mode = XOR_OPERATION_MODE_MEMSET;
-                break;
        default:
                dev_err(mv_chan_to_devp(chan),
                        "error: unsupported operation %d\n",
@@ -274,18 +248,9 @@ static void mv_xor_start_new_chain(struct mv_xor_chan *mv_chan,
        if (sw_desc->type != mv_chan->current_type)
                mv_set_mode(mv_chan, sw_desc->type);
-        if (sw_desc->type == DMA_MEMSET) {
+        /* set the hardware chain */
-                /* for memset requests we need to program the engine, no
+        mv_chan_set_next_descriptor(mv_chan, sw_desc->async_tx.phys);
-                 * descriptors used.
-                 */
-                struct mv_xor_desc *hw_desc = sw_desc->hw_desc;
-                mv_chan_set_dest_pointer(mv_chan, hw_desc->phy_dest_addr);
-                mv_chan_set_block_size(mv_chan, sw_desc->unmap_len);
-                mv_chan_set_value(mv_chan, sw_desc->value);
-        } else {
-                /* set the hardware chain */
-                mv_chan_set_next_descriptor(mv_chan, sw_desc->async_tx.phys);
-        }
        mv_chan->pending += sw_desc->slot_cnt;
        mv_xor_issue_pending(&mv_chan->dmachan);
 }
@@ -688,43 +653,6 @@ mv_xor_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
 }
 static struct dma_async_tx_descriptor *
-mv_xor_prep_dma_memset(struct dma_chan *chan, dma_addr_t dest, int value,
-                       size_t len, unsigned long flags)
-{
-        struct mv_xor_chan *mv_chan = to_mv_xor_chan(chan);
-        struct mv_xor_desc_slot *sw_desc, *grp_start;
-        int slot_cnt;
-        dev_dbg(mv_chan_to_devp(mv_chan),
-                "%s dest: %x len: %u flags: %ld\n",
-                __func__, dest, len, flags);
-        if (unlikely(len < MV_XOR_MIN_BYTE_COUNT))
-                return NULL;
-        BUG_ON(len > MV_XOR_MAX_BYTE_COUNT);
-        spin_lock_bh(&mv_chan->lock);
-        slot_cnt = mv_chan_memset_slot_count(len);
-        sw_desc = mv_xor_alloc_slots(mv_chan, slot_cnt, 1);
-        if (sw_desc) {
-                sw_desc->type = DMA_MEMSET;
-                sw_desc->async_tx.flags = flags;
-                grp_start = sw_desc->group_head;
-                mv_desc_init(grp_start, flags);
-                mv_desc_set_byte_count(grp_start, len);
-                mv_desc_set_dest_addr(sw_desc->group_head, dest);
-                mv_desc_set_block_fill_val(grp_start, value);
-                sw_desc->unmap_src_cnt = 1;
-                sw_desc->unmap_len = len;
-        }
-        spin_unlock_bh(&mv_chan->lock);
-        dev_dbg(mv_chan_to_devp(mv_chan),
-                "%s sw_desc %p async_tx %p \n",
-                __func__, sw_desc, &sw_desc->async_tx);
-        return sw_desc ? &sw_desc->async_tx : NULL;
-}
-static struct dma_async_tx_descriptor *
 mv_xor_prep_dma_xor(struct dma_chan *chan, dma_addr_t dest, dma_addr_t *src,
                    unsigned int src_cnt, size_t len, unsigned long flags)
 {
@@ -1137,8 +1065,6 @@ mv_xor_channel_add(struct mv_xor_device *xordev,
        /* set prep routines based on capability */
        if (dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask))
                dma_dev->device_prep_dma_memcpy = mv_xor_prep_dma_memcpy;
-        if (dma_has_cap(DMA_MEMSET, dma_dev->cap_mask))
-                dma_dev->device_prep_dma_memset = mv_xor_prep_dma_memset;
        if (dma_has_cap(DMA_XOR, dma_dev->cap_mask)) {
                dma_dev->max_xor = 8;
                dma_dev->device_prep_dma_xor = mv_xor_prep_dma_xor;
@@ -1187,9 +1113,8 @@ mv_xor_channel_add(struct mv_xor_device *xordev,
                        goto err_free_irq;
        }
-        dev_info(&pdev->dev, "Marvell XOR: ( %s%s%s%s)\n",
+        dev_info(&pdev->dev, "Marvell XOR: ( %s%s%s)\n",
                 dma_has_cap(DMA_XOR, dma_dev->cap_mask) ? "xor " : "",
-                 dma_has_cap(DMA_MEMSET, dma_dev->cap_mask)  ? "fill " : "",
                 dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask) ? "cpy " : "",
                 dma_has_cap(DMA_INTERRUPT, dma_dev->cap_mask) ? "intr " : "");
@@ -1298,8 +1223,6 @@ static int mv_xor_probe(struct platform_device *pdev)
                                dma_cap_set(DMA_MEMCPY, cap_mask);
                        if (of_property_read_bool(np, "dmacap,xor"))
                                dma_cap_set(DMA_XOR, cap_mask);
-                        if (of_property_read_bool(np, "dmacap,memset"))
-                                dma_cap_set(DMA_MEMSET, cap_mask);
                        if (of_property_read_bool(np, "dmacap,interrupt"))
                                dma_cap_set(DMA_INTERRUPT, cap_mask);
diff --git a/drivers/dma/mv_xor.h b/drivers/dma/mv_xor.h
index c632a4761fcf..c619359cb7fe 100644
--- a/drivers/dma/mv_xor.h
+++ b/drivers/dma/mv_xor.h
@@ -31,7 +31,6 @@
 #define XOR_OPERATION_MODE_XOR          0
 #define XOR_OPERATION_MODE_MEMCPY       2
-#define XOR_OPERATION_MODE_MEMSET       4
 #define XOR_CURR_DESC(chan)     (chan->mmr_base + 0x210 + (chan->idx * 4))
 #define XOR_NEXT_DESC(chan)     (chan->mmr_base + 0x200 + (chan->idx * 4))
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index a17553f7c028..7ec82f0667eb 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -2485,10 +2485,10 @@ static void pl330_free_chan_resources(struct dma_chan *chan)
        struct dma_pl330_chan *pch = to_pchan(chan);
        unsigned long flags;
-        spin_lock_irqsave(&pch->lock, flags);
        tasklet_kill(&pch->task);
+        spin_lock_irqsave(&pch->lock, flags);
        pl330_release_channel(pch->pl330_chid);
        pch->pl330_chid = NULL;
diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
index 5d3d95569a1e..1e220f8dfd8c 100644
--- a/drivers/dma/ppc4xx/adma.c
+++ b/drivers/dma/ppc4xx/adma.c
@@ -2323,47 +2323,6 @@ static struct dma_async_tx_descriptor *ppc440spe_adma_prep_dma_memcpy(
 }
 /**
- * ppc440spe_adma_prep_dma_memset - prepare CDB for a MEMSET operation
- */
-static struct dma_async_tx_descriptor *ppc440spe_adma_prep_dma_memset(
-                struct dma_chan *chan, dma_addr_t dma_dest, int value,
-                size_t len, unsigned long flags)
-{
-        struct ppc440spe_adma_chan *ppc440spe_chan;
-        struct ppc440spe_adma_desc_slot *sw_desc, *group_start;
-        int slot_cnt, slots_per_op;
-        ppc440spe_chan = to_ppc440spe_adma_chan(chan);
-        if (unlikely(!len))
-                return NULL;
-        BUG_ON(len > PPC440SPE_ADMA_DMA_MAX_BYTE_COUNT);
-        spin_lock_bh(&ppc440spe_chan->lock);
-        dev_dbg(ppc440spe_chan->device->common.dev,
-                "ppc440spe adma%d: %s cal: %u len: %u int_en %d\n",
-                ppc440spe_chan->device->id, __func__, value, len,
-                flags & DMA_PREP_INTERRUPT ? 1 : 0);
-        slot_cnt = slots_per_op = 1;
-        sw_desc = ppc440spe_adma_alloc_slots(ppc440spe_chan, slot_cnt,
-                slots_per_op);
-        if (sw_desc) {
-                group_start = sw_desc->group_head;
-                ppc440spe_desc_init_memset(group_start, value, flags);
-                ppc440spe_adma_set_dest(group_start, dma_dest, 0);
-                ppc440spe_desc_set_byte_count(group_start, ppc440spe_chan, len);
-                sw_desc->unmap_len = len;
-                sw_desc->async_tx.flags = flags;
-        }
-        spin_unlock_bh(&ppc440spe_chan->lock);
-        return sw_desc ? &sw_desc->async_tx : NULL;
-}
-/**
 * ppc440spe_adma_prep_dma_xor - prepare CDB for a XOR operation
 */
 static struct dma_async_tx_descriptor *ppc440spe_adma_prep_dma_xor(
@@ -4125,7 +4084,6 @@ static void ppc440spe_adma_init_capabilities(struct ppc440spe_adma_device *adev)
        case PPC440SPE_DMA1_ID:
                dma_cap_set(DMA_MEMCPY, adev->common.cap_mask);
                dma_cap_set(DMA_INTERRUPT, adev->common.cap_mask);
-                dma_cap_set(DMA_MEMSET, adev->common.cap_mask);
                dma_cap_set(DMA_PQ, adev->common.cap_mask);
                dma_cap_set(DMA_PQ_VAL, adev->common.cap_mask);
                dma_cap_set(DMA_XOR_VAL, adev->common.cap_mask);
@@ -4151,10 +4109,6 @@ static void ppc440spe_adma_init_capabilities(struct ppc440spe_adma_device *adev)
                adev->common.device_prep_dma_memcpy =
                        ppc440spe_adma_prep_dma_memcpy;
        }
-        if (dma_has_cap(DMA_MEMSET, adev->common.cap_mask)) {
-                adev->common.device_prep_dma_memset =
-                        ppc440spe_adma_prep_dma_memset;
-        }
        if (dma_has_cap(DMA_XOR, adev->common.cap_mask)) {
                adev->common.max_xor = XOR_MAX_OPS;
                adev->common.device_prep_dma_xor =
@@ -4217,7 +4171,6 @@ static void ppc440spe_adma_init_capabilities(struct ppc440spe_adma_device *adev)
          dma_has_cap(DMA_XOR, adev->common.cap_mask) ? "xor " : "",
          dma_has_cap(DMA_XOR_VAL, adev->common.cap_mask) ? "xor_val " : "",
          dma_has_cap(DMA_MEMCPY, adev->common.cap_mask) ? "memcpy " : "",
-          dma_has_cap(DMA_MEMSET, adev->common.cap_mask)  ? "memset " : "",
          dma_has_cap(DMA_INTERRUPT, adev->common.cap_mask) ? "intr " : "");
 }
diff --git a/drivers/extcon/extcon-class.c b/drivers/extcon/extcon-class.c
index 8c69803558fe..18ccadef43fd 100644
--- a/drivers/extcon/extcon-class.c
+++ b/drivers/extcon/extcon-class.c
@@ -602,7 +602,7 @@ int extcon_dev_register(struct extcon_dev *edev, struct device *dev)
        edev->dev->class = extcon_class;
        edev->dev->release = extcon_dev_release;
-        dev_set_name(edev->dev, edev->name ? edev->name : dev_name(dev));
+        dev_set_name(edev->dev, "%s", edev->name ? edev->name : dev_name(dev));
        if (edev->max_supported) {
                char buf[10];
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index b95159b33c39..eb760a218da4 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -551,9 +551,15 @@ static bool dmi_matches(const struct dmi_system_id *dmi)
                int s = dmi->matches[i].slot;
                if (s == DMI_NONE)
                        break;
-                if (dmi_ident[s]
+                if (dmi_ident[s]) {
-                    && strstr(dmi_ident[s], dmi->matches[i].substr))
+                        if (!dmi->matches[i].exact_match &&
-                        continue;
+                            strstr(dmi_ident[s], dmi->matches[i].substr))
+                                continue;
+                        else if (dmi->matches[i].exact_match &&
+                                 !strcmp(dmi_ident[s], dmi->matches[i].substr))
+                                continue;
+                }
                /* No match */
                return false;
        }
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 29412cc89c7a..817f936e2666 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -869,6 +869,22 @@ static const struct dmi_system_id intel_no_lvds[] = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "ESPRIMO Q900"),
                },
        },
+        {
+                .callback = intel_no_lvds_dmi_callback,
+                .ident = "Intel D510MO",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "Intel"),
+                        DMI_EXACT_MATCH(DMI_BOARD_NAME, "D510MO"),
+                },
+        },
+        {
+                .callback = intel_no_lvds_dmi_callback,
+                .ident = "Intel D525MW",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "Intel"),
+                        DMI_EXACT_MATCH(DMI_BOARD_NAME, "D525MW"),
+                },
+        },
        { }     /* terminating entry */
 };
diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
index 5a82b6b75849..af85299f2126 100644
--- a/drivers/gpu/drm/radeon/mkregtable.c
+++ b/drivers/gpu/drm/radeon/mkregtable.c
@@ -373,19 +373,6 @@ static inline void list_splice_tail_init(struct list_head *list,
                pos = pos->next)
 /**
- * __list_for_each      -       iterate over a list
- * @pos:        the &struct list_head to use as a loop cursor.
- * @head:       the head for your list.
- *
- * This variant differs from list_for_each() in that it's the
- * simplest possible list iteration code, no prefetching is done.
- * Use this for code that knows the list to be very short (empty
- * or 1 entry) most of the time.
- */
-#define __list_for_each(pos, head) \
-        for (pos = (head)->next; pos != (head); pos = pos->next)
-/**
 * list_for_each_prev   -       iterate over a list backwards
 * @pos:        the &struct list_head to use as a loop cursor.
 * @head:       the head for your list.
diff --git a/drivers/hsi/hsi.c b/drivers/hsi/hsi.c
index 833dd1afbf46..66d44581e1b1 100644
--- a/drivers/hsi/hsi.c
+++ b/drivers/hsi/hsi.c
@@ -75,7 +75,7 @@ static void hsi_new_client(struct hsi_port *port, struct hsi_board_info *info)
        cl->device.bus = &hsi_bus_type;
        cl->device.parent = &port->device;
        cl->device.release = hsi_client_release;
-        dev_set_name(&cl->device, info->name);
+        dev_set_name(&cl->device, "%s", info->name);
        cl->device.platform_data = info->platform_data;
        if (info->archdata)
                cl->device.archdata = *info->archdata;
diff --git a/drivers/hwmon/adt7470.c b/drivers/hwmon/adt7470.c
index b83bf4bb95eb..0f34bca9f5e5 100644
--- a/drivers/hwmon/adt7470.c
+++ b/drivers/hwmon/adt7470.c
@@ -1285,7 +1285,7 @@ static int adt7470_probe(struct i2c_client *client,
        }
        init_completion(&data->auto_update_stop);
-        data->auto_update = kthread_run(adt7470_update_thread, client,
+        data->auto_update = kthread_run(adt7470_update_thread, client, "%s",
                                        dev_name(data->hwmon_dev));
        if (IS_ERR(data->auto_update)) {
                err = PTR_ERR(data->auto_update);
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 2ff620444930..0b510bafd90e 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1756,7 +1756,7 @@ static int ide_cd_probe(ide_drive_t *drive)
        info->dev.parent = &drive->gendev;
        info->dev.release = ide_cd_release;
-        dev_set_name(&info->dev, dev_name(&drive->gendev));
+        dev_set_name(&info->dev, "%s", dev_name(&drive->gendev));
        if (device_register(&info->dev))
                goto out_free_disk;
diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c
index de86631e767d..838996a0039e 100644
--- a/drivers/ide/ide-gd.c
+++ b/drivers/ide/ide-gd.c
@@ -392,7 +392,7 @@ static int ide_gd_probe(ide_drive_t *drive)
        idkp->dev.parent = &drive->gendev;
        idkp->dev.release = ide_disk_release;
-        dev_set_name(&idkp->dev, dev_name(&drive->gendev));
+        dev_set_name(&idkp->dev, "%s", dev_name(&drive->gendev));
        if (device_register(&idkp->dev))
                goto out_free_disk;
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 068cef0a987a..2a744a91370e 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -545,7 +545,7 @@ static int ide_register_port(ide_hwif_t *hwif)
        int ret;
        /* register with global device tree */
-        dev_set_name(&hwif->gendev, hwif->name);
+        dev_set_name(&hwif->gendev, "%s", hwif->name);
        dev_set_drvdata(&hwif->gendev, hwif);
        if (hwif->gendev.parent == NULL)
                hwif->gendev.parent = hwif->dev;
@@ -559,7 +559,7 @@ static int ide_register_port(ide_hwif_t *hwif)
        }
        hwif->portdev = device_create(ide_port_class, &hwif->gendev,
-                                      MKDEV(0, 0), hwif, hwif->name);
+                                      MKDEV(0, 0), hwif, "%s", hwif->name);
        if (IS_ERR(hwif->portdev)) {
                ret = PTR_ERR(hwif->portdev);
                device_unregister(&hwif->gendev);
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index c6c574bd5f59..1793aea4a7d2 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -1985,7 +1985,7 @@ static int ide_tape_probe(ide_drive_t *drive)
        tape->dev.parent = &drive->gendev;
        tape->dev.release = ide_tape_release;
-        dev_set_name(&tape->dev, dev_name(&drive->gendev));
+        dev_set_name(&tape->dev, "%s", dev_name(&drive->gendev));
        if (device_register(&tape->dev))
                goto out_free_disk;
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index 246fdc151652..99904f7d59e3 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -813,7 +813,7 @@ int ib_device_register_sysfs(struct ib_device *device,
        class_dev->class      = &ib_class;
        class_dev->parent     = device->dma_device;
-        dev_set_name(class_dev, device->name);
+        dev_set_name(class_dev, "%s", device->name);
        dev_set_drvdata(class_dev, device);
        INIT_LIST_HEAD(&device->port_list);
diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c
index b56c9428f3c5..9dd0bc89c3aa 100644
--- a/drivers/infiniband/hw/qib/qib_file_ops.c
+++ b/drivers/infiniband/hw/qib/qib_file_ops.c
@@ -2208,7 +2208,7 @@ int qib_cdev_init(int minor, const char *name,
                goto err_cdev;
        }
-        device = device_create(qib_class, NULL, dev, NULL, name);
+        device = device_create(qib_class, NULL, dev, NULL, "%s", name);
        if (!IS_ERR(device))
                goto done;
        ret = PTR_ERR(device);
diff --git a/drivers/isdn/mISDN/dsp_pipeline.c b/drivers/isdn/mISDN/dsp_pipeline.c
index 88305c9cbff5..8b1a66c6ca8a 100644
--- a/drivers/isdn/mISDN/dsp_pipeline.c
+++ b/drivers/isdn/mISDN/dsp_pipeline.c
@@ -102,7 +102,7 @@ int mISDN_dsp_element_register(struct mISDN_dsp_element *elem)
        entry->dev.class = elements_class;
        entry->dev.release = mISDN_dsp_dev_release;
        dev_set_drvdata(&entry->dev, elem);
-        dev_set_name(&entry->dev, elem->name);
+        dev_set_name(&entry->dev, "%s", elem->name);
        ret = device_register(&entry->dev);
        if (ret) {
                printk(KERN_ERR "%s: failed to register %s\n",
diff --git a/drivers/media/i2c/tvaudio.c b/drivers/media/i2c/tvaudio.c
index b72a59d3216a..e0634c8b7e0b 100644
--- a/drivers/media/i2c/tvaudio.c
+++ b/drivers/media/i2c/tvaudio.c
@@ -2020,7 +2020,8 @@ static int tvaudio_probe(struct i2c_client *client, const struct i2c_device_id *
                /* start async thread */
                chip->wt.function = chip_thread_wake;
                chip->wt.data     = (unsigned long)chip;
-                chip->thread = kthread_run(chip_thread, chip, client->name);
+                chip->thread = kthread_run(chip_thread, chip, "%s",
+                                           client->name);
                if (IS_ERR(chip->thread)) {
                        v4l2_warn(sd, "failed to create kthread\n");
                        chip->thread = NULL;
diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c
index 67b61cf3e03a..004d8ace5019 100644
--- a/drivers/media/pci/cx18/cx18-driver.c
+++ b/drivers/media/pci/cx18/cx18-driver.c
@@ -695,7 +695,7 @@ static int cx18_create_in_workq(struct cx18 *cx)
 {
        snprintf(cx->in_workq_name, sizeof(cx->in_workq_name), "%s-in",
                 cx->v4l2_dev.name);
-        cx->in_work_queue = alloc_ordered_workqueue(cx->in_workq_name, 0);
+        cx->in_work_queue = alloc_ordered_workqueue("%s", 0, cx->in_workq_name);
        if (cx->in_work_queue == NULL) {
                CX18_ERR("Unable to create incoming mailbox handler thread\n");
                return -ENOMEM;
diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
index 07b8460953b6..b809bc868a9f 100644
--- a/drivers/media/pci/ivtv/ivtv-driver.c
+++ b/drivers/media/pci/ivtv/ivtv-driver.c
@@ -753,7 +753,7 @@ static int ivtv_init_struct1(struct ivtv *itv)
        init_kthread_worker(&itv->irq_worker);
        itv->irq_worker_task = kthread_run(kthread_worker_fn, &itv->irq_worker,
-                                           itv->v4l2_dev.name);
+                                           "%s", itv->v4l2_dev.name);
        if (IS_ERR(itv->irq_worker_task)) {
                IVTV_ERR("Could not create ivtv task\n");
                return -1;
diff --git a/drivers/media/platform/vivi.c b/drivers/media/platform/vivi.c
index 85bc314382d3..1d3f11965196 100644
--- a/drivers/media/platform/vivi.c
+++ b/drivers/media/platform/vivi.c
@@ -768,7 +768,8 @@ static int vivi_start_generating(struct vivi_dev *dev)
        dma_q->frame = 0;
        dma_q->ini_jiffies = jiffies;
-        dma_q->kthread = kthread_run(vivi_thread, dev, dev->v4l2_dev.name);
+        dma_q->kthread = kthread_run(vivi_thread, dev, "%s",
+                                     dev->v4l2_dev.name);
        if (IS_ERR(dma_q->kthread)) {
                v4l2_err(&dev->v4l2_dev, "kernel_thread() failed\n");
diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c
index c37d3756d8d2..aeabaa5aedf7 100644
--- a/drivers/memstick/host/jmb38x_ms.c
+++ b/drivers/memstick/host/jmb38x_ms.c
@@ -1046,20 +1046,9 @@ static struct pci_driver jmb38x_ms_driver = {
        .resume = jmb38x_ms_resume
 };
-static int __init jmb38x_ms_init(void)
+module_pci_driver(jmb38x_ms_driver);
-{
-        return pci_register_driver(&jmb38x_ms_driver);
-}
-static void __exit jmb38x_ms_exit(void)
-{
-        pci_unregister_driver(&jmb38x_ms_driver);
-}
 MODULE_AUTHOR("Alex Dubov");
 MODULE_DESCRIPTION("JMicron jmb38x MemoryStick driver");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, jmb38x_ms_id_tbl);
-module_init(jmb38x_ms_init);
-module_exit(jmb38x_ms_exit);
diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
index 9718661c1fb6..1b6e91345222 100644
--- a/drivers/memstick/host/r592.c
+++ b/drivers/memstick/host/r592.c
@@ -884,18 +884,7 @@ static struct pci_driver r852_pci_driver = {
        .driver.pm      = &r592_pm_ops,
 };
-static __init int r592_module_init(void)
+module_pci_driver(r852_pci_driver);
-{
-        return pci_register_driver(&r852_pci_driver);
-}
-static void __exit r592_module_exit(void)
-{
-        pci_unregister_driver(&r852_pci_driver);
-}
-module_init(r592_module_init);
-module_exit(r592_module_exit);
 module_param_named(enable_dma, r592_enable_dma, bool, S_IRUGO);
 MODULE_PARM_DESC(enable_dma, "Enable usage of the DMA (default)");
diff --git a/drivers/message/i2o/driver.c b/drivers/message/i2o/driver.c
index 8a5b2d8f4daf..813eaa33fa14 100644
--- a/drivers/message/i2o/driver.c
+++ b/drivers/message/i2o/driver.c
@@ -84,8 +84,8 @@ int i2o_driver_register(struct i2o_driver *drv)
        osm_debug("Register driver %s\n", drv->name);
        if (drv->event) {
-                drv->event_queue = alloc_workqueue(drv->name,
+                drv->event_queue = alloc_workqueue("%s", WQ_MEM_RECLAIM, 1,
-                                                   WQ_MEM_RECLAIM, 1);
+                                                   drv->name);
                if (!drv->event_queue) {
                        osm_err("Could not initialize event queue for driver "
                                "%s\n", drv->name);
diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c
index c4acac74725c..f74fc0ca2ef9 100644
--- a/drivers/misc/sgi-gru/grufault.c
+++ b/drivers/misc/sgi-gru/grufault.c
@@ -876,8 +876,9 @@ int gru_set_context_option(unsigned long arg)
        switch (req.op) {
        case sco_blade_chiplet:
                /* Select blade/chiplet for GRU context */
-                if (req.val1 < -1 || req.val1 >= GRU_MAX_BLADES || !gru_base[req.val1] ||
+                if (req.val0 < -1 || req.val0 >= GRU_CHIPLETS_PER_HUB ||
-                    req.val0 < -1 || req.val0 >= GRU_CHIPLETS_PER_HUB) {
+                    req.val1 < -1 || req.val1 >= GRU_MAX_BLADES ||
+                    (req.val1 >= 0 && !gru_base[req.val1])) {
                        ret = -EINVAL;
                } else {
                        gts->ts_user_blade_id = req.val1;
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index c400c57c394a..048c823f5c51 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -1151,7 +1151,7 @@ static int __init mtd_bdi_init(struct backing_dev_info *bdi, const char *name)
        ret = bdi_init(bdi);
        if (!ret)
-                ret = bdi_register(bdi, NULL, name);
+                ret = bdi_register(bdi, NULL, "%s", name);
        if (ret)
                bdi_destroy(bdi);
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index a56133585e92..0aaece9107c7 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -1005,7 +1005,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
        if (err)
                goto out_uif;
-        ubi->bgt_thread = kthread_create(ubi_thread, ubi, ubi->bgt_name);
+        ubi->bgt_thread = kthread_create(ubi_thread, ubi, "%s", ubi->bgt_name);
        if (IS_ERR(ubi->bgt_thread)) {
                err = PTR_ERR(ubi->bgt_thread);
                ubi_err("cannot spawn \"%s\", error %d", ubi->bgt_name,
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index f433b594388e..6d1f6ed3113f 100644
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -208,6 +208,17 @@ static int rionet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
                if (nets[rnet->mport->id].active[destid])
                        rionet_queue_tx_msg(skb, ndev,
                                        nets[rnet->mport->id].active[destid]);
+                else {
+                        /*
+                         * If the target device was removed from the list of
+                         * active peers but we still have TX packets targeting
+                         * it just report sending a packet to the target
+                         * (without actual packet transfer).
+                         */
+                        dev_kfree_skb_any(skb);
+                        ndev->stats.tx_packets++;
+                        ndev->stats.tx_bytes += skb->len;
+                }
        }
        spin_unlock_irqrestore(&rnet->tx_lock, flags);
@@ -385,24 +396,28 @@ static int rionet_close(struct net_device *ndev)
        return 0;
 }
-static void rionet_remove(struct rio_dev *rdev)
+static int rionet_remove_dev(struct device *dev, struct subsys_interface *sif)
 {
-        struct net_device *ndev = rio_get_drvdata(rdev);
+        struct rio_dev *rdev = to_rio_dev(dev);
        unsigned char netid = rdev->net->hport->id;
        struct rionet_peer *peer, *tmp;
-        unregister_netdev(ndev);
+        if (dev_rionet_capable(rdev)) {
+                list_for_each_entry_safe(peer, tmp, &nets[netid].peers, node) {
-        free_pages((unsigned long)nets[netid].active, get_order(sizeof(void *) *
+                        if (peer->rdev == rdev) {
-                        RIO_MAX_ROUTE_ENTRIES(rdev->net->hport->sys_size)));
+                                if (nets[netid].active[rdev->destid]) {
-        nets[netid].active = NULL;
+                                        nets[netid].active[rdev->destid] = NULL;
+                                        nets[netid].nact--;
+                                }
-        list_for_each_entry_safe(peer, tmp, &nets[netid].peers, node) {
+                                list_del(&peer->node);
-                list_del(&peer->node);
+                                kfree(peer);
-                kfree(peer);
+                                break;
+                        }
+                }
        }
-        free_netdev(ndev);
+        return 0;
 }
 static void rionet_get_drvinfo(struct net_device *ndev,
@@ -503,12 +518,13 @@ static int rionet_setup_netdev(struct rio_mport *mport, struct net_device *ndev)
 static unsigned long net_table[RIONET_MAX_NETS/sizeof(unsigned long) + 1];
-static int rionet_probe(struct rio_dev *rdev, const struct rio_device_id *id)
+static int rionet_add_dev(struct device *dev, struct subsys_interface *sif)
 {
        int rc = -ENODEV;
        u32 lsrc_ops, ldst_ops;
        struct rionet_peer *peer;
        struct net_device *ndev = NULL;
+        struct rio_dev *rdev = to_rio_dev(dev);
        unsigned char netid = rdev->net->hport->id;
        int oldnet;
@@ -518,8 +534,9 @@ static int rionet_probe(struct rio_dev *rdev, const struct rio_device_id *id)
        oldnet = test_and_set_bit(netid, net_table);
        /*
-         * First time through, make sure local device is rionet
+         * If first time through this net, make sure local device is rionet
-         * capable, setup netdev (will be skipped on later probes)
+         * capable and setup netdev (this step will be skipped in later probes
+         * on the same net).
         */
        if (!oldnet) {
                rio_local_read_config_32(rdev->net->hport, RIO_SRC_OPS_CAR,
@@ -541,6 +558,12 @@ static int rionet_probe(struct rio_dev *rdev, const struct rio_device_id *id)
                }
                nets[netid].ndev = ndev;
                rc = rionet_setup_netdev(rdev->net->hport, ndev);
+                if (rc) {
+                        printk(KERN_ERR "%s: failed to setup netdev (rc=%d)\n",
+                               DRV_NAME, rc);
+                        goto out;
+                }
                INIT_LIST_HEAD(&nets[netid].peers);
                nets[netid].nact = 0;
        } else if (nets[netid].ndev == NULL)
@@ -559,31 +582,61 @@ static int rionet_probe(struct rio_dev *rdev, const struct rio_device_id *id)
                list_add_tail(&peer->node, &nets[netid].peers);
        }
-        rio_set_drvdata(rdev, nets[netid].ndev);
+        return 0;
+out:
-      out:
        return rc;
 }
+#ifdef MODULE
 static struct rio_device_id rionet_id_table[] = {
-        {RIO_DEVICE(RIO_ANY_ID, RIO_ANY_ID)}
+        {RIO_DEVICE(RIO_ANY_ID, RIO_ANY_ID)},
+        { 0, }  /* terminate list */
 };
-static struct rio_driver rionet_driver = {
+MODULE_DEVICE_TABLE(rapidio, rionet_id_table);
-        .name = "rionet",
+#endif
-        .id_table = rionet_id_table,
-        .probe = rionet_probe,
+static struct subsys_interface rionet_interface = {
-        .remove = rionet_remove,
+        .name           = "rionet",
+        .subsys         = &rio_bus_type,
+        .add_dev        = rionet_add_dev,
+        .remove_dev     = rionet_remove_dev,
 };
 static int __init rionet_init(void)
 {
-        return rio_register_driver(&rionet_driver);
+        return subsys_interface_register(&rionet_interface);
 }
 static void __exit rionet_exit(void)
 {
-        rio_unregister_driver(&rionet_driver);
+        struct rionet_private *rnet;
+        struct net_device *ndev;
+        struct rionet_peer *peer, *tmp;
+        int i;
+        for (i = 0; i < RIONET_MAX_NETS; i++) {
+                if (nets[i].ndev != NULL) {
+                        ndev = nets[i].ndev;
+                        rnet = netdev_priv(ndev);
+                        unregister_netdev(ndev);
+                        list_for_each_entry_safe(peer,
+                                                 tmp, &nets[i].peers, node) {
+                                list_del(&peer->node);
+                                kfree(peer);
+                        }
+                        free_pages((unsigned long)nets[i].active,
+                                 get_order(sizeof(void *) *
+                                 RIO_MAX_ROUTE_ENTRIES(rnet->mport->sys_size)));
+                        nets[i].active = NULL;
+                        free_netdev(ndev);
+                }
+        }
+        subsys_interface_unregister(&rionet_interface);
 }
 late_initcall(rionet_init);
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 6125adb520a3..d0adbaf86186 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -1893,7 +1893,8 @@ static int airo_open(struct net_device *dev) {
        if (ai->wifidev != dev) {
                clear_bit(JOB_DIE, &ai->jobs);
-                ai->airo_thread_task = kthread_run(airo_thread, dev, dev->name);
+                ai->airo_thread_task = kthread_run(airo_thread, dev, "%s",
+                                                   dev->name);
                if (IS_ERR(ai->airo_thread_task))
                        return (int)PTR_ERR(ai->airo_thread_task);
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index d96257b79a84..4ed5e45ca1e2 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -8256,7 +8256,7 @@ static  int is_duplicate_packet(struct ipw_priv *priv,
                        u8 *mac = header->addr2;
                        int index = mac[5] % IPW_IBSS_MAC_HASH_SIZE;
-                        __list_for_each(p, &priv->ibss_mac_hash[index]) {
+                        list_for_each(p, &priv->ibss_mac_hash[index]) {
                                entry =
                                    list_entry(p, struct ipw_ibss_seq, list);
                                if (!memcmp(entry->mac, mac, ETH_ALEN))
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 90dc14336980..c8b9ef0c21f8 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1321,7 +1321,7 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
         * Initialize work.
         */
        rt2x00dev->workqueue =
-            alloc_ordered_workqueue(wiphy_name(rt2x00dev->hw->wiphy), 0);
+            alloc_ordered_workqueue("%s", 0, wiphy_name(rt2x00dev->hw->wiphy));
        if (!rt2x00dev->workqueue) {
                retval = -ENOMEM;
                goto exit;
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index af59dd5718e1..a5f223145b0f 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -380,7 +380,7 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw)
        /* <2> work queue */
        rtlpriv->works.hw = hw;
-        rtlpriv->works.rtl_wq = alloc_workqueue(rtlpriv->cfg->name, 0, 0);
+        rtlpriv->works.rtl_wq = alloc_workqueue("%s", 0, 0, rtlpriv->cfg->name);
        INIT_DELAYED_WORK(&rtlpriv->works.watchdog_wq,
                          (void *)rtl_watchdog_wq_callback);
        INIT_DELAYED_WORK(&rtlpriv->works.ips_nic_off_wq,
diff --git a/drivers/parport/share.c b/drivers/parport/share.c
index a848e02e6be3..6a83ee1e9178 100644
--- a/drivers/parport/share.c
+++ b/drivers/parport/share.c
@@ -282,14 +282,13 @@ struct parport *parport_register_port(unsigned long base, int irq, int dma,
        int device;
        char *name;
-        tmp = kmalloc(sizeof(struct parport), GFP_KERNEL);
+        tmp = kzalloc(sizeof(struct parport), GFP_KERNEL);
        if (!tmp) {
                printk(KERN_WARNING "parport: memory squeeze\n");
                return NULL;
        }
        /* Init our structure */
-        memset(tmp, 0, sizeof(struct parport));
        tmp->base = base;
        tmp->irq = irq;
        tmp->dma = dma;
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 5127f3f41821..b2255736ac81 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -773,14 +773,12 @@ static void pcie_shutdown_notification(struct controller *ctrl)
 static int pcie_init_slot(struct controller *ctrl)
 {
        struct slot *slot;
-        char name[32];
        slot = kzalloc(sizeof(*slot), GFP_KERNEL);
        if (!slot)
                return -ENOMEM;
-        snprintf(name, sizeof(name), "pciehp-%u", PSN(ctrl));
+        slot->wq = alloc_workqueue("pciehp-%u", 0, 0, PSN(ctrl));
-        slot->wq = alloc_workqueue(name, 0, 0);
        if (!slot->wq)
                goto abort;
diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c
index 3100c52c837c..d3f757df691c 100644
--- a/drivers/pci/hotplug/shpchp_core.c
+++ b/drivers/pci/hotplug/shpchp_core.c
@@ -128,8 +128,7 @@ static int init_slots(struct controller *ctrl)
                slot->hpc_ops = ctrl->hpc_ops;
                slot->number = ctrl->first_slot + (ctrl->slot_num_inc * i);
-                snprintf(name, sizeof(name), "shpchp-%d", slot->number);
+                slot->wq = alloc_workqueue("shpchp-%d", 0, 0, slot->number);
-                slot->wq = alloc_workqueue(name, 0, 0);
                if (!slot->wq) {
                        retval = -ENOMEM;
                        goto error_info;
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index e4ac38aca580..b13344c59808 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -743,7 +743,7 @@ static int wmi_create_device(const struct guid_block *gblock,
        wblock->dev.class = &wmi_class;
        wmi_gtoa(gblock->guid, guid_string);
-        dev_set_name(&wblock->dev, guid_string);
+        dev_set_name(&wblock->dev, "%s", guid_string);
        dev_set_drvdata(&wblock->dev, wblock);
diff --git a/drivers/pps/clients/pps-gpio.c b/drivers/pps/clients/pps-gpio.c
index d3db26e46489..eae0eda9ff39 100644
--- a/drivers/pps/clients/pps-gpio.c
+++ b/drivers/pps/clients/pps-gpio.c
@@ -33,13 +33,17 @@
 #include <linux/pps-gpio.h>
 #include <linux/gpio.h>
 #include <linux/list.h>
+#include <linux/of_device.h>
+#include <linux/of_gpio.h>
 /* Info for each registered platform device */
 struct pps_gpio_device_data {
        int irq;                        /* IRQ used as PPS source */
        struct pps_device *pps;         /* PPS source device */
        struct pps_source_info info;    /* PPS source information */
-        const struct pps_gpio_platform_data *pdata;
+        bool assert_falling_edge;
+        bool capture_clear;
+        unsigned int gpio_pin;
 };
 /*
@@ -57,46 +61,25 @@ static irqreturn_t pps_gpio_irq_handler(int irq, void *data)
        info = data;
-        rising_edge = gpio_get_value(info->pdata->gpio_pin);
+        rising_edge = gpio_get_value(info->gpio_pin);
-        if ((rising_edge && !info->pdata->assert_falling_edge) ||
+        if ((rising_edge && !info->assert_falling_edge) ||
-                        (!rising_edge && info->pdata->assert_falling_edge))
+                        (!rising_edge && info->assert_falling_edge))
                pps_event(info->pps, &ts, PPS_CAPTUREASSERT, NULL);
-        else if (info->pdata->capture_clear &&
+        else if (info->capture_clear &&
-                        ((rising_edge && info->pdata->assert_falling_edge) ||
+                        ((rising_edge && info->assert_falling_edge) ||
-                         (!rising_edge && !info->pdata->assert_falling_edge)))
+                         (!rising_edge && !info->assert_falling_edge)))
                pps_event(info->pps, &ts, PPS_CAPTURECLEAR, NULL);
        return IRQ_HANDLED;
 }
-static int pps_gpio_setup(struct platform_device *pdev)
-{
-        int ret;
-        const struct pps_gpio_platform_data *pdata = pdev->dev.platform_data;
-        ret = gpio_request(pdata->gpio_pin, pdata->gpio_label);
-        if (ret) {
-                pr_warning("failed to request GPIO %u\n", pdata->gpio_pin);
-                return -EINVAL;
-        }
-        ret = gpio_direction_input(pdata->gpio_pin);
-        if (ret) {
-                pr_warning("failed to set pin direction\n");
-                gpio_free(pdata->gpio_pin);
-                return -EINVAL;
-        }
-        return 0;
-}
 static unsigned long
-get_irqf_trigger_flags(const struct pps_gpio_platform_data *pdata)
+get_irqf_trigger_flags(const struct pps_gpio_device_data *data)
 {
-        unsigned long flags = pdata->assert_falling_edge ?
+        unsigned long flags = data->assert_falling_edge ?
                IRQF_TRIGGER_FALLING : IRQF_TRIGGER_RISING;
-        if (pdata->capture_clear) {
+        if (data->capture_clear) {
                flags |= ((flags & IRQF_TRIGGER_RISING) ?
                                IRQF_TRIGGER_FALLING : IRQF_TRIGGER_RISING);
        }
@@ -107,38 +90,63 @@ get_irqf_trigger_flags(const struct pps_gpio_platform_data *pdata)
 static int pps_gpio_probe(struct platform_device *pdev)
 {
        struct pps_gpio_device_data *data;
-        int irq;
+        const char *gpio_label;
        int ret;
-        int err;
        int pps_default_params;
        const struct pps_gpio_platform_data *pdata = pdev->dev.platform_data;
+        struct device_node *np = pdev->dev.of_node;
+        /* allocate space for device info */
+        data = devm_kzalloc(&pdev->dev, sizeof(struct pps_gpio_device_data),
+                        GFP_KERNEL);
+        if (!data)
+                return -ENOMEM;
+        if (pdata) {
+                data->gpio_pin = pdata->gpio_pin;
+                gpio_label = pdata->gpio_label;
+                data->assert_falling_edge = pdata->assert_falling_edge;
+                data->capture_clear = pdata->capture_clear;
+        } else {
+                ret = of_get_gpio(np, 0);
+                if (ret < 0) {
+                        dev_err(&pdev->dev, "failed to get GPIO from device tree\n");
+                        return ret;
+                }
+                data->gpio_pin = ret;
+                gpio_label = PPS_GPIO_NAME;
+                if (of_get_property(np, "assert-falling-edge", NULL))
+                        data->assert_falling_edge = true;
+        }
        /* GPIO setup */
-        ret = pps_gpio_setup(pdev);
+        ret = devm_gpio_request(&pdev->dev, data->gpio_pin, gpio_label);
-        if (ret)
+        if (ret) {
-                return -EINVAL;
+                dev_err(&pdev->dev, "failed to request GPIO %u\n",
+                        data->gpio_pin);
+                return ret;
+        }
-        /* IRQ setup */
+        ret = gpio_direction_input(data->gpio_pin);
-        irq = gpio_to_irq(pdata->gpio_pin);
+        if (ret) {
-        if (irq < 0) {
+                dev_err(&pdev->dev, "failed to set pin direction\n");
-                pr_err("failed to map GPIO to IRQ: %d\n", irq);
+                return -EINVAL;
-                err = -EINVAL;
-                goto return_error;
        }
-        /* allocate space for device info */
+        /* IRQ setup */
-        data = devm_kzalloc(&pdev->dev, sizeof(struct pps_gpio_device_data),
+        ret = gpio_to_irq(data->gpio_pin);
-                            GFP_KERNEL);
+        if (ret < 0) {
-        if (data == NULL) {
+                dev_err(&pdev->dev, "failed to map GPIO to IRQ: %d\n", ret);
-                err = -ENOMEM;
+                return -EINVAL;
-                goto return_error;
        }
+        data->irq = ret;
        /* initialize PPS specific parts of the bookkeeping data structure. */
        data->info.mode = PPS_CAPTUREASSERT | PPS_OFFSETASSERT |
                PPS_ECHOASSERT | PPS_CANWAIT | PPS_TSFMT_TSPEC;
-        if (pdata->capture_clear)
+        if (data->capture_clear)
                data->info.mode |= PPS_CAPTURECLEAR | PPS_OFFSETCLEAR |
                        PPS_ECHOCLEAR;
        data->info.owner = THIS_MODULE;
@@ -147,77 +155,58 @@ static int pps_gpio_probe(struct platform_device *pdev)
        /* register PPS source */
        pps_default_params = PPS_CAPTUREASSERT | PPS_OFFSETASSERT;
-        if (pdata->capture_clear)
+        if (data->capture_clear)
                pps_default_params |= PPS_CAPTURECLEAR | PPS_OFFSETCLEAR;
        data->pps = pps_register_source(&data->info, pps_default_params);
        if (data->pps == NULL) {
-                pr_err("failed to register IRQ %d as PPS source\n", irq);
+                dev_err(&pdev->dev, "failed to register IRQ %d as PPS source\n",
-                err = -EINVAL;
+                        data->irq);
-                goto return_error;
+                return -EINVAL;
        }
-        data->irq = irq;
-        data->pdata = pdata;
        /* register IRQ interrupt handler */
-        ret = request_irq(irq, pps_gpio_irq_handler,
+        ret = devm_request_irq(&pdev->dev, data->irq, pps_gpio_irq_handler,
-                        get_irqf_trigger_flags(pdata), data->info.name, data);
+                        get_irqf_trigger_flags(data), data->info.name, data);
        if (ret) {
                pps_unregister_source(data->pps);
-                pr_err("failed to acquire IRQ %d\n", irq);
+                dev_err(&pdev->dev, "failed to acquire IRQ %d\n", data->irq);
-                err = -EINVAL;
+                return -EINVAL;
-                goto return_error;
        }
        platform_set_drvdata(pdev, data);
-        dev_info(data->pps->dev, "Registered IRQ %d as PPS source\n", irq);
+        dev_info(data->pps->dev, "Registered IRQ %d as PPS source\n",
+                 data->irq);
        return 0;
-return_error:
-        gpio_free(pdata->gpio_pin);
-        return err;
 }
 static int pps_gpio_remove(struct platform_device *pdev)
 {
        struct pps_gpio_device_data *data = platform_get_drvdata(pdev);
-        const struct pps_gpio_platform_data *pdata = data->pdata;
        platform_set_drvdata(pdev, NULL);
-        free_irq(data->irq, data);
-        gpio_free(pdata->gpio_pin);
        pps_unregister_source(data->pps);
-        pr_info("removed IRQ %d as PPS source\n", data->irq);
+        dev_info(&pdev->dev, "removed IRQ %d as PPS source\n", data->irq);
        return 0;
 }
+static const struct of_device_id pps_gpio_dt_ids[] = {
+        { .compatible = "pps-gpio", },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, pps_gpio_dt_ids);
 static struct platform_driver pps_gpio_driver = {
        .probe          = pps_gpio_probe,
        .remove         = pps_gpio_remove,
        .driver         = {
                .name   = PPS_GPIO_NAME,
-                .owner  = THIS_MODULE
+                .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(pps_gpio_dt_ids),
        },
 };
-static int __init pps_gpio_init(void)
+module_platform_driver(pps_gpio_driver);
-{
-        int ret = platform_driver_register(&pps_gpio_driver);
-        if (ret < 0)
-                pr_err("failed to register platform driver\n");
-        return ret;
-}
-static void __exit pps_gpio_exit(void)
-{
-        platform_driver_unregister(&pps_gpio_driver);
-        pr_debug("unregistered platform driver\n");
-}
-module_init(pps_gpio_init);
-module_exit(pps_gpio_exit);
 MODULE_AUTHOR("Ricardo Martins <rasm@fe.up.pt>");
 MODULE_AUTHOR("James Nuss <jamesnuss@nanometrics.ca>");
 MODULE_DESCRIPTION("Use GPIO pin as PPS source");
diff --git a/drivers/rapidio/Kconfig b/drivers/rapidio/Kconfig
index 5ab056494bbe..3e3be57e9a1a 100644
--- a/drivers/rapidio/Kconfig
+++ b/drivers/rapidio/Kconfig
@@ -67,4 +67,9 @@ config RAPIDIO_ENUM_BASIC
 endchoice
+menu "RapidIO Switch drivers"
+        depends on RAPIDIO
 source "drivers/rapidio/switches/Kconfig"
+endmenu
diff --git a/drivers/rapidio/Makefile b/drivers/rapidio/Makefile
index 3036702ffe8b..6271ada6993f 100644
--- a/drivers/rapidio/Makefile
+++ b/drivers/rapidio/Makefile
@@ -1,7 +1,9 @@
 #
 # Makefile for RapidIO interconnect services
 #
-obj-y += rio.o rio-access.o rio-driver.o rio-sysfs.o
+obj-$(CONFIG_RAPIDIO) += rapidio.o
+rapidio-y := rio.o rio-access.o rio-driver.o rio-sysfs.o
 obj-$(CONFIG_RAPIDIO_ENUM_BASIC) += rio-scan.o
 obj-$(CONFIG_RAPIDIO)           += switches/
diff --git a/drivers/rapidio/devices/Kconfig b/drivers/rapidio/devices/Kconfig
index 12a9d7f7040b..c4cb0877592b 100644
--- a/drivers/rapidio/devices/Kconfig
+++ b/drivers/rapidio/devices/Kconfig
@@ -3,7 +3,7 @@
 #
 config RAPIDIO_TSI721
-        bool "IDT Tsi721 PCI Express SRIO Controller support"
+        tristate "IDT Tsi721 PCI Express SRIO Controller support"
        depends on RAPIDIO && PCIEPORTBUS
        default "n"
        ---help---
diff --git a/drivers/rapidio/devices/Makefile b/drivers/rapidio/devices/Makefile
index 7b62860f34f8..9432c494cf57 100644
--- a/drivers/rapidio/devices/Makefile
+++ b/drivers/rapidio/devices/Makefile
@@ -2,7 +2,6 @@
 # Makefile for RapidIO devices
 #
-obj-$(CONFIG_RAPIDIO_TSI721)    += tsi721.o
+obj-$(CONFIG_RAPIDIO_TSI721)    += tsi721_mport.o
-ifeq ($(CONFIG_RAPIDIO_DMA_ENGINE),y)
+tsi721_mport-y                  := tsi721.o
-obj-$(CONFIG_RAPIDIO_TSI721)    += tsi721_dma.o
+tsi721_mport-$(CONFIG_RAPIDIO_DMA_ENGINE) += tsi721_dma.o
-endif
diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c
index a8b2c23a7ef4..ff7cbf2d28e3 100644
--- a/drivers/rapidio/devices/tsi721.c
+++ b/drivers/rapidio/devices/tsi721.c
@@ -2515,9 +2515,8 @@ static int __init tsi721_init(void)
        return pci_register_driver(&tsi721_driver);
 }
-static void __exit tsi721_exit(void)
-{
-        pci_unregister_driver(&tsi721_driver);
-}
 device_initcall(tsi721_init);
+MODULE_DESCRIPTION("IDT Tsi721 PCIExpress-to-SRIO bridge driver");
+MODULE_AUTHOR("Integrated Device Technology, Inc.");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rapidio/rio-driver.c b/drivers/rapidio/rio-driver.c
index a0c875563d76..3e9b6a78ad18 100644
--- a/drivers/rapidio/rio-driver.c
+++ b/drivers/rapidio/rio-driver.c
@@ -199,6 +199,23 @@ static int rio_match_bus(struct device *dev, struct device_driver *drv)
      out:return 0;
 }
+static int rio_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+        struct rio_dev *rdev;
+        if (!dev)
+                return -ENODEV;
+        rdev = to_rio_dev(dev);
+        if (!rdev)
+                return -ENODEV;
+        if (add_uevent_var(env, "MODALIAS=rapidio:v%04Xd%04Xav%04Xad%04X",
+                           rdev->vid, rdev->did, rdev->asm_vid, rdev->asm_did))
+                return -ENOMEM;
+        return 0;
+}
 struct device rio_bus = {
        .init_name = "rapidio",
 };
@@ -210,6 +227,7 @@ struct bus_type rio_bus_type = {
        .bus_attrs = rio_bus_attrs,
        .probe = rio_device_probe,
        .remove = rio_device_remove,
+        .uevent = rio_uevent,
 };
 /**
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index 4c15dbf81087..d3a6539a77cc 100644
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -406,6 +406,7 @@ static struct rio_dev *rio_setup_device(struct rio_net *net,
                rio_mport_write_config_32(port, destid, hopcount,
                                          RIO_COMPONENT_TAG_CSR, next_comptag);
                rdev->comp_tag = next_comptag++;
+                rdev->do_enum = true;
        }  else {
                rio_mport_read_config_32(port, destid, hopcount,
                                         RIO_COMPONENT_TAG_CSR,
@@ -432,8 +433,8 @@ static struct rio_dev *rio_setup_device(struct rio_net *net,
        /* If a PE has both switch and other functions, show it as a switch */
        if (rio_is_switch(rdev)) {
                rswitch = rdev->rswitch;
-                rswitch->switchid = rdev->comp_tag & RIO_CTAG_UDEVID;
                rswitch->port_ok = 0;
+                spin_lock_init(&rswitch->lock);
                rswitch->route_table = kzalloc(sizeof(u8)*
                                        RIO_MAX_ROUTE_ENTRIES(port->sys_size),
                                        GFP_KERNEL);
@@ -444,12 +445,10 @@ static struct rio_dev *rio_setup_device(struct rio_net *net,
                                rdid++)
                        rswitch->route_table[rdid] = RIO_INVALID_ROUTE;
                dev_set_name(&rdev->dev, "%02x:s:%04x", rdev->net->id,
-                             rswitch->switchid);
+                             rdev->comp_tag & RIO_CTAG_UDEVID);
-                rio_switch_init(rdev, do_enum);
-                if (do_enum && rswitch->clr_table)
+                if (do_enum)
-                        rswitch->clr_table(port, destid, hopcount,
+                        rio_route_clr_table(rdev, RIO_GLOBAL_TABLE, 0);
-                                           RIO_GLOBAL_TABLE);
                list_add_tail(&rswitch->node, &net->switches);
@@ -459,7 +458,7 @@ static struct rio_dev *rio_setup_device(struct rio_net *net,
                        rio_enable_rx_tx_port(port, 0, destid, hopcount, 0);
                dev_set_name(&rdev->dev, "%02x:e:%04x", rdev->net->id,
-                             rdev->destid);
+                             rdev->comp_tag & RIO_CTAG_UDEVID);
        }
        rio_attach_device(rdev);
@@ -533,156 +532,6 @@ rio_sport_is_active(struct rio_mport *port, u16 destid, u8 hopcount, int sport)
 }
 /**
- * rio_lock_device - Acquires host device lock for specified device
- * @port: Master port to send transaction
- * @destid: Destination ID for device/switch
- * @hopcount: Hopcount to reach switch
- * @wait_ms: Max wait time in msec (0 = no timeout)
- *
- * Attepts to acquire host device lock for specified device
- * Returns 0 if device lock acquired or EINVAL if timeout expires.
- */
-static int
-rio_lock_device(struct rio_mport *port, u16 destid, u8 hopcount, int wait_ms)
-{
-        u32 result;
-        int tcnt = 0;
-        /* Attempt to acquire device lock */
-        rio_mport_write_config_32(port, destid, hopcount,
-                                  RIO_HOST_DID_LOCK_CSR, port->host_deviceid);
-        rio_mport_read_config_32(port, destid, hopcount,
-                                 RIO_HOST_DID_LOCK_CSR, &result);
-        while (result != port->host_deviceid) {
-                if (wait_ms != 0 && tcnt == wait_ms) {
-                        pr_debug("RIO: timeout when locking device %x:%x\n",
-                                destid, hopcount);
-                        return -EINVAL;
-                }
-                /* Delay a bit */
-                mdelay(1);
-                tcnt++;
-                /* Try to acquire device lock again */
-                rio_mport_write_config_32(port, destid,
-                        hopcount,
-                        RIO_HOST_DID_LOCK_CSR,
-                        port->host_deviceid);
-                rio_mport_read_config_32(port, destid,
-                        hopcount,
-                        RIO_HOST_DID_LOCK_CSR, &result);
-        }
-        return 0;
-}
-/**
- * rio_unlock_device - Releases host device lock for specified device
- * @port: Master port to send transaction
- * @destid: Destination ID for device/switch
- * @hopcount: Hopcount to reach switch
- *
- * Returns 0 if device lock released or EINVAL if fails.
- */
-static int
-rio_unlock_device(struct rio_mport *port, u16 destid, u8 hopcount)
-{
-        u32 result;
-        /* Release device lock */
-        rio_mport_write_config_32(port, destid,
-                                  hopcount,
-                                  RIO_HOST_DID_LOCK_CSR,
-                                  port->host_deviceid);
-        rio_mport_read_config_32(port, destid, hopcount,
-                RIO_HOST_DID_LOCK_CSR, &result);
-        if ((result & 0xffff) != 0xffff) {
-                pr_debug("RIO: badness when releasing device lock %x:%x\n",
-                         destid, hopcount);
-                return -EINVAL;
-        }
-        return 0;
-}
-/**
- * rio_route_add_entry- Add a route entry to a switch routing table
- * @rdev: RIO device
- * @table: Routing table ID
- * @route_destid: Destination ID to be routed
- * @route_port: Port number to be routed
- * @lock: lock switch device flag
- *
- * Calls the switch specific add_entry() method to add a route entry
- * on a switch. The route table can be specified using the @table
- * argument if a switch has per port routing tables or the normal
- * use is to specific all tables (or the global table) by passing
- * %RIO_GLOBAL_TABLE in @table. Returns %0 on success or %-EINVAL
- * on failure.
- */
-static int
-rio_route_add_entry(struct rio_dev *rdev,
-                    u16 table, u16 route_destid, u8 route_port, int lock)
-{
-        int rc;
-        if (lock) {
-                rc = rio_lock_device(rdev->net->hport, rdev->destid,
-                                     rdev->hopcount, 1000);
-                if (rc)
-                        return rc;
-        }
-        rc = rdev->rswitch->add_entry(rdev->net->hport, rdev->destid,
-                                      rdev->hopcount, table,
-                                      route_destid, route_port);
-        if (lock)
-                rio_unlock_device(rdev->net->hport, rdev->destid,
-                                  rdev->hopcount);
-        return rc;
-}
-/**
- * rio_route_get_entry- Read a route entry in a switch routing table
- * @rdev: RIO device
- * @table: Routing table ID
- * @route_destid: Destination ID to be routed
- * @route_port: Pointer to read port number into
- * @lock: lock switch device flag
- *
- * Calls the switch specific get_entry() method to read a route entry
- * in a switch. The route table can be specified using the @table
- * argument if a switch has per port routing tables or the normal
- * use is to specific all tables (or the global table) by passing
- * %RIO_GLOBAL_TABLE in @table. Returns %0 on success or %-EINVAL
- * on failure.
- */
-static int
-rio_route_get_entry(struct rio_dev *rdev, u16 table,
-                    u16 route_destid, u8 *route_port, int lock)
-{
-        int rc;
-        if (lock) {
-                rc = rio_lock_device(rdev->net->hport, rdev->destid,
-                                     rdev->hopcount, 1000);
-                if (rc)
-                        return rc;
-        }
-        rc = rdev->rswitch->get_entry(rdev->net->hport, rdev->destid,
-                                      rdev->hopcount, table,
-                                      route_destid, route_port);
-        if (lock)
-                rio_unlock_device(rdev->net->hport, rdev->destid,
-                                  rdev->hopcount);
-        return rc;
-}
-/**
 * rio_get_host_deviceid_lock- Reads the Host Device ID Lock CSR on a device
 * @port: Master port to send transaction
 * @hopcount: Number of hops to the device
@@ -1094,12 +943,9 @@ static void rio_update_route_tables(struct rio_net *net)
                                sport = RIO_GET_PORT_NUM(swrdev->swpinfo);
-                                if (rswitch->add_entry) {
+                                rio_route_add_entry(swrdev, RIO_GLOBAL_TABLE,
-                                        rio_route_add_entry(swrdev,
+                                                    destid, sport, 0);
-                                                RIO_GLOBAL_TABLE, destid,
+                                rswitch->route_table[destid] = sport;
-                                                sport, 0);
-                                        rswitch->route_table[destid] = sport;
-                                }
                        }
                }
        }
@@ -1115,8 +961,8 @@ static void rio_update_route_tables(struct rio_net *net)
 static void rio_init_em(struct rio_dev *rdev)
 {
        if (rio_is_switch(rdev) && (rdev->em_efptr) &&
-            (rdev->rswitch->em_init)) {
+            rdev->rswitch->ops && rdev->rswitch->ops->em_init) {
-                rdev->rswitch->em_init(rdev);
+                rdev->rswitch->ops->em_init(rdev);
        }
 }
@@ -1141,7 +987,7 @@ static void rio_pw_enable(struct rio_mport *port, int enable)
 * link, then start recursive peer enumeration. Returns %0 if
 * enumeration succeeds or %-EBUSY if enumeration fails.
 */
-int rio_enum_mport(struct rio_mport *mport, u32 flags)
+static int rio_enum_mport(struct rio_mport *mport, u32 flags)
 {
        struct rio_net *net = NULL;
        int rc = 0;
@@ -1256,7 +1102,7 @@ static void rio_build_route_tables(struct rio_net *net)
 * peer discovery. Returns %0 if discovery succeeds or %-EBUSY
 * on failure.
 */
-int rio_disc_mport(struct rio_mport *mport, u32 flags)
+static int rio_disc_mport(struct rio_mport *mport, u32 flags)
 {
        struct rio_net *net = NULL;
        unsigned long to_end;
@@ -1315,6 +1161,7 @@ bail:
 }
 static struct rio_scan rio_scan_ops = {
+        .owner = THIS_MODULE,
        .enumerate = rio_enum_mport,
        .discover = rio_disc_mport,
 };
diff --git a/drivers/rapidio/rio-sysfs.c b/drivers/rapidio/rio-sysfs.c
index 66d4acd5e18f..9331be646dc3 100644
--- a/drivers/rapidio/rio-sysfs.c
+++ b/drivers/rapidio/rio-sysfs.c
@@ -84,6 +84,15 @@ static ssize_t lnext_show(struct device *dev,
        return str - buf;
 }
+static ssize_t modalias_show(struct device *dev,
+                             struct device_attribute *attr, char *buf)
+{
+        struct rio_dev *rdev = to_rio_dev(dev);
+        return sprintf(buf, "rapidio:v%04Xd%04Xav%04Xad%04X\n",
+                       rdev->vid, rdev->did, rdev->asm_vid, rdev->asm_did);
+}
 struct device_attribute rio_dev_attrs[] = {
        __ATTR_RO(did),
        __ATTR_RO(vid),
@@ -93,6 +102,7 @@ struct device_attribute rio_dev_attrs[] = {
        __ATTR_RO(asm_rev),
        __ATTR_RO(lprev),
        __ATTR_RO(destid),
+        __ATTR_RO(modalias),
        __ATTR_NULL,
 };
@@ -257,8 +267,6 @@ int rio_create_sysfs_dev_files(struct rio_dev *rdev)
                err |= device_create_file(&rdev->dev, &dev_attr_routes);
                err |= device_create_file(&rdev->dev, &dev_attr_lnext);
                err |= device_create_file(&rdev->dev, &dev_attr_hopcount);
-                if (!err && rdev->rswitch->sw_sysfs)
-                        err = rdev->rswitch->sw_sysfs(rdev, RIO_SW_SYSFS_CREATE);
        }
        if (err)
@@ -281,8 +289,6 @@ void rio_remove_sysfs_dev_files(struct rio_dev *rdev)
                device_remove_file(&rdev->dev, &dev_attr_routes);
                device_remove_file(&rdev->dev, &dev_attr_lnext);
                device_remove_file(&rdev->dev, &dev_attr_hopcount);
-                if (rdev->rswitch->sw_sysfs)
-                        rdev->rswitch->sw_sysfs(rdev, RIO_SW_SYSFS_REMOVE);
        }
 }
@@ -290,7 +296,6 @@ static ssize_t bus_scan_store(struct bus_type *bus, const char *buf,
                                size_t count)
 {
        long val;
-        struct rio_mport *port = NULL;
        int rc;
        if (kstrtol(buf, 0, &val) < 0)
@@ -304,21 +309,7 @@ static ssize_t bus_scan_store(struct bus_type *bus, const char *buf,
        if (val < 0 || val >= RIO_MAX_MPORTS)
                return -EINVAL;
-        port = rio_find_mport((int)val);
+        rc = rio_mport_scan((int)val);
-        if (!port) {
-                pr_debug("RIO: %s: mport_%d not available\n",
-                         __func__, (int)val);
-                return -EINVAL;
-        }
-        if (!port->nscan)
-                return -EINVAL;
-        if (port->host_deviceid >= 0)
-                rc = port->nscan->enumerate(port, 0);
-        else
-                rc = port->nscan->discover(port, RIO_SCAN_ENUM_NO_WAIT);
 exit:
        if (!rc)
                rc = count;
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index cb1c08996fbb..f4f30af2df68 100644
--- a/drivers/rapidio/rio.c
+++ b/drivers/rapidio/rio.c
@@ -5,9 +5,8 @@
 * Copyright 2005 MontaVista Software, Inc.
 * Matt Porter <mporter@kernel.crashing.org>
 *
- * Copyright 2009 Integrated Device Technology, Inc.
+ * Copyright 2009 - 2013 Integrated Device Technology, Inc.
 * Alex Bounine <alexandre.bounine@idt.com>
- * - Added Port-Write/Error Management initialization and handling
 *
 * 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
@@ -31,10 +30,22 @@
 #include "rio.h"
+MODULE_DESCRIPTION("RapidIO Subsystem Core");
+MODULE_AUTHOR("Matt Porter <mporter@kernel.crashing.org>");
+MODULE_AUTHOR("Alexandre Bounine <alexandre.bounine@idt.com>");
+MODULE_LICENSE("GPL");
+static int hdid[RIO_MAX_MPORTS];
+static int ids_num;
+module_param_array(hdid, int, &ids_num, 0);
+MODULE_PARM_DESC(hdid,
+        "Destination ID assignment to local RapidIO controllers");
 static LIST_HEAD(rio_devices);
 static DEFINE_SPINLOCK(rio_global_list_lock);
 static LIST_HEAD(rio_mports);
+static LIST_HEAD(rio_scans);
 static DEFINE_MUTEX(rio_mport_list_lock);
 static unsigned char next_portid;
 static DEFINE_SPINLOCK(rio_mmap_lock);
@@ -580,44 +591,6 @@ int rio_set_port_lockout(struct rio_dev *rdev, u32 pnum, int lock)
 EXPORT_SYMBOL_GPL(rio_set_port_lockout);
 /**
- * rio_switch_init - Sets switch operations for a particular vendor switch
- * @rdev: RIO device
- * @do_enum: Enumeration/Discovery mode flag
- *
- * Searches the RIO switch ops table for known switch types. If the vid
- * and did match a switch table entry, then call switch initialization
- * routine to setup switch-specific routines.
- */
-void rio_switch_init(struct rio_dev *rdev, int do_enum)
-{
-        struct rio_switch_ops *cur = __start_rio_switch_ops;
-        struct rio_switch_ops *end = __end_rio_switch_ops;
-        while (cur < end) {
-                if ((cur->vid == rdev->vid) && (cur->did == rdev->did)) {
-                        pr_debug("RIO: calling init routine for %s\n",
-                                 rio_name(rdev));
-                        cur->init_hook(rdev, do_enum);
-                        break;
-                }
-                cur++;
-        }
-        if ((cur >= end) && (rdev->pef & RIO_PEF_STD_RT)) {
-                pr_debug("RIO: adding STD routing ops for %s\n",
-                        rio_name(rdev));
-                rdev->rswitch->add_entry = rio_std_route_add_entry;
-                rdev->rswitch->get_entry = rio_std_route_get_entry;
-                rdev->rswitch->clr_table = rio_std_route_clr_table;
-        }
-        if (!rdev->rswitch->add_entry || !rdev->rswitch->get_entry)
-                printk(KERN_ERR "RIO: missing routing ops for %s\n",
-                       rio_name(rdev));
-}
-EXPORT_SYMBOL_GPL(rio_switch_init);
-/**
 * rio_enable_rx_tx_port - enable input receiver and output transmitter of
 * given port
 * @port: Master port associated with the RIO network
@@ -970,8 +943,8 @@ int rio_inb_pwrite_handler(union rio_pw_msg *pw_msg)
        /*
         * Process the port-write notification from switch
         */
-        if (rdev->rswitch->em_handle)
+        if (rdev->rswitch->ops && rdev->rswitch->ops->em_handle)
-                rdev->rswitch->em_handle(rdev, portnum);
+                rdev->rswitch->ops->em_handle(rdev, portnum);
        rio_read_config_32(rdev,
                        rdev->phys_efptr + RIO_PORT_N_ERR_STS_CSR(portnum),
@@ -1207,8 +1180,9 @@ struct rio_dev *rio_get_device(u16 vid, u16 did, struct rio_dev *from)
 * @route_destid: destID entry in the RT
 * @route_port: destination port for specified destID
 */
-int rio_std_route_add_entry(struct rio_mport *mport, u16 destid, u8 hopcount,
+static int
-                       u16 table, u16 route_destid, u8 route_port)
+rio_std_route_add_entry(struct rio_mport *mport, u16 destid, u8 hopcount,
+                        u16 table, u16 route_destid, u8 route_port)
 {
        if (table == RIO_GLOBAL_TABLE) {
                rio_mport_write_config_32(mport, destid, hopcount,
@@ -1234,8 +1208,9 @@ int rio_std_route_add_entry(struct rio_mport *mport, u16 destid, u8 hopcount,
 * @route_destid: destID entry in the RT
 * @route_port: returned destination port for specified destID
 */
-int rio_std_route_get_entry(struct rio_mport *mport, u16 destid, u8 hopcount,
+static int
-                       u16 table, u16 route_destid, u8 *route_port)
+rio_std_route_get_entry(struct rio_mport *mport, u16 destid, u8 hopcount,
+                        u16 table, u16 route_destid, u8 *route_port)
 {
        u32 result;
@@ -1259,8 +1234,9 @@ int rio_std_route_get_entry(struct rio_mport *mport, u16 destid, u8 hopcount,
 * @hopcount: Number of switch hops to the device
 * @table: routing table ID (global or port-specific)
 */
-int rio_std_route_clr_table(struct rio_mport *mport, u16 destid, u8 hopcount,
+static int
-                       u16 table)
+rio_std_route_clr_table(struct rio_mport *mport, u16 destid, u8 hopcount,
+                        u16 table)
 {
        u32 max_destid = 0xff;
        u32 i, pef, id_inc = 1, ext_cfg = 0;
@@ -1301,6 +1277,234 @@ int rio_std_route_clr_table(struct rio_mport *mport, u16 destid, u8 hopcount,
        return 0;
 }
+/**
+ * rio_lock_device - Acquires host device lock for specified device
+ * @port: Master port to send transaction
+ * @destid: Destination ID for device/switch
+ * @hopcount: Hopcount to reach switch
+ * @wait_ms: Max wait time in msec (0 = no timeout)
+ *
+ * Attepts to acquire host device lock for specified device
+ * Returns 0 if device lock acquired or EINVAL if timeout expires.
+ */
+int rio_lock_device(struct rio_mport *port, u16 destid,
+                    u8 hopcount, int wait_ms)
+{
+        u32 result;
+        int tcnt = 0;
+        /* Attempt to acquire device lock */
+        rio_mport_write_config_32(port, destid, hopcount,
+                                  RIO_HOST_DID_LOCK_CSR, port->host_deviceid);
+        rio_mport_read_config_32(port, destid, hopcount,
+                                 RIO_HOST_DID_LOCK_CSR, &result);
+        while (result != port->host_deviceid) {
+                if (wait_ms != 0 && tcnt == wait_ms) {
+                        pr_debug("RIO: timeout when locking device %x:%x\n",
+                                destid, hopcount);
+                        return -EINVAL;
+                }
+                /* Delay a bit */
+                mdelay(1);
+                tcnt++;
+                /* Try to acquire device lock again */
+                rio_mport_write_config_32(port, destid,
+                        hopcount,
+                        RIO_HOST_DID_LOCK_CSR,
+                        port->host_deviceid);
+                rio_mport_read_config_32(port, destid,
+                        hopcount,
+                        RIO_HOST_DID_LOCK_CSR, &result);
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(rio_lock_device);
+/**
+ * rio_unlock_device - Releases host device lock for specified device
+ * @port: Master port to send transaction
+ * @destid: Destination ID for device/switch
+ * @hopcount: Hopcount to reach switch
+ *
+ * Returns 0 if device lock released or EINVAL if fails.
+ */
+int rio_unlock_device(struct rio_mport *port, u16 destid, u8 hopcount)
+{
+        u32 result;
+        /* Release device lock */
+        rio_mport_write_config_32(port, destid,
+                                  hopcount,
+                                  RIO_HOST_DID_LOCK_CSR,
+                                  port->host_deviceid);
+        rio_mport_read_config_32(port, destid, hopcount,
+                RIO_HOST_DID_LOCK_CSR, &result);
+        if ((result & 0xffff) != 0xffff) {
+                pr_debug("RIO: badness when releasing device lock %x:%x\n",
+                         destid, hopcount);
+                return -EINVAL;
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(rio_unlock_device);
+/**
+ * rio_route_add_entry- Add a route entry to a switch routing table
+ * @rdev: RIO device
+ * @table: Routing table ID
+ * @route_destid: Destination ID to be routed
+ * @route_port: Port number to be routed
+ * @lock: apply a hardware lock on switch device flag (1=lock, 0=no_lock)
+ *
+ * If available calls the switch specific add_entry() method to add a route
+ * entry into a switch routing table. Otherwise uses standard RT update method
+ * as defined by RapidIO specification. A specific routing table can be selected
+ * using the @table argument if a switch has per port routing tables or
+ * the standard (or global) table may be used by passing
+ * %RIO_GLOBAL_TABLE in @table.
+ *
+ * Returns %0 on success or %-EINVAL on failure.
+ */
+int rio_route_add_entry(struct rio_dev *rdev,
+                        u16 table, u16 route_destid, u8 route_port, int lock)
+{
+        int rc = -EINVAL;
+        struct rio_switch_ops *ops = rdev->rswitch->ops;
+        if (lock) {
+                rc = rio_lock_device(rdev->net->hport, rdev->destid,
+                                     rdev->hopcount, 1000);
+                if (rc)
+                        return rc;
+        }
+        spin_lock(&rdev->rswitch->lock);
+        if (ops == NULL || ops->add_entry == NULL) {
+                rc = rio_std_route_add_entry(rdev->net->hport, rdev->destid,
+                                             rdev->hopcount, table,
+                                             route_destid, route_port);
+        } else if (try_module_get(ops->owner)) {
+                rc = ops->add_entry(rdev->net->hport, rdev->destid,
+                                    rdev->hopcount, table, route_destid,
+                                    route_port);
+                module_put(ops->owner);
+        }
+        spin_unlock(&rdev->rswitch->lock);
+        if (lock)
+                rio_unlock_device(rdev->net->hport, rdev->destid,
+                                  rdev->hopcount);
+        return rc;
+}
+EXPORT_SYMBOL_GPL(rio_route_add_entry);
+/**
+ * rio_route_get_entry- Read an entry from a switch routing table
+ * @rdev: RIO device
+ * @table: Routing table ID
+ * @route_destid: Destination ID to be routed
+ * @route_port: Pointer to read port number into
+ * @lock: apply a hardware lock on switch device flag (1=lock, 0=no_lock)
+ *
+ * If available calls the switch specific get_entry() method to fetch a route
+ * entry from a switch routing table. Otherwise uses standard RT read method
+ * as defined by RapidIO specification. A specific routing table can be selected
+ * using the @table argument if a switch has per port routing tables or
+ * the standard (or global) table may be used by passing
+ * %RIO_GLOBAL_TABLE in @table.
+ *
+ * Returns %0 on success or %-EINVAL on failure.
+ */
+int rio_route_get_entry(struct rio_dev *rdev, u16 table,
+                        u16 route_destid, u8 *route_port, int lock)
+{
+        int rc = -EINVAL;
+        struct rio_switch_ops *ops = rdev->rswitch->ops;
+        if (lock) {
+                rc = rio_lock_device(rdev->net->hport, rdev->destid,
+                                     rdev->hopcount, 1000);
+                if (rc)
+                        return rc;
+        }
+        spin_lock(&rdev->rswitch->lock);
+        if (ops == NULL || ops->get_entry == NULL) {
+                rc = rio_std_route_get_entry(rdev->net->hport, rdev->destid,
+                                             rdev->hopcount, table,
+                                             route_destid, route_port);
+        } else if (try_module_get(ops->owner)) {
+                rc = ops->get_entry(rdev->net->hport, rdev->destid,
+                                    rdev->hopcount, table, route_destid,
+                                    route_port);
+                module_put(ops->owner);
+        }
+        spin_unlock(&rdev->rswitch->lock);
+        if (lock)
+                rio_unlock_device(rdev->net->hport, rdev->destid,
+                                  rdev->hopcount);
+        return rc;
+}
+EXPORT_SYMBOL_GPL(rio_route_get_entry);
+/**
+ * rio_route_clr_table - Clear a switch routing table
+ * @rdev: RIO device
+ * @table: Routing table ID
+ * @lock: apply a hardware lock on switch device flag (1=lock, 0=no_lock)
+ *
+ * If available calls the switch specific clr_table() method to clear a switch
+ * routing table. Otherwise uses standard RT write method as defined by RapidIO
+ * specification. A specific routing table can be selected using the @table
+ * argument if a switch has per port routing tables or the standard (or global)
+ * table may be used by passing %RIO_GLOBAL_TABLE in @table.
+ *
+ * Returns %0 on success or %-EINVAL on failure.
+ */
+int rio_route_clr_table(struct rio_dev *rdev, u16 table, int lock)
+{
+        int rc = -EINVAL;
+        struct rio_switch_ops *ops = rdev->rswitch->ops;
+        if (lock) {
+                rc = rio_lock_device(rdev->net->hport, rdev->destid,
+                                     rdev->hopcount, 1000);
+                if (rc)
+                        return rc;
+        }
+        spin_lock(&rdev->rswitch->lock);
+        if (ops == NULL || ops->clr_table == NULL) {
+                rc = rio_std_route_clr_table(rdev->net->hport, rdev->destid,
+                                             rdev->hopcount, table);
+        } else if (try_module_get(ops->owner)) {
+                rc = ops->clr_table(rdev->net->hport, rdev->destid,
+                                    rdev->hopcount, table);
+                module_put(ops->owner);
+        }
+        spin_unlock(&rdev->rswitch->lock);
+        if (lock)
+                rio_unlock_device(rdev->net->hport, rdev->destid,
+                                  rdev->hopcount);
+        return rc;
+}
+EXPORT_SYMBOL_GPL(rio_route_clr_table);
 #ifdef CONFIG_RAPIDIO_DMA_ENGINE
 static bool rio_chan_filter(struct dma_chan *chan, void *arg)
@@ -1410,34 +1614,73 @@ found:
 * rio_register_scan - enumeration/discovery method registration interface
 * @mport_id: mport device ID for which fabric scan routine has to be set
 *            (RIO_MPORT_ANY = set for all available mports)
- * @scan_ops: enumeration/discovery control structure
+ * @scan_ops: enumeration/discovery operations structure
+ *
+ * Registers enumeration/discovery operations with RapidIO subsystem and
+ * attaches it to the specified mport device (or all available mports
+ * if RIO_MPORT_ANY is specified).
 *
- * Assigns enumeration or discovery method to the specified mport device (or all
- * available mports if RIO_MPORT_ANY is specified).
 * Returns error if the mport already has an enumerator attached to it.
- * In case of RIO_MPORT_ANY ignores ports with valid scan routines and returns
+ * In case of RIO_MPORT_ANY skips mports with valid scan routines (no error).
- * an error if was unable to find at least one available mport.
 */
 int rio_register_scan(int mport_id, struct rio_scan *scan_ops)
 {
        struct rio_mport *port;
-        int rc = -EBUSY;
+        struct rio_scan_node *scan;
+        int rc = 0;
-        mutex_lock(&rio_mport_list_lock);
+        pr_debug("RIO: %s for mport_id=%d\n", __func__, mport_id);
-        list_for_each_entry(port, &rio_mports, node) {
-                if (port->id == mport_id || mport_id == RIO_MPORT_ANY) {
-                        if (port->nscan && mport_id == RIO_MPORT_ANY)
-                                continue;
-                        else if (port->nscan)
-                                break;
-                        port->nscan = scan_ops;
+        if ((mport_id != RIO_MPORT_ANY && mport_id >= RIO_MAX_MPORTS) ||
-                        rc = 0;
+            !scan_ops)
+                return -EINVAL;
-                        if (mport_id != RIO_MPORT_ANY)
+        mutex_lock(&rio_mport_list_lock);
-                                break;
+        /*
+         * Check if there is another enumerator already registered for
+         * the same mport ID (including RIO_MPORT_ANY). Multiple enumerators
+         * for the same mport ID are not supported.
+         */
+        list_for_each_entry(scan, &rio_scans, node) {
+                if (scan->mport_id == mport_id) {
+                        rc = -EBUSY;
+                        goto err_out;
                }
        }
+        /*
+         * Allocate and initialize new scan registration node.
+         */
+        scan = kzalloc(sizeof(*scan), GFP_KERNEL);
+        if (!scan) {
+                rc = -ENOMEM;
+                goto err_out;
+        }
+        scan->mport_id = mport_id;
+        scan->ops = scan_ops;
+        /*
+         * Traverse the list of registered mports to attach this new scan.
+         *
+         * The new scan with matching mport ID overrides any previously attached
+         * scan assuming that old scan (if any) is the default one (based on the
+         * enumerator registration check above).
+         * If the new scan is the global one, it will be attached only to mports
+         * that do not have their own individual operations already attached.
+         */
+        list_for_each_entry(port, &rio_mports, node) {
+                if (port->id == mport_id) {
+                        port->nscan = scan_ops;
+                        break;
+                } else if (mport_id == RIO_MPORT_ANY && !port->nscan)
+                        port->nscan = scan_ops;
+        }
+        list_add_tail(&scan->node, &rio_scans);
+err_out:
        mutex_unlock(&rio_mport_list_lock);
        return rc;
@@ -1447,30 +1690,81 @@ EXPORT_SYMBOL_GPL(rio_register_scan);
 /**
 * rio_unregister_scan - removes enumeration/discovery method from mport
 * @mport_id: mport device ID for which fabric scan routine has to be
- *            unregistered (RIO_MPORT_ANY = set for all available mports)
+ *            unregistered (RIO_MPORT_ANY = apply to all mports that use
+ *            the specified scan_ops)
+ * @scan_ops: enumeration/discovery operations structure
 *
 * Removes enumeration or discovery method assigned to the specified mport
- * device (or all available mports if RIO_MPORT_ANY is specified).
+ * device. If RIO_MPORT_ANY is specified, removes the specified operations from
+ * all mports that have them attached.
 */
-int rio_unregister_scan(int mport_id)
+int rio_unregister_scan(int mport_id, struct rio_scan *scan_ops)
 {
        struct rio_mport *port;
+        struct rio_scan_node *scan;
+        pr_debug("RIO: %s for mport_id=%d\n", __func__, mport_id);
+        if (mport_id != RIO_MPORT_ANY && mport_id >= RIO_MAX_MPORTS)
+                return -EINVAL;
        mutex_lock(&rio_mport_list_lock);
-        list_for_each_entry(port, &rio_mports, node) {
-                if (port->id == mport_id || mport_id == RIO_MPORT_ANY) {
+        list_for_each_entry(port, &rio_mports, node)
-                        if (port->nscan)
+                if (port->id == mport_id ||
-                                port->nscan = NULL;
+                    (mport_id == RIO_MPORT_ANY && port->nscan == scan_ops))
-                        if (mport_id != RIO_MPORT_ANY)
+                        port->nscan = NULL;
-                                break;
+        list_for_each_entry(scan, &rio_scans, node)
+                if (scan->mport_id == mport_id) {
+                        list_del(&scan->node);
+                        kfree(scan);
                }
-        }
        mutex_unlock(&rio_mport_list_lock);
        return 0;
 }
 EXPORT_SYMBOL_GPL(rio_unregister_scan);
+/**
+ * rio_mport_scan - execute enumeration/discovery on the specified mport
+ * @mport_id: number (ID) of mport device
+ */
+int rio_mport_scan(int mport_id)
+{
+        struct rio_mport *port = NULL;
+        int rc;
+        mutex_lock(&rio_mport_list_lock);
+        list_for_each_entry(port, &rio_mports, node) {
+                if (port->id == mport_id)
+                        goto found;
+        }
+        mutex_unlock(&rio_mport_list_lock);
+        return -ENODEV;
+found:
+        if (!port->nscan) {
+                mutex_unlock(&rio_mport_list_lock);
+                return -EINVAL;
+        }
+        if (!try_module_get(port->nscan->owner)) {
+                mutex_unlock(&rio_mport_list_lock);
+                return -ENODEV;
+        }
+        mutex_unlock(&rio_mport_list_lock);
+        if (port->host_deviceid >= 0)
+                rc = port->nscan->enumerate(port, 0);
+        else
+                rc = port->nscan->discover(port, RIO_SCAN_ENUM_NO_WAIT);
+        module_put(port->nscan->owner);
+        return rc;
+}
 static void rio_fixup_device(struct rio_dev *dev)
 {
 }
@@ -1499,7 +1793,10 @@ static void disc_work_handler(struct work_struct *_work)
        work = container_of(_work, struct rio_disc_work, work);
        pr_debug("RIO: discovery work for mport %d %s\n",
                 work->mport->id, work->mport->name);
-        work->mport->nscan->discover(work->mport, 0);
+        if (try_module_get(work->mport->nscan->owner)) {
+                work->mport->nscan->discover(work->mport, 0);
+                module_put(work->mport->nscan->owner);
+        }
 }
 int rio_init_mports(void)
@@ -1518,8 +1815,10 @@ int rio_init_mports(void)
        mutex_lock(&rio_mport_list_lock);
        list_for_each_entry(port, &rio_mports, node) {
                if (port->host_deviceid >= 0) {
-                        if (port->nscan)
+                        if (port->nscan && try_module_get(port->nscan->owner)) {
                                port->nscan->enumerate(port, 0);
+                                module_put(port->nscan->owner);
+                        }
                } else
                        n++;
        }
@@ -1533,7 +1832,7 @@ int rio_init_mports(void)
         * for each of them. If the code below fails to allocate needed
         * resources, exit without error to keep results of enumeration
         * process (if any).
-         * TODO: Implement restart of dicovery process for all or
+         * TODO: Implement restart of discovery process for all or
         * individual discovering mports.
         */
        rio_wq = alloc_workqueue("riodisc", 0, 0);
@@ -1559,9 +1858,9 @@ int rio_init_mports(void)
                        n++;
                }
        }
-        mutex_unlock(&rio_mport_list_lock);
        flush_workqueue(rio_wq);
+        mutex_unlock(&rio_mport_list_lock);
        pr_debug("RIO: destroy discovery workqueue\n");
        destroy_workqueue(rio_wq);
        kfree(work);
@@ -1572,26 +1871,18 @@ no_disc:
        return 0;
 }
-static int hdids[RIO_MAX_MPORTS + 1];
 static int rio_get_hdid(int index)
 {
-        if (!hdids[0] || hdids[0] <= index || index >= RIO_MAX_MPORTS)
+        if (ids_num == 0 || ids_num <= index || index >= RIO_MAX_MPORTS)
                return -1;
-        return hdids[index + 1];
+        return hdid[index];
-}
-static int rio_hdid_setup(char *str)
-{
-        (void)get_options(str, ARRAY_SIZE(hdids), hdids);
-        return 1;
 }
-__setup("riohdid=", rio_hdid_setup);
 int rio_register_mport(struct rio_mport *port)
 {
+        struct rio_scan_node *scan = NULL;
        if (next_portid >= RIO_MAX_MPORTS) {
                pr_err("RIO: reached specified max number of mports\n");
                return 1;
@@ -1600,11 +1891,28 @@ int rio_register_mport(struct rio_mport *port)
        port->id = next_portid++;
        port->host_deviceid = rio_get_hdid(port->id);
        port->nscan = NULL;
        mutex_lock(&rio_mport_list_lock);
        list_add_tail(&port->node, &rio_mports);
+        /*
+         * Check if there are any registered enumeration/discovery operations
+         * that have to be attached to the added mport.
+         */
+        list_for_each_entry(scan, &rio_scans, node) {
+                if (port->id == scan->mport_id ||
+                    scan->mport_id == RIO_MPORT_ANY) {
+                        port->nscan = scan->ops;
+                        if (port->id == scan->mport_id)
+                                break;
+                }
+        }
        mutex_unlock(&rio_mport_list_lock);
+        pr_debug("RIO: %s %s id=%d\n", __func__, port->name, port->id);
        return 0;
 }
+EXPORT_SYMBOL_GPL(rio_register_mport);
 EXPORT_SYMBOL_GPL(rio_local_get_device_id);
 EXPORT_SYMBOL_GPL(rio_get_device);
diff --git a/drivers/rapidio/rio.h b/drivers/rapidio/rio.h
index c14f864dea5c..085215cd8502 100644
--- a/drivers/rapidio/rio.h
+++ b/drivers/rapidio/rio.h
@@ -28,52 +28,28 @@ extern u32 rio_mport_get_efb(struct rio_mport *port, int local, u16 destid,
 extern int rio_mport_chk_dev_access(struct rio_mport *mport, u16 destid,
                                    u8 hopcount);
 extern int rio_create_sysfs_dev_files(struct rio_dev *rdev);
-extern int rio_std_route_add_entry(struct rio_mport *mport, u16 destid,
+extern int rio_lock_device(struct rio_mport *port, u16 destid,
-                                   u8 hopcount, u16 table, u16 route_destid,
+                        u8 hopcount, int wait_ms);
-                                   u8 route_port);
+extern int rio_unlock_device(struct rio_mport *port, u16 destid, u8 hopcount);
-extern int rio_std_route_get_entry(struct rio_mport *mport, u16 destid,
+extern int rio_route_add_entry(struct rio_dev *rdev,
-                                   u8 hopcount, u16 table, u16 route_destid,
+                        u16 table, u16 route_destid, u8 route_port, int lock);
-                                   u8 *route_port);
+extern int rio_route_get_entry(struct rio_dev *rdev, u16 table,
-extern int rio_std_route_clr_table(struct rio_mport *mport, u16 destid,
+                        u16 route_destid, u8 *route_port, int lock);
-                                   u8 hopcount, u16 table);
+extern int rio_route_clr_table(struct rio_dev *rdev, u16 table, int lock);
 extern int rio_set_port_lockout(struct rio_dev *rdev, u32 pnum, int lock);
 extern struct rio_dev *rio_get_comptag(u32 comp_tag, struct rio_dev *from);
 extern int rio_add_device(struct rio_dev *rdev);
-extern void rio_switch_init(struct rio_dev *rdev, int do_enum);
 extern int rio_enable_rx_tx_port(struct rio_mport *port, int local, u16 destid,
                                 u8 hopcount, u8 port_num);
 extern int rio_register_scan(int mport_id, struct rio_scan *scan_ops);
-extern int rio_unregister_scan(int mport_id);
+extern int rio_unregister_scan(int mport_id, struct rio_scan *scan_ops);
 extern void rio_attach_device(struct rio_dev *rdev);
 extern struct rio_mport *rio_find_mport(int mport_id);
+extern int rio_mport_scan(int mport_id);
 /* Structures internal to the RIO core code */
 extern struct device_attribute rio_dev_attrs[];
 extern struct bus_attribute rio_bus_attrs[];
-extern struct rio_switch_ops __start_rio_switch_ops[];
-extern struct rio_switch_ops __end_rio_switch_ops[];
-/* Helpers internal to the RIO core code */
-#define DECLARE_RIO_SWITCH_SECTION(section, name, vid, did, init_hook) \
-        static const struct rio_switch_ops __rio_switch_##name __used \
-        __section(section) = { vid, did, init_hook };
-/**
- * DECLARE_RIO_SWITCH_INIT - Registers switch initialization routine
- * @vid: RIO vendor ID
- * @did: RIO device ID
- * @init_hook: Callback that performs switch-specific initialization
- *
- * Manipulating switch route tables and error management in RIO
- * is switch specific. This registers a switch by vendor and device ID with
- * initialization callback for setting up switch operations and (if required)
- * hardware initialization. A &struct rio_switch_ops is initialized with
- * pointer to the init routine and placed into a RIO-specific kernel section.
- */
-#define DECLARE_RIO_SWITCH_INIT(vid, did, init_hook)            \
-        DECLARE_RIO_SWITCH_SECTION(.rio_switch_ops, vid##did, \
-                        vid, did, init_hook)
 #define RIO_GET_DID(size, x)    (size ? (x & 0xffff) : ((x & 0x00ff0000) >> 16))
 #define RIO_SET_DID(size, x)    (size ? (x & 0xffff) : ((x & 0x000000ff) << 16))
diff --git a/drivers/rapidio/switches/Kconfig b/drivers/rapidio/switches/Kconfig
index f47fee5d4563..345841562f95 100644
--- a/drivers/rapidio/switches/Kconfig
+++ b/drivers/rapidio/switches/Kconfig
@@ -2,34 +2,23 @@
 # RapidIO switches configuration
 #
 config RAPIDIO_TSI57X
-        bool "IDT Tsi57x SRIO switches support"
+        tristate "IDT Tsi57x SRIO switches support"
-        depends on RAPIDIO
        ---help---
          Includes support for IDT Tsi57x family of serial RapidIO switches.
 config RAPIDIO_CPS_XX
-        bool "IDT CPS-xx SRIO switches support"
+        tristate "IDT CPS-xx SRIO switches support"
-        depends on RAPIDIO
        ---help---
          Includes support for IDT CPS-16/12/10/8 serial RapidIO switches.
 config RAPIDIO_TSI568
-        bool "Tsi568 SRIO switch support"
+        tristate "Tsi568 SRIO switch support"
-        depends on RAPIDIO
        default n
        ---help---
          Includes support for IDT Tsi568 serial RapidIO switch.
 config RAPIDIO_CPS_GEN2
-        bool "IDT CPS Gen.2 SRIO switch support"
+        tristate "IDT CPS Gen.2 SRIO switch support"
-        depends on RAPIDIO
        default n
        ---help---
          Includes support for ITD CPS Gen.2 serial RapidIO switches.
-config RAPIDIO_TSI500
-        bool "Tsi500 Parallel RapidIO switch support"
-        depends on RAPIDIO
-        default n
-        ---help---
-          Includes support for IDT Tsi500 parallel RapidIO switch.
diff --git a/drivers/rapidio/switches/Makefile b/drivers/rapidio/switches/Makefile
index c4d3acc3c715..051cc6b38188 100644
--- a/drivers/rapidio/switches/Makefile
+++ b/drivers/rapidio/switches/Makefile
@@ -5,5 +5,4 @@
 obj-$(CONFIG_RAPIDIO_TSI57X)    += tsi57x.o
 obj-$(CONFIG_RAPIDIO_CPS_XX)    += idtcps.o
 obj-$(CONFIG_RAPIDIO_TSI568)    += tsi568.o
-obj-$(CONFIG_RAPIDIO_TSI500)    += tsi500.o
 obj-$(CONFIG_RAPIDIO_CPS_GEN2)  += idt_gen2.o
diff --git a/drivers/rapidio/switches/idt_gen2.c b/drivers/rapidio/switches/idt_gen2.c
index 809b7a3336ba..00a71ebb5cac 100644
--- a/drivers/rapidio/switches/idt_gen2.c
+++ b/drivers/rapidio/switches/idt_gen2.c
@@ -11,6 +11,7 @@
 */
 #include <linux/stat.h>
+#include <linux/module.h>
 #include <linux/rio.h>
 #include <linux/rio_drv.h>
 #include <linux/rio_ids.h>
@@ -387,12 +388,12 @@ idtg2_show_errlog(struct device *dev, struct device_attribute *attr, char *buf)
 static DEVICE_ATTR(errlog, S_IRUGO, idtg2_show_errlog, NULL);
-static int idtg2_sysfs(struct rio_dev *rdev, int create)
+static int idtg2_sysfs(struct rio_dev *rdev, bool create)
 {
        struct device *dev = &rdev->dev;
        int err = 0;
-        if (create == RIO_SW_SYSFS_CREATE) {
+        if (create) {
                /* Initialize sysfs entries */
                err = device_create_file(dev, &dev_attr_errlog);
                if (err)
@@ -403,29 +404,90 @@ static int idtg2_sysfs(struct rio_dev *rdev, int create)
        return err;
 }
-static int idtg2_switch_init(struct rio_dev *rdev, int do_enum)
+static struct rio_switch_ops idtg2_switch_ops = {
+        .owner = THIS_MODULE,
+        .add_entry = idtg2_route_add_entry,
+        .get_entry = idtg2_route_get_entry,
+        .clr_table = idtg2_route_clr_table,
+        .set_domain = idtg2_set_domain,
+        .get_domain = idtg2_get_domain,
+        .em_init = idtg2_em_init,
+        .em_handle = idtg2_em_handler,
+};
+static int idtg2_probe(struct rio_dev *rdev, const struct rio_device_id *id)
 {
        pr_debug("RIO: %s for %s\n", __func__, rio_name(rdev));
-        rdev->rswitch->add_entry = idtg2_route_add_entry;
-        rdev->rswitch->get_entry = idtg2_route_get_entry;
+        spin_lock(&rdev->rswitch->lock);
-        rdev->rswitch->clr_table = idtg2_route_clr_table;
-        rdev->rswitch->set_domain = idtg2_set_domain;
+        if (rdev->rswitch->ops) {
-        rdev->rswitch->get_domain = idtg2_get_domain;
+                spin_unlock(&rdev->rswitch->lock);
-        rdev->rswitch->em_init = idtg2_em_init;
+                return -EINVAL;
-        rdev->rswitch->em_handle = idtg2_em_handler;
+        }
-        rdev->rswitch->sw_sysfs = idtg2_sysfs;
+        rdev->rswitch->ops = &idtg2_switch_ops;
-        if (do_enum) {
+        if (rdev->do_enum) {
                /* Ensure that default routing is disabled on startup */
                rio_write_config_32(rdev,
                                    RIO_STD_RTE_DEFAULT_PORT, IDT_NO_ROUTE);
        }
+        /* Create device-specific sysfs attributes */
+        idtg2_sysfs(rdev, true);
+        spin_unlock(&rdev->rswitch->lock);
        return 0;
 }
-DECLARE_RIO_SWITCH_INIT(RIO_VID_IDT, RIO_DID_IDTCPS1848, idtg2_switch_init);
+static void idtg2_remove(struct rio_dev *rdev)
-DECLARE_RIO_SWITCH_INIT(RIO_VID_IDT, RIO_DID_IDTCPS1616, idtg2_switch_init);
+{
-DECLARE_RIO_SWITCH_INIT(RIO_VID_IDT, RIO_DID_IDTVPS1616, idtg2_switch_init);
+        pr_debug("RIO: %s for %s\n", __func__, rio_name(rdev));
-DECLARE_RIO_SWITCH_INIT(RIO_VID_IDT, RIO_DID_IDTSPS1616, idtg2_switch_init);
+        spin_lock(&rdev->rswitch->lock);
-DECLARE_RIO_SWITCH_INIT(RIO_VID_IDT, RIO_DID_IDTCPS1432, idtg2_switch_init);
+        if (rdev->rswitch->ops != &idtg2_switch_ops) {
+                spin_unlock(&rdev->rswitch->lock);
+                return;
+        }
+        rdev->rswitch->ops = NULL;
+        /* Remove device-specific sysfs attributes */
+        idtg2_sysfs(rdev, false);
+        spin_unlock(&rdev->rswitch->lock);
+}
+static struct rio_device_id idtg2_id_table[] = {
+        {RIO_DEVICE(RIO_DID_IDTCPS1848, RIO_VID_IDT)},
+        {RIO_DEVICE(RIO_DID_IDTCPS1616, RIO_VID_IDT)},
+        {RIO_DEVICE(RIO_DID_IDTVPS1616, RIO_VID_IDT)},
+        {RIO_DEVICE(RIO_DID_IDTSPS1616, RIO_VID_IDT)},
+        {RIO_DEVICE(RIO_DID_IDTCPS1432, RIO_VID_IDT)},
+        { 0, }  /* terminate list */
+};
+static struct rio_driver idtg2_driver = {
+        .name = "idt_gen2",
+        .id_table = idtg2_id_table,
+        .probe = idtg2_probe,
+        .remove = idtg2_remove,
+};
+static int __init idtg2_init(void)
+{
+        return rio_register_driver(&idtg2_driver);
+}
+static void __exit idtg2_exit(void)
+{
+        pr_debug("RIO: %s\n", __func__);
+        rio_unregister_driver(&idtg2_driver);
+        pr_debug("RIO: %s done\n", __func__);
+}
+device_initcall(idtg2_init);
+module_exit(idtg2_exit);
+MODULE_DESCRIPTION("IDT CPS Gen.2 Serial RapidIO switch family driver");
+MODULE_AUTHOR("Integrated Device Technology, Inc.");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rapidio/switches/idtcps.c b/drivers/rapidio/switches/idtcps.c
index d06ee2d44b44..7fbb60d31796 100644
--- a/drivers/rapidio/switches/idtcps.c
+++ b/drivers/rapidio/switches/idtcps.c
@@ -13,6 +13,7 @@
 #include <linux/rio.h>
 #include <linux/rio_drv.h>
 #include <linux/rio_ids.h>
+#include <linux/module.h>
 #include "../rio.h"
 #define CPS_DEFAULT_ROUTE       0xde
@@ -118,18 +119,31 @@ idtcps_get_domain(struct rio_mport *mport, u16 destid, u8 hopcount,
        return 0;
 }
-static int idtcps_switch_init(struct rio_dev *rdev, int do_enum)
+static struct rio_switch_ops idtcps_switch_ops = {
+        .owner = THIS_MODULE,
+        .add_entry = idtcps_route_add_entry,
+        .get_entry = idtcps_route_get_entry,
+        .clr_table = idtcps_route_clr_table,
+        .set_domain = idtcps_set_domain,
+        .get_domain = idtcps_get_domain,
+        .em_init = NULL,
+        .em_handle = NULL,
+};
+static int idtcps_probe(struct rio_dev *rdev, const struct rio_device_id *id)
 {
        pr_debug("RIO: %s for %s\n", __func__, rio_name(rdev));
-        rdev->rswitch->add_entry = idtcps_route_add_entry;
-        rdev->rswitch->get_entry = idtcps_route_get_entry;
+        spin_lock(&rdev->rswitch->lock);
-        rdev->rswitch->clr_table = idtcps_route_clr_table;
-        rdev->rswitch->set_domain = idtcps_set_domain;
+        if (rdev->rswitch->ops) {
-        rdev->rswitch->get_domain = idtcps_get_domain;
+                spin_unlock(&rdev->rswitch->lock);
-        rdev->rswitch->em_init = NULL;
+                return -EINVAL;
-        rdev->rswitch->em_handle = NULL;
+        }
-        if (do_enum) {
+        rdev->rswitch->ops = &idtcps_switch_ops;
+        if (rdev->do_enum) {
                /* set TVAL = ~50us */
                rio_write_config_32(rdev,
                        rdev->phys_efptr + RIO_PORT_LINKTO_CTL_CSR, 0x8e << 8);
@@ -138,12 +152,52 @@ static int idtcps_switch_init(struct rio_dev *rdev, int do_enum)
                                    RIO_STD_RTE_DEFAULT_PORT, CPS_NO_ROUTE);
        }
+        spin_unlock(&rdev->rswitch->lock);
        return 0;
 }
-DECLARE_RIO_SWITCH_INIT(RIO_VID_IDT, RIO_DID_IDTCPS6Q, idtcps_switch_init);
+static void idtcps_remove(struct rio_dev *rdev)
-DECLARE_RIO_SWITCH_INIT(RIO_VID_IDT, RIO_DID_IDTCPS8, idtcps_switch_init);
+{
-DECLARE_RIO_SWITCH_INIT(RIO_VID_IDT, RIO_DID_IDTCPS10Q, idtcps_switch_init);
+        pr_debug("RIO: %s for %s\n", __func__, rio_name(rdev));
-DECLARE_RIO_SWITCH_INIT(RIO_VID_IDT, RIO_DID_IDTCPS12, idtcps_switch_init);
+        spin_lock(&rdev->rswitch->lock);
-DECLARE_RIO_SWITCH_INIT(RIO_VID_IDT, RIO_DID_IDTCPS16, idtcps_switch_init);
+        if (rdev->rswitch->ops != &idtcps_switch_ops) {
-DECLARE_RIO_SWITCH_INIT(RIO_VID_IDT, RIO_DID_IDT70K200, idtcps_switch_init);
+                spin_unlock(&rdev->rswitch->lock);
+                return;
+        }
+        rdev->rswitch->ops = NULL;
+        spin_unlock(&rdev->rswitch->lock);
+}
+static struct rio_device_id idtcps_id_table[] = {
+        {RIO_DEVICE(RIO_DID_IDTCPS6Q, RIO_VID_IDT)},
+        {RIO_DEVICE(RIO_DID_IDTCPS8, RIO_VID_IDT)},
+        {RIO_DEVICE(RIO_DID_IDTCPS10Q, RIO_VID_IDT)},
+        {RIO_DEVICE(RIO_DID_IDTCPS12, RIO_VID_IDT)},
+        {RIO_DEVICE(RIO_DID_IDTCPS16, RIO_VID_IDT)},
+        {RIO_DEVICE(RIO_DID_IDT70K200, RIO_VID_IDT)},
+        { 0, }  /* terminate list */
+};
+static struct rio_driver idtcps_driver = {
+        .name = "idtcps",
+        .id_table = idtcps_id_table,
+        .probe = idtcps_probe,
+        .remove = idtcps_remove,
+};
+static int __init idtcps_init(void)
+{
+        return rio_register_driver(&idtcps_driver);
+}
+static void __exit idtcps_exit(void)
+{
+        rio_unregister_driver(&idtcps_driver);
+}
+device_initcall(idtcps_init);
+module_exit(idtcps_exit);
+MODULE_DESCRIPTION("IDT CPS Gen.1 Serial RapidIO switch family driver");
+MODULE_AUTHOR("Integrated Device Technology, Inc.");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rapidio/switches/tsi500.c b/drivers/rapidio/switches/tsi500.c
deleted file mode 100644
index 914eddd5aa42..000000000000
--- a/drivers/rapidio/switches/tsi500.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * RapidIO Tsi500 switch support
- *
- * Copyright 2009-2010 Integrated Device Technology, Inc.
- * Alexandre Bounine <alexandre.bounine@idt.com>
- *  - Modified switch operations initialization.
- *
- * Copyright 2005 MontaVista Software, Inc.
- * Matt Porter <mporter@kernel.crashing.org>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-#include <linux/rio.h>
-#include <linux/rio_drv.h>
-#include <linux/rio_ids.h>
-#include "../rio.h"
-static int
-tsi500_route_add_entry(struct rio_mport *mport, u16 destid, u8 hopcount, u16 table, u16 route_destid, u8 route_port)
-{
-        int i;
-        u32 offset = 0x10000 + 0xa00 + ((route_destid / 2)&~0x3);
-        u32 result;
-        if (table == 0xff) {
-                rio_mport_read_config_32(mport, destid, hopcount, offset, &result);
-                result &= ~(0xf << (4*(route_destid & 0x7)));
-                for (i=0;i<4;i++)
-                        rio_mport_write_config_32(mport, destid, hopcount, offset + (0x20000*i), result | (route_port << (4*(route_destid & 0x7))));
-        }
-        else {
-                rio_mport_read_config_32(mport, destid, hopcount, offset + (0x20000*table), &result);
-                result &= ~(0xf << (4*(route_destid & 0x7)));
-                rio_mport_write_config_32(mport, destid, hopcount, offset + (0x20000*table), result | (route_port << (4*(route_destid & 0x7))));
-        }
-        return 0;
-}
-static int
-tsi500_route_get_entry(struct rio_mport *mport, u16 destid, u8 hopcount, u16 table, u16 route_destid, u8 *route_port)
-{
-        int ret = 0;
-        u32 offset = 0x10000 + 0xa00 + ((route_destid / 2)&~0x3);
-        u32 result;
-        if (table == 0xff)
-                rio_mport_read_config_32(mport, destid, hopcount, offset, &result);
-        else
-                rio_mport_read_config_32(mport, destid, hopcount, offset + (0x20000*table), &result);
-        result &= 0xf << (4*(route_destid & 0x7));
-        *route_port = result >> (4*(route_destid & 0x7));
-        if (*route_port > 3)
-                ret = -1;
-        return ret;
-}
-static int tsi500_switch_init(struct rio_dev *rdev, int do_enum)
-{
-        pr_debug("RIO: %s for %s\n", __func__, rio_name(rdev));
-        rdev->rswitch->add_entry = tsi500_route_add_entry;
-        rdev->rswitch->get_entry = tsi500_route_get_entry;
-        rdev->rswitch->clr_table = NULL;
-        rdev->rswitch->set_domain = NULL;
-        rdev->rswitch->get_domain = NULL;
-        rdev->rswitch->em_init = NULL;
-        rdev->rswitch->em_handle = NULL;
-        return 0;
-}
-DECLARE_RIO_SWITCH_INIT(RIO_VID_TUNDRA, RIO_DID_TSI500, tsi500_switch_init);
diff --git a/drivers/rapidio/switches/tsi568.c b/drivers/rapidio/switches/tsi568.c
index 3994c00aa01f..8a43561b9d17 100644
--- a/drivers/rapidio/switches/tsi568.c
+++ b/drivers/rapidio/switches/tsi568.c
@@ -19,6 +19,7 @@
 #include <linux/rio_drv.h>
 #include <linux/rio_ids.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #include "../rio.h"
 /* Global (broadcast) route registers */
@@ -129,18 +130,70 @@ tsi568_em_init(struct rio_dev *rdev)
        return 0;
 }
-static int tsi568_switch_init(struct rio_dev *rdev, int do_enum)
+static struct rio_switch_ops tsi568_switch_ops = {
+        .owner = THIS_MODULE,
+        .add_entry = tsi568_route_add_entry,
+        .get_entry = tsi568_route_get_entry,
+        .clr_table = tsi568_route_clr_table,
+        .set_domain = NULL,
+        .get_domain = NULL,
+        .em_init = tsi568_em_init,
+        .em_handle = NULL,
+};
+static int tsi568_probe(struct rio_dev *rdev, const struct rio_device_id *id)
 {
        pr_debug("RIO: %s for %s\n", __func__, rio_name(rdev));
-        rdev->rswitch->add_entry = tsi568_route_add_entry;
-        rdev->rswitch->get_entry = tsi568_route_get_entry;
-        rdev->rswitch->clr_table = tsi568_route_clr_table;
-        rdev->rswitch->set_domain = NULL;
-        rdev->rswitch->get_domain = NULL;
-        rdev->rswitch->em_init = tsi568_em_init;
-        rdev->rswitch->em_handle = NULL;
+        spin_lock(&rdev->rswitch->lock);
+        if (rdev->rswitch->ops) {
+                spin_unlock(&rdev->rswitch->lock);
+                return -EINVAL;
+        }
+        rdev->rswitch->ops = &tsi568_switch_ops;
+        spin_unlock(&rdev->rswitch->lock);
        return 0;
 }
-DECLARE_RIO_SWITCH_INIT(RIO_VID_TUNDRA, RIO_DID_TSI568, tsi568_switch_init);
+static void tsi568_remove(struct rio_dev *rdev)
+{
+        pr_debug("RIO: %s for %s\n", __func__, rio_name(rdev));
+        spin_lock(&rdev->rswitch->lock);
+        if (rdev->rswitch->ops != &tsi568_switch_ops) {
+                spin_unlock(&rdev->rswitch->lock);
+                return;
+        }
+        rdev->rswitch->ops = NULL;
+        spin_unlock(&rdev->rswitch->lock);
+}
+static struct rio_device_id tsi568_id_table[] = {
+        {RIO_DEVICE(RIO_DID_TSI568, RIO_VID_TUNDRA)},
+        { 0, }  /* terminate list */
+};
+static struct rio_driver tsi568_driver = {
+        .name = "tsi568",
+        .id_table = tsi568_id_table,
+        .probe = tsi568_probe,
+        .remove = tsi568_remove,
+};
+static int __init tsi568_init(void)
+{
+        return rio_register_driver(&tsi568_driver);
+}
+static void __exit tsi568_exit(void)
+{
+        rio_unregister_driver(&tsi568_driver);
+}
+device_initcall(tsi568_init);
+module_exit(tsi568_exit);
+MODULE_DESCRIPTION("IDT Tsi568 Serial RapidIO switch driver");
+MODULE_AUTHOR("Integrated Device Technology, Inc.");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rapidio/switches/tsi57x.c b/drivers/rapidio/switches/tsi57x.c
index db8b8028988d..42c8b014fe15 100644
--- a/drivers/rapidio/switches/tsi57x.c
+++ b/drivers/rapidio/switches/tsi57x.c
@@ -19,6 +19,7 @@
 #include <linux/rio_drv.h>
 #include <linux/rio_ids.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #include "../rio.h"
 /* Global (broadcast) route registers */
@@ -292,27 +293,79 @@ exit_es:
        return 0;
 }
-static int tsi57x_switch_init(struct rio_dev *rdev, int do_enum)
+static struct rio_switch_ops tsi57x_switch_ops = {
+        .owner = THIS_MODULE,
+        .add_entry = tsi57x_route_add_entry,
+        .get_entry = tsi57x_route_get_entry,
+        .clr_table = tsi57x_route_clr_table,
+        .set_domain = tsi57x_set_domain,
+        .get_domain = tsi57x_get_domain,
+        .em_init = tsi57x_em_init,
+        .em_handle = tsi57x_em_handler,
+};
+static int tsi57x_probe(struct rio_dev *rdev, const struct rio_device_id *id)
 {
        pr_debug("RIO: %s for %s\n", __func__, rio_name(rdev));
-        rdev->rswitch->add_entry = tsi57x_route_add_entry;
-        rdev->rswitch->get_entry = tsi57x_route_get_entry;
+        spin_lock(&rdev->rswitch->lock);
-        rdev->rswitch->clr_table = tsi57x_route_clr_table;
-        rdev->rswitch->set_domain = tsi57x_set_domain;
+        if (rdev->rswitch->ops) {
-        rdev->rswitch->get_domain = tsi57x_get_domain;
+                spin_unlock(&rdev->rswitch->lock);
-        rdev->rswitch->em_init = tsi57x_em_init;
+                return -EINVAL;
-        rdev->rswitch->em_handle = tsi57x_em_handler;
+        }
+        rdev->rswitch->ops = &tsi57x_switch_ops;
-        if (do_enum) {
+        if (rdev->do_enum) {
                /* Ensure that default routing is disabled on startup */
                rio_write_config_32(rdev, RIO_STD_RTE_DEFAULT_PORT,
                                    RIO_INVALID_ROUTE);
        }
+        spin_unlock(&rdev->rswitch->lock);
        return 0;
 }
-DECLARE_RIO_SWITCH_INIT(RIO_VID_TUNDRA, RIO_DID_TSI572, tsi57x_switch_init);
+static void tsi57x_remove(struct rio_dev *rdev)
-DECLARE_RIO_SWITCH_INIT(RIO_VID_TUNDRA, RIO_DID_TSI574, tsi57x_switch_init);
+{
-DECLARE_RIO_SWITCH_INIT(RIO_VID_TUNDRA, RIO_DID_TSI577, tsi57x_switch_init);
+        pr_debug("RIO: %s for %s\n", __func__, rio_name(rdev));
-DECLARE_RIO_SWITCH_INIT(RIO_VID_TUNDRA, RIO_DID_TSI578, tsi57x_switch_init);
+        spin_lock(&rdev->rswitch->lock);
+        if (rdev->rswitch->ops != &tsi57x_switch_ops) {
+                spin_unlock(&rdev->rswitch->lock);
+                return;
+        }
+        rdev->rswitch->ops = NULL;
+        spin_unlock(&rdev->rswitch->lock);
+}
+static struct rio_device_id tsi57x_id_table[] = {
+        {RIO_DEVICE(RIO_DID_TSI572, RIO_VID_TUNDRA)},
+        {RIO_DEVICE(RIO_DID_TSI574, RIO_VID_TUNDRA)},
+        {RIO_DEVICE(RIO_DID_TSI577, RIO_VID_TUNDRA)},
+        {RIO_DEVICE(RIO_DID_TSI578, RIO_VID_TUNDRA)},
+        { 0, }  /* terminate list */
+};
+static struct rio_driver tsi57x_driver = {
+        .name = "tsi57x",
+        .id_table = tsi57x_id_table,
+        .probe = tsi57x_probe,
+        .remove = tsi57x_remove,
+};
+static int __init tsi57x_init(void)
+{
+        return rio_register_driver(&tsi57x_driver);
+}
+static void __exit tsi57x_exit(void)
+{
+        rio_unregister_driver(&tsi57x_driver);
+}
+device_initcall(tsi57x_init);
+module_exit(tsi57x_exit);
+MODULE_DESCRIPTION("IDT Tsi57x Serial RapidIO switch family driver");
+MODULE_AUTHOR("Integrated Device Technology, Inc.");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index b9838130a7b0..9e3498bf302b 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -313,6 +313,15 @@ config RTC_DRV_PALMAS
          This driver can also be built as a module. If so, the module
          will be called rtc-palma.
+config RTC_DRV_PCF2127
+        tristate "NXP PCF2127"
+        help
+          If you say yes here you get support for the NXP PCF2127/29 RTC
+          chips.
+          This driver can also be built as a module. If so, the module
+          will be called rtc-pcf2127.
 config RTC_DRV_PCF8523
        tristate "NXP PCF8523"
        help
@@ -1233,6 +1242,13 @@ config RTC_DRV_SNVS
           This driver can also be built as a module, if so, the module
           will be called "rtc-snvs".
+config RTC_DRV_SIRFSOC
+        tristate "SiRFSOC RTC"
+        depends on ARCH_SIRF
+        help
+          Say "yes" here to support the real time clock on SiRF SOC chips.
+          This driver can also be built as a module called rtc-sirfsoc.
 comment "HID Sensor RTC drivers"
 config RTC_DRV_HID_SENSOR_TIME
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index c33f86f1a69b..d3b4488f48f2 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -83,6 +83,7 @@ obj-$(CONFIG_RTC_DRV_NUC900)	+= rtc-nuc900.o
 obj-$(CONFIG_RTC_DRV_OMAP)      += rtc-omap.o
 obj-$(CONFIG_RTC_DRV_PALMAS)    += rtc-palmas.o
 obj-$(CONFIG_RTC_DRV_PCAP)      += rtc-pcap.o
+obj-$(CONFIG_RTC_DRV_PCF2127)   += rtc-pcf2127.o
 obj-$(CONFIG_RTC_DRV_PCF8523)   += rtc-pcf8523.o
 obj-$(CONFIG_RTC_DRV_PCF8563)   += rtc-pcf8563.o
 obj-$(CONFIG_RTC_DRV_PCF8583)   += rtc-pcf8583.o
@@ -128,3 +129,4 @@ obj-$(CONFIG_RTC_DRV_VT8500)	+= rtc-vt8500.o
 obj-$(CONFIG_RTC_DRV_WM831X)    += rtc-wm831x.o
 obj-$(CONFIG_RTC_DRV_WM8350)    += rtc-wm8350.o
 obj-$(CONFIG_RTC_DRV_X1205)     += rtc-x1205.o
+obj-$(CONFIG_RTC_DRV_SIRFSOC)   += rtc-sirfsoc.o
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index 66385402d20e..02426812bebc 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -38,7 +38,7 @@ static void rtc_device_release(struct device *dev)
 int rtc_hctosys_ret = -ENODEV;
 #endif
-#if defined(CONFIG_PM) && defined(CONFIG_RTC_HCTOSYS_DEVICE)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_RTC_HCTOSYS_DEVICE)
 /*
 * On suspend(), measure the delta between one RTC and the
 * system's wall clock; restore it on resume().
@@ -47,7 +47,7 @@ int rtc_hctosys_ret = -ENODEV;
 static struct timespec old_rtc, old_system, old_delta;
-static int rtc_suspend(struct device *dev, pm_message_t mesg)
+static int rtc_suspend(struct device *dev)
 {
        struct rtc_device       *rtc = to_rtc_device(dev);
        struct rtc_time         tm;
@@ -135,9 +135,10 @@ static int rtc_resume(struct device *dev)
        return 0;
 }
+static SIMPLE_DEV_PM_OPS(rtc_class_dev_pm_ops, rtc_suspend, rtc_resume);
+#define RTC_CLASS_DEV_PM_OPS    (&rtc_class_dev_pm_ops)
 #else
-#define rtc_suspend     NULL
+#define RTC_CLASS_DEV_PM_OPS    NULL
-#define rtc_resume      NULL
 #endif
@@ -336,8 +337,7 @@ static int __init rtc_init(void)
                pr_err("couldn't create class\n");
                return PTR_ERR(rtc_class);
        }
-        rtc_class->suspend = rtc_suspend;
+        rtc_class->pm = RTC_CLASS_DEV_PM_OPS;
-        rtc_class->resume = rtc_resume;
        rtc_dev_init();
        rtc_sysfs_init(rtc_class);
        return 0;
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 42bd57da239d..72c5cdbe0791 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -109,9 +109,9 @@ int rtc_set_mmss(struct rtc_device *rtc, unsigned long secs)
                                err = rtc->ops->set_time(rtc->dev.parent,
                                                &new);
                }
-        }
+        } else {
-        else
                err = -EINVAL;
+        }
        mutex_unlock(&rtc->ops_lock);
        /* A timer might have just expired */
@@ -367,14 +367,14 @@ int rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
        err = mutex_lock_interruptible(&rtc->ops_lock);
        if (err)
                return err;
-        if (rtc->aie_timer.enabled) {
+        if (rtc->aie_timer.enabled)
                rtc_timer_remove(rtc, &rtc->aie_timer);
-        }
        rtc->aie_timer.node.expires = rtc_tm_to_ktime(alarm->time);
        rtc->aie_timer.period = ktime_set(0, 0);
-        if (alarm->enabled) {
+        if (alarm->enabled)
                err = rtc_timer_enqueue(rtc, &rtc->aie_timer);
-        }
        mutex_unlock(&rtc->ops_lock);
        return err;
 }
@@ -698,9 +698,9 @@ retry:
        spin_lock_irqsave(&rtc->irq_task_lock, flags);
        if (rtc->irq_task != NULL && task == NULL)
                err = -EBUSY;
-        if (rtc->irq_task != task)
+        else if (rtc->irq_task != task)
                err = -EACCES;
-        if (!err) {
+        else {
                if (rtc_update_hrtimer(rtc, enabled) < 0) {
                        spin_unlock_irqrestore(&rtc->irq_task_lock, flags);
                        cpu_relax();
@@ -734,9 +734,9 @@ retry:
        spin_lock_irqsave(&rtc->irq_task_lock, flags);
        if (rtc->irq_task != NULL && task == NULL)
                err = -EBUSY;
-        if (rtc->irq_task != task)
+        else if (rtc->irq_task != task)
                err = -EACCES;
-        if (!err) {
+        else {
                rtc->irq_freq = freq;
                if (rtc->pie_enabled && rtc_update_hrtimer(rtc, 1) < 0) {
                        spin_unlock_irqrestore(&rtc->irq_task_lock, flags);
@@ -891,7 +891,7 @@ again:
 *
 * Kernel interface to initializing an rtc_timer.
 */
-void rtc_timer_init(struct rtc_timer *timer, void (*f)(void* p), void* data)
+void rtc_timer_init(struct rtc_timer *timer, void (*f)(void *p), void *data)
 {
        timerqueue_init(&timer->node);
        timer->enabled = 0;
@@ -907,7 +907,7 @@ void rtc_timer_init(struct rtc_timer *timer, void (*f)(void* p), void* data)
 *
 * Kernel interface to set an rtc_timer
 */
-int rtc_timer_start(struct rtc_device *rtc, struct rtc_timer* timer,
+int rtc_timer_start(struct rtc_device *rtc, struct rtc_timer *timer,
                        ktime_t expires, ktime_t period)
 {
        int ret = 0;
@@ -930,7 +930,7 @@ int rtc_timer_start(struct rtc_device *rtc, struct rtc_timer* timer,
 *
 * Kernel interface to cancel an rtc_timer
 */
-int rtc_timer_cancel(struct rtc_device *rtc, struct rtc_timer* timer)
+int rtc_timer_cancel(struct rtc_device *rtc, struct rtc_timer *timer)
 {
        int ret = 0;
        mutex_lock(&rtc->ops_lock);
diff --git a/drivers/rtc/rtc-88pm80x.c b/drivers/rtc/rtc-88pm80x.c
index f3742f364eb8..354c937a5866 100644
--- a/drivers/rtc/rtc-88pm80x.c
+++ b/drivers/rtc/rtc-88pm80x.c
@@ -345,7 +345,6 @@ out:
 static int pm80x_rtc_remove(struct platform_device *pdev)
 {
        struct pm80x_rtc_info *info = platform_get_drvdata(pdev);
-        platform_set_drvdata(pdev, NULL);
        pm80x_free_irq(info->chip, info->irq, info);
        return 0;
 }
diff --git a/drivers/rtc/rtc-88pm860x.c b/drivers/rtc/rtc-88pm860x.c
index 0f2b91bfee37..4e30c85728e5 100644
--- a/drivers/rtc/rtc-88pm860x.c
+++ b/drivers/rtc/rtc-88pm860x.c
@@ -418,7 +418,6 @@ static int pm860x_rtc_remove(struct platform_device *pdev)
        pm860x_set_bits(info->i2c, PM8607_MEAS_EN2, MEAS2_VRTC, 0);
 #endif  /* VRTC_CALIBRATION */
-        platform_set_drvdata(pdev, NULL);
        return 0;
 }
diff --git a/drivers/rtc/rtc-ab3100.c b/drivers/rtc/rtc-ab3100.c
index 47a4f2c4d30e..ff435343ba9f 100644
--- a/drivers/rtc/rtc-ab3100.c
+++ b/drivers/rtc/rtc-ab3100.c
@@ -240,18 +240,11 @@ static int __init ab3100_rtc_probe(struct platform_device *pdev)
        return 0;
 }
-static int __exit ab3100_rtc_remove(struct platform_device *pdev)
-{
-        platform_set_drvdata(pdev, NULL);
-        return 0;
-}
 static struct platform_driver ab3100_rtc_driver = {
        .driver = {
                .name = "ab3100-rtc",
                .owner = THIS_MODULE,
        },
-        .remove  = __exit_p(ab3100_rtc_remove),
 };
 module_platform_driver_probe(ab3100_rtc_driver, ab3100_rtc_probe);
diff --git a/drivers/rtc/rtc-ab8500.c b/drivers/rtc/rtc-ab8500.c
index 63cfa314a39f..727e2f5d14d9 100644
--- a/drivers/rtc/rtc-ab8500.c
+++ b/drivers/rtc/rtc-ab8500.c
@@ -35,6 +35,10 @@
 #define AB8500_RTC_FORCE_BKUP_REG       0x0D
 #define AB8500_RTC_CALIB_REG            0x0E
 #define AB8500_RTC_SWITCH_STAT_REG      0x0F
+#define AB8540_RTC_ALRM_SEC             0x22
+#define AB8540_RTC_ALRM_MIN_LOW_REG     0x23
+#define AB8540_RTC_ALRM_MIN_MID_REG     0x24
+#define AB8540_RTC_ALRM_MIN_HI_REG      0x25
 /* RtcReadRequest bits */
 #define RTC_READ_REQUEST                0x01
@@ -58,6 +62,11 @@ static const u8 ab8500_rtc_alarm_regs[] = {
        AB8500_RTC_ALRM_MIN_LOW_REG
 };
+static const u8 ab8540_rtc_alarm_regs[] = {
+        AB8540_RTC_ALRM_MIN_HI_REG, AB8540_RTC_ALRM_MIN_MID_REG,
+        AB8540_RTC_ALRM_MIN_LOW_REG, AB8540_RTC_ALRM_SEC
+};
 /* Calculate the seconds from 1970 to 01-01-2000 00:00:00 */
 static unsigned long get_elapsed_seconds(int year)
 {
@@ -267,6 +276,42 @@ static int ab8500_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
        return ab8500_rtc_irq_enable(dev, alarm->enabled);
 }
+static int ab8540_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
+{
+        int retval, i;
+        unsigned char buf[ARRAY_SIZE(ab8540_rtc_alarm_regs)];
+        unsigned long mins, secs = 0;
+        if (alarm->time.tm_year < (AB8500_RTC_EPOCH - 1900)) {
+                dev_dbg(dev, "year should be equal to or greater than %d\n",
+                                AB8500_RTC_EPOCH);
+                return -EINVAL;
+        }
+        /* Get the number of seconds since 1970 */
+        rtc_tm_to_time(&alarm->time, &secs);
+        /*
+         * Convert it to the number of seconds since 01-01-2000 00:00:00
+         */
+        secs -= get_elapsed_seconds(AB8500_RTC_EPOCH);
+        mins = secs / 60;
+        buf[3] = secs % 60;
+        buf[2] = mins & 0xFF;
+        buf[1] = (mins >> 8) & 0xFF;
+        buf[0] = (mins >> 16) & 0xFF;
+        /* Set the alarm time */
+        for (i = 0; i < ARRAY_SIZE(ab8540_rtc_alarm_regs); i++) {
+                retval = abx500_set_register_interruptible(dev, AB8500_RTC,
+                        ab8540_rtc_alarm_regs[i], buf[i]);
+                if (retval < 0)
+                        return retval;
+        }
+        return ab8500_rtc_irq_enable(dev, alarm->enabled);
+}
 static int ab8500_rtc_set_calibration(struct device *dev, int calibration)
 {
@@ -389,8 +434,22 @@ static const struct rtc_class_ops ab8500_rtc_ops = {
        .alarm_irq_enable       = ab8500_rtc_irq_enable,
 };
+static const struct rtc_class_ops ab8540_rtc_ops = {
+        .read_time              = ab8500_rtc_read_time,
+        .set_time               = ab8500_rtc_set_time,
+        .read_alarm             = ab8500_rtc_read_alarm,
+        .set_alarm              = ab8540_rtc_set_alarm,
+        .alarm_irq_enable       = ab8500_rtc_irq_enable,
+};
+static struct platform_device_id ab85xx_rtc_ids[] = {
+        { "ab8500-rtc", (kernel_ulong_t)&ab8500_rtc_ops, },
+        { "ab8540-rtc", (kernel_ulong_t)&ab8540_rtc_ops, },
+};
 static int ab8500_rtc_probe(struct platform_device *pdev)
 {
+        const struct platform_device_id *platid = platform_get_device_id(pdev);
        int err;
        struct rtc_device *rtc;
        u8 rtc_ctrl;
@@ -423,7 +482,8 @@ static int ab8500_rtc_probe(struct platform_device *pdev)
        device_init_wakeup(&pdev->dev, true);
        rtc = devm_rtc_device_register(&pdev->dev, "ab8500-rtc",
-                                        &ab8500_rtc_ops, THIS_MODULE);
+                                (struct rtc_class_ops *)platid->driver_data,
+                                THIS_MODULE);
        if (IS_ERR(rtc)) {
                dev_err(&pdev->dev, "Registration failed\n");
                err = PTR_ERR(rtc);
@@ -451,8 +511,6 @@ static int ab8500_rtc_remove(struct platform_device *pdev)
 {
        ab8500_sysfs_rtc_unregister(&pdev->dev);
-        platform_set_drvdata(pdev, NULL);
        return 0;
 }
@@ -463,6 +521,7 @@ static struct platform_driver ab8500_rtc_driver = {
        },
        .probe  = ab8500_rtc_probe,
        .remove = ab8500_rtc_remove,
+        .id_table = ab85xx_rtc_ids,
 };
 module_platform_driver(ab8500_rtc_driver);
diff --git a/drivers/rtc/rtc-at32ap700x.c b/drivers/rtc/rtc-at32ap700x.c
index f47fbb5eee8b..3161ab5263ed 100644
--- a/drivers/rtc/rtc-at32ap700x.c
+++ b/drivers/rtc/rtc-at32ap700x.c
@@ -141,7 +141,7 @@ static int at32_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
        spin_lock_irq(&rtc->lock);
-        if(enabled) {
+        if (enabled) {
                if (rtc_readl(rtc, VAL) > rtc->alarm_time) {
                        ret = -EINVAL;
                        goto out;
@@ -212,23 +212,20 @@ static int __init at32_rtc_probe(struct platform_device *pdev)
        regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!regs) {
                dev_dbg(&pdev->dev, "no mmio resource defined\n");
-                ret = -ENXIO;
+                return -ENXIO;
-                goto out;
        }
        irq = platform_get_irq(pdev, 0);
        if (irq <= 0) {
                dev_dbg(&pdev->dev, "could not get irq\n");
-                ret = -ENXIO;
+                return -ENXIO;
-                goto out;
        }
        rtc->irq = irq;
        rtc->regs = devm_ioremap(&pdev->dev, regs->start, resource_size(regs));
        if (!rtc->regs) {
-                ret = -ENOMEM;
                dev_dbg(&pdev->dev, "could not map I/O memory\n");
-                goto out;
+                return -ENOMEM;
        }
        spin_lock_init(&rtc->lock);
@@ -249,7 +246,7 @@ static int __init at32_rtc_probe(struct platform_device *pdev)
                                "rtc", rtc);
        if (ret) {
                dev_dbg(&pdev->dev, "could not request irq %d\n", irq);
-                goto out;
+                return ret;
        }
        platform_set_drvdata(pdev, rtc);
@@ -258,8 +255,7 @@ static int __init at32_rtc_probe(struct platform_device *pdev)
                                &at32_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc->rtc)) {
                dev_dbg(&pdev->dev, "could not register rtc device\n");
-                ret = PTR_ERR(rtc->rtc);
+                return PTR_ERR(rtc->rtc);
-                goto out;
        }
        device_init_wakeup(&pdev->dev, 1);
@@ -268,18 +264,12 @@ static int __init at32_rtc_probe(struct platform_device *pdev)
                        (unsigned long)rtc->regs, rtc->irq);
        return 0;
-out:
-        platform_set_drvdata(pdev, NULL);
-        return ret;
 }
 static int __exit at32_rtc_remove(struct platform_device *pdev)
 {
        device_init_wakeup(&pdev->dev, 0);
-        platform_set_drvdata(pdev, NULL);
        return 0;
 }
diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c
index f296f3f7db9b..741892632ae0 100644
--- a/drivers/rtc/rtc-at91rm9200.c
+++ b/drivers/rtc/rtc-at91rm9200.c
@@ -31,8 +31,7 @@
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/uaccess.h>
-#include <asm/uaccess.h>
 #include "rtc-at91rm9200.h"
@@ -439,7 +438,6 @@ static int __exit at91_rtc_remove(struct platform_device *pdev)
        rtc_device_unregister(rtc);
        iounmap(at91_rtc_regs);
-        platform_set_drvdata(pdev, NULL);
        return 0;
 }
diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c
index b60a34cb145a..309b8b342d9c 100644
--- a/drivers/rtc/rtc-at91sam9.c
+++ b/drivers/rtc/rtc-at91sam9.c
@@ -324,16 +324,14 @@ static int at91_rtc_probe(struct platform_device *pdev)
        rtc->rtt = devm_ioremap(&pdev->dev, r->start, resource_size(r));
        if (!rtc->rtt) {
                dev_err(&pdev->dev, "failed to map registers, aborting.\n");
-                ret = -ENOMEM;
+                return -ENOMEM;
-                goto fail;
        }
        rtc->gpbr = devm_ioremap(&pdev->dev, r_gpbr->start,
                                resource_size(r_gpbr));
        if (!rtc->gpbr) {
                dev_err(&pdev->dev, "failed to map gpbr registers, aborting.\n");
-                ret = -ENOMEM;
+                return -ENOMEM;
-                goto fail;
        }
        mr = rtt_readl(rtc, MR);
@@ -350,17 +348,15 @@ static int at91_rtc_probe(struct platform_device *pdev)
        rtc->rtcdev = devm_rtc_device_register(&pdev->dev, pdev->name,
                                        &at91_rtc_ops, THIS_MODULE);
-        if (IS_ERR(rtc->rtcdev)) {
+        if (IS_ERR(rtc->rtcdev))
-                ret = PTR_ERR(rtc->rtcdev);
+                return PTR_ERR(rtc->rtcdev);
-                goto fail;
-        }
        /* register irq handler after we know what name we'll use */
        ret = devm_request_irq(&pdev->dev, rtc->irq, at91_rtc_interrupt,
                                IRQF_SHARED, dev_name(&rtc->rtcdev->dev), rtc);
        if (ret) {
                dev_dbg(&pdev->dev, "can't share IRQ %d?\n", rtc->irq);
-                goto fail;
+                return ret;
        }
        /* NOTE:  sam9260 rev A silicon has a ROM bug which resets the
@@ -374,10 +370,6 @@ static int at91_rtc_probe(struct platform_device *pdev)
                                dev_name(&rtc->rtcdev->dev));
        return 0;
-fail:
-        platform_set_drvdata(pdev, NULL);
-        return ret;
 }
 /*
@@ -391,7 +383,6 @@ static int at91_rtc_remove(struct platform_device *pdev)
        /* disable all interrupts */
        rtt_writel(rtc, MR, mr & ~(AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN));
-        platform_set_drvdata(pdev, NULL);
        return 0;
 }
diff --git a/drivers/rtc/rtc-au1xxx.c b/drivers/rtc/rtc-au1xxx.c
index 7995abc391fc..ed526a192ce0 100644
--- a/drivers/rtc/rtc-au1xxx.c
+++ b/drivers/rtc/rtc-au1xxx.c
@@ -116,19 +116,11 @@ out_err:
        return ret;
 }
-static int au1xtoy_rtc_remove(struct platform_device *pdev)
-{
-        platform_set_drvdata(pdev, NULL);
-        return 0;
-}
 static struct platform_driver au1xrtc_driver = {
        .driver         = {
                .name   = "rtc-au1xxx",
                .owner  = THIS_MODULE,
        },
-        .remove         = au1xtoy_rtc_remove,
 };
 module_platform_driver_probe(au1xrtc_driver, au1xtoy_rtc_probe);
diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c
index ad44ec5dc29a..0c53f452849d 100644
--- a/drivers/rtc/rtc-bfin.c
+++ b/drivers/rtc/rtc-bfin.c
@@ -391,7 +391,6 @@ static int bfin_rtc_remove(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        bfin_rtc_reset(dev, 0);
-        platform_set_drvdata(pdev, NULL);
        return 0;
 }
diff --git a/drivers/rtc/rtc-bq32k.c b/drivers/rtc/rtc-bq32k.c
index fea78bc713ca..c74bf0dc52cc 100644
--- a/drivers/rtc/rtc-bq32k.c
+++ b/drivers/rtc/rtc-bq32k.c
@@ -163,11 +163,6 @@ static int bq32k_probe(struct i2c_client *client,
        return 0;
 }
-static int bq32k_remove(struct i2c_client *client)
-{
-        return 0;
-}
 static const struct i2c_device_id bq32k_id[] = {
        { "bq32000", 0 },
        { }
@@ -180,7 +175,6 @@ static struct i2c_driver bq32k_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = bq32k_probe,
-        .remove         = bq32k_remove,
        .id_table       = bq32k_id,
 };
diff --git a/drivers/rtc/rtc-bq4802.c b/drivers/rtc/rtc-bq4802.c
index af2886784a7b..fc0ff87aa5df 100644
--- a/drivers/rtc/rtc-bq4802.c
+++ b/drivers/rtc/rtc-bq4802.c
@@ -186,13 +186,6 @@ out:
 }
-static int bq4802_remove(struct platform_device *pdev)
-{
-        platform_set_drvdata(pdev, NULL);
-        return 0;
-}
 /* work with hotplug and coldplug */
 MODULE_ALIAS("platform:rtc-bq4802");
@@ -202,7 +195,6 @@ static struct platform_driver bq4802_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = bq4802_probe,
-        .remove         = bq4802_remove,
 };
 module_platform_driver(bq4802_driver);
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index f1cb706445c7..be06d7150de5 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -326,7 +326,7 @@ static void cmos_irq_disable(struct cmos_rtc *cmos, unsigned char mask)
 static int cmos_set_alarm(struct device *dev, struct rtc_wkalrm *t)
 {
        struct cmos_rtc *cmos = dev_get_drvdata(dev);
-       unsigned char   mon, mday, hrs, min, sec, rtc_control;
+        unsigned char mon, mday, hrs, min, sec, rtc_control;
        if (!is_valid_irq(cmos->irq))
                return -EIO;
@@ -556,17 +556,24 @@ static irqreturn_t cmos_interrupt(int irq, void *p)
        rtc_control = CMOS_READ(RTC_CONTROL);
        if (is_hpet_enabled())
                irqstat = (unsigned long)irq & 0xF0;
-        irqstat &= (rtc_control & RTC_IRQMASK) | RTC_IRQF;
+        /* If we were suspended, RTC_CONTROL may not be accurate since the
+         * bios may have cleared it.
+         */
+        if (!cmos_rtc.suspend_ctrl)
+                irqstat &= (rtc_control & RTC_IRQMASK) | RTC_IRQF;
+        else
+                irqstat &= (cmos_rtc.suspend_ctrl & RTC_IRQMASK) | RTC_IRQF;
        /* All Linux RTC alarms should be treated as if they were oneshot.
         * Similar code may be needed in system wakeup paths, in case the
         * alarm woke the system.
         */
        if (irqstat & RTC_AIE) {
+                cmos_rtc.suspend_ctrl &= ~RTC_AIE;
                rtc_control &= ~RTC_AIE;
                CMOS_WRITE(rtc_control, RTC_CONTROL);
                hpet_mask_rtc_irq_bit(RTC_AIE);
                CMOS_READ(RTC_INTR_FLAGS);
        }
        spin_unlock(&rtc_lock);
@@ -691,7 +698,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
        /* FIXME:
         * <asm-generic/rtc.h> doesn't know 12-hour mode either.
         */
-       if (is_valid_irq(rtc_irq) && !(rtc_control & RTC_24H)) {
+        if (is_valid_irq(rtc_irq) && !(rtc_control & RTC_24H)) {
                dev_warn(dev, "only 24-hr supported\n");
                retval = -ENXIO;
                goto cleanup1;
@@ -839,21 +846,23 @@ static inline int cmos_poweroff(struct device *dev)
 static int cmos_resume(struct device *dev)
 {
        struct cmos_rtc *cmos = dev_get_drvdata(dev);
-        unsigned char   tmp = cmos->suspend_ctrl;
+        unsigned char tmp;
+        if (cmos->enabled_wake) {
+                if (cmos->wake_off)
+                        cmos->wake_off(dev);
+                else
+                        disable_irq_wake(cmos->irq);
+                cmos->enabled_wake = 0;
+        }
+        spin_lock_irq(&rtc_lock);
+        tmp = cmos->suspend_ctrl;
+        cmos->suspend_ctrl = 0;
        /* re-enable any irqs previously active */
        if (tmp & RTC_IRQMASK) {
                unsigned char   mask;
-                if (cmos->enabled_wake) {
-                        if (cmos->wake_off)
-                                cmos->wake_off(dev);
-                        else
-                                disable_irq_wake(cmos->irq);
-                        cmos->enabled_wake = 0;
-                }
-                spin_lock_irq(&rtc_lock);
                if (device_may_wakeup(dev))
                        hpet_rtc_timer_init();
@@ -873,8 +882,8 @@ static int cmos_resume(struct device *dev)
                        tmp &= ~RTC_AIE;
                        hpet_mask_rtc_irq_bit(RTC_AIE);
                } while (mask & RTC_AIE);
-                spin_unlock_irq(&rtc_lock);
        }
+        spin_unlock_irq(&rtc_lock);
        dev_dbg(dev, "resume, ctrl %02x\n", tmp);
@@ -991,7 +1000,7 @@ static int cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
 {
        cmos_wake_setup(&pnp->dev);
-        if (pnp_port_start(pnp,0) == 0x70 && !pnp_irq_valid(pnp,0))
+        if (pnp_port_start(pnp, 0) == 0x70 && !pnp_irq_valid(pnp, 0))
                /* Some machines contain a PNP entry for the RTC, but
                 * don't define the IRQ. It should always be safe to
                 * hardcode it in these cases
diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c
index ad6863a76af9..73f157519dff 100644
--- a/drivers/rtc/rtc-coh901331.c
+++ b/drivers/rtc/rtc-coh901331.c
@@ -152,12 +152,10 @@ static struct rtc_class_ops coh901331_ops = {
 static int __exit coh901331_remove(struct platform_device *pdev)
 {
-        struct coh901331_port *rtap = dev_get_drvdata(&pdev->dev);
+        struct coh901331_port *rtap = platform_get_drvdata(pdev);
-        if (rtap) {
+        if (rtap)
                clk_unprepare(rtap->clk);
-                platform_set_drvdata(pdev, NULL);
-        }
        return 0;
 }
@@ -220,7 +218,6 @@ static int __init coh901331_probe(struct platform_device *pdev)
        return 0;
 out_no_rtc:
-        platform_set_drvdata(pdev, NULL);
        clk_unprepare(rtap->clk);
        return ret;
 }
@@ -267,7 +264,7 @@ static SIMPLE_DEV_PM_OPS(coh901331_pm_ops, coh901331_suspend, coh901331_resume);
 static void coh901331_shutdown(struct platform_device *pdev)
 {
-        struct coh901331_port *rtap = dev_get_drvdata(&pdev->dev);
+        struct coh901331_port *rtap = platform_get_drvdata(pdev);
        clk_enable(rtap->clk);
        writel(0, rtap->virtbase + COH901331_IRQ_MASK);
diff --git a/drivers/rtc/rtc-da9052.c b/drivers/rtc/rtc-da9052.c
index 7286b279cf2d..9c8c19441cc6 100644
--- a/drivers/rtc/rtc-da9052.c
+++ b/drivers/rtc/rtc-da9052.c
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/rtc.h>
+#include <linux/err.h>
 #include <linux/mfd/da9052/da9052.h>
 #include <linux/mfd/da9052/reg.h>
@@ -249,22 +250,11 @@ static int da9052_rtc_probe(struct platform_device *pdev)
        rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
                                       &da9052_rtc_ops, THIS_MODULE);
-        if (IS_ERR(rtc->rtc))
+        return PTR_RET(rtc->rtc);
-                return PTR_ERR(rtc->rtc);
-        return 0;
-}
-static int da9052_rtc_remove(struct platform_device *pdev)
-{
-        platform_set_drvdata(pdev, NULL);
-        return 0;
 }
 static struct platform_driver da9052_rtc_driver = {
        .probe  = da9052_rtc_probe,
-        .remove = da9052_rtc_remove,
        .driver = {
                .name   = "da9052-rtc",
                .owner  = THIS_MODULE,
diff --git a/drivers/rtc/rtc-da9055.c b/drivers/rtc/rtc-da9055.c
index 73858ca9709a..e00642b61076 100644
--- a/drivers/rtc/rtc-da9055.c
+++ b/drivers/rtc/rtc-da9055.c
@@ -315,13 +315,6 @@ err_rtc:
 }
-static int da9055_rtc_remove(struct platform_device *pdev)
-{
-        platform_set_drvdata(pdev, NULL);
-        return 0;
-}
 #ifdef CONFIG_PM
 /* Turn off the alarm if it should not be a wake source. */
 static int da9055_rtc_suspend(struct device *dev)
@@ -394,7 +387,6 @@ static const struct dev_pm_ops da9055_rtc_pm_ops = {
 static struct platform_driver da9055_rtc_driver = {
        .probe  = da9055_rtc_probe,
-        .remove = da9055_rtc_remove,
        .driver = {
                .name   = "da9055-rtc",
                .owner  = THIS_MODULE,
diff --git a/drivers/rtc/rtc-davinci.c b/drivers/rtc/rtc-davinci.c
index a55048c3e26f..24677ef8c39a 100644
--- a/drivers/rtc/rtc-davinci.c
+++ b/drivers/rtc/rtc-davinci.c
@@ -117,7 +117,7 @@
 static DEFINE_SPINLOCK(davinci_rtc_lock);
 struct davinci_rtc {
-        struct rtc_device               *rtc;
+        struct rtc_device               *rtc;
        void __iomem                    *base;
        resource_size_t                 pbase;
        size_t                          base_size;
@@ -526,10 +526,9 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
        davinci_rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
                                    &davinci_rtc_ops, THIS_MODULE);
        if (IS_ERR(davinci_rtc->rtc)) {
-                ret = PTR_ERR(davinci_rtc->rtc);
                dev_err(dev, "unable to register RTC device, err %d\n",
                                ret);
-                goto fail1;
+                return PTR_ERR(davinci_rtc->rtc);
        }
        rtcif_write(davinci_rtc, PRTCIF_INTFLG_RTCSS, PRTCIF_INTFLG);
@@ -543,7 +542,7 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
                          0, "davinci_rtc", davinci_rtc);
        if (ret < 0) {
                dev_err(dev, "unable to register davinci RTC interrupt\n");
-                goto fail1;
+                return ret;
        }
        /* Enable interrupts */
@@ -556,10 +555,6 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
        device_init_wakeup(&pdev->dev, 0);
        return 0;
-fail1:
-        platform_set_drvdata(pdev, NULL);
-        return ret;
 }
 static int __exit davinci_rtc_remove(struct platform_device *pdev)
@@ -570,8 +565,6 @@ static int __exit davinci_rtc_remove(struct platform_device *pdev)
        rtcif_write(davinci_rtc, 0, PRTCIF_INTEN);
-        platform_set_drvdata(pdev, NULL);
        return 0;
 }
diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c
index 1e1ca63d58a9..1aca08394c47 100644
--- a/drivers/rtc/rtc-dm355evm.c
+++ b/drivers/rtc/rtc-dm355evm.c
@@ -139,19 +139,12 @@ static int dm355evm_rtc_probe(struct platform_device *pdev)
        return 0;
 }
-static int dm355evm_rtc_remove(struct platform_device *pdev)
-{
-        platform_set_drvdata(pdev, NULL);
-        return 0;
-}
 /*
 * I2C is used to talk to the MSP430, but this platform device is
 * exposed by an MFD driver that manages I2C communications.
 */
 static struct platform_driver rtc_dm355evm_driver = {
        .probe          = dm355evm_rtc_probe,
-        .remove         = dm355evm_rtc_remove,
        .driver         = {
                .owner  = THIS_MODULE,
                .name   = "rtc-dm355evm",
diff --git a/drivers/rtc/rtc-ds1216.c b/drivers/rtc/rtc-ds1216.c
index c7702b7269f7..9c04fd2bc209 100644
--- a/drivers/rtc/rtc-ds1216.c
+++ b/drivers/rtc/rtc-ds1216.c
@@ -167,34 +167,17 @@ static int __init ds1216_rtc_probe(struct platform_device *pdev)
        return 0;
 }
-static int __exit ds1216_rtc_remove(struct platform_device *pdev)
-{
-        return 0;
-}
 static struct platform_driver ds1216_rtc_platform_driver = {
        .driver         = {
                .name   = "rtc-ds1216",
                .owner  = THIS_MODULE,
        },
-        .remove         = __exit_p(ds1216_rtc_remove),
 };
-static int __init ds1216_rtc_init(void)
+module_platform_driver_probe(ds1216_rtc_platform_driver, ds1216_rtc_probe);
-{
-        return platform_driver_probe(&ds1216_rtc_platform_driver, ds1216_rtc_probe);
-}
-static void __exit ds1216_rtc_exit(void)
-{
-        platform_driver_unregister(&ds1216_rtc_platform_driver);
-}
 MODULE_AUTHOR("Thomas Bogendoerfer <tsbogend@alpha.franken.de>");
 MODULE_DESCRIPTION("DS1216 RTC driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
 MODULE_ALIAS("platform:rtc-ds1216");
-module_init(ds1216_rtc_init);
-module_exit(ds1216_rtc_exit);
diff --git a/drivers/rtc/rtc-ds1286.c b/drivers/rtc/rtc-ds1286.c
index 398c96a98fc4..50e109b78252 100644
--- a/drivers/rtc/rtc-ds1286.c
+++ b/drivers/rtc/rtc-ds1286.c
@@ -353,18 +353,12 @@ static int ds1286_probe(struct platform_device *pdev)
        return 0;
 }
-static int ds1286_remove(struct platform_device *pdev)
-{
-        return 0;
-}
 static struct platform_driver ds1286_platform_driver = {
        .driver         = {
                .name   = "rtc-ds1286",
                .owner  = THIS_MODULE,
        },
        .probe          = ds1286_probe,
-        .remove         = ds1286_remove,
 };
 module_platform_driver(ds1286_platform_driver);
diff --git a/drivers/rtc/rtc-ds1302.c b/drivers/rtc/rtc-ds1302.c
index d13954346286..07e8d79b4a09 100644
--- a/drivers/rtc/rtc-ds1302.c
+++ b/drivers/rtc/rtc-ds1302.c
@@ -23,8 +23,12 @@
 #define RTC_CMD_READ    0x81            /* Read command */
 #define RTC_CMD_WRITE   0x80            /* Write command */
+#define RTC_CMD_WRITE_ENABLE    0x00            /* Write enable */
+#define RTC_CMD_WRITE_DISABLE   0x80            /* Write disable */
 #define RTC_ADDR_RAM0   0x20            /* Address of RAM0 */
 #define RTC_ADDR_TCR    0x08            /* Address of trickle charge register */
+#define RTC_ADDR_CTRL   0x07            /* Address of control register */
 #define RTC_ADDR_YEAR   0x06            /* Address of year register */
 #define RTC_ADDR_DAY    0x05            /* Address of day of week register */
 #define RTC_ADDR_MON    0x04            /* Address of month register */
@@ -161,6 +165,7 @@ static int ds1302_rtc_read_time(struct device *dev, struct rtc_time *tm)
 static int ds1302_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
+        ds1302_writebyte(RTC_ADDR_CTRL, RTC_CMD_WRITE_ENABLE);
        /* Stop RTC */
        ds1302_writebyte(RTC_ADDR_SEC, ds1302_readbyte(RTC_ADDR_SEC) | 0x80);
@@ -175,6 +180,8 @@ static int ds1302_rtc_set_time(struct device *dev, struct rtc_time *tm)
        /* Start RTC */
        ds1302_writebyte(RTC_ADDR_SEC, ds1302_readbyte(RTC_ADDR_SEC) & ~0x80);
+        ds1302_writebyte(RTC_ADDR_CTRL, RTC_CMD_WRITE_DISABLE);
        return 0;
 }
@@ -234,19 +241,11 @@ static int __init ds1302_rtc_probe(struct platform_device *pdev)
        return 0;
 }
-static int __exit ds1302_rtc_remove(struct platform_device *pdev)
-{
-        platform_set_drvdata(pdev, NULL);
-        return 0;
-}
 static struct platform_driver ds1302_platform_driver = {
        .driver         = {
                .name   = DRV_NAME,
                .owner  = THIS_MODULE,
        },
-        .remove         = __exit_p(ds1302_rtc_remove),
 };
 module_platform_driver_probe(ds1302_platform_driver, ds1302_rtc_probe);
diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c
index bb5f13f63630..dd6170acde95 100644
--- a/drivers/rtc/rtc-ds1305.c
+++ b/drivers/rtc/rtc-ds1305.c
@@ -158,7 +158,7 @@ static int ds1305_alarm_irq_enable(struct device *dev, unsigned int enabled)
                        goto done;
                buf[1] &= ~DS1305_AEI0;
        }
-        err = spi_write_then_read(ds1305->spi, buf, sizeof buf, NULL, 0);
+        err = spi_write_then_read(ds1305->spi, buf, sizeof(buf), NULL, 0);
        if (err >= 0)
                ds1305->ctrl[0] = buf[1];
 done:
@@ -181,8 +181,8 @@ static int ds1305_get_time(struct device *dev, struct rtc_time *time)
        /* Use write-then-read to get all the date/time registers
         * since dma from stack is nonportable
         */
-        status = spi_write_then_read(ds1305->spi, &addr, sizeof addr,
+        status = spi_write_then_read(ds1305->spi, &addr, sizeof(addr),
-                        buf, sizeof buf);
+                        buf, sizeof(buf));
        if (status < 0)
                return status;
@@ -237,7 +237,7 @@ static int ds1305_set_time(struct device *dev, struct rtc_time *time)
                buf[4], buf[5], buf[6], buf[7]);
        /* use write-then-read since dma from stack is nonportable */
-        return spi_write_then_read(ds1305->spi, buf, sizeof buf,
+        return spi_write_then_read(ds1305->spi, buf, sizeof(buf),
                        NULL, 0);
 }
@@ -286,8 +286,8 @@ static int ds1305_get_alarm(struct device *dev, struct rtc_wkalrm *alm)
         * of EFI status is at best fragile anyway (given IRQ handlers).
         */
        addr = DS1305_CONTROL;
-        status = spi_write_then_read(spi, &addr, sizeof addr,
+        status = spi_write_then_read(spi, &addr, sizeof(addr),
-                        ds1305->ctrl, sizeof ds1305->ctrl);
+                        ds1305->ctrl, sizeof(ds1305->ctrl));
        if (status < 0)
                return status;
@@ -296,8 +296,8 @@ static int ds1305_get_alarm(struct device *dev, struct rtc_wkalrm *alm)
        /* get and check ALM0 registers */
        addr = DS1305_ALM0(DS1305_SEC);
-        status = spi_write_then_read(spi, &addr, sizeof addr,
+        status = spi_write_then_read(spi, &addr, sizeof(addr),
-                        buf, sizeof buf);
+                        buf, sizeof(buf));
        if (status < 0)
                return status;
@@ -381,7 +381,7 @@ static int ds1305_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
                "alm0 write", buf[1 + DS1305_SEC], buf[1 + DS1305_MIN],
                buf[1 + DS1305_HOUR], buf[1 + DS1305_WDAY]);
-        status = spi_write_then_read(spi, buf, sizeof buf, NULL, 0);
+        status = spi_write_then_read(spi, buf, sizeof(buf), NULL, 0);
        if (status < 0)
                return status;
@@ -474,7 +474,7 @@ static void ds1305_work(struct work_struct *work)
        buf[1] = ds1305->ctrl[0];
        buf[2] = 0;
-        status = spi_write_then_read(spi, buf, sizeof buf,
+        status = spi_write_then_read(spi, buf, sizeof(buf),
                        NULL, 0);
        if (status < 0)
                dev_dbg(&spi->dev, "clear irq --> %d\n", status);
@@ -627,8 +627,8 @@ static int ds1305_probe(struct spi_device *spi)
        /* read and cache control registers */
        addr = DS1305_CONTROL;
-        status = spi_write_then_read(spi, &addr, sizeof addr,
+        status = spi_write_then_read(spi, &addr, sizeof(addr),
-                        ds1305->ctrl, sizeof ds1305->ctrl);
+                        ds1305->ctrl, sizeof(ds1305->ctrl));
        if (status < 0) {
                dev_dbg(&spi->dev, "can't %s, %d\n",
                                "read", status);
@@ -659,7 +659,7 @@ static int ds1305_probe(struct spi_device *spi)
                buf[0] = DS1305_WRITE | DS1305_CONTROL;
                buf[1] = ds1305->ctrl[0];
-                status = spi_write_then_read(spi, buf, sizeof buf, NULL, 0);
+                status = spi_write_then_read(spi, buf, sizeof(buf), NULL, 0);
                dev_dbg(&spi->dev, "clear WP --> %d\n", status);
                if (status < 0)
@@ -713,7 +713,7 @@ static int ds1305_probe(struct spi_device *spi)
                buf[1] = ds1305->ctrl[0];
                buf[2] = ds1305->ctrl[1];
                buf[3] = ds1305->ctrl[2];
-                status = spi_write_then_read(spi, buf, sizeof buf, NULL, 0);
+                status = spi_write_then_read(spi, buf, sizeof(buf), NULL, 0);
                if (status < 0) {
                        dev_dbg(&spi->dev, "can't %s, %d\n",
                                        "write", status);
@@ -725,8 +725,8 @@ static int ds1305_probe(struct spi_device *spi)
        /* see if non-Linux software set up AM/PM mode */
        addr = DS1305_HOUR;
-        status = spi_write_then_read(spi, &addr, sizeof addr,
+        status = spi_write_then_read(spi, &addr, sizeof(addr),
-                                &value, sizeof value);
+                                &value, sizeof(value));
        if (status < 0) {
                dev_dbg(&spi->dev, "read HOUR --> %d\n", status);
                return status;
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index b53992ab3090..ca18fd1433b3 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -683,7 +683,7 @@ static int ds1307_probe(struct i2c_client *client,
            && !i2c_check_functionality(adapter, I2C_FUNC_SMBUS_I2C_BLOCK))
                return -EIO;
-        ds1307 = kzalloc(sizeof(struct ds1307), GFP_KERNEL);
+        ds1307 = devm_kzalloc(&client->dev, sizeof(struct ds1307), GFP_KERNEL);
        if (!ds1307)
                return -ENOMEM;
@@ -715,7 +715,7 @@ static int ds1307_probe(struct i2c_client *client,
                if (tmp != 2) {
                        dev_dbg(&client->dev, "read error %d\n", tmp);
                        err = -EIO;
-                        goto exit_free;
+                        goto exit;
                }
                /* oscillator off?  turn it on, so clock can tick. */
@@ -754,7 +754,7 @@ static int ds1307_probe(struct i2c_client *client,
                if (tmp != 2) {
                        dev_dbg(&client->dev, "read error %d\n", tmp);
                        err = -EIO;
-                        goto exit_free;
+                        goto exit;
                }
                /* oscillator off?  turn it on, so clock can tick. */
@@ -798,7 +798,7 @@ static int ds1307_probe(struct i2c_client *client,
                        if (tmp != 2) {
                                dev_dbg(&client->dev, "read error %d\n", tmp);
                                err = -EIO;
-                                goto exit_free;
+                                goto exit;
                        }
                        /* correct hour */
@@ -826,7 +826,7 @@ read_rtc:
        if (tmp != 8) {
                dev_dbg(&client->dev, "read error %d\n", tmp);
                err = -EIO;
-                goto exit_free;
+                goto exit;
        }
        /*
@@ -868,7 +868,7 @@ read_rtc:
                if (tmp < 0) {
                        dev_dbg(&client->dev, "read error %d\n", tmp);
                        err = -EIO;
-                        goto exit_free;
+                        goto exit;
                }
                /* oscillator fault?  clear flag, and warn */
@@ -927,13 +927,13 @@ read_rtc:
                                bin2bcd(tmp));
        }
-        ds1307->rtc = rtc_device_register(client->name, &client->dev,
+        ds1307->rtc = devm_rtc_device_register(&client->dev, client->name,
                                &ds13xx_rtc_ops, THIS_MODULE);
        if (IS_ERR(ds1307->rtc)) {
                err = PTR_ERR(ds1307->rtc);
                dev_err(&client->dev,
                        "unable to register the class device\n");
-                goto exit_free;
+                goto exit;
        }
        if (want_irq) {
@@ -942,7 +942,7 @@ read_rtc:
                if (err) {
                        dev_err(&client->dev,
                                "unable to request IRQ!\n");
-                        goto exit_irq;
+                        goto exit;
                }
                device_set_wakeup_capable(&client->dev, 1);
@@ -951,11 +951,12 @@ read_rtc:
        }
        if (chip->nvram_size) {
-                ds1307->nvram = kzalloc(sizeof(struct bin_attribute),
+                ds1307->nvram = devm_kzalloc(&client->dev,
-                                                        GFP_KERNEL);
+                                        sizeof(struct bin_attribute),
+                                        GFP_KERNEL);
                if (!ds1307->nvram) {
                        err = -ENOMEM;
-                        goto exit_nvram;
+                        goto exit;
                }
                ds1307->nvram->attr.name = "nvram";
                ds1307->nvram->attr.mode = S_IRUGO | S_IWUSR;
@@ -965,21 +966,15 @@ read_rtc:
                ds1307->nvram->size = chip->nvram_size;
                ds1307->nvram_offset = chip->nvram_offset;
                err = sysfs_create_bin_file(&client->dev.kobj, ds1307->nvram);
-                if (err) {
+                if (err)
-                        kfree(ds1307->nvram);
+                        goto exit;
-                        goto exit_nvram;
-                }
                set_bit(HAS_NVRAM, &ds1307->flags);
                dev_info(&client->dev, "%zu bytes nvram\n", ds1307->nvram->size);
        }
        return 0;
-exit_nvram:
+exit:
-exit_irq:
-        rtc_device_unregister(ds1307->rtc);
-exit_free:
-        kfree(ds1307);
        return err;
 }
@@ -992,13 +987,9 @@ static int ds1307_remove(struct i2c_client *client)
                cancel_work_sync(&ds1307->work);
        }
-        if (test_and_clear_bit(HAS_NVRAM, &ds1307->flags)) {
+        if (test_and_clear_bit(HAS_NVRAM, &ds1307->flags))
                sysfs_remove_bin_file(&client->dev.kobj, ds1307->nvram);
-                kfree(ds1307->nvram);
-        }
-        rtc_device_unregister(ds1307->rtc);
-        kfree(ds1307);
        return 0;
 }
diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c
index 94366e12f40f..9e6e14fb53d7 100644
--- a/drivers/rtc/rtc-ds1374.c
+++ b/drivers/rtc/rtc-ds1374.c
@@ -65,7 +65,7 @@ struct ds1374 {
 static struct i2c_driver ds1374_driver;
 static int ds1374_read_rtc(struct i2c_client *client, u32 *time,
-                           int reg, int nbytes)
+                           int reg, int nbytes)
 {
        u8 buf[4];
        int ret;
@@ -90,7 +90,7 @@ static int ds1374_read_rtc(struct i2c_client *client, u32 *time,
 }
 static int ds1374_write_rtc(struct i2c_client *client, u32 time,
-                            int reg, int nbytes)
+                            int reg, int nbytes)
 {
        u8 buf[4];
        int i;
@@ -119,8 +119,7 @@ static int ds1374_check_rtc_status(struct i2c_client *client)
        if (stat & DS1374_REG_SR_OSF)
                dev_warn(&client->dev,
-                         "oscillator discontinuity flagged, "
+                         "oscillator discontinuity flagged, time unreliable\n");
-                         "time unreliable\n");
        stat &= ~(DS1374_REG_SR_OSF | DS1374_REG_SR_AF);
@@ -363,7 +362,7 @@ static int ds1374_probe(struct i2c_client *client,
        if (client->irq > 0) {
                ret = devm_request_irq(&client->dev, client->irq, ds1374_irq, 0,
-                                  "ds1374", client);
+                                        "ds1374", client);
                if (ret) {
                        dev_err(&client->dev, "unable to request IRQ\n");
                        return ret;
@@ -373,7 +372,7 @@ static int ds1374_probe(struct i2c_client *client,
        }
        ds1374->rtc = devm_rtc_device_register(&client->dev, client->name,
-                                          &ds1374_rtc_ops, THIS_MODULE);
+                                                &ds1374_rtc_ops, THIS_MODULE);
        if (IS_ERR(ds1374->rtc)) {
                dev_err(&client->dev, "unable to register the class device\n");
                return PTR_ERR(ds1374->rtc);
diff --git a/drivers/rtc/rtc-ds1390.c b/drivers/rtc/rtc-ds1390.c
index 289af419dff4..be9d8c0a7e3a 100644
--- a/drivers/rtc/rtc-ds1390.c
+++ b/drivers/rtc/rtc-ds1390.c
@@ -154,18 +154,12 @@ static int ds1390_probe(struct spi_device *spi)
        return res;
 }
-static int ds1390_remove(struct spi_device *spi)
-{
-        return 0;
-}
 static struct spi_driver ds1390_driver = {
        .driver = {
                .name   = "rtc-ds1390",
                .owner  = THIS_MODULE,
        },
        .probe  = ds1390_probe,
-        .remove = ds1390_remove,
 };
 module_spi_driver(ds1390_driver);
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
index 6ce8a997cf51..308a8fefe76f 100644
--- a/drivers/rtc/rtc-ds1511.c
+++ b/drivers/rtc/rtc-ds1511.c
@@ -104,31 +104,31 @@ static DEFINE_SPINLOCK(ds1511_lock);
 static __iomem char *ds1511_base;
 static u32 reg_spacing = 1;
- static noinline void
+static noinline void
 rtc_write(uint8_t val, uint32_t reg)
 {
        writeb(val, ds1511_base + (reg * reg_spacing));
 }
- static inline void
+static inline void
 rtc_write_alarm(uint8_t val, enum ds1511reg reg)
 {
        rtc_write((val | 0x80), reg);
 }
- static noinline uint8_t
+static noinline uint8_t
 rtc_read(enum ds1511reg reg)
 {
        return readb(ds1511_base + (reg * reg_spacing));
 }
- static inline void
+static inline void
 rtc_disable_update(void)
 {
        rtc_write((rtc_read(RTC_CMD) & ~RTC_TE), RTC_CMD);
 }
- static void
+static void
 rtc_enable_update(void)
 {
        rtc_write((rtc_read(RTC_CMD) | RTC_TE), RTC_CMD);
@@ -145,7 +145,7 @@ rtc_enable_update(void)
 * just enough code to set the watchdog timer so that it
 * will reboot the system
 */
- void
+void
 ds1511_wdog_set(unsigned long deciseconds)
 {
        /*
@@ -163,7 +163,7 @@ ds1511_wdog_set(unsigned long deciseconds)
        rtc_write(DS1511_WDE | DS1511_WDS, RTC_CMD);
 }
- void
+void
 ds1511_wdog_disable(void)
 {
        /*
@@ -191,13 +191,12 @@ static int ds1511_rtc_set_time(struct device *dev, struct rtc_time *rtc_tm)
        /*
         * won't have to change this for a while
         */
-        if (rtc_tm->tm_year < 1900) {
+        if (rtc_tm->tm_year < 1900)
                rtc_tm->tm_year += 1900;
-        }
-        if (rtc_tm->tm_year < 1970) {
+        if (rtc_tm->tm_year < 1970)
                return -EINVAL;
-        }
        yrs = rtc_tm->tm_year % 100;
        cen = rtc_tm->tm_year / 100;
        mon = rtc_tm->tm_mon + 1;   /* tm_mon starts at zero */
@@ -207,17 +206,14 @@ static int ds1511_rtc_set_time(struct device *dev, struct rtc_time *rtc_tm)
        min = rtc_tm->tm_min;
        sec = rtc_tm->tm_sec;
-        if ((mon > 12) || (day == 0)) {
+        if ((mon > 12) || (day == 0))
                return -EINVAL;
-        }
-        if (day > rtc_month_days(rtc_tm->tm_mon, rtc_tm->tm_year)) {
+        if (day > rtc_month_days(rtc_tm->tm_mon, rtc_tm->tm_year))
                return -EINVAL;
-        }
-        if ((hrs >= 24) || (min >= 60) || (sec >= 60)) {
+        if ((hrs >= 24) || (min >= 60) || (sec >= 60))
                return -EINVAL;
-        }
        /*
         * each register is a different number of valid bits
@@ -299,7 +295,7 @@ static int ds1511_rtc_read_time(struct device *dev, struct rtc_time *rtc_tm)
 * date/hours/mins/secs matches.  the ds1511 has many more
 * permutations, but the kernel doesn't.
 */
- static void
+static void
 ds1511_rtc_update_alarm(struct rtc_plat_data *pdata)
 {
        unsigned long flags;
@@ -322,7 +318,7 @@ ds1511_rtc_update_alarm(struct rtc_plat_data *pdata)
        spin_unlock_irqrestore(&pdata->lock, flags);
 }
- static int
+static int
 ds1511_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 {
        struct platform_device *pdev = to_platform_device(dev);
@@ -335,14 +331,14 @@ ds1511_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
        pdata->alrm_hour = alrm->time.tm_hour;
        pdata->alrm_min = alrm->time.tm_min;
        pdata->alrm_sec = alrm->time.tm_sec;
-        if (alrm->enabled) {
+        if (alrm->enabled)
                pdata->irqen |= RTC_AF;
-        }
        ds1511_rtc_update_alarm(pdata);
        return 0;
 }
- static int
+static int
 ds1511_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 {
        struct platform_device *pdev = to_platform_device(dev);
@@ -359,7 +355,7 @@ ds1511_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
        return 0;
 }
- static irqreturn_t
+static irqreturn_t
 ds1511_interrupt(int irq, void *dev_id)
 {
        struct platform_device *pdev = dev_id;
@@ -406,7 +402,7 @@ static const struct rtc_class_ops ds1511_rtc_ops = {
        .alarm_irq_enable       = ds1511_rtc_alarm_irq_enable,
 };
- static ssize_t
+static ssize_t
 ds1511_nvram_read(struct file *filp, struct kobject *kobj,
                  struct bin_attribute *ba,
                  char *buf, loff_t pos, size_t size)
@@ -417,26 +413,26 @@ ds1511_nvram_read(struct file *filp, struct kobject *kobj,
         * if count is more than one, turn on "burst" mode
         * turn it off when you're done
         */
-        if (size > 1) {
+        if (size > 1)
                rtc_write((rtc_read(RTC_CMD) | DS1511_BME), RTC_CMD);
-        }
-        if (pos > DS1511_RAM_MAX) {
+        if (pos > DS1511_RAM_MAX)
                pos = DS1511_RAM_MAX;
-        }
-        if (size + pos > DS1511_RAM_MAX + 1) {
+        if (size + pos > DS1511_RAM_MAX + 1)
                size = DS1511_RAM_MAX - pos + 1;
-        }
        rtc_write(pos, DS1511_RAMADDR_LSB);
-        for (count = 0; size > 0; count++, size--) {
+        for (count = 0; size > 0; count++, size--)
                *buf++ = rtc_read(DS1511_RAMDATA);
-        }
-        if (count > 1) {
+        if (count > 1)
                rtc_write((rtc_read(RTC_CMD) & ~DS1511_BME), RTC_CMD);
-        }
        return count;
 }
- static ssize_t
+static ssize_t
 ds1511_nvram_write(struct file *filp, struct kobject *kobj,
                   struct bin_attribute *bin_attr,
                   char *buf, loff_t pos, size_t size)
@@ -447,22 +443,22 @@ ds1511_nvram_write(struct file *filp, struct kobject *kobj,
         * if count is more than one, turn on "burst" mode
         * turn it off when you're done
         */
-        if (size > 1) {
+        if (size > 1)
                rtc_write((rtc_read(RTC_CMD) | DS1511_BME), RTC_CMD);
-        }
-        if (pos > DS1511_RAM_MAX) {
+        if (pos > DS1511_RAM_MAX)
                pos = DS1511_RAM_MAX;
-        }
-        if (size + pos > DS1511_RAM_MAX + 1) {
+        if (size + pos > DS1511_RAM_MAX + 1)
                size = DS1511_RAM_MAX - pos + 1;
-        }
        rtc_write(pos, DS1511_RAMADDR_LSB);
-        for (count = 0; size > 0; count++, size--) {
+        for (count = 0; size > 0; count++, size--)
                rtc_write(*buf++, DS1511_RAMDATA);
-        }
-        if (count > 1) {
+        if (count > 1)
                rtc_write((rtc_read(RTC_CMD) & ~DS1511_BME), RTC_CMD);
-        }
        return count;
 }
@@ -484,9 +480,9 @@ static int ds1511_rtc_probe(struct platform_device *pdev)
        int ret = 0;
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res) {
+        if (!res)
                return -ENODEV;
-        }
        pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
        if (!pdata)
                return -ENOMEM;
@@ -518,9 +514,8 @@ static int ds1511_rtc_probe(struct platform_device *pdev)
        /*
         * check for a dying bat-tree
         */
-        if (rtc_read(RTC_CMD1) & DS1511_BLF1) {
+        if (rtc_read(RTC_CMD1) & DS1511_BLF1)
                dev_warn(&pdev->dev, "voltage-low detected.\n");
-        }
        spin_lock_init(&pdata->lock);
        platform_set_drvdata(pdev, pdata);
diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c
index 3fc2a4738027..18e2d8471472 100644
--- a/drivers/rtc/rtc-ds1672.c
+++ b/drivers/rtc/rtc-ds1672.c
@@ -153,11 +153,6 @@ static const struct rtc_class_ops ds1672_rtc_ops = {
        .set_mmss = ds1672_rtc_set_mmss,
 };
-static int ds1672_remove(struct i2c_client *client)
-{
-        return 0;
-}
 static int ds1672_probe(struct i2c_client *client,
                        const struct i2c_device_id *id)
 {
@@ -210,7 +205,6 @@ static struct i2c_driver ds1672_driver = {
                   .name = "rtc-ds1672",
                   },
        .probe = &ds1672_probe,
-        .remove = &ds1672_remove,
        .id_table = ds1672_id,
 };
diff --git a/drivers/rtc/rtc-ds3234.c b/drivers/rtc/rtc-ds3234.c
index ba98c0e9580d..4c9ba5368464 100644
--- a/drivers/rtc/rtc-ds3234.c
+++ b/drivers/rtc/rtc-ds3234.c
@@ -73,7 +73,7 @@ static int ds3234_read_time(struct device *dev, struct rtc_time *dt)
        dt->tm_wday     = bcd2bin(buf[3]) - 1; /* 0 = Sun */
        dt->tm_mday     = bcd2bin(buf[4]);
        dt->tm_mon      = bcd2bin(buf[5] & 0x1f) - 1; /* 0 = Jan */
-        dt->tm_year     = bcd2bin(buf[6] & 0xff) + 100; /* Assume 20YY */
+        dt->tm_year     = bcd2bin(buf[6] & 0xff) + 100; /* Assume 20YY */
        return rtc_valid_tm(dt);
 }
@@ -156,18 +156,12 @@ static int ds3234_probe(struct spi_device *spi)
        return 0;
 }
-static int ds3234_remove(struct spi_device *spi)
-{
-        return 0;
-}
 static struct spi_driver ds3234_driver = {
        .driver = {
                .name    = "ds3234",
                .owner  = THIS_MODULE,
        },
        .probe   = ds3234_probe,
-        .remove = ds3234_remove,
 };
 module_spi_driver(ds3234_driver);
diff --git a/drivers/rtc/rtc-efi.c b/drivers/rtc/rtc-efi.c
index b3c8c0b1709d..797aa0252ba9 100644
--- a/drivers/rtc/rtc-efi.c
+++ b/drivers/rtc/rtc-efi.c
@@ -201,17 +201,11 @@ static int __init efi_rtc_probe(struct platform_device *dev)
        return 0;
 }
-static int __exit efi_rtc_remove(struct platform_device *dev)
-{
-        return 0;
-}
 static struct platform_driver efi_rtc_driver = {
        .driver = {
                .name = "rtc-efi",
                .owner = THIS_MODULE,
        },
-        .remove = __exit_p(efi_rtc_remove),
 };
 module_platform_driver_probe(efi_rtc_driver, efi_rtc_probe);
diff --git a/drivers/rtc/rtc-em3027.c b/drivers/rtc/rtc-em3027.c
index 3f9eb57d0486..fccf36699245 100644
--- a/drivers/rtc/rtc-em3027.c
+++ b/drivers/rtc/rtc-em3027.c
@@ -131,11 +131,6 @@ static int em3027_probe(struct i2c_client *client,
        return 0;
 }
-static int em3027_remove(struct i2c_client *client)
-{
-        return 0;
-}
 static struct i2c_device_id em3027_id[] = {
        { "em3027", 0 },
        { }
@@ -146,7 +141,6 @@ static struct i2c_driver em3027_driver = {
                   .name = "rtc-em3027",
        },
        .probe = &em3027_probe,
-        .remove = &em3027_remove,
        .id_table = em3027_id,
 };
diff --git a/drivers/rtc/rtc-ep93xx.c b/drivers/rtc/rtc-ep93xx.c
index 5807b77c444a..549b3c3792d2 100644
--- a/drivers/rtc/rtc-ep93xx.c
+++ b/drivers/rtc/rtc-ep93xx.c
@@ -167,7 +167,6 @@ static int ep93xx_rtc_probe(struct platform_device *pdev)
        return 0;
 exit:
-        platform_set_drvdata(pdev, NULL);
        pdev->dev.platform_data = NULL;
        return err;
 }
@@ -175,7 +174,6 @@ exit:
 static int ep93xx_rtc_remove(struct platform_device *pdev)
 {
        sysfs_remove_group(&pdev->dev.kobj, &ep93xx_rtc_sysfs_files);
-        platform_set_drvdata(pdev, NULL);
        pdev->dev.platform_data = NULL;
        return 0;
diff --git a/drivers/rtc/rtc-fm3130.c b/drivers/rtc/rtc-fm3130.c
index 2835fb6c1965..83c3b3029fa7 100644
--- a/drivers/rtc/rtc-fm3130.c
+++ b/drivers/rtc/rtc-fm3130.c
@@ -47,7 +47,7 @@
 struct fm3130 {
        u8                      reg_addr_time;
-        u8                      reg_addr_alarm;
+        u8                      reg_addr_alarm;
        u8                      regs[15];
        struct i2c_msg          msg[4];
        struct i2c_client       *client;
@@ -520,18 +520,12 @@ exit_free:
        return err;
 }
-static int fm3130_remove(struct i2c_client *client)
-{
-        return 0;
-}
 static struct i2c_driver fm3130_driver = {
        .driver = {
                .name   = "rtc-fm3130",
                .owner  = THIS_MODULE,
        },
        .probe          = fm3130_probe,
-        .remove         = fm3130_remove,
        .id_table       = fm3130_id,
 };
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index 06279ce6bff2..9b6725ebbfb2 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -48,17 +48,11 @@ static int __init generic_rtc_probe(struct platform_device *dev)
        return 0;
 }
-static int __exit generic_rtc_remove(struct platform_device *dev)
-{
-        return 0;
-}
 static struct platform_driver generic_rtc_driver = {
        .driver = {
                .name = "rtc-generic",
                .owner = THIS_MODULE,
        },
-        .remove = __exit_p(generic_rtc_remove),
 };
 module_platform_driver_probe(generic_rtc_driver, generic_rtc_probe);
diff --git a/drivers/rtc/rtc-hid-sensor-time.c b/drivers/rtc/rtc-hid-sensor-time.c
index 63024505dddc..7273b0139e5c 100644
--- a/drivers/rtc/rtc-hid-sensor-time.c
+++ b/drivers/rtc/rtc-hid-sensor-time.c
@@ -76,6 +76,20 @@ static int hid_time_proc_event(struct hid_sensor_hub_device *hsdev,
        return 0;
 }
+static u32 hid_time_value(size_t raw_len, char *raw_data)
+{
+        switch (raw_len) {
+        case 1:
+                return *(u8 *)raw_data;
+        case 2:
+                return *(u16 *)raw_data;
+        case 4:
+                return *(u32 *)raw_data;
+        default:
+                return (u32)(~0U); /* 0xff... or -1 to denote an error */
+        }
+}
 static int hid_time_capture_sample(struct hid_sensor_hub_device *hsdev,
                                unsigned usage_id, size_t raw_len,
                                char *raw_data, void *priv)
@@ -85,26 +99,35 @@ static int hid_time_capture_sample(struct hid_sensor_hub_device *hsdev,
        switch (usage_id) {
        case HID_USAGE_SENSOR_TIME_YEAR:
-                time_buf->tm_year = *(u8 *)raw_data;
+                /*
-                if (time_buf->tm_year < 70)
+                 * The draft for HID-sensors (HUTRR39) currently doesn't define
-                        /* assume we are in 1970...2069 */
+                 * the range for the year attribute. Therefor we support
-                        time_buf->tm_year += 100;
+                 * 8 bit (0-99) and 16 or 32 bits (full) as size for the year.
+                 */
+                if (raw_len == 1) {
+                        time_buf->tm_year = *(u8 *)raw_data;
+                        if (time_buf->tm_year < 70)
+                                /* assume we are in 1970...2069 */
+                                time_buf->tm_year += 100;
+                } else
+                        time_buf->tm_year =
+                                (int)hid_time_value(raw_len, raw_data)-1900;
                break;
        case HID_USAGE_SENSOR_TIME_MONTH:
-                /* sensor sending the month as 1-12, we need 0-11 */
+                /* sensors are sending the month as 1-12, we need 0-11 */
-                time_buf->tm_mon = *(u8 *)raw_data-1;
+                time_buf->tm_mon = (int)hid_time_value(raw_len, raw_data)-1;
                break;
        case HID_USAGE_SENSOR_TIME_DAY:
-                time_buf->tm_mday = *(u8 *)raw_data;
+                time_buf->tm_mday = (int)hid_time_value(raw_len, raw_data);
                break;
        case HID_USAGE_SENSOR_TIME_HOUR:
-                time_buf->tm_hour = *(u8 *)raw_data;
+                time_buf->tm_hour = (int)hid_time_value(raw_len, raw_data);
                break;
        case HID_USAGE_SENSOR_TIME_MINUTE:
-                time_buf->tm_min = *(u8 *)raw_data;
+                time_buf->tm_min = (int)hid_time_value(raw_len, raw_data);
                break;
        case HID_USAGE_SENSOR_TIME_SECOND:
-                time_buf->tm_sec = *(u8 *)raw_data;
+                time_buf->tm_sec = (int)hid_time_value(raw_len, raw_data);
                break;
        default:
                return -EINVAL;
@@ -150,9 +173,10 @@ static int hid_time_parse_report(struct platform_device *pdev,
                                "not all needed attributes inside the same report!\n");
                        return -EINVAL;
                }
-                if (time_state->info[i].size != 1) {
+                if (time_state->info[i].size == 3 ||
+                                time_state->info[i].size > 4) {
                        dev_err(&pdev->dev,
-                                "attribute '%s' not 8 bits wide!\n",
+                                "attribute '%s' not 8, 16 or 32 bits wide!\n",
                                hid_time_attrib_name(
                                        time_state->info[i].attrib_id));
                        return -EINVAL;
diff --git a/drivers/rtc/rtc-isl12022.c b/drivers/rtc/rtc-isl12022.c
index a1bbbb8de029..5dbdc4405718 100644
--- a/drivers/rtc/rtc-isl12022.c
+++ b/drivers/rtc/rtc-isl12022.c
@@ -16,6 +16,7 @@
 #include <linux/rtc.h>
 #include <linux/slab.h>
 #include <linux/module.h>
+#include <linux/err.h>
 #define DRV_VERSION "0.1"
@@ -267,15 +268,7 @@ static int isl12022_probe(struct i2c_client *client,
        isl12022->rtc = devm_rtc_device_register(&client->dev,
                                        isl12022_driver.driver.name,
                                        &isl12022_rtc_ops, THIS_MODULE);
-        if (IS_ERR(isl12022->rtc))
+        return PTR_RET(isl12022->rtc);
-                return PTR_ERR(isl12022->rtc);
-        return 0;
-}
-static int isl12022_remove(struct i2c_client *client)
-{
-        return 0;
 }
 static const struct i2c_device_id isl12022_id[] = {
@@ -289,7 +282,6 @@ static struct i2c_driver isl12022_driver = {
                .name   = "rtc-isl12022",
        },
        .probe          = isl12022_probe,
-        .remove         = isl12022_remove,
        .id_table       = isl12022_id,
 };
diff --git a/drivers/rtc/rtc-jz4740.c b/drivers/rtc/rtc-jz4740.c
index 1e48686ca6d2..1b126d2513de 100644
--- a/drivers/rtc/rtc-jz4740.c
+++ b/drivers/rtc/rtc-jz4740.c
@@ -14,6 +14,7 @@
 *
 */
+#include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
@@ -216,37 +217,34 @@ static int jz4740_rtc_probe(struct platform_device *pdev)
        struct jz4740_rtc *rtc;
        uint32_t scratchpad;
-        rtc = kzalloc(sizeof(*rtc), GFP_KERNEL);
+        rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
        if (!rtc)
                return -ENOMEM;
        rtc->irq = platform_get_irq(pdev, 0);
        if (rtc->irq < 0) {
-                ret = -ENOENT;
                dev_err(&pdev->dev, "Failed to get platform irq\n");
-                goto err_free;
+                return -ENOENT;
        }
        rtc->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!rtc->mem) {
-                ret = -ENOENT;
                dev_err(&pdev->dev, "Failed to get platform mmio memory\n");
-                goto err_free;
+                return -ENOENT;
        }
-        rtc->mem = request_mem_region(rtc->mem->start, resource_size(rtc->mem),
+        rtc->mem = devm_request_mem_region(&pdev->dev, rtc->mem->start,
-                                        pdev->name);
+                                        resource_size(rtc->mem), pdev->name);
        if (!rtc->mem) {
-                ret = -EBUSY;
                dev_err(&pdev->dev, "Failed to request mmio memory region\n");
-                goto err_free;
+                return -EBUSY;
        }
-        rtc->base = ioremap_nocache(rtc->mem->start, resource_size(rtc->mem));
+        rtc->base = devm_ioremap_nocache(&pdev->dev, rtc->mem->start,
+                                        resource_size(rtc->mem));
        if (!rtc->base) {
-                ret = -EBUSY;
                dev_err(&pdev->dev, "Failed to ioremap mmio memory\n");
-                goto err_release_mem_region;
+                return -EBUSY;
        }
        spin_lock_init(&rtc->lock);
@@ -255,19 +253,19 @@ static int jz4740_rtc_probe(struct platform_device *pdev)
        device_init_wakeup(&pdev->dev, 1);
-        rtc->rtc = rtc_device_register(pdev->name, &pdev->dev, &jz4740_rtc_ops,
+        rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
-                                        THIS_MODULE);
+                                        &jz4740_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc->rtc)) {
                ret = PTR_ERR(rtc->rtc);
                dev_err(&pdev->dev, "Failed to register rtc device: %d\n", ret);
-                goto err_iounmap;
+                return ret;
        }
-        ret = request_irq(rtc->irq, jz4740_rtc_irq, 0,
+        ret = devm_request_irq(&pdev->dev, rtc->irq, jz4740_rtc_irq, 0,
                                pdev->name, rtc);
        if (ret) {
                dev_err(&pdev->dev, "Failed to request rtc irq: %d\n", ret);
-                goto err_unregister_rtc;
+                return ret;
        }
        scratchpad = jz4740_rtc_reg_read(rtc, JZ_REG_RTC_SCRATCHPAD);
@@ -276,46 +274,13 @@ static int jz4740_rtc_probe(struct platform_device *pdev)
                ret = jz4740_rtc_reg_write(rtc, JZ_REG_RTC_SEC, 0);
                if (ret) {
                        dev_err(&pdev->dev, "Could not write write to RTC registers\n");
-                        goto err_free_irq;
+                        return ret;
                }
        }
        return 0;
-err_free_irq:
-        free_irq(rtc->irq, rtc);
-err_unregister_rtc:
-        rtc_device_unregister(rtc->rtc);
-err_iounmap:
-        platform_set_drvdata(pdev, NULL);
-        iounmap(rtc->base);
-err_release_mem_region:
-        release_mem_region(rtc->mem->start, resource_size(rtc->mem));
-err_free:
-        kfree(rtc);
-        return ret;
-}
-static int jz4740_rtc_remove(struct platform_device *pdev)
-{
-        struct jz4740_rtc *rtc = platform_get_drvdata(pdev);
-        free_irq(rtc->irq, rtc);
-        rtc_device_unregister(rtc->rtc);
-        iounmap(rtc->base);
-        release_mem_region(rtc->mem->start, resource_size(rtc->mem));
-        kfree(rtc);
-        platform_set_drvdata(pdev, NULL);
-        return 0;
 }
 #ifdef CONFIG_PM
 static int jz4740_rtc_suspend(struct device *dev)
 {
@@ -347,7 +312,6 @@ static const struct dev_pm_ops jz4740_pm_ops = {
 static struct platform_driver jz4740_rtc_driver = {
        .probe   = jz4740_rtc_probe,
-        .remove  = jz4740_rtc_remove,
        .driver  = {
                .name  = "jz4740-rtc",
                .owner = THIS_MODULE,
diff --git a/drivers/rtc/rtc-lp8788.c b/drivers/rtc/rtc-lp8788.c
index 9853ac15b296..4ff6c73253b3 100644
--- a/drivers/rtc/rtc-lp8788.c
+++ b/drivers/rtc/rtc-lp8788.c
@@ -312,16 +312,8 @@ static int lp8788_rtc_probe(struct platform_device *pdev)
        return 0;
 }
-static int lp8788_rtc_remove(struct platform_device *pdev)
-{
-        platform_set_drvdata(pdev, NULL);
-        return 0;
-}
 static struct platform_driver lp8788_rtc_driver = {
        .probe = lp8788_rtc_probe,
-        .remove = lp8788_rtc_remove,
        .driver = {
                .name = LP8788_DEV_RTC,
                .owner = THIS_MODULE,
diff --git a/drivers/rtc/rtc-lpc32xx.c b/drivers/rtc/rtc-lpc32xx.c
index 787550d756e9..8276ae94a2a9 100644
--- a/drivers/rtc/rtc-lpc32xx.c
+++ b/drivers/rtc/rtc-lpc32xx.c
@@ -277,7 +277,6 @@ static int lpc32xx_rtc_probe(struct platform_device *pdev)
                                        &lpc32xx_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc->rtc)) {
                dev_err(&pdev->dev, "Can't get RTC\n");
-                platform_set_drvdata(pdev, NULL);
                return PTR_ERR(rtc->rtc);
        }
@@ -306,8 +305,6 @@ static int lpc32xx_rtc_remove(struct platform_device *pdev)
        if (rtc->irq >= 0)
                device_init_wakeup(&pdev->dev, 0);
-        platform_set_drvdata(pdev, NULL);
        return 0;
 }
diff --git a/drivers/rtc/rtc-ls1x.c b/drivers/rtc/rtc-ls1x.c
index db82f91f4562..682ecb094839 100644
--- a/drivers/rtc/rtc-ls1x.c
+++ b/drivers/rtc/rtc-ls1x.c
@@ -185,19 +185,11 @@ err:
        return ret;
 }
-static int ls1x_rtc_remove(struct platform_device *pdev)
-{
-        platform_set_drvdata(pdev, NULL);
-        return 0;
-}
 static struct platform_driver  ls1x_rtc_driver = {
        .driver         = {
                .name   = "ls1x-rtc",
                .owner  = THIS_MODULE,
        },
-        .remove         = ls1x_rtc_remove,
        .probe          = ls1x_rtc_probe,
 };
diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index 89674b5e6efd..a5248aa1abf1 100644
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -168,7 +168,7 @@ static int m41t80_set_datetime(struct i2c_client *client, struct rtc_time *tm)
        buf[M41T80_REG_MIN] =
                bin2bcd(tm->tm_min) | (buf[M41T80_REG_MIN] & ~0x7f);
        buf[M41T80_REG_HOUR] =
-                bin2bcd(tm->tm_hour) | (buf[M41T80_REG_HOUR] & ~0x3f) ;
+                bin2bcd(tm->tm_hour) | (buf[M41T80_REG_HOUR] & ~0x3f);
        buf[M41T80_REG_WDAY] =
                (tm->tm_wday & 0x07) | (buf[M41T80_REG_WDAY] & ~0x07);
        buf[M41T80_REG_DAY] =
diff --git a/drivers/rtc/rtc-m41t93.c b/drivers/rtc/rtc-m41t93.c
index 9707d36e8b15..4698c7e344e4 100644
--- a/drivers/rtc/rtc-m41t93.c
+++ b/drivers/rtc/rtc-m41t93.c
@@ -194,19 +194,12 @@ static int m41t93_probe(struct spi_device *spi)
        return 0;
 }
-static int m41t93_remove(struct spi_device *spi)
-{
-        return 0;
-}
 static struct spi_driver m41t93_driver = {
        .driver = {
                .name   = "rtc-m41t93",
                .owner  = THIS_MODULE,
        },
        .probe  = m41t93_probe,
-        .remove = m41t93_remove,
 };
 module_spi_driver(m41t93_driver);
diff --git a/drivers/rtc/rtc-m41t94.c b/drivers/rtc/rtc-m41t94.c
index 7454ef0a4cfa..8d800b1bf87b 100644
--- a/drivers/rtc/rtc-m41t94.c
+++ b/drivers/rtc/rtc-m41t94.c
@@ -134,18 +134,12 @@ static int m41t94_probe(struct spi_device *spi)
        return 0;
 }
-static int m41t94_remove(struct spi_device *spi)
-{
-        return 0;
-}
 static struct spi_driver m41t94_driver = {
        .driver = {
                .name   = "rtc-m41t94",
                .owner  = THIS_MODULE,
        },
        .probe  = m41t94_probe,
-        .remove = m41t94_remove,
 };
 module_spi_driver(m41t94_driver);
diff --git a/drivers/rtc/rtc-m48t35.c b/drivers/rtc/rtc-m48t35.c
index 37444246e5e4..23c3779a5f2b 100644
--- a/drivers/rtc/rtc-m48t35.c
+++ b/drivers/rtc/rtc-m48t35.c
@@ -20,6 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/bcd.h>
 #include <linux/io.h>
+#include <linux/err.h>
 #define DRV_VERSION             "1.0"
@@ -174,15 +175,7 @@ static int m48t35_probe(struct platform_device *pdev)
        priv->rtc = devm_rtc_device_register(&pdev->dev, "m48t35",
                                  &m48t35_ops, THIS_MODULE);
-        if (IS_ERR(priv->rtc))
+        return PTR_RET(priv->rtc);
-                return PTR_ERR(priv->rtc);
-        return 0;
-}
-static int m48t35_remove(struct platform_device *pdev)
-{
-        return 0;
 }
 static struct platform_driver m48t35_platform_driver = {
@@ -191,7 +184,6 @@ static struct platform_driver m48t35_platform_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = m48t35_probe,
-        .remove         = m48t35_remove,
 };
 module_platform_driver(m48t35_platform_driver);
diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
index 130f29af3869..fcb03291f145 100644
--- a/drivers/rtc/rtc-m48t59.c
+++ b/drivers/rtc/rtc-m48t59.c
@@ -409,7 +409,8 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
        } else if (res->flags & IORESOURCE_MEM) {
                /* we are memory-mapped */
                if (!pdata) {
-                        pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
+                        pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata),
+                                                GFP_KERNEL);
                        if (!pdata)
                                return -ENOMEM;
                        /* Ensure we only kmalloc platform data once */
@@ -425,7 +426,7 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
                        pdata->read_byte = m48t59_mem_readb;
        }
-        m48t59 = kzalloc(sizeof(*m48t59), GFP_KERNEL);
+        m48t59 = devm_kzalloc(&pdev->dev, sizeof(*m48t59), GFP_KERNEL);
        if (!m48t59)
                return -ENOMEM;
@@ -433,9 +434,10 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
        if (!m48t59->ioaddr) {
                /* ioaddr not mapped externally */
-                m48t59->ioaddr = ioremap(res->start, resource_size(res));
+                m48t59->ioaddr = devm_ioremap(&pdev->dev, res->start,
+                                                resource_size(res));
                if (!m48t59->ioaddr)
-                        goto out;
+                        return ret;
        }
        /* Try to get irq number. We also can work in
@@ -446,10 +448,11 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
                m48t59->irq = NO_IRQ;
        if (m48t59->irq != NO_IRQ) {
-                ret = request_irq(m48t59->irq, m48t59_rtc_interrupt,
+                ret = devm_request_irq(&pdev->dev, m48t59->irq,
-                        IRQF_SHARED, "rtc-m48t59", &pdev->dev);
+                                m48t59_rtc_interrupt, IRQF_SHARED,
+                                "rtc-m48t59", &pdev->dev);
                if (ret)
-                        goto out;
+                        return ret;
        }
        switch (pdata->type) {
        case M48T59RTC_TYPE_M48T59:
@@ -469,52 +472,29 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
                break;
        default:
                dev_err(&pdev->dev, "Unknown RTC type\n");
-                ret = -ENODEV;
+                return -ENODEV;
-                goto out;
        }
        spin_lock_init(&m48t59->lock);
        platform_set_drvdata(pdev, m48t59);
-        m48t59->rtc = rtc_device_register(name, &pdev->dev, ops, THIS_MODULE);
+        m48t59->rtc = devm_rtc_device_register(&pdev->dev, name, ops,
-        if (IS_ERR(m48t59->rtc)) {
+                                                THIS_MODULE);
-                ret = PTR_ERR(m48t59->rtc);
+        if (IS_ERR(m48t59->rtc))
-                goto out;
+                return PTR_ERR(m48t59->rtc);
-        }
        m48t59_nvram_attr.size = pdata->offset;
        ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
-        if (ret) {
+        if (ret)
-                rtc_device_unregister(m48t59->rtc);
+                return ret;
-                goto out;
-        }
        return 0;
-out:
-        if (m48t59->irq != NO_IRQ)
-                free_irq(m48t59->irq, &pdev->dev);
-        if (m48t59->ioaddr)
-                iounmap(m48t59->ioaddr);
-                kfree(m48t59);
-        return ret;
 }
 static int m48t59_rtc_remove(struct platform_device *pdev)
 {
-        struct m48t59_private *m48t59 = platform_get_drvdata(pdev);
-        struct m48t59_plat_data *pdata = pdev->dev.platform_data;
        sysfs_remove_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
-        if (!IS_ERR(m48t59->rtc))
-                rtc_device_unregister(m48t59->rtc);
-        if (m48t59->ioaddr && !pdata->ioaddr)
-                iounmap(m48t59->ioaddr);
-        if (m48t59->irq != NO_IRQ)
-                free_irq(m48t59->irq, &pdev->dev);
-        platform_set_drvdata(pdev, NULL);
-        kfree(m48t59);
        return 0;
 }
diff --git a/drivers/rtc/rtc-m48t86.c b/drivers/rtc/rtc-m48t86.c
index 33a91c484533..2d30314fa07f 100644
--- a/drivers/rtc/rtc-m48t86.c
+++ b/drivers/rtc/rtc-m48t86.c
@@ -166,20 +166,12 @@ static int m48t86_rtc_probe(struct platform_device *dev)
        return 0;
 }
-static int m48t86_rtc_remove(struct platform_device *dev)
-{
-        platform_set_drvdata(dev, NULL);
-        return 0;
-}
 static struct platform_driver m48t86_rtc_platform_driver = {
        .driver         = {
                .name   = "rtc-m48t86",
                .owner  = THIS_MODULE,
        },
        .probe          = m48t86_rtc_probe,
-        .remove         = m48t86_rtc_remove,
 };
 module_platform_driver(m48t86_rtc_platform_driver);
diff --git a/drivers/rtc/rtc-max6900.c b/drivers/rtc/rtc-max6900.c
index 8669d6d09a00..55969b1b771a 100644
--- a/drivers/rtc/rtc-max6900.c
+++ b/drivers/rtc/rtc-max6900.c
@@ -212,11 +212,6 @@ static int max6900_rtc_set_time(struct device *dev, struct rtc_time *tm)
        return max6900_i2c_set_time(to_i2c_client(dev), tm);
 }
-static int max6900_remove(struct i2c_client *client)
-{
-        return 0;
-}
 static const struct rtc_class_ops max6900_rtc_ops = {
        .read_time = max6900_rtc_read_time,
        .set_time = max6900_rtc_set_time,
@@ -252,7 +247,6 @@ static struct i2c_driver max6900_driver = {
                   .name = "rtc-max6900",
                   },
        .probe = max6900_probe,
-        .remove = max6900_remove,
        .id_table = max6900_id,
 };
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c
index e3aea00c3145..ac3f4191864f 100644
--- a/drivers/rtc/rtc-max6902.c
+++ b/drivers/rtc/rtc-max6902.c
@@ -143,23 +143,17 @@ static int max6902_probe(struct spi_device *spi)
        return 0;
 }
-static int max6902_remove(struct spi_device *spi)
-{
-        return 0;
-}
 static struct spi_driver max6902_driver = {
        .driver = {
                .name   = "rtc-max6902",
                .owner  = THIS_MODULE,
        },
        .probe  = max6902_probe,
-        .remove = max6902_remove,
 };
 module_spi_driver(max6902_driver);
-MODULE_DESCRIPTION ("max6902 spi RTC driver");
+MODULE_DESCRIPTION("max6902 spi RTC driver");
-MODULE_AUTHOR ("Raphael Assenat");
+MODULE_AUTHOR("Raphael Assenat");
-MODULE_LICENSE ("GPL");
+MODULE_LICENSE("GPL");
 MODULE_ALIAS("spi:rtc-max6902");
diff --git a/drivers/rtc/rtc-max77686.c b/drivers/rtc/rtc-max77686.c
index 771812d62e6b..9915cb96014b 100644
--- a/drivers/rtc/rtc-max77686.c
+++ b/drivers/rtc/rtc-max77686.c
@@ -119,7 +119,7 @@ static int max77686_rtc_tm_to_data(struct rtc_time *tm, u8 *data)
        data[RTC_WEEKDAY] = 1 << tm->tm_wday;
        data[RTC_DATE] = tm->tm_mday;
        data[RTC_MONTH] = tm->tm_mon + 1;
-        data[RTC_YEAR] = tm->tm_year > 100 ? (tm->tm_year - 100) : 0 ;
+        data[RTC_YEAR] = tm->tm_year > 100 ? (tm->tm_year - 100) : 0;
        if (tm->tm_year < 100) {
                pr_warn("%s: MAX77686 RTC cannot handle the year %d."
@@ -567,11 +567,6 @@ err_rtc:
        return ret;
 }
-static int max77686_rtc_remove(struct platform_device *pdev)
-{
-        return 0;
-}
 static void max77686_rtc_shutdown(struct platform_device *pdev)
 {
 #ifdef MAX77686_RTC_WTSR_SMPL
@@ -610,7 +605,6 @@ static struct platform_driver max77686_rtc_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = max77686_rtc_probe,
-        .remove         = max77686_rtc_remove,
        .shutdown       = max77686_rtc_shutdown,
        .id_table       = rtc_id,
 };
diff --git a/drivers/rtc/rtc-max8907.c b/drivers/rtc/rtc-max8907.c
index 86afb797125d..8e45b3c4aa2f 100644
--- a/drivers/rtc/rtc-max8907.c
+++ b/drivers/rtc/rtc-max8907.c
@@ -213,18 +213,12 @@ static int max8907_rtc_probe(struct platform_device *pdev)
        return ret;
 }
-static int max8907_rtc_remove(struct platform_device *pdev)
-{
-        return 0;
-}
 static struct platform_driver max8907_rtc_driver = {
        .driver = {
                .name = "max8907-rtc",
                .owner = THIS_MODULE,
        },
        .probe = max8907_rtc_probe,
-        .remove = max8907_rtc_remove,
 };
 module_platform_driver(max8907_rtc_driver);
diff --git a/drivers/rtc/rtc-max8925.c b/drivers/rtc/rtc-max8925.c
index 7c90f4e45e27..951d1a78e190 100644
--- a/drivers/rtc/rtc-max8925.c
+++ b/drivers/rtc/rtc-max8925.c
@@ -268,7 +268,7 @@ static int max8925_rtc_probe(struct platform_device *pdev)
        if (ret < 0) {
                dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n",
                        info->irq, ret);
-                goto err;
+                return ret;
        }
        dev_set_drvdata(&pdev->dev, info);
@@ -282,18 +282,10 @@ static int max8925_rtc_probe(struct platform_device *pdev)
        ret = PTR_ERR(info->rtc_dev);
        if (IS_ERR(info->rtc_dev)) {
                dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret);
-                goto err;
+                return ret;
        }
        return 0;
-err:
-        platform_set_drvdata(pdev, NULL);
-        return ret;
-}
-static int max8925_rtc_remove(struct platform_device *pdev)
-{
-        return 0;
 }
 #ifdef CONFIG_PM_SLEEP
@@ -326,7 +318,6 @@ static struct platform_driver max8925_rtc_driver = {
                .pm     = &max8925_rtc_pm_ops,
        },
        .probe          = max8925_rtc_probe,
-        .remove         = max8925_rtc_remove,
 };
 module_platform_driver(max8925_rtc_driver);
diff --git a/drivers/rtc/rtc-max8997.c b/drivers/rtc/rtc-max8997.c
index dacf48db7925..0777c01b58e0 100644
--- a/drivers/rtc/rtc-max8997.c
+++ b/drivers/rtc/rtc-max8997.c
@@ -104,7 +104,7 @@ static int max8997_rtc_tm_to_data(struct rtc_time *tm, u8 *data)
        data[RTC_WEEKDAY] = 1 << tm->tm_wday;
        data[RTC_DATE] = tm->tm_mday;
        data[RTC_MONTH] = tm->tm_mon + 1;
-        data[RTC_YEAR] = tm->tm_year > 100 ? (tm->tm_year - 100) : 0 ;
+        data[RTC_YEAR] = tm->tm_year > 100 ? (tm->tm_year - 100) : 0;
        if (tm->tm_year < 100) {
                pr_warn("%s: MAX8997 RTC cannot handle the year %d."
@@ -507,11 +507,6 @@ err_out:
        return ret;
 }
-static int max8997_rtc_remove(struct platform_device *pdev)
-{
-        return 0;
-}
 static void max8997_rtc_shutdown(struct platform_device *pdev)
 {
        struct max8997_rtc_info *info = platform_get_drvdata(pdev);
@@ -531,7 +526,6 @@ static struct platform_driver max8997_rtc_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = max8997_rtc_probe,
-        .remove         = max8997_rtc_remove,
        .shutdown       = max8997_rtc_shutdown,
        .id_table       = rtc_id,
 };
diff --git a/drivers/rtc/rtc-max8998.c b/drivers/rtc/rtc-max8998.c
index d5af7baa48b5..5388336a2c4c 100644
--- a/drivers/rtc/rtc-max8998.c
+++ b/drivers/rtc/rtc-max8998.c
@@ -274,7 +274,7 @@ static int max8998_rtc_probe(struct platform_device *pdev)
        if (IS_ERR(info->rtc_dev)) {
                ret = PTR_ERR(info->rtc_dev);
                dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret);
-                goto out_rtc;
+                return ret;
        }
        ret = devm_request_threaded_irq(&pdev->dev, info->irq, NULL,
@@ -292,15 +292,6 @@ static int max8998_rtc_probe(struct platform_device *pdev)
        }
        return 0;
-out_rtc:
-        platform_set_drvdata(pdev, NULL);
-        return ret;
-}
-static int max8998_rtc_remove(struct platform_device *pdev)
-{
-        return 0;
 }
 static const struct platform_device_id max8998_rtc_id[] = {
@@ -315,7 +306,6 @@ static struct platform_driver max8998_rtc_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = max8998_rtc_probe,
-        .remove         = max8998_rtc_remove,
        .id_table       = max8998_rtc_id,
 };
diff --git a/drivers/rtc/rtc-mc13xxx.c b/drivers/rtc/rtc-mc13xxx.c
index 7a8ed27a5f2e..77ea9896b5ba 100644
--- a/drivers/rtc/rtc-mc13xxx.c
+++ b/drivers/rtc/rtc-mc13xxx.c
@@ -370,8 +370,6 @@ err_reset_irq_status:
 err_reset_irq_request:
                mc13xxx_unlock(mc13xxx);
-                platform_set_drvdata(pdev, NULL);
        }
        return ret;
@@ -389,8 +387,6 @@ static int __exit mc13xxx_rtc_remove(struct platform_device *pdev)
        mc13xxx_unlock(priv->mc13xxx);
-        platform_set_drvdata(pdev, NULL);
        return 0;
 }
diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c
index bdcc60830aec..9c8f60903799 100644
--- a/drivers/rtc/rtc-mpc5121.c
+++ b/drivers/rtc/rtc-mpc5121.c
@@ -68,7 +68,7 @@ struct mpc5121_rtc_regs {
        u32 target_time;        /* RTC + 0x20 */
        /*
         * actual_time:
-         *      readonly time since VBAT_RTC was last connected
+         *      readonly time since VBAT_RTC was last connected
         */
        u32 actual_time;        /* RTC + 0x24 */
        u32 keep_alive;         /* RTC + 0x28 */
@@ -312,20 +312,19 @@ static int mpc5121_rtc_probe(struct platform_device *op)
        struct mpc5121_rtc_data *rtc;
        int err = 0;
-        rtc = kzalloc(sizeof(*rtc), GFP_KERNEL);
+        rtc = devm_kzalloc(&op->dev, sizeof(*rtc), GFP_KERNEL);
        if (!rtc)
                return -ENOMEM;
        rtc->regs = of_iomap(op->dev.of_node, 0);
        if (!rtc->regs) {
                dev_err(&op->dev, "%s: couldn't map io space\n", __func__);
-                err = -ENOSYS;
+                return -ENOSYS;
-                goto out_free;
        }
        device_init_wakeup(&op->dev, 1);
-        dev_set_drvdata(&op->dev, rtc);
+        platform_set_drvdata(op, rtc);
        rtc->irq = irq_of_parse_and_map(op->dev.of_node, 1);
        err = request_irq(rtc->irq, mpc5121_rtc_handler, 0,
@@ -354,10 +353,10 @@ static int mpc5121_rtc_probe(struct platform_device *op)
                        out_be32(&rtc->regs->keep_alive, ka);
                }
-                rtc->rtc = rtc_device_register("mpc5121-rtc", &op->dev,
+                rtc->rtc = devm_rtc_device_register(&op->dev, "mpc5121-rtc",
                                                &mpc5121_rtc_ops, THIS_MODULE);
        } else {
-                rtc->rtc = rtc_device_register("mpc5200-rtc", &op->dev,
+                rtc->rtc = devm_rtc_device_register(&op->dev, "mpc5200-rtc",
                                                &mpc5200_rtc_ops, THIS_MODULE);
        }
@@ -377,29 +376,24 @@ out_dispose2:
 out_dispose:
        irq_dispose_mapping(rtc->irq);
        iounmap(rtc->regs);
-out_free:
-        kfree(rtc);
        return err;
 }
 static int mpc5121_rtc_remove(struct platform_device *op)
 {
-        struct mpc5121_rtc_data *rtc = dev_get_drvdata(&op->dev);
+        struct mpc5121_rtc_data *rtc = platform_get_drvdata(op);
        struct mpc5121_rtc_regs __iomem *regs = rtc->regs;
        /* disable interrupt, so there are no nasty surprises */
        out_8(&regs->alm_enable, 0);
        out_8(&regs->int_enable, in_8(&regs->int_enable) & ~0x1);
-        rtc_device_unregister(rtc->rtc);
        iounmap(rtc->regs);
        free_irq(rtc->irq, &op->dev);
        free_irq(rtc->irq_periodic, &op->dev);
        irq_dispose_mapping(rtc->irq);
        irq_dispose_mapping(rtc->irq_periodic);
-        dev_set_drvdata(&op->dev, NULL);
-        kfree(rtc);
        return 0;
 }
diff --git a/drivers/rtc/rtc-msm6242.c b/drivers/rtc/rtc-msm6242.c
index 771f86a05d14..426cb5189daa 100644
--- a/drivers/rtc/rtc-msm6242.c
+++ b/drivers/rtc/rtc-msm6242.c
@@ -111,8 +111,8 @@ static void msm6242_lock(struct msm6242_priv *priv)
        }
        if (!cnt)
-                pr_warning("msm6242: timed out waiting for RTC (0x%x)\n",
+                pr_warn("msm6242: timed out waiting for RTC (0x%x)\n",
-                           msm6242_read(priv, MSM6242_CD));
+                        msm6242_read(priv, MSM6242_CD));
 }
 static void msm6242_unlock(struct msm6242_priv *priv)
@@ -199,7 +199,6 @@ static int __init msm6242_rtc_probe(struct platform_device *pdev)
        struct resource *res;
        struct msm6242_priv *priv;
        struct rtc_device *rtc;
-        int error;
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res)
@@ -216,22 +215,11 @@ static int __init msm6242_rtc_probe(struct platform_device *pdev)
        rtc = devm_rtc_device_register(&pdev->dev, "rtc-msm6242",
                                &msm6242_rtc_ops, THIS_MODULE);
-        if (IS_ERR(rtc)) {
+        if (IS_ERR(rtc))
-                error = PTR_ERR(rtc);
+                return PTR_ERR(rtc);
-                goto out_unmap;
-        }
        priv->rtc = rtc;
        return 0;
-out_unmap:
-        platform_set_drvdata(pdev, NULL);
-        return error;
-}
-static int __exit msm6242_rtc_remove(struct platform_device *pdev)
-{
-        return 0;
 }
 static struct platform_driver msm6242_rtc_driver = {
@@ -239,7 +227,6 @@ static struct platform_driver msm6242_rtc_driver = {
                .name   = "rtc-msm6242",
                .owner  = THIS_MODULE,
        },
-        .remove = __exit_p(msm6242_rtc_remove),
 };
 module_platform_driver_probe(msm6242_rtc_driver, msm6242_rtc_probe);
diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c
index 9a3895bc4f4d..ab87bacb8f88 100644
--- a/drivers/rtc/rtc-mxc.c
+++ b/drivers/rtc/rtc-mxc.c
@@ -436,22 +436,20 @@ static int mxc_rtc_probe(struct platform_device *pdev)
                pdata->irq = -1;
        }
-        if (pdata->irq >=0)
+        if (pdata->irq >= 0)
                device_init_wakeup(&pdev->dev, 1);
        rtc = devm_rtc_device_register(&pdev->dev, pdev->name, &mxc_rtc_ops,
                                  THIS_MODULE);
        if (IS_ERR(rtc)) {
                ret = PTR_ERR(rtc);
-                goto exit_clr_drvdata;
+                goto exit_put_clk;
        }
        pdata->rtc = rtc;
        return 0;
-exit_clr_drvdata:
-        platform_set_drvdata(pdev, NULL);
 exit_put_clk:
        clk_disable_unprepare(pdata->clk);
@@ -465,7 +463,6 @@ static int mxc_rtc_remove(struct platform_device *pdev)
        struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
        clk_disable_unprepare(pdata->clk);
-        platform_set_drvdata(pdev, NULL);
        return 0;
 }
diff --git a/drivers/rtc/rtc-nuc900.c b/drivers/rtc/rtc-nuc900.c
index d592e2fe43f7..22861c5e0c59 100644
--- a/drivers/rtc/rtc-nuc900.c
+++ b/drivers/rtc/rtc-nuc900.c
@@ -260,15 +260,7 @@ static int __init nuc900_rtc_probe(struct platform_device *pdev)
        return 0;
 }
-static int __exit nuc900_rtc_remove(struct platform_device *pdev)
-{
-        platform_set_drvdata(pdev, NULL);
-        return 0;
-}
 static struct platform_driver nuc900_rtc_driver = {
-        .remove         = __exit_p(nuc900_rtc_remove),
        .driver         = {
                .name   = "nuc900-rtc",
                .owner  = THIS_MODULE,
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index b0ba3fc991ea..c6ffbaec32a4 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -23,9 +23,7 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/io.h>
-#include <asm/io.h>
 /* The OMAP1 RTC is a year/month/day/hours/minutes/seconds BCD clock
 * with century-range alarm matching, driven by the 32kHz clock.
@@ -423,6 +421,8 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
         *    is write-only, and always reads as zero...)
         */
+        device_init_wakeup(&pdev->dev, true);
        if (new_ctrl & (u8) OMAP_RTC_CTRL_SPLIT)
                pr_info("%s: split power mode\n", pdev->name);
diff --git a/drivers/rtc/rtc-palmas.c b/drivers/rtc/rtc-palmas.c
index 50204d474eb7..a1fecc8d97fc 100644
--- a/drivers/rtc/rtc-palmas.c
+++ b/drivers/rtc/rtc-palmas.c
@@ -265,6 +265,7 @@ static int palmas_rtc_probe(struct platform_device *pdev)
        palmas_rtc->irq = platform_get_irq(pdev, 0);
+        device_init_wakeup(&pdev->dev, 1);
        palmas_rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
                                &palmas_rtc_ops, THIS_MODULE);
        if (IS_ERR(palmas_rtc->rtc)) {
@@ -283,7 +284,6 @@ static int palmas_rtc_probe(struct platform_device *pdev)
                return ret;
        }
-        device_set_wakeup_capable(&pdev->dev, 1);
        return 0;
 }
diff --git a/drivers/rtc/rtc-pcap.c b/drivers/rtc/rtc-pcap.c
index 539a90b98bc5..40b5c630bc7d 100644
--- a/drivers/rtc/rtc-pcap.c
+++ b/drivers/rtc/rtc-pcap.c
@@ -156,10 +156,8 @@ static int __init pcap_rtc_probe(struct platform_device *pdev)
        pcap_rtc->rtc = devm_rtc_device_register(&pdev->dev, "pcap",
                                        &pcap_rtc_ops, THIS_MODULE);
-        if (IS_ERR(pcap_rtc->rtc)) {
+        if (IS_ERR(pcap_rtc->rtc))
-                err = PTR_ERR(pcap_rtc->rtc);
+                return PTR_ERR(pcap_rtc->rtc);
-                goto fail;
-        }
        timer_irq = pcap_to_irq(pcap_rtc->pcap, PCAP_IRQ_1HZ);
        alarm_irq = pcap_to_irq(pcap_rtc->pcap, PCAP_IRQ_TODA);
@@ -167,17 +165,14 @@ static int __init pcap_rtc_probe(struct platform_device *pdev)
        err = devm_request_irq(&pdev->dev, timer_irq, pcap_rtc_irq, 0,
                                "RTC Timer", pcap_rtc);
        if (err)
-                goto fail;
+                return err;
        err = devm_request_irq(&pdev->dev, alarm_irq, pcap_rtc_irq, 0,
                                "RTC Alarm", pcap_rtc);
        if (err)
-                goto fail;
+                return err;
        return 0;
-fail:
-        platform_set_drvdata(pdev, NULL);
-        return err;
 }
 static int __exit pcap_rtc_remove(struct platform_device *pdev)
diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c
index 796a6c5067dd..1725b5090e33 100644
--- a/drivers/rtc/rtc-pcf2123.c
+++ b/drivers/rtc/rtc-pcf2123.c
@@ -18,11 +18,11 @@
 * should look something like:
 *
 * static struct spi_board_info ek_spi_devices[] = {
- *      ...
+ *      ...
- *      {
+ *      {
- *              .modalias               = "rtc-pcf2123",
+ *              .modalias               = "rtc-pcf2123",
- *              .chip_select            = 1,
+ *              .chip_select            = 1,
- *              .controller_data        = (void *)AT91_PIN_PA10,
+ *              .controller_data        = (void *)AT91_PIN_PA10,
 *              .max_speed_hz           = 1000 * 1000,
 *              .mode                   = SPI_CS_HIGH,
 *              .bus_num                = 0,
@@ -94,8 +94,9 @@ static ssize_t pcf2123_show(struct device *dev, struct device_attribute *attr,
        r = container_of(attr, struct pcf2123_sysfs_reg, attr);
-        if (strict_strtoul(r->name, 16, &reg))
+        ret = kstrtoul(r->name, 16, &reg);
-                return -EINVAL;
+        if (ret)
+                return ret;
        txbuf[0] = PCF2123_READ | reg;
        ret = spi_write_then_read(spi, txbuf, 1, rxbuf, 1);
@@ -117,9 +118,13 @@ static ssize_t pcf2123_store(struct device *dev, struct device_attribute *attr,
        r = container_of(attr, struct pcf2123_sysfs_reg, attr);
-        if (strict_strtoul(r->name, 16, &reg)
+        ret = kstrtoul(r->name, 16, &reg);
-                || strict_strtoul(buffer, 10, &val))
+        if (ret)
-                return -EINVAL;
+                return ret;
+        ret = kstrtoul(buffer, 10, &val);
+        if (ret)
+                return ret;
        txbuf[0] = PCF2123_WRITE | reg;
        txbuf[1] = val;
diff --git a/drivers/rtc/rtc-pcf2127.c b/drivers/rtc/rtc-pcf2127.c
new file mode 100644
index 000000000000..205b9f7da1b8
--- /dev/null
+++ b/drivers/rtc/rtc-pcf2127.c
@@ -0,0 +1,241 @@
+/*
+ * An I2C driver for the NXP PCF2127 RTC
+ * Copyright 2013 Til-Technologies
+ *
+ * Author: Renaud Cerrato <r.cerrato@til-technologies.fr>
+ *
+ * based on the other drivers in this same directory.
+ *
+ * http://www.nxp.com/documents/data_sheet/PCF2127AT.pdf
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/i2c.h>
+#include <linux/bcd.h>
+#include <linux/rtc.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#define DRV_VERSION "0.0.1"
+#define PCF2127_REG_CTRL1       (0x00)  /* Control Register 1 */
+#define PCF2127_REG_CTRL2       (0x01)  /* Control Register 2 */
+#define PCF2127_REG_CTRL3       (0x02)  /* Control Register 3 */
+#define PCF2127_REG_SC          (0x03)  /* datetime */
+#define PCF2127_REG_MN          (0x04)
+#define PCF2127_REG_HR          (0x05)
+#define PCF2127_REG_DM          (0x06)
+#define PCF2127_REG_DW          (0x07)
+#define PCF2127_REG_MO          (0x08)
+#define PCF2127_REG_YR          (0x09)
+static struct i2c_driver pcf2127_driver;
+struct pcf2127 {
+        struct rtc_device *rtc;
+        int voltage_low; /* indicates if a low_voltage was detected */
+};
+/*
+ * In the routines that deal directly with the pcf2127 hardware, we use
+ * rtc_time -- month 0-11, hour 0-23, yr = calendar year-epoch.
+ */
+static int pcf2127_get_datetime(struct i2c_client *client, struct rtc_time *tm)
+{
+        struct pcf2127 *pcf2127 = i2c_get_clientdata(client);
+        unsigned char buf[10] = { PCF2127_REG_CTRL1 };
+        /* read registers */
+        if (i2c_master_send(client, buf, 1) != 1 ||
+                i2c_master_recv(client, buf, sizeof(buf)) != sizeof(buf)) {
+                dev_err(&client->dev, "%s: read error\n", __func__);
+                return -EIO;
+        }
+        if (buf[PCF2127_REG_CTRL3] & 0x04) {
+                pcf2127->voltage_low = 1;
+                dev_info(&client->dev,
+                        "low voltage detected, date/time is not reliable.\n");
+        }
+        dev_dbg(&client->dev,
+                "%s: raw data is cr1=%02x, cr2=%02x, cr3=%02x, "
+                "sec=%02x, min=%02x, hr=%02x, "
+                "mday=%02x, wday=%02x, mon=%02x, year=%02x\n",
+                __func__,
+                buf[0], buf[1], buf[2],
+                buf[3], buf[4], buf[5],
+                buf[6], buf[7], buf[8], buf[9]);
+        tm->tm_sec = bcd2bin(buf[PCF2127_REG_SC] & 0x7F);
+        tm->tm_min = bcd2bin(buf[PCF2127_REG_MN] & 0x7F);
+        tm->tm_hour = bcd2bin(buf[PCF2127_REG_HR] & 0x3F); /* rtc hr 0-23 */
+        tm->tm_mday = bcd2bin(buf[PCF2127_REG_DM] & 0x3F);
+        tm->tm_wday = buf[PCF2127_REG_DW] & 0x07;
+        tm->tm_mon = bcd2bin(buf[PCF2127_REG_MO] & 0x1F) - 1; /* rtc mn 1-12 */
+        tm->tm_year = bcd2bin(buf[PCF2127_REG_YR]);
+        if (tm->tm_year < 70)
+                tm->tm_year += 100;     /* assume we are in 1970...2069 */
+        dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
+                "mday=%d, mon=%d, year=%d, wday=%d\n",
+                __func__,
+                tm->tm_sec, tm->tm_min, tm->tm_hour,
+                tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
+        /* the clock can give out invalid datetime, but we cannot return
+         * -EINVAL otherwise hwclock will refuse to set the time on bootup.
+         */
+        if (rtc_valid_tm(tm) < 0)
+                dev_err(&client->dev, "retrieved date/time is not valid.\n");
+        return 0;
+}
+static int pcf2127_set_datetime(struct i2c_client *client, struct rtc_time *tm)
+{
+        unsigned char buf[8];
+        int i = 0, err;
+        dev_dbg(&client->dev, "%s: secs=%d, mins=%d, hours=%d, "
+                "mday=%d, mon=%d, year=%d, wday=%d\n",
+                __func__,
+                tm->tm_sec, tm->tm_min, tm->tm_hour,
+                tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
+        /* start register address */
+        buf[i++] = PCF2127_REG_SC;
+        /* hours, minutes and seconds */
+        buf[i++] = bin2bcd(tm->tm_sec);
+        buf[i++] = bin2bcd(tm->tm_min);
+        buf[i++] = bin2bcd(tm->tm_hour);
+        buf[i++] = bin2bcd(tm->tm_mday);
+        buf[i++] = tm->tm_wday & 0x07;
+        /* month, 1 - 12 */
+        buf[i++] = bin2bcd(tm->tm_mon + 1);
+        /* year */
+        buf[i++] = bin2bcd(tm->tm_year % 100);
+        /* write register's data */
+        err = i2c_master_send(client, buf, i);
+        if (err != i) {
+                dev_err(&client->dev,
+                        "%s: err=%d", __func__, err);
+                return -EIO;
+        }
+        return 0;
+}
+#ifdef CONFIG_RTC_INTF_DEV
+static int pcf2127_rtc_ioctl(struct device *dev,
+                                unsigned int cmd, unsigned long arg)
+{
+        struct pcf2127 *pcf2127 = i2c_get_clientdata(to_i2c_client(dev));
+        switch (cmd) {
+        case RTC_VL_READ:
+                if (pcf2127->voltage_low)
+                        dev_info(dev, "low voltage detected, date/time is not reliable.\n");
+                if (copy_to_user((void __user *)arg, &pcf2127->voltage_low,
+                                        sizeof(int)))
+                        return -EFAULT;
+                return 0;
+        default:
+                return -ENOIOCTLCMD;
+        }
+}
+#else
+#define pcf2127_rtc_ioctl NULL
+#endif
+static int pcf2127_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        return pcf2127_get_datetime(to_i2c_client(dev), tm);
+}
+static int pcf2127_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        return pcf2127_set_datetime(to_i2c_client(dev), tm);
+}
+static const struct rtc_class_ops pcf2127_rtc_ops = {
+        .ioctl          = pcf2127_rtc_ioctl,
+        .read_time      = pcf2127_rtc_read_time,
+        .set_time       = pcf2127_rtc_set_time,
+};
+static int pcf2127_probe(struct i2c_client *client,
+                                const struct i2c_device_id *id)
+{
+        struct pcf2127 *pcf2127;
+        dev_dbg(&client->dev, "%s\n", __func__);
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
+                return -ENODEV;
+        pcf2127 = devm_kzalloc(&client->dev, sizeof(struct pcf2127),
+                                GFP_KERNEL);
+        if (!pcf2127)
+                return -ENOMEM;
+        dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
+        i2c_set_clientdata(client, pcf2127);
+        pcf2127->rtc = devm_rtc_device_register(&client->dev,
+                                pcf2127_driver.driver.name,
+                                &pcf2127_rtc_ops, THIS_MODULE);
+        if (IS_ERR(pcf2127->rtc))
+                return PTR_ERR(pcf2127->rtc);
+        return 0;
+}
+static int pcf2127_remove(struct i2c_client *client)
+{
+        return 0;
+}
+static const struct i2c_device_id pcf2127_id[] = {
+        { "pcf2127", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, pcf2127_id);
+#ifdef CONFIG_OF
+static const struct of_device_id pcf2127_of_match[] = {
+        { .compatible = "nxp,pcf2127" },
+        {}
+};
+MODULE_DEVICE_TABLE(of, pcf2127_of_match);
+#endif
+static struct i2c_driver pcf2127_driver = {
+        .driver         = {
+                .name   = "rtc-pcf2127",
+                .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(pcf2127_of_match),
+        },
+        .probe          = pcf2127_probe,
+        .remove         = pcf2127_remove,
+        .id_table       = pcf2127_id,
+};
+module_i2c_driver(pcf2127_driver);
+MODULE_AUTHOR("Renaud Cerrato <r.cerrato@til-technologies.fr>");
+MODULE_DESCRIPTION("NXP PCF2127 RTC driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
diff --git a/drivers/rtc/rtc-pcf8523.c b/drivers/rtc/rtc-pcf8523.c
index 305c9515e5bb..5c8f8226c848 100644
--- a/drivers/rtc/rtc-pcf8523.c
+++ b/drivers/rtc/rtc-pcf8523.c
@@ -317,11 +317,6 @@ static int pcf8523_probe(struct i2c_client *client,
        return 0;
 }
-static int pcf8523_remove(struct i2c_client *client)
-{
-        return 0;
-}
 static const struct i2c_device_id pcf8523_id[] = {
        { "pcf8523", 0 },
        { }
@@ -343,7 +338,6 @@ static struct i2c_driver pcf8523_driver = {
                .of_match_table = of_match_ptr(pcf8523_of_match),
        },
        .probe = pcf8523_probe,
-        .remove = pcf8523_remove,
        .id_table = pcf8523_id,
 };
 module_i2c_driver(pcf8523_driver);
diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c
index 97b354a26a44..710c3a5aa6ff 100644
--- a/drivers/rtc/rtc-pcf8563.c
+++ b/drivers/rtc/rtc-pcf8563.c
@@ -20,6 +20,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <linux/err.h>
 #define DRV_VERSION "0.4.3"
@@ -263,15 +264,7 @@ static int pcf8563_probe(struct i2c_client *client,
                                pcf8563_driver.driver.name,
                                &pcf8563_rtc_ops, THIS_MODULE);
-        if (IS_ERR(pcf8563->rtc))
+        return PTR_RET(pcf8563->rtc);
-                return PTR_ERR(pcf8563->rtc);
-        return 0;
-}
-static int pcf8563_remove(struct i2c_client *client)
-{
-        return 0;
 }
 static const struct i2c_device_id pcf8563_id[] = {
@@ -296,7 +289,6 @@ static struct i2c_driver pcf8563_driver = {
                .of_match_table = of_match_ptr(pcf8563_of_match),
        },
        .probe          = pcf8563_probe,
-        .remove         = pcf8563_remove,
        .id_table       = pcf8563_id,
 };
diff --git a/drivers/rtc/rtc-pcf8583.c b/drivers/rtc/rtc-pcf8583.c
index 95886dcf4a39..843a745c42f3 100644
--- a/drivers/rtc/rtc-pcf8583.c
+++ b/drivers/rtc/rtc-pcf8583.c
@@ -17,6 +17,7 @@
 #include <linux/slab.h>
 #include <linux/rtc.h>
 #include <linux/init.h>
+#include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/bcd.h>
@@ -188,7 +189,8 @@ static int pcf8583_rtc_read_time(struct device *dev, struct rtc_time *tm)
                dev_warn(dev, "resetting control %02x -> %02x\n",
                        ctrl, new_ctrl);
-                if ((err = pcf8583_set_ctrl(client, &new_ctrl)) < 0)
+                err = pcf8583_set_ctrl(client, &new_ctrl);
+                if (err < 0)
                        return err;
        }
@@ -283,15 +285,7 @@ static int pcf8583_probe(struct i2c_client *client,
                                pcf8583_driver.driver.name,
                                &pcf8583_rtc_ops, THIS_MODULE);
-        if (IS_ERR(pcf8583->rtc))
+        return PTR_RET(pcf8583->rtc);
-                return PTR_ERR(pcf8583->rtc);
-        return 0;
-}
-static int pcf8583_remove(struct i2c_client *client)
-{
-        return 0;
 }
 static const struct i2c_device_id pcf8583_id[] = {
@@ -306,7 +300,6 @@ static struct i2c_driver pcf8583_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = pcf8583_probe,
-        .remove         = pcf8583_remove,
        .id_table       = pcf8583_id,
 };
diff --git a/drivers/rtc/rtc-pm8xxx.c b/drivers/rtc/rtc-pm8xxx.c
index f1a6557261f3..03f8f75d5af2 100644
--- a/drivers/rtc/rtc-pm8xxx.c
+++ b/drivers/rtc/rtc-pm8xxx.c
@@ -395,7 +395,7 @@ static int pm8xxx_rtc_probe(struct platform_device *pdev)
        if (pdata != NULL)
                rtc_write_enable = pdata->rtc_write_enable;
-        rtc_dd = kzalloc(sizeof(*rtc_dd), GFP_KERNEL);
+        rtc_dd = devm_kzalloc(&pdev->dev, sizeof(*rtc_dd), GFP_KERNEL);
        if (rtc_dd == NULL) {
                dev_err(&pdev->dev, "Unable to allocate memory!\n");
                return -ENOMEM;
@@ -407,16 +407,14 @@ static int pm8xxx_rtc_probe(struct platform_device *pdev)
        rtc_dd->rtc_alarm_irq = platform_get_irq(pdev, 0);
        if (rtc_dd->rtc_alarm_irq < 0) {
                dev_err(&pdev->dev, "Alarm IRQ resource absent!\n");
-                rc = -ENXIO;
+                return -ENXIO;
-                goto fail_rtc_enable;
        }
        rtc_resource = platform_get_resource_byname(pdev, IORESOURCE_IO,
                                                        "pmic_rtc_base");
        if (!(rtc_resource && rtc_resource->start)) {
                dev_err(&pdev->dev, "RTC IO resource absent!\n");
-                rc = -ENXIO;
+                return -ENXIO;
-                goto fail_rtc_enable;
        }
        rtc_dd->rtc_base = rtc_resource->start;
@@ -432,7 +430,7 @@ static int pm8xxx_rtc_probe(struct platform_device *pdev)
        rc = pm8xxx_read_wrapper(rtc_dd, &ctrl_reg, rtc_dd->rtc_base, 1);
        if (rc < 0) {
                dev_err(&pdev->dev, "RTC control register read failed!\n");
-                goto fail_rtc_enable;
+                return rc;
        }
        if (!(ctrl_reg & PM8xxx_RTC_ENABLE)) {
@@ -442,7 +440,7 @@ static int pm8xxx_rtc_probe(struct platform_device *pdev)
                if (rc < 0) {
                        dev_err(&pdev->dev, "Write to RTC control register "
                                                                "failed\n");
-                        goto fail_rtc_enable;
+                        return rc;
                }
        }
@@ -453,13 +451,12 @@ static int pm8xxx_rtc_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, rtc_dd);
        /* Register the RTC device */
-        rtc_dd->rtc = rtc_device_register("pm8xxx_rtc", &pdev->dev,
+        rtc_dd->rtc = devm_rtc_device_register(&pdev->dev, "pm8xxx_rtc",
                                &pm8xxx_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc_dd->rtc)) {
                dev_err(&pdev->dev, "%s: RTC registration failed (%ld)\n",
                                        __func__, PTR_ERR(rtc_dd->rtc));
-                rc = PTR_ERR(rtc_dd->rtc);
+                return PTR_ERR(rtc_dd->rtc);
-                goto fail_rtc_enable;
        }
        /* Request the alarm IRQ */
@@ -468,7 +465,7 @@ static int pm8xxx_rtc_probe(struct platform_device *pdev)
                                 "pm8xxx_rtc_alarm", rtc_dd);
        if (rc < 0) {
                dev_err(&pdev->dev, "Request IRQ failed (%d)\n", rc);
-                goto fail_req_irq;
+                return rc;
        }
        device_init_wakeup(&pdev->dev, 1);
@@ -476,13 +473,6 @@ static int pm8xxx_rtc_probe(struct platform_device *pdev)
        dev_dbg(&pdev->dev, "Probe success !!\n");
        return 0;
-fail_req_irq:
-        rtc_device_unregister(rtc_dd->rtc);
-fail_rtc_enable:
-        platform_set_drvdata(pdev, NULL);
-        kfree(rtc_dd);
-        return rc;
 }
 static int pm8xxx_rtc_remove(struct platform_device *pdev)
@@ -491,9 +481,6 @@ static int pm8xxx_rtc_remove(struct platform_device *pdev)
        device_init_wakeup(&pdev->dev, 0);
        free_irq(rtc_dd->rtc_alarm_irq, rtc_dd);
-        rtc_device_unregister(rtc_dd->rtc);
-        platform_set_drvdata(pdev, NULL);
-        kfree(rtc_dd);
        return 0;
 }
diff --git a/drivers/rtc/rtc-ps3.c b/drivers/rtc/rtc-ps3.c
index 4bb825bb5804..554ada5e9b76 100644
--- a/drivers/rtc/rtc-ps3.c
+++ b/drivers/rtc/rtc-ps3.c
@@ -71,17 +71,11 @@ static int __init ps3_rtc_probe(struct platform_device *dev)
        return 0;
 }
-static int __exit ps3_rtc_remove(struct platform_device *dev)
-{
-        return 0;
-}
 static struct platform_driver ps3_rtc_driver = {
        .driver = {
                .name = "rtc-ps3",
                .owner = THIS_MODULE,
        },
-        .remove = __exit_p(ps3_rtc_remove),
 };
 module_platform_driver_probe(ps3_rtc_driver, ps3_rtc_probe);
diff --git a/drivers/rtc/rtc-puv3.c b/drivers/rtc/rtc-puv3.c
index 72f437170d2e..402732cfb32a 100644
--- a/drivers/rtc/rtc-puv3.c
+++ b/drivers/rtc/rtc-puv3.c
@@ -224,7 +224,6 @@ static int puv3_rtc_remove(struct platform_device *dev)
 {
        struct rtc_device *rtc = platform_get_drvdata(dev);
-        platform_set_drvdata(dev, NULL);
        rtc_device_unregister(rtc);
        puv3_rtc_setpie(&dev->dev, 0);
diff --git a/drivers/rtc/rtc-pxa.c b/drivers/rtc/rtc-pxa.c
index ed037ae91c5f..a355f2b82bb8 100644
--- a/drivers/rtc/rtc-pxa.c
+++ b/drivers/rtc/rtc-pxa.c
@@ -324,37 +324,35 @@ static int __init pxa_rtc_probe(struct platform_device *pdev)
        int ret;
        u32 rttr;
-        pxa_rtc = kzalloc(sizeof(struct pxa_rtc), GFP_KERNEL);
+        pxa_rtc = devm_kzalloc(dev, sizeof(*pxa_rtc), GFP_KERNEL);
        if (!pxa_rtc)
                return -ENOMEM;
        spin_lock_init(&pxa_rtc->lock);
        platform_set_drvdata(pdev, pxa_rtc);
-        ret = -ENXIO;
        pxa_rtc->ress = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!pxa_rtc->ress) {
                dev_err(dev, "No I/O memory resource defined\n");
-                goto err_ress;
+                return -ENXIO;
        }
        pxa_rtc->irq_1Hz = platform_get_irq(pdev, 0);
        if (pxa_rtc->irq_1Hz < 0) {
                dev_err(dev, "No 1Hz IRQ resource defined\n");
-                goto err_ress;
+                return -ENXIO;
        }
        pxa_rtc->irq_Alrm = platform_get_irq(pdev, 1);
        if (pxa_rtc->irq_Alrm < 0) {
                dev_err(dev, "No alarm IRQ resource defined\n");
-                goto err_ress;
+                return -ENXIO;
        }
        pxa_rtc_open(dev);
-        ret = -ENOMEM;
+        pxa_rtc->base = devm_ioremap(dev, pxa_rtc->ress->start,
-        pxa_rtc->base = ioremap(pxa_rtc->ress->start,
                                resource_size(pxa_rtc->ress));
        if (!pxa_rtc->base) {
-                dev_err(&pdev->dev, "Unable to map pxa RTC I/O memory\n");
+                dev_err(dev, "Unable to map pxa RTC I/O memory\n");
-                goto err_map;
+                return -ENOMEM;
        }
        /*
@@ -370,41 +368,24 @@ static int __init pxa_rtc_probe(struct platform_device *pdev)
        rtsr_clear_bits(pxa_rtc, RTSR_PIALE | RTSR_RDALE1 | RTSR_HZE);
-        pxa_rtc->rtc = rtc_device_register("pxa-rtc", &pdev->dev, &pxa_rtc_ops,
+        pxa_rtc->rtc = devm_rtc_device_register(&pdev->dev, "pxa-rtc",
-                                           THIS_MODULE);
+                                                &pxa_rtc_ops, THIS_MODULE);
-        ret = PTR_ERR(pxa_rtc->rtc);
        if (IS_ERR(pxa_rtc->rtc)) {
+                ret = PTR_ERR(pxa_rtc->rtc);
                dev_err(dev, "Failed to register RTC device -> %d\n", ret);
-                goto err_rtc_reg;
+                return ret;
        }
        device_init_wakeup(dev, 1);
        return 0;
-err_rtc_reg:
-         iounmap(pxa_rtc->base);
-err_ress:
-err_map:
-        kfree(pxa_rtc);
-        return ret;
 }
 static int __exit pxa_rtc_remove(struct platform_device *pdev)
 {
-        struct pxa_rtc *pxa_rtc = platform_get_drvdata(pdev);
        struct device *dev = &pdev->dev;
-        pxa_rtc_release(dev);
-        rtc_device_unregister(pxa_rtc->rtc);
-        spin_lock_irq(&pxa_rtc->lock);
-        iounmap(pxa_rtc->base);
-        spin_unlock_irq(&pxa_rtc->lock);
-        kfree(pxa_rtc);
+        pxa_rtc_release(dev);
        return 0;
 }
diff --git a/drivers/rtc/rtc-rc5t583.c b/drivers/rtc/rtc-rc5t583.c
index 8eabcf51b35a..e53e9b1c69b3 100644
--- a/drivers/rtc/rtc-rc5t583.c
+++ b/drivers/rtc/rtc-rc5t583.c
@@ -273,7 +273,7 @@ static int rc5t583_rtc_probe(struct platform_device *pdev)
 */
 static int rc5t583_rtc_remove(struct platform_device *pdev)
 {
-        struct rc5t583_rtc *rc5t583_rtc = dev_get_drvdata(&pdev->dev);
+        struct rc5t583_rtc *rc5t583_rtc = platform_get_drvdata(pdev);
        rc5t583_rtc_alarm_irq_enable(&rc5t583_rtc->rtc->dev, 0);
        return 0;
diff --git a/drivers/rtc/rtc-rp5c01.c b/drivers/rtc/rtc-rp5c01.c
index 873c689f01c3..89d073679267 100644
--- a/drivers/rtc/rtc-rp5c01.c
+++ b/drivers/rtc/rtc-rp5c01.c
@@ -251,21 +251,15 @@ static int __init rp5c01_rtc_probe(struct platform_device *dev)
        rtc = devm_rtc_device_register(&dev->dev, "rtc-rp5c01", &rp5c01_rtc_ops,
                                  THIS_MODULE);
-        if (IS_ERR(rtc)) {
+        if (IS_ERR(rtc))
-                error = PTR_ERR(rtc);
+                return PTR_ERR(rtc);
-                goto out;
-        }
        priv->rtc = rtc;
        error = sysfs_create_bin_file(&dev->dev.kobj, &priv->nvram_attr);
        if (error)
-                goto out;
+                return error;
        return 0;
-out:
-        platform_set_drvdata(dev, NULL);
-        return error;
 }
 static int __exit rp5c01_rtc_remove(struct platform_device *dev)
diff --git a/drivers/rtc/rtc-rs5c313.c b/drivers/rtc/rtc-rs5c313.c
index 8089fc63e403..68f7856422f1 100644
--- a/drivers/rtc/rtc-rs5c313.c
+++ b/drivers/rtc/rtc-rs5c313.c
@@ -47,10 +47,10 @@
 #include <linux/platform_device.h>
 #include <linux/bcd.h>
 #include <linux/delay.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #define DRV_NAME        "rs5c313"
-#define DRV_VERSION     "1.13"
+#define DRV_VERSION     "1.13"
 #ifdef CONFIG_SH_LANDISK
 /*****************************************************/
@@ -301,7 +301,7 @@ static int rs5c313_rtc_set_time(struct device *dev, struct rtc_time *tm)
        rs5c313_write_reg(RS5C313_ADDR_SEC10, (data >> 4));
        data = bin2bcd(tm->tm_min);
-        rs5c313_write_reg(RS5C313_ADDR_MIN, data );
+        rs5c313_write_reg(RS5C313_ADDR_MIN, data);
        rs5c313_write_reg(RS5C313_ADDR_MIN10, (data >> 4));
        data = bin2bcd(tm->tm_hour);
@@ -310,7 +310,7 @@ static int rs5c313_rtc_set_time(struct device *dev, struct rtc_time *tm)
        data = bin2bcd(tm->tm_mday);
        rs5c313_write_reg(RS5C313_ADDR_DAY, data);
-        rs5c313_write_reg(RS5C313_ADDR_DAY10, (data>> 4));
+        rs5c313_write_reg(RS5C313_ADDR_DAY10, (data >> 4));
        data = bin2bcd(tm->tm_mon + 1);
        rs5c313_write_reg(RS5C313_ADDR_MON, data);
@@ -349,9 +349,9 @@ static void rs5c313_check_xstp_bit(void)
                }
                memset(&tm, 0, sizeof(struct rtc_time));
-                tm.tm_mday      = 1;
+                tm.tm_mday      = 1;
-                tm.tm_mon       = 1 - 1;
+                tm.tm_mon       = 1 - 1;
-                tm.tm_year      = 2000 - 1900;
+                tm.tm_year      = 2000 - 1900;
                rs5c313_rtc_set_time(NULL, &tm);
                pr_err("invalid value, resetting to 1 Jan 2000\n");
@@ -378,18 +378,12 @@ static int rs5c313_rtc_probe(struct platform_device *pdev)
        return 0;
 }
-static int rs5c313_rtc_remove(struct platform_device *pdev)
-{
-        return 0;
-}
 static struct platform_driver rs5c313_rtc_platform_driver = {
        .driver         = {
                .name   = DRV_NAME,
                .owner  = THIS_MODULE,
        },
-        .probe  = rs5c313_rtc_probe,
+        .probe  = rs5c313_rtc_probe,
-        .remove = rs5c313_rtc_remove,
 };
 static int __init rs5c313_rtc_init(void)
@@ -408,7 +402,7 @@ static int __init rs5c313_rtc_init(void)
 static void __exit rs5c313_rtc_exit(void)
 {
-        platform_driver_unregister( &rs5c313_rtc_platform_driver );
+        platform_driver_unregister(&rs5c313_rtc_platform_driver);
 }
 module_init(rs5c313_rtc_init);
diff --git a/drivers/rtc/rtc-rs5c348.c b/drivers/rtc/rtc-rs5c348.c
index 2c37df3586c7..f7a90a116a39 100644
--- a/drivers/rtc/rtc-rs5c348.c
+++ b/drivers/rtc/rtc-rs5c348.c
@@ -218,18 +218,12 @@ static int rs5c348_probe(struct spi_device *spi)
        return ret;
 }
-static int rs5c348_remove(struct spi_device *spi)
-{
-        return 0;
-}
 static struct spi_driver rs5c348_driver = {
        .driver = {
                .name   = "rtc-rs5c348",
                .owner  = THIS_MODULE,
        },
        .probe  = rs5c348_probe,
-        .remove = rs5c348_remove,
 };
 module_spi_driver(rs5c348_driver);
diff --git a/drivers/rtc/rtc-rv3029c2.c b/drivers/rtc/rtc-rv3029c2.c
index 5032c24ec159..1a779a67ff66 100644
--- a/drivers/rtc/rtc-rv3029c2.c
+++ b/drivers/rtc/rtc-rv3029c2.c
@@ -310,7 +310,7 @@ static int rv3029c2_rtc_i2c_set_alarm(struct i2c_client *client,
                dev_dbg(&client->dev, "alarm IRQ armed\n");
        } else {
                /* disable AIE irq */
-                ret = rv3029c2_rtc_i2c_alarm_set_irq(client, 1);
+                ret = rv3029c2_rtc_i2c_alarm_set_irq(client, 0);
                if (ret)
                        return ret;
@@ -412,17 +412,11 @@ static int rv3029c2_probe(struct i2c_client *client,
        return 0;
 }
-static int rv3029c2_remove(struct i2c_client *client)
-{
-        return 0;
-}
 static struct i2c_driver rv3029c2_driver = {
        .driver = {
                .name = "rtc-rv3029c2",
        },
        .probe = rv3029c2_probe,
-        .remove = rv3029c2_remove,
        .id_table = rv3029c2_id,
 };
diff --git a/drivers/rtc/rtc-rx4581.c b/drivers/rtc/rtc-rx4581.c
index 84eb08d65d30..6889222f9ed6 100644
--- a/drivers/rtc/rtc-rx4581.c
+++ b/drivers/rtc/rtc-rx4581.c
@@ -282,11 +282,6 @@ static int rx4581_probe(struct spi_device *spi)
        return 0;
 }
-static int rx4581_remove(struct spi_device *spi)
-{
-        return 0;
-}
 static const struct spi_device_id rx4581_id[] = {
        { "rx4581", 0 },
        { }
@@ -299,7 +294,6 @@ static struct spi_driver rx4581_driver = {
                .owner  = THIS_MODULE,
        },
        .probe  = rx4581_probe,
-        .remove = rx4581_remove,
        .id_table = rx4581_id,
 };
diff --git a/drivers/rtc/rtc-rx8025.c b/drivers/rtc/rtc-rx8025.c
index 0722d36b9c9a..8fa23eabcb68 100644
--- a/drivers/rtc/rtc-rx8025.c
+++ b/drivers/rtc/rtc-rx8025.c
@@ -549,7 +549,7 @@ static int rx8025_probe(struct i2c_client *client,
                goto errout;
        }
-        rx8025 = kzalloc(sizeof(*rx8025), GFP_KERNEL);
+        rx8025 = devm_kzalloc(&client->dev, sizeof(*rx8025), GFP_KERNEL);
        if (!rx8025) {
                dev_err(&adapter->dev, "failed to alloc memory\n");
                err = -ENOMEM;
@@ -562,7 +562,7 @@ static int rx8025_probe(struct i2c_client *client,
        err = rx8025_init_client(client, &need_reset);
        if (err)
-                goto errout_free;
+                goto errout;
        if (need_reset) {
                struct rtc_time tm;
@@ -572,12 +572,12 @@ static int rx8025_probe(struct i2c_client *client,
                rx8025_set_time(&client->dev, &tm);
        }
-        rx8025->rtc = rtc_device_register(client->name, &client->dev,
+        rx8025->rtc = devm_rtc_device_register(&client->dev, client->name,
                                          &rx8025_rtc_ops, THIS_MODULE);
        if (IS_ERR(rx8025->rtc)) {
                err = PTR_ERR(rx8025->rtc);
                dev_err(&client->dev, "unable to register the class device\n");
-                goto errout_free;
+                goto errout;
        }
        if (client->irq > 0) {
@@ -586,7 +586,7 @@ static int rx8025_probe(struct i2c_client *client,
                                  0, "rx8025", client);
                if (err) {
                        dev_err(&client->dev, "unable to request IRQ\n");
-                        goto errout_reg;
+                        goto errout;
                }
        }
@@ -603,12 +603,6 @@ errout_irq:
        if (client->irq > 0)
                free_irq(client->irq, client);
-errout_reg:
-        rtc_device_unregister(rx8025->rtc);
-errout_free:
-        kfree(rx8025);
 errout:
        dev_err(&adapter->dev, "probing for rx8025 failed\n");
        return err;
@@ -629,8 +623,6 @@ static int rx8025_remove(struct i2c_client *client)
        }
        rx8025_sysfs_unregister(&client->dev);
-        rtc_device_unregister(rx8025->rtc);
-        kfree(rx8025);
        return 0;
 }
diff --git a/drivers/rtc/rtc-rx8581.c b/drivers/rtc/rtc-rx8581.c
index 07f3037b18f4..00b0eb7fe166 100644
--- a/drivers/rtc/rtc-rx8581.c
+++ b/drivers/rtc/rtc-rx8581.c
@@ -251,11 +251,6 @@ static int rx8581_probe(struct i2c_client *client,
        return 0;
 }
-static int rx8581_remove(struct i2c_client *client)
-{
-        return 0;
-}
 static const struct i2c_device_id rx8581_id[] = {
        { "rx8581", 0 },
        { }
@@ -268,7 +263,6 @@ static struct i2c_driver rx8581_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = rx8581_probe,
-        .remove         = rx8581_remove,
        .id_table       = rx8581_id,
 };
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 0b495e8b8e66..7afd373b9595 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -421,8 +421,6 @@ static void s3c_rtc_enable(struct platform_device *pdev, int en)
 static int s3c_rtc_remove(struct platform_device *dev)
 {
-        platform_set_drvdata(dev, NULL);
        s3c_rtc_setaie(&dev->dev, 0);
        clk_unprepare(rtc_clk);
@@ -549,23 +547,20 @@ static int s3c_rtc_probe(struct platform_device *pdev)
                          0,  "s3c2410-rtc alarm", rtc);
        if (ret) {
                dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret);
-                goto err_alarm_irq;
+                goto err_nortc;
        }
        ret = devm_request_irq(&pdev->dev, s3c_rtc_tickno, s3c_rtc_tickirq,
                          0,  "s3c2410-rtc tick", rtc);
        if (ret) {
                dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret);
-                goto err_alarm_irq;
+                goto err_nortc;
        }
        clk_disable(rtc_clk);
        return 0;
- err_alarm_irq:
-        platform_set_drvdata(pdev, NULL);
 err_nortc:
        s3c_rtc_enable(pdev, 0);
        clk_disable_unprepare(rtc_clk);
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index 00605601dbf7..0f7adeb1944a 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -249,7 +249,7 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
        ret = clk_prepare_enable(info->clk);
        if (ret)
-                goto err_enable_clk;
+                return ret;
        /*
         * According to the manual we should be able to let RTTR be zero
         * and then a default diviser for a 32.768KHz clock is used.
@@ -303,8 +303,6 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
        return 0;
 err_dev:
        clk_disable_unprepare(info->clk);
-err_enable_clk:
-        platform_set_drvdata(pdev, NULL);
        return ret;
 }
@@ -312,10 +310,8 @@ static int sa1100_rtc_remove(struct platform_device *pdev)
 {
        struct sa1100_rtc *info = platform_get_drvdata(pdev);
-        if (info) {
+        if (info)
                clk_disable_unprepare(info->clk);
-                platform_set_drvdata(pdev, NULL);
-        }
        return 0;
 }
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index 8d5bd2e36776..6d87e26355a3 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -593,7 +593,7 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
        char clk_name[6];
        int clk_id, ret;
-        rtc = kzalloc(sizeof(struct sh_rtc), GFP_KERNEL);
+        rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
        if (unlikely(!rtc))
                return -ENOMEM;
@@ -602,9 +602,8 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
        /* get periodic/carry/alarm irqs */
        ret = platform_get_irq(pdev, 0);
        if (unlikely(ret <= 0)) {
-                ret = -ENOENT;
                dev_err(&pdev->dev, "No IRQ resource\n");
-                goto err_badres;
+                return -ENOENT;
        }
        rtc->periodic_irq = ret;
@@ -613,24 +612,21 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
        if (unlikely(res == NULL)) {
-                ret = -ENOENT;
                dev_err(&pdev->dev, "No IO resource\n");
-                goto err_badres;
+                return -ENOENT;
        }
        rtc->regsize = resource_size(res);
-        rtc->res = request_mem_region(res->start, rtc->regsize, pdev->name);
+        rtc->res = devm_request_mem_region(&pdev->dev, res->start,
-        if (unlikely(!rtc->res)) {
+                                        rtc->regsize, pdev->name);
-                ret = -EBUSY;
+        if (unlikely(!rtc->res))
-                goto err_badres;
+                return -EBUSY;
-        }
-        rtc->regbase = ioremap_nocache(rtc->res->start, rtc->regsize);
+        rtc->regbase = devm_ioremap_nocache(&pdev->dev, rtc->res->start,
-        if (unlikely(!rtc->regbase)) {
+                                        rtc->regsize);
-                ret = -EINVAL;
+        if (unlikely(!rtc->regbase))
-                goto err_badmap;
+                return -EINVAL;
-        }
        clk_id = pdev->id;
        /* With a single device, the clock id is still "rtc0" */
@@ -639,7 +635,7 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
        snprintf(clk_name, sizeof(clk_name), "rtc%d", clk_id);
-        rtc->clk = clk_get(&pdev->dev, clk_name);
+        rtc->clk = devm_clk_get(&pdev->dev, clk_name);
        if (IS_ERR(rtc->clk)) {
                /*
                 * No error handling for rtc->clk intentionally, not all
@@ -665,8 +661,8 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
        if (rtc->carry_irq <= 0) {
                /* register shared periodic/carry/alarm irq */
-                ret = request_irq(rtc->periodic_irq, sh_rtc_shared,
+                ret = devm_request_irq(&pdev->dev, rtc->periodic_irq,
-                                  0, "sh-rtc", rtc);
+                                sh_rtc_shared, 0, "sh-rtc", rtc);
                if (unlikely(ret)) {
                        dev_err(&pdev->dev,
                                "request IRQ failed with %d, IRQ %d\n", ret,
@@ -675,8 +671,8 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
                }
        } else {
                /* register periodic/carry/alarm irqs */
-                ret = request_irq(rtc->periodic_irq, sh_rtc_periodic,
+                ret = devm_request_irq(&pdev->dev, rtc->periodic_irq,
-                                  0, "sh-rtc period", rtc);
+                                sh_rtc_periodic, 0, "sh-rtc period", rtc);
                if (unlikely(ret)) {
                        dev_err(&pdev->dev,
                                "request period IRQ failed with %d, IRQ %d\n",
@@ -684,24 +680,21 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
                        goto err_unmap;
                }
-                ret = request_irq(rtc->carry_irq, sh_rtc_interrupt,
+                ret = devm_request_irq(&pdev->dev, rtc->carry_irq,
-                                  0, "sh-rtc carry", rtc);
+                                sh_rtc_interrupt, 0, "sh-rtc carry", rtc);
                if (unlikely(ret)) {
                        dev_err(&pdev->dev,
                                "request carry IRQ failed with %d, IRQ %d\n",
                                ret, rtc->carry_irq);
-                        free_irq(rtc->periodic_irq, rtc);
                        goto err_unmap;
                }
-                ret = request_irq(rtc->alarm_irq, sh_rtc_alarm,
+                ret = devm_request_irq(&pdev->dev, rtc->alarm_irq,
-                                  0, "sh-rtc alarm", rtc);
+                                sh_rtc_alarm, 0, "sh-rtc alarm", rtc);
                if (unlikely(ret)) {
                        dev_err(&pdev->dev,
                                "request alarm IRQ failed with %d, IRQ %d\n",
                                ret, rtc->alarm_irq);
-                        free_irq(rtc->carry_irq, rtc);
-                        free_irq(rtc->periodic_irq, rtc);
                        goto err_unmap;
                }
        }
@@ -714,13 +707,10 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
        sh_rtc_setaie(&pdev->dev, 0);
        sh_rtc_setcie(&pdev->dev, 0);
-        rtc->rtc_dev = rtc_device_register("sh", &pdev->dev,
+        rtc->rtc_dev = devm_rtc_device_register(&pdev->dev, "sh",
                                           &sh_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc->rtc_dev)) {
                ret = PTR_ERR(rtc->rtc_dev);
-                free_irq(rtc->periodic_irq, rtc);
-                free_irq(rtc->carry_irq, rtc);
-                free_irq(rtc->alarm_irq, rtc);
                goto err_unmap;
        }
@@ -737,12 +727,6 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
 err_unmap:
        clk_disable(rtc->clk);
-        clk_put(rtc->clk);
-        iounmap(rtc->regbase);
-err_badmap:
-        release_mem_region(rtc->res->start, rtc->regsize);
-err_badres:
-        kfree(rtc);
        return ret;
 }
@@ -751,28 +735,12 @@ static int __exit sh_rtc_remove(struct platform_device *pdev)
 {
        struct sh_rtc *rtc = platform_get_drvdata(pdev);
-        rtc_device_unregister(rtc->rtc_dev);
        sh_rtc_irq_set_state(&pdev->dev, 0);
        sh_rtc_setaie(&pdev->dev, 0);
        sh_rtc_setcie(&pdev->dev, 0);
-        free_irq(rtc->periodic_irq, rtc);
-        if (rtc->carry_irq > 0) {
-                free_irq(rtc->carry_irq, rtc);
-                free_irq(rtc->alarm_irq, rtc);
-        }
-        iounmap(rtc->regbase);
-        release_mem_region(rtc->res->start, rtc->regsize);
        clk_disable(rtc->clk);
-        clk_put(rtc->clk);
-        platform_set_drvdata(pdev, NULL);
-        kfree(rtc);
        return 0;
 }
diff --git a/drivers/rtc/rtc-sirfsoc.c b/drivers/rtc/rtc-sirfsoc.c
new file mode 100644
index 000000000000..aa7ed4b5f7f0
--- /dev/null
+++ b/drivers/rtc/rtc-sirfsoc.c
@@ -0,0 +1,475 @@
+/*
+ * SiRFSoC Real Time Clock interface for Linux
+ *
+ * Copyright (c) 2013 Cambridge Silicon Radio Limited, a CSR plc group company.
+ *
+ * Licensed under GPLv2 or later.
+ */
+#include <linux/module.h>
+#include <linux/err.h>
+#include <linux/rtc.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/rtc/sirfsoc_rtciobrg.h>
+#define RTC_CN                  0x00
+#define RTC_ALARM0              0x04
+#define RTC_ALARM1              0x18
+#define RTC_STATUS              0x08
+#define RTC_SW_VALUE            0x40
+#define SIRFSOC_RTC_AL1E        (1<<6)
+#define SIRFSOC_RTC_AL1         (1<<4)
+#define SIRFSOC_RTC_HZE         (1<<3)
+#define SIRFSOC_RTC_AL0E        (1<<2)
+#define SIRFSOC_RTC_HZ          (1<<1)
+#define SIRFSOC_RTC_AL0         (1<<0)
+#define RTC_DIV                 0x0c
+#define RTC_DEEP_CTRL           0x14
+#define RTC_CLOCK_SWITCH        0x1c
+#define SIRFSOC_RTC_CLK         0x03    /* others are reserved */
+/* Refer to RTC DIV switch */
+#define RTC_HZ                  16
+/* This macro is also defined in arch/arm/plat-sirfsoc/cpu.c */
+#define RTC_SHIFT               4
+#define INTR_SYSRTC_CN          0x48
+struct sirfsoc_rtc_drv {
+        struct rtc_device       *rtc;
+        u32                     rtc_base;
+        u32                     irq;
+        /* Overflow for every 8 years extra time */
+        u32                     overflow_rtc;
+#ifdef CONFIG_PM
+        u32             saved_counter;
+        u32             saved_overflow_rtc;
+#endif
+};
+static int sirfsoc_rtc_read_alarm(struct device *dev,
+                struct rtc_wkalrm *alrm)
+{
+        unsigned long rtc_alarm, rtc_count;
+        struct sirfsoc_rtc_drv *rtcdrv;
+        rtcdrv = (struct sirfsoc_rtc_drv *)dev_get_drvdata(dev);
+        local_irq_disable();
+        rtc_count = sirfsoc_rtc_iobrg_readl(rtcdrv->rtc_base + RTC_CN);
+        rtc_alarm = sirfsoc_rtc_iobrg_readl(rtcdrv->rtc_base + RTC_ALARM0);
+        memset(alrm, 0, sizeof(struct rtc_wkalrm));
+        /*
+         * assume alarm interval not beyond one round counter overflow_rtc:
+         * 0->0xffffffff
+         */
+        /* if alarm is in next overflow cycle */
+        if (rtc_count > rtc_alarm)
+                rtc_time_to_tm((rtcdrv->overflow_rtc + 1)
+                                << (BITS_PER_LONG - RTC_SHIFT)
+                                | rtc_alarm >> RTC_SHIFT, &(alrm->time));
+        else
+                rtc_time_to_tm(rtcdrv->overflow_rtc
+                                << (BITS_PER_LONG - RTC_SHIFT)
+                                | rtc_alarm >> RTC_SHIFT, &(alrm->time));
+        if (sirfsoc_rtc_iobrg_readl(
+                        rtcdrv->rtc_base + RTC_STATUS) & SIRFSOC_RTC_AL0E)
+                alrm->enabled = 1;
+        local_irq_enable();
+        return 0;
+}
+static int sirfsoc_rtc_set_alarm(struct device *dev,
+                struct rtc_wkalrm *alrm)
+{
+        unsigned long rtc_status_reg, rtc_alarm;
+        struct sirfsoc_rtc_drv *rtcdrv;
+        rtcdrv = (struct sirfsoc_rtc_drv *)dev_get_drvdata(dev);
+        if (alrm->enabled) {
+                rtc_tm_to_time(&(alrm->time), &rtc_alarm);
+                local_irq_disable();
+                rtc_status_reg = sirfsoc_rtc_iobrg_readl(
+                                rtcdrv->rtc_base + RTC_STATUS);
+                if (rtc_status_reg & SIRFSOC_RTC_AL0E) {
+                        /*
+                         * An ongoing alarm in progress - ingore it and not
+                         * to return EBUSY
+                         */
+                        dev_info(dev, "An old alarm was set, will be replaced by a new one\n");
+                }
+                sirfsoc_rtc_iobrg_writel(
+                        rtc_alarm << RTC_SHIFT, rtcdrv->rtc_base + RTC_ALARM0);
+                rtc_status_reg &= ~0x07; /* mask out the lower status bits */
+                /*
+                 * This bit RTC_AL sets it as a wake-up source for Sleep Mode
+                 * Writing 1 into this bit will clear it
+                 */
+                rtc_status_reg |= SIRFSOC_RTC_AL0;
+                /* enable the RTC alarm interrupt */
+                rtc_status_reg |= SIRFSOC_RTC_AL0E;
+                sirfsoc_rtc_iobrg_writel(
+                        rtc_status_reg, rtcdrv->rtc_base + RTC_STATUS);
+                local_irq_enable();
+        } else {
+                /*
+                 * if this function was called with enabled=0
+                 * then it could mean that the application is
+                 * trying to cancel an ongoing alarm
+                 */
+                local_irq_disable();
+                rtc_status_reg = sirfsoc_rtc_iobrg_readl(
+                                rtcdrv->rtc_base + RTC_STATUS);
+                if (rtc_status_reg & SIRFSOC_RTC_AL0E) {
+                        /* clear the RTC status register's alarm bit */
+                        rtc_status_reg &= ~0x07;
+                        /* write 1 into SIRFSOC_RTC_AL0 to force a clear */
+                        rtc_status_reg |= (SIRFSOC_RTC_AL0);
+                        /* Clear the Alarm enable bit */
+                        rtc_status_reg &= ~(SIRFSOC_RTC_AL0E);
+                        sirfsoc_rtc_iobrg_writel(rtc_status_reg,
+                                        rtcdrv->rtc_base + RTC_STATUS);
+                }
+                local_irq_enable();
+        }
+        return 0;
+}
+static int sirfsoc_rtc_read_time(struct device *dev,
+                struct rtc_time *tm)
+{
+        unsigned long tmp_rtc = 0;
+        struct sirfsoc_rtc_drv *rtcdrv;
+        rtcdrv = (struct sirfsoc_rtc_drv *)dev_get_drvdata(dev);
+        /*
+         * This patch is taken from WinCE - Need to validate this for
+         * correctness. To work around sirfsoc RTC counter double sync logic
+         * fail, read several times to make sure get stable value.
+         */
+        do {
+                tmp_rtc = sirfsoc_rtc_iobrg_readl(rtcdrv->rtc_base + RTC_CN);
+                cpu_relax();
+        } while (tmp_rtc != sirfsoc_rtc_iobrg_readl(rtcdrv->rtc_base + RTC_CN));
+        rtc_time_to_tm(rtcdrv->overflow_rtc << (BITS_PER_LONG - RTC_SHIFT) |
+                                        tmp_rtc >> RTC_SHIFT, tm);
+        return 0;
+}
+static int sirfsoc_rtc_set_time(struct device *dev,
+                struct rtc_time *tm)
+{
+        unsigned long rtc_time;
+        struct sirfsoc_rtc_drv *rtcdrv;
+        rtcdrv = (struct sirfsoc_rtc_drv *)dev_get_drvdata(dev);
+        rtc_tm_to_time(tm, &rtc_time);
+        rtcdrv->overflow_rtc = rtc_time >> (BITS_PER_LONG - RTC_SHIFT);
+        sirfsoc_rtc_iobrg_writel(rtcdrv->overflow_rtc,
+                        rtcdrv->rtc_base + RTC_SW_VALUE);
+        sirfsoc_rtc_iobrg_writel(
+                        rtc_time << RTC_SHIFT, rtcdrv->rtc_base + RTC_CN);
+        return 0;
+}
+static int sirfsoc_rtc_ioctl(struct device *dev, unsigned int cmd,
+                unsigned long arg)
+{
+        switch (cmd) {
+        case RTC_PIE_ON:
+        case RTC_PIE_OFF:
+        case RTC_UIE_ON:
+        case RTC_UIE_OFF:
+        case RTC_AIE_ON:
+        case RTC_AIE_OFF:
+                return 0;
+        default:
+                return -ENOIOCTLCMD;
+        }
+}
+static const struct rtc_class_ops sirfsoc_rtc_ops = {
+        .read_time = sirfsoc_rtc_read_time,
+        .set_time = sirfsoc_rtc_set_time,
+        .read_alarm = sirfsoc_rtc_read_alarm,
+        .set_alarm = sirfsoc_rtc_set_alarm,
+        .ioctl = sirfsoc_rtc_ioctl
+};
+static irqreturn_t sirfsoc_rtc_irq_handler(int irq, void *pdata)
+{
+        struct sirfsoc_rtc_drv *rtcdrv = pdata;
+        unsigned long rtc_status_reg = 0x0;
+        unsigned long events = 0x0;
+        rtc_status_reg = sirfsoc_rtc_iobrg_readl(rtcdrv->rtc_base + RTC_STATUS);
+        /* this bit will be set ONLY if an alarm was active
+         * and it expired NOW
+         * So this is being used as an ASSERT
+         */
+        if (rtc_status_reg & SIRFSOC_RTC_AL0) {
+                /*
+                 * clear the RTC status register's alarm bit
+                 * mask out the lower status bits
+                 */
+                rtc_status_reg &= ~0x07;
+                /* write 1 into SIRFSOC_RTC_AL0 to ACK the alarm interrupt */
+                rtc_status_reg |= (SIRFSOC_RTC_AL0);
+                /* Clear the Alarm enable bit */
+                rtc_status_reg &= ~(SIRFSOC_RTC_AL0E);
+        }
+        sirfsoc_rtc_iobrg_writel(rtc_status_reg, rtcdrv->rtc_base + RTC_STATUS);
+        /* this should wake up any apps polling/waiting on the read
+         * after setting the alarm
+         */
+        events |= RTC_IRQF | RTC_AF;
+        rtc_update_irq(rtcdrv->rtc, 1, events);
+        return IRQ_HANDLED;
+}
+static const struct of_device_id sirfsoc_rtc_of_match[] = {
+        { .compatible = "sirf,prima2-sysrtc"},
+        {},
+};
+MODULE_DEVICE_TABLE(of, sirfsoc_rtc_of_match);
+static int sirfsoc_rtc_probe(struct platform_device *pdev)
+{
+        int err;
+        unsigned long rtc_div;
+        struct sirfsoc_rtc_drv *rtcdrv;
+        struct device_node *np = pdev->dev.of_node;
+        rtcdrv = devm_kzalloc(&pdev->dev,
+                sizeof(struct sirfsoc_rtc_drv), GFP_KERNEL);
+        if (rtcdrv == NULL) {
+                dev_err(&pdev->dev,
+                        "%s: can't alloc mem for drv struct\n",
+                        pdev->name);
+                return -ENOMEM;
+        }
+        err = of_property_read_u32(np, "reg", &rtcdrv->rtc_base);
+        if (err) {
+                dev_err(&pdev->dev, "unable to find base address of rtc node in dtb\n");
+                goto error;
+        }
+        platform_set_drvdata(pdev, rtcdrv);
+        /* Register rtc alarm as a wakeup source */
+        device_init_wakeup(&pdev->dev, 1);
+        /*
+         * Set SYS_RTC counter in RTC_HZ HZ Units
+         * We are using 32K RTC crystal (32768 / RTC_HZ / 2) -1
+         * If 16HZ, therefore RTC_DIV = 1023;
+         */
+        rtc_div = ((32768 / RTC_HZ) / 2) - 1;
+        sirfsoc_rtc_iobrg_writel(rtc_div, rtcdrv->rtc_base + RTC_DIV);
+        rtcdrv->rtc = rtc_device_register(pdev->name, &(pdev->dev),
+                        &sirfsoc_rtc_ops, THIS_MODULE);
+        if (IS_ERR(rtcdrv->rtc)) {
+                err = PTR_ERR(rtcdrv->rtc);
+                dev_err(&pdev->dev, "can't register RTC device\n");
+                return err;
+        }
+        /* 0x3 -> RTC_CLK */
+        sirfsoc_rtc_iobrg_writel(SIRFSOC_RTC_CLK,
+                        rtcdrv->rtc_base + RTC_CLOCK_SWITCH);
+        /* reset SYS RTC ALARM0 */
+        sirfsoc_rtc_iobrg_writel(0x0, rtcdrv->rtc_base + RTC_ALARM0);
+        /* reset SYS RTC ALARM1 */
+        sirfsoc_rtc_iobrg_writel(0x0, rtcdrv->rtc_base + RTC_ALARM1);
+        /* Restore RTC Overflow From Register After Command Reboot */
+        rtcdrv->overflow_rtc =
+                sirfsoc_rtc_iobrg_readl(rtcdrv->rtc_base + RTC_SW_VALUE);
+        rtcdrv->irq = platform_get_irq(pdev, 0);
+        err = devm_request_irq(
+                        &pdev->dev,
+                        rtcdrv->irq,
+                        sirfsoc_rtc_irq_handler,
+                        IRQF_SHARED,
+                        pdev->name,
+                        rtcdrv);
+        if (err) {
+                dev_err(&pdev->dev, "Unable to register for the SiRF SOC RTC IRQ\n");
+                goto error;
+        }
+        return 0;
+error:
+        if (rtcdrv->rtc)
+                rtc_device_unregister(rtcdrv->rtc);
+        return err;
+}
+static int sirfsoc_rtc_remove(struct platform_device *pdev)
+{
+        struct sirfsoc_rtc_drv *rtcdrv = platform_get_drvdata(pdev);
+        device_init_wakeup(&pdev->dev, 0);
+        rtc_device_unregister(rtcdrv->rtc);
+        return 0;
+}
+#ifdef CONFIG_PM
+static int sirfsoc_rtc_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct sirfsoc_rtc_drv *rtcdrv = platform_get_drvdata(pdev);
+        rtcdrv->overflow_rtc =
+                sirfsoc_rtc_iobrg_readl(rtcdrv->rtc_base + RTC_SW_VALUE);
+        rtcdrv->saved_counter =
+                sirfsoc_rtc_iobrg_readl(rtcdrv->rtc_base + RTC_CN);
+        rtcdrv->saved_overflow_rtc = rtcdrv->overflow_rtc;
+        if (device_may_wakeup(&pdev->dev))
+                enable_irq_wake(rtcdrv->irq);
+        return 0;
+}
+static int sirfsoc_rtc_freeze(struct device *dev)
+{
+        sirfsoc_rtc_suspend(dev);
+        return 0;
+}
+static int sirfsoc_rtc_thaw(struct device *dev)
+{
+        u32 tmp;
+        struct sirfsoc_rtc_drv *rtcdrv;
+        rtcdrv = (struct sirfsoc_rtc_drv *)dev_get_drvdata(dev);
+        /*
+         * if resume from snapshot and the rtc power is losed,
+         * restroe the rtc settings
+         */
+        if (SIRFSOC_RTC_CLK != sirfsoc_rtc_iobrg_readl(
+                        rtcdrv->rtc_base + RTC_CLOCK_SWITCH)) {
+                u32 rtc_div;
+                /* 0x3 -> RTC_CLK */
+                sirfsoc_rtc_iobrg_writel(SIRFSOC_RTC_CLK,
+                        rtcdrv->rtc_base + RTC_CLOCK_SWITCH);
+                /*
+                 * Set SYS_RTC counter in RTC_HZ HZ Units
+                 * We are using 32K RTC crystal (32768 / RTC_HZ / 2) -1
+                 * If 16HZ, therefore RTC_DIV = 1023;
+                 */
+                rtc_div = ((32768 / RTC_HZ) / 2) - 1;
+                sirfsoc_rtc_iobrg_writel(rtc_div, rtcdrv->rtc_base + RTC_DIV);
+                /* reset SYS RTC ALARM0 */
+                sirfsoc_rtc_iobrg_writel(0x0, rtcdrv->rtc_base + RTC_ALARM0);
+                /* reset SYS RTC ALARM1 */
+                sirfsoc_rtc_iobrg_writel(0x0, rtcdrv->rtc_base + RTC_ALARM1);
+        }
+        rtcdrv->overflow_rtc = rtcdrv->saved_overflow_rtc;
+        /*
+         * if current counter is small than previous,
+         * it means overflow in sleep
+         */
+        tmp = sirfsoc_rtc_iobrg_readl(rtcdrv->rtc_base + RTC_CN);
+        if (tmp <= rtcdrv->saved_counter)
+                rtcdrv->overflow_rtc++;
+        /*
+         *PWRC Value Be Changed When Suspend, Restore Overflow
+         * In Memory To Register
+         */
+        sirfsoc_rtc_iobrg_writel(rtcdrv->overflow_rtc,
+                        rtcdrv->rtc_base + RTC_SW_VALUE);
+        return 0;
+}
+static int sirfsoc_rtc_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct sirfsoc_rtc_drv *rtcdrv = platform_get_drvdata(pdev);
+        sirfsoc_rtc_thaw(dev);
+        if (device_may_wakeup(&pdev->dev))
+                disable_irq_wake(rtcdrv->irq);
+        return 0;
+}
+static int sirfsoc_rtc_restore(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct sirfsoc_rtc_drv *rtcdrv = platform_get_drvdata(pdev);
+        if (device_may_wakeup(&pdev->dev))
+                disable_irq_wake(rtcdrv->irq);
+        return 0;
+}
+#else
+#define sirfsoc_rtc_suspend     NULL
+#define sirfsoc_rtc_resume      NULL
+#define sirfsoc_rtc_freeze      NULL
+#define sirfsoc_rtc_thaw        NULL
+#define sirfsoc_rtc_restore     NULL
+#endif
+static const struct dev_pm_ops sirfsoc_rtc_pm_ops = {
+        .suspend = sirfsoc_rtc_suspend,
+        .resume = sirfsoc_rtc_resume,
+        .freeze = sirfsoc_rtc_freeze,
+        .thaw = sirfsoc_rtc_thaw,
+        .restore = sirfsoc_rtc_restore,
+};
+static struct platform_driver sirfsoc_rtc_driver = {
+        .driver = {
+                .name = "sirfsoc-rtc",
+                .owner = THIS_MODULE,
+#ifdef CONFIG_PM
+                .pm = &sirfsoc_rtc_pm_ops,
+#endif
+                .of_match_table = of_match_ptr(sirfsoc_rtc_of_match),
+        },
+        .probe = sirfsoc_rtc_probe,
+        .remove = sirfsoc_rtc_remove,
+};
+module_platform_driver(sirfsoc_rtc_driver);
+MODULE_DESCRIPTION("SiRF SoC rtc driver");
+MODULE_AUTHOR("Xianglong Du <Xianglong.Du@csr.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:sirfsoc-rtc");
diff --git a/drivers/rtc/rtc-snvs.c b/drivers/rtc/rtc-snvs.c
index b04f09a1df2a..316a342115b2 100644
--- a/drivers/rtc/rtc-snvs.c
+++ b/drivers/rtc/rtc-snvs.c
@@ -294,11 +294,6 @@ static int snvs_rtc_probe(struct platform_device *pdev)
        return 0;
 }
-static int snvs_rtc_remove(struct platform_device *pdev)
-{
-        return 0;
-}
 #ifdef CONFIG_PM_SLEEP
 static int snvs_rtc_suspend(struct device *dev)
 {
@@ -337,7 +332,6 @@ static struct platform_driver snvs_rtc_driver = {
                .of_match_table = of_match_ptr(snvs_dt_ids),
        },
        .probe          = snvs_rtc_probe,
-        .remove         = snvs_rtc_remove,
 };
 module_platform_driver(snvs_rtc_driver);
diff --git a/drivers/rtc/rtc-spear.c b/drivers/rtc/rtc-spear.c
index 574359c48f65..c492cf0ab8cd 100644
--- a/drivers/rtc/rtc-spear.c
+++ b/drivers/rtc/rtc-spear.c
@@ -417,7 +417,6 @@ static int spear_rtc_probe(struct platform_device *pdev)
        return 0;
 err_disable_clock:
-        platform_set_drvdata(pdev, NULL);
        clk_disable_unprepare(config->clk);
        return status;
diff --git a/drivers/rtc/rtc-starfire.c b/drivers/rtc/rtc-starfire.c
index 987b5ec0ae56..f7d8a6db8078 100644
--- a/drivers/rtc/rtc-starfire.c
+++ b/drivers/rtc/rtc-starfire.c
@@ -51,17 +51,11 @@ static int __init starfire_rtc_probe(struct platform_device *pdev)
        return 0;
 }
-static int __exit starfire_rtc_remove(struct platform_device *pdev)
-{
-        return 0;
-}
 static struct platform_driver starfire_rtc_driver = {
        .driver         = {
                .name   = "rtc-starfire",
                .owner  = THIS_MODULE,
        },
-        .remove         = __exit_p(starfire_rtc_remove),
 };
 module_platform_driver_probe(starfire_rtc_driver, starfire_rtc_probe);
diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c
index 483ce086990b..90a3e864b8fe 100644
--- a/drivers/rtc/rtc-stmp3xxx.c
+++ b/drivers/rtc/rtc-stmp3xxx.c
@@ -225,7 +225,6 @@ static int stmp3xxx_rtc_remove(struct platform_device *pdev)
        writel(STMP3XXX_RTC_CTRL_ALARM_IRQ_EN,
                        rtc_data->io + STMP3XXX_RTC_CTRL_CLR);
-        platform_set_drvdata(pdev, NULL);
        return 0;
 }
@@ -274,25 +273,19 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev)
        rtc_data->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
                                &stmp3xxx_rtc_ops, THIS_MODULE);
-        if (IS_ERR(rtc_data->rtc)) {
+        if (IS_ERR(rtc_data->rtc))
-                err = PTR_ERR(rtc_data->rtc);
+                return PTR_ERR(rtc_data->rtc);
-                goto out;
-        }
        err = devm_request_irq(&pdev->dev, rtc_data->irq_alarm,
                        stmp3xxx_rtc_interrupt, 0, "RTC alarm", &pdev->dev);
        if (err) {
                dev_err(&pdev->dev, "Cannot claim IRQ%d\n",
                        rtc_data->irq_alarm);
-                goto out;
+                return err;
        }
        stmp3xxx_wdt_register(pdev);
        return 0;
-out:
-        platform_set_drvdata(pdev, NULL);
-        return err;
 }
 #ifdef CONFIG_PM_SLEEP
diff --git a/drivers/rtc/rtc-sun4v.c b/drivers/rtc/rtc-sun4v.c
index ce42e5fa9e09..bc97ff91341d 100644
--- a/drivers/rtc/rtc-sun4v.c
+++ b/drivers/rtc/rtc-sun4v.c
@@ -92,17 +92,11 @@ static int __init sun4v_rtc_probe(struct platform_device *pdev)
        return 0;
 }
-static int __exit sun4v_rtc_remove(struct platform_device *pdev)
-{
-        return 0;
-}
 static struct platform_driver sun4v_rtc_driver = {
        .driver         = {
                .name   = "rtc-sun4v",
                .owner  = THIS_MODULE,
        },
-        .remove         = __exit_p(sun4v_rtc_remove),
 };
 module_platform_driver_probe(sun4v_rtc_driver, sun4v_rtc_probe);
diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c
index b70e2bb63645..4b26f8672b2d 100644
--- a/drivers/rtc/rtc-sysfs.c
+++ b/drivers/rtc/rtc-sysfs.c
@@ -164,6 +164,7 @@ rtc_sysfs_set_wakealarm(struct device *dev, struct device_attribute *attr,
 {
        ssize_t retval;
        unsigned long now, alarm;
+        unsigned long push = 0;
        struct rtc_wkalrm alm;
        struct rtc_device *rtc = to_rtc_device(dev);
        char *buf_ptr;
@@ -180,13 +181,17 @@ rtc_sysfs_set_wakealarm(struct device *dev, struct device_attribute *attr,
        buf_ptr = (char *)buf;
        if (*buf_ptr == '+') {
                buf_ptr++;
-                adjust = 1;
+                if (*buf_ptr == '=') {
+                        buf_ptr++;
+                        push = 1;
+                } else
+                        adjust = 1;
        }
        alarm = simple_strtoul(buf_ptr, NULL, 0);
        if (adjust) {
                alarm += now;
        }
-        if (alarm > now) {
+        if (alarm > now || push) {
                /* Avoid accidentally clobbering active alarms; we can't
                 * entirely prevent that here, without even the minimal
                 * locking from the /dev/rtcN api.
@@ -194,9 +199,14 @@ rtc_sysfs_set_wakealarm(struct device *dev, struct device_attribute *attr,
                retval = rtc_read_alarm(rtc, &alm);
                if (retval < 0)
                        return retval;
-                if (alm.enabled)
+                if (alm.enabled) {
-                        return -EBUSY;
+                        if (push) {
+                                rtc_tm_to_time(&alm.time, &push);
+                                alarm += push;
+                        } else
+                                return -EBUSY;
+                } else if (push)
+                        return -EINVAL;
                alm.enabled = 1;
        } else {
                alm.enabled = 0;
diff --git a/drivers/rtc/rtc-tile.c b/drivers/rtc/rtc-tile.c
index fc3dee95f166..ff9632eb79f2 100644
--- a/drivers/rtc/rtc-tile.c
+++ b/drivers/rtc/rtc-tile.c
@@ -91,23 +91,12 @@ static int tile_rtc_probe(struct platform_device *dev)
        return 0;
 }
-/*
- * Device cleanup routine.
- */
-static int tile_rtc_remove(struct platform_device *dev)
-{
-        platform_set_drvdata(dev, NULL);
-        return 0;
-}
 static struct platform_driver tile_rtc_platform_driver = {
        .driver         = {
                .name   = "rtc-tile",
                .owner  = THIS_MODULE,
        },
        .probe          = tile_rtc_probe,
-        .remove         = tile_rtc_remove,
 };
 /*
diff --git a/drivers/rtc/rtc-tps80031.c b/drivers/rtc/rtc-tps80031.c
index 72662eafb938..3e400dce2d06 100644
--- a/drivers/rtc/rtc-tps80031.c
+++ b/drivers/rtc/rtc-tps80031.c
@@ -298,11 +298,6 @@ static int tps80031_rtc_probe(struct platform_device *pdev)
        return 0;
 }
-static int tps80031_rtc_remove(struct platform_device *pdev)
-{
-        return 0;
-}
 #ifdef CONFIG_PM_SLEEP
 static int tps80031_rtc_suspend(struct device *dev)
 {
@@ -333,7 +328,6 @@ static struct platform_driver tps80031_rtc_driver = {
                .pm     = &tps80031_pm_ops,
        },
        .probe  = tps80031_rtc_probe,
-        .remove = tps80031_rtc_remove,
 };
 module_platform_driver(tps80031_rtc_driver);
diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c
index b2eab34f38d9..02faf3c4e0d5 100644
--- a/drivers/rtc/rtc-twl.c
+++ b/drivers/rtc/rtc-twl.c
@@ -213,12 +213,24 @@ static int mask_rtc_irq_bit(unsigned char bit)
 static int twl_rtc_alarm_irq_enable(struct device *dev, unsigned enabled)
 {
+        struct platform_device *pdev = to_platform_device(dev);
+        int irq = platform_get_irq(pdev, 0);
+        static bool twl_rtc_wake_enabled;
        int ret;
-        if (enabled)
+        if (enabled) {
                ret = set_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_ALARM_M);
-        else
+                if (device_can_wakeup(dev) && !twl_rtc_wake_enabled) {
+                        enable_irq_wake(irq);
+                        twl_rtc_wake_enabled = true;
+                }
+        } else {
                ret = mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_ALARM_M);
+                if (twl_rtc_wake_enabled) {
+                        disable_irq_wake(irq);
+                        twl_rtc_wake_enabled = false;
+                }
+        }
        return ret;
 }
@@ -469,6 +481,12 @@ static int twl_rtc_probe(struct platform_device *pdev)
        if (irq <= 0)
                goto out1;
+        /* Initialize the register map */
+        if (twl_class_is_4030())
+                rtc_reg_map = (u8 *)twl4030_rtc_reg_map;
+        else
+                rtc_reg_map = (u8 *)twl6030_rtc_reg_map;
        ret = twl_rtc_read_u8(&rd_reg, REG_RTC_STATUS_REG);
        if (ret < 0)
                goto out1;
@@ -556,7 +574,6 @@ static int twl_rtc_remove(struct platform_device *pdev)
        free_irq(irq, rtc);
        rtc_device_unregister(rtc);
-        platform_set_drvdata(pdev, NULL);
        return 0;
 }
@@ -609,22 +626,7 @@ static struct platform_driver twl4030rtc_driver = {
        },
 };
-static int __init twl_rtc_init(void)
+module_platform_driver(twl4030rtc_driver);
-{
-        if (twl_class_is_4030())
-                rtc_reg_map = (u8 *) twl4030_rtc_reg_map;
-        else
-                rtc_reg_map = (u8 *) twl6030_rtc_reg_map;
-        return platform_driver_register(&twl4030rtc_driver);
-}
-module_init(twl_rtc_init);
-static void __exit twl_rtc_exit(void)
-{
-        platform_driver_unregister(&twl4030rtc_driver);
-}
-module_exit(twl_rtc_exit);
 MODULE_AUTHOR("Texas Instruments, MontaVista Software");
 MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c
index 6e0cba8f47d5..d07d89823020 100644
--- a/drivers/rtc/rtc-v3020.c
+++ b/drivers/rtc/rtc-v3020.c
@@ -16,7 +16,7 @@
 *                              - Use the generic rtc class
 *
 *  ??-???-2004: Someone at Compulab
- *                      - Initial driver creation.
+ *                      - Initial driver creation.
 *
 */
 #include <linux/platform_device.h>
@@ -278,13 +278,13 @@ static int v3020_set_time(struct device *dev, struct rtc_time *dt)
        dev_dbg(dev, "tm_year: %i\n", dt->tm_year);
        /* Write all the values to ram... */
-        v3020_set_reg(chip, V3020_SECONDS,      bin2bcd(dt->tm_sec));
+        v3020_set_reg(chip, V3020_SECONDS,      bin2bcd(dt->tm_sec));
-        v3020_set_reg(chip, V3020_MINUTES,      bin2bcd(dt->tm_min));
+        v3020_set_reg(chip, V3020_MINUTES,      bin2bcd(dt->tm_min));
-        v3020_set_reg(chip, V3020_HOURS,        bin2bcd(dt->tm_hour));
+        v3020_set_reg(chip, V3020_HOURS,        bin2bcd(dt->tm_hour));
        v3020_set_reg(chip, V3020_MONTH_DAY,    bin2bcd(dt->tm_mday));
-        v3020_set_reg(chip, V3020_MONTH,     bin2bcd(dt->tm_mon + 1));
+        v3020_set_reg(chip, V3020_MONTH,        bin2bcd(dt->tm_mon + 1));
-        v3020_set_reg(chip, V3020_WEEK_DAY,     bin2bcd(dt->tm_wday));
+        v3020_set_reg(chip, V3020_WEEK_DAY,     bin2bcd(dt->tm_wday));
-        v3020_set_reg(chip, V3020_YEAR,         bin2bcd(dt->tm_year % 100));
+        v3020_set_reg(chip, V3020_YEAR,         bin2bcd(dt->tm_year % 100));
        /* ...and set the clock. */
        v3020_set_reg(chip, V3020_CMD_RAM2CLOCK, 0);
@@ -320,7 +320,7 @@ static int rtc_probe(struct platform_device *pdev)
        retval = chip->ops->map_io(chip, pdev, pdata);
        if (retval)
-                goto err_chip;
+                return retval;
        /* Make sure the v3020 expects a communication cycle
         * by reading 8 times */
@@ -364,7 +364,7 @@ static int rtc_probe(struct platform_device *pdev)
 err_io:
        chip->ops->unmap_io(chip);
-err_chip:
        return retval;
 }
diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
index f91be04b9050..54e104e197e3 100644
--- a/drivers/rtc/rtc-vr41xx.c
+++ b/drivers/rtc/rtc-vr41xx.c
@@ -103,7 +103,7 @@ static inline unsigned long read_elapsed_second(void)
                second_mid = rtc1_read(ETIMEMREG);
                second_high = rtc1_read(ETIMEHREG);
        } while (first_low != second_low || first_mid != second_mid ||
-                 first_high != second_high);
+                 first_high != second_high);
        return (first_high << 17) | (first_mid << 1) | (first_low >> 15);
 }
@@ -154,7 +154,7 @@ static int vr41xx_rtc_set_time(struct device *dev, struct rtc_time *time)
        epoch_sec = mktime(epoch, 1, 1, 0, 0, 0);
        current_sec = mktime(time->tm_year + 1900, time->tm_mon + 1, time->tm_mday,
-                             time->tm_hour, time->tm_min, time->tm_sec);
+                             time->tm_hour, time->tm_min, time->tm_sec);
        write_elapsed_second(current_sec - epoch_sec);
@@ -186,7 +186,7 @@ static int vr41xx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *wkalrm)
        struct rtc_time *time = &wkalrm->time;
        alarm_sec = mktime(time->tm_year + 1900, time->tm_mon + 1, time->tm_mday,
-                           time->tm_hour, time->tm_min, time->tm_sec);
+                           time->tm_hour, time->tm_min, time->tm_sec);
        spin_lock_irq(&rtc_lock);
@@ -334,16 +334,18 @@ static int rtc_probe(struct platform_device *pdev)
        }
        retval = request_irq(aie_irq, elapsedtime_interrupt, 0,
-                             "elapsed_time", pdev);
+                             "elapsed_time", pdev);
        if (retval < 0)
                goto err_device_unregister;
        pie_irq = platform_get_irq(pdev, 1);
-        if (pie_irq <= 0)
+        if (pie_irq <= 0) {
+                retval = -EBUSY;
                goto err_free_irq;
+        }
        retval = request_irq(pie_irq, rtclong1_interrupt, 0,
-                             "rtclong1", pdev);
+                             "rtclong1", pdev);
        if (retval < 0)
                goto err_free_irq;
@@ -381,8 +383,6 @@ static int rtc_remove(struct platform_device *pdev)
        if (rtc)
                rtc_device_unregister(rtc);
-        platform_set_drvdata(pdev, NULL);
        free_irq(aie_irq, pdev);
        free_irq(pie_irq, pdev);
        if (rtc1_base)
diff --git a/drivers/rtc/rtc-vt8500.c b/drivers/rtc/rtc-vt8500.c
index d89efee6d29e..c2d6331fc712 100644
--- a/drivers/rtc/rtc-vt8500.c
+++ b/drivers/rtc/rtc-vt8500.c
@@ -282,8 +282,6 @@ static int vt8500_rtc_remove(struct platform_device *pdev)
        /* Disable alarm matching */
        writel(0, vt8500_rtc->regbase + VT8500_RTC_IS);
-        platform_set_drvdata(pdev, NULL);
        return 0;
 }
diff --git a/drivers/rtc/rtc-wm831x.c b/drivers/rtc/rtc-wm831x.c
index 8d65b94e5a7e..75aea4c4d334 100644
--- a/drivers/rtc/rtc-wm831x.c
+++ b/drivers/rtc/rtc-wm831x.c
@@ -460,11 +460,6 @@ err:
        return ret;
 }
-static int wm831x_rtc_remove(struct platform_device *pdev)
-{
-        return 0;
-}
 static const struct dev_pm_ops wm831x_rtc_pm_ops = {
        .suspend = wm831x_rtc_suspend,
        .resume = wm831x_rtc_resume,
@@ -478,7 +473,6 @@ static const struct dev_pm_ops wm831x_rtc_pm_ops = {
 static struct platform_driver wm831x_rtc_driver = {
        .probe = wm831x_rtc_probe,
-        .remove = wm831x_rtc_remove,
        .driver = {
                .name = "wm831x-rtc",
                .pm = &wm831x_rtc_pm_ops,
diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c
index fa9b0679fb60..365dc6505148 100644
--- a/drivers/rtc/rtc-x1205.c
+++ b/drivers/rtc/rtc-x1205.c
@@ -4,7 +4,7 @@
 * Copyright 2005 Alessandro Zummo
 *
 * please send all reports to:
- *      Karen Spearel <kas111 at gmail dot com>
+ *      Karen Spearel <kas111 at gmail dot com>
 *      Alessandro Zummo <a.zummo@towertech.it>
 *
 * based on a lot of other RTC drivers.
@@ -215,12 +215,14 @@ static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm,
                        buf[i] |= 0x80;
        /* this sequence is required to unlock the chip */
-        if ((xfer = i2c_master_send(client, wel, 3)) != 3) {
+        xfer = i2c_master_send(client, wel, 3);
+        if (xfer != 3) {
                dev_err(&client->dev, "%s: wel - %d\n", __func__, xfer);
                return -EIO;
        }
-        if ((xfer = i2c_master_send(client, rwel, 3)) != 3) {
+        xfer = i2c_master_send(client, rwel, 3);
+        if (xfer != 3) {
                dev_err(&client->dev, "%s: rwel - %d\n", __func__, xfer);
                return -EIO;
        }
@@ -269,7 +271,8 @@ static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm,
        }
        /* disable further writes */
-        if ((xfer = i2c_master_send(client, diswe, 3)) != 3) {
+        xfer = i2c_master_send(client, diswe, 3);
+        if (xfer != 3) {
                dev_err(&client->dev, "%s: diswe - %d\n", __func__, xfer);
                return -EIO;
        }
@@ -375,8 +378,7 @@ static int x1205_get_atrim(struct i2c_client *client, int *trim)
        return 0;
 }
-struct x1205_limit
+struct x1205_limit {
-{
        unsigned char reg, mask, min, max;
 };
@@ -430,7 +432,8 @@ static int x1205_validate_client(struct i2c_client *client)
                        },
                };
-                if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) {
+                xfer = i2c_transfer(client->adapter, msgs, 2);
+                if (xfer != 2) {
                        dev_err(&client->dev,
                                "%s: could not read register %x\n",
                                __func__, probe_zero_pattern[i]);
@@ -467,7 +470,8 @@ static int x1205_validate_client(struct i2c_client *client)
                        },
                };
-                if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) {
+                xfer = i2c_transfer(client->adapter, msgs, 2);
+                if (xfer != 2) {
                        dev_err(&client->dev,
                                "%s: could not read register %x\n",
                                __func__, probe_limits_pattern[i].reg);
@@ -548,10 +552,12 @@ static int x1205_rtc_proc(struct device *dev, struct seq_file *seq)
 {
        int err, dtrim, atrim;
-        if ((err = x1205_get_dtrim(to_i2c_client(dev), &dtrim)) == 0)
+        err = x1205_get_dtrim(to_i2c_client(dev), &dtrim);
+        if (!err)
                seq_printf(seq, "digital_trim\t: %d ppm\n", dtrim);
-        if ((err = x1205_get_atrim(to_i2c_client(dev), &atrim)) == 0)
+        err = x1205_get_atrim(to_i2c_client(dev), &atrim);
+        if (!err)
                seq_printf(seq, "analog_trim\t: %d.%02d pF\n",
                        atrim / 1000, atrim % 1000);
        return 0;
@@ -639,7 +645,8 @@ static int x1205_probe(struct i2c_client *client,
        i2c_set_clientdata(client, rtc);
        /* Check for power failures and eventually enable the osc */
-        if ((err = x1205_get_status(client, &sr)) == 0) {
+        err = x1205_get_status(client, &sr);
+        if (!err) {
                if (sr & X1205_SR_RTCF) {
                        dev_err(&client->dev,
                                "power failure detected, "
@@ -647,9 +654,9 @@ static int x1205_probe(struct i2c_client *client,
                        udelay(50);
                        x1205_fix_osc(client);
                }
-        }
+        } else {
-        else
                dev_err(&client->dev, "couldn't read status\n");
+        }
        err = x1205_sysfs_register(&client->dev);
        if (err)
diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c
index e70af2406ff9..d1c8025b0b03 100644
--- a/drivers/s390/net/qeth_l3_sys.c
+++ b/drivers/s390/net/qeth_l3_sys.c
@@ -315,10 +315,8 @@ static ssize_t qeth_l3_dev_hsuid_store(struct device *dev,
        if (qeth_configure_cq(card, QETH_CQ_ENABLED))
                return -EPERM;
-        for (i = 0; i < 8; i++)
+        snprintf(card->options.hsuid, sizeof(card->options.hsuid),
-                card->options.hsuid[i] = ' ';
+                 "%-8s", tmp);
-        card->options.hsuid[8] = '\0';
-        strncpy(card->options.hsuid, tmp, strlen(tmp));
        ASCEBC(card->options.hsuid, 8);
        if (card->dev)
                memcpy(card->dev->perm_addr, card->options.hsuid, 9);
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index 1ef041bc60c8..d85ac1a9d2c0 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -318,7 +318,8 @@ return_fib:
                        kthread_stop(dev->thread);
                        ssleep(1);
                        dev->aif_thread = 0;
-                        dev->thread = kthread_run(aac_command_thread, dev, dev->name);
+                        dev->thread = kthread_run(aac_command_thread, dev,
+                                                  "%s", dev->name);
                        ssleep(1);
                }
                if (f.wait) {
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 1be0776a80c4..cab190af6345 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1336,7 +1336,8 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced)
                if ((retval = pci_set_dma_mask(aac->pdev, DMA_BIT_MASK(32))))
                        goto out;
        if (jafo) {
-                aac->thread = kthread_run(aac_command_thread, aac, aac->name);
+                aac->thread = kthread_run(aac_command_thread, aac, "%s",
+                                          aac->name);
                if (IS_ERR(aac->thread)) {
                        retval = PTR_ERR(aac->thread);
                        goto out;
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index d24a2867bc21..a1f5ac7a9806 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -4996,7 +4996,7 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev,
        snprintf(phba->wq_name, sizeof(phba->wq_name), "beiscsi_%02x_wq",
                 phba->shost->host_no);
-        phba->wq = alloc_workqueue(phba->wq_name, WQ_MEM_RECLAIM, 1);
+        phba->wq = alloc_workqueue("%s", WQ_MEM_RECLAIM, 1, phba->wq_name);
        if (!phba->wq) {
                beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
                            "BM_%d : beiscsi_dev_probe-"
diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c
index 0fab6b5c7b82..9d86947d67fe 100644
--- a/drivers/scsi/osd/osd_uld.c
+++ b/drivers/scsi/osd/osd_uld.c
@@ -485,7 +485,7 @@ static int osd_probe(struct device *dev)
        oud->class_dev.class = &osd_uld_class;
        oud->class_dev.parent = dev;
        oud->class_dev.release = __remove;
-        error = dev_set_name(&oud->class_dev, disk->disk_name);
+        error = dev_set_name(&oud->class_dev, "%s", disk->disk_name);
        if (error) {
                OSD_ERR("dev_set_name failed => %d\n", error);
                goto err_put_cdev;
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 4d231c12463e..b246b3c26912 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -7060,8 +7060,8 @@ skip_retry_init:
        }
        INIT_WORK(&ha->dpc_work, qla4xxx_do_dpc);
-        sprintf(buf, "qla4xxx_%lu_task", ha->host_no);
+        ha->task_wq = alloc_workqueue("qla4xxx_%lu_task", WQ_MEM_RECLAIM, 1,
-        ha->task_wq = alloc_workqueue(buf, WQ_MEM_RECLAIM, 1);
+                                      ha->host_no);
        if (!ha->task_wq) {
                ql4_printk(KERN_WARNING, ha, "Unable to start task thread!\n");
                ret = -ENODEV;
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index e106c276aa00..4628fd5e0688 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -435,7 +435,7 @@ static int fc_host_setup(struct transport_container *tc, struct device *dev,
        snprintf(fc_host->work_q_name, sizeof(fc_host->work_q_name),
                 "fc_wq_%d", shost->host_no);
-        fc_host->work_q = alloc_workqueue(fc_host->work_q_name, 0, 0);
+        fc_host->work_q = alloc_workqueue("%s", 0, 0, fc_host->work_q_name);
        if (!fc_host->work_q)
                return -ENOMEM;
@@ -443,8 +443,8 @@ static int fc_host_setup(struct transport_container *tc, struct device *dev,
        snprintf(fc_host->devloss_work_q_name,
                 sizeof(fc_host->devloss_work_q_name),
                 "fc_dl_%d", shost->host_no);
-        fc_host->devloss_work_q =
+        fc_host->devloss_work_q = alloc_workqueue("%s", 0, 0,
-                        alloc_workqueue(fc_host->devloss_work_q_name, 0, 0);
+                                        fc_host->devloss_work_q_name);
        if (!fc_host->devloss_work_q) {
                destroy_workqueue(fc_host->work_q);
                fc_host->work_q = NULL;
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index c1c555242d0d..8fa3d0b73ad9 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2931,7 +2931,7 @@ static int sd_probe(struct device *dev)
        device_initialize(&sdkp->dev);
        sdkp->dev.parent = dev;
        sdkp->dev.class = &sd_disk_class;
-        dev_set_name(&sdkp->dev, dev_name(dev));
+        dev_set_name(&sdkp->dev, "%s", dev_name(dev));
        if (device_add(&sdkp->dev))
                goto out_free_index;
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 095cfaded1c0..978dda2c5239 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -601,7 +601,7 @@ static int spi_init_queue(struct spi_master *master)
        init_kthread_worker(&master->kworker);
        master->kworker_task = kthread_run(kthread_worker_fn,
-                                           &master->kworker,
+                                           &master->kworker, "%s",
                                           dev_name(&master->dev));
        if (IS_ERR(master->kworker_task)) {
                dev_err(&master->dev, "failed to create message pump task\n");
diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
index ec9e2ae2de0d..ee3a57f22832 100644
--- a/drivers/staging/android/timed_output.c
+++ b/drivers/staging/android/timed_output.c
@@ -78,7 +78,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
        tdev->index = atomic_inc_return(&device_count);
        tdev->dev = device_create(timed_output_class, NULL,
-                MKDEV(0, tdev->index), NULL, tdev->name);
+                MKDEV(0, tdev->index), NULL, "%s", tdev->name);
        if (IS_ERR(tdev->dev))
                return PTR_ERR(tdev->dev);
diff --git a/drivers/staging/dgrp/dgrp_sysfs.c b/drivers/staging/dgrp/dgrp_sysfs.c
index 7d1b36d1e75f..8cee9c8bc38b 100644
--- a/drivers/staging/dgrp/dgrp_sysfs.c
+++ b/drivers/staging/dgrp/dgrp_sysfs.c
@@ -273,7 +273,7 @@ void dgrp_create_node_class_sysfs_files(struct nd_struct *nd)
                sprintf(name, "node%ld", nd->nd_major);
        nd->nd_class_dev = device_create(dgrp_class, dgrp_class_nodes_dev,
-                MKDEV(0, nd->nd_major), NULL, name);
+                MKDEV(0, nd->nd_major), NULL, "%s", name);
        ret = sysfs_create_group(&nd->nd_class_dev->kobj,
                                 &dgrp_node_attribute_group);
diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c
index b65bf5e177a8..6e81ba0eaf1e 100644
--- a/drivers/staging/rtl8712/os_intfs.c
+++ b/drivers/staging/rtl8712/os_intfs.c
@@ -238,7 +238,7 @@ struct net_device *r8712_init_netdev(void)
 static u32 start_drv_threads(struct _adapter *padapter)
 {
-        padapter->cmdThread = kthread_run(r8712_cmd_thread, padapter,
+        padapter->cmdThread = kthread_run(r8712_cmd_thread, padapter, "%s",
                              padapter->pnetdev->name);
        if (IS_ERR(padapter->cmdThread) < 0)
                return _FAIL;
diff --git a/drivers/staging/tidspbridge/rmgr/drv_interface.c b/drivers/staging/tidspbridge/rmgr/drv_interface.c
index 9c020562c846..6d04eb48bfbc 100644
--- a/drivers/staging/tidspbridge/rmgr/drv_interface.c
+++ b/drivers/staging/tidspbridge/rmgr/drv_interface.c
@@ -421,12 +421,11 @@ static int omap3_bridge_startup(struct platform_device *pdev)
        drv_datap->tc_wordswapon = tc_wordswapon;
        if (base_img) {
-                drv_datap->base_img = kmalloc(strlen(base_img) + 1, GFP_KERNEL);
+                drv_datap->base_img = kstrdup(base_img, GFP_KERNEL);
                if (!drv_datap->base_img) {
                        err = -ENOMEM;
                        goto err2;
                }
-                strncpy(drv_datap->base_img, base_img, strlen(base_img) + 1);
        }
        dev_set_drvdata(bridge, drv_datap);
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index b645c47501b4..3b96f18593b3 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -677,7 +677,7 @@ static int uio_mmap(struct file *filep, struct vm_area_struct *vma)
        if (mi < 0)
                return -EINVAL;
-        requested_pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+        requested_pages = vma_pages(vma);
        actual_pages = ((idev->info->mem[mi].addr & ~PAGE_MASK)
                        + idev->info->mem[mi].size + PAGE_SIZE -1) >> PAGE_SHIFT;
        if (requested_pages > actual_pages)
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index d3527dd8b90c..5e0d33a7da58 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -1020,7 +1020,7 @@ static int usbatm_heavy_init(struct usbatm_data *instance)
 {
        struct task_struct *t;
-        t = kthread_create(usbatm_do_heavy_init, instance,
+        t = kthread_create(usbatm_do_heavy_init, instance, "%s",
                        instance->driver->driver_name);
        if (IS_ERR(t)) {
                usb_err(instance, "%s: failed to create kernel_thread (%ld)!\n",
@@ -1076,7 +1076,8 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
        /* public fields */
        instance->driver = driver;
-        snprintf(instance->driver_name, sizeof(instance->driver_name), driver->driver_name);
+        strlcpy(instance->driver_name, driver->driver_name,
+                sizeof(instance->driver_name));
        instance->usb_dev = usb_dev;
        instance->usb_intf = intf;
diff --git a/drivers/uwb/lc-dev.c b/drivers/uwb/lc-dev.c
index 5241f1d0ef7a..9209eafc75b1 100644
--- a/drivers/uwb/lc-dev.c
+++ b/drivers/uwb/lc-dev.c
@@ -440,7 +440,7 @@ void uwbd_dev_onair(struct uwb_rc *rc, struct uwb_beca_e *bce)
        uwb_dev_init(uwb_dev);          /* This sets refcnt to one, we own it */
        uwb_dev->mac_addr = *bce->mac_addr;
        uwb_dev->dev_addr = bce->dev_addr;
-        dev_set_name(&uwb_dev->dev, macbuf);
+        dev_set_name(&uwb_dev->dev, "%s", macbuf);
        result = uwb_dev_add(uwb_dev, &rc->uwb_dev.dev, rc);
        if (result < 0) {
                dev_err(dev, "new device %s: cannot instantiate device\n",
diff --git a/drivers/video/backlight/atmel-pwm-bl.c b/drivers/video/backlight/atmel-pwm-bl.c
index a60d6afca97c..0393d827dd44 100644
--- a/drivers/video/backlight/atmel-pwm-bl.c
+++ b/drivers/video/backlight/atmel-pwm-bl.c
@@ -195,7 +195,6 @@ static int __init atmel_pwm_bl_probe(struct platform_device *pdev)
        return 0;
 err_free_bl_dev:
-        platform_set_drvdata(pdev, NULL);
        backlight_device_unregister(bldev);
 err_free_pwm:
        pwm_channel_free(&pwmbl->pwmc);
@@ -212,7 +211,6 @@ static int __exit atmel_pwm_bl_remove(struct platform_device *pdev)
        pwm_channel_disable(&pwmbl->pwmc);
        pwm_channel_free(&pwmbl->pwmc);
        backlight_device_unregister(pwmbl->bldev);
-        platform_set_drvdata(pdev, NULL);
        return 0;
 }
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index c74e7aa46731..3fccb6d3c8c3 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -208,7 +208,8 @@ static ssize_t backlight_show_actual_brightness(struct device *dev,
 static struct class *backlight_class;
-static int backlight_suspend(struct device *dev, pm_message_t state)
+#ifdef CONFIG_PM_SLEEP
+static int backlight_suspend(struct device *dev)
 {
        struct backlight_device *bd = to_backlight_device(dev);
@@ -235,6 +236,10 @@ static int backlight_resume(struct device *dev)
        return 0;
 }
+#endif
+static SIMPLE_DEV_PM_OPS(backlight_class_dev_pm_ops, backlight_suspend,
+                         backlight_resume);
 static void bl_device_release(struct device *dev)
 {
@@ -304,7 +309,7 @@ struct backlight_device *backlight_device_register(const char *name,
        new_bd->dev.class = backlight_class;
        new_bd->dev.parent = parent;
        new_bd->dev.release = bl_device_release;
-        dev_set_name(&new_bd->dev, name);
+        dev_set_name(&new_bd->dev, "%s", name);
        dev_set_drvdata(&new_bd->dev, devdata);
        /* Set default properties */
@@ -370,6 +375,81 @@ void backlight_device_unregister(struct backlight_device *bd)
 }
 EXPORT_SYMBOL(backlight_device_unregister);
+static void devm_backlight_device_release(struct device *dev, void *res)
+{
+        struct backlight_device *backlight = *(struct backlight_device **)res;
+        backlight_device_unregister(backlight);
+}
+static int devm_backlight_device_match(struct device *dev, void *res,
+                                        void *data)
+{
+        struct backlight_device **r = res;
+        return *r == data;
+}
+/**
+ * devm_backlight_device_register - resource managed backlight_device_register()
+ * @dev: the device to register
+ * @name: the name of the device
+ * @parent: a pointer to the parent device
+ * @devdata: an optional pointer to be stored for private driver use
+ * @ops: the backlight operations structure
+ * @props: the backlight properties
+ *
+ * @return a struct backlight on success, or an ERR_PTR on error
+ *
+ * Managed backlight_device_register(). The backlight_device returned
+ * from this function are automatically freed on driver detach.
+ * See backlight_device_register() for more information.
+ */
+struct backlight_device *devm_backlight_device_register(struct device *dev,
+        const char *name, struct device *parent, void *devdata,
+        const struct backlight_ops *ops,
+        const struct backlight_properties *props)
+{
+        struct backlight_device **ptr, *backlight;
+        ptr = devres_alloc(devm_backlight_device_release, sizeof(*ptr),
+                        GFP_KERNEL);
+        if (!ptr)
+                return ERR_PTR(-ENOMEM);
+        backlight = backlight_device_register(name, parent, devdata, ops,
+                                                props);
+        if (!IS_ERR(backlight)) {
+                *ptr = backlight;
+                devres_add(dev, ptr);
+        } else {
+                devres_free(ptr);
+        }
+        return backlight;
+}
+EXPORT_SYMBOL(devm_backlight_device_register);
+/**
+ * devm_backlight_device_unregister - resource managed backlight_device_unregister()
+ * @dev: the device to unregister
+ * @bd: the backlight device to unregister
+ *
+ * Deallocated a backlight allocated with devm_backlight_device_register().
+ * Normally this function will not need to be called and the resource management
+ * code will ensure that the resource is freed.
+ */
+void devm_backlight_device_unregister(struct device *dev,
+                                struct backlight_device *bd)
+{
+        int rc;
+        rc = devres_release(dev, devm_backlight_device_release,
+                                devm_backlight_device_match, bd);
+        WARN_ON(rc);
+}
+EXPORT_SYMBOL(devm_backlight_device_unregister);
 #ifdef CONFIG_OF
 static int of_parent_match(struct device *dev, const void *data)
 {
@@ -414,8 +494,7 @@ static int __init backlight_class_init(void)
        }
        backlight_class->dev_attrs = bl_device_attributes;
-        backlight_class->suspend = backlight_suspend;
+        backlight_class->pm = &backlight_class_dev_pm_ops;
-        backlight_class->resume = backlight_resume;
        return 0;
 }
diff --git a/drivers/video/backlight/ep93xx_bl.c b/drivers/video/backlight/ep93xx_bl.c
index 33455821dd31..018368ba4124 100644
--- a/drivers/video/backlight/ep93xx_bl.c
+++ b/drivers/video/backlight/ep93xx_bl.c
@@ -111,7 +111,6 @@ static int ep93xxbl_remove(struct platform_device *dev)
        struct backlight_device *bl = platform_get_drvdata(dev);
        backlight_device_unregister(bl);
-        platform_set_drvdata(dev, NULL);
        return 0;
 }
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index 34fb6bd798c8..41964a71a036 100644
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -219,7 +219,7 @@ struct lcd_device *lcd_device_register(const char *name, struct device *parent,
        new_ld->dev.class = lcd_class;
        new_ld->dev.parent = parent;
        new_ld->dev.release = lcd_device_release;
-        dev_set_name(&new_ld->dev, name);
+        dev_set_name(&new_ld->dev, "%s", name);
        dev_set_drvdata(&new_ld->dev, devdata);
        rc = device_register(&new_ld->dev);
@@ -260,6 +260,76 @@ void lcd_device_unregister(struct lcd_device *ld)
 }
 EXPORT_SYMBOL(lcd_device_unregister);
+static void devm_lcd_device_release(struct device *dev, void *res)
+{
+        struct lcd_device *lcd = *(struct lcd_device **)res;
+        lcd_device_unregister(lcd);
+}
+static int devm_lcd_device_match(struct device *dev, void *res, void *data)
+{
+        struct lcd_device **r = res;
+        return *r == data;
+}
+/**
+ * devm_lcd_device_register - resource managed lcd_device_register()
+ * @dev: the device to register
+ * @name: the name of the device
+ * @parent: a pointer to the parent device
+ * @devdata: an optional pointer to be stored for private driver use
+ * @ops: the lcd operations structure
+ *
+ * @return a struct lcd on success, or an ERR_PTR on error
+ *
+ * Managed lcd_device_register(). The lcd_device returned from this function
+ * are automatically freed on driver detach. See lcd_device_register()
+ * for more information.
+ */
+struct lcd_device *devm_lcd_device_register(struct device *dev,
+                const char *name, struct device *parent,
+                void *devdata, struct lcd_ops *ops)
+{
+        struct lcd_device **ptr, *lcd;
+        ptr = devres_alloc(devm_lcd_device_release, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr)
+                return ERR_PTR(-ENOMEM);
+        lcd = lcd_device_register(name, parent, devdata, ops);
+        if (!IS_ERR(lcd)) {
+                *ptr = lcd;
+                devres_add(dev, ptr);
+        } else {
+                devres_free(ptr);
+        }
+        return lcd;
+}
+EXPORT_SYMBOL(devm_lcd_device_register);
+/**
+ * devm_lcd_device_unregister - resource managed lcd_device_unregister()
+ * @dev: the device to unregister
+ * @ld: the lcd device to unregister
+ *
+ * Deallocated a lcd allocated with devm_lcd_device_register(). Normally
+ * this function will not need to be called and the resource management
+ * code will ensure that the resource is freed.
+ */
+void devm_lcd_device_unregister(struct device *dev, struct lcd_device *ld)
+{
+        int rc;
+        rc = devres_release(dev, devm_lcd_device_release,
+                                devm_lcd_device_match, ld);
+        WARN_ON(rc);
+}
+EXPORT_SYMBOL(devm_lcd_device_unregister);
 static void __exit lcd_class_exit(void)
 {
        class_destroy(lcd_class);
diff --git a/drivers/video/backlight/lp8788_bl.c b/drivers/video/backlight/lp8788_bl.c
index 4bb8b4f140cf..980855ec9bb1 100644
--- a/drivers/video/backlight/lp8788_bl.c
+++ b/drivers/video/backlight/lp8788_bl.c
@@ -312,7 +312,6 @@ static int lp8788_backlight_remove(struct platform_device *pdev)
        backlight_update_status(bl_dev);
        sysfs_remove_group(&pdev->dev.kobj, &lp8788_attr_group);
        lp8788_backlight_unregister(bl);
-        platform_set_drvdata(pdev, NULL);
        return 0;
 }
diff --git a/drivers/video/backlight/pcf50633-backlight.c b/drivers/video/backlight/pcf50633-backlight.c
index e87c7a3394f3..6ed76be18f19 100644
--- a/drivers/video/backlight/pcf50633-backlight.c
+++ b/drivers/video/backlight/pcf50633-backlight.c
@@ -153,8 +153,6 @@ static int pcf50633_bl_remove(struct platform_device *pdev)
        backlight_device_unregister(pcf_bl->bl);
-        platform_set_drvdata(pdev, NULL);
        return 0;
 }
diff --git a/drivers/video/output.c b/drivers/video/output.c
index 0d6f2cda9369..6285b9718451 100644
--- a/drivers/video/output.c
+++ b/drivers/video/output.c
@@ -97,7 +97,7 @@ struct output_device *video_output_register(const char *name,
        new_dev->props = op;
        new_dev->dev.class = &video_output_class;
        new_dev->dev.parent = dev;
-        dev_set_name(&new_dev->dev, name);
+        dev_set_name(&new_dev->dev, "%s", name);
        dev_set_drvdata(&new_dev->dev, devdata);
        ret_code = device_register(&new_dev->dev);
        if (ret_code) {
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index bd3ae324a1a2..0098810df69d 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -148,7 +148,7 @@ static void fill_balloon(struct virtio_balloon *vb, size_t num)
                }
                set_page_pfns(vb->pfns + vb->num_pfns, page);
                vb->num_pages += VIRTIO_BALLOON_PAGES_PER_PAGE;
-                totalram_pages--;
+                adjust_managed_page_count(page, -1);
        }
        /* Did we get any? */
@@ -163,8 +163,9 @@ static void release_pages_by_pfn(const u32 pfns[], unsigned int num)
        /* Find pfns pointing at start of each page, get pages and free them. */
        for (i = 0; i < num; i += VIRTIO_BALLOON_PAGES_PER_PAGE) {
-                balloon_page_free(balloon_pfn_to_page(pfns[i]));
+                struct page *page = balloon_pfn_to_page(pfns[i]);
-                totalram_pages++;
+                balloon_page_free(page);
+                adjust_managed_page_count(page, 1);
        }
 }
diff --git a/drivers/w1/slaves/w1_ds2408.c b/drivers/w1/slaves/w1_ds2408.c
index 91cc2cdf02c0..cb8a8e5d9573 100644
--- a/drivers/w1/slaves/w1_ds2408.c
+++ b/drivers/w1/slaves/w1_ds2408.c
@@ -302,7 +302,33 @@ error:
        return -EIO;
 }
+/*
+ * This is a special sequence we must do to ensure the P0 output is not stuck
+ * in test mode. This is described in rev 2 of the ds2408's datasheet
+ * (http://datasheets.maximintegrated.com/en/ds/DS2408.pdf) under
+ * "APPLICATION INFORMATION/Power-up timing".
+ */
+static int w1_f29_disable_test_mode(struct w1_slave *sl)
+{
+        int res;
+        u8 magic[10] = {0x96, };
+        u64 rn = le64_to_cpu(*((u64*)&sl->reg_num));
+        memcpy(&magic[1], &rn, 8);
+        magic[9] = 0x3C;
+        mutex_lock(&sl->master->bus_mutex);
+        res = w1_reset_bus(sl->master);
+        if (res)
+                goto out;
+        w1_write_block(sl->master, magic, ARRAY_SIZE(magic));
+        res = w1_reset_bus(sl->master);
+out:
+        mutex_unlock(&sl->master->bus_mutex);
+        return res;
+}
 static struct bin_attribute w1_f29_sysfs_bin_files[] = {
        {
@@ -363,6 +389,10 @@ static int w1_f29_add_slave(struct w1_slave *sl)
        int err = 0;
        int i;
+        err = w1_f29_disable_test_mode(sl);
+        if (err)
+                return err;
        for (i = 0; i < ARRAY_SIZE(w1_f29_sysfs_bin_files) && !err; ++i)
                err = sysfs_create_bin_file(
                        &sl->dev.kobj,
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index e33615335aa0..2a2ef97697b2 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -91,14 +91,6 @@ EXPORT_SYMBOL_GPL(balloon_stats);
 /* We increase/decrease in batches which fit in a page */
 static xen_pfn_t frame_list[PAGE_SIZE / sizeof(unsigned long)];
-#ifdef CONFIG_HIGHMEM
-#define inc_totalhigh_pages() (totalhigh_pages++)
-#define dec_totalhigh_pages() (totalhigh_pages--)
-#else
-#define inc_totalhigh_pages() do {} while (0)
-#define dec_totalhigh_pages() do {} while (0)
-#endif
 /* List of ballooned pages, threaded through the mem_map array. */
 static LIST_HEAD(ballooned_pages);
@@ -134,9 +126,7 @@ static void __balloon_append(struct page *page)
 static void balloon_append(struct page *page)
 {
        __balloon_append(page);
-        if (PageHighMem(page))
+        adjust_managed_page_count(page, -1);
-                dec_totalhigh_pages();
-        totalram_pages--;
 }
 /* balloon_retrieve: rescue a page from the balloon, if it is not empty. */
@@ -153,13 +143,12 @@ static struct page *balloon_retrieve(bool prefer_highmem)
                page = list_entry(ballooned_pages.next, struct page, lru);
        list_del(&page->lru);
-        if (PageHighMem(page)) {
+        if (PageHighMem(page))
                balloon_stats.balloon_high--;
-                inc_totalhigh_pages();
+        else
-        } else
                balloon_stats.balloon_low--;
-        totalram_pages++;
+        adjust_managed_page_count(page, 1);
        return page;
 }
@@ -374,9 +363,7 @@ static enum bp_state increase_reservation(unsigned long nr_pages)
 #endif
                /* Relinquish the page back to the allocator. */
-                ClearPageReserved(page);
+                __free_reserved_page(page);
-                init_page_count(page);
-                __free_page(page);
        }
        balloon_stats.current_pages += rc;
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index cb1afc00c96d..38e92b770e91 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -449,7 +449,7 @@ int xenbus_probe_node(struct xen_bus_type *bus,
        if (err)
                goto fail;
-        dev_set_name(&xendev->dev, devname);
+        dev_set_name(&xendev->dev, "%s", devname);
        /* Register with generic device framework. */
        err = device_register(&xendev->dev);