diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-10 18:51:13 -0500 |
---|---|---|
committer | Chanwoo Choi <cw00.choi@samsung.com> | 2013-01-15 01:42:16 -0500 |
commit | 3d44ea1cfbf671152d3ac0ede94439550afa7406 (patch) | |
tree | 5cc6be07d36798eb35b2347b155356e9e08e7afb /drivers/extcon | |
parent | a162629859a03c07b9603ea59a0b7ae24f695689 (diff) |
extcon: arizona: Convert to devm_input_allocate_device()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Myungjoo Ham <myungjoo.ham@samsung.com>
Diffstat (limited to 'drivers/extcon')
-rw-r--r-- | drivers/extcon/extcon-arizona.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c index 414aed50b1bc..4454d2df3a58 100644 --- a/drivers/extcon/extcon-arizona.c +++ b/drivers/extcon/extcon-arizona.c | |||
@@ -418,7 +418,7 @@ static int arizona_extcon_probe(struct platform_device *pdev) | |||
418 | 418 | ||
419 | arizona_extcon_set_mode(info, 0); | 419 | arizona_extcon_set_mode(info, 0); |
420 | 420 | ||
421 | info->input = input_allocate_device(); | 421 | info->input = devm_input_allocate_device(&pdev->dev); |
422 | if (!info->input) { | 422 | if (!info->input) { |
423 | dev_err(arizona->dev, "Can't allocate input dev\n"); | 423 | dev_err(arizona->dev, "Can't allocate input dev\n"); |
424 | ret = -ENOMEM; | 424 | ret = -ENOMEM; |
@@ -510,7 +510,6 @@ err_rise_wake: | |||
510 | err_rise: | 510 | err_rise: |
511 | arizona_free_irq(arizona, ARIZONA_IRQ_JD_RISE, info); | 511 | arizona_free_irq(arizona, ARIZONA_IRQ_JD_RISE, info); |
512 | err_input: | 512 | err_input: |
513 | input_free_device(info->input); | ||
514 | err_register: | 513 | err_register: |
515 | pm_runtime_disable(&pdev->dev); | 514 | pm_runtime_disable(&pdev->dev); |
516 | extcon_dev_unregister(&info->edev); | 515 | extcon_dev_unregister(&info->edev); |
@@ -533,7 +532,6 @@ static int arizona_extcon_remove(struct platform_device *pdev) | |||
533 | regmap_update_bits(arizona->regmap, ARIZONA_JACK_DETECT_ANALOGUE, | 532 | regmap_update_bits(arizona->regmap, ARIZONA_JACK_DETECT_ANALOGUE, |
534 | ARIZONA_JD1_ENA, 0); | 533 | ARIZONA_JD1_ENA, 0); |
535 | arizona_clk32k_disable(arizona); | 534 | arizona_clk32k_disable(arizona); |
536 | input_unregister_device(info->input); | ||
537 | extcon_dev_unregister(&info->edev); | 535 | extcon_dev_unregister(&info->edev); |
538 | 536 | ||
539 | return 0; | 537 | return 0; |