Prev: SUNRPC auth: add context argument to shrinker callback
Next: SystemTap release 1.3
From: Greg KH on 21 Jul 2010 20:20
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(a)secretlab.ca>
> CC: Greg Kroah-Hartman <gregkh(a)suse.de>
> CC: Michal Simek <monstr(a)monstr.eu>
> CC: Grant Likely <grant.likely(a)secretlab.ca>
> CC: Benjamin Herrenschmidt <benh(a)kernel.crashing.org>
> CC: Stephen Rothwell <sfr(a)canb.auug.org.au>
> CC: linux-kernel(a)vger.kernel.org
> CC: microblaze-uclinux(a)itee.uq.edu.au
> CC: linuxppc-dev(a)ozlabs.org
> CC: devicetree-discuss(a)lists.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(a)suse.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(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: SUNRPC auth: add context argument to shrinker callback
Next: SystemTap release 1.3