From patchwork Wed Dec 2 16:30:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 551457 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5CD271400CB for ; Thu, 3 Dec 2015 03:31:09 +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=s90a205t; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933008AbbLBQax (ORCPT ); Wed, 2 Dec 2015 11:30:53 -0500 Received: from mail-wm0-f45.google.com ([74.125.82.45]:34534 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932835AbbLBQal (ORCPT ); Wed, 2 Dec 2015 11:30:41 -0500 Received: by wmvv187 with SMTP id v187so263433923wmv.1; Wed, 02 Dec 2015 08:30:39 -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:in-reply-to:references; bh=1x9Ti+GF7wYUlEi15kligntJcX+B8RQhUJS2nfXDxXU=; b=s90a205thcZcy/V+PRlC7sJazPcylDjfs8gAjiD6Du3PEhge/gLrpCPuwCoq862qN2 VXHkp34TKPQKTfhwrAxs0WX6H+pmqRQ1yXkJNx50xny75vl4HNVPagznU5DIRPOmSdFW hxrhBjCf9TkPjQUHajJa6nYX5ep/JrT9xoxz0AVHReAxVvjYlV8ebMrDevXAGDZDUVGp W/vJw9T/LG7zc5/fAKW7UH8yKUIfjDnZ11sebp6/CZxDt5y/Zf1rRzxbMvUo/ACcS2tS hyDftvukDu4Eu9JrWlc21G6dG6Bgq+yrzfbOOArR/d0LBCEOeTz3YG1adZtX9ijnEPfn hjuA== X-Received: by 10.194.105.38 with SMTP id gj6mr6647814wjb.130.1449073839687; Wed, 02 Dec 2015 08:30:39 -0800 (PST) Received: from localhost (port-973.pppoe.wtnet.de. [84.46.3.208]) by smtp.gmail.com with ESMTPSA id q77sm3890572wmd.22.2015.12.02.08.30.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Dec 2015 08:30:39 -0800 (PST) From: Thierry Reding To: "David S. Miller" Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] net: mv643xx: Use platform_register/unregister_drivers() Date: Wed, 2 Dec 2015 17:30:29 +0100 Message-Id: <1449073829-12438-4-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1449073829-12438-1-git-send-email-thierry.reding@gmail.com> References: <1449073829-12438-1-git-send-email-thierry.reding@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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 --- Applies on top of next-20151127. drivers/net/ethernet/marvell/mv643xx_eth.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 4182290fdbcf..4eba2ed53052 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -3257,25 +3257,20 @@ static struct platform_driver mv643xx_eth_driver = { }, }; +static struct platform_driver * const drivers[] = { + &mv643xx_eth_shared_driver, + &mv643xx_eth_driver, +}; + static int __init mv643xx_eth_init_module(void) { - int rc; - - rc = platform_driver_register(&mv643xx_eth_shared_driver); - if (!rc) { - rc = platform_driver_register(&mv643xx_eth_driver); - if (rc) - platform_driver_unregister(&mv643xx_eth_shared_driver); - } - - return rc; + return platform_register_drivers(drivers, ARRAY_SIZE(drivers)); } module_init(mv643xx_eth_init_module); static void __exit mv643xx_eth_cleanup_module(void) { - platform_driver_unregister(&mv643xx_eth_driver); - platform_driver_unregister(&mv643xx_eth_shared_driver); + platform_unregister_drivers(drivers, ARRAY_SIZE(drivers)); } module_exit(mv643xx_eth_cleanup_module);