redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

extcon: arizona: Convert to devm_input_allocate_device()

Browse source 
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>
This commit is contained in:
Mark Brown 2013-01-11 08:51:13 +09:00 committed by Chanwoo Choi
parent a162629859
commit 3d44ea1cfb
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/extcon/extcon-arizona.c
View file

@ -418,7 +418,7 @@ static int arizona_extcon_probe(struct platform_device *pdev)
arizona_extcon_set_mode(info, 0); arizona_extcon_set_mode(info, 0);
info->input = input_allocate_device(); info->input = devm_input_allocate_device(&pdev->dev);
if (!info->input) { if (!info->input) {
dev_err(arizona->dev, "Can't allocate input dev\n"); dev_err(arizona->dev, "Can't allocate input dev\n");
ret = -ENOMEM; ret = -ENOMEM;
@ -510,7 +510,6 @@ err_rise_wake:
err_rise: err_rise:
arizona_free_irq(arizona, ARIZONA_IRQ_JD_RISE, info); arizona_free_irq(arizona, ARIZONA_IRQ_JD_RISE, info);
err_input: err_input:
input_free_device(info->input);
err_register: err_register:
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
extcon_dev_unregister(&info->edev); 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, regmap_update_bits(arizona->regmap, ARIZONA_JACK_DETECT_ANALOGUE,
ARIZONA_JD1_ENA, 0); ARIZONA_JD1_ENA, 0);
arizona_clk32k_disable(arizona); arizona_clk32k_disable(arizona);
input_unregister_device(info->input);
extcon_dev_unregister(&info->edev); extcon_dev_unregister(&info->edev);
return 0; return 0;