[PATCH 1/5] drivercore/of: Add OF style matching to platform bus

Greg KH gregkh at suse.de
Thu Jul 22 10:07:37 EST 2010


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 at secretlab.ca>
> CC: Greg Kroah-Hartman <gregkh at suse.de>
> CC: Michal Simek <monstr at monstr.eu>
> CC: Grant Likely <grant.likely at secretlab.ca>
> CC: Benjamin Herrenschmidt <benh at kernel.crashing.org>
> CC: Stephen Rothwell <sfr at canb.auug.org.au>
> CC: linux-kernel at vger.kernel.org
> CC: microblaze-uclinux at itee.uq.edu.au
> CC: linuxppc-dev at ozlabs.org
> CC: devicetree-discuss at 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 at suse.de>
to the patch.

thanks,

greg k-h


More information about the Linuxppc-dev mailing list