aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/phy/phy-ab8500-usb.c
diff options
context:
space:
mode:
authorFabio Baltieri <fabio.baltieri@linaro.org>2013-05-15 08:03:25 -0400
committerFelipe Balbi <balbi@ti.com>2013-05-28 13:00:04 -0400
commit3147dad6fa457e0bb7edaab36f6d290c7048b49e (patch)
treef2c6a016c58cf2a0584f7e9d2dcf6a37faa2e28b /drivers/usb/phy/phy-ab8500-usb.c
parentaee5500f4fe5fec7ba1c371e6538d791ca294bd8 (diff)
usb: musb: various cosmetic fixes on ux500 files
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>
Diffstat (limited to 'drivers/usb/phy/phy-ab8500-usb.c')
-rw-r--r--drivers/usb/phy/phy-ab8500-usb.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/usb/phy/phy-ab8500-usb.c b/drivers/usb/phy/phy-ab8500-usb.c
index e5eb1b5a04eb..f760e935e059 100644
--- a/drivers/usb/phy/phy-ab8500-usb.c
+++ b/drivers/usb/phy/phy-ab8500-usb.c
@@ -286,7 +286,8 @@ static void ab8500_usb_phy_disable(struct ab8500_usb *ab, bool sel_host)
286 else if (pinctrl_select_state(ab->pinctrl, ab->pins_sleep)) 286 else if (pinctrl_select_state(ab->pinctrl, ab->pins_sleep))
287 dev_err(ab->dev, "could not set pins to sleep state\n"); 287 dev_err(ab->dev, "could not set pins to sleep state\n");
288 288
289 /* as USB pins are shared with idddet, release them to allow 289 /*
290 * as USB pins are shared with iddet, release them to allow
290 * iddet to request them 291 * iddet to request them
291 */ 292 */
292 pinctrl_put(ab->pinctrl); 293 pinctrl_put(ab->pinctrl);
@@ -553,7 +554,7 @@ static irqreturn_t ab8500_usb_disconnect_irq(int irq, void *data)
553 554
554static irqreturn_t ab8500_usb_link_status_irq(int irq, void *data) 555static irqreturn_t ab8500_usb_link_status_irq(int irq, void *data)
555{ 556{
556 struct ab8500_usb *ab = (struct ab8500_usb *) data; 557 struct ab8500_usb *ab = (struct ab8500_usb *)data;
557 558
558 abx500_usb_link_status_update(ab); 559 abx500_usb_link_status_update(ab);
559 560
@@ -627,7 +628,7 @@ static int ab8500_usb_set_peripheral(struct usb_otg *otg,
627 * is fixed. 628 * is fixed.
628 */ 629 */
629 630
630 if ((ab->mode != USB_IDLE) && (!gadget)) { 631 if ((ab->mode != USB_IDLE) && !gadget) {
631 ab->mode = USB_IDLE; 632 ab->mode = USB_IDLE;
632 schedule_work(&ab->phy_dis_work); 633 schedule_work(&ab->phy_dis_work);
633 } 634 }
@@ -651,7 +652,7 @@ static int ab8500_usb_set_host(struct usb_otg *otg, struct usb_bus *host)
651 * is fixed. 652 * is fixed.
652 */ 653 */
653 654
654 if ((ab->mode != USB_IDLE) && (!host)) { 655 if ((ab->mode != USB_IDLE) && !host) {
655 ab->mode = USB_IDLE; 656 ab->mode = USB_IDLE;
656 schedule_work(&ab->phy_dis_work); 657 schedule_work(&ab->phy_dis_work);
657 } 658 }