diff options
author | Liam Girdwood <lrg@slimlogic.co.uk> | 2011-08-01 17:25:06 (GMT) |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2011-08-01 17:25:06 (GMT) |
commit | 424c3d4a2c7d4ac3467a4849f8ccc230f670c35a (patch) | |
tree | 55806b1367b42ec210f273c16bf350182ac6fd62 /drivers/regulator/dummy.c | |
parent | 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff) | |
parent | 88cda60e512373ca18a663ee66dc2550800223eb (diff) | |
download | linux-fsl-qoriq-424c3d4a2c7d4ac3467a4849f8ccc230f670c35a.tar.xz |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'drivers/regulator/dummy.c')
-rw-r--r-- | drivers/regulator/dummy.c | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/drivers/regulator/dummy.c b/drivers/regulator/dummy.c index c7410bd..f6ef669 100644 --- a/drivers/regulator/dummy.c +++ b/drivers/regulator/dummy.c @@ -36,6 +36,29 @@ static struct regulator_desc dummy_desc = { .ops = &dummy_ops, }; +static int __devinit dummy_regulator_probe(struct platform_device *pdev) +{ + int ret; + + dummy_regulator_rdev = regulator_register(&dummy_desc, NULL, + &dummy_initdata, NULL); + if (IS_ERR(dummy_regulator_rdev)) { + ret = PTR_ERR(dummy_regulator_rdev); + pr_err("Failed to register regulator: %d\n", ret); + return ret; + } + + return 0; +} + +static struct platform_driver dummy_regulator_driver = { + .probe = dummy_regulator_probe, + .driver = { + .name = "reg-dummy", + .owner = THIS_MODULE, + }, +}; + static struct platform_device *dummy_pdev; void __init regulator_dummy_init(void) @@ -55,12 +78,9 @@ void __init regulator_dummy_init(void) return; } - dummy_regulator_rdev = regulator_register(&dummy_desc, NULL, - &dummy_initdata, NULL); - if (IS_ERR(dummy_regulator_rdev)) { - ret = PTR_ERR(dummy_regulator_rdev); - pr_err("Failed to register regulator: %d\n", ret); + ret = platform_driver_register(&dummy_regulator_driver); + if (ret != 0) { + pr_err("Failed to register dummy regulator driver: %d\n", ret); platform_device_unregister(dummy_pdev); - return; } } |