diff options
| -rw-r--r-- | drivers/crypto/caam/ctrl.c | 13 | ||||
| -rw-r--r-- | drivers/crypto/caam/regs.h | 1 |
2 files changed, 0 insertions, 14 deletions
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index 048bb2343231..8ae3ba2a160d 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c | |||
| @@ -52,8 +52,6 @@ static int caam_probe(struct platform_device *pdev) | |||
| 52 | struct caam_ctrl __iomem *ctrl; | 52 | struct caam_ctrl __iomem *ctrl; |
| 53 | struct caam_full __iomem *topregs; | 53 | struct caam_full __iomem *topregs; |
| 54 | struct caam_drv_private *ctrlpriv; | 54 | struct caam_drv_private *ctrlpriv; |
| 55 | struct caam_deco **deco; | ||
| 56 | u32 deconum; | ||
| 57 | #ifdef CONFIG_DEBUG_FS | 55 | #ifdef CONFIG_DEBUG_FS |
| 58 | struct caam_perfmon *perfmon; | 56 | struct caam_perfmon *perfmon; |
| 59 | #endif | 57 | #endif |
| @@ -92,17 +90,6 @@ static int caam_probe(struct platform_device *pdev) | |||
| 92 | if (sizeof(dma_addr_t) == sizeof(u64)) | 90 | if (sizeof(dma_addr_t) == sizeof(u64)) |
| 93 | dma_set_mask(dev, DMA_BIT_MASK(36)); | 91 | dma_set_mask(dev, DMA_BIT_MASK(36)); |
| 94 | 92 | ||
| 95 | /* Find out how many DECOs are present */ | ||
| 96 | deconum = (rd_reg64(&topregs->ctrl.perfmon.cha_num) & | ||
| 97 | CHA_NUM_DECONUM_MASK) >> CHA_NUM_DECONUM_SHIFT; | ||
| 98 | |||
| 99 | ctrlpriv->deco = kmalloc(deconum * sizeof(struct caam_deco *), | ||
| 100 | GFP_KERNEL); | ||
| 101 | |||
| 102 | deco = (struct caam_deco __force **)&topregs->deco; | ||
| 103 | for (d = 0; d < deconum; d++) | ||
| 104 | ctrlpriv->deco[d] = deco[d]; | ||
| 105 | |||
| 106 | /* | 93 | /* |
| 107 | * Detect and enable JobRs | 94 | * Detect and enable JobRs |
| 108 | * First, find out how many ring spec'ed, allocate references | 95 | * First, find out how many ring spec'ed, allocate references |
diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h index aee394e39056..e9f7a70cdd5e 100644 --- a/drivers/crypto/caam/regs.h +++ b/drivers/crypto/caam/regs.h | |||
| @@ -657,7 +657,6 @@ struct caam_full { | |||
| 657 | u64 rsvd[512]; | 657 | u64 rsvd[512]; |
| 658 | struct caam_assurance assure; | 658 | struct caam_assurance assure; |
| 659 | struct caam_queue_if qi; | 659 | struct caam_queue_if qi; |
| 660 | struct caam_deco *deco; | ||
| 661 | }; | 660 | }; |
| 662 | 661 | ||
| 663 | #endif /* REGS_H */ | 662 | #endif /* REGS_H */ |
