diff options
Diffstat (limited to 'drivers/usb/phy/phy-fsl-usb.c')
-rw-r--r-- | drivers/usb/phy/phy-fsl-usb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c index e771bafb9f1d..fa7c9f9628b5 100644 --- a/drivers/usb/phy/phy-fsl-usb.c +++ b/drivers/usb/phy/phy-fsl-usb.c | |||
@@ -611,7 +611,7 @@ static int fsl_otg_set_peripheral(struct usb_otg *otg, | |||
611 | otg_dev->fsm.b_bus_req = 1; | 611 | otg_dev->fsm.b_bus_req = 1; |
612 | 612 | ||
613 | /* start the gadget right away if the ID pin says Mini-B */ | 613 | /* start the gadget right away if the ID pin says Mini-B */ |
614 | DBG("ID pin=%d\n", otg_dev->fsm.id); | 614 | pr_debug("ID pin=%d\n", otg_dev->fsm.id); |
615 | if (otg_dev->fsm.id == 1) { | 615 | if (otg_dev->fsm.id == 1) { |
616 | fsl_otg_start_host(&otg_dev->fsm, 0); | 616 | fsl_otg_start_host(&otg_dev->fsm, 0); |
617 | otg_drv_vbus(&otg_dev->fsm, 0); | 617 | otg_drv_vbus(&otg_dev->fsm, 0); |
@@ -684,7 +684,7 @@ static int fsl_otg_start_hnp(struct usb_otg *otg) | |||
684 | if (otg_dev != fsl_otg_dev) | 684 | if (otg_dev != fsl_otg_dev) |
685 | return -ENODEV; | 685 | return -ENODEV; |
686 | 686 | ||
687 | DBG("start_hnp...n"); | 687 | pr_debug("start_hnp...\n"); |
688 | 688 | ||
689 | /* clear a_bus_req to enter a_suspend state */ | 689 | /* clear a_bus_req to enter a_suspend state */ |
690 | otg_dev->fsm.a_bus_req = 0; | 690 | otg_dev->fsm.a_bus_req = 0; |
@@ -834,7 +834,7 @@ int usb_otg_start(struct platform_device *pdev) | |||
834 | int status; | 834 | int status; |
835 | struct resource *res; | 835 | struct resource *res; |
836 | u32 temp; | 836 | u32 temp; |
837 | struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data; | 837 | struct fsl_usb2_platform_data *pdata = dev_get_platdata(&pdev->dev); |
838 | 838 | ||
839 | p_otg = container_of(otg_trans, struct fsl_otg, phy); | 839 | p_otg = container_of(otg_trans, struct fsl_otg, phy); |
840 | fsm = &p_otg->fsm; | 840 | fsm = &p_otg->fsm; |
@@ -941,7 +941,7 @@ int usb_otg_start(struct platform_device *pdev) | |||
941 | p_otg->fsm.id = 0; | 941 | p_otg->fsm.id = 0; |
942 | } | 942 | } |
943 | 943 | ||
944 | DBG("initial ID pin=%d\n", p_otg->fsm.id); | 944 | pr_debug("initial ID pin=%d\n", p_otg->fsm.id); |
945 | 945 | ||
946 | /* enable OTG ID pin interrupt */ | 946 | /* enable OTG ID pin interrupt */ |
947 | temp = fsl_readl(&p_otg->dr_mem_map->otgsc); | 947 | temp = fsl_readl(&p_otg->dr_mem_map->otgsc); |
@@ -1105,7 +1105,7 @@ static int fsl_otg_probe(struct platform_device *pdev) | |||
1105 | { | 1105 | { |
1106 | int ret; | 1106 | int ret; |
1107 | 1107 | ||
1108 | if (!pdev->dev.platform_data) | 1108 | if (!dev_get_platdata(&pdev->dev)) |
1109 | return -ENODEV; | 1109 | return -ENODEV; |
1110 | 1110 | ||
1111 | /* configure the OTG */ | 1111 | /* configure the OTG */ |
@@ -1137,7 +1137,7 @@ static int fsl_otg_probe(struct platform_device *pdev) | |||
1137 | 1137 | ||
1138 | static int fsl_otg_remove(struct platform_device *pdev) | 1138 | static int fsl_otg_remove(struct platform_device *pdev) |
1139 | { | 1139 | { |
1140 | struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data; | 1140 | struct fsl_usb2_platform_data *pdata = dev_get_platdata(&pdev->dev); |
1141 | 1141 | ||
1142 | usb_remove_phy(&fsl_otg_dev->phy); | 1142 | usb_remove_phy(&fsl_otg_dev->phy); |
1143 | free_irq(fsl_otg_dev->irq, fsl_otg_dev); | 1143 | free_irq(fsl_otg_dev->irq, fsl_otg_dev); |