From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932566AbcBVO0g (ORCPT ); Mon, 22 Feb 2016 09:26:36 -0500 Received: from hqemgate15.nvidia.com ([216.228.121.64]:15517 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932546AbcBVO0c (ORCPT ); Mon, 22 Feb 2016 09:26:32 -0500 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Mon, 22 Feb 2016 06:26:28 -0800 From: Laxman Dewangan To: , , , , , , , , , CC: , , , , , , , , , , , Subject: [PATCH 51/61] gpio: ts4800: Use devm_gpiochip_add_data() for gpio registration Date: Mon, 22 Feb 2016 19:38:40 +0530 Message-ID: <1456150130-2668-52-git-send-email-ldewangan@nvidia.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1456150130-2668-1-git-send-email-ldewangan@nvidia.com> References: <1456150130-2668-1-git-send-email-ldewangan@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use devm_gpiochip_add_data() for GPIO registration and remove the need of driver callback .remove. Signed-off-by: Laxman Dewangan --- drivers/gpio/gpio-ts4800.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/gpio/gpio-ts4800.c b/drivers/gpio/gpio-ts4800.c index c4908a4..b8762d9 100644 --- a/drivers/gpio/gpio-ts4800.c +++ b/drivers/gpio/gpio-ts4800.c @@ -61,16 +61,7 @@ static int ts4800_gpio_probe(struct platform_device *pdev) platform_set_drvdata(pdev, chip); - return gpiochip_add_data(chip, NULL); -} - -static int ts4800_gpio_remove(struct platform_device *pdev) -{ - struct gpio_chip *chip = platform_get_drvdata(pdev); - - gpiochip_remove(chip); - - return 0; + return devm_gpiochip_add_data(&pdev->dev, chip, NULL); } static const struct of_device_id ts4800_gpio_of_match[] = { @@ -84,7 +75,6 @@ static struct platform_driver ts4800_gpio_driver = { .of_match_table = ts4800_gpio_of_match, }, .probe = ts4800_gpio_probe, - .remove = ts4800_gpio_remove, }; module_platform_driver_probe(ts4800_gpio_driver, ts4800_gpio_probe); -- 2.1.4