From patchwork Wed Aug 1 15:54:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 174508 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 50AEE2C0088 for ; Thu, 2 Aug 2012 02:04:20 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755598Ab2HAP4O (ORCPT ); Wed, 1 Aug 2012 11:56:14 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:48542 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751660Ab2HAP4N (ORCPT ); Wed, 1 Aug 2012 11:56:13 -0400 Received: by yenl2 with SMTP id l2so7447897yen.19 for ; Wed, 01 Aug 2012 08:56:12 -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=+p9LCUem4JmtipRL1N0FsEXFxjulCBncH+gqjIASCBw=; b=mYJSoyXn4eUAuNg+oARSGUmCEgvAO/3QojhBtuFasCqB1eOnakNSubZe9F+RLIxXDo DDXb4oGslvT3/DCRBzJsjpO81enXtA6QfaibGOLQ9V85yiKZ3yIFhWhHWjRDYElsuSFg QVy15Hb7EFWZy/POPzZILik8X9gCoajFv7n26V3KMujwTzxkcFOkOA4cifmcPnSy5QJm uVh6HFjF/w/IyUOhUoS3EkTVVkXKsrJQojeoVnBqdCo5zAr87ko/vVKnH5jXCiL1a0gB oqO+6CZkCwt3o1TdJeSsqCELXUQnQKzR8d+X5j9bJJZLy3k6b3n1FKhHokZkD7j5n17J wjEA== Received: by 10.66.73.133 with SMTP id l5mr40671925pav.74.1343836572553; Wed, 01 Aug 2012 08:56:12 -0700 (PDT) Received: from localhost.localdomain ([58.250.81.2]) by mx.google.com with ESMTPS id pe8sm2816231pbc.76.2012.08.01.08.56.04 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 01 Aug 2012 08:56:11 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , Don Dutile Cc: Jiang Liu , Yinghai Lu , Taku Izumi , "Rafael J . Wysocki" , Kenji Kaneshige , Yijing Wang , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Jiang Liu Subject: [PATCH v3 06/32] PCI/hotplug: use PCIe capabilities access functions to simplify implementation Date: Wed, 1 Aug 2012 23:54:11 +0800 Message-Id: <1343836477-7287-7-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: Jiang Liu Use PCIe capabilities access functions to simplify cpihp_slot.c. Signed-off-by: Jiang Liu Reviewed-by: Kenji Kaneshige --- drivers/pci/hotplug/pcihp_slot.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/pci/hotplug/pcihp_slot.c b/drivers/pci/hotplug/pcihp_slot.c index 8c05a18..649dcc8 100644 --- a/drivers/pci/hotplug/pcihp_slot.c +++ b/drivers/pci/hotplug/pcihp_slot.c @@ -96,17 +96,11 @@ static void program_hpp_type1(struct pci_dev *dev, struct hpp_type1 *hpp) static void program_hpp_type2(struct pci_dev *dev, struct hpp_type2 *hpp) { int pos; - u16 reg16; u32 reg32; if (!hpp) return; - /* Find PCI Express capability */ - pos = pci_pcie_cap(dev); - if (!pos) - return; - if (hpp->revision > 1) { dev_warn(&dev->dev, "PCIe settings rev %d not supported\n", hpp->revision); @@ -114,17 +108,13 @@ static void program_hpp_type2(struct pci_dev *dev, struct hpp_type2 *hpp) } /* Initialize Device Control Register */ - pci_read_config_word(dev, pos + PCI_EXP_DEVCTL, ®16); - reg16 = (reg16 & hpp->pci_exp_devctl_and) | hpp->pci_exp_devctl_or; - pci_write_config_word(dev, pos + PCI_EXP_DEVCTL, reg16); + pci_pcie_capability_change_word(dev, PCI_EXP_DEVCTL, + hpp->pci_exp_devctl_or, ~hpp->pci_exp_devctl_and); /* Initialize Link Control Register */ - if (dev->subordinate) { - pci_read_config_word(dev, pos + PCI_EXP_LNKCTL, ®16); - reg16 = (reg16 & hpp->pci_exp_lnkctl_and) - | hpp->pci_exp_lnkctl_or; - pci_write_config_word(dev, pos + PCI_EXP_LNKCTL, reg16); - } + if (dev->subordinate) + pci_pcie_capability_change_word(dev, PCI_EXP_LNKCTL, + hpp->pci_exp_lnkctl_or, ~hpp->pci_exp_lnkctl_and); /* Find Advanced Error Reporting Enhanced Capability */ pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);