diff options
author | Tadeusz Struk <tadeusz.struk@intel.com> | 2014-07-25 18:55:41 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-08-01 10:36:06 -0400 |
commit | 8c1f8e3bbf60d0d06190be81f55d5199d52a463f (patch) | |
tree | 3fa3da68bfcf4bfb44c09689740ce79860b9f326 | |
parent | df0088f50712f9540769c542d0b4d27acc4fc527 (diff) |
crypto: qat - change slice->regions to slice->region
Change ptr name slice->regions to slice->region to reflect the same
in the page struct.
Signed-off-by: Pingchao Yang <pingchao.yang@intel.com>
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r-- | drivers/crypto/qat/qat_common/icp_qat_uclo.h | 2 | ||||
-rw-r--r-- | drivers/crypto/qat/qat_common/qat_uclo.c | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/crypto/qat/qat_common/icp_qat_uclo.h b/drivers/crypto/qat/qat_common/icp_qat_uclo.h index 120fbce517a9..2132a8cbc4ec 100644 --- a/drivers/crypto/qat/qat_common/icp_qat_uclo.h +++ b/drivers/crypto/qat/qat_common/icp_qat_uclo.h | |||
@@ -124,7 +124,7 @@ struct icp_qat_uclo_region { | |||
124 | }; | 124 | }; |
125 | 125 | ||
126 | struct icp_qat_uclo_aeslice { | 126 | struct icp_qat_uclo_aeslice { |
127 | struct icp_qat_uclo_region *regions; | 127 | struct icp_qat_uclo_region *region; |
128 | struct icp_qat_uclo_page *page; | 128 | struct icp_qat_uclo_page *page; |
129 | struct icp_qat_uclo_page *cur_page[ICP_QAT_UCLO_MAX_CTX]; | 129 | struct icp_qat_uclo_page *cur_page[ICP_QAT_UCLO_MAX_CTX]; |
130 | struct icp_qat_uclo_encapme *encap_image; | 130 | struct icp_qat_uclo_encapme *encap_image; |
diff --git a/drivers/crypto/qat/qat_common/qat_uclo.c b/drivers/crypto/qat/qat_common/qat_uclo.c index b1a16eb5a36d..557fa606da89 100644 --- a/drivers/crypto/qat/qat_common/qat_uclo.c +++ b/drivers/crypto/qat/qat_common/qat_uclo.c | |||
@@ -79,37 +79,37 @@ static int qat_uclo_init_ae_data(struct icp_qat_uclo_objhandle *obj_handle, | |||
79 | } else { | 79 | } else { |
80 | ae_slice->ctx_mask_assigned = 0; | 80 | ae_slice->ctx_mask_assigned = 0; |
81 | } | 81 | } |
82 | ae_slice->regions = kzalloc(sizeof(*ae_slice->regions), GFP_KERNEL); | 82 | ae_slice->region = kzalloc(sizeof(*ae_slice->region), GFP_KERNEL); |
83 | if (!ae_slice->regions) | 83 | if (!ae_slice->region) |
84 | return -ENOMEM; | 84 | return -ENOMEM; |
85 | ae_slice->page = kzalloc(sizeof(*ae_slice->page), GFP_KERNEL); | 85 | ae_slice->page = kzalloc(sizeof(*ae_slice->page), GFP_KERNEL); |
86 | if (!ae_slice->page) | 86 | if (!ae_slice->page) |
87 | goto out_err; | 87 | goto out_err; |
88 | page = ae_slice->page; | 88 | page = ae_slice->page; |
89 | page->encap_page = encap_image->page; | 89 | page->encap_page = encap_image->page; |
90 | ae_slice->page->region = ae_slice->regions; | 90 | ae_slice->page->region = ae_slice->region; |
91 | ae_data->slice_num++; | 91 | ae_data->slice_num++; |
92 | return 0; | 92 | return 0; |
93 | out_err: | 93 | out_err: |
94 | kfree(ae_slice->regions); | 94 | kfree(ae_slice->region); |
95 | ae_slice->regions = NULL; | 95 | ae_slice->region = NULL; |
96 | return -ENOMEM; | 96 | return -ENOMEM; |
97 | } | 97 | } |
98 | 98 | ||
99 | static int qat_uclo_free_ae_data(struct icp_qat_uclo_aedata *ae_data) | 99 | static int qat_uclo_free_ae_data(struct icp_qat_uclo_aedata *ae_data) |
100 | { | 100 | { |
101 | unsigned int ss = 0; | 101 | unsigned int i; |
102 | 102 | ||
103 | if (!ae_data) { | 103 | if (!ae_data) { |
104 | pr_err("QAT: bad argument, ae_data is NULL\n "); | 104 | pr_err("QAT: bad argument, ae_data is NULL\n "); |
105 | return -EINVAL; | 105 | return -EINVAL; |
106 | } | 106 | } |
107 | 107 | ||
108 | for (ss = 0; ss < ae_data->slice_num; ss++) { | 108 | for (i = 0; i < ae_data->slice_num; i++) { |
109 | kfree(ae_data->ae_slices[ss].regions); | 109 | kfree(ae_data->ae_slices[i].region); |
110 | ae_data->ae_slices[ss].regions = NULL; | 110 | ae_data->ae_slices[i].region = NULL; |
111 | kfree(ae_data->ae_slices[ss].page); | 111 | kfree(ae_data->ae_slices[i].page); |
112 | ae_data->ae_slices[ss].page = NULL; | 112 | ae_data->ae_slices[i].page = NULL; |
113 | } | 113 | } |
114 | return 0; | 114 | return 0; |
115 | } | 115 | } |