From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755619AbdETNN7 (ORCPT ); Sat, 20 May 2017 09:13:59 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36667 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752621AbdETNNw (ORCPT ); Sat, 20 May 2017 09:13:52 -0400 From: Bram Vlerick To: dmitry.torokhov@gmail.com, michael.opdenacker@free-electrons.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] input: move gpio mouse to managed api Date: Sat, 20 May 2017 15:13:25 +0200 Message-Id: <20170520131325.21049-1-vlerickb@gmail.com> X-Mailer: git-send-email 2.12.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Bram Vlerick --- drivers/input/mouse/gpio_mouse.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/input/mouse/gpio_mouse.c b/drivers/input/mouse/gpio_mouse.c index ced07391304b..2fc8ddaf0175 100644 --- a/drivers/input/mouse/gpio_mouse.c +++ b/drivers/input/mouse/gpio_mouse.c @@ -93,7 +93,7 @@ static int gpio_mouse_probe(struct platform_device *pdev) } } - input_poll = input_allocate_polled_device(); + input_poll = devm_input_allocate_polled_device(&pdev->dev); if (!input_poll) { dev_err(&pdev->dev, "not enough memory for input device\n"); error = -ENOMEM; @@ -124,7 +124,7 @@ static int gpio_mouse_probe(struct platform_device *pdev) error = input_register_polled_device(input_poll); if (error) { dev_err(&pdev->dev, "could not register input device\n"); - goto out_free_polldev; + goto out_free_gpios; } dev_dbg(&pdev->dev, "%d ms scan time, buttons: %s%s%s\n", @@ -135,9 +135,6 @@ static int gpio_mouse_probe(struct platform_device *pdev) return 0; - out_free_polldev: - input_free_polled_device(input_poll); - out_free_gpios: while (--i >= 0) { pin = pdata->pins[i]; @@ -155,7 +152,6 @@ static int gpio_mouse_remove(struct platform_device *pdev) int pin, i; input_unregister_polled_device(input); - input_free_polled_device(input); for (i = 0; i < GPIO_MOUSE_PIN_MAX; i++) { pin = pdata->pins[i]; -- 2.12.2