From patchwork Tue Jul 22 05:58:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varka Bhadram X-Patchwork-Id: 372360 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 26430140143 for ; Tue, 22 Jul 2014 16:00:35 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752654AbaGVGA0 (ORCPT ); Tue, 22 Jul 2014 02:00:26 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:61171 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752587AbaGVGAY (ORCPT ); Tue, 22 Jul 2014 02:00:24 -0400 Received: by mail-pa0-f53.google.com with SMTP id kq14so11162680pab.26 for ; Mon, 21 Jul 2014 23:00: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=38yxaUd7K6U8bsursMe3qsHACs8yVj6nrvEmqoB8Z7s=; b=0uRfncwY5iIW9SSMSo9645rez1d7FoDVXn11dRt+8xTkUWSWAnay91lLmijFGbfe9o 5wWOmj9M3Hjm+7GBu5deAJKnR4j8gciPxceE6ERHIGTxjPKI7aqGLdtHKtsV+xbYuZzp y4Lk1GzspOVRlaxzcC/AVxyiDbbgXdiFnfJNmPHtHmSVdqdmthHjKAq3ZyrO4JHhIVdF kd268UnJjzvVj2Fo0L+IdgrJFnsbBx2+oDVlD8nofOp7f5uY2bq5gR9Or9JfMx7qWW0L vrEclo2OlJnW97dKde4zMdCmen3IbfwTbIp9ZZ5Q6ya0HE6GJzotVxoLhnj7ftvyLk1g XLgA== X-Received: by 10.69.20.97 with SMTP id hb1mr1399810pbd.150.1406008823675; Mon, 21 Jul 2014 23:00:23 -0700 (PDT) Received: from cdac.hyderabad.cdac.in ([196.12.45.164]) by mx.google.com with ESMTPSA id lq6sm65626946pab.48.2014.07.21.23.00.21 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Jul 2014 23:00:23 -0700 (PDT) From: varkabhadram@gmail.com To: netdev@vger.kernel.org Cc: davem@davemloft.net, Varka Bhadram Subject: [PATCH net-next 2/2] ethernet: realtek: use pci_device_id Date: Tue, 22 Jul 2014 11:28:48 +0530 Message-Id: <1406008728-22604-3-git-send-email-varkabhadram@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1406008728-22604-1-git-send-email-varkabhadram@gmail.com> References: <1406008728-22604-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 9025fba..a2a2ac6 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[] = { @@ -2110,6 +2103,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,