From patchwork Wed Jul 23 03:49:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varka Bhadram X-Patchwork-Id: 372799 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 EEF40140129 for ; Wed, 23 Jul 2014 13:51:56 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756904AbaGWDv0 (ORCPT ); Tue, 22 Jul 2014 23:51:26 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:57537 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753791AbaGWDvY (ORCPT ); Tue, 22 Jul 2014 23:51:24 -0400 Received: by mail-pd0-f179.google.com with SMTP id ft15so779649pdb.24 for ; Tue, 22 Jul 2014 20:51:24 -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=v+Hy6LjOkRTt244WWvhNrSOyIIv2xCpYestcsZclgrE=; b=MMvSedPFThVJ0rGNOvXjQEUr4LyN3QEi3Ev/xEkTFq+uDRbyG7KnykRiXmRZXQoNOT wxlnw8JGhElZPAggfx/EeLEb8v4QftaMuEMsLKxW5faU+0a6OidiK7ixTZpADscmWbr5 YhXRf40Pp/NH5akFzFJgkWAp+DF9yMpP/hdu30l1nwlQ/GyjTI2xMoEl4R6mRotbizSS RNSyx9qXNtBt0FIiW3ch9MFjj90RVIX4rEtzahaRyPHhRa6BjxCknhMLMX1100aeAjQd F1QIK2Ga7Zyk9JAeCMbeL3uO/3zfjsmumUNFUHzBuKOULUcLi5uhZvgJDDwg6UCVjx/S i5qQ== X-Received: by 10.66.136.131 with SMTP id qa3mr38744989pab.77.1406087484048; Tue, 22 Jul 2014 20:51:24 -0700 (PDT) Received: from cdac.hyderabad.cdac.in ([196.12.45.164]) by mx.google.com with ESMTPSA id q6sm1149090pdp.5.2014.07.22.20.51.21 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Jul 2014 20:51:23 -0700 (PDT) From: varkabhadram@gmail.com To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, davem@davemloft.net, Varka Bhadram Subject: [PATCH net-next v3 2/2] ethernet: realtek: use pci_device_id Date: Wed, 23 Jul 2014 09:19:49 +0530 Message-Id: <1406087389-4436-3-git-send-email-varkabhadram@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1406087389-4436-1-git-send-email-varkabhadram@gmail.com> References: <1406087389-4436-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 use the struct pci_device_id instead of using macro DEFINE_PCI_DEVICE_TABLE which is deprecated and should not be used. And also moves these ids after probe and remove functionalities. Signed-off-by: Varka Bhadram --- drivers/net/ethernet/realtek/8139cp.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c index be101ca..75b1693 100644 --- a/drivers/net/ethernet/realtek/8139cp.c +++ b/drivers/net/ethernet/realtek/8139cp.c @@ -382,13 +382,6 @@ static int cp_get_eeprom(struct net_device *dev, static int cp_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, u8 *data); -static DEFINE_PCI_DEVICE_TABLE(cp_pci_tbl) = { - { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139), }, - { PCI_DEVICE(PCI_VENDOR_ID_TTTECH, PCI_DEVICE_ID_TTTECH_MC322), }, - { }, -}; -MODULE_DEVICE_TABLE(pci, cp_pci_tbl); - static struct { const char str[ETH_GSTRING_LEN]; } ethtool_stats_keys[] = { @@ -2106,6 +2099,13 @@ static int cp_resume (struct pci_dev *pdev) } #endif /* CONFIG_PM */ +static const struct pci_device_id cp_pci_tbl[] = { + { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139), }, + { PCI_DEVICE(PCI_VENDOR_ID_TTTECH, PCI_DEVICE_ID_TTTECH_MC322), }, + { }, +}; +MODULE_DEVICE_TABLE(pci, cp_pci_tbl); + static struct pci_driver cp_driver = { .name = DRV_NAME, .id_table = cp_pci_tbl,