5 files changed, 15 insertions, 15 deletions

diff --git a/arch/sh/include/asm/dmaengine.h b/arch/sh/include/asm/dmaengine.h
index bf2f30cf0a27..568e991442b0 100644
--- a/arch/sh/include/asm/dmaengine.h
+++ b/arch/sh/include/asm/dmaengine.h
@@ -17,7 +17,7 @@
 
 #define SH_DMAC_MAX_CHANNELS    6
 
-enum sh_dmae_slave_chan_id {
+enum {
         SHDMA_SLAVE_SCIF0_TX,
         SHDMA_SLAVE_SCIF0_RX,
         SHDMA_SLAVE_SCIF1_TX,
@@ -38,7 +38,7 @@ enum sh_dmae_slave_chan_id {
 };
 
 struct sh_dmae_slave_config {
-        enum sh_dmae_slave_chan_id      slave_id;
+        unsigned int                    slave_id;
         dma_addr_t                      addr;
         u32                             chcr;
         char                            mid_rid;
@@ -68,7 +68,7 @@ struct device;
 
 /* Used by slave DMA clients to request DMA to/from a specific peripheral */
 struct sh_dmae_slave {
-        enum sh_dmae_slave_chan_id      slave_id; /* Set by the platform */
+        unsigned int                    slave_id; /* Set by the platform */
         struct device                   *dma_dev; /* Set by the platform */
         struct sh_dmae_slave_config     *config;  /* Set by the driver */
 };
diff --git a/arch/sh/include/asm/siu.h b/arch/sh/include/asm/siu.h
index f1b1e6944a5f..e8d4142baf59 100644
--- a/arch/sh/include/asm/siu.h
+++ b/arch/sh/include/asm/siu.h
@@ -17,10 +17,10 @@ struct device;
 
 struct siu_platform {
         struct device *dma_dev;
-        enum sh_dmae_slave_chan_id dma_slave_tx_a;
-        enum sh_dmae_slave_chan_id dma_slave_rx_a;
-        enum sh_dmae_slave_chan_id dma_slave_tx_b;
-        enum sh_dmae_slave_chan_id dma_slave_rx_b;
+        unsigned int dma_slave_tx_a;
+        unsigned int dma_slave_rx_a;
+        unsigned int dma_slave_tx_b;
+        unsigned int dma_slave_rx_b;
 };
 
 #endif /* ASM_SIU_H */
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index 5d17e09cb625..e5588f4868ca 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -266,7 +266,7 @@ static struct sh_desc *sh_dmae_get_desc(struct sh_dmae_chan *sh_chan)
 }
 
 static struct sh_dmae_slave_config *sh_dmae_find_slave(
-        struct sh_dmae_chan *sh_chan, enum sh_dmae_slave_chan_id slave_id)
+        struct sh_dmae_chan *sh_chan, struct sh_dmae_slave *param)
 {
         struct dma_device *dma_dev = sh_chan->common.device;
         struct sh_dmae_device *shdev = container_of(dma_dev,
@@ -274,11 +274,11 @@ static struct sh_dmae_slave_config *sh_dmae_find_slave(
         struct sh_dmae_pdata *pdata = shdev->pdata;
         int i;
 
-        if ((unsigned)slave_id >= SHDMA_SLAVE_NUMBER)
+        if (param->slave_id >= SHDMA_SLAVE_NUMBER)
                 return NULL;
 
         for (i = 0; i < pdata->slave_num; i++)
-                if (pdata->slave[i].slave_id == slave_id)
+                if (pdata->slave[i].slave_id == param->slave_id)
                         return pdata->slave + i;
 
         return NULL;
@@ -299,7 +299,7 @@ static int sh_dmae_alloc_chan_resources(struct dma_chan *chan)
         if (param) {
                 struct sh_dmae_slave_config *cfg;
 
-                cfg = sh_dmae_find_slave(sh_chan, param->slave_id);
+                cfg = sh_dmae_find_slave(sh_chan, param);
                 if (!cfg)
                         return -EINVAL;
 
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index f7b9aff88f4a..2d9a06db83b5 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -90,8 +90,8 @@ struct sci_port {
         struct dma_chan                 *chan_rx;
 #ifdef CONFIG_SERIAL_SH_SCI_DMA
         struct device                   *dma_dev;
-        enum sh_dmae_slave_chan_id      slave_tx;
-        enum sh_dmae_slave_chan_id      slave_rx;
+        unsigned int                    slave_tx;
+        unsigned int                    slave_rx;
         struct dma_async_tx_descriptor  *desc_tx;
         struct dma_async_tx_descriptor  *desc_rx[2];
         dma_cookie_t                    cookie_tx;
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h
index 193d4bfe42ff..f5364a1de68b 100644
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@ -33,8 +33,8 @@ struct plat_sci_port {
         char            *clk;                   /* clock string */
         struct device   *dma_dev;
 #ifdef CONFIG_SERIAL_SH_SCI_DMA
-        enum sh_dmae_slave_chan_id dma_slave_tx;
-        enum sh_dmae_slave_chan_id dma_slave_rx;
+        unsigned int dma_slave_tx;
+        unsigned int dma_slave_rx;
 #endif
 };