1. 16 7月, 2016 14 次提交
  2. 12 7月, 2016 7 次提交
  3. 08 7月, 2016 11 次提交
  4. 07 7月, 2016 2 次提交
    • A
      dmaengine: qcom-bam-dma: add __maybe_unused annotations for PM · 184f337e
      Arnd Bergmann 提交于
      The bam_dma driver gained runtime PM support, but that causes build
      warnings whenever CONFIG_PM is disabled:
      
      drivers/dma/qcom/bam_dma.c:1324:12: error: 'bam_dma_runtime_resume' defined but not used [-Werror=unused-function]
       static int bam_dma_runtime_resume(struct device *dev)
                  ^~~~~~~~~~~~~~~~~~~~~~
      drivers/dma/qcom/bam_dma.c:1315:12: error: 'bam_dma_runtime_suspend' defined but not used [-Werror=unused-function]
       static int bam_dma_runtime_suspend(struct device *dev)
      
      This removes the incomplete #ifdef guard and instead marks all
      four PM functions as __maybe_unused, which avoids this kind of
      warning.
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Fixes: 7d254559 ("dmaengine: qcom-bam-dma: Add pm_runtime support")
      Signed-off-by: NVinod Koul <vinod.koul@intel.com>
      184f337e
    • A
      dmaengine: bcm2835: fix 64-bit warning · 9a8d0efa
      Arnd Bergmann 提交于
      When building this driver on arm64, we get a harmless type
      mismatch warning:
      
      drivers/dma/bcm2835-dma.c: In function 'bcm2835_dma_fill_cb_chain_with_sg':
      include/linux/kernel.h:743:17: warning: comparison of distinct pointer types lacks a cast
        (void) (&_min1 == &_min2);  \
                       ^
      drivers/dma/bcm2835-dma.c:409:21: note: in expansion of macro 'min'
          cb->cb->length = min(len, max_len);
      
      This changes the type of the 'len' variable to size_t, which
      avoids the problem.
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Fixes: 388cc7a2 ("dmaengine: bcm2835: add slave_sg support to bcm2835-dma")
      Signed-off-by: NVinod Koul <vinod.koul@intel.com>
      9a8d0efa
  5. 02 7月, 2016 3 次提交
  6. 01 7月, 2016 1 次提交
    • A
      dmaengine: bcm2835: fix 64-bit warning · 4aa819c7
      Arnd Bergmann 提交于
      When building this driver on arm64, we get a harmless type
      mismatch warning:
      
      drivers/dma/bcm2835-dma.c: In function 'bcm2835_dma_fill_cb_chain_with_sg':
      include/linux/kernel.h:743:17: warning: comparison of distinct pointer types lacks a cast
        (void) (&_min1 == &_min2);  \
                       ^
      drivers/dma/bcm2835-dma.c:409:21: note: in expansion of macro 'min'
          cb->cb->length = min(len, max_len);
      
      This changes the type of the 'len' variable to size_t, which
      avoids the problem.
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Fixes: 388cc7a2 ("dmaengine: bcm2835: add slave_sg support to bcm2835-dma")
      Signed-off-by: NVinod Koul <vinod.koul@intel.com>
      4aa819c7
  7. 30 6月, 2016 2 次提交
    • P
      dmaengine: qcom-bam-dma: Add pm_runtime support · 7d254559
      Pramod Gurav 提交于
      Adds pm_runtime support for BAM DMA so that clock is enabled only
      when there is a transaction going on to help save power.
      Signed-off-by: NPramod Gurav <pramod.gurav@linaro.org>
      Signed-off-by: NVinod Koul <vinod.koul@intel.com>
      7d254559
    • J
      dmaengine: tegra-apb: Return the actual descriptor status · d3183447
      Jon Hunter 提交于
      Commit 71f7e6cc ('dmaengine: tegra20-apb-dma: Only calculate residue
      if txstate exists') changed the tegra_dma_tx_status() function to only
      calculate the residue if there is a valid 'txstate' pointer for storing
      the residue. Although this makes sense, this changed the behaviour of
      the function tegra_dma_tx_status() such that if the pointer 'txstate' is
      not valid, then we will return whatever state is returned by
      dma_cookie_status() and no longer return the state by looking up the DMA
      descriptor and returning it's state.
      
      Please note that dma_cookie_status() will either return DMA_COMPLETE or
      DMA_IN_PROGRESS. However, if dma_cookie_status() returns DMA_IN_PROGRESS
      the actual status could be DMA_ERROR which will only be seen from
      checking the descriptor status. Therefore, even if 'txstate' is not
      valid, still check to see if there is a valid descriptor for the cookie
      in question and if so return the descriptor state. Finally, ensure the
      residue is still not calculated if the 'txstate' is not valid.
      Signed-off-by: NJon Hunter <jonathanh@nvidia.com>
      Signed-off-by: NVinod Koul <vinod.koul@intel.com>
      d3183447