Merge branch 'for-linus-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / dma / s3c24xx-dma.c

diff --git a/drivers/dma/s3c24xx-dma.c b/drivers/dma/s3c24xx-dma.c
index 3c579abbabb713bf1c0f11c7f63fde92975edf6c..f04c4702d98bfeb58ae059cd427b9ab5f14d8f67 100644 (file)
--- a/drivers/dma/s3c24xx-dma.c
+++ b/drivers/dma/s3c24xx-dma.c
@@ -289,16 +289,11 @@ static
 struct s3c24xx_dma_phy *s3c24xx_dma_get_phy(struct s3c24xx_dma_chan *s3cchan)
 {
        struct s3c24xx_dma_engine *s3cdma = s3cchan->host;
-       const struct s3c24xx_dma_platdata *pdata = s3cdma->pdata;
-       struct s3c24xx_dma_channel *cdata;
        struct s3c24xx_dma_phy *phy = NULL;
        unsigned long flags;
        int i;
        int ret;
 
-       if (s3cchan->slave)
-               cdata = &pdata->channels[s3cchan->id];
-
        for (i = 0; i < s3cdma->pdata->num_phy_channels; i++) {
                phy = &s3cdma->phy_chans[i];