Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp3457418ybl; Sun, 1 Sep 2019 13:36:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqyZrifQV+lrZosNWygcgCn5gO8jVYYWJDC13KW0C5ryN0CbYVXFZVU6JOinDqtCHAALVZ9r X-Received: by 2002:a17:90a:1b0a:: with SMTP id q10mr9713840pjq.91.1567370191640; Sun, 01 Sep 2019 13:36:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567370191; cv=none; d=google.com; s=arc-20160816; b=bQuhNYzwaEJGZE9UmrEbD8qgSzb2cLGzKb3hfgXL0qBuvdLlmWsQ9Q4Nu9fSAYQNQN 0VNT/VbKL4sWgjw+j5wPFtLCsJps9hxtSRybtleiJjbLXvqxmn/xK1RxugVQFj4pCfds Z2eWnX7JfxnDeF5d0T+kjbg1E87bKWOMbdsjTPBKmcRsJ86Gmm1QfLRnCwtFF8A1TWEK gFlgakCs6zbRgM9z1ShvgSm85EtDMAwI28wlawykYGAqCl9Fgv0AryRGpWRcoe1NUyKk MYBeghT3ij7/eO9PdBCL35BDQpGhb8QMrpWESTRrBjkYNc4mdqdu5mWXuGdVm0txVhrL GKyg== 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; bh=HLySE826K/+SsZbjTo6MMip8mA6aSZ2jelPfOZZmTJs=; b=oXrkfaWiRpfsmLbYDMVXF/hSHOb8LT6t8REnmmYP/k1GcIM+pOHAxFclkQnEZFylWo cbyj/pQqlCQCw9xbLxkkrdRxtytjR9h44iqUg1mJLnpxxMDhkP6KXQjglh4h10XTdBEX ZylGGYEKi8Abp/0R6obY5giPi4yTjy7M9Xvlp3BtoVhgtHOsx3F9qCodwFqGY6fJTj2t Zdk1lOmb3AeHbFNUzep8ZnwSjp0LNlYlL1uW1hPzTNK4atQFFqMKcA+qajd1bM1yjBzV PTKD9kwlyC/OvzM1LTr+qsAYSa8VFz/tX9eA98C2KpGXAYsLsoU9Gk0AC0DkClC7b6od /low== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h11si10075199pjs.64.2019.09.01.13.36.18; Sun, 01 Sep 2019 13:36:31 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729158AbfIAUfy (ORCPT + 99 others); Sun, 1 Sep 2019 16:35:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51006 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725955AbfIAUfx (ORCPT ); Sun, 1 Sep 2019 16:35:53 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F0FE536887; Sun, 1 Sep 2019 20:35:52 +0000 (UTC) Received: from shalem.localdomain.com (ovpn-116-36.ams2.redhat.com [10.36.116.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id C1FD560920; Sun, 1 Sep 2019 20:35:48 +0000 (UTC) From: Hans de Goede To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H . Peter Anvin" , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Russell King , Catalin Marinas , Will Deacon , Gilad Ben-Yossef , Atul Gupta Cc: Hans de Goede , Marc Zyngier , Eric Biggers , Andy Lutomirski , Ard Biesheuvel , linux-crypto@vger.kernel.org, x86@kernel.org, linux-s390@vger.kernel.org, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/9] crypto: s390 - Rename functions to avoid conflict with crypto/sha256.h Date: Sun, 1 Sep 2019 22:35:26 +0200 Message-Id: <20190901203532.2615-4-hdegoede@redhat.com> In-Reply-To: <20190901203532.2615-1-hdegoede@redhat.com> References: <20190901203532.2615-1-hdegoede@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Sun, 01 Sep 2019 20:35:53 +0000 (UTC) Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Rename static / file-local functions so that they do not conflict with the functions declared in crypto/sha256.h. This is a preparation patch for folding crypto/sha256.h into crypto/sha.h. Signed-off-by: Hans de Goede --- arch/s390/crypto/sha256_s390.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/s390/crypto/sha256_s390.c b/arch/s390/crypto/sha256_s390.c index af7505148f80..b52c87e44939 100644 --- a/arch/s390/crypto/sha256_s390.c +++ b/arch/s390/crypto/sha256_s390.c @@ -17,7 +17,7 @@ #include "sha.h" -static int sha256_init(struct shash_desc *desc) +static int s390_sha256_init(struct shash_desc *desc) { struct s390_sha_ctx *sctx = shash_desc_ctx(desc); @@ -60,7 +60,7 @@ static int sha256_import(struct shash_desc *desc, const void *in) static struct shash_alg sha256_alg = { .digestsize = SHA256_DIGEST_SIZE, - .init = sha256_init, + .init = s390_sha256_init, .update = s390_sha_update, .final = s390_sha_final, .export = sha256_export, @@ -76,7 +76,7 @@ static struct shash_alg sha256_alg = { } }; -static int sha224_init(struct shash_desc *desc) +static int s390_sha224_init(struct shash_desc *desc) { struct s390_sha_ctx *sctx = shash_desc_ctx(desc); @@ -96,7 +96,7 @@ static int sha224_init(struct shash_desc *desc) static struct shash_alg sha224_alg = { .digestsize = SHA224_DIGEST_SIZE, - .init = sha224_init, + .init = s390_sha224_init, .update = s390_sha_update, .final = s390_sha_final, .export = sha256_export, -- 2.23.0