From patchwork Tue Jan 7 00:56:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 3445011 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 95FB19F2E9 for ; Tue, 7 Jan 2014 00:57:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D29CB2017A for ; Tue, 7 Jan 2014 00:57:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1BCB22016D for ; Tue, 7 Jan 2014 00:57:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757906AbaAGA4m (ORCPT ); Mon, 6 Jan 2014 19:56:42 -0500 Received: from mail-ig0-f180.google.com ([209.85.213.180]:42976 "EHLO mail-ig0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757838AbaAGA4k (ORCPT ); Mon, 6 Jan 2014 19:56:40 -0500 Received: by mail-ig0-f180.google.com with SMTP id m12so278220iga.1 for ; Mon, 06 Jan 2014 16:56:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=7JG/+6rR2M5IQSnMWG8wEt/2htBsShpYchX0PDGDPTg=; b=iIRD8FZZH6EUXzEeC1pbPj37F9HOuaL0JE0uGnJ/2Z6CfuZ/PkWm8urWuzgBwILdaU /eUBgfV82X7IzGErxw36MIOPr2f6bqY9e5593qVjFBcF9PNcjaczKQFcEuXOU7geu7lL tibbPeZXIXQesjx7uWsPsNS897ijfpOj4h5TWfGnzNv+1ci09jzJiPFNyujGSqcVnN4a kBdPxlK/biwGGweW7X8h0R9D8qY0LjXgljUGXjRKtsPpVC0m00Z1pKpc3dZON8RH7U1O S/8zDjIVhkKdQ6TJIOxBbf5+pYzF6AjTpEcDqz2CqGapxTy5hPv1bdEwuNDRsrxpToyS bBdQ== 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:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=7JG/+6rR2M5IQSnMWG8wEt/2htBsShpYchX0PDGDPTg=; b=lGLEWcGZF0uE6dFhpgWL9vgOX35Jnr5ih+Lt6+sikRVTZjdhtW0Fmn8ziw7bu2Gm5m Y1yWo2NqBjXdktKpz4kBr/RfXlzGj/Frljs6CI2TOGsiZmKlNN5lv2/cQubM2ux0yxNM 3NPJep1J/HLzBaVFzY3m4XtpEJiqaX2Ekv2D51YZJPoonI+aBFCf7ulnH0hvv3ASZJJS jpVHVa838ph6rqawEfs9Y1E0N03xoDHm7TCQd3ZZ1UKArG5qc+0veugUSOjtnUwDIy6i 4o4Z81+xw5ElqZw4wfzpPdTv8pUDpzwi8ZDGvwSiU+/JkhuPx9211rE4PgE0IK1wNVTm /1Ow== X-Gm-Message-State: ALoCoQktJ6eyI7EszWDES7BwMKqpcbLFwF6dpLulsavtvcZxlkgFiUFH0hTyQhkV1odW86IvpJCcl41nfZwqUHJqWvnRfKuesEvlsRtI5NJHaB5w7xHv1FznQn64KglH+SR/YBM949jju2fIxNiJxhXGjm/bzFKC1ONoKigl0WTcihDXtekyYFAaDlAU92+jknzmM+UiWvLQg2VXetmKtVrqUbaS2ke2uFUh6bshpejAJ0mc5FPntWs= X-Received: by 10.50.29.114 with SMTP id j18mr22433024igh.24.1389056199664; Mon, 06 Jan 2014 16:56:39 -0800 (PST) Received: from localhost ([172.29.127.26]) by mx.google.com with ESMTPSA id j3sm889915igj.9.2014.01.06.16.56.38 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 06 Jan 2014 16:56:39 -0800 (PST) Subject: [PATCH v7 12/15] agp/ati: Use PCI_COMMAND instead of hard-coded 4 To: linux-pci@vger.kernel.org, Daniel Vetter From: Bjorn Helgaas Cc: David Airlie , Yinghai Lu , Guo Chao , linux-kernel@vger.kernel.org Date: Mon, 06 Jan 2014 17:56:38 -0700 Message-ID: <20140107005637.10786.2267.stgit@bhelgaas-glaptop.roam.corp.google.com> In-Reply-To: <20140107005003.10786.85164.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <20140107005003.10786.85164.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.1 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=ham 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 We're accessing the PCI_COMMAND register here, so use the appropriate #define. The bit we're writing (1 << 14) isn't defined by the PCI or PCIe spec, so we don't have a name for it. No functional change. Signed-off-by: Bjorn Helgaas --- drivers/char/agp/ati-agp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 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/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c index ba83c11186ce..18a7a6baa304 100644 --- a/drivers/char/agp/ati-agp.c +++ b/drivers/char/agp/ati-agp.c @@ -221,8 +221,8 @@ static int ati_configure(void) readl(ati_generic_private.registers+ATI_GART_FEATURE_ID); /* PCI Posting.*/ /* SIGNALED_SYSTEM_ERROR @ NB_STATUS */ - pci_read_config_dword(agp_bridge->dev, 4, &temp); - pci_write_config_dword(agp_bridge->dev, 4, temp | (1<<14)); + pci_read_config_dword(agp_bridge->dev, PCI_COMMAND, &temp); + pci_write_config_dword(agp_bridge->dev, PCI_COMMAND, temp | (1<<14)); /* Write out the address of the gatt table */ writel(agp_bridge->gatt_bus_addr, ati_generic_private.registers+ATI_GART_BASE);