Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp530061ybe; Wed, 18 Sep 2019 22:50:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqweTS3lMuvAoqghDEfw8oYGu11loMRUNPyn0tO7r2zB3smkpNvtXYZzQRl2mw1EiVmczT6+ X-Received: by 2002:a17:906:5a96:: with SMTP id l22mr10542033ejq.310.1568872215075; Wed, 18 Sep 2019 22:50:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568872215; cv=none; d=google.com; s=arc-20160816; b=kYbc6BbBxfdWq9+0NVI3WJ3x9TqS/ORGi4oDkXZO5Vek9CHxNJKZ1NEYAG2Jrd6At9 tx5WotdMXf0kyQD8SRWF4U+v8kSHOV4ZYM/RENPKb5hcZzZK5y5W0vCsFdqR1mH95HPr G3lAlLBsU7JLpWBKzUopCa1ZV3mlVYQIF38XS5NIK6Ac9ayzFDXqlWCvykHVfO4YuvFR jW/1Pn+nMmSEOj7S0p/7ZZkGgV9YGdzbgbn0sqMnm3w8Ygnu1XQUaDimXVAEFszPDC4v Vt/aUwhWyg2Iphsp1nS1nfdD2hLqNY5z3T2ZXluttQug+maQJhcjNXw8hohcSXz6H4Rr n11A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Hi1ifQQR9gpdPmRZ1GOZNnhiHESsDUToV+uCj5M5hAM=; b=EQIvnOt8DeBkwCILlskr9enjXyshh3eKkaN/teipb6lw+aODK5Ffl24+bS51mpVgmJ QRvyEXF23bT0ghuz4uaYdYXWb80IL/Q2o4FOs50vSWy9BwAL8GP2bw8msQfaQ+NDPIaW jmgea0COFZDzUwKU2LVxccubEw5UmUUFywMZVwaa3k6eb/DIRJhgFDFcLcjXJuLTBmam knoJ5px6gHAPc58ExGu5Z8Y38wZ3pSSW9Vl6ik7tBVuKpJI9INxj1HLNhc+85yDec1Dg huPY3iftzWUc1e8DJTzIcDBhAw9giHOU6xQjpbjLQWF6YmW7HHMnwaYgYdlX+uU/YvQC ouOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=TK1Jg2tr; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f13si4339566edr.445.2019.09.18.22.49.50; Wed, 18 Sep 2019 22:50:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=TK1Jg2tr; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732002AbfISFKn (ORCPT + 99 others); Thu, 19 Sep 2019 01:10:43 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:54743 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732000AbfISFKm (ORCPT ); Thu, 19 Sep 2019 01:10:42 -0400 Received: by mail-wm1-f67.google.com with SMTP id p7so2623765wmp.4; Wed, 18 Sep 2019 22:10:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Hi1ifQQR9gpdPmRZ1GOZNnhiHESsDUToV+uCj5M5hAM=; b=TK1Jg2trmgQTscppX/zra/WBdWr0pzqo34rey/+Un83KLSAoVGfAq2QgYlWpdRdmHD vi6lDlaLbbdWIh7dBg/1Grq/SD+FPunqfubr/NG/tNKGGuHfUW/onB+zS5IRjMzKJAJv iNenFOljXnWu+C7H6iB9pJUqUFnupc4XfEx343e7IPQc0ExRVqoETwI0S8E8/6x7/o3L QreXpoXj4i9UNrUI4rTpnrisDtFc19+Wc5IpEx20CNsdb6RYyZ9FZFMzvWLvw+V8UV1p FGLW7wnAYSFg+VFLwJ6oD0GKkv8dhlsCFgLN/+Uo+uaViaUUJI0jWYys9G/1Uf6XqWyu 9JjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Hi1ifQQR9gpdPmRZ1GOZNnhiHESsDUToV+uCj5M5hAM=; b=loeHAs2+KngwxJI/YPdslb1MEZ7BnCXxmeejvkTllJ/fL2c6ioVJQRmTjLfDWilTaW QbdS1EKGj7hQynrV3zhriil6a6Sh/sUepqqROd/yHvk3cAHaS3W3Y0kueKMFjB5hsEyv 6Xlo5Q0CUhQHsJQbq0W+0JiprVMrTwiq1GhvP9y1kNalGt5SMA2J84mGzBgvch+xiBDF Cgy8PbZkktbblzfPi5eigZJi1MYbW/LWMU15bqQ28USWf1KMaIjjn8NUyjIsxcPs2FFl 8tMNymd/aH7955tCyCa1DBTnO+wZ8y2izBW+wlemEgLpKLu8p2WKwS6T22V4bJ4YC27B QZ/g== X-Gm-Message-State: APjAAAXp3Zov0R2cTV/WJ/BTkvupyxj6e+Zz1qOPdLy+rH/QlSBqriJx MCbR9Ub7KJDyfwZiLFtjKfE= X-Received: by 2002:a7b:cb8b:: with SMTP id m11mr1076276wmi.145.1568869840588; Wed, 18 Sep 2019 22:10:40 -0700 (PDT) Received: from Red.localdomain ([2a01:cb1d:147:7200:2e56:dcff:fed2:c6d6]) by smtp.googlemail.com with ESMTPSA id 94sm6575552wrk.92.2019.09.18.22.10.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Sep 2019 22:10:40 -0700 (PDT) From: Corentin Labbe To: davem@davemloft.net, herbert@gondor.apana.org.au, mripard@kernel.org, wens@csie.org Cc: linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, Corentin Labbe Subject: [PATCH v2 1/2] crypto: sun4i-ss: simplify enable/disable of the device Date: Thu, 19 Sep 2019 07:10:34 +0200 Message-Id: <20190919051035.4111-2-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190919051035.4111-1-clabbe.montjoie@gmail.com> References: <20190919051035.4111-1-clabbe.montjoie@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org This patch regroups resource enabling/disabling in dedicated function. This simplify error handling and will permit to support power management. Signed-off-by: Corentin Labbe Acked-by: Maxime Ripard --- drivers/crypto/sunxi-ss/sun4i-ss-core.c | 77 +++++++++++++++---------- 1 file changed, 46 insertions(+), 31 deletions(-) diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-core.c b/drivers/crypto/sunxi-ss/sun4i-ss-core.c index 9aa6fe081a27..6c2db5d83b06 100644 --- a/drivers/crypto/sunxi-ss/sun4i-ss-core.c +++ b/drivers/crypto/sunxi-ss/sun4i-ss-core.c @@ -223,6 +223,45 @@ static struct sun4i_ss_alg_template ss_algs[] = { #endif }; +static void sun4i_ss_disable(struct sun4i_ss_ctx *ss) +{ + if (ss->reset) + reset_control_assert(ss->reset); + + clk_disable_unprepare(ss->ssclk); + clk_disable_unprepare(ss->busclk); +} + +static int sun4i_ss_enable(struct sun4i_ss_ctx *ss) +{ + int err; + + err = clk_prepare_enable(ss->busclk); + if (err) { + dev_err(ss->dev, "Cannot prepare_enable busclk\n"); + goto err_enable; + } + + err = clk_prepare_enable(ss->ssclk); + if (err) { + dev_err(ss->dev, "Cannot prepare_enable ssclk\n"); + goto err_enable; + } + + if (ss->reset) { + err = reset_control_deassert(ss->reset); + if (err) { + dev_err(ss->dev, "Cannot deassert reset control\n"); + goto err_enable; + } + } + + return err; +err_enable: + sun4i_ss_disable(ss); + return err; +} + static int sun4i_ss_probe(struct platform_device *pdev) { u32 v; @@ -269,17 +308,9 @@ static int sun4i_ss_probe(struct platform_device *pdev) ss->reset = NULL; } - /* Enable both clocks */ - err = clk_prepare_enable(ss->busclk); - if (err) { - dev_err(&pdev->dev, "Cannot prepare_enable busclk\n"); - return err; - } - err = clk_prepare_enable(ss->ssclk); - if (err) { - dev_err(&pdev->dev, "Cannot prepare_enable ssclk\n"); - goto error_ssclk; - } + err = sun4i_ss_enable(ss); + if (err) + goto error_enable; /* * Check that clock have the correct rates given in the datasheet @@ -288,16 +319,7 @@ static int sun4i_ss_probe(struct platform_device *pdev) err = clk_set_rate(ss->ssclk, cr_mod); if (err) { dev_err(&pdev->dev, "Cannot set clock rate to ssclk\n"); - goto error_clk; - } - - /* Deassert reset if we have a reset control */ - if (ss->reset) { - err = reset_control_deassert(ss->reset); - if (err) { - dev_err(&pdev->dev, "Cannot deassert reset control\n"); - goto error_clk; - } + goto error_enable; } /* @@ -387,12 +409,8 @@ static int sun4i_ss_probe(struct platform_device *pdev) break; } } - if (ss->reset) - reset_control_assert(ss->reset); -error_clk: - clk_disable_unprepare(ss->ssclk); -error_ssclk: - clk_disable_unprepare(ss->busclk); +error_enable: + sun4i_ss_disable(ss); return err; } @@ -416,10 +434,7 @@ static int sun4i_ss_remove(struct platform_device *pdev) } writel(0, ss->base + SS_CTL); - if (ss->reset) - reset_control_assert(ss->reset); - clk_disable_unprepare(ss->busclk); - clk_disable_unprepare(ss->ssclk); + sun4i_ss_disable(ss); return 0; } -- 2.21.0