Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...

[firefly-linux-kernel-4.4.55.git] / include / linux / sh_dma.h

diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h
index 7c8ca41e60e6147ec24e69eac9f98fb575b3adca..b64d6bec6f903637617f06f153547295336d4133 100644 (file)
--- a/include/linux/sh_dma.h
+++ b/include/linux/sh_dma.h
@@ -20,8 +20,6 @@ struct device;
 /* Used by slave DMA clients to request DMA to/from a specific peripheral */
 struct sh_dmae_slave {
        struct shdma_slave              shdma_slave;    /* Set by the platform */
-       struct device                   *dma_dev;       /* Set by the platform */
-       const struct sh_dmae_slave_config *config;      /* Set by the driver */
 };
 
 /*
@@ -29,10 +27,10 @@ struct sh_dmae_slave {
  * a certain peripheral
  */
 struct sh_dmae_slave_config {
-       unsigned int                    slave_id;
-       dma_addr_t                      addr;
-       u32                             chcr;
-       char                            mid_rid;
+       int             slave_id;
+       dma_addr_t      addr;
+       u32             chcr;
+       char            mid_rid;
 };
 
 struct sh_dmae_channel {
@@ -101,4 +99,6 @@ struct sh_dmae_pdata {
 #define CHCR_TE        0x00000002
 #define CHCR_IE        0x00000004
 
+bool shdma_chan_filter(struct dma_chan *chan, void *arg);
+
 #endif