Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3050581pxk; Mon, 7 Sep 2020 01:27:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3RyGpBiD4+kfHDmc0QyunCjF+wyGEtobR0l5fBpATN72m7cPCPZpCM9zWaeslBI5X3C8P X-Received: by 2002:a50:e004:: with SMTP id e4mr20413999edl.114.1599467220371; Mon, 07 Sep 2020 01:27:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599467220; cv=none; d=google.com; s=arc-20160816; b=Z3YRpfYIB4tbwN9phnzBUCikSAdJnNiTwFk5gG3L3vvWAD2NCCnvGX83BQsRi22/Jb l2a7EnAvJawkq2h4M40IadXzRBh7V/Wtdbn/WFBZnKoefT3IjtvbVwPmaA5ZwY1qKQAV Pfeo98NCRXwWszxa/69VINMWScfjX1L8JXogbxL8oZkrCktMMhMAMknW5J+/kJoQB2wV CaTV041UccKfmbTTlQljElwOEvn5x32uMzkT7IKTgSmr1lvMzxQkI+ujf//ibp851QWs 9YAj0THEzRBLGHwfSKgFm9ZvDwMXMeFTe8u69xl2DqrtBy+xk0qLJszA6Y25PaSG2GN4 lLFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=4dFr1Osg79wutD9pQNEwxOa4eHtum6t7BM3mu9ABfQk=; b=vDVkuc/G9aSoQ/Zo4lmiqoy/tEa7j4IZHqtEesKm/Y38j5ysfH3cb765ty8wsIIM+E x+y5euUQeq31og1K1SMTVfgbdSJVnpli96BS5Nd3ni0Gvy3AcwSSWZmtSKvPvIn8vk6X vmmMyfFXjGt87Lrl58Nv8Drf5pkWjjGsTbbk9e98kpzhJeZMCye5KKRvVU2SMK6r+heM nhNZ4rduJNZIWYOvTVwBkTGUegr1niEzyuGCuzqyLApcJTw0J8BJyOf/0sodODPU2aas N5q2UxCsZ5a4NVy9ZQaL8XPjJctVWNhBc1+Ren6T0+XS5Al58W/I2jo2o7EcTvjEqFke Qgpg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s22si8831334edc.481.2020.09.07.01.26.38; Mon, 07 Sep 2020 01:27:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728185AbgIGIZ3 (ORCPT + 99 others); Mon, 7 Sep 2020 04:25:29 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:10785 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728016AbgIGIYm (ORCPT ); Mon, 7 Sep 2020 04:24:42 -0400 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id EE4AB6CA4D042C282A64; Mon, 7 Sep 2020 16:24:34 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.487.0; Mon, 7 Sep 2020 16:24:26 +0800 From: Yang Shen To: , CC: , , , Subject: [PATCH v2 08/10] crypto: hisilicon/zip - move some private macros from 'zip.h' to 'zip_crypto.c' Date: Mon, 7 Sep 2020 16:22:00 +0800 Message-ID: <1599466922-10323-9-git-send-email-shenyang39@huawei.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1599466922-10323-1-git-send-email-shenyang39@huawei.com> References: <1599466922-10323-1-git-send-email-shenyang39@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.69.192.56] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some macros which are defined in 'zip.h' are related to the struct 'hisi_zip_sqe' and are only used in 'zip_crypto.c'. So move them from 'zip.h' to 'zip_crypto.c'. Signed-off-by: Yang Shen Reviewed-by: Zhou Wang --- drivers/crypto/hisilicon/zip/zip.h | 14 -------------- drivers/crypto/hisilicon/zip/zip_crypto.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/crypto/hisilicon/zip/zip.h b/drivers/crypto/hisilicon/zip/zip.h index 4b3aae8..92397f9 100644 --- a/drivers/crypto/hisilicon/zip/zip.h +++ b/drivers/crypto/hisilicon/zip/zip.h @@ -9,20 +9,6 @@ #include #include "../qm.h" -/* hisi_zip_sqe dw3 */ -#define HZIP_BD_STATUS_M GENMASK(7, 0) -/* hisi_zip_sqe dw7 */ -#define HZIP_IN_SGE_DATA_OFFSET_M GENMASK(23, 0) -/* hisi_zip_sqe dw8 */ -#define HZIP_OUT_SGE_DATA_OFFSET_M GENMASK(23, 0) -/* hisi_zip_sqe dw9 */ -#define HZIP_REQ_TYPE_M GENMASK(7, 0) -#define HZIP_ALG_TYPE_ZLIB 0x02 -#define HZIP_ALG_TYPE_GZIP 0x03 -#define HZIP_BUF_TYPE_M GENMASK(11, 8) -#define HZIP_PBUFFER 0x0 -#define HZIP_SGL 0x1 - enum hisi_zip_error_type { /* negative compression */ HZIP_NC_ERR = 0x0d, diff --git a/drivers/crypto/hisilicon/zip/zip_crypto.c b/drivers/crypto/hisilicon/zip/zip_crypto.c index 246a43e..ba73bd8 100644 --- a/drivers/crypto/hisilicon/zip/zip_crypto.c +++ b/drivers/crypto/hisilicon/zip/zip_crypto.c @@ -6,6 +6,20 @@ #include #include "zip.h" +/* hisi_zip_sqe dw3 */ +#define HZIP_BD_STATUS_M GENMASK(7, 0) +/* hisi_zip_sqe dw7 */ +#define HZIP_IN_SGE_DATA_OFFSET_M GENMASK(23, 0) +/* hisi_zip_sqe dw8 */ +#define HZIP_OUT_SGE_DATA_OFFSET_M GENMASK(23, 0) +/* hisi_zip_sqe dw9 */ +#define HZIP_REQ_TYPE_M GENMASK(7, 0) +#define HZIP_ALG_TYPE_ZLIB 0x02 +#define HZIP_ALG_TYPE_GZIP 0x03 +#define HZIP_BUF_TYPE_M GENMASK(11, 8) +#define HZIP_PBUFFER 0x0 +#define HZIP_SGL 0x1 + #define HZIP_ZLIB_HEAD_SIZE 2 #define HZIP_GZIP_HEAD_SIZE 10 -- 2.7.4