aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/mpc52xx_uart.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-04-13 19:13:02 -0400
committerGrant Likely <grant.likely@secretlab.ca>2010-05-22 02:10:40 -0400
commit4018294b53d1dae026880e45f174c1cc63b5d435 (patch)
tree6db3538eaf91b653381720a6d92f4f15634a93d0 /drivers/serial/mpc52xx_uart.c
parent597b9d1e44e9ba69f2454a5318bbe7a6d5e6930a (diff)
of: Remove duplicate fields from of_platform_driver
.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver. This patch is a removes the extra copies from struct of_platform_driver and converts all users to the device_driver members. This patch is a pretty mechanical change. The usage model doesn't change and if any drivers have been missed, or if anything has been fixed up incorrectly, then it will fail with a compile time error, and the fixup will be trivial. This patch looks big and scary because it touches so many files, but it should be pretty safe. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Sean MacLennan <smaclennan@pikatech.com>
Diffstat (limited to 'drivers/serial/mpc52xx_uart.c')
-rw-r--r--drivers/serial/mpc52xx_uart.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index cb079387c5ae..4fb32e3748c2 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -1464,15 +1464,16 @@ mpc52xx_uart_of_enumerate(void)
1464MODULE_DEVICE_TABLE(of, mpc52xx_uart_of_match); 1464MODULE_DEVICE_TABLE(of, mpc52xx_uart_of_match);
1465 1465
1466static struct of_platform_driver mpc52xx_uart_of_driver = { 1466static struct of_platform_driver mpc52xx_uart_of_driver = {
1467 .match_table = mpc52xx_uart_of_match,
1468 .probe = mpc52xx_uart_of_probe, 1467 .probe = mpc52xx_uart_of_probe,
1469 .remove = mpc52xx_uart_of_remove, 1468 .remove = mpc52xx_uart_of_remove,
1470#ifdef CONFIG_PM 1469#ifdef CONFIG_PM
1471 .suspend = mpc52xx_uart_of_suspend, 1470 .suspend = mpc52xx_uart_of_suspend,
1472 .resume = mpc52xx_uart_of_resume, 1471 .resume = mpc52xx_uart_of_resume,
1473#endif 1472#endif
1474 .driver = { 1473 .driver = {
1475 .name = "mpc52xx-psc-uart", 1474 .name = "mpc52xx-psc-uart",
1475 .owner = THIS_MODULE,
1476 .of_match_table = mpc52xx_uart_of_match,
1476 }, 1477 },
1477}; 1478};
1478 1479