From patchwork Mon Dec 16 01:15:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 3351291 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 43229C0D4A for ; Mon, 16 Dec 2013 01:15:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 78F672035E for ; Mon, 16 Dec 2013 01:15:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9ADD02034B for ; Mon, 16 Dec 2013 01:15:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751993Ab3LPBPb (ORCPT ); Sun, 15 Dec 2013 20:15:31 -0500 Received: from mail-ig0-f169.google.com ([209.85.213.169]:56556 "EHLO mail-ig0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751908Ab3LPBPa (ORCPT ); Sun, 15 Dec 2013 20:15:30 -0500 Received: by mail-ig0-f169.google.com with SMTP id hk11so2704003igb.0 for ; Sun, 15 Dec 2013 17:15:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:date:message-id:in-reply-to:references:user-agent :mime-version:content-type:content-transfer-encoding; bh=aTQwEGt86oNkb/wUQYl43TgngBt/bmKo7tYSNPNI41Y=; b=YqCbcthUkLf2tjQt/1MjD6bvnWNay8VgeD7hdlcnLDbGv/oJqSc5TD/hz9uxn02AHc PzoPxxMpl5EpVhaZkc5ML+gJ3t4/jL8fRKsTQReJLS6xk+w/NKgBULPqSspBLhmjvMuL DoKTgy8S8lUNM2HbQim1e4bRXstfAioaeuqds1Fox7aP5F4z1G3Jd7trEm6W83TNGXPS bWuoBCoIDfSDlBHDwijvqQbLyF99gTkJRwHHOkOIJnHsNL9NAbkgffbXa9RfkkPCO0bt H2NssMdZpc1nY9RK0/pA7thmXhc6s7bMXZ35GwK6PgsyPwAqG1prBCqHRca3MxFxQnEN +e9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=aTQwEGt86oNkb/wUQYl43TgngBt/bmKo7tYSNPNI41Y=; b=QgPMI+B33dOCq7r0hpCuWfwwuU52wyJtk8WEFCv5CdxGs611YE7NQV2lHONmTtH5QB /fHRev5cNWyu1XIxezyCGlRKQu22E97sXPNxpFw4iHDYLNZolRLpsL/bSP70SmKoN+UA QsfbgUTP/CHkdRDXe9he1nV7sLTIwA8Ant9+vm4qRZ0u4L5eQj9THjzG2HMcIgHxUJ5f kk4h9mRtUiHkRxCHZbtF2a6bRzXYpygZ+fidxsDX9N2LLa/zflBBSGeAYObfXcFbCbMy HStjdEg2bbK7t5fOrCKrsxmGZZZxBpw86NspdGctLrVLks8Cnnjaazmy9vQ9bS26KoaK OnPQ== X-Gm-Message-State: ALoCoQldjwyqMs5BpsOm54nXsxvOfJr4G0jJejjU2MkEk5xSTvKbeMIWqCtqz6IyqfrGG8TtAFSf7+pf0HYGJOAyCGYpOOi6VcDyWTF88qOAfctShA5Ov6GR6My3XWJ8BPPQsdUe5/f2dmCLJOEova+0C31FylTKh2jfOsjBqzrw8jfh0m0BQJnW+Chd0WX5FbK0c5FKszUvJI3b9XeseuoN2dc8+xqVaVmO8rx+rCgj6A+NK/qfzFg= X-Received: by 10.50.26.36 with SMTP id i4mr12399154igg.33.1387156530184; Sun, 15 Dec 2013 17:15:30 -0800 (PST) Received: from localhost (173-8-252-97-Colorado.hfc.comcastbusiness.net. [173.8.252.97]) by mx.google.com with ESMTPSA id da14sm13393532igc.1.2013.12.15.17.15.29 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 15 Dec 2013 17:15:29 -0800 (PST) Subject: [PATCH 5/8] PCI: pciehp: Simplify "Power Fault Detected" checking/clearing To: linux-pci@vger.kernel.org From: Bjorn Helgaas Date: Sun, 15 Dec 2013 18:15:29 -0700 Message-ID: <20131216011529.7275.23999.stgit@bhelgaas-glaptop.roam.corp.google.com> In-Reply-To: <20131216010946.7275.83547.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <20131216010946.7275.83547.stgit@bhelgaas-glaptop.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It's simpler to test the PCI_EXP_SLTSTA_PFD bit directly and to write the constant back to PCI_EXP_SLTSTA. No functional change. Signed-off-by: Bjorn Helgaas --- drivers/pci/hotplug/pciehp_hpc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index 55109d6d8a90..cb3100af7e8c 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -501,9 +501,9 @@ int pciehp_power_on_slot(struct slot * slot) /* Clear sticky power-fault bit from previous power failures */ pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, &slot_status); - slot_status &= PCI_EXP_SLTSTA_PFD; - if (slot_status) - pcie_capability_write_word(pdev, PCI_EXP_SLTSTA, slot_status); + if (slot_status & PCI_EXP_SLTSTA_PFD) + pcie_capability_write_word(pdev, PCI_EXP_SLTSTA, + PCI_EXP_SLTSTA_PFD); ctrl->power_fault_detected = 0; slot_cmd = POWER_ON;