From patchwork Wed Dec 2 16:30:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 551460 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 F05D11400CB for ; Thu, 3 Dec 2015 03:31:48 +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=M21fSa1s; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932885AbbLBQbd (ORCPT ); Wed, 2 Dec 2015 11:31:33 -0500 Received: from mail-wm0-f42.google.com ([74.125.82.42]:33496 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751670AbbLBQad (ORCPT ); Wed, 2 Dec 2015 11:30:33 -0500 Received: by wmec201 with SMTP id c201so261730148wme.0; Wed, 02 Dec 2015 08:30:32 -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=nHfig1EmMk12KKeEtCChpwEvjE9OeI7dr5NnJvLTiuw=; b=M21fSa1sD0rnY8YwxFAz9qs6P9g7QWVMOhlLqOAryL4HlUtydzFwN9bgpjisarJTge XK/5pz8q1sD3cpNxOFnzYRzfBOMhLQq+v3zdGRk6iig60ogmCze/KtDh4zx0wA+o8NGb JKf1FP75yEH0T9SzusI0GDH7zHNvsiAJJOKKjIHhkjmJL7aJZDX158J5L6djC5hTur5p 9kM9b9op2nFUcnUibyrdVe+cX2ulj0GyAPfQQGow3/DwMSXJzRwSmW+LR21lHnlYmA57 XSxtUIxK65r+30hVS4OhLG1kK9aCTIZWcYYjNeGOBWGdL2YevGm4e1JpyqTlWyU+doBm WTXg== X-Received: by 10.194.238.231 with SMTP id vn7mr6592804wjc.109.1449073832356; Wed, 02 Dec 2015 08:30:32 -0800 (PST) Received: from localhost (port-973.pppoe.wtnet.de. [84.46.3.208]) by smtp.gmail.com with ESMTPSA id z17sm3532142wjq.1.2015.12.02.08.30.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Dec 2015 08:30:31 -0800 (PST) From: Thierry Reding To: "David S. Miller" Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] net: bcm63xx: Use platform_register/unregister_drivers() Date: Wed, 2 Dec 2015 17:30:27 +0100 Message-Id: <1449073829-12438-2-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/broadcom/bcm63xx_enet.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index 8b1929e9f698..a54bafad3538 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -2884,33 +2884,21 @@ struct platform_driver bcm63xx_enet_shared_driver = { }, }; +static struct platform_driver * const drivers[] = { + &bcm63xx_enet_shared_driver, + &bcm63xx_enet_driver, + &bcm63xx_enetsw_driver, +}; + /* entry point */ static int __init bcm_enet_init(void) { - int ret; - - ret = platform_driver_register(&bcm63xx_enet_shared_driver); - if (ret) - return ret; - - ret = platform_driver_register(&bcm63xx_enet_driver); - if (ret) - platform_driver_unregister(&bcm63xx_enet_shared_driver); - - ret = platform_driver_register(&bcm63xx_enetsw_driver); - if (ret) { - platform_driver_unregister(&bcm63xx_enet_driver); - platform_driver_unregister(&bcm63xx_enet_shared_driver); - } - - return ret; + return platform_register_drivers(drivers, ARRAY_SIZE(drivers)); } static void __exit bcm_enet_exit(void) { - platform_driver_unregister(&bcm63xx_enet_driver); - platform_driver_unregister(&bcm63xx_enetsw_driver); - platform_driver_unregister(&bcm63xx_enet_shared_driver); + platform_unregister_drivers(drivers, ARRAY_SIZE(drivers)); }