Commit 4f5d9865 authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Greg Kroah-Hartman

staging: ccree: Cleanup: remove references to page_link

This is a layering violation so we replace it with calls to
sg_page. This is a prep patch for replacing page_link and this
is one of the very few uses outside of scatterlist.h.
Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Signed-off-by: default avatarStephen Bates <sbates@raithlin.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c2b21f68
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
#ifdef CC_DEBUG #ifdef CC_DEBUG
#define DUMP_SGL(sg) \ #define DUMP_SGL(sg) \
while (sg) { \ while (sg) { \
SSI_LOG_DEBUG("page=%lu offset=%u length=%u (dma_len=%u) " \ SSI_LOG_DEBUG("page=%p offset=%u length=%u (dma_len=%u) " \
"dma_addr=%08x\n", (sg)->page_link, (sg)->offset, \ "dma_addr=%08x\n", sg_page(sg), (sg)->offset, \
(sg)->length, sg_dma_len(sg), (sg)->dma_address); \ (sg)->length, sg_dma_len(sg), (sg)->dma_address); \
(sg) = sg_next(sg); \ (sg) = sg_next(sg); \
} }
...@@ -442,10 +442,10 @@ static int ssi_buffer_mgr_map_scatterlist( ...@@ -442,10 +442,10 @@ static int ssi_buffer_mgr_map_scatterlist(
return -ENOMEM; return -ENOMEM;
} }
SSI_LOG_DEBUG("Mapped sg: dma_address=0x%llX " SSI_LOG_DEBUG("Mapped sg: dma_address=0x%llX "
"page_link=0x%08lX addr=%pK offset=%u " "page=%p addr=%pK offset=%u "
"length=%u\n", "length=%u\n",
(unsigned long long)sg_dma_address(sg), (unsigned long long)sg_dma_address(sg),
sg->page_link, sg_page(sg),
sg_virt(sg), sg_virt(sg),
sg->offset, sg->length); sg->offset, sg->length);
*lbytes = nbytes; *lbytes = nbytes;
...@@ -505,10 +505,10 @@ ssi_aead_handle_config_buf(struct device *dev, ...@@ -505,10 +505,10 @@ ssi_aead_handle_config_buf(struct device *dev,
return -ENOMEM; return -ENOMEM;
} }
SSI_LOG_DEBUG("Mapped curr_buff: dma_address=0x%llX " SSI_LOG_DEBUG("Mapped curr_buff: dma_address=0x%llX "
"page_link=0x%08lX addr=%pK " "page=%p addr=%pK "
"offset=%u length=%u\n", "offset=%u length=%u\n",
(unsigned long long)sg_dma_address(&areq_ctx->ccm_adata_sg), (unsigned long long)sg_dma_address(&areq_ctx->ccm_adata_sg),
areq_ctx->ccm_adata_sg.page_link, sg_page(&areq_ctx->ccm_adata_sg),
sg_virt(&areq_ctx->ccm_adata_sg), sg_virt(&areq_ctx->ccm_adata_sg),
areq_ctx->ccm_adata_sg.offset, areq_ctx->ccm_adata_sg.offset,
areq_ctx->ccm_adata_sg.length); areq_ctx->ccm_adata_sg.length);
...@@ -540,10 +540,10 @@ static inline int ssi_ahash_handle_curr_buf(struct device *dev, ...@@ -540,10 +540,10 @@ static inline int ssi_ahash_handle_curr_buf(struct device *dev,
return -ENOMEM; return -ENOMEM;
} }
SSI_LOG_DEBUG("Mapped curr_buff: dma_address=0x%llX " SSI_LOG_DEBUG("Mapped curr_buff: dma_address=0x%llX "
"page_link=0x%08lX addr=%pK " "page=%p addr=%pK "
"offset=%u length=%u\n", "offset=%u length=%u\n",
(unsigned long long)sg_dma_address(areq_ctx->buff_sg), (unsigned long long)sg_dma_address(areq_ctx->buff_sg),
areq_ctx->buff_sg->page_link, sg_page(areq_ctx->buff_sg),
sg_virt(areq_ctx->buff_sg), sg_virt(areq_ctx->buff_sg),
areq_ctx->buff_sg->offset, areq_ctx->buff_sg->offset,
areq_ctx->buff_sg->length); areq_ctx->buff_sg->length);
...@@ -1870,4 +1870,3 @@ int ssi_buffer_mgr_fini(struct ssi_drvdata *drvdata) ...@@ -1870,4 +1870,3 @@ int ssi_buffer_mgr_fini(struct ssi_drvdata *drvdata)
} }
return 0; return 0;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment