From c0ce5d6c77955ae6f13f43ab3043e081c1ff17a4 Mon Sep 17 00:00:00 2001 From: Kim Phillips Date: Mon, 12 Dec 2011 14:59:16 -0600 Subject: [PATCH] --- yaml --- r: 283307 b: refs/heads/master c: a1a38c4c6a0f73e8a9dc217c0e4e0ac483a89f25 h: refs/heads/master i: 283305: d5d7509a52495babf7bab5eff922438f8cf1706e 283303: 5e13366e3cc97f71d8d17d731b6461449b3ea396 v: v3 --- [refs] | 2 +- trunk/drivers/crypto/caam/ctrl.c | 13 ------------- trunk/drivers/crypto/caam/regs.h | 1 - 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 1742ac2d5741..dd76849fccec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2ecb155a30fea933cc539fc2064fef825fd9511 +refs/heads/master: a1a38c4c6a0f73e8a9dc217c0e4e0ac483a89f25 diff --git a/trunk/drivers/crypto/caam/ctrl.c b/trunk/drivers/crypto/caam/ctrl.c index 048bb2343231..8ae3ba2a160d 100644 --- a/trunk/drivers/crypto/caam/ctrl.c +++ b/trunk/drivers/crypto/caam/ctrl.c @@ -52,8 +52,6 @@ static int caam_probe(struct platform_device *pdev) struct caam_ctrl __iomem *ctrl; struct caam_full __iomem *topregs; struct caam_drv_private *ctrlpriv; - struct caam_deco **deco; - u32 deconum; #ifdef CONFIG_DEBUG_FS struct caam_perfmon *perfmon; #endif @@ -92,17 +90,6 @@ static int caam_probe(struct platform_device *pdev) if (sizeof(dma_addr_t) == sizeof(u64)) dma_set_mask(dev, DMA_BIT_MASK(36)); - /* Find out how many DECOs are present */ - deconum = (rd_reg64(&topregs->ctrl.perfmon.cha_num) & - CHA_NUM_DECONUM_MASK) >> CHA_NUM_DECONUM_SHIFT; - - ctrlpriv->deco = kmalloc(deconum * sizeof(struct caam_deco *), - GFP_KERNEL); - - deco = (struct caam_deco __force **)&topregs->deco; - for (d = 0; d < deconum; d++) - ctrlpriv->deco[d] = deco[d]; - /* * Detect and enable JobRs * First, find out how many ring spec'ed, allocate references diff --git a/trunk/drivers/crypto/caam/regs.h b/trunk/drivers/crypto/caam/regs.h index aee394e39056..e9f7a70cdd5e 100644 --- a/trunk/drivers/crypto/caam/regs.h +++ b/trunk/drivers/crypto/caam/regs.h @@ -657,7 +657,6 @@ struct caam_full { u64 rsvd[512]; struct caam_assurance assure; struct caam_queue_if qi; - struct caam_deco *deco; }; #endif /* REGS_H */