From patchwork Mon Dec 16 01:15:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 301421 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 C32E92C009F for ; Mon, 16 Dec 2013 12:15:37 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752053Ab3LPBPh (ORCPT ); Sun, 15 Dec 2013 20:15:37 -0500 Received: from mail-ie0-f172.google.com ([209.85.223.172]:46887 "EHLO mail-ie0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751908Ab3LPBPg (ORCPT ); Sun, 15 Dec 2013 20:15:36 -0500 Received: by mail-ie0-f172.google.com with SMTP id qd12so5728346ieb.17 for ; Sun, 15 Dec 2013 17:15:36 -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=QUfgnZjsrbNUmB0RwU3FaeE3gJkOIVK56G6Eel6qla4=; b=YSKAH8htu/CxAN9oWId4+HHxbm+cHyhKIwORl81NhTh3eikjZWBhnsn5vQsehswPK2 FV+3mQBRB56U32pu0sHrVM+hLemxfdc9cqWqJB9oF/aF176mNQ+a+XbmdLYdGfKh7oGJ qAqBO3tMjwPHy600kUcD3hMaTJe+NNmYyn2jFa/2C2ZbY+ysXogIUUw1gjSbeRXMJkKZ NSirQ63wIFZ2a2umwP2dPhYuEpecvM8lviJpmKn58V2qbuTEfnRf36Lg6Zt3Z3GuGCBG nVqRUKxzd85FocVUSFYH6ge1s4DeLwmdduSsVOZpLVRd8/+USR0k038DBeU1lZ0WGdRn 6p+A== 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=QUfgnZjsrbNUmB0RwU3FaeE3gJkOIVK56G6Eel6qla4=; b=JlSlxhOzH9F/qHxiDOIr+MMsSsW9TDKVhLXttglV93m3c7KUjjFeo0f+uvXgN26jWw 3UKDMEMEbDd33vOzLd28sbkukeOGv+c9tdsK/mvrfJg2CvIl+jtcS/XG2djt3Ml/ylFf c1Jw44UdKx2c55xRJrXRCdLTo4i/WX/mRoKlvmoaqO+eONz3VyXu96iHfqAN+SzwqrcO BF2WyeKh7Doc+bJ8/ColQFwG1Kp35a5s3v3YhvmDSY/hGDqWZSEn71sWbhAAszebo/cb aAx0G94a0l0tntSS3clwP7nt5ZPTJgCHrScLqsGNpoeu1yhOb32YCIUXlXXUtyh3XZ6u GSJA== X-Gm-Message-State: ALoCoQkWIGiNK9lhBEsjEzD6IReFVw/t4pVM7npoQzUYzdYw7SmMocRmEIDUhsiF+wvAt54s6x2GwsxSKJirtW0ZiMSV0GayrW0O8bDOOxtVihdajGTpT8Cj6cPHzDs2XCNftkZlywFGe5MDVFqTCBkWxygZgvUKFmPLPLkj6k97V0q/O/+vTKxg4Oh1hqsvJ0/vcrSkWCweBufB3zHFMlhXMSi3kGnuftXW1ruHebqDQ2Ugd1QK90E= X-Received: by 10.50.82.41 with SMTP id f9mr12431110igy.26.1387156536341; Sun, 15 Dec 2013 17:15:36 -0800 (PST) Received: from localhost (173-8-252-97-Colorado.hfc.comcastbusiness.net. [173.8.252.97]) by mx.google.com with ESMTPSA id y10sm13382914igl.4.2013.12.15.17.15.35 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 15 Dec 2013 17:15:36 -0800 (PST) Subject: [PATCH 6/8] PCI: pciehp: Use symbolic constants, not hard-coded bitmask To: linux-pci@vger.kernel.org From: Bjorn Helgaas Date: Sun, 15 Dec 2013 18:15:35 -0700 Message-ID: <20131216011535.7275.77761.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 Use the PCI_EXP_SLTSTA definitions, not 0x1f, when clearing Slot Status bits. No functional change. Signed-off-by: Bjorn Helgaas --- drivers/pci/hotplug/pciehp_hpc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 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 cb3100af7e8c..915bb35f9180 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -808,7 +808,10 @@ struct controller *pcie_init(struct pcie_device *dev) } /* Clear all remaining event bits in Slot Status register */ - pcie_capability_write_word(pdev, PCI_EXP_SLTSTA, 0x1f); + pcie_capability_write_word(pdev, PCI_EXP_SLTSTA, + PCI_EXP_SLTSTA_ABP | PCI_EXP_SLTSTA_PFD | + PCI_EXP_SLTSTA_MRLSC | PCI_EXP_SLTSTA_PDC | + PCI_EXP_SLTSTA_CC); /* Disable software notification */ pcie_disable_notification(ctrl);