From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754491Ab3EUXjE (ORCPT ); Tue, 21 May 2013 19:39:04 -0400 Received: from mout.gmx.net ([212.227.15.15]:55016 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754360Ab3EUXid (ORCPT ); Tue, 21 May 2013 19:38:33 -0400 X-Authenticated: #12255092 X-Provags-ID: V01U2FsdGVkX1/wUZg+tyXwmWfHaKIh1C0sCFD3MlUKrfkqMWb2rz F2G2Xcf71HS5LL From: Peter Huewe To: "David S. Miller" Cc: Peter Huewe , Greg Kroah-Hartman , Bill Pemberton , Patrick McHardy , netdev@vger.kernel.org (open list:NETWORKING DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 18/19] net/ethernet/chelsio/cxgb/cxgb2: Use module_pci_driver to register driver Date: Wed, 22 May 2013 01:42:55 +0200 Message-Id: <1369179778-20115-18-git-send-email-peterhuewe@gmx.de> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1369176146-19383-1-git-send-email-peterhuewe@gmx.de> References: <1369176146-19383-1-git-send-email-peterhuewe@gmx.de> X-Y-GMX-Trusted: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Removing some boilerplate by using module_pci_driver instead of calling register and unregister in the otherwise empty init/exit functions. The name of the pci_driver struct had to be changed in order to prevent a build failure. Signed-off-by: Peter Huewe --- drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c index 9624cfe..d7048db 100644 --- a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c +++ b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c @@ -1351,22 +1351,11 @@ static void remove_one(struct pci_dev *pdev) t1_sw_reset(pdev); } -static struct pci_driver driver = { +static struct pci_driver cxgb_pci_driver = { .name = DRV_NAME, .id_table = t1_pci_tbl, .probe = init_one, .remove = remove_one, }; -static int __init t1_init_module(void) -{ - return pci_register_driver(&driver); -} - -static void __exit t1_cleanup_module(void) -{ - pci_unregister_driver(&driver); -} - -module_init(t1_init_module); -module_exit(t1_cleanup_module); +module_pci_driver(cxgb_pci_driver); -- 1.8.1.5