diff options
| author | Vinod Koul <vkoul@kernel.org> | 2021-12-17 21:42:17 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2021-12-17 21:42:17 +0530 |
| commit | 2577394f4b01906d345d8b223d1a17cc34e46b46 (patch) | |
| tree | 932ef63ff765723e09b18d56d09d40220a5221e3 /drivers/dma/sh | |
| parent | d5aeba456e666c6f2c01e8b4e5bba2affabcdd09 (diff) | |
| parent | 3c219644075795a99271d345efdfa8b256e55161 (diff) | |
Merge tag 'dmaengine_topic_slave_id_removal_5.17' into next
Merge the tag dmaengine_topic_slave_id_removal_5.17 into next. This
brings in the slave_id removal topic changes
Diffstat (limited to 'drivers/dma/sh')
| -rw-r--r-- | drivers/dma/sh/shdma-base.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c index 0a2eb5f5a6e8..158e5e7defae 100644 --- a/drivers/dma/sh/shdma-base.c +++ b/drivers/dma/sh/shdma-base.c @@ -787,14 +787,6 @@ static int shdma_config(struct dma_chan *chan, return -EINVAL; /* - * overriding the slave_id through dma_slave_config is deprecated, - * but possibly some out-of-tree drivers still do it. - */ - if (WARN_ON_ONCE(config->slave_id && - config->slave_id != schan->real_slave_id)) - schan->real_slave_id = config->slave_id; - - /* * We could lock this, but you shouldn't be configuring the * channel, while using it... */ |