From: Mark Brown Date: Thu, 10 Jan 2013 23:51:13 +0000 (+0900) Subject: extcon: arizona: Convert to devm_input_allocate_device() X-Git-Tag: firefly_0821_release~3680^2~1077^2~8^2~21 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3d44ea1cfbf671152d3ac0ede94439550afa7406;p=firefly-linux-kernel-4.4.55.git extcon: arizona: Convert to devm_input_allocate_device() Signed-off-by: Mark Brown Signed-off-by: Chanwoo Choi Signed-off-by: Myungjoo Ham --- 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;