From patchwork Wed Dec 2 16:30:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 551458 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 BB4EE14030F for ; Thu, 3 Dec 2015 03:31:23 +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=z36+fAO2; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932954AbbLBQal (ORCPT ); Wed, 2 Dec 2015 11:30:41 -0500 Received: from mail-wm0-f49.google.com ([74.125.82.49]:35165 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932599AbbLBQaj (ORCPT ); Wed, 2 Dec 2015 11:30:39 -0500 Received: by wmuu63 with SMTP id u63so222306568wmu.0; Wed, 02 Dec 2015 08:30:38 -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=62RcFBUlqmBelHo3LmWij8ZyKnyHl7YVrTzUZmu+SBs=; b=z36+fAO2AD0lfVeq2Wv/FHquWCe+YE87qQYyHUd8WtzZBHQ7bq2IzgXW3ql/Rob1Uy NFVIwQqirtg46sTA3nU5+7q4kJiqtOPqsIyXiZEcTm8rdHVEqZg+infoLBwh9mQe6XAa yiek7sD36Ha71tftd2HLAoFoMyUpZuEWwmqYnnbxcVB1YPetxQzLKyQaocnLrPG1lE3q jAYyRM64RZHfGn4YqYI9iYLPaLDfyJVYPrBJgN8SPuZKJMyagA3QVTBO3B/beLMLIZHt 2Tx6b4FiLNIbo7QWb3eRfnv1Km/FJQnVmvem81xP6/Z3GWOQ3YFAePN6N7RCx1VWXuoW 6DCw== X-Received: by 10.194.95.65 with SMTP id di1mr5716172wjb.134.1449073838334; Wed, 02 Dec 2015 08:30:38 -0800 (PST) Received: from localhost (port-973.pppoe.wtnet.de. [84.46.3.208]) by smtp.gmail.com with ESMTPSA id q9sm3505863wjo.9.2015.12.02.08.30.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Dec 2015 08:30:33 -0800 (PST) From: Thierry Reding To: "David S. Miller" Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] net: mpc52xx: Use platform_register/unregister_drivers() Date: Wed, 2 Dec 2015 17:30:28 +0100 Message-Id: <1449073829-12438-3-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/freescale/fec_mpc52xx.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.c b/drivers/net/ethernet/freescale/fec_mpc52xx.c index afe7f39cdd7c..25553ee857b4 100644 --- a/drivers/net/ethernet/freescale/fec_mpc52xx.c +++ b/drivers/net/ethernet/freescale/fec_mpc52xx.c @@ -1084,27 +1084,23 @@ static struct platform_driver mpc52xx_fec_driver = { /* Module */ /* ======================================================================== */ +static struct platform_driver * const drivers[] = { +#ifdef CONFIG_FEC_MPC52xx_MDIO + &mpc52xx_fec_mdio_driver, +#endif + &mpc52xx_fec_driver, +}; + static int __init mpc52xx_fec_init(void) { -#ifdef CONFIG_FEC_MPC52xx_MDIO - int ret; - ret = platform_driver_register(&mpc52xx_fec_mdio_driver); - if (ret) { - pr_err("failed to register mdio driver\n"); - return ret; - } -#endif - return platform_driver_register(&mpc52xx_fec_driver); + return platform_register_drivers(drivers, ARRAY_SIZE(drivers)); } static void __exit mpc52xx_fec_exit(void) { - platform_driver_unregister(&mpc52xx_fec_driver); -#ifdef CONFIG_FEC_MPC52xx_MDIO - platform_driver_unregister(&mpc52xx_fec_mdio_driver); -#endif + platform_unregister_drivers(drivers, ARRAY_SIZE(drivers)); }