From: Grant Likely <grant.likely@secretlab.ca>
To: monstr@monstr.eu, gregkh@suse.de, benh@kernel.crashing.org,
akpm@linux-foundation.org, davem@davemloft.net,
sfr@canb.auug.org.au, jgarzik@pobox.com, ben-linux@fluff.org,
dwmw2@infradead.org, jeremy.kerr@canonical.com,
James.Bottomley@suse.de, broonie@opensource.wolfsonmicro.com,
microblaze-uclinux@itee.uq.edu.au, linux-kernel@vger.kernel.org,
linuxppc-dev@ozlabs.org, sparclinux@vger.kernel.org,
linux-ide@vger.kernel.org, netdev@vger.kernel.org,
linux-i2c@vger.kernel.org, devicetree-discuss@lists.ozlabs.org,
linux-scsi@vger.kernel.org, alsa-devel@alsa-project.org
Subject: [PATCH 01/27] drivercore: Add of_match_table to the common device drivers
Date: Thu, 11 Mar 2010 11:21:53 -0700 [thread overview]
Message-ID: <20100311182153.13103.40899.stgit@angua> (raw)
In-Reply-To: <20100311181604.13103.30088.stgit@angua>
OF-style matching can be available to any device, on any type of bus.
This patch allows any driver to provide an OF match table when CONFIG_OF
is enabled so that drivers can be bound against devices described in
the device tree.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
---
arch/powerpc/kernel/ibmebus.c | 2 +-
drivers/macintosh/macio_asic.c | 5 ++---
drivers/of/platform.c | 7 ++++---
include/linux/device.h | 4 ++++
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index 797e9ac..62ded8b 100644
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -201,7 +201,7 @@ static int ibmebus_create_devices(const struct of_device_id *matches)
int ibmebus_register_driver(struct of_platform_driver *drv)
{
/* If the driver uses devices that ibmebus doesn't know, add them */
- ibmebus_create_devices(drv->match_table);
+ ibmebus_create_devices(drv->driver.of_match_table);
return of_register_driver(drv, &ibmebus_bus_type);
}
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index 48a5f04..e3ba1d8 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -40,8 +40,7 @@ static struct macio_chip *macio_on_hold;
static int macio_bus_match(struct device *dev, struct device_driver *drv)
{
struct macio_dev * macio_dev = to_macio_device(dev);
- struct macio_driver * macio_drv = to_macio_driver(drv);
- const struct of_device_id * matches = macio_drv->match_table;
+ const struct of_device_id * matches = drv->of_match_table;
if (!matches)
return 0;
@@ -84,7 +83,7 @@ static int macio_device_probe(struct device *dev)
macio_dev_get(macio_dev);
- match = of_match_device(drv->match_table, &macio_dev->ofdev);
+ match = of_match_device(drv->driver.of_match_table, &macio_dev->ofdev);
if (match)
error = drv->probe(macio_dev, match);
if (error)
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index d58ade1..9fd7f7d 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -22,8 +22,7 @@ extern struct device_attribute of_platform_device_attrs[];
static int of_platform_bus_match(struct device *dev, struct device_driver *drv)
{
struct of_device *of_dev = to_of_device(dev);
- struct of_platform_driver *of_drv = to_of_platform_driver(drv);
- const struct of_device_id *matches = of_drv->match_table;
+ const struct of_device_id *matches = drv->of_match_table;
if (!matches)
return 0;
@@ -46,7 +45,7 @@ static int of_platform_device_probe(struct device *dev)
of_dev_get(of_dev);
- match = of_match_device(drv->match_table, of_dev);
+ match = of_match_device(drv->driver.of_match_table, of_dev);
if (match)
error = drv->probe(of_dev, match);
if (error)
@@ -391,6 +390,8 @@ int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)
drv->driver.name = drv->name;
if (!drv->driver.owner)
drv->driver.owner = drv->owner;
+ if (!drv->driver.of_match_table)
+ drv->driver.of_match_table = drv->match_table;
drv->driver.bus = bus;
/* register with core */
diff --git a/include/linux/device.h b/include/linux/device.h
index 7a968bd..cd7534c 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -129,6 +129,10 @@ struct device_driver {
bool suppress_bind_attrs; /* disables bind/unbind via sysfs */
+#if defined(CONFIG_OF)
+ const struct of_device_id *of_match_table;
+#endif
+
int (*probe) (struct device *dev);
int (*remove) (struct device *dev);
void (*shutdown) (struct device *dev);
next prev parent reply other threads:[~2010-03-11 18:21 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-11 18:21 [PATCH 00/27] Clean up of_platform drivers Grant Likely
2010-03-11 18:21 ` Grant Likely [this message]
2010-03-11 18:21 ` [PATCH 02/27] drivers/gpio/of: don't use deprecated fields in of_platform_driver Grant Likely
2010-03-11 18:22 ` [PATCH 03/27] drivers/watchdog/of: don't use deprecated .name and .owner " Grant Likely
2010-03-11 18:22 ` [PATCH 04/27] drivers/video/of: don't use deprecated field " Grant Likely
2010-03-11 18:22 ` [PATCH 05/27] drivers/usb/of: " Grant Likely
2010-03-11 18:28 ` Greg KH
2010-03-11 18:22 ` [PATCH 06/27] drivers/block/of: " Grant Likely
2010-03-11 18:22 ` [PATCH 07/27] drivers/char/of: " Grant Likely
2010-03-11 18:22 ` [PATCH 08/27] drivers/crypto/of: " Grant Likely
2010-03-11 18:22 ` [PATCH 09/27] drivers/atm/of: " Grant Likely
2010-03-11 18:22 ` [PATCH 10/27] drivers/input/of: " Grant Likely
2010-03-11 18:22 ` [PATCH 11/27] drivers/macintosh/of: " Grant Likely
2010-03-11 18:22 ` [PATCH 12/27] drivers/mtd/of: " Grant Likely
2010-03-12 17:31 ` Sean MacLennan
2010-03-11 18:23 ` [PATCH 13/27] drivers/net/of: " Grant Likely
2010-03-11 18:23 ` [PATCH 14/27] drivers/serial/of: " Grant Likely
2010-03-11 18:23 ` [PATCH 15/27] drivers/spi/of: " Grant Likely
2010-03-11 18:23 ` [PATCH 16/27] drivers/scsi/of: " Grant Likely
2010-03-11 18:23 ` [PATCH 17/27] drivers/sbus/of: " Grant Likely
2010-03-11 18:23 ` [PATCH 18/27] drivers/parport/of: " Grant Likely
2010-03-11 18:23 ` [PATCH 19/27] drivers/pcmcia/of: " Grant Likely
2010-03-11 18:23 ` [PATCH 20/27] drivers/mmc/of: " Grant Likely
2010-03-11 18:23 ` [PATCH 21/27] drivers/hwmon/of: " Grant Likely
2010-03-11 18:23 ` [PATCH 22/27] drivers/i2c/of: " Grant Likely
2010-03-12 17:31 ` Sean MacLennan
2010-03-11 18:23 ` [PATCH 23/27] drivers/infiniband/of: don't use deprecated fields " Grant Likely
2010-03-11 18:24 ` [PATCH 24/27] sound/of: " Grant Likely
2010-03-11 18:24 ` [PATCH 25/27] arch/powerpc/of: don't use deprecated field " Grant Likely
2010-03-11 18:24 ` [PATCH 26/27] arch/sparc/of: " Grant Likely
2010-03-11 18:24 ` [PATCH 27/27] of: remove obsolete members from of_platform_driver Grant Likely
2010-03-11 18:26 ` [PATCH 00/27] Clean up of_platform drivers 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=20100311182153.13103.40899.stgit@angua \
--to=grant.likely@secretlab.ca \
--cc=James.Bottomley@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alsa-devel@alsa-project.org \
--cc=ben-linux@fluff.org \
--cc=benh@kernel.crashing.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=davem@davemloft.net \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=dwmw2@infradead.org \
--cc=gregkh@suse.de \
--cc=jeremy.kerr@canonical.com \
--cc=jgarzik@pobox.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=microblaze-uclinux@itee.uq.edu.au \
--cc=monstr@monstr.eu \
--cc=netdev@vger.kernel.org \
--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).