From 06d7cf44a156ad63544dd73d3dea3402009fa208 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sat, 2 Mar 2013 16:13:34 +0100 Subject: [PATCH] Updated for Linux 3.4 (stable -rt branch) --- motorek.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/motorek.c b/motorek.c index 71ca745..1ab1bf8 100644 --- a/motorek.c +++ b/motorek.c @@ -20,6 +20,7 @@ #include #include #include +#include struct motorek { struct mpc52xx_gpt *pwmf, *pwmb, *irca, *ircb; @@ -200,10 +201,9 @@ out: return gpt; } -static int __devinit motorek_probe(struct of_device* dev, - const struct of_device_id *match) +static int __devinit motorek_probe(struct platform_device* dev) { - struct device_node *dn = dev->node; + struct device_node *dn = dev->dev.of_node; struct motorek *m; int err; @@ -262,7 +262,7 @@ err_free: return err; } -static int __devexit motorek_remove(struct of_device* dev) +static int __devexit motorek_remove(struct platform_device* dev) { struct motorek *m; @@ -278,19 +278,21 @@ static struct of_device_id motorek_match[] = { { .type = "motorek", }, {}, }; -static struct of_platform_driver motorek_driver = { - .owner = THIS_MODULE, - .name = "motorek", - .match_table = motorek_match, +static struct platform_driver motorek_driver = { .probe = motorek_probe, .remove = __devexit_p(motorek_remove), + .driver = { + .name = "motorek", + .owner = THIS_MODULE, + .of_match_table = motorek_match, + }, }; static int __init motorek_init_module(void) { int ret; - struct of_device *dev; + struct platform_device *dev; struct device_node *dn; for_each_node_by_type(dn, "motorek") { @@ -301,13 +303,13 @@ static int __init motorek_init_module(void) } }; - ret = of_register_platform_driver(&motorek_driver); + ret = platform_driver_register(&motorek_driver); return ret; } static void __exit motorek_exit_module(void) { - struct of_device *dev; + struct platform_device *dev; struct device_node *dn; for_each_node_by_type(dn, "motorek") { @@ -315,7 +317,7 @@ static void __exit motorek_exit_module(void) of_device_unregister(dev); } } - of_unregister_platform_driver(&motorek_driver); + platform_driver_unregister(&motorek_driver); } module_init(motorek_init_module); -- 2.39.2