devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Ricardo Ribalda Delgado
	<ricardo.ribalda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Greg Kroah-Hartman
	<gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>,
	Grant Likely
	<grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
	Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
	Andrew Morton
	<akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>,
	Jakub Sitnicki
	<jsitnicki-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
	Vivek Goyal <vgoyal-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
	Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>,
	Jiang Liu <jiang.liu-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>,
	Mike Travis <travis-sJ/iWh9BUns@public.gmane.org>,
	Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>,
	"linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
	<linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	"devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
	<devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Subject: Re: [PATCH v4 1/4] base/platform: Only insert MEM and IO resources
Date: Wed, 13 May 2015 08:56:00 -0500	[thread overview]
Message-ID: <CAL_JsqK8UAQwns7Bb3MQDXKBcqwBfQdswrnnOwUKKJROse7LXw@mail.gmail.com> (raw)
In-Reply-To: <1429797494-29242-2-git-send-email-ricardo.ribalda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

On Thu, Apr 23, 2015 at 8:58 AM, Ricardo Ribalda Delgado
<ricardo.ribalda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> platform_device_del only checks the type of the resource in order to
> call release_resource.
>
> On the other hand, platform_device_add calls insert_resource for any
> resource that has a parent.
>
> Make both code branches balanced.

Does this actually solve anything? What resources have parents besides
mem or io?

Rob

>
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>  drivers/base/platform.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/base/platform.c b/drivers/base/platform.c
> index ebf034b..6028681 100644
> --- a/drivers/base/platform.c
> +++ b/drivers/base/platform.c
> @@ -341,19 +341,23 @@ int platform_device_add(struct platform_device *pdev)
>
>         for (i = 0; i < pdev->num_resources; i++) {
>                 struct resource *p, *r = &pdev->resource[i];
> +               unsigned long type = resource_type(r);
>
>                 if (r->name == NULL)
>                         r->name = dev_name(&pdev->dev);
>
> +               if (!(type == IORESOURCE_MEM || type == IORESOURCE_IO))
> +                       continue;
> +
>                 p = r->parent;
>                 if (!p) {
> -                       if (resource_type(r) == IORESOURCE_MEM)
> +                       if (type == IORESOURCE_MEM)
>                                 p = &iomem_resource;
> -                       else if (resource_type(r) == IORESOURCE_IO)
> +                       else if (type == IORESOURCE_IO)
>                                 p = &ioport_resource;
>                 }
>
> -               if (p && insert_resource(p, r)) {
> +               if (insert_resource(p, r)) {
>                         dev_err(&pdev->dev, "failed to claim resource %d\n", i);
>                         ret = -EBUSY;
>                         goto failed;
> --
> 2.1.4
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2015-05-13 13:56 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-23 13:58 [PATCH v4 0/4] Fix null pointer deference when calling of_platform_depopulate Ricardo Ribalda Delgado
     [not found] ` <1429797494-29242-1-git-send-email-ricardo.ribalda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-04-23 13:58   ` [PATCH v4 1/4] base/platform: Only insert MEM and IO resources Ricardo Ribalda Delgado
     [not found]     ` <1429797494-29242-2-git-send-email-ricardo.ribalda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-05-13 13:56       ` Rob Herring [this message]
     [not found]         ` <CAL_JsqK8UAQwns7Bb3MQDXKBcqwBfQdswrnnOwUKKJROse7LXw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-05-13 14:01           ` Ricardo Ribalda Delgado
2015-06-07 14:26       ` Grant Likely
2015-04-23 13:58 ` [PATCH v4 2/4] base/platform: Continue on insert_resource() error Ricardo Ribalda Delgado
     [not found]   ` <1429797494-29242-3-git-send-email-ricardo.ribalda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-05-13 14:11     ` Rob Herring
2015-04-23 13:58 ` [PATCH v4 3/4] of/platform: Use platform_device interface Ricardo Ribalda Delgado
2015-05-13 14:08   ` Rob Herring
2015-04-23 13:58 ` [PATCH v4 4/4] base/platform: Remove code duplication Ricardo Ribalda Delgado
2015-05-13 14:03   ` Rob Herring
     [not found]     ` <CAL_JsqLOBvTgaLx7Ev3y5UQQdKGqMwnYSptDKvBQmmN0EnQL5Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-06-07 14:32       ` Grant Likely
2015-05-13 12:31 ` [PATCH v4 0/4] Fix null pointer deference when calling of_platform_depopulate Ricardo Ribalda Delgado

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=CAL_JsqK8UAQwns7Bb3MQDXKBcqwBfQdswrnnOwUKKJROse7LXw@mail.gmail.com \
    --to=robherring2-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org \
    --cc=bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
    --cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org \
    --cc=jiang.liu-VuQAYsv1563Yd54FQh9/CA@public.gmane.org \
    --cc=jsitnicki-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=ricardo.ribalda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    --cc=travis-sJ/iWh9BUns@public.gmane.org \
    --cc=treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \
    --cc=vgoyal-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).