diff options
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise.c | 1 | ||||
| -rw-r--r-- | drivers/usb/gadget/fsl_udc_core.c | 15 | ||||
| -rw-r--r-- | include/linux/fsl_devices.h | 1 |
3 files changed, 6 insertions, 11 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise.c b/arch/arm/mach-tegra/board-enterprise.c index b8cad28833bb..3d349620bd2b 100644 --- a/arch/arm/mach-tegra/board-enterprise.c +++ b/arch/arm/mach-tegra/board-enterprise.c @@ -665,7 +665,6 @@ static void enterprise_usb_init(void) platform_device_register(&tegra_otg_device); udc_pdata = tegra_udc_device.dev.platform_data; - udc_pdata->charge_regulator ="usb_bat_chg"; } static void enterprise_gps_init(void) diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c index 59de4264c9a2..f7abe13d3e73 100644 --- a/drivers/usb/gadget/fsl_udc_core.c +++ b/drivers/usb/gadget/fsl_udc_core.c @@ -3034,15 +3034,12 @@ static int __init fsl_udc_probe(struct platform_device *pdev) INIT_WORK(&udc_controller->charger_work, fsl_udc_set_current_limit_work); /* Get the regulator for drawing the vbus current in udc driver */ - if (pdata->charge_regulator) { - udc_controller->vbus_regulator = regulator_get(NULL, - pdata->charge_regulator); - if (IS_ERR(udc_controller->vbus_regulator)) { - dev_err(&pdev->dev, - "can't get charge regulator,err:%ld\n", - PTR_ERR(udc_controller->vbus_regulator)); - udc_controller->vbus_regulator = NULL; - } + udc_controller->vbus_regulator = regulator_get(NULL, "usb_bat_chg"); + if (IS_ERR(udc_controller->vbus_regulator)) { + dev_err(&pdev->dev, + "can't get charge regulator,err:%ld\n", + PTR_ERR(udc_controller->vbus_regulator)); + udc_controller->vbus_regulator = NULL; } #ifdef CONFIG_USB_OTG_UTILS diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index b54bd37ec09b..1962102d132e 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -104,7 +104,6 @@ struct fsl_usb2_platform_data { void *phy_config; enum fsl_usb2_phy_types usb_phy_type; - const char *charge_regulator; }; /* Flags in fsl_usb2_mph_platform_data */ |