151-dmaengine-Remove-the-need-to-declare-device_control.patch 1.1 KB

123456789101112131415161718192021222324252627
  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. In order to migrate the drivers without triggering a BUG_ON for the converted
  6. drivers, which would cause bisectability issues, we need to remove that check
  7. before removing the device_control function entirely.
  8. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  9. Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  10. Signed-off-by: Vinod Koul <vinod.koul@intel.com>
  11. ---
  12. drivers/dma/dmaengine.c | 2 --
  13. 1 file changed, 2 deletions(-)
  14. --- a/drivers/dma/dmaengine.c
  15. +++ b/drivers/dma/dmaengine.c
  16. @@ -814,8 +814,6 @@ int dma_async_device_register(struct dma
  17. !device->device_prep_dma_sg);
  18. BUG_ON(dma_has_cap(DMA_CYCLIC, device->cap_mask) &&
  19. !device->device_prep_dma_cyclic);
  20. - BUG_ON(dma_has_cap(DMA_SLAVE, device->cap_mask) &&
  21. - !device->device_control);
  22. BUG_ON(dma_has_cap(DMA_INTERLEAVE, device->cap_mask) &&
  23. !device->device_prep_interleaved_dma);