[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20100722000737.GA14249@suse.de>
Date: Wed, 21 Jul 2010 17:07:37 -0700
From: Greg KH <gregkh@...e.de>
To: Grant Likely <grant.likely@...retlab.ca>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>,
Michal Simek <monstr@...str.eu>,
Benjamin Herrenschmidt <benh@...nel.crashing.org>,
linux-kernel@...r.kernel.org, linuxppc-dev@...abs.org,
microblaze-uclinux@...e.uq.edu.au, sparclinux@...r.kernel.org,
David Miller <davem@...emloft.net>
Subject: Re: [PATCH 1/5] drivercore/of: Add OF style matching to platform
bus
On Wed, Jul 21, 2010 at 05:39:54PM -0600, Grant Likely wrote:
> As part of the merge between platform bus and of_platform bus, add the
> ability to do of-style matching to the platform bus.
>
> Signed-off-by: Grant Likely <grant.likely@...retlab.ca>
> CC: Greg Kroah-Hartman <gregkh@...e.de>
> CC: Michal Simek <monstr@...str.eu>
> CC: Grant Likely <grant.likely@...retlab.ca>
> CC: Benjamin Herrenschmidt <benh@...nel.crashing.org>
> CC: Stephen Rothwell <sfr@...b.auug.org.au>
> CC: linux-kernel@...r.kernel.org
> CC: microblaze-uclinux@...e.uq.edu.au
> CC: linuxppc-dev@...abs.org
> CC: devicetree-discuss@...ts.ozlabs.org
> ---
> drivers/base/platform.c | 5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/base/platform.c b/drivers/base/platform.c
> index 4d99c8b..6a9b3dd 100644
> --- a/drivers/base/platform.c
> +++ b/drivers/base/platform.c
> @@ -12,6 +12,7 @@
>
> #include <linux/string.h>
> #include <linux/platform_device.h>
> +#include <linux/of_device.h>
> #include <linux/module.h>
> #include <linux/init.h>
> #include <linux/dma-mapping.h>
> @@ -673,6 +674,10 @@ static int platform_match(struct device *dev, struct device_driver *drv)
> struct platform_device *pdev = to_platform_device(dev);
> struct platform_driver *pdrv = to_platform_driver(drv);
>
> + /* Attempt an OF style match first */
> + if (of_driver_match_device(dev, drv))
> + return 1;
> +
> /* match against the id table first */
I think you need to also change this comment, you can't have two
"firsts" :)
If you do that, feel free to add an:
Acked-by: Greg Kroah-Hartman <gregkh@...e.de>
to the patch.
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists