| Message ID | 20211215225203.1991003-1-robh@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e1ffd5f0709de8a423925a60d1e4b3593e0c96b4 |
| Headers | show |
| Series | usb: uhci: Use platform_get_irq() to get the interrupt | expand |
On Wed, Dec 15, 2021 at 04:52:03PM -0600, Rob Herring wrote: > Accessing platform device resources directly has long been deprecated for > DT as IRQ resources may not be available at device creation time. Drivers > continuing to use static IRQ resources is blocking removing the static setup > from the DT core code. > > Signed-off-by: Rob Herring <robh@kernel.org> > --- Acked-by: Alan Stern <stern@rowland.harvard.edu> > drivers/usb/host/uhci-platform.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/host/uhci-platform.c b/drivers/usb/host/uhci-platform.c > index 70dbd95c3f06..b854699e9e4e 100644 > --- a/drivers/usb/host/uhci-platform.c > +++ b/drivers/usb/host/uhci-platform.c > @@ -132,7 +132,11 @@ static int uhci_hcd_platform_probe(struct platform_device *pdev) > goto err_rmr; > } > > - ret = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_SHARED); > + ret = platform_get_irq(pdev, 0); > + if (ret < 0) > + goto err_clk; > + > + ret = usb_add_hcd(hcd, ret, IRQF_SHARED); > if (ret) > goto err_clk; > > -- > 2.32.0 >
diff --git a/drivers/usb/host/uhci-platform.c b/drivers/usb/host/uhci-platform.c index 70dbd95c3f06..b854699e9e4e 100644 --- a/drivers/usb/host/uhci-platform.c +++ b/drivers/usb/host/uhci-platform.c @@ -132,7 +132,11 @@ static int uhci_hcd_platform_probe(struct platform_device *pdev) goto err_rmr; } - ret = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_SHARED); + ret = platform_get_irq(pdev, 0); + if (ret < 0) + goto err_clk; + + ret = usb_add_hcd(hcd, ret, IRQF_SHARED); if (ret) goto err_clk;
Accessing platform device resources directly has long been deprecated for DT as IRQ resources may not be available at device creation time. Drivers continuing to use static IRQ resources is blocking removing the static setup from the DT core code. Signed-off-by: Rob Herring <robh@kernel.org> --- drivers/usb/host/uhci-platform.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)