From patchwork Mon May 20 23:19:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 245137 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 4F4332C018D for ; Tue, 21 May 2013 09:19:21 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757036Ab3ETXTU (ORCPT ); Mon, 20 May 2013 19:19:20 -0400 Received: from mail-ia0-f170.google.com ([209.85.210.170]:51528 "EHLO mail-ia0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756026Ab3ETXTS (ORCPT ); Mon, 20 May 2013 19:19:18 -0400 Received: by mail-ia0-f170.google.com with SMTP id l29so8248659iag.15 for ; Mon, 20 May 2013 16:19:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=al/V7LXDVoE+qOwL1YUg8u2Vzuw4aOevdX0cp12egPE=; b=nkZ9+3BsDFOG/ZX6Nx16jed/vWesHTOb219n879C4EeiAQ/vkEv7xp5N6YHSCWFXeM KaIStGktD3pygYpCV6UjUGYTmEAQeuynSnGpXgRB1e/9dWxpER38VAHFQjdvsa5OAq56 /7zu+xINJKRVqY2fDuFGflgrfmwf1onkc4IL0H9poG/dbYvXJw3kwjIkLwlrBsjb2WO2 jv+bWF80/CAjDq0nj8A4lTVUmSr/Gs1wpGYCGU3EM95Y+jXY1UzDhClKVg3BjnGSiE9X WRhkb1DNnOEvXFNnvGmNkO/JGKfNNpagdnLoKnVKjYGasJMohmzV2SdDUl0S8COYa96L vfHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding:x-gm-message-state; bh=al/V7LXDVoE+qOwL1YUg8u2Vzuw4aOevdX0cp12egPE=; b=YbOdxd5kY7RxWvQaNdwjdlaiGq9Wg4NyCv843dTvlkgtmAPP13cfnnGuti9+xrci1I XnTBZpm3YGxaAC4tJe5BG7upvORMucPnEPEdgdubSUII03vzpGdAXMciHzD5Yo84hEv2 RaXNmZkpSGVpZqOLf7uAQbC/xGQZbMw3H9l9l75zBu+w30JN7K7WWSl07PkAmD+O1lGn kkiYbuV5yLr3qe56i2aQp9rIdbBsVlXAuUfA6y2J7+R6rSFIJMrwIwn4jdWtqreu1S02 N6up+zll98yP/tQOjHqgFCKhB8gLaGkX6NUUYL5yYg37OZdQrCPP83bEvk+uDAn8pfWf osFQ== X-Received: by 10.50.23.41 with SMTP id j9mr6589020igf.59.1369091957948; Mon, 20 May 2013 16:19:17 -0700 (PDT) Received: from localhost ([172.29.122.152]) by mx.google.com with ESMTPSA id xc3sm13858208igb.10.2013.05.20.16.19.16 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 20 May 2013 16:19:17 -0700 (PDT) Subject: [PATCH 2/2] sparc/PCI: Use PCI_UNKNOWN for unknown power state To: Benjamin Herrenschmidt , Paul Mackerras , "David S. Miller" From: Bjorn Helgaas Cc: sparclinux@vger.kernel.org, "Rafael J. Wysocki" , linuxppc-dev@lists.ozlabs.org, linux-pci@vger.kernel.org Date: Mon, 20 May 2013 17:19:16 -0600 Message-ID: <20130520231916.32416.7318.stgit@bhelgaas-glaptop> In-Reply-To: <20130520231909.32416.81752.stgit@bhelgaas-glaptop> References: <20130520231909.32416.81752.stgit@bhelgaas-glaptop> User-Agent: StGit/0.16 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQnLMor9N0PNvHb0uqq5G6On2S2JPBpCnhFNl0I5gxk9EubxzulzPHCQ89VatkeIrlSqKzGAU1M/aOB2LutWQ558qmnYgO7mJgP47GEAvdsTqOMEtO0fi3N/s1PnTbiqZmJAn4DeX2CQL6n7xVArMx2hDqpxUaesKCE0nS3cvq8kU3uxoU3Vo8v0+kBxCpLd3P7G9L/iEJ67hvLTKNoykfWLHygzAw== Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Previously we initialized dev->current_state to 4 (PCI_D3cold), but I think we wanted PCI_UNKNOWN (5) here based on the comment and the fact that the generic version of this code, pci_setup_device(), uses PCI_UNKNOWN. Signed-off-by: Bjorn Helgaas Acked-by: David S. Miller --- arch/sparc/kernel/pci.c | 2 +- 1 file changed, 1 insertion(+), 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/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index baf4366..972892a 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c @@ -327,7 +327,7 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE) pci_set_master(dev); - dev->current_state = 4; /* unknown power state */ + dev->current_state = PCI_UNKNOWN; /* unknown power state */ dev->error_state = pci_channel_io_normal; dev->dma_mask = 0xffffffff;