diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-22 23:07:43 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-28 15:22:45 -0500 |
commit | 28541d0f1894cd0c8f4a90c6e006c88d38ad3ac0 (patch) | |
tree | 9d735279860b9f5e499cdf8bd67bf790c92dbebd /drivers/video/ffb.c | |
parent | 74888760d40b3ac9054f9c5fa07b566c0676ba2d (diff) |
dt/video: Eliminate users of of_platform_{,un}register_driver
Get rid of users of of_platform_driver in drivers/video. The
of_platform_{,un}register_driver functions are going away, so the
users need to be converted to using the platform_bus_type directly.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/video/ffb.c')
-rw-r--r-- | drivers/video/ffb.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c index 6739b2af3bc0..910c5e6f6702 100644 --- a/drivers/video/ffb.c +++ b/drivers/video/ffb.c | |||
@@ -893,8 +893,7 @@ static void ffb_init_fix(struct fb_info *info) | |||
893 | info->fix.accel = FB_ACCEL_SUN_CREATOR; | 893 | info->fix.accel = FB_ACCEL_SUN_CREATOR; |
894 | } | 894 | } |
895 | 895 | ||
896 | static int __devinit ffb_probe(struct platform_device *op, | 896 | static int __devinit ffb_probe(struct platform_device *op) |
897 | const struct of_device_id *match) | ||
898 | { | 897 | { |
899 | struct device_node *dp = op->dev.of_node; | 898 | struct device_node *dp = op->dev.of_node; |
900 | struct ffb_fbc __iomem *fbc; | 899 | struct ffb_fbc __iomem *fbc; |
@@ -1052,7 +1051,7 @@ static const struct of_device_id ffb_match[] = { | |||
1052 | }; | 1051 | }; |
1053 | MODULE_DEVICE_TABLE(of, ffb_match); | 1052 | MODULE_DEVICE_TABLE(of, ffb_match); |
1054 | 1053 | ||
1055 | static struct of_platform_driver ffb_driver = { | 1054 | static struct platform_driver ffb_driver = { |
1056 | .driver = { | 1055 | .driver = { |
1057 | .name = "ffb", | 1056 | .name = "ffb", |
1058 | .owner = THIS_MODULE, | 1057 | .owner = THIS_MODULE, |
@@ -1067,12 +1066,12 @@ static int __init ffb_init(void) | |||
1067 | if (fb_get_options("ffb", NULL)) | 1066 | if (fb_get_options("ffb", NULL)) |
1068 | return -ENODEV; | 1067 | return -ENODEV; |
1069 | 1068 | ||
1070 | return of_register_platform_driver(&ffb_driver); | 1069 | return platform_driver_register(&ffb_driver); |
1071 | } | 1070 | } |
1072 | 1071 | ||
1073 | static void __exit ffb_exit(void) | 1072 | static void __exit ffb_exit(void) |
1074 | { | 1073 | { |
1075 | of_unregister_platform_driver(&ffb_driver); | 1074 | platform_driver_unregister(&ffb_driver); |
1076 | } | 1075 | } |
1077 | 1076 | ||
1078 | module_init(ffb_init); | 1077 | module_init(ffb_init); |