aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/renesas_usbhs/fifo.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2012-05-09 11:09:19 -0400
committerVinod Koul <vinod.koul@linux.intel.com>2012-07-12 23:43:08 -0400
commitf19b7e0db7744dd1ed6052cc58a90b74a29772b8 (patch)
tree646e1886395421634bcf4c66160d5e352af359e4 /drivers/usb/renesas_usbhs/fifo.c
parent6f3de8bf33902a91b83744c76fea7de3cd0328cc (diff)
usb: renesas_usbhs: prepare for conversion to the shdma base library
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/usb/renesas_usbhs/fifo.c')
-rw-r--r--drivers/usb/renesas_usbhs/fifo.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c
index 6ec7f838d7fa..fc597a49ac27 100644
--- a/drivers/usb/renesas_usbhs/fifo.c
+++ b/drivers/usb/renesas_usbhs/fifo.c
@@ -994,7 +994,7 @@ static bool usbhsf_dma_filter(struct dma_chan *chan, void *param)
994 * 994 *
995 * usbhs doesn't recognize id = 0 as valid DMA 995 * usbhs doesn't recognize id = 0 as valid DMA
996 */ 996 */
997 if (0 == slave->slave_id) 997 if (0 == slave->shdma_slave.slave_id)
998 return false; 998 return false;
999 999
1000 chan->private = slave; 1000 chan->private = slave;
@@ -1173,8 +1173,8 @@ int usbhs_fifo_probe(struct usbhs_priv *priv)
1173 fifo->port = D0FIFO; 1173 fifo->port = D0FIFO;
1174 fifo->sel = D0FIFOSEL; 1174 fifo->sel = D0FIFOSEL;
1175 fifo->ctr = D0FIFOCTR; 1175 fifo->ctr = D0FIFOCTR;
1176 fifo->tx_slave.slave_id = usbhs_get_dparam(priv, d0_tx_id); 1176 fifo->tx_slave.shdma_slave.slave_id = usbhs_get_dparam(priv, d0_tx_id);
1177 fifo->rx_slave.slave_id = usbhs_get_dparam(priv, d0_rx_id); 1177 fifo->rx_slave.shdma_slave.slave_id = usbhs_get_dparam(priv, d0_rx_id);
1178 1178
1179 /* D1FIFO */ 1179 /* D1FIFO */
1180 fifo = usbhsf_get_d1fifo(priv); 1180 fifo = usbhsf_get_d1fifo(priv);
@@ -1182,8 +1182,8 @@ int usbhs_fifo_probe(struct usbhs_priv *priv)
1182 fifo->port = D1FIFO; 1182 fifo->port = D1FIFO;
1183 fifo->sel = D1FIFOSEL; 1183 fifo->sel = D1FIFOSEL;
1184 fifo->ctr = D1FIFOCTR; 1184 fifo->ctr = D1FIFOCTR;
1185 fifo->tx_slave.slave_id = usbhs_get_dparam(priv, d1_tx_id); 1185 fifo->tx_slave.shdma_slave.slave_id = usbhs_get_dparam(priv, d1_tx_id);
1186 fifo->rx_slave.slave_id = usbhs_get_dparam(priv, d1_rx_id); 1186 fifo->rx_slave.shdma_slave.slave_id = usbhs_get_dparam(priv, d1_rx_id);
1187 1187
1188 return 0; 1188 return 0;
1189} 1189}