From patchwork Thu Mar 5 16:46:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 5948061 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CE9D09F373 for ; Thu, 5 Mar 2015 17:05:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 018DE2026C for ; Thu, 5 Mar 2015 17:05:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0DFB1201CE for ; Thu, 5 Mar 2015 17:05:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758368AbbCERFf (ORCPT ); Thu, 5 Mar 2015 12:05:35 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:48382 "EHLO mailhub1.si.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758359AbbCERFd (ORCPT ); Thu, 5 Mar 2015 12:05:33 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id AB74E1C8337; Thu, 5 Mar 2015 17:46:21 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from mailhub1.si.c-s.fr ([192.168.12.234]) by localhost (mailhub1.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id D8tppjNO8HYM; Thu, 5 Mar 2015 17:46:21 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 921861C8330; Thu, 5 Mar 2015 17:46:21 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id C89D8C73D4; Thu, 5 Mar 2015 17:46:20 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id Nd3Pa0vMYbSV; Thu, 5 Mar 2015 17:46:20 +0100 (CET) Received: from PO10863.localdomain (unknown [172.25.231.75]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 1B1D8C73CE; Thu, 5 Mar 2015 17:46:14 +0100 (CET) Received: by localhost.localdomain (Postfix, from userid 0) id 1F5251A2427; Thu, 5 Mar 2015 17:46:07 +0100 (CET) From: Christophe Leroy To: Kim Phillips , Herbert Xu , "David S. Miller" CC: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-crypto@vger.kernel.org Subject: [PATCH 13/17] crypto: talitos - move sg_count() helper into talitos.h Message-Id: <20150305164607.1F5251A2427@localhost.localdomain> Date: Thu, 5 Mar 2015 17:46:07 +0100 (CET) Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP move sg_count() helper into talitos.h as it will be needed by SEC1 specific functions Signed-off-by: Christophe Leroy --- drivers/crypto/talitos.c | 20 -------------------- drivers/crypto/talitos.h | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index 9f75ec9..fc30196 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -459,26 +459,6 @@ static void talitos_unregister_rng(struct device *dev) #define MD5_BLOCK_SIZE 64 /* - * derive number of elements in scatterlist - */ -static int sg_count(struct scatterlist *sg_list, int nbytes, bool *chained) -{ - struct scatterlist *sg = sg_list; - int sg_nents = 0; - - *chained = false; - while (nbytes > 0) { - sg_nents++; - nbytes -= sg->length; - if (!sg_is_last(sg) && (sg + 1)->length == 0) - *chained = true; - sg = sg_next(sg); - } - - return sg_nents; -} - -/* * allocate and map the extended descriptor */ struct talitos_edesc *talitos_edesc_alloc(struct device *dev, diff --git a/drivers/crypto/talitos.h b/drivers/crypto/talitos.h index f95e4bc..a11ad53 100644 --- a/drivers/crypto/talitos.h +++ b/drivers/crypto/talitos.h @@ -155,6 +155,27 @@ extern void talitos_error(struct device *dev, u32 isr, u32 isr_lo); extern int talitos_cra_init(struct crypto_tfm *tfm); +/* + * derive number of elements in scatterlist + */ +static inline int sg_count(struct scatterlist *sg_list, int nbytes, + bool *chained) +{ + struct scatterlist *sg = sg_list; + int sg_nents = 0; + + *chained = false; + while (nbytes > 0) { + sg_nents++; + nbytes -= sg->length; + if (!sg_is_last(sg) && (sg + 1)->length == 0) + *chained = true; + sg = sg_next(sg); + } + + return sg_nents; +} + /* .features flag */ #define TALITOS_FTR_SRC_LINK_TBL_LEN_INCLUDES_EXTENT 0x00000001 #define TALITOS_FTR_HW_AUTH_CHECK 0x00000002