diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2015-04-20 18:51:14 (GMT) |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-04-20 18:51:14 (GMT) |
| commit | b53c7582805b10d6a32e88e22d16dc469e66a37a (patch) | |
| tree | 3775742e873f18d005fd8c2187411ead06c0049d /drivers/spi | |
| parent | 7d3beab16dd9eee86bb1a4dd05b51159fc7772f0 (diff) | |
| parent | 3cd44dcd35a6618df88c51561290dc02fb35b8e2 (diff) | |
| download | linux-b53c7582805b10d6a32e88e22d16dc469e66a37a.tar.xz | |
Merge branch 'topic/sh' into for-linus
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-rspi.c | 1 | ||||
| -rw-r--r-- | drivers/spi/spi-sh-msiof.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index 46ce470..3f41106 100644 --- a/drivers/spi/spi-rspi.c +++ b/drivers/spi/spi-rspi.c @@ -913,7 +913,6 @@ static struct dma_chan *rspi_request_dma_chan(struct device *dev, } memset(&cfg, 0, sizeof(cfg)); - cfg.slave_id = id; cfg.direction = dir; if (dir == DMA_MEM_TO_DEV) { cfg.dst_addr = port_addr; diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index e57eec0..bcc7c63 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -1030,7 +1030,6 @@ static struct dma_chan *sh_msiof_request_dma_chan(struct device *dev, } memset(&cfg, 0, sizeof(cfg)); - cfg.slave_id = id; cfg.direction = dir; if (dir == DMA_MEM_TO_DEV) { cfg.dst_addr = port_addr; |