From patchwork Tue Jul 14 18:43:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 235544 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3990803ilg; Tue, 14 Jul 2020 11:55:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQZPb9auOZr0iqJpz66/YWkPwBG5ha5TmBsJu+b9mTfVrOGIKV8oZKQBgpmQ+3M+KSS8Gj X-Received: by 2002:a50:9b5d:: with SMTP id a29mr5953674edj.68.1594752930014; Tue, 14 Jul 2020 11:55:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594752930; cv=none; d=google.com; s=arc-20160816; b=RjcswTuhFXsherPf6ylPWqFTFAyo5HCICx/RT8xUwYaWwjXsKQ9CUqVdxFE5MJitt4 OLS9wvBZL7wl0o/HQWtpAg3Ieuh56V5l3+vtQ9cuwEfXk0uC8gCAw+FbC4UompTov4Qd kCNExD99zAMMcBlVsOlLdLaxUDZ5Mh9PQzfg6ryJMEcTd3+0tiaXr8W9tRnx9eo2Ybdz 1pYj36Hme+0bsA3lkrPF0X/U8PR76Wd0hSFtQ1WpPNYvIbczwQdue/bDC00Yy+fh8ME+ TPlGG7jfex+KhBBm6RGfpxJM2aH3pTK3ZNgbDaOT6xPY3SZAZiIRMe80kkE5jinkl93q M1PQ== 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=KK2wWvtM09s7BymlwQ0zdF1/WZSE6B2AHq1SfLX5ep8=; b=o8ctsb2a3t4NSySq4KgC9kNUv/GZRU9iI1hES/JwKNvz46CP0DiNL9KCLtRvqb6OKK KcC0nZSOm/jguj5IWTz6iJNWi8UGEp9XXu2NreZOJjWjw5M0QUzVuHaOpMbCMDf5Htk4 lfaI2JljOcRzQiowj7Vn31reKAjFa9Tsz4f3MSRRJLF/lmsgSLtPanxC67f0kgTNAMHy nQznT7S7TTLxtGEUzBPmbM9g5LTeO5LFM5NmMmFxWD4TTfGs80FWQA90vc87ls8n3TTc /HoA0fuSy/rO8LtgWUb3bZxnlAyVl72bPKVqI3VEZ+77/cLur0HdP7Fd1bxM39CJ5aiU Hing== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="0/NEpk9V"; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x15si11294833ejc.115.2020.07.14.11.55.29; Tue, 14 Jul 2020 11:55:30 -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="0/NEpk9V"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730854AbgGNSz1 (ORCPT + 15 others); Tue, 14 Jul 2020 14:55:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:53054 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730859AbgGNSzV (ORCPT ); Tue, 14 Jul 2020 14:55:21 -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 D4BB221D79; Tue, 14 Jul 2020 18:55:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752921; bh=YPWW6g2bZlQUgqHk1g+1fzvKYQHRfjq3261t+6B+jPk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0/NEpk9VF+ixEBFshFAjSk3Z76aATTXWZ7+b3fm3XKkS589gr3H5FlW6WH6S1RpSg xeUwzbQ+OaPSNLMLnYnTVi9M+BsrPG+TZb9DpDyemKY2VjSa7lezUAFOTjqHDz5vKq 988ihwdifPQCrC3vxuuf37JeTZFtoLpOQsVaYtQA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shengjiu Wang , Nicolin Chen , Mark Brown , Sasha Levin Subject: [PATCH 5.7 051/166] ASoC: fsl_mqs: Dont check clock is NULL before calling clk API Date: Tue, 14 Jul 2020 20:43:36 +0200 Message-Id: <20200714184118.321222867@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184115.844176932@linuxfoundation.org> References: <20200714184115.844176932@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: Shengjiu Wang [ Upstream commit adf46113a608d9515801997fc96cbfe8ffa89ed3 ] Because clk_prepare_enable and clk_disable_unprepare should check input clock parameter is NULL or not internally, then we don't need to check them before calling the function. Fixes: 9e28f6532c61 ("ASoC: fsl_mqs: Add MQS component driver") Signed-off-by: Shengjiu Wang Acked-by: Nicolin Chen Link: https://lore.kernel.org/r/743be216bd504c26e8d45d5ce4a84561b67a122b.1592888591.git.shengjiu.wang@nxp.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/fsl/fsl_mqs.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) -- 2.25.1 diff --git a/sound/soc/fsl/fsl_mqs.c b/sound/soc/fsl/fsl_mqs.c index 0c813a45bba7c..b44b134390a39 100644 --- a/sound/soc/fsl/fsl_mqs.c +++ b/sound/soc/fsl/fsl_mqs.c @@ -266,11 +266,9 @@ static int fsl_mqs_runtime_resume(struct device *dev) { struct fsl_mqs *mqs_priv = dev_get_drvdata(dev); - if (mqs_priv->ipg) - clk_prepare_enable(mqs_priv->ipg); + clk_prepare_enable(mqs_priv->ipg); - if (mqs_priv->mclk) - clk_prepare_enable(mqs_priv->mclk); + clk_prepare_enable(mqs_priv->mclk); if (mqs_priv->use_gpr) regmap_write(mqs_priv->regmap, IOMUXC_GPR2, @@ -292,11 +290,8 @@ static int fsl_mqs_runtime_suspend(struct device *dev) regmap_read(mqs_priv->regmap, REG_MQS_CTRL, &mqs_priv->reg_mqs_ctrl); - if (mqs_priv->mclk) - clk_disable_unprepare(mqs_priv->mclk); - - if (mqs_priv->ipg) - clk_disable_unprepare(mqs_priv->ipg); + clk_disable_unprepare(mqs_priv->mclk); + clk_disable_unprepare(mqs_priv->ipg); return 0; }