From patchwork Tue Jul 22 07:20:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varka Bhadram X-Patchwork-Id: 372373 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 0F2B914010B for ; Tue, 22 Jul 2014 17:22:19 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752800AbaGVHWM (ORCPT ); Tue, 22 Jul 2014 03:22:12 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:51390 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750743AbaGVHWJ (ORCPT ); Tue, 22 Jul 2014 03:22:09 -0400 Received: by mail-pa0-f41.google.com with SMTP id rd3so10966779pab.0 for ; Tue, 22 Jul 2014 00:22:09 -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=U51M7DHfNG9ffPu/pSl80JCamDSEDiEvgKO+uH5FMS4=; b=u1UsFLXBGzpwZYwXF5dKSZ3I0Bk9hYrlpxAnaV+EIQntb/sSgTiDOD/Bo9TDOslF4B ddel0Xulu0ncvvOZYlkwnEJ+ImcgYnX8CU5qAiqh3spzm4k9+Hdmwa1p50TtJ6XtWPAi u+j49Hg6nKVXj1zmbIjLL0z6NGswlOj3IdsjSHT6KrBLuo6qNAyzEfK1RcoU+OyUup1i k6pzvhlZ1wuBquwQ3NWp3LCzcz9wJGzKg2ipvFT/UrVEPiKScaTYGKHf2Q4o2GZ3+v16 dYnAkIoYn795UCyu0BEfX2Cz8LiYkydp6OtCAd1i5smqljW/E0earri7efzQp2lahaLh r80A== X-Received: by 10.66.249.71 with SMTP id ys7mr15120361pac.112.1406013729197; Tue, 22 Jul 2014 00:22:09 -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.06 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Jul 2014 00:22:08 -0700 (PDT) From: varkabhadram@gmail.com To: netdev@vger.kernel.org Cc: davem@davemloft.net, Varka Bhadram Subject: [PATCH net-next v2 2/2] ethernet: realtek: use pci_device_id Date: Tue, 22 Jul 2014 12:50:22 +0530 Message-Id: <1406013622-27869-3-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 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 9fb68b9..6873122 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,