Merge branch 'akpm' (updates from Andrew Morton)

Merge first patch-bomb from Andrew Morton:
 - various misc bits
 - I'm been patchmonkeying ocfs2 for a while, as Joel and Mark have been
   distracted.  There has been quite a bit of activity.
 - About half the MM queue
 - Some backlight bits
 - Various lib/ updates
 - checkpatch updates
 - zillions more little rtc patches
 - ptrace
 - signals
 - exec
 - procfs
 - rapidio
 - nbd
 - aoe
 - pps
 - memstick
 - tools/testing/selftests updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (445 commits)
  tools/testing/selftests: don't assume the x bit is set on scripts
  selftests: add .gitignore for kcmp
  selftests: fix clean target in kcmp Makefile
  selftests: add .gitignore for vm
  selftests: add hugetlbfstest
  self-test: fix make clean
  selftests: exit 1 on failure
  kernel/resource.c: remove the unneeded assignment in function __find_resource
  aio: fix wrong comment in aio_complete()
  drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode
  drivers/memstick/host/r592.c: convert to module_pci_driver
  drivers/memstick/host/jmb38x_ms: convert to module_pci_driver
  pps-gpio: add device-tree binding and support
  drivers/pps/clients/pps-gpio.c: convert to module_platform_driver
  drivers/pps/clients/pps-gpio.c: convert to devm_* helpers
  drivers/parport/share.c: use kzalloc
  Documentation/accounting/getdelays.c: avoid strncpy in accounting tool
  aoe: update internal version number to v83
  aoe: update copyright date
  aoe: perform I/O completions in parallel
  ...

10 files changed, 10 insertions, 345 deletions

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) ||
-            dma_has_cap(DMA_MEMSET, dma_dev->cap_mask)) {
+        if (dma_has_cap(DMA_XOR, 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) {
-                /* for memset requests we need to program the engine, no
-                 * 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);
-        }
+        /* 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 " : "");
 }