target/linux/ipq806x/patches-3.18/151-dmaengine-Remove-the-need-to-declare-device_control.patch

   1 From 4f8ef9f4140cc286d7d1cf9237da7a7439e4fc0b Mon Sep 17 00:00:00 2001
   2 From: Maxime Ripard <maxime.ripard@free-electrons.com>
   3 Date: Mon, 17 Nov 2014 14:42:03 +0100
   4 Subject: [PATCH] dmaengine: Remove the need to declare device_control
   5
   6 In order to migrate the drivers without triggering a BUG_ON for the converted
   7 drivers, which would cause bisectability issues, we need to remove that check
   8 before removing the device_control function entirely.
   9
  10 Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  11 Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  12 Signed-off-by: Vinod Koul <vinod.koul@intel.com>
  13 ---
  14  drivers/dma/dmaengine.c | 2 --
  15  1 file changed, 2 deletions(-)
  16
  17 --- a/drivers/dma/dmaengine.c
  18 +++ b/drivers/dma/dmaengine.c
  19 @@ -814,8 +814,6 @@ int dma_async_device_register(struct dma
  20                 !device->device_prep_dma_sg);
  21         BUG_ON(dma_has_cap(DMA_CYCLIC, device->cap_mask) &&
  22                 !device->device_prep_dma_cyclic);
  23 -       BUG_ON(dma_has_cap(DMA_SLAVE, device->cap_mask) &&
  24 -               !device->device_control);
  25         BUG_ON(dma_has_cap(DMA_INTERLEAVE, device->cap_mask) &&
  26                 !device->device_prep_interleaved_dma);
  27