crypto: crypto4xx - replace crypto4xx_dev's scatter_buffer_size with constant

scatter_buffer_size is always set to PPC4XX_SD_BUFFER_SIZE.
I don't think there's any point in keeping the variable
around.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c
index f3f1518203738b43ce25d3d508f8635be6ca68a4..c47c84f7492a1c84a9ad1afa609ab1402996893f 100644 (file)
--- a/drivers/crypto/amcc/crypto4xx_core.c
+++ b/drivers/crypto/amcc/crypto4xx_core.c
@@ -394,10 +394,9 @@ static u32 crypto4xx_build_sdr(struct crypto4xx_device *dev)
        if (!dev->sdr)
                return -ENOMEM;
 
-       dev->scatter_buffer_size = PPC4XX_SD_BUFFER_SIZE;
        dev->scatter_buffer_va =
                dma_alloc_coherent(dev->core_dev->device,
-                       dev->scatter_buffer_size * PPC4XX_NUM_SD,
+                       PPC4XX_SD_BUFFER_SIZE * PPC4XX_NUM_SD,
                        &dev->scatter_buffer_pa, GFP_ATOMIC);
        if (!dev->scatter_buffer_va) {
                dma_free_coherent(dev->core_dev->device,
@@ -410,7 +409,7 @@ static u32 crypto4xx_build_sdr(struct crypto4xx_device *dev)
 
        for (i = 0; i < PPC4XX_NUM_SD; i++) {
                sd_array[i].ptr = dev->scatter_buffer_pa +
-                                 dev->scatter_buffer_size * i;
+                                 PPC4XX_SD_BUFFER_SIZE * i;
        }
 
        return 0;
@@ -425,7 +424,7 @@ static void crypto4xx_destroy_sdr(struct crypto4xx_device *dev)
 
        if (dev->scatter_buffer_va != NULL)
                dma_free_coherent(dev->core_dev->device,
-                                 dev->scatter_buffer_size * PPC4XX_NUM_SD,
+                                 PPC4XX_SD_BUFFER_SIZE * PPC4XX_NUM_SD,
                                  dev->scatter_buffer_va,
                                  dev->scatter_buffer_pa);
 }

diff --git a/drivers/crypto/amcc/crypto4xx_core.h b/drivers/crypto/amcc/crypto4xx_core.h
index f886b8bdc8687f1808a11b0a838d099d96cc3911..dc8452be10039c89fe75e07ca1499827a7f31502 100644 (file)
--- a/drivers/crypto/amcc/crypto4xx_core.h
+++ b/drivers/crypto/amcc/crypto4xx_core.h
@@ -87,7 +87,6 @@ struct crypto4xx_device {
                                        program ce sdr_base_register */
        void *scatter_buffer_va;
        dma_addr_t scatter_buffer_pa;
-       u32 scatter_buffer_size;
 
        void *shadow_sa_pool;           /* pool of memory for sa in pd_uinfo */
        dma_addr_t shadow_sa_pool_pa;