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 14/27] drivers/serial/of: don't use deprecated field in of_platform_driver
Date: Thu, 11 Mar 2010 11:23:05 -0700 [thread overview]
Message-ID: <20100311182305.13103.57542.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/serial/apbuart.c | 8 ++++----
drivers/serial/cpm_uart/cpm_uart_core.c | 7 +++++--
drivers/serial/mpc52xx_uart.c | 7 ++++---
drivers/serial/of_serial.c | 8 +++++---
drivers/serial/sunhv.c | 7 +++++--
drivers/serial/sunsab.c | 7 +++++--
drivers/serial/sunsu.c | 7 +++++--
drivers/serial/sunzilog.c | 7 +++++--
drivers/serial/uartlite.c | 5 ++---
drivers/serial/ucc_uart.c | 8 +++++---
10 files changed, 45 insertions(+), 26 deletions(-)
diff --git a/drivers/serial/apbuart.c b/drivers/serial/apbuart.c
index 52015d7..0099b86 100644
--- a/drivers/serial/apbuart.c
+++ b/drivers/serial/apbuart.c
@@ -584,12 +584,12 @@ static struct of_device_id __initdata apbuart_match[] = {
};
static struct of_platform_driver grlib_apbuart_of_driver = {
- .match_table = apbuart_match,
.probe = apbuart_probe,
.driver = {
- .owner = THIS_MODULE,
- .name = "grlib-apbuart",
- },
+ .owner = THIS_MODULE,
+ .name = "grlib-apbuart",
+ .of_match_table = apbuart_match,
+ },
};
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index 300cea7..09962e0 100644
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -1372,8 +1372,11 @@ static struct of_device_id cpm_uart_match[] = {
};
static struct of_platform_driver cpm_uart_driver = {
- .name = "cpm_uart",
- .match_table = cpm_uart_match,
+ .driver = {
+ .name = "cpm_uart",
+ .owner = THIS_MODULE,
+ .of_match_table = cpm_uart_match,
+ },
.probe = cpm_uart_probe,
.remove = cpm_uart_remove,
};
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index cb07938..4fb32e3 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -1464,15 +1464,16 @@ mpc52xx_uart_of_enumerate(void)
MODULE_DEVICE_TABLE(of, mpc52xx_uart_of_match);
static struct of_platform_driver mpc52xx_uart_of_driver = {
- .match_table = mpc52xx_uart_of_match,
.probe = mpc52xx_uart_of_probe,
.remove = mpc52xx_uart_of_remove,
#ifdef CONFIG_PM
.suspend = mpc52xx_uart_of_suspend,
.resume = mpc52xx_uart_of_resume,
#endif
- .driver = {
- .name = "mpc52xx-psc-uart",
+ .driver = {
+ .name = "mpc52xx-psc-uart",
+ .owner = THIS_MODULE,
+ .of_match_table = mpc52xx_uart_of_match,
},
};
diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c
index 18bf39b..4166c23 100644
--- a/drivers/serial/of_serial.c
+++ b/drivers/serial/of_serial.c
@@ -174,11 +174,13 @@ static struct of_device_id __devinitdata of_platform_serial_table[] = {
};
static struct of_platform_driver of_platform_serial_driver = {
- .owner = THIS_MODULE,
- .name = "of_serial",
+ .driver = {
+ .name = "of_serial",
+ .owner = THIS_MODULE,
+ .of_match_table = of_platform_serial_table,
+ },
.probe = of_platform_serial_probe,
.remove = of_platform_serial_remove,
- .match_table = of_platform_serial_table,
};
static int __init of_platform_serial_init(void)
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c
index d1eedf1..890f917 100644
--- a/drivers/serial/sunhv.c
+++ b/drivers/serial/sunhv.c
@@ -630,8 +630,11 @@ static const struct of_device_id hv_match[] = {
MODULE_DEVICE_TABLE(of, hv_match);
static struct of_platform_driver hv_driver = {
- .name = "hv",
- .match_table = hv_match,
+ .driver = {
+ .name = "hv",
+ .owner = THIS_MODULE,
+ .of_match_table = hv_match,
+ },
.probe = hv_probe,
.remove = __devexit_p(hv_remove),
};
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index 2b8b2c2..fdb596c 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -1093,8 +1093,11 @@ static const struct of_device_id sab_match[] = {
MODULE_DEVICE_TABLE(of, sab_match);
static struct of_platform_driver sab_driver = {
- .name = "sab",
- .match_table = sab_match,
+ .driver = {
+ .name = "sab",
+ .owner = THIS_MODULE,
+ .of_match_table = sab_match,
+ },
.probe = sab_probe,
.remove = __devexit_p(sab_remove),
};
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 2ab82ed..1f507fe 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1536,8 +1536,11 @@ static const struct of_device_id su_match[] = {
MODULE_DEVICE_TABLE(of, su_match);
static struct of_platform_driver su_driver = {
- .name = "su",
- .match_table = su_match,
+ .driver = {
+ .name = "su",
+ .owner = THIS_MODULE,
+ .of_match_table = su_match,
+ },
.probe = su_probe,
.remove = __devexit_p(su_remove),
};
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 20f9be8..34fb8e8 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1491,8 +1491,11 @@ static const struct of_device_id zs_match[] = {
MODULE_DEVICE_TABLE(of, zs_match);
static struct of_platform_driver zs_driver = {
- .name = "zs",
- .match_table = zs_match,
+ .driver = {
+ .name = "zs",
+ .owner = THIS_MODULE,
+ .of_match_table = zs_match,
+ },
.probe = zs_probe,
.remove = __devexit_p(zs_remove),
};
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
index 8fc2583..81073e3 100644
--- a/drivers/serial/uartlite.c
+++ b/drivers/serial/uartlite.c
@@ -610,13 +610,12 @@ static int __devexit ulite_of_remove(struct of_device *op)
}
static struct of_platform_driver ulite_of_driver = {
- .owner = THIS_MODULE,
- .name = "uartlite",
- .match_table = ulite_of_match,
.probe = ulite_of_probe,
.remove = __devexit_p(ulite_of_remove),
.driver = {
.name = "uartlite",
+ .owner = THIS_MODULE,
+ .of_match_table = ulite_of_match,
},
};
diff --git a/drivers/serial/ucc_uart.c b/drivers/serial/ucc_uart.c
index 465f2fa..21182fe 100644
--- a/drivers/serial/ucc_uart.c
+++ b/drivers/serial/ucc_uart.c
@@ -1485,9 +1485,11 @@ static struct of_device_id ucc_uart_match[] = {
MODULE_DEVICE_TABLE(of, ucc_uart_match);
static struct of_platform_driver ucc_uart_of_driver = {
- .owner = THIS_MODULE,
- .name = "ucc_uart",
- .match_table = ucc_uart_match,
+ .driver = {
+ .name = "ucc_uart",
+ .owner = THIS_MODULE,
+ .of_match_table = ucc_uart_match,
+ },
.probe = ucc_uart_probe,
.remove = ucc_uart_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 ` Grant Likely [this message]
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=20100311182305.13103.57542.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).