From: Sascha Hauer <s.hauer@pengutronix.de>
To: Jan Luebbe <jlu@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] dt: factor out common code
Date: Thu, 20 Nov 2014 14:45:31 +0100 [thread overview]
Message-ID: <20141120134531.GM30369@pengutronix.de> (raw)
In-Reply-To: <1416404048-8469-1-git-send-email-jlu@pengutronix.de>
On Wed, Nov 19, 2014 at 02:34:08PM +0100, Jan Luebbe wrote:
> Currently, dt_struct is always checked with the same code after
> dt_struct_advance(). Move the check after the switch statement.
>
> Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Applied, thanks
Sascha
> ---
> drivers/of/fdt.c | 33 +++++++++++----------------------
> 1 file changed, 11 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
> index cfe183350978..d465f9879751 100644
> --- a/drivers/of/fdt.c
> +++ b/drivers/of/fdt.c
> @@ -120,18 +120,14 @@ struct device_node *of_unflatten_dtb(void *infdt)
> goto err;
> }
>
> - dt_struct = dt_struct_advance(&f, dt_struct,
> - sizeof(struct fdt_node_header) + len + 1);
> - if (!dt_struct) {
> - ret = -ESPIPE;
> - goto err;
> - }
> -
> if (!node)
> node = root;
> else
> node = of_new_node(node, pathp);
>
> + dt_struct = dt_struct_advance(&f, dt_struct,
> + sizeof(struct fdt_node_header) + len + 1);
> +
> break;
>
> case FDT_END_NODE:
> @@ -144,10 +140,6 @@ struct device_node *of_unflatten_dtb(void *infdt)
> node = node->parent;
>
> dt_struct = dt_struct_advance(&f, dt_struct, FDT_TAGSIZE);
> - if (!dt_struct) {
> - ret = -ESPIPE;
> - goto err;
> - }
>
> break;
>
> @@ -162,25 +154,17 @@ struct device_node *of_unflatten_dtb(void *infdt)
> goto err;
> }
>
> - dt_struct = dt_struct_advance(&f, dt_struct,
> - sizeof(struct fdt_property) + len);
> - if (!dt_struct) {
> - ret = -ESPIPE;
> - goto err;
> - }
> -
> p = of_new_property(node, name, nodep, len);
> if (!strcmp(name, "phandle") && len == 4)
> node->phandle = be32_to_cpup(p->value);
>
> + dt_struct = dt_struct_advance(&f, dt_struct,
> + sizeof(struct fdt_property) + len);
> +
> break;
>
> case FDT_NOP:
> dt_struct = dt_struct_advance(&f, dt_struct, FDT_TAGSIZE);
> - if (!dt_struct) {
> - ret = -ESPIPE;
> - goto err;
> - }
>
> break;
>
> @@ -192,6 +176,11 @@ struct device_node *of_unflatten_dtb(void *infdt)
> ret = -EINVAL;
> goto err;
> }
> +
> + if (!dt_struct) {
> + ret = -ESPIPE;
> + goto err;
> + }
> }
> err:
> of_delete_node(root);
> --
> 2.1.1
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2014-11-20 13:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-19 13:34 Jan Luebbe
2014-11-20 13:45 ` Sascha Hauer [this message]
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=20141120134531.GM30369@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=jlu@pengutronix.de \
/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