| Message ID | 1370864113-17895-15-git-send-email-tushar.behera@linaro.org |
|---|---|
| State | Accepted |
| Commit | 56a9a6de2a87221c859be431b7b48e84b3f867b9 |
| Headers | show |
Hello. On 10-06-2013 15:35, Tushar Behera wrote: > Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()") > introduced devm_ioremap_resource() and deprecated the use of > devm_request_and_ioremap(). > Signed-off-by: Tushar Behera <tushar.behera@linaro.org> > CC: linux-usb@vger.kernel.org > CC: Felipe Balbi <balbi@ti.com> > --- > drivers/usb/phy/phy-rcar-usb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > diff --git a/drivers/usb/phy/phy-rcar-usb.c b/drivers/usb/phy/phy-rcar-usb.c > index a35681b..23c3dd3 100644 > --- a/drivers/usb/phy/phy-rcar-usb.c > +++ b/drivers/usb/phy/phy-rcar-usb.c > @@ -161,7 +161,7 @@ static int rcar_usb_phy_probe(struct platform_device *pdev) > * CAUTION > * > * Because this phy address is also mapped under OHCI/EHCI address area, > - * this driver can't use devm_request_and_ioremap(dev, res) here > + * this driver can't use devm_ioremap_resource(dev, res) here > */ > reg0 = devm_ioremap_nocache(dev, res0->start, resource_size(res0)); > reg1 = devm_ioremap_nocache(dev, res1->start, resource_size(res1)); I'm completely removing this comment in my series pushed thru renesas.git, so I advise this patch to be ignored not to create conflict in the future. WBR, Sergei
On 06/10/2013 05:47 PM, Sergei Shtylyov wrote: > Hello. > > On 10-06-2013 15:35, Tushar Behera wrote: > [ ... ] >> * CAUTION >> * >> * Because this phy address is also mapped under OHCI/EHCI >> address area, >> - * this driver can't use devm_request_and_ioremap(dev, res) here >> + * this driver can't use devm_ioremap_resource(dev, res) here >> */ >> reg0 = devm_ioremap_nocache(dev, res0->start, resource_size(res0)); >> reg1 = devm_ioremap_nocache(dev, res1->start, resource_size(res1)); > > I'm completely removing this comment in my series pushed thru > renesas.git, so I advise this patch to be ignored not to create conflict > in the future. > Ok. I will drop this from the patchset. > WBR, Sergei > Thanks.
diff --git a/drivers/usb/phy/phy-rcar-usb.c b/drivers/usb/phy/phy-rcar-usb.c index a35681b..23c3dd3 100644 --- a/drivers/usb/phy/phy-rcar-usb.c +++ b/drivers/usb/phy/phy-rcar-usb.c @@ -161,7 +161,7 @@ static int rcar_usb_phy_probe(struct platform_device *pdev) * CAUTION * * Because this phy address is also mapped under OHCI/EHCI address area, - * this driver can't use devm_request_and_ioremap(dev, res) here + * this driver can't use devm_ioremap_resource(dev, res) here */ reg0 = devm_ioremap_nocache(dev, res0->start, resource_size(res0)); reg1 = devm_ioremap_nocache(dev, res1->start, resource_size(res1));
Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()") introduced devm_ioremap_resource() and deprecated the use of devm_request_and_ioremap(). Signed-off-by: Tushar Behera <tushar.behera@linaro.org> CC: linux-usb@vger.kernel.org CC: Felipe Balbi <balbi@ti.com> --- drivers/usb/phy/phy-rcar-usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)