diff options
| author | Victoria Milhoan <vicki.milhoan@freescale.com> | 2014-11-19 13:55:07 -0700 |
|---|---|---|
| committer | Victoria Milhoan <vicki.milhoan@freescale.com> | 2014-12-05 10:48:45 -0700 |
| commit | 746f13662e57d4ee127f0ad30f10ff4a944a4da3 (patch) | |
| tree | d06db135ee9f85c5f7148c3b332cccee5b6fb458 | |
| parent | ccc6f0c4831e9576f9244554526b7561c813f909 (diff) | |
MLK-9950 Remove deprecated caam_get_jrdev() from CAAM driver
The caam_get_jrdev() function is no longer needed. The
caam_jr_alloc() function is used instead to allocate a job
ring device from the CAAM driver.
Signed-off-by: Victoria Milhoan <vicki.milhoan@freescale.com>
(cherry picked from commit bae574f498f4928ee5a42abeb419b045af5e1d91)
| -rw-r--r-- | drivers/crypto/caam/ctrl.c | 15 | ||||
| -rw-r--r-- | drivers/crypto/caam/jr.h | 3 |
2 files changed, 1 insertions, 17 deletions
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index 05f82228ef87..5712352203ea 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c @@ -17,9 +17,6 @@ #include "ctrl.h" #include "sm.h" -/* Used to capture the array of job rings */ -struct device **caam_jr_dev; - /* * Descriptor to instantiate RNG State Handle 0 in normal mode and * load the JDKEK, TDKEK and TDSK registers @@ -409,18 +406,6 @@ int caam_get_era(u64 caam_id) } EXPORT_SYMBOL(caam_get_era); -/* - * Return a job ring device. This is available so outside - * entities can gain direct access to the job ring. For now, - * this function returns the first job ring (at index 0). - */ -struct device *caam_get_jrdev(void) -{ - return caam_jr_dev[0]; -} -EXPORT_SYMBOL(caam_get_jrdev); - - /* Probe routine for CAAM top (controller) level */ static int caam_probe(struct platform_device *pdev) { diff --git a/drivers/crypto/caam/jr.h b/drivers/crypto/caam/jr.h index 9c9faefd463f..4c010dc3bd3d 100644 --- a/drivers/crypto/caam/jr.h +++ b/drivers/crypto/caam/jr.h @@ -1,7 +1,7 @@ /* * CAAM public-level include definitions for the JobR backend * - * Copyright (C) 2008-2013 Freescale Semiconductor, Inc. + * Copyright (C) 2008-2014 Freescale Semiconductor, Inc. */ #ifndef JR_H @@ -15,5 +15,4 @@ int caam_jr_enqueue(struct device *dev, u32 *desc, void *areq), void *areq); -extern struct device *caam_get_jrdev(void); #endif /* JR_H */ |