diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-22 22:01:33 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-28 03:36:39 -0500 |
commit | 4ebb24f707187196937607c60810d42f7112d7aa (patch) | |
tree | 89a92b3f8dd55f3c5e0cfa73fa6446b3d490f3a8 /drivers/sbus/char/flash.c | |
parent | 000061245a6797d542854106463b6b20fbdcb12e (diff) |
dt/sparc: Eliminate users of of_platform_{,un}register_driver
Get rid of old users of of_platform_driver in arch/sparc. Most
of_platform_driver users can be converted to use the platform_bus
directly.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/sbus/char/flash.c')
-rw-r--r-- | drivers/sbus/char/flash.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c index 2b4b4b613c48..73dd4e7afaaa 100644 --- a/drivers/sbus/char/flash.c +++ b/drivers/sbus/char/flash.c | |||
@@ -160,8 +160,7 @@ static const struct file_operations flash_fops = { | |||
160 | 160 | ||
161 | static struct miscdevice flash_dev = { FLASH_MINOR, "flash", &flash_fops }; | 161 | static struct miscdevice flash_dev = { FLASH_MINOR, "flash", &flash_fops }; |
162 | 162 | ||
163 | static int __devinit flash_probe(struct platform_device *op, | 163 | static int __devinit flash_probe(struct platform_device *op) |
164 | const struct of_device_id *match) | ||
165 | { | 164 | { |
166 | struct device_node *dp = op->dev.of_node; | 165 | struct device_node *dp = op->dev.of_node; |
167 | struct device_node *parent; | 166 | struct device_node *parent; |
@@ -207,7 +206,7 @@ static const struct of_device_id flash_match[] = { | |||
207 | }; | 206 | }; |
208 | MODULE_DEVICE_TABLE(of, flash_match); | 207 | MODULE_DEVICE_TABLE(of, flash_match); |
209 | 208 | ||
210 | static struct of_platform_driver flash_driver = { | 209 | static struct platform_driver flash_driver = { |
211 | .driver = { | 210 | .driver = { |
212 | .name = "flash", | 211 | .name = "flash", |
213 | .owner = THIS_MODULE, | 212 | .owner = THIS_MODULE, |
@@ -219,12 +218,12 @@ static struct of_platform_driver flash_driver = { | |||
219 | 218 | ||
220 | static int __init flash_init(void) | 219 | static int __init flash_init(void) |
221 | { | 220 | { |
222 | return of_register_platform_driver(&flash_driver); | 221 | return platform_driver_register(&flash_driver); |
223 | } | 222 | } |
224 | 223 | ||
225 | static void __exit flash_cleanup(void) | 224 | static void __exit flash_cleanup(void) |
226 | { | 225 | { |
227 | of_unregister_platform_driver(&flash_driver); | 226 | platform_driver_unregister(&flash_driver); |
228 | } | 227 | } |
229 | 228 | ||
230 | module_init(flash_init); | 229 | module_init(flash_init); |