| Message ID | 1414531573-18807-3-git-send-email-maxime.ripard@free-electrons.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On 28/10/2014 22:25, Maxime Ripard : > We are removing the dmaengine_device_control API, that shouldn't even have been > exposed in the first place. Change the callers to use the proper API. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Thanks, Maxime. Do I have to carry the patch myself or is it part of a series? Bye, > --- > drivers/tty/serial/atmel_serial.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c > index edde3eca055d..10e6b382d68f 100644 > --- a/drivers/tty/serial/atmel_serial.c > +++ b/drivers/tty/serial/atmel_serial.c > @@ -862,9 +862,8 @@ static int atmel_prepare_tx_dma(struct uart_port *port) > config.dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE; > config.dst_addr = port->mapbase + ATMEL_US_THR; > > - ret = dmaengine_device_control(atmel_port->chan_tx, > - DMA_SLAVE_CONFIG, > - (unsigned long)&config); > + ret = dmaengine_slave_config(atmel_port->chan_tx, > + &config); > if (ret) { > dev_err(port->dev, "DMA tx slave configuration failed\n"); > goto chan_err; > @@ -1026,9 +1025,8 @@ static int atmel_prepare_rx_dma(struct uart_port *port) > config.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE; > config.src_addr = port->mapbase + ATMEL_US_RHR; > > - ret = dmaengine_device_control(atmel_port->chan_rx, > - DMA_SLAVE_CONFIG, > - (unsigned long)&config); > + ret = dmaengine_slave_config(atmel_port->chan_rx, > + &config); > if (ret) { > dev_err(port->dev, "DMA rx slave configuration failed\n"); > goto chan_err; >
Hi Nicolas, On Mon, Nov 03, 2014 at 12:12:44PM +0100, Nicolas Ferre wrote: > On 28/10/2014 22:25, Maxime Ripard : > > We are removing the dmaengine_device_control API, that shouldn't even have been > > exposed in the first place. Change the callers to use the proper API. > > > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > > Thanks, Maxime. Do I have to carry the patch myself or is it part of a > series? I think it would be better to keep it together with that serie, since we're removing dmaengine_device_control in a latter patch. If it's ok for you of course. Maxime
On 03/11/2014 13:33, Maxime Ripard : > Hi Nicolas, > > On Mon, Nov 03, 2014 at 12:12:44PM +0100, Nicolas Ferre wrote: >> On 28/10/2014 22:25, Maxime Ripard : >>> We are removing the dmaengine_device_control API, that shouldn't even have been >>> exposed in the first place. Change the callers to use the proper API. >>> >>> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> >> >> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> >> >> Thanks, Maxime. Do I have to carry the patch myself or is it part of a >> series? > > I think it would be better to keep it together with that serie, since > we're removing dmaengine_device_control in a latter patch. If it's ok > for you of course. Fair enough, keep it in. Thanks Maxime, bye,
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index edde3eca055d..10e6b382d68f 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -862,9 +862,8 @@ static int atmel_prepare_tx_dma(struct uart_port *port) config.dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE; config.dst_addr = port->mapbase + ATMEL_US_THR; - ret = dmaengine_device_control(atmel_port->chan_tx, - DMA_SLAVE_CONFIG, - (unsigned long)&config); + ret = dmaengine_slave_config(atmel_port->chan_tx, + &config); if (ret) { dev_err(port->dev, "DMA tx slave configuration failed\n"); goto chan_err; @@ -1026,9 +1025,8 @@ static int atmel_prepare_rx_dma(struct uart_port *port) config.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE; config.src_addr = port->mapbase + ATMEL_US_RHR; - ret = dmaengine_device_control(atmel_port->chan_rx, - DMA_SLAVE_CONFIG, - (unsigned long)&config); + ret = dmaengine_slave_config(atmel_port->chan_rx, + &config); if (ret) { dev_err(port->dev, "DMA rx slave configuration failed\n"); goto chan_err;
We are removing the dmaengine_device_control API, that shouldn't even have been exposed in the first place. Change the callers to use the proper API. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- drivers/tty/serial/atmel_serial.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)