diff options
| author | Pavel Machek <pavel@ucw.cz> | 2015-07-30 02:11:24 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2015-08-05 05:10:54 +0200 |
| commit | 7396f708b9f1d8874dda9c6386c37b065d99b68f (patch) | |
| tree | 7c50b2585a41eda5614b8c529c9fd266430c0507 /drivers | |
| parent | twl4030_charger: use runtime_pm to keep usb phy active while charging. (diff) | |
| download | linux-7396f708b9f1d8874dda9c6386c37b065d99b68f.tar.xz linux-7396f708b9f1d8874dda9c6386c37b065d99b68f.zip | |
twl4030_charger: convert to module_platform_driver instead of ..._probe.
Drivers using module_platform_driver_probe cannot return
EPROBE_DEFER from the probe function, which makes them rather useless
these days...
Convert to module_platform_driver() so EPROBE_DEFER can be used.
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: NeilBrown <neil@brown.name>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/twl4030_charger.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c index fe71c61109f5..045238370d3f 100644 --- a/drivers/power/twl4030_charger.c +++ b/drivers/power/twl4030_charger.c @@ -568,7 +568,7 @@ static const struct power_supply_desc twl4030_bci_usb_desc = { .get_property = twl4030_bci_get_property, }; -static int __init twl4030_bci_probe(struct platform_device *pdev) +static int twl4030_bci_probe(struct platform_device *pdev) { struct twl4030_bci *bci; const struct twl4030_bci_platform_data *pdata = pdev->dev.platform_data; @@ -692,14 +692,14 @@ static const struct of_device_id twl_bci_of_match[] = { MODULE_DEVICE_TABLE(of, twl_bci_of_match); static struct platform_driver twl4030_bci_driver = { + .probe = twl4030_bci_probe, .driver = { .name = "twl4030_bci", .of_match_table = of_match_ptr(twl_bci_of_match), }, .remove = __exit_p(twl4030_bci_remove), }; - -module_platform_driver_probe(twl4030_bci_driver, twl4030_bci_probe); +module_platform_driver(twl4030_bci_driver); MODULE_AUTHOR("GraÅžvydas Ignotas"); MODULE_DESCRIPTION("TWL4030 Battery Charger Interface driver"); |