From patchwork Sun Nov 16 18:05:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilles Chanteperdrix X-Patchwork-Id: 411322 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 1F0E71400D2 for ; Mon, 17 Nov 2014 05:21:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755456AbaKPSVa (ORCPT ); Sun, 16 Nov 2014 13:21:30 -0500 Received: from sd-51317.dedibox.fr ([62.210.215.82]:36242 "EHLO sd-51317.dedibox.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751282AbaKPSV3 (ORCPT ); Sun, 16 Nov 2014 13:21:29 -0500 X-Greylist: delayed 935 seconds by postgrey-1.27 at vger.kernel.org; Sun, 16 Nov 2014 13:21:29 EST Received: from [78.194.115.96] (helo=prometheus.local) by sd-51317.dedibox.fr with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1Xq4CO-0004SX-L6; Sun, 16 Nov 2014 19:05:21 +0100 From: Gilles Chanteperdrix To: Nicolas Ferre , netdev@vger.kernel.org Cc: Gilles Chanteperdrix Subject: [PATCH] net/at91_ether: fix loading when macb is compiled as a module Date: Sun, 16 Nov 2014 19:05:06 +0100 Message-Id: <1416161106-27498-1-git-send-email-gilles.chanteperdrix@xenomai.org> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The at91_ether driver depends on symbols defined in the macb driver. Currently, when compiling both at91_ether and macb as module, starting the at91_ether module fails, because the macb module can not be loaded with a macb interface. Avoid this issue by getting the macb module initialization routine to always return 0, even when no macb device is detected. Signed-off-by: Gilles Chanteperdrix --- drivers/net/ethernet/cadence/macb.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 4d9fc05..f70228c 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -2327,7 +2327,20 @@ static struct platform_driver macb_driver = { }, }; -module_platform_driver_probe(macb_driver, macb_probe); +static bool found; +static int __init macb_driver_init(void) +{ + found = platform_driver_probe(&macb_driver, macb_probe) == 0; + return 0; +} +module_init(macb_driver_init); + +static void __exit macb_driver_exit(void) +{ + if (found) + platform_driver_unregister(&macb_driver); +} +module_exit(macb_driver_exit); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Cadence MACB/GEM Ethernet driver");