[PATCH 2/3] sparc: make driver/of/pdt no longer sparc-specific

[Andres Salomon]

On Sun, 8 Aug 2010 23:12:21 -0600
Grant Likely <grant.likely at secretlab.ca> wrote:

> Hi Andres, thanks for the patch.  Comments below.
> 
> g.
> 
> On Sun, Aug 8, 2010 at 9:11 PM, Andres Salomon <dilinger at queued.net>
> wrote:
[...]
> > +
> >  unsigned int prom_early_allocated __initdata;
> >
> > -#include "../../../drivers/of/pdt.c"
> > +static struct of_pdt_ops prom_sparc_ops __initdata = {
> > +       .firstprop = prom_common_firstprop,
> > +       .nextprop = prom_common_nextprop,
> > +       .getproplen = (int (*)(phandle, const char
> > *))prom_getproplen,
> > +       .getproperty = (int (*)(phandle, const char *, char *,
> > int))prom_getproperty,
> > +       .getchild = (phandle (*)(phandle))prom_getchild,
> > +       .getsibling = (phandle (*)(phandle))prom_getsibling,
> 
> If you have to explicitly cast these function pointers, then you're
> doing it wrong.  :-)  Listen to and fix the compiler complaint here.
> 

Hm, can you please expand on that?  The reason it's necessary to cast is
because sparc's prom_* functions are using ints instead of phandles.  I
don't understand why casting is the wrong thing here.

I could write some 1-line wrapper functions that simply call prom_*
rather than casting, I suppose.

[...]
> > +}
> > diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
> > index 1678dbc..c8a4b7c 100644
> > --- a/drivers/of/Kconfig
> > +++ b/drivers/of/Kconfig
> > @@ -5,6 +5,10 @@ config OF_FLATTREE
> >        bool
> >        depends on OF
> >
> > +config OF_PROMTREE
> > +       bool
> > +       depends on OF
> > +
> 
> I can tell from the context here you're working from an older tree.
> Please rebase onto Linus' current top-of-tree.  :-)  A bunch of OF
> related patches have been merged for 2.6.36 that will conflict with
> this patch.
> 

Sorry, will do.  Was just looking for more feedback (while testing)
before sending final versions of this stuff.


[...]
> 
> > +
> > +#if defined(CONFIG_SPARC)
> > +static unsigned int prom_unique_id __initdata;
> > +
> > +#define inc_unique_id(p) do { \
> > +       (p)->unique_id = prom_unique_id++; \
> > +} while (0)
> 
> Use a static inline.  C code is preferred over preprocessor code.
> Also preserver the namespace and use the of_pdt_ prefix (that goes for
> all the new functions here in this file).

This is processing multiple types, that's the reason for the macro.

'p' can be either a property struct, or device_node struct.


[...]
> > -       of_console_init();
> > +void __init of_pdt_set_ops(struct of_pdt_ops *ops)
> > +{
> > +       BUG_ON(!ops);
> >
> > -       printk("PROM: Built device tree with %u bytes of memory.\n",
> > -              prom_early_allocated);
> > +       prom_ops = *ops;
> 
> As mentioned above, why is the structure copied instead of just
> storing the pointer.
> 

Er, right, because originally the struct was handled differently.  No
reason for it to be copied anymore.

Thanks for the feedback!