From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2792CC5DF62 for ; Tue, 5 Nov 2019 16:15:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E90E221882 for ; Tue, 5 Nov 2019 16:15:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572970515; bh=xRGY58lp9PQsCKLD1X18lIko3kx92Dak6+o3gcsRNX8=; h=References:In-Reply-To:From:Date:Subject:To:Cc:List-ID:From; b=bJq+yotQnu3+LEKx+vvDDeg4aJn3fECo59LCD1z7VwE+6SlHBGHnLVwpBwUvmwC4f XxSpampK8Vs/q0IpDuuRXV9TzeD89FDjtWFIRERQ7Q6XXxBV+KdoIy/UQyptU4wGgG 6R5njQBlrTkLUkcBD39PK3cUwooKIb+NUsuIy4A0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390128AbfKEQPO (ORCPT ); Tue, 5 Nov 2019 11:15:14 -0500 Received: from mail-ot1-f65.google.com ([209.85.210.65]:33317 "EHLO mail-ot1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390096AbfKEQPN (ORCPT ); Tue, 5 Nov 2019 11:15:13 -0500 Received: by mail-ot1-f65.google.com with SMTP id u13so18135641ote.0; Tue, 05 Nov 2019 08:15:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ZT4en3y5QgVMI33vOLDv0psnHaObzkIn5HyOngHG/js=; b=ouyYXgW0jAZ+w+GC+edAT/Y/kTMiX8B3uANXn3hmFczhKezYkKk1td11RLnBg3WK8T Hueu/SPlvr/2B95A9yIGW1E3tGNg4bYoTz4zmCDTcl1oY/AVQZPQmgMWkyNwB8OfoPWV IdwbJSRl9veKpgtU2EvsAikkqqPqEJtNhRu52Eof1P6D5zWj9w9WcCtnCO/ApzKRkOnD NhctdXW4XI6M1tFol2sBxXaf5lnFqMpkir9TiyjX5PidpFiAysHj0v7Gzr0b2AEbjis0 G0WSP1LllxbIVHIkd5UtJa1RhesXM0Qg15KjATdrboEFpK7psIzIV7+aNiIULFqh9lnW AgoQ== X-Gm-Message-State: APjAAAWoCP1nF9LNMk9UgbaQT8RBlu3hNPuIjoHNTYTyrNJ0ohOqp2EO 44SFqzG/P4J5NDO8Nb1x/2JEkDlaXglw314UEKc= X-Google-Smtp-Source: APXvYqxPByCUHFEGufCUJNmU7TyKG4nMDGVEUpuw3GX3YTjqrQQnhSLG7mBe9+fFh64RFCNxxpPec86rL+o++PouL0s= X-Received: by 2002:a9d:5907:: with SMTP id t7mr12462593oth.118.1572970512569; Tue, 05 Nov 2019 08:15:12 -0800 (PST) MIME-Version: 1.0 References: <2771503.n70vfTtcVb@kreacher> <1769241.yKxyosiRnQ@kreacher> <20191105160943.GA19190@infradead.org> In-Reply-To: <20191105160943.GA19190@infradead.org> From: "Rafael J. Wysocki" Date: Tue, 5 Nov 2019 17:15:01 +0100 Message-ID: Subject: Re: [PATCH 5/5] PCI: PM: Fold __pci_complete_power_transition() into its caller To: Christoph Hellwig Cc: "Rafael J. Wysocki" , Bjorn Helgaas , LKML , Linux PCI , Linux PM , Mika Westerberg Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Nov 5, 2019 at 5:09 PM Christoph Hellwig wrote: > > On Tue, Nov 05, 2019 at 11:32:02AM +0100, Rafael J. Wysocki wrote: > > if (state > PCI_D3cold) > > @@ -1132,10 +1112,12 @@ int pci_set_power_state(struct pci_dev * > > error = pci_raw_set_power_state(dev, state > PCI_D3hot ? > > PCI_D3hot : state); > > > > - if (!__pci_complete_power_transition(dev, state)) > > - error = 0; > > + ret = pci_platform_power_transition(dev, state); > > + /* Powering off a bridge may power off the whole hierarchy */ > > + if (!ret && state == PCI_D3cold) > > + pci_bus_set_current_state(dev->subordinate, PCI_D3cold); > > > > - return error; > > + return ret ? error : 0; > > Total nitpick, but why not: > > if (pci_platform_power_transition(dev, state)) > return error; > > /* Powering off a bridge may power off the whole hierarchy */ > if (state == PCI_D3cold) > pci_bus_set_current_state(dev->subordinate, PCI_D3cold); > return 0; Yes, that looks better, thanks! I'll send an update of this patch.