From: Greg KH <gregkh@suse.de>
To: Grant Likely <grant.likely@secretlab.ca>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Michal Simek <monstr@monstr.eu>,
microblaze-uclinux@itee.uq.edu.au, linux-kernel@vger.kernel.org,
linuxppc-dev@ozlabs.org, sparclinux@vger.kernel.org,
David Miller <davem@davemloft.net>
Subject: Re: [PATCH 1/5] drivercore/of: Add OF style matching to platform bus
Date: Wed, 21 Jul 2010 17:07:37 -0700 [thread overview]
Message-ID: <20100722000737.GA14249@suse.de> (raw)
In-Reply-To: <20100721233954.7782.81154.stgit@angua>
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@secretlab.ca>
> CC: Greg Kroah-Hartman <gregkh@suse.de>
> CC: Michal Simek <monstr@monstr.eu>
> CC: Grant Likely <grant.likely@secretlab.ca>
> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> CC: Stephen Rothwell <sfr@canb.auug.org.au>
> CC: linux-kernel@vger.kernel.org
> CC: microblaze-uclinux@itee.uq.edu.au
> CC: linuxppc-dev@ozlabs.org
> CC: devicetree-discuss@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@suse.de>
to the patch.
thanks,
greg k-h
next prev parent reply other threads:[~2010-07-22 0:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-21 23:39 [PATCH 0/5] Eliminate of_platform_bus_type Grant Likely
2010-07-21 23:39 ` [PATCH 1/5] drivercore/of: Add OF style matching to platform bus Grant Likely
2010-07-22 0:07 ` Greg KH [this message]
2010-07-21 23:40 ` [PATCH 2/5] of: Merge of_platform_bus_type with platform_bus_type Grant Likely
2010-07-22 5:28 ` David Miller
2010-07-21 23:40 ` [PATCH 3/5] of/platform: remove all of_bus_type and of_platform_bus_type references Grant Likely
2010-07-22 5:28 ` David Miller
2010-07-21 23:40 ` [PATCH 4/5] of: remove asm/of_platform.h Grant Likely
2010-07-22 5:28 ` David Miller
2010-07-21 23:40 ` [PATCH 5/5] of: remove asm/of_device.h Grant Likely
2010-07-22 5:28 ` David Miller
2010-07-22 5:28 ` [PATCH 0/5] Eliminate of_platform_bus_type David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100722000737.GA14249@suse.de \
--to=gregkh@suse.de \
--cc=davem@davemloft.net \
--cc=grant.likely@secretlab.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=microblaze-uclinux@itee.uq.edu.au \
--cc=monstr@monstr.eu \
--cc=sfr@canb.auug.org.au \
--cc=sparclinux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).