Commit 29504121 authored by Tony Lindgren's avatar Tony Lindgren

musb_hdrc: Search and replace bDmaOk with dma_ok

Search and replace bDmaOk with dma_ok
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 19539ddd
...@@ -629,7 +629,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum, ...@@ -629,7 +629,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
{ {
struct dma_controller *dma_controller; struct dma_controller *dma_controller;
struct dma_channel *dma_channel; struct dma_channel *dma_channel;
u8 bDmaOk; u8 dma_ok;
void __iomem *mbase = musb->mregs; void __iomem *mbase = musb->mregs;
struct musb_hw_ep *hw_ep = musb->endpoints + epnum; struct musb_hw_ep *hw_ep = musb->endpoints + epnum;
void __iomem *epio = hw_ep->regs; void __iomem *epio = hw_ep->regs;
...@@ -791,12 +791,12 @@ static void musb_ep_program(struct musb *musb, u8 epnum, ...@@ -791,12 +791,12 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
musb_writew(epio, MUSB_TXCSR, csr); musb_writew(epio, MUSB_TXCSR, csr);
bDmaOk = dma_controller->channel_program( dma_ok = dma_controller->channel_program(
dma_channel, packet_sz, dma_channel, packet_sz,
dma_channel->desired_mode, dma_channel->desired_mode,
urb->transfer_dma, urb->transfer_dma,
qh->segsize); qh->segsize);
if (bDmaOk) { if (dma_ok) {
load_count = 0; load_count = 0;
} else { } else {
dma_controller->channel_release(dma_channel); dma_controller->channel_release(dma_channel);
...@@ -830,14 +830,14 @@ static void musb_ep_program(struct musb *musb, u8 epnum, ...@@ -830,14 +830,14 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
/* TX uses "rndis" mode automatically, but needs help /* TX uses "rndis" mode automatically, but needs help
* to identify the zero-length-final-packet case. * to identify the zero-length-final-packet case.
*/ */
bDmaOk = dma_controller->channel_program( dma_ok = dma_controller->channel_program(
dma_channel, packet_sz, dma_channel, packet_sz,
(urb->transfer_flags (urb->transfer_flags
& URB_ZERO_PACKET) & URB_ZERO_PACKET)
== URB_ZERO_PACKET, == URB_ZERO_PACKET,
urb->transfer_dma, urb->transfer_dma,
qh->segsize); qh->segsize);
if (bDmaOk) { if (dma_ok) {
load_count = 0; load_count = 0;
} else { } else {
dma_controller->channel_release(dma_channel); dma_controller->channel_release(dma_channel);
...@@ -915,13 +915,13 @@ static void musb_ep_program(struct musb *musb, u8 epnum, ...@@ -915,13 +915,13 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
/* unless caller treats short rx transfers as /* unless caller treats short rx transfers as
* errors, we dare not queue multiple transfers. * errors, we dare not queue multiple transfers.
*/ */
bDmaOk = dma_controller->channel_program( dma_ok = dma_controller->channel_program(
dma_channel, packet_sz, dma_channel, packet_sz,
!(urb->transfer_flags !(urb->transfer_flags
& URB_SHORT_NOT_OK), & URB_SHORT_NOT_OK),
urb->transfer_dma, urb->transfer_dma,
qh->segsize); qh->segsize);
if (!bDmaOk) { if (!dma_ok) {
dma_controller->channel_release( dma_controller->channel_release(
dma_channel); dma_channel);
dma_channel = hw_ep->rx_channel = NULL; dma_channel = hw_ep->rx_channel = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment