From patchwork Wed Dec 2 16:31:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 551461 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B0D051400CB for ; Thu, 3 Dec 2015 03:31:59 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=S+bbNA6v; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932888AbbLBQb6 (ORCPT ); Wed, 2 Dec 2015 11:31:58 -0500 Received: from mail-wm0-f42.google.com ([74.125.82.42]:34287 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932853AbbLBQb5 (ORCPT ); Wed, 2 Dec 2015 11:31:57 -0500 Received: by wmvv187 with SMTP id v187so263496621wmv.1; Wed, 02 Dec 2015 08:31:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=AoXfhzpqlKM607PvP9a+wGehdBEnbuupPpAeOzz8SKo=; b=S+bbNA6vyyXe+vAKKqzst7ZXaGr+/YfVAbaImXg9YmQu8H1zgMJfsMZJ6KYzW/cadS 8DSU0lC7HxdddLxPZXIzmbI6eTzcWkl7kDyjBJXvfmIUlMJeLtnjzckqTJPl8KFes3B0 mE0TZRA8I/GXcfPwCt7hox+pMeCs1MZuYa60v2N7MSQ6G+M4VFz4+kq0rHmv4ahQIYxb RqWLjd+UKqOptHVBr1STkLaF5Fo25E23PIcUj/y9c1HzTj4gBrhSN4+OIqxDqIv5YD8r OU+VaLE4LBFu1Fwev0Kz9BCODmXtrCXtsgmqL5kF+1xhraImw/GACe90/BFeValF7U8v M03A== X-Received: by 10.28.128.5 with SMTP id b5mr42906013wmd.25.1449073916475; Wed, 02 Dec 2015 08:31:56 -0800 (PST) Received: from localhost (port-973.pppoe.wtnet.de. [84.46.3.208]) by smtp.gmail.com with ESMTPSA id i18sm3950175wmf.6.2015.12.02.08.31.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Dec 2015 08:31:55 -0800 (PST) From: Thierry Reding To: Linus Walleij Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] pinctrl: adi2: Use platform_register/unregister_drivers() Date: Wed, 2 Dec 2015 17:31:54 +0100 Message-Id: <1449073915-12663-1-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.5.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Thierry Reding These new helpers simplify implementing multi-driver modules and properly handle failure to register one driver by unregistering all previously registered drivers. Signed-off-by: Thierry Reding --- drivers/pinctrl/pinctrl-adi2.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/drivers/pinctrl/pinctrl-adi2.c b/drivers/pinctrl/pinctrl-adi2.c index fd342dffe4dc..8e9e8eab59ba 100644 --- a/drivers/pinctrl/pinctrl-adi2.c +++ b/drivers/pinctrl/pinctrl-adi2.c @@ -1102,32 +1102,24 @@ static struct platform_driver adi_gpio_driver = { }, }; +static struct platform_driver * const drivers[] = { + &adi_pinctrl_driver, + &adi_gpio_pint_driver, + &adi_gpio_driver, +}; + static int __init adi_pinctrl_setup(void) { int ret; - ret = platform_driver_register(&adi_pinctrl_driver); + ret = platform_register_drivers(drivers, ARRAY_SIZE(drivers)); if (ret) return ret; - ret = platform_driver_register(&adi_gpio_pint_driver); - if (ret) - goto pint_error; - - ret = platform_driver_register(&adi_gpio_driver); - if (ret) - goto gpio_error; - #ifdef CONFIG_PM register_syscore_ops(&gpio_pm_syscore_ops); #endif - return ret; -gpio_error: - platform_driver_unregister(&adi_gpio_pint_driver); -pint_error: - platform_driver_unregister(&adi_pinctrl_driver); - - return ret; + return 0; } arch_initcall(adi_pinctrl_setup);