Skip to content

L
linux-davinci
Commit 9f591ba7 authored by Tony Lindgren's avatar Tony Lindgren
Browse files
Options

musb_hdrc: Search and replace pController with controller 

Search and replace pController with controller
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent e62e057d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 106 additions and 106 deletions
drivers/usb/musb/cppi_dma.c
View file @ 9f591ba7
This diff is collapsed.
drivers/usb/musb/cppi_dma.h
View file @ 9f591ba7
...@@ -62,7 +62,7 @@ struct cppi_channel { ...@@ -62,7 +62,7 @@ struct cppi_channel {
struct dma_channel Channel; struct dma_channel Channel;
/* back pointer to the Dma Controller structure */ /* back pointer to the Dma Controller structure */
struct cppi *pController; struct cppi *controller;
/* which direction of which endpoint? */ /* which direction of which endpoint? */
struct musb_hw_ep *hw_ep; struct musb_hw_ep *hw_ep;
......
drivers/usb/musb/musbhsdma.c
View file @ 9f591ba7
...@@ -73,7 +73,7 @@ struct musb_dma_controller; ...@@ -73,7 +73,7 @@ struct musb_dma_controller;
struct musb_dma_channel { struct musb_dma_channel {
struct dma_channel Channel; struct dma_channel Channel;
struct musb_dma_controller *pController; struct musb_dma_controller *controller;
u32 dwStartAddress; u32 dwStartAddress;
u32 len; u32 len;
u16 wMaxPacketSize; u16 wMaxPacketSize;
...@@ -102,22 +102,22 @@ static void dma_channel_release(struct dma_channel *pChannel); ...@@ -102,22 +102,22 @@ static void dma_channel_release(struct dma_channel *pChannel);
static int dma_controller_stop(struct dma_controller *c) static int dma_controller_stop(struct dma_controller *c)
{ {
struct musb_dma_controller *pController = struct musb_dma_controller *controller =
container_of(c, struct musb_dma_controller, Controller); container_of(c, struct musb_dma_controller, Controller);
struct musb *musb = (struct musb *) pController->pDmaPrivate; struct musb *musb = (struct musb *) controller->pDmaPrivate;
struct dma_channel *pChannel; struct dma_channel *pChannel;
u8 bBit; u8 bBit;
if (pController->bmUsedChannels != 0) { if (controller->bmUsedChannels != 0) {
dev_err(musb->controller, dev_err(musb->controller,
"Stopping DMA controller while channel active\n"); "Stopping DMA controller while channel active\n");
for (bBit = 0; bBit < MGC_HSDMA_CHANNELS; bBit++) { for (bBit = 0; bBit < MGC_HSDMA_CHANNELS; bBit++) {
if (pController->bmUsedChannels & (1 << bBit)) { if (controller->bmUsedChannels & (1 << bBit)) {
pChannel = &(pController->aChannel[bBit].Channel); pChannel = &(controller->aChannel[bBit].Channel);
dma_channel_release(pChannel); dma_channel_release(pChannel);
if (!pController->bmUsedChannels) if (!controller->bmUsedChannels)
break; break;
} }
} }
...@@ -131,14 +131,14 @@ static struct dma_channel* dma_channel_allocate(struct dma_controller *c, ...@@ -131,14 +131,14 @@ static struct dma_channel* dma_channel_allocate(struct dma_controller *c,
u8 bBit; u8 bBit;
struct dma_channel *pChannel = NULL; struct dma_channel *pChannel = NULL;
struct musb_dma_channel *pImplChannel = NULL; struct musb_dma_channel *pImplChannel = NULL;
struct musb_dma_controller *pController = struct musb_dma_controller *controller =
container_of(c, struct musb_dma_controller, Controller); container_of(c, struct musb_dma_controller, Controller);
for (bBit = 0; bBit < MGC_HSDMA_CHANNELS; bBit++) { for (bBit = 0; bBit < MGC_HSDMA_CHANNELS; bBit++) {
if (!(pController->bmUsedChannels & (1 << bBit))) { if (!(controller->bmUsedChannels & (1 << bBit))) {
pController->bmUsedChannels |= (1 << bBit); controller->bmUsedChannels |= (1 << bBit);
pImplChannel = &(pController->aChannel[bBit]); pImplChannel = &(controller->aChannel[bBit]);
pImplChannel->pController = pController; pImplChannel->controller = controller;
pImplChannel->bIndex = bBit; pImplChannel->bIndex = bBit;
pImplChannel->epnum = hw_ep->epnum; pImplChannel->epnum = hw_ep->epnum;
pImplChannel->transmit = transmit; pImplChannel->transmit = transmit;
...@@ -164,7 +164,7 @@ static void dma_channel_release(struct dma_channel *pChannel) ...@@ -164,7 +164,7 @@ static void dma_channel_release(struct dma_channel *pChannel)
pImplChannel->dwStartAddress = 0; pImplChannel->dwStartAddress = 0;
pImplChannel->len = 0; pImplChannel->len = 0;
pImplChannel->pController->bmUsedChannels &= pImplChannel->controller->bmUsedChannels &=
~(1 << pImplChannel->bIndex); ~(1 << pImplChannel->bIndex);
pChannel->status = MGC_DMA_STATUS_UNKNOWN; pChannel->status = MGC_DMA_STATUS_UNKNOWN;
...@@ -176,8 +176,8 @@ static void configure_channel(struct dma_channel *pChannel, ...@@ -176,8 +176,8 @@ static void configure_channel(struct dma_channel *pChannel,
{ {
struct musb_dma_channel *pImplChannel = struct musb_dma_channel *pImplChannel =
(struct musb_dma_channel *) pChannel->private_data; (struct musb_dma_channel *) pChannel->private_data;
struct musb_dma_controller *pController = pImplChannel->pController; struct musb_dma_controller *controller = pImplChannel->controller;
u8 *mbase = pController->pCoreBase; u8 *mbase = controller->pCoreBase;
u8 bChannel = pImplChannel->bIndex; u8 bChannel = pImplChannel->bIndex;
u16 csr = 0; u16 csr = 0;
...@@ -256,7 +256,7 @@ static int dma_channel_abort(struct dma_channel *pChannel) ...@@ -256,7 +256,7 @@ static int dma_channel_abort(struct dma_channel *pChannel)
struct musb_dma_channel *pImplChannel = struct musb_dma_channel *pImplChannel =
(struct musb_dma_channel *) pChannel->private_data; (struct musb_dma_channel *) pChannel->private_data;
u8 bChannel = pImplChannel->bIndex; u8 bChannel = pImplChannel->bIndex;
u8 *mbase = pImplChannel->pController->pCoreBase; u8 *mbase = pImplChannel->controller->pCoreBase;
u16 csr; u16 csr;
if (pChannel->status == MGC_DMA_STATUS_BUSY) { if (pChannel->status == MGC_DMA_STATUS_BUSY) {
...@@ -296,10 +296,10 @@ static int dma_channel_abort(struct dma_channel *pChannel) ...@@ -296,10 +296,10 @@ static int dma_channel_abort(struct dma_channel *pChannel)
static irqreturn_t dma_controller_irq(int irq, void *private_data) static irqreturn_t dma_controller_irq(int irq, void *private_data)
{ {
struct musb_dma_controller *pController = struct musb_dma_controller *controller =
(struct musb_dma_controller *)private_data; (struct musb_dma_controller *)private_data;
struct musb_dma_channel *pImplChannel; struct musb_dma_channel *pImplChannel;
u8 *mbase = pController->pCoreBase; u8 *mbase = controller->pCoreBase;
struct dma_channel *pChannel; struct dma_channel *pChannel;
u8 bChannel; u8 bChannel;
u16 csr; u16 csr;
...@@ -314,7 +314,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data) ...@@ -314,7 +314,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data)
for (bChannel = 0; bChannel < MGC_HSDMA_CHANNELS; bChannel++) { for (bChannel = 0; bChannel < MGC_HSDMA_CHANNELS; bChannel++) {
if (int_hsdma & (1 << bChannel)) { if (int_hsdma & (1 << bChannel)) {
pImplChannel = (struct musb_dma_channel *) pImplChannel = (struct musb_dma_channel *)
&(pController->aChannel[bChannel]); &(controller->aChannel[bChannel]);
pChannel = &pImplChannel->Channel; pChannel = &pImplChannel->Channel;
csr = musb_readw(mbase, csr = musb_readw(mbase,
...@@ -360,7 +360,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data) ...@@ -360,7 +360,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data)
MUSB_TXCSR_TXPKTRDY); MUSB_TXCSR_TXPKTRDY);
} else } else
musb_dma_completion( musb_dma_completion(
pController->pDmaPrivate, controller->pDmaPrivate,
pImplChannel->epnum, pImplChannel->epnum,
pImplChannel->transmit); pImplChannel->transmit);
} }
...@@ -373,23 +373,23 @@ done: ...@@ -373,23 +373,23 @@ done:
void dma_controller_destroy(struct dma_controller *c) void dma_controller_destroy(struct dma_controller *c)
{ {
struct musb_dma_controller *pController = struct musb_dma_controller *controller =
(struct musb_dma_controller *) c->private_data; (struct musb_dma_controller *) c->private_data;
if (!pController) if (!controller)
return; return;
if (pController->irq) if (controller->irq)
free_irq(pController->irq, c); free_irq(controller->irq, c);
kfree(pController); kfree(controller);
c->private_data = NULL; c->private_data = NULL;
} }
struct dma_controller *__init struct dma_controller *__init
dma_controller_create(struct musb *musb, void __iomem *pCoreBase) dma_controller_create(struct musb *musb, void __iomem *pCoreBase)
{ {
struct musb_dma_controller *pController; struct musb_dma_controller *controller;
struct device *dev = musb->controller; struct device *dev = musb->controller;
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
int irq = platform_get_irq(pdev, 1); int irq = platform_get_irq(pdev, 1);
...@@ -399,30 +399,30 @@ dma_controller_create(struct musb *musb, void __iomem *pCoreBase) ...@@ -399,30 +399,30 @@ dma_controller_create(struct musb *musb, void __iomem *pCoreBase)
return NULL; return NULL;
} }
if (!(pController = kzalloc(sizeof(struct musb_dma_controller), if (!(controller = kzalloc(sizeof(struct musb_dma_controller),
GFP_KERNEL))) GFP_KERNEL)))
return NULL; return NULL;
pController->bChannelCount = MGC_HSDMA_CHANNELS; controller->bChannelCount = MGC_HSDMA_CHANNELS;
pController->pDmaPrivate = musb; controller->pDmaPrivate = musb;
pController->pCoreBase = pCoreBase; controller->pCoreBase = pCoreBase;
pController->Controller.private_data = pController; controller->Controller.private_data = controller;
pController->Controller.start = dma_controller_start; controller->Controller.start = dma_controller_start;
pController->Controller.stop = dma_controller_stop; controller->Controller.stop = dma_controller_stop;
pController->Controller.channel_alloc = dma_channel_allocate; controller->Controller.channel_alloc = dma_channel_allocate;
pController->Controller.channel_release = dma_channel_release; controller->Controller.channel_release = dma_channel_release;
pController->Controller.channel_program = dma_channel_program; controller->Controller.channel_program = dma_channel_program;
pController->Controller.channel_abort = dma_channel_abort; controller->Controller.channel_abort = dma_channel_abort;
if (request_irq(irq, dma_controller_irq, IRQF_DISABLED, if (request_irq(irq, dma_controller_irq, IRQF_DISABLED,
musb->controller->bus_id, &pController->Controller)) { musb->controller->bus_id, &controller->Controller)) {
dev_err(dev, "request_irq %d failed!\n", irq); dev_err(dev, "request_irq %d failed!\n", irq);
dma_controller_destroy(&pController->Controller); dma_controller_destroy(&controller->Controller);
return NULL; return NULL;
} }
pController->irq = irq; controller->irq = irq;
return &pController->Controller; return &controller->Controller;
} }
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