From patchwork Wed Sep 11 11:46:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 173608 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp629007ilq; Wed, 11 Sep 2019 04:47:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqz9qXtPfuaNpHG92SStIfADDDkjh/kcbSIr0XC+xugoY44tAl9Sju/AC0ouxj6StV6hco9Z X-Received: by 2002:a17:906:d78d:: with SMTP id pj13mr29784793ejb.62.1568202423158; Wed, 11 Sep 2019 04:47:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568202423; cv=none; d=google.com; s=arc-20160816; b=pNlJ/En/+Z94+SGYNneXGbEHSkiIrCYqt5BiRMLdO7sDUhcHVrAXFHjVd+AdXHtySQ INV9L0tBrnixTgLACndgp/0ls02g/mi7Kd4QD/vM6S5GFnLfNmDjPNCjePmaj2RZd9Ib /Q+VjYBJVpJT6bPf8LbOpei9t12hL9nvmqgBjGHqEOfewJUHRDs0Zypd3yLONjX7gys5 3LhH2LzWMC2bJgE+KpOVKEJeipk07g3Zjp2lHbiIzG8GLzhiWDEhJgelGLzqupa2oV2I vFXZgNw0hFPqhnjYWt4BYXZcqQJhFWEfPx6FwGhrOH2OAEy78wKxWa550hgUk9za2ZcN H+Cg== 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=JgPahXjzwJ1FlZOqme8sddUdHnTiNo6i0GnstFUSooI=; b=b2xK0jZhsLSWq7+oulQOtG/tpMyCaTF+BSLC92yWkFmWgBQAX4cxkd9CWIsi3nZXGZ 5Nvf3Itgw/7Mu6pivF40HY+u4aI+bIcQQL9OKeS5wz1P8xZVA5tFMUStmnZSvSvQCVOS btWn5KoygExB0zm34PHrTFpsCpULm5LGmVHDZr0d8SZ7lLwOCrczivU4V+tn6ExzgkL/ w1VBOW2BKhvPbxJ59zbz+Qm2N+XPvcJbp0OpbiDXiBbrj+UCIaJoqsAK57kcy8p2F64W nVEgrf/ldSvuDpRxzOwP2H7BaebYzuQUPXhbv+O+NeLPfUIXNoAIEIQB6bG87nnM3RNF 7Trg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=P4lbFX7i; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 gv21si10922488ejb.289.2019.09.11.04.47.02; Wed, 11 Sep 2019 04:47:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=P4lbFX7i; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1727802AbfIKLq7 (ORCPT + 27 others); Wed, 11 Sep 2019 07:46:59 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:38838 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726696AbfIKLq5 (ORCPT ); Wed, 11 Sep 2019 07:46:57 -0400 Received: by mail-wm1-f67.google.com with SMTP id o184so3146689wme.3; Wed, 11 Sep 2019 04:46:55 -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=JgPahXjzwJ1FlZOqme8sddUdHnTiNo6i0GnstFUSooI=; b=P4lbFX7igZ66ZuRooFnd4doxXIvDnTHfGnMDq6qWqE+hWs/lu7TnLfr+reaot9BhJU VBGMoQacwjjlo5pU6kByJ82mXJZyZBl8p26EG9NKA7lDmk0ez9s1s1FPHDxicBoE/Kv6 GMhbuumfZUxwA1GI6DlKYeJjBfvLRmd3+rkT0Y8L1TmIVsq2TqhHj1HtLQMnVGCaaLNX ImY4UkOJECA2GWNfdfUcjW9A+ET5T5LK4196gAZzSFlN/9HMJZXCo0mWRMtl+r7cxhrg 4zwlkvGBDCh3fcesptlSBusICqOaXCe0uf4pSBmxT1n9Wla8rSa6wG8QE1jcr0a2neNc 1eFg== 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=JgPahXjzwJ1FlZOqme8sddUdHnTiNo6i0GnstFUSooI=; b=IiUQNgZHzvi9jyVW6+uowM0JOnIHWx2n0bVJ91cnBImSi9+vLNeTyC/w/cm8iaYwFJ 6uh3swTFLAXylHljNO3z2IrHcAi9z8NQ6Y4r78ktPcK0dGPtOa54sfktCC9N/L9TniGU ihubQb1Tn54MtLAooDtt9vyfl+kpSd6/zvW9HLQ88G666JUuFCxeMzrvavF6I/UlpSWD EkzBGJl2AqY4X4l46lCDUnAZ+wnk5oxwmcrzPZj9LmCwr1IY/bHyWRHtNiM7SwR1g2jb +Y7UWPm9QZjKpe+L6wo6ZR4wHG8HQhu+/vmppDZrMYVAQNvqF/ocn1MBUjuVjVKsFuO0 9Atw== X-Gm-Message-State: APjAAAUvsu/5HJBlbnqVLGXyFuw/jlcQS/K/4H1nCCDllssG9tOjL8Fb DLueIe/U2PhJgGXW61edHdg= X-Received: by 2002:a1c:1d84:: with SMTP id d126mr3569473wmd.58.1568202415208; Wed, 11 Sep 2019 04:46:55 -0700 (PDT) Received: from Red.localdomain ([2a01:cb1d:147:7200:2e56:dcff:fed2:c6d6]) by smtp.googlemail.com with ESMTPSA id h17sm4864705wme.6.2019.09.11.04.46.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Sep 2019 04:46:54 -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 1/2] crypto: sun4i-ss: simplify enable/disable of the device Date: Wed, 11 Sep 2019 13:46:49 +0200 Message-Id: <20190911114650.20567-2-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190911114650.20567-1-clabbe.montjoie@gmail.com> References: <20190911114650.20567-1-clabbe.montjoie@gmail.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 --- drivers/crypto/sunxi-ss/sun4i-ss-core.c | 73 ++++++++++++++----------- 1 file changed, 42 insertions(+), 31 deletions(-) -- 2.21.0 Acked-by: Maxime Ripard diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-core.c b/drivers/crypto/sunxi-ss/sun4i-ss-core.c index 9aa6fe081a27..2c9ff01dddfc 100644 --- a/drivers/crypto/sunxi-ss/sun4i-ss-core.c +++ b/drivers/crypto/sunxi-ss/sun4i-ss-core.c @@ -223,6 +223,41 @@ 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 +304,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 +315,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 +405,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 +430,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; }