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 17/27] drivers/sbus/of: don't use deprecated field in of_platform_driver
Date: Thu, 11 Mar 2010 11:23:22 -0700 [thread overview]
Message-ID: <20100311182321.13103.29782.stgit@angua> (raw)
In-Reply-To: <20100311181604.13103.30088.stgit@angua>
.name, .match_table and .owner are duplicated in both of_platform_driver
and device_driver, so the of_platform_driver copies will be removed soon.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
drivers/sbus/char/bbc_i2c.c | 7 +++++--
drivers/sbus/char/display7seg.c | 7 +++++--
drivers/sbus/char/envctrl.c | 7 +++++--
drivers/sbus/char/flash.c | 7 +++++--
drivers/sbus/char/uctrl.c | 7 +++++--
5 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c
index 1543ac3..8bfdd63 100644
--- a/drivers/sbus/char/bbc_i2c.c
+++ b/drivers/sbus/char/bbc_i2c.c
@@ -414,8 +414,11 @@ static const struct of_device_id bbc_i2c_match[] = {
MODULE_DEVICE_TABLE(of, bbc_i2c_match);
static struct of_platform_driver bbc_i2c_driver = {
- .name = "bbc_i2c",
- .match_table = bbc_i2c_match,
+ .driver = {
+ .name = "bbc_i2c",
+ .owner = THIS_MODULE,
+ .of_match_table = bbc_i2c_match,
+ },
.probe = bbc_i2c_probe,
.remove = __devexit_p(bbc_i2c_remove),
};
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index d0a10f4..e1db005 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -265,8 +265,11 @@ static const struct of_device_id d7s_match[] = {
MODULE_DEVICE_TABLE(of, d7s_match);
static struct of_platform_driver d7s_driver = {
- .name = DRIVER_NAME,
- .match_table = d7s_match,
+ .driver = {
+ .name = DRIVER_NAME,
+ .owner = THIS_MODULE,
+ .of_match_table = d7s_match,
+ },
.probe = d7s_probe,
.remove = __devexit_p(d7s_remove),
};
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index 84a4310..dc9e8ef 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -1130,8 +1130,11 @@ static const struct of_device_id envctrl_match[] = {
MODULE_DEVICE_TABLE(of, envctrl_match);
static struct of_platform_driver envctrl_driver = {
- .name = DRIVER_NAME,
- .match_table = envctrl_match,
+ .driver = {
+ .name = DRIVER_NAME,
+ .owner = THIS_MODULE,
+ .of_match_table = envctrl_match,
+ },
.probe = envctrl_probe,
.remove = __devexit_p(envctrl_remove),
};
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c
index dc8f95d..0e8ae6b 100644
--- a/drivers/sbus/char/flash.c
+++ b/drivers/sbus/char/flash.c
@@ -208,8 +208,11 @@ static const struct of_device_id flash_match[] = {
MODULE_DEVICE_TABLE(of, flash_match);
static struct of_platform_driver flash_driver = {
- .name = "flash",
- .match_table = flash_match,
+ .driver = {
+ .name = "flash",
+ .owner = THIS_MODULE,
+ .of_match_table = flash_match,
+ },
.probe = flash_probe,
.remove = __devexit_p(flash_remove),
};
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c
index acc6738..5f25366 100644
--- a/drivers/sbus/char/uctrl.c
+++ b/drivers/sbus/char/uctrl.c
@@ -425,8 +425,11 @@ static const struct of_device_id uctrl_match[] = {
MODULE_DEVICE_TABLE(of, uctrl_match);
static struct of_platform_driver uctrl_driver = {
- .name = "uctrl",
- .match_table = uctrl_match,
+ .driver = {
+ .name = "uctrl",
+ .owner = THIS_MODULE,
+ .of_match_table = uctrl_match,
+ },
.probe = uctrl_probe,
.remove = __devexit_p(uctrl_remove),
};
next prev parent reply other threads:[~2010-03-11 18:23 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 ` [PATCH 01/27] drivercore: Add of_match_table to the common device drivers Grant Likely
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 ` Grant Likely [this message]
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=20100311182321.13103.29782.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).