From patchwork Wed Feb 22 11:06:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 60466 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp511984wrd; Wed, 22 Feb 2023 03:12:47 -0800 (PST) X-Google-Smtp-Source: AK7set9h4q+sf5k2BiyxCc2BlEExstFw1KVZuKczEb9JNHCge5oppfVJKgYcEQb0E8UjmAfWwgeW X-Received: by 2002:a05:6a00:9b:b0:5a8:a263:7f4d with SMTP id c27-20020a056a00009b00b005a8a2637f4dmr6589738pfj.15.1677064366951; Wed, 22 Feb 2023 03:12:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677064366; cv=none; d=google.com; s=arc-20160816; b=lKS8B6suY5La35YG23wG6swnS9umdhddHTNdoVFdOtLZxEYkfzW2oHRMMU47p3Fasl qumVexeowFvkYm/GW4lrjzr3LjIN+fWaygrR/CkbJZLlPpnlB9UcZgQQj7W+Y3MCJpy/ wxMvQZEM/o6sbRkJyahGsV1vCumj6ziX/B3LGqf30tWpyaXA4qwlqtrZoWPu5FpNWN3e lrPXC3YUeppo8q5Rr02TnZdJo4Nx8vyaqMeZM9kO4BABKOBlAtfV9XBrJHeZPIEv2t7n e5zwrtQYx4KBk2FH82ULg9ukxphI4ZK6DoJiNZB+CAMUZAQGGNmADtecjlbVDaK/LmR2 36Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pKF4g3sJY4F36hMtcM0eHUIlxzL76BJwo9OlrmTuaXo=; b=L7lHbMKdGQ0tV9wuGOZtp4xPbM6yLl3T2D35bUijl0pALoO4/KlMCK8DLBwG12A9uW nD6kl5GDc0vQ/5tpoRQqAtoXnUAWEKCzbw5Jdn6LtJuIyRI5kmb6Sps9NtxN5QvMHX5Q XF5TJPAXS05CC2R9ORLClbr32mQ5PulbFns5GWuutXE0jsT4bq0oEvMVYSz8eCAQG9mV fWPiGM0WpbNW0NbZJth7tpTL3LQnsHZya1w2z54z4h31xql8KJKmjLMtNlc2rIRtDo+G Xmdu2YTos94Bx2OskL2urITu9cd3LzntSL3oINqyhi+5M8djB22tJ0P/WwAn2qnsCPsU pL5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r1QtHTdm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o12-20020aa7978c000000b0058bb0834688si7879479pfp.157.2023.02.22.03.12.34; Wed, 22 Feb 2023 03:12:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r1QtHTdm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231654AbjBVLHB (ORCPT + 99 others); Wed, 22 Feb 2023 06:07:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231386AbjBVLG5 (ORCPT ); Wed, 22 Feb 2023 06:06:57 -0500 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D648C38E8E for ; Wed, 22 Feb 2023 03:06:55 -0800 (PST) Received: by mail-pl1-x62a.google.com with SMTP id z2so8481227plf.12 for ; Wed, 22 Feb 2023 03:06:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pKF4g3sJY4F36hMtcM0eHUIlxzL76BJwo9OlrmTuaXo=; b=r1QtHTdmuiRplIZ5BlnOJSnSr9AfM12vU5yV8seTDhtwDfAwQVVrchPoLYEtimSeSO fZcOjLk2nkQ4BNkACOsmfYIXAurwqq1Wcp1/8R447NRr9t/UwAwiK4ReoOoKg8fMz61B NzblmUIez8fpvNadarTg5ogp8sv3C6SBBsUiAuHC/3V6DbSw/L42g5bneQ4b2MtrHTsv sTs7V9J11iejVjby1kcY+SPupy/b+vy3wM6W0mLZe9sgFJr2hD26X8aWk4K8YILU4Qns DluNjWyWME9jDCYpOFtKWAImOytgUD1JN11Vdpbiw72JWSd1Bj/xkYth2KyB6VcR8mrk up7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pKF4g3sJY4F36hMtcM0eHUIlxzL76BJwo9OlrmTuaXo=; b=NWdurBxGwlIVJxEg4o5xg7tYMOTfEpNN8XU8YokIu49/iH4bS1kXyMCqrtdclZTQnj SZP1G3nwE/+CFM57MqUxAEuHrGrM/iE8jAhnF3r2/RTdXCNptKCXL6BgIJRgScpIBLPC aK2kY/8QOitHTh2AfWDamCPPQL9qyPc8D8dZsjueuXOiUkaZCJ6NkPQKXag46KuxJfcd tr9sBJ2Usi2P81cXO1SN+FMhUUMloeqhEyAC/kydBQD5MNB4N8Va1RruxiN5+GH2mkwG dTt+uLeVcj7McZYbuJ2CXr+h8A9fnrUihzzXEY1F2RlV4YjZSgLi7WAoMjWtOBneykDX 8YIg== X-Gm-Message-State: AO0yUKV/6IBVMIVwUI8397Xk0zktF4kOLJy+8XklzQEAOcSGljPsK8ru tG8u3rXqSv6J77qdgTbskKtrIw== X-Received: by 2002:a17:902:cf48:b0:19a:80c2:4396 with SMTP id e8-20020a170902cf4800b0019a80c24396mr8138522plg.68.1677064015575; Wed, 22 Feb 2023 03:06:55 -0800 (PST) Received: from localhost ([122.172.83.155]) by smtp.gmail.com with ESMTPSA id 12-20020a170902c14c00b001949f21e1d2sm4579999plj.308.2023.02.22.03.06.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 03:06:55 -0800 (PST) From: Viresh Kumar To: Jun Nie , Viresh Kumar , Nishanth Menon , Stephen Boyd Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , "Rafael J. Wysocki" , Manivannan Sadhasivam , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] OPP: Handle all genpd cases together in _set_required_opps() Date: Wed, 22 Feb 2023 16:36:37 +0530 Message-Id: <8f9fba47f91ef04fa2cf0c3adba9299a23d5280a.1677063656.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.31.1.272.g89b43f80a514 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758529445322245293?= X-GMAIL-MSGID: =?utf-8?q?1758529445322245293?= There is no real need of keeping separate code for single genpd case, it can be made to work with a simple change. Signed-off-by: Viresh Kumar Reviewed-by: Ulf Hansson --- drivers/opp/core.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/opp/core.c b/drivers/opp/core.c index e87567dbe99f..6d7016ce8c53 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -959,7 +959,8 @@ static int _set_required_opps(struct device *dev, struct dev_pm_opp *opp, bool up) { struct opp_table **required_opp_tables = opp_table->required_opp_tables; - struct device **genpd_virt_devs = opp_table->genpd_virt_devs; + struct device **genpd_virt_devs = + opp_table->genpd_virt_devs ? opp_table->genpd_virt_devs : &dev; int i, ret = 0; if (!required_opp_tables) @@ -979,12 +980,6 @@ static int _set_required_opps(struct device *dev, return -ENOENT; } - /* Single genpd case */ - if (!genpd_virt_devs) - return _set_required_opp(dev, dev, opp, 0); - - /* Multiple genpd case */ - /* * Acquire genpd_virt_dev_lock to make sure we don't use a genpd_dev * after it is freed from another thread.