From: tomasz.figa@gmail.com (Tomasz Figa)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3] usb: ohci-at91: fix irq and iomem resource retrieval
Date: Thu, 05 Dec 2013 10:53:21 +0100 [thread overview]
Message-ID: <3152704.UEBEXU0Stl@flatron> (raw)
In-Reply-To: <1386237013-22285-1-git-send-email-b.brezillon@overkiz.com>
Hi Boris,
On Thursday 05 of December 2013 10:50:13 Boris BREZILLON wrote:
> When using dt resources retrieval (interrupts and reg properties) there is
> no predefined order for these resources in the platform dev resources
> table.
>
> Retrieve resources using the platform_get_resource function instead of
> direct resource table entries to avoid resource type mismatch.
>
> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
> ---
> Changes since v2:
> - split the patch series to isolate the urgent fix provided by this patch
>
> Changes since v1:
> - none
>
> drivers/usb/host/ohci-at91.c | 19 +++++++++++--------
> 1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
> index 418444e..7aec6ca 100644
> --- a/drivers/usb/host/ohci-at91.c
> +++ b/drivers/usb/host/ohci-at91.c
> @@ -136,23 +136,26 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
> struct ohci_hcd *ohci;
> int retval;
> struct usb_hcd *hcd = NULL;
> + struct device *dev = &pdev->dev;
> + struct resource *mem_r, *irq_r;
>
> - if (pdev->num_resources != 2) {
> - pr_debug("hcd probe: invalid num_resources");
> + mem_r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + if (!mem_r) {
> + dev_dbg(dev, "hcd probe: missing memory resource\n");
> return -ENODEV;
> }
>
> - if ((pdev->resource[0].flags != IORESOURCE_MEM)
> - || (pdev->resource[1].flags != IORESOURCE_IRQ)) {
> - pr_debug("hcd probe: invalid resource type\n");
> + irq_r = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
You could have simply used platform_get_irq() here, but I guess it's just
a matter of preference, so:
Reviewed-by: Tomasz Figa <tomasz.figa@gmail.com>
Best regards,
Tomasz
WARNING: multiple messages have this Message-ID (diff)
From: Tomasz Figa <tomasz.figa@gmail.com>
To: Boris BREZILLON <b.brezillon@overkiz.com>
Cc: Douglas Gilbert <dgilbert@interlog.com>,
Nicolas Ferre <nicolas.ferre@atmel.com>,
Alan Stern <stern@rowland.harvard.edu>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
Grant Likely <grant.likely@linaro.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v3] usb: ohci-at91: fix irq and iomem resource retrieval
Date: Thu, 05 Dec 2013 10:53:21 +0100 [thread overview]
Message-ID: <3152704.UEBEXU0Stl@flatron> (raw)
In-Reply-To: <1386237013-22285-1-git-send-email-b.brezillon@overkiz.com>
Hi Boris,
On Thursday 05 of December 2013 10:50:13 Boris BREZILLON wrote:
> When using dt resources retrieval (interrupts and reg properties) there is
> no predefined order for these resources in the platform dev resources
> table.
>
> Retrieve resources using the platform_get_resource function instead of
> direct resource table entries to avoid resource type mismatch.
>
> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
> ---
> Changes since v2:
> - split the patch series to isolate the urgent fix provided by this patch
>
> Changes since v1:
> - none
>
> drivers/usb/host/ohci-at91.c | 19 +++++++++++--------
> 1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
> index 418444e..7aec6ca 100644
> --- a/drivers/usb/host/ohci-at91.c
> +++ b/drivers/usb/host/ohci-at91.c
> @@ -136,23 +136,26 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
> struct ohci_hcd *ohci;
> int retval;
> struct usb_hcd *hcd = NULL;
> + struct device *dev = &pdev->dev;
> + struct resource *mem_r, *irq_r;
>
> - if (pdev->num_resources != 2) {
> - pr_debug("hcd probe: invalid num_resources");
> + mem_r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + if (!mem_r) {
> + dev_dbg(dev, "hcd probe: missing memory resource\n");
> return -ENODEV;
> }
>
> - if ((pdev->resource[0].flags != IORESOURCE_MEM)
> - || (pdev->resource[1].flags != IORESOURCE_IRQ)) {
> - pr_debug("hcd probe: invalid resource type\n");
> + irq_r = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
You could have simply used platform_get_irq() here, but I guess it's just
a matter of preference, so:
Reviewed-by: Tomasz Figa <tomasz.figa@gmail.com>
Best regards,
Tomasz
next prev parent reply other threads:[~2013-12-05 9:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-05 9:50 [PATCH v3] usb: ohci-at91: fix irq and iomem resource retrieval Boris BREZILLON
2013-12-05 9:50 ` Boris BREZILLON
2013-12-05 9:53 ` Tomasz Figa [this message]
2013-12-05 9:53 ` Tomasz Figa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3152704.UEBEXU0Stl@flatron \
--to=tomasz.figa@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.