From patchwork Tue Jul 10 15:54:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 170234 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 986A32C0344 for ; Wed, 11 Jul 2012 01:58:38 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755929Ab2GJPzQ (ORCPT ); Tue, 10 Jul 2012 11:55:16 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:43454 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752464Ab2GJPzL (ORCPT ); Tue, 10 Jul 2012 11:55:11 -0400 Received: by mail-pb0-f46.google.com with SMTP id rp8so456687pbb.19 for ; Tue, 10 Jul 2012 08:55:11 -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 :in-reply-to:references; bh=VRWMBmTuBnQjPNxqXr8cGze/2ikGKS7Co6oBLaiRIsA=; b=LHSKhzTYZSnuOs6gylY97qnTTI/Nntj0lpy4O2PQFfW/v545Kig00yAlwgtccfD12c zaDDPgBvrCo+I7ZO7W/q8E5iM9RBD5YTBLevvKKToAR/XYiuBcp9aZF37+1UZNCo9xUz tKzOkTun+t40ASYOL4Fw8QzUKhsCCxA48RsL8lXV14QLkAsVzzUmqX8bmFeliW+tDx9e 3J8zgfJar5Y1Rwc1+4tCI/PYVEexGSLaLEHFlO18q5GBfdBpzR3L+UFP29V4hg1HGUhy u0tDLtHSZ7GAFsRsYfY7/4vKVmgcu9fbTAy2XVACeE9gKj6gPppuYY7iMITpHDp1Rfx1 cREw== Received: by 10.68.221.227 with SMTP id qh3mr69953695pbc.115.1341935711534; Tue, 10 Jul 2012 08:55:11 -0700 (PDT) Received: from localhost.localdomain ([221.221.21.23]) by mx.google.com with ESMTPS id oq4sm3056662pbb.21.2012.07.10.08.55.01 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 10 Jul 2012 08:55:09 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , Don Dutile Cc: Jiang Liu , Yinghai Lu , Taku Izumi , "Rafael J . Wysocki" , Kenji Kaneshige , Yijing Wang , Keping Chen , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Jiang Liu Subject: [RFC PATCH 03/14] PCI: remove unused field pcie_type from struct pci_dev Date: Tue, 10 Jul 2012 23:54:04 +0800 Message-Id: <1341935655-5381-4-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1341935655-5381-1-git-send-email-jiang.liu@huawei.com> References: <1341935655-5381-1-git-send-email-jiang.liu@huawei.com> In-Reply-To: References: Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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 3d958e6..446933d 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 = 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 fc2034d..1837354 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 */