From patchwork Tue Jul 22 07:20:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varka Bhadram X-Patchwork-Id: 372372 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 87F9E140119 for ; Tue, 22 Jul 2014 17:22:13 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752275AbaGVHWI (ORCPT ); Tue, 22 Jul 2014 03:22:08 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:59578 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750743AbaGVHWG (ORCPT ); Tue, 22 Jul 2014 03:22:06 -0400 Received: by mail-pd0-f170.google.com with SMTP id g10so10783665pdj.29 for ; Tue, 22 Jul 2014 00:22:06 -0700 (PDT) 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=yVWXFAPFpRqX/PHFop2z9iYtZ97wqhWSCRuSPeol73g=; b=HEgYKEuWR1AAqoWpQ6+L1tokUcabdFJoPU/GxMsMV/H1gjp7IYYiZ40PjTHe4RsN1B LLVAf3AsrxLS019qac3y73hlXUzRIqkLBWZu0/y1LqmwQogbzffOd5usuDsGl9wZeqGb /iOsYYcn6baGxK8irz5UB2+ZKIaagvXIa4oyO1VOzsakpvgIYm/gRZm+vdkmk4emF6XM GfOW68doo7/kdIwZpGdpcQ183bC9Djwjf3P+EOJbfcKWJqiPSQ0/e8aEFSYJwfD6/N++ W1lMovodXv2sjuUPU2wXb0UygEFqOSV9ov/Si8TyMpT/UZtEyB3LMTOPWH+FK2ToDIjV L9NA== X-Received: by 10.68.167.133 with SMTP id zo5mr19877514pbb.21.1406013726487; Tue, 22 Jul 2014 00:22:06 -0700 (PDT) Received: from cdac.hyderabad.cdac.in ([196.12.45.164]) by mx.google.com with ESMTPSA id qn13sm21993543pdb.69.2014.07.22.00.22.03 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Jul 2014 00:22:05 -0700 (PDT) From: varkabhadram@gmail.com To: netdev@vger.kernel.org Cc: davem@davemloft.net, Varka Bhadram Subject: [PATCH net-next v2 1/2] ethernet: realtek: use module_pci_driver Date: Tue, 22 Jul 2014 12:50:21 +0530 Message-Id: <1406013622-27869-2-git-send-email-varkabhadram@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1406013622-27869-1-git-send-email-varkabhadram@gmail.com> References: <1406013622-27869-1-git-send-email-varkabhadram@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Varka Bhadram This patch converts to use the macro module_pci_driver, which makes the code smaller and simpler. Signed-off-by: Varka Bhadram --- drivers/net/ethernet/realtek/8139cp.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c index 2bc728e..9fb68b9 100644 --- a/drivers/net/ethernet/realtek/8139cp.c +++ b/drivers/net/ethernet/realtek/8139cp.c @@ -1887,11 +1887,7 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) resource_size_t pciaddr; unsigned int addr_len, i, pci_using_dac; -#ifndef MODULE - static int version_printed; - if (version_printed++ == 0) - pr_info("%s", version); -#endif + pr_info("%s", version); if (pdev->vendor == PCI_VENDOR_ID_REALTEK && pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pdev->revision < 0x20) { @@ -2121,18 +2117,4 @@ static struct pci_driver cp_driver = { #endif }; -static int __init cp_init (void) -{ -#ifdef MODULE - pr_info("%s", version); -#endif - return pci_register_driver(&cp_driver); -} - -static void __exit cp_exit (void) -{ - pci_unregister_driver (&cp_driver); -} - -module_init(cp_init); -module_exit(cp_exit); +module_pci_driver(cp_driver);