[PATCH 1/3] OF: Add helper for matching against linux, stdout-path

Grant Likely grant.likely at secretlab.ca
Thu Nov 15 04:10:28 EST 2012


On Thu, Nov 15, 2012 at 8:49 AM, Sascha Hauer <s.hauer at pengutronix.de> wrote:
> On Wed, Nov 14, 2012 at 08:49:54PM +0000, Grant Likely wrote:
>> On Fri, Nov 2, 2012 at 9:48 AM, Sascha Hauer <s.hauer at pengutronix.de> wrote:
>> > devicetrees may have a linux,stdout-path property in the chosen
>> > node describing the console device. This adds a helper function
>> > to match a device against this property so a driver can call
>> > add_preferred_console for a matching device.
>> >
>> > Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
>> > ---
>> >  drivers/of/Kconfig        |    3 +++
>> >  drivers/of/Makefile       |    1 +
>> >  drivers/of/of_stdout.c    |   27 +++++++++++++++++++++++++++
>> >  include/linux/of_stdout.h |   24 ++++++++++++++++++++++++
>> >  4 files changed, 55 insertions(+)
>> >  create mode 100644 drivers/of/of_stdout.c
>> >  create mode 100644 include/linux/of_stdout.h
>> >
>> > diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
>> > index dfba3e6..8574ebb 100644
>> > --- a/drivers/of/Kconfig
>> > +++ b/drivers/of/Kconfig
>> > @@ -67,6 +67,9 @@ config OF_MDIO
>> >         help
>> >           OpenFirmware MDIO bus (Ethernet PHY) accessors
>> >
>> > +config OF_STDOUT
>> > +       def_bool y
>> > +
>> >  config OF_PCI
>> >         def_tristate PCI
>> >         depends on PCI
>> > diff --git a/drivers/of/Makefile b/drivers/of/Makefile
>> > index e027f44..c9f3f2f 100644
>> > --- a/drivers/of/Makefile
>> > +++ b/drivers/of/Makefile
>> > @@ -8,6 +8,7 @@ obj-$(CONFIG_OF_I2C)    += of_i2c.o
>> >  obj-$(CONFIG_OF_NET)   += of_net.o
>> >  obj-$(CONFIG_OF_SELFTEST) += selftest.o
>> >  obj-$(CONFIG_OF_MDIO)  += of_mdio.o
>> > +obj-$(CONFIG_OF_STDOUT) += of_stdout.o
>> >  obj-$(CONFIG_OF_PCI)   += of_pci.o
>> >  obj-$(CONFIG_OF_PCI_IRQ)  += of_pci_irq.o
>> >  obj-$(CONFIG_OF_MTD)   += of_mtd.o
>> > diff --git a/drivers/of/of_stdout.c b/drivers/of/of_stdout.c
>> > new file mode 100644
>> > index 0000000..c9e370e
>> > --- /dev/null
>> > +++ b/drivers/of/of_stdout.c
>> > @@ -0,0 +1,27 @@
>> > +/*
>> > + * OF helper for linux,stdoutpath property.
>> > + *
>> > + * This file is released under the GPLv2
>> > + */
>> > +#include <linux/of_stdout.h>
>> > +
>> > +/**
>> > + * of_device_is_stdout_path - check if a device node matches the
>> > + *                            linux,stdout-path property
>> > + *
>> > + * Check if this device node matches the linux,stdout-path property
>> > + * in the chosen node. return true if yes, false otherwise.
>> > + */
>> > +int of_device_is_stdout_path(struct device_node *dn)
>> > +{
>> > +       const char *name;
>> > +
>> > +       name = of_get_property(of_chosen, "linux,stdout-path", NULL);
>> > +       if (name == NULL)
>> > +               return 0;
>> > +
>> > +       if (dn == of_find_node_by_path(name))
>>
>> need to of_node_put() the return value of of_find_node_by_path()
>>
>> > +               return 1;
>> > +
>> > +       return 0;
>> > +}
>>
>> Hi Sascha,
>>
>> I'm fine with the helper, but there really is no need for a completely
>> separate .c file. Just put it in drivers/of/base.c.
>
> I guess the same applies to include/linux/of_stdout.h.
>
> Should I drop the CONFIG_OF_STDOUT aswell?

Yup.

g.



More information about the linux-arm-kernel mailing list