Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9f28469 authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Greg Kroah-Hartman
Browse files

staging: ccree: remove unused cc_base parameter 



Remove a common parameter named cc_base with the pointer
to the mapped command registers which was used by the
old register access macros that are not longer in use.

Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 155ff091

drivers/staging/ccree/ssi_aead.c

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ static int ssi_aead_init(struct crypto_aead *tfm) 
	return -ENOMEM;

}



static void ssi_aead_complete(struct device *dev, void *ssi_req, void __iomem *cc_base)

static void ssi_aead_complete(struct device *dev, void *ssi_req)

{

	struct aead_request *areq = (struct aead_request *)ssi_req;

	struct aead_req_ctx *areq_ctx = aead_request_ctx(areq);

drivers/staging/ccree/ssi_cipher.c

+5 −7
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ struct ssi_ablkcipher_ctx { 
	struct crypto_shash *shash_tfm;

};



static void ssi_ablkcipher_complete(struct device *dev, void *ssi_req, void __iomem *cc_base);

static void ssi_ablkcipher_complete(struct device *dev, void *ssi_req);



static int validate_keys_sizes(struct ssi_ablkcipher_ctx *ctx_p, u32 size)

{
@@ -688,8 +688,7 @@ static int ssi_blkcipher_complete(struct device *dev, 
				  struct scatterlist *dst,

				  struct scatterlist *src,

				  unsigned int ivsize,

				  void *areq,

				  void __iomem *cc_base)

				  void *areq)

{

	int completion_error = 0;

	struct ablkcipher_request *req = (struct ablkcipher_request *)areq;
@@ -832,8 +831,7 @@ static int ssi_blkcipher_process( 
						   dst);

		} else {

			rc = ssi_blkcipher_complete(dev, ctx_p, req_ctx, dst,

						    src, ivsize, NULL,

						    ctx_p->drvdata->cc_base);

						    src, ivsize, NULL);

		}

	}
@@ -849,7 +847,7 @@ static int ssi_blkcipher_process( 
	return rc;

}



static void ssi_ablkcipher_complete(struct device *dev, void *ssi_req, void __iomem *cc_base)

static void ssi_ablkcipher_complete(struct device *dev, void *ssi_req)

{

	struct ablkcipher_request *areq = (struct ablkcipher_request *)ssi_req;

	struct blkcipher_req_ctx *req_ctx = ablkcipher_request_ctx(areq);
@@ -858,7 +856,7 @@ static void ssi_ablkcipher_complete(struct device *dev, void *ssi_req, void __io 
	unsigned int ivsize = crypto_ablkcipher_ivsize(tfm);



	ssi_blkcipher_complete(dev, ctx_p, req_ctx, areq->dst, areq->src,

			       ivsize, areq, cc_base);

			       ivsize, areq);

}



/* Async wrap functions */

drivers/staging/ccree/ssi_driver.c

+0 −3
Original line number Diff line number Diff line
@@ -199,7 +199,6 @@ int init_cc_regs(struct ssi_drvdata *drvdata, bool is_probe) 
static int init_cc_resources(struct platform_device *plat_dev)

{

	struct resource *req_mem_cc_regs = NULL;

	void __iomem *cc_base = NULL;

	struct ssi_drvdata *new_drvdata;

	struct device *dev = &plat_dev->dev;

	struct device_node *np = dev->of_node;
@@ -232,8 +231,6 @@ static int init_cc_resources(struct platform_device *plat_dev) 
	dev_dbg(dev, "CC registers mapped from %pa to 0x%p\n",

		&req_mem_cc_regs->start, new_drvdata->cc_base);



	cc_base = new_drvdata->cc_base;



	/* Then IRQ */

	new_drvdata->irq = platform_get_irq(plat_dev, 0);

	if (new_drvdata->irq < 0) {

drivers/staging/ccree/ssi_driver.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 


#define SSI_MAX_IVGEN_DMA_ADDRESSES	3

struct ssi_crypto_req {

	void (*user_cb)(struct device *dev, void *req, void __iomem *cc_base);

	void (*user_cb)(struct device *dev, void *req);

	void *user_arg;

	dma_addr_t ivgen_dma_addr[SSI_MAX_IVGEN_DMA_ADDRESSES];

	/* For the first 'ivgen_dma_addr_len' addresses of this array,

drivers/staging/ccree/ssi_hash.c

+3 −3
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ static void ssi_hash_unmap_result(struct device *dev, 
	state->digest_result_dma_addr = 0;

}



static void ssi_hash_update_complete(struct device *dev, void *ssi_req, void __iomem *cc_base)

static void ssi_hash_update_complete(struct device *dev, void *ssi_req)

{

	struct ahash_request *req = (struct ahash_request *)ssi_req;

	struct ahash_req_ctx *state = ahash_request_ctx(req);
@@ -368,7 +368,7 @@ static void ssi_hash_update_complete(struct device *dev, void *ssi_req, void __i 
	req->base.complete(&req->base, 0);

}



static void ssi_hash_digest_complete(struct device *dev, void *ssi_req, void __iomem *cc_base)

static void ssi_hash_digest_complete(struct device *dev, void *ssi_req)

{

	struct ahash_request *req = (struct ahash_request *)ssi_req;

	struct ahash_req_ctx *state = ahash_request_ctx(req);
@@ -384,7 +384,7 @@ static void ssi_hash_digest_complete(struct device *dev, void *ssi_req, void __i 
	req->base.complete(&req->base, 0);

}



static void ssi_hash_complete(struct device *dev, void *ssi_req, void __iomem *cc_base)

static void ssi_hash_complete(struct device *dev, void *ssi_req)

{

	struct ahash_request *req = (struct ahash_request *)ssi_req;

	struct ahash_req_ctx *state = ahash_request_ctx(req);