From patchwork Mon Aug 24 08:29:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 248180 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:522:0:0:0:0 with SMTP id h2csp2398750ils; Mon, 24 Aug 2020 02:49:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxI3p56KeWKTlnhKIKp5Lb2onx+pklKg8LFhxzZi4Jt1jdyUZxlA5M6fuvah1tpDHcwkbu9 X-Received: by 2002:aa7:dc44:: with SMTP id g4mr4595327edu.273.1598262550458; Mon, 24 Aug 2020 02:49:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598262550; cv=none; d=google.com; s=arc-20160816; b=BTuhrkXBvaZH3tbhdKm6HPQcan5RQ4+2M7V60iKAspDXRJcp+0Hq98kE8hGdmxrgxf ixg2K/nwz5Q2dG5eVzO+CeoB5Z9gGor1bck1dUaxX3CkwBpNQ1Irm5VtgI9nqaxHr1D3 rhsm50+NimWfKp4hFt2ldQlb6ucKViEsGWu01kXyw0nPOS0jz9JnuZcwV4ZxUqivw96v 7R8aSpPmUXwL9UfwgyuOGKjb3UZTJpJXF9baO24ZuQi7CsofkhdHzZhp2IRzzl9JHZ3u UfmvdHhQZBqccwSvmWnGmYvIMFkEq0IMsxIcB/SsXco6xgnm8tGALly+ZXiMHoH3MQ4X 39cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9XrAzwRmn3itSfGsaFOH5ReT+ClgoHkY6R4hzK3t+Ok=; b=krUZNvYM6pZwQ3yR8YreRhYj9hQn6eA7R8bd+w/OdZQUBRdzAbshMcHwasWT9WBG1M QthZ3droHEC0R29XoPrggJLqz4Vq1cO7Y9oxxDjx1hjOo3blSlvxRR/Bi36RU5hPps1Q z4y1Bzg7PtGWA2ZipxpzCq9RbZxWyFoVPesafpKDHyrEOGgPdPyEzpKsgxWwEpBw9up3 Yl/7Qdbi/pKeAdarYQ1edGZF4ZCDVmcr/wzZCOXlYOYBn++gnVOzbrd27HJs5QawzKEH ol+I73sEylboSSjvXYQjAZNX2Yax+6r3oJDK7767IYva2NF+ASd5Aa5bZrsPEn2pp+p8 DIcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fe7TPdhX; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r7si6441894edw.560.2020.08.24.02.49.10; Mon, 24 Aug 2020 02:49:10 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fe7TPdhX; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728686AbgHXIkV (ORCPT + 15 others); Mon, 24 Aug 2020 04:40:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:57112 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726645AbgHXIkU (ORCPT ); Mon, 24 Aug 2020 04:40:20 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 62D4D22B49; Mon, 24 Aug 2020 08:40:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598258419; bh=8ZfPDjBednZIPM4jhBpxyi85ckrUlCtixwY+7Murw8M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fe7TPdhXQH7uOIMjXKaUnWJ1zVckJvCA09eV3tuBNu+py6EA541Krb3IkwgrtYTZP vc16egeTbjA1WpSARULDs2uhBJFJcOX3JGmgrHLQqs6Wb2+20tN+AhHMj7uX+urRzI U/oLANdnRw3opUWaBrEZvdqDr7WJfbmdrNBNfvcs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marek Szyprowski , =?utf-8?q?Cl=C3=A9ment_P?= =?utf-8?b?w6lyb24=?= , Viresh Kumar , Sasha Levin Subject: [PATCH 5.7 033/124] opp: Reorder the code for !target_freq case Date: Mon, 24 Aug 2020 10:29:27 +0200 Message-Id: <20200824082411.048028270@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200824082409.368269240@linuxfoundation.org> References: <20200824082409.368269240@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Viresh Kumar [ Upstream commit b23dfa3543f31fbb8c0098925bf90fc23193d17a ] Reorder the code a bit to make it more readable. Add additional comment as well. Tested-by: Marek Szyprowski Acked-by: Clément Péron Tested-by: Clément Péron Signed-off-by: Viresh Kumar Signed-off-by: Sasha Levin --- drivers/opp/core.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) -- 2.25.1 diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 195fcaff18448..2d3880b3d6ee0 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -817,15 +817,21 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) } if (unlikely(!target_freq)) { - if (opp_table->required_opp_tables) { - ret = _set_required_opps(dev, opp_table, NULL); - } else if (!_get_opp_count(opp_table)) { + /* + * Some drivers need to support cases where some platforms may + * have OPP table for the device, while others don't and + * opp_set_rate() just needs to behave like clk_set_rate(). + */ + if (!_get_opp_count(opp_table)) return 0; - } else { + + if (!opp_table->required_opp_tables) { dev_err(dev, "target frequency can't be 0\n"); ret = -EINVAL; + goto put_opp_table; } + ret = _set_required_opps(dev, opp_table, NULL); goto put_opp_table; }