From patchwork Tue Oct 3 23:00:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 9983621 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4909B6029B for ; Tue, 3 Oct 2017 23:00:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3FF2C28A2A for ; Tue, 3 Oct 2017 23:00:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E58228A38; Tue, 3 Oct 2017 23:00:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF55A28A44 for ; Tue, 3 Oct 2017 23:00:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751226AbdJCXAX (ORCPT ); Tue, 3 Oct 2017 19:00:23 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:51832 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751199AbdJCXAW (ORCPT ); Tue, 3 Oct 2017 19:00:22 -0400 Received: by mail-wm0-f65.google.com with SMTP id f4so11743595wme.0 for ; Tue, 03 Oct 2017 16:00:21 -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 :in-reply-to:references; bh=TZTGE1uCsGtAu0pBfVidiNeHnsnO4a1o8bQ9uZeEn/M=; b=dhGn9DYwpkH1hXC4o7tNj5JpltHP+NYU3WxUWhWFaojkY0ZJ8Dp2aZv+xoUoucFlZ3 jPYU3PzFMW5lhlowwCt/C63ZkOPp46BLyJqKVM3d1lOyMQOuJ/rv2J/FL2QBCxy0bF5b fSduaOEqi7vSjxR93Y2rOP0O7hbyKyKG7/EcD8RbtVuQK7HJMg7qp9e8lCOAfq9kDAn4 3f+2sxdTExblcIbCIQRRFwiYeOmmBuHJzwJo2phoHYhJ91MdnfC4gsMWAUzV2FH3PFSv Pg2UIM6HzZLsUsjrkdTlz6rEjbjdQQwpDuCdfaIUDAOlwaXIJVHe1hfbem4IaeYqzwOx DfZQ== 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:in-reply-to:references; bh=TZTGE1uCsGtAu0pBfVidiNeHnsnO4a1o8bQ9uZeEn/M=; b=c3v1APQLqPdOYoVC29A0yLXs1ICeVr5BevMfYIyIDnUd4flFBsdttibYk9zVn+bUBS IV1FSpmsQDy3Ahvw4o6N1nUYWQQ1SUmgsyQQ+MCC3rdKzRbBdwuK7WFOS/Ttt8Q47RSt QJ28c4l/e6M45gRsRIWFkqHjb7VtzLt/pAmO1OnsSPLW9x+Em50Xlmwj3EGOABVOHJ5e mTndk7SpAWRcGka83z1V9fE3DtgMK9WgAZSMApv4fvTNgPwu+fzzHllHAUVlNbk6SlMs vS1CnT1YPm2xxzzXNCLQLz7wVebmAKjcy/o1dTFdM5VFlcK81GgDtg68wib/m+BEMBwB FAzw== X-Gm-Message-State: AMCzsaXAYnmvmr1CEioeIXQErWsRNO5nBP/inC88hXL+FCLCU7SCoSpK clS29FVKo2X/8A8oopzqPj8M52z8 X-Google-Smtp-Source: AOwi7QBLWq5meg9jAIUZaU9hVAxWLYV5YU1lx3PWCqAb6ttqjLRsOb73UcVQBQl48siHbI4gk9Q3VQ== X-Received: by 10.28.27.22 with SMTP id b22mr4777215wmb.66.1507071620686; Tue, 03 Oct 2017 16:00:20 -0700 (PDT) Received: from debian64.daheim (p200300D5FBCA48FCD63D7EFFFEBDE96E.dip0.t-ipconnect.de. [2003:d5:fbca:48fc:d63d:7eff:febd:e96e]) by smtp.gmail.com with ESMTPSA id x5sm7236038wre.18.2017.10.03.16.00.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Oct 2017 16:00:18 -0700 (PDT) Received: from chuck by debian64.daheim with local (Exim 4.89) (envelope-from ) id 1dzWAj-00010C-G6; Wed, 04 Oct 2017 01:00:17 +0200 From: Christian Lamparter To: linux-crypto@vger.kernel.org Cc: Herbert Xu Subject: [PATCH 03/13] crypto: crypto4xx: fix type mismatch compiler error Date: Wed, 4 Oct 2017 01:00:07 +0200 Message-Id: X-Mailer: git-send-email 2.14.2 In-Reply-To: <8c9b4bc7e3a88970fe0fc308034627b8ae972600.1507070985.git.chunkeey@gmail.com> References: <8c9b4bc7e3a88970fe0fc308034627b8ae972600.1507070985.git.chunkeey@gmail.com> In-Reply-To: <8c9b4bc7e3a88970fe0fc308034627b8ae972600.1507070985.git.chunkeey@gmail.com> References: <8c9b4bc7e3a88970fe0fc308034627b8ae972600.1507070985.git.chunkeey@gmail.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch fixes a type mismatch error that I accidentally introduced when I moved and refactored the dynamic_contents helpers. Signed-off-by: Christian Lamparter --- drivers/crypto/amcc/crypto4xx_sa.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/amcc/crypto4xx_sa.h b/drivers/crypto/amcc/crypto4xx_sa.h index 7cc04f1ff8a0..8040c82dc354 100644 --- a/drivers/crypto/amcc/crypto4xx_sa.h +++ b/drivers/crypto/amcc/crypto4xx_sa.h @@ -266,9 +266,9 @@ get_dynamic_sa_offset_state_ptr_field(struct dynamic_sa_ctl *cts) return sizeof(struct dynamic_sa_ctl) + offset * 4; } -static inline u8 *get_dynamic_sa_key_field(struct dynamic_sa_ctl *cts) +static inline u32 *get_dynamic_sa_key_field(struct dynamic_sa_ctl *cts) { - return (u8 *) ((unsigned long)cts + sizeof(struct dynamic_sa_ctl)); + return (u32 *) ((unsigned long)cts + sizeof(struct dynamic_sa_ctl)); } #endif