[PATCH 1/8] of/fdt.c: use architecture-independent ALIGN macro, defined in kernel.h

[Stephen Neuendorffer]

> -----Original Message-----
> From: glikely at secretlab.ca [mailto:glikely at secretlab.ca] On Behalf Of Grant Likely
> Sent: Friday, July 16, 2010 11:30 AM
> To: Stephen Neuendorffer
> Cc: devicetree-discuss at lists.ozlabs.org
> Subject: Re: [PATCH 1/8] of/fdt.c: use architecture-independent ALIGN macro, defined in kernel.h
> 
> On Fri, Jul 16, 2010 at 12:13 PM, Stephen Neuendorffer
> <stephen.neuendorffer at xilinx.com> wrote:
> > This removes an architecture dependency, making the code more generic.
> 
> A similar change will be in linux-next today.  :-)  I've recently
> updated my next-devicetree and test-devicetree branches if you would
> like to rebase.

I will..  Looks like this cleans up alot of the junky stuff! :)

Steve

> 
> g.
> 
> > ---
> >  drivers/of/fdt.c |   20 ++++++++++----------
> >  1 files changed, 10 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
> > index b6987bb..d61fda8 100644
> > --- a/drivers/of/fdt.c
> > +++ b/drivers/of/fdt.c
> > @@ -69,9 +69,9 @@ int __init of_scan_flat_dt(int (*it)(unsigned long node,
> >                        u32 sz = be32_to_cpup((__be32 *)p);
> >                        p += 8;
> >                        if (be32_to_cpu(initial_boot_params->version) < 0x10)
> > -                               p = _ALIGN(p, sz >= 8 ? 8 : 4);
> > +                               p = ALIGN(p, sz >= 8 ? 8 : 4);
> >                        p += sz;
> > -                       p = _ALIGN(p, 4);
> > +                       p = ALIGN(p, 4);
> >                        continue;
> >                }
> >                if (tag != OF_DT_BEGIN_NODE) {
> > @@ -80,7 +80,7 @@ int __init of_scan_flat_dt(int (*it)(unsigned long node,
> >                }
> >                depth++;
> >                pathp = (char *)p;
> > -               p = _ALIGN(p + strlen(pathp) + 1, 4);
> > +               p = ALIGN(p + strlen(pathp) + 1, 4);
> >                if ((*pathp) == '/') {
> >                        char *lp, *np;
> >                        for (lp = NULL, np = pathp; *np; np++)
> > @@ -109,7 +109,7 @@ unsigned long __init of_get_flat_dt_root(void)
> >                p += 4;
> >        BUG_ON(be32_to_cpup((__be32 *)p) != OF_DT_BEGIN_NODE);
> >        p += 4;
> > -       return _ALIGN(p + strlen((char *)p) + 1, 4);
> > +       return ALIGN(p + strlen((char *)p) + 1, 4);
> >  }
> >
> >  /**
> > @@ -138,7 +138,7 @@ void *__init of_get_flat_dt_prop(unsigned long node, const char *name,
> >                noff = be32_to_cpup((__be32 *)(p + 4));
> >                p += 8;
> >                if (be32_to_cpu(initial_boot_params->version) < 0x10)
> > -                       p = _ALIGN(p, sz >= 8 ? 8 : 4);
> > +                       p = ALIGN(p, sz >= 8 ? 8 : 4);
> >
> >                nstr = find_flat_dt_string(noff);
> >                if (nstr == NULL) {
> > @@ -151,7 +151,7 @@ void *__init of_get_flat_dt_prop(unsigned long node, const char *name,
> >                        return (void *)p;
> >                }
> >                p += sz;
> > -               p = _ALIGN(p, 4);
> > +               p = ALIGN(p, 4);
> >        } while (1);
> >  }
> >
> > @@ -184,7 +184,7 @@ static void *__init unflatten_dt_alloc(unsigned long *mem, unsigned long size,
> >  {
> >        void *res;
> >
> > -       *mem = _ALIGN(*mem, align);
> > +       *mem = ALIGN(*mem, align);
> >        res = (void *)*mem;
> >        *mem += size;
> >
> > @@ -220,7 +220,7 @@ unsigned long __init unflatten_dt_node(unsigned long mem,
> >        *p += 4;
> >        pathp = (char *)*p;
> >        l = allocl = strlen(pathp) + 1;
> > -       *p = _ALIGN(*p + l, 4);
> > +       *p = ALIGN(*p + l, 4);
> >
> >        /* version 0x10 has a more compact unit name here instead of the full
> >         * path. we accumulate the full path size using "fpsize", we'll rebuild
> > @@ -299,7 +299,7 @@ unsigned long __init unflatten_dt_node(unsigned long mem,
> >                noff = be32_to_cpup((__be32 *)((*p) + 4));
> >                *p += 8;
> >                if (be32_to_cpu(initial_boot_params->version) < 0x10)
> > -                       *p = _ALIGN(*p, sz >= 8 ? 8 : 4);
> > +                       *p = ALIGN(*p, sz >= 8 ? 8 : 4);
> >
> >                pname = find_flat_dt_string(noff);
> >                if (pname == NULL) {
> > @@ -333,7 +333,7 @@ unsigned long __init unflatten_dt_node(unsigned long mem,
> >                        *prev_pp = pp;
> >                        prev_pp = &pp->next;
> >                }
> > -               *p = _ALIGN((*p) + sz, 4);
> > +               *p = ALIGN((*p) + sz, 4);
> >        }
> >        /* with version 0x10 we may not have the name property, recreate
> >         * it here from the unit name if absent
> > --
> > 1.5.6.6
> >
> >
> >
> > This email and any attachments are intended for the sole use of the named recipient(s) and
> contain(s) confidential information that may be proprietary, privileged or copyrighted under
> applicable law. If you are not the intended recipient, do not read, copy, or forward this email
> message or any attachments. Delete this email message and any attachments immediately.
> >
> >
> >
> 
> 
> 
> --
> Grant Likely, B.Sc., P.Eng.
> Secret Lab Technologies Ltd.


This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.