Revert "usb: host: ehci-msm: Use devm_ioremap_resource instead of devm_ioremap"
Subsystems (3)
PATCH v2 1/1 Revert "usb: host: ehci-msm: Use devm_ioremap_resource instead of devm_ioremap"
This reverts commit 70843f623b58 ("usb: host: ehci-msm: Use devm_ioremap_resource instead of devm_ioremap") and commit e507bf577e5a ("host: ehci-msm: remove duplicate check on resource"), because msm_otg and this driver are using same address space to access AHB mode and USB command registers.
---
Changes since v0:
* Add note to patch description that also commit e507bf577e5a is reverted.
drivers/usb/host/ehci-msm.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/usb/host/ehci-msm.c +10 -3
@@ -88,13 +88,20 @@ static int ehci_msm_probe(struct platform_device *pdev) } res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - hcd->regs =devm_ioremap_resource (&pdev->dev, res); -if (IS_ERR (hcd->regs)) { - ret =PTR_ERR (hcd->regs); +if (!res) { +dev_err (&pdev->dev,"Unable to get memory resource\n" ); + ret = -ENODEV ; goto put_hcd; } + hcd->rsrc_start = res->start; hcd->rsrc_len =resource_size (res); + hcd->regs =devm_ioremap (&pdev->dev, hcd->rsrc_start, hcd->rsrc_len); +if (!hcd->regs) { +dev_err (&pdev->dev,"ioremap failed\n" ); + ret = -ENOMEM ; + goto put_hcd; + }/* * OTG driver takes care of PHY initialization, clock management,
--
1.9.1
Quoted 46 lines · Ivan T. Ivanov
This reverts commit
70843f623b58("usb: host: ehci-msm: Usedevm_ioremap_resourceinstead ofdevm_ioremap") and commite507bf577e5a("host: ehci-msm: remove duplicate check on resource"), becausemsm_otgand this driver are using same address space to access AHB mode and USB command registers.Cc Vivek Gautam <[email protected]>Signed-off-by Ivan T. Ivanov <[email protected]>---
Changes since v0:
* Add note to patch description that also commit
e507bf577e5ais reverted.drivers/usb/host/ehci-msm.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)drivers/usb/host/ehci-msm.c +10
-4@@ -88,13 +88,20 @@ static int ehci_msm_probe(struct platform_device *pdev) } res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - hcd->regs =devm_ioremap_resource (&pdev->dev, res); -if (IS_ERR (hcd->regs)) { - ret =PTR_ERR (hcd->regs); +if (!res) { +dev_err (&pdev->dev,"Unable to get memory resource\n" ); + ret = -ENODEV ; goto put_hcd; } + hcd->rsrc_start = res->start; hcd->rsrc_len =resource_size (res); + hcd->regs =devm_ioremap (&pdev->dev, hcd->rsrc_start, hcd->rsrc_len); +if (!hcd->regs) { +dev_err (&pdev->dev,"ioremap failed\n" ); + ret = -ENOMEM ; + goto put_hcd; + }/* * OTG driver takes care of PHY initialization, clock management, --
Quoted 1 line
1.9.1
Vivek Gautam
Acked-byHi,
--------------------------------------------------
From: "Alan Stern" <[email protected]>
Sent: Monday, April 27, 2015 8:14 PM
To: "Ivan T. Ivanov" <[email protected]>
Cc: "Greg Kroah-Hartman" <[email protected]>; <[email protected]>; <[email protected]>; <[email protected]>; "Vivek Gautam" <[email protected]>
Subject: Re: [PATCH v2] Revert "usb: host: ehci-msm: Use devm_ioremap_resource instead of devm_ioremap"
Quoted 8 lines · Ivan T. Ivanov
Quoted 7 lines
This reverts commit
70843f623b58("usb: host: ehci-msm: Usedevm_ioremap_resourceinstead ofdevm_ioremap") and commite507bf577e5a("host: ehci-msm: remove duplicate check on resource"), becausemsm_otgand this driver are using same address space to access AHB mode and USB command registers.
Quoted 7 lines
Quoted 7 lines
Cc Vivek Gautam <[email protected]>Signed-off-by Ivan T. Ivanov <[email protected]>---
Changes since v0:
* Add note to patch description that also commit
e507bf577e5ais reverted.
Ok,
Quoted 38 lines
Quoted 32 lines
drivers/usb/host/ehci-msm.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)drivers/usb/host/ehci-msm.c +10
-3@@ -88,13 +88,20 @@ static int ehci_msm_probe(struct platform_device *pdev) } res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - hcd->regs =devm_ioremap_resource (&pdev->dev, res); -if (IS_ERR (hcd->regs)) { - ret =PTR_ERR (hcd->regs); +if (!res) { +dev_err (&pdev->dev,"Unable to get memory resource\n" ); + ret = -ENODEV ; goto put_hcd; } + hcd->rsrc_start = res->start; hcd->rsrc_len =resource_size (res); + hcd->regs =devm_ioremap (&pdev->dev, hcd->rsrc_start, hcd->rsrc_len); +if (!hcd->regs) { +dev_err (&pdev->dev,"ioremap failed\n" ); + ret = -ENOMEM ; + goto put_hcd; + }/* Quoted 3 lines
* OTG driver takes care of PHY initialization, clock management,
--
1.9.1Acked-by Alan Stern <[email protected]>