From patchwork Mon Sep 28 19:51:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Gortmaker X-Patchwork-Id: 523581 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 3B4081401CD for ; Tue, 29 Sep 2015 05:52:17 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752166AbbI1TwG (ORCPT ); Mon, 28 Sep 2015 15:52:06 -0400 Received: from mail1.windriver.com ([147.11.146.13]:40469 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751515AbbI1TwC (ORCPT ); Mon, 28 Sep 2015 15:52:02 -0400 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.15.2/8.15.1) with ESMTPS id t8SJq1Nw014797 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Mon, 28 Sep 2015 12:52:01 -0700 (PDT) Received: from yow-lpgnfs-02.corp.ad.wrs.com (128.224.149.8) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.235.1; Mon, 28 Sep 2015 12:52:00 -0700 From: Paul Gortmaker To: CC: Paul Gortmaker , "David S. Miller" , Subject: [PATCH 4/6] net/ethernet: make amd/hplance.c driver explicitly non-modular Date: Mon, 28 Sep 2015 15:51:28 -0400 Message-ID: <1443469890-19485-5-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.6.0.rc3 In-Reply-To: <1443469890-19485-1-git-send-email-paul.gortmaker@windriver.com> References: <1443469890-19485-1-git-send-email-paul.gortmaker@windriver.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The Kconfig for this driver is currently: config HPLANCE bool "HP on-board LANCE support" ...meaning that it currently is not being built as a module by anyone. Lets remove the modular and unused code here, so that when reading the driver there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. We don't swap module.h for init.h since this file has init.h already. We move the information from the MODULE_LICENSE tag to the top of the file in this case, since it is not duplicating similar information already there. Cc: "David S. Miller" Cc: netdev@vger.kernel.org Cc: linux-m68k@lists.linux-m68k.org Signed-off-by: Paul Gortmaker --- drivers/net/ethernet/amd/hplance.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/amd/hplance.c b/drivers/net/ethernet/amd/hplance.c index 6c9de117ffc6..fa9397508a79 100644 --- a/drivers/net/ethernet/amd/hplance.c +++ b/drivers/net/ethernet/amd/hplance.c @@ -3,9 +3,9 @@ * Copyright (C) 05/1998 Peter Maydell * Based on the Sun Lance driver and the NetBSD HP Lance driver * Uses the generic 7990.c LANCE code. + * License: GPL */ -#include #include #include #include @@ -220,13 +220,4 @@ static int __init hplance_init_module(void) { return dio_register_driver(&hplance_driver); } - -static void __exit hplance_cleanup_module(void) -{ - dio_unregister_driver(&hplance_driver); -} - -module_init(hplance_init_module); -module_exit(hplance_cleanup_module); - -MODULE_LICENSE("GPL"); +device_initcall(hplance_init_module);