From patchwork Tue Jul 24 16:31:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 1232421 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 264F13FD4F for ; Tue, 24 Jul 2012 16:39:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755870Ab2GXQds (ORCPT ); Tue, 24 Jul 2012 12:33:48 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:59998 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755075Ab2GXQdq (ORCPT ); Tue, 24 Jul 2012 12:33:46 -0400 Received: by mail-pb0-f46.google.com with SMTP id rp8so12913946pbb.19 for ; Tue, 24 Jul 2012 09:33:46 -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:x-mailer:in-reply-to:references; bh=0oj7ubeHzvZEt4WQuj2IP7Yclek9PnLFuSmOAj4pwg8=; b=bTdA+KtB0gG55MACFgGuyg94ojXF5IJqi1QUeoUP8j2CjF7a+R6lbxYyaMRUWkSTyh HXfvi4eEk3THlCDNsE/iM45QSzZ0m/DSMEVfoiAmVMZrVEo2oqi1z/6Kj7Gh6hi37ZKN mF5joSUHAfC0PYxc6kIpqWYMNuGj8BWxaAGK6syX83ZvW4Z74oPVDRIlmklLWVXS3dAL CAOYTVQTpjJuc9TrqJ8W0HDB5hrbdh4qc0AN+nGfv/RXmXRC+6aQULXo2pBoJk3JfbnO 2ewLJW76K7dJIY+wzZ0043VRhYFYZRQCc2PWWCn0uA75iF2vHEZIZyufK8oToY8UIeq+ 7ELg== Received: by 10.68.192.40 with SMTP id hd8mr29536148pbc.125.1343147626653; Tue, 24 Jul 2012 09:33:46 -0700 (PDT) Received: from localhost.localdomain ([221.221.26.244]) by mx.google.com with ESMTPS id wi6sm12457583pbc.35.2012.07.24.09.33.38 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 Jul 2012 09:33:45 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , Don Dutile Cc: Yijing Wang , Yinghai Lu , Taku Izumi , "Rafael J . Wysocki" , Kenji Kaneshige , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Jiang Liu Subject: [RFC PATCH v2 03/32] PCI: remove unused field pcie_type from struct pci_dev Date: Wed, 25 Jul 2012 00:31:15 +0800 Message-Id: <1343147504-25891-4-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343147504-25891-1-git-send-email-jiang.liu@huawei.com> References: <1343147504-25891-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Yijing Wang From: Yijing Wang With introduction of pci_pcie_type(), pci_dev->pcie_type field becomes redundant, so remove it. Signed-off-by: Yijing Wang Signed-off-by: Jiang Liu --- drivers/pci/probe.c | 1 - include/linux/pci.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 00c7bab..8bcc985 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -930,7 +930,6 @@ void set_pcie_port_type(struct pci_dev *pdev) pdev->pcie_cap = pos; pci_read_config_word(pdev, pos + PCI_EXP_FLAGS, ®16); pdev->pcie_flags_reg = reg16; - pdev->pcie_type = (reg16 & PCI_EXP_FLAGS_TYPE) >> 4; pci_read_config_word(pdev, pos + PCI_EXP_DEVCAP, ®16); pdev->pcie_mpss = reg16 & PCI_EXP_DEVCAP_PAYLOAD; } diff --git a/include/linux/pci.h b/include/linux/pci.h index 95662b2..9807da5 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -254,7 +254,6 @@ struct pci_dev { u8 revision; /* PCI revision, low byte of class word */ u8 hdr_type; /* PCI header type (`multi' flag masked out) */ u8 pcie_cap; /* PCI-E capability offset */ - u8 pcie_type:4; /* PCI-E device/port type */ u8 pcie_mpss:3; /* PCI-E Max Payload Size Supported */ u8 rom_base_reg; /* which config register controls the ROM */ u8 pin; /* which interrupt pin this device uses */