diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-11 08:51:13 +0900 |
|---|---|---|
| committer | Chanwoo Choi <cw00.choi@samsung.com> | 2013-01-15 15:42:16 +0900 |
| commit | 3d44ea1cfbf671152d3ac0ede94439550afa7406 (patch) | |
| tree | 5cc6be07d36798eb35b2347b155356e9e08e7afb /drivers/extcon | |
| parent | a162629859a03c07b9603ea59a0b7ae24f695689 (diff) | |
| download | linux-3d44ea1cfbf671152d3ac0ede94439550afa7406.tar.bz2 | |
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) arizona_extcon_set_mode(info, 0); - info->input = input_allocate_device(); + info->input = devm_input_allocate_device(&pdev->dev); if (!info->input) { dev_err(arizona->dev, "Can't allocate input dev\n"); ret = -ENOMEM; @@ -510,7 +510,6 @@ err_rise_wake: err_rise: arizona_free_irq(arizona, ARIZONA_IRQ_JD_RISE, info); err_input: - input_free_device(info->input); err_register: pm_runtime_disable(&pdev->dev); extcon_dev_unregister(&info->edev); @@ -533,7 +532,6 @@ static int arizona_extcon_remove(struct platform_device *pdev) regmap_update_bits(arizona->regmap, ARIZONA_JACK_DETECT_ANALOGUE, ARIZONA_JD1_ENA, 0); arizona_clk32k_disable(arizona); - input_unregister_device(info->input); extcon_dev_unregister(&info->edev); return 0; |