| Message ID | 20211115085403.360194-5-arnd@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | dmaengine: kill off dma_slave_config->slave_id | expand |
Hi Arnd, Thank you for the patch. On Mon, Nov 15, 2021 at 09:53:56AM +0100, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > The slave device is picked through either devicetree or a filter > function, and any remaining out-of-tree drivers would have warned > about this usage since 2015. > > Stop interpreting the field finally so it can be removed from > the interface. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/dma/sh/shdma-base.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c > index 7f72b3f4cd1a..41c6bc650fa3 100644 > --- a/drivers/dma/sh/shdma-base.c > +++ b/drivers/dma/sh/shdma-base.c > @@ -786,14 +786,6 @@ static int shdma_config(struct dma_chan *chan, > if (!config) > 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...
diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c index 7f72b3f4cd1a..41c6bc650fa3 100644 --- a/drivers/dma/sh/shdma-base.c +++ b/drivers/dma/sh/shdma-base.c @@ -786,14 +786,6 @@ static int shdma_config(struct dma_chan *chan, if (!config) 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...