evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

usb: musb: various cosmetic fixes on ux500 files

Browse source 
Various non functional coding style fixes on ux500_dma.c and
phy-ab8500-usb.c drivers.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Maxime Coquelin <maxime.coquelin@st.com>
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Fabio Baltieri 2013-05-15 14:03:25 +02:00 • committed by Felipe Balbi
parent aee5500f4f
commit 3147dad6fa
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/usb/musb/ux500_dma.c
View file

@ -71,8 +71,7 @@ static void ux500_dma_callback(void *private_data)
spin_lock_irqsave(&musb->lock, flags); spin_lock_irqsave(&musb->lock, flags);
ux500_channel->channel.actual_len = ux500_channel->cur_len; ux500_channel->channel.actual_len = ux500_channel->cur_len;
ux500_channel->channel.status = MUSB_DMA_STATUS_FREE; ux500_channel->channel.status = MUSB_DMA_STATUS_FREE;
musb_dma_completion(musb, hw_ep->epnum, musb_dma_completion(musb, hw_ep->epnum, ux500_channel->is_tx);
ux500_channel->is_tx);
spin_unlock_irqrestore(&musb->lock, flags); spin_unlock_irqrestore(&musb->lock, flags);
} }
@ -366,7 +365,8 @@ void dma_controller_destroy(struct dma_controller *c)
kfree(controller); kfree(controller);
} }
struct dma_controller *dma_controller_create(struct musb *musb, void __iomem *base) struct dma_controller *dma_controller_create(struct musb *musb,
void __iomem *base)
{ {
struct ux500_dma_controller *controller; struct ux500_dma_controller *controller;
struct platform_device *pdev = to_platform_device(musb->controller); struct platform_device *pdev = to_platform_device(musb->controller);

7
drivers/usb/phy/phy-ab8500-usb.c
View file

@ -286,7 +286,8 @@ static void ab8500_usb_phy_disable(struct ab8500_usb *ab, bool sel_host)
else if (pinctrl_select_state(ab->pinctrl, ab->pins_sleep)) else if (pinctrl_select_state(ab->pinctrl, ab->pins_sleep))
dev_err(ab->dev, "could not set pins to sleep state\n"); dev_err(ab->dev, "could not set pins to sleep state\n");
/* as USB pins are shared with idddet, release them to allow /*
* as USB pins are shared with iddet, release them to allow
* iddet to request them * iddet to request them
*/ */
pinctrl_put(ab->pinctrl); pinctrl_put(ab->pinctrl);
@ -627,7 +628,7 @@ static int ab8500_usb_set_peripheral(struct usb_otg *otg,
* is fixed. * is fixed.
*/ */
if ((ab->mode != USB_IDLE) && (!gadget)) { if ((ab->mode != USB_IDLE) && !gadget) {
ab->mode = USB_IDLE; ab->mode = USB_IDLE;
schedule_work(&ab->phy_dis_work); schedule_work(&ab->phy_dis_work);
} }
@ -651,7 +652,7 @@ static int ab8500_usb_set_host(struct usb_otg *otg, struct usb_bus *host)
* is fixed. * is fixed.
*/ */
if ((ab->mode != USB_IDLE) && (!host)) { if ((ab->mode != USB_IDLE) && !host) {
ab->mode = USB_IDLE; ab->mode = USB_IDLE;
schedule_work(&ab->phy_dis_work); schedule_work(&ab->phy_dis_work);
} }