From patchwork Wed Aug 1 15:54:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 1265351 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 9A62EDF215 for ; Wed, 1 Aug 2012 16:04:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755676Ab2HAPzs (ORCPT ); Wed, 1 Aug 2012 11:55:48 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:53585 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755781Ab2HAPzp (ORCPT ); Wed, 1 Aug 2012 11:55:45 -0400 Received: by mail-pb0-f46.google.com with SMTP id rp8so1282604pbb.19 for ; Wed, 01 Aug 2012 08:55:45 -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=owq3GLteURsHMFx+J+e/iB9utXzD4ipHokEGLnVYN50=; b=ZvZc5MeQREj0jOjZ3sSCXmm4mujI84OmslvCDWM/JhKb1TbYIs+ql9ju5vNl/fSjJy /rZ6bOjDCDVrC/acJmhzfrzc7pzHvu/XrsQv2kbWTd9ec9KfUDVq0Qc+ohyXL9hTb6lV GL7x2rDXdhUJ45P3uvQGp80RljyDvOH+TQd+xN7YLgNaGk0iQwsUTukGXNnHuQpNgpMR TeMVK561LiQj5tG84yR6vpCX8oWAWzjfRfgUnavQocrVEBfGSiEim9QfQ7AWF3QkvkBF undvKXcAAObj/71CQaiiVYpW6i9KKjd4jRSQaJH8etRdNZ2qZf3CINEo2Y0R+P+FRwqd w79Q== Received: by 10.68.241.35 with SMTP id wf3mr52760956pbc.102.1343836545540; Wed, 01 Aug 2012 08:55:45 -0700 (PDT) Received: from localhost.localdomain ([58.250.81.2]) by mx.google.com with ESMTPS id pe8sm2816231pbc.76.2012.08.01.08.55.36 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 01 Aug 2012 08:55:43 -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: [PATCH v3 03/32] PCI: remove unused field pcie_type from struct pci_dev Date: Wed, 1 Aug 2012 23:54:08 +0800 Message-Id: <1343836477-7287-4-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343836477-7287-1-git-send-email-jiang.liu@huawei.com> References: <1343836477-7287-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 1d52a43..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 = pci_pcie_type(pdev); 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 */