ehci-mv.c (03ab8e6297acd1bc0eedaa050e2a1635c576fd11) ehci-mv.c (450955d77ae35e0bc11d6fa997376765520acc61)
1// SPDX-License-Identifier: GPL-2.0+
2/*
3 * Copyright (C) 2011 Marvell International Ltd. All rights reserved.
4 * Author: Chao Xie <chao.xie@marvell.com>
5 * Neil Zhang <zhangwm@marvell.com>
6 */
7
8#include <linux/kernel.h>

--- 221 unchanged lines hidden (view full) ---

230err_disable_clk:
231 mv_ehci_disable(ehci_mv);
232err_put_hcd:
233 usb_put_hcd(hcd);
234
235 return retval;
236}
237
1// SPDX-License-Identifier: GPL-2.0+
2/*
3 * Copyright (C) 2011 Marvell International Ltd. All rights reserved.
4 * Author: Chao Xie <chao.xie@marvell.com>
5 * Neil Zhang <zhangwm@marvell.com>
6 */
7
8#include <linux/kernel.h>

--- 221 unchanged lines hidden (view full) ---

230err_disable_clk:
231 mv_ehci_disable(ehci_mv);
232err_put_hcd:
233 usb_put_hcd(hcd);
234
235 return retval;
236}
237
238static int mv_ehci_remove(struct platform_device *pdev)
238static void mv_ehci_remove(struct platform_device *pdev)
239{
240 struct usb_hcd *hcd = platform_get_drvdata(pdev);
241 struct ehci_hcd_mv *ehci_mv = hcd_to_ehci_hcd_mv(hcd);
242
243 if (hcd->rh_registered)
244 usb_remove_hcd(hcd);
245
246 if (!IS_ERR_OR_NULL(ehci_mv->otg))
247 otg_set_host(ehci_mv->otg->otg, NULL);
248
249 if (ehci_mv->mode == MV_USB_MODE_HOST) {
250 if (ehci_mv->set_vbus)
251 ehci_mv->set_vbus(0);
252
253 mv_ehci_disable(ehci_mv);
254 }
255
256 usb_put_hcd(hcd);
239{
240 struct usb_hcd *hcd = platform_get_drvdata(pdev);
241 struct ehci_hcd_mv *ehci_mv = hcd_to_ehci_hcd_mv(hcd);
242
243 if (hcd->rh_registered)
244 usb_remove_hcd(hcd);
245
246 if (!IS_ERR_OR_NULL(ehci_mv->otg))
247 otg_set_host(ehci_mv->otg->otg, NULL);
248
249 if (ehci_mv->mode == MV_USB_MODE_HOST) {
250 if (ehci_mv->set_vbus)
251 ehci_mv->set_vbus(0);
252
253 mv_ehci_disable(ehci_mv);
254 }
255
256 usb_put_hcd(hcd);
257
258 return 0;
259}
260
261static const struct platform_device_id ehci_id_table[] = {
262 {"pxa-u2oehci", 0},
263 {"pxa-sph", 0},
264 {},
265};
266

--- 10 unchanged lines hidden (view full) ---

277
278static const struct of_device_id ehci_mv_dt_ids[] = {
279 { .compatible = "marvell,pxau2o-ehci", },
280 {},
281};
282
283static struct platform_driver ehci_mv_driver = {
284 .probe = mv_ehci_probe,
257}
258
259static const struct platform_device_id ehci_id_table[] = {
260 {"pxa-u2oehci", 0},
261 {"pxa-sph", 0},
262 {},
263};
264

--- 10 unchanged lines hidden (view full) ---

275
276static const struct of_device_id ehci_mv_dt_ids[] = {
277 { .compatible = "marvell,pxau2o-ehci", },
278 {},
279};
280
281static struct platform_driver ehci_mv_driver = {
282 .probe = mv_ehci_probe,
285 .remove = mv_ehci_remove,
283 .remove_new = mv_ehci_remove,
286 .shutdown = mv_ehci_shutdown,
287 .driver = {
288 .name = "mv-ehci",
289 .bus = &platform_bus_type,
290 .of_match_table = ehci_mv_dt_ids,
291 },
292 .id_table = ehci_id_table,
293};

--- 23 unchanged lines hidden --- 		284 .shutdown = mv_ehci_shutdown,
285 .driver = {
286 .name = "mv-ehci",
287 .bus = &platform_bus_type,
288 .of_match_table = ehci_mv_dt_ids,
289 },
290 .id_table = ehci_id_table,
291};

--- 23 unchanged lines hidden ---