crypto: caam - Fix kerneldoc
Subsystems (5)
PATCH v2 3/4 crypto: stm32-hash - Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiCommon pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.
---
Changes since v1:
1. None
--- drivers/crypto/stm32/stm32-hash.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/crypto/stm32/stm32-hash.c +3 -8
@@ -1464,14 +1464,9 @@ static int stm32_hash_probe(struct platform_device *pdev) } hdev->clk =devm_clk_get (&pdev->dev,NULL ); -if (IS_ERR (hdev->clk)) { -if (PTR_ERR (hdev->clk) != -EPROBE_DEFER ) { -dev_err (dev,"failed to get clock for hash (%lu)\n" , -PTR_ERR (hdev->clk)); - } - -return PTR_ERR (hdev->clk); - } +if (IS_ERR (hdev->clk)) +return dev_err_probe (dev,PTR_ERR (hdev->clk), +"failed to get clock for hash\n" ); ret =clk_prepare_enable (hdev->clk);if (ret) {
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 2/4 crypto: caam - Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiCommon pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.
---
Changes since v1:
1. Add Reviewed-by
--- drivers/crypto/caam/caamalg_qi2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/crypto/caam/caamalg_qi2.c +1 -2
@@ -5115,8 +5115,7 @@ static int dpaa2_caam_probe(struct fsl_mc_device *dpseci_dev)/* DPIO */ err =dpaa2_dpseci_dpio_setup (priv);if (err) { -if (err != -EPROBE_DEFER ) -dev_err (dev,"dpaa2_dpseci_dpio_setup() failed\n" ); +dev_err_probe (dev, err,"dpaa2_dpseci_dpio_setup() failed\n" ); goto err_dpio_setup; }
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 4/4 crypto: allwinner/sun8i - Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiCommon pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.
---
Changes since v1:
1. None
--- drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 9 +++------ drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-)
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c +3 -6
@@ -573,12 +573,9 @@ static int sun8i_ce_probe(struct platform_device *pdev)return irq; ce->reset =devm_reset_control_get (&pdev->dev,NULL ); -if (IS_ERR (ce->reset)) { -if (PTR_ERR (ce->reset) == -EPROBE_DEFER ) -return PTR_ERR (ce->reset); -dev_err (&pdev->dev,"No reset control found\n" ); -return PTR_ERR (ce->reset); - } +if (IS_ERR (ce->reset)) +return dev_err_probe (&pdev->dev,PTR_ERR (ce->reset), +"No reset control found\n" );mutex_init (&ce->mlock);
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c +3 -6
@@ -545,12 +545,9 @@ static int sun8i_ss_probe(struct platform_device *pdev)return irq; ss->reset =devm_reset_control_get (&pdev->dev,NULL ); -if (IS_ERR (ss->reset)) { -if (PTR_ERR (ss->reset) == -EPROBE_DEFER ) -return PTR_ERR (ss->reset); -dev_err (&pdev->dev,"No reset control found\n" ); -return PTR_ERR (ss->reset); - } +if (IS_ERR (ss->reset)) +return dev_err_probe (&pdev->dev,PTR_ERR (ss->reset), +"No reset control found\n" );mutex_init (&ss->mlock);
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 1/4 crypto: caam - Fix kerneldoc
Fix kerneldoc warnings like:
drivers/crypto/caam/caamalg_qi2.c:73: warning: cannot understand function prototype: 'struct caam_ctx' drivers/crypto/caam/caamalg_qi2.c:2962: warning: cannot understand function prototype: 'struct caam_hash_ctx' drivers/crypto/caam/ctrl.c:449: warning: Function parameter or member 'ctrl' not described in 'caam_get_era'
---
Changes since v1:
1. Fix more warnings
--- drivers/crypto/caam/caamalg_desc.c | 1 + drivers/crypto/caam/caamalg_qi2.c | 4 ++-- drivers/crypto/caam/ctrl.c | 4 +++- drivers/crypto/caam/jr.c | 10 +++++----- 4 files changed, 11 insertions(+), 8 deletions(-)
drivers/crypto/caam/caamalg_desc.c +1 -0
@@ -373,6 +373,7 @@ EXPORT_SYMBOL(cnstr_shdsc_aead_encap);* with OP_ALG_AAI_HMAC_PRECOMP. * @ivsize: initialization vector size * @icvsize: integrity check value (ICV) size (truncated or full) +* @geniv: whether to generate Encrypted Chain IV * @is_rfc3686: true when ctr(aes) is wrapped by rfc3686 template * @nonce: pointer to rfc3686 nonce * @ctx1_iv_off: IV offset in CONTEXT1 register
drivers/crypto/caam/caamalg_qi2.c +2 -2
@@ -59,7 +59,7 @@ struct caam_skcipher_alg { };/** -* caam_ctx - per-session context +* struct caam_ctx - per-session context * @flc: Flow Contexts array * @key: [authentication key], encryption key * @flc_dma: I/O virtual addresses of the Flow Contexts
@@ -2951,7 +2951,7 @@ enum hash_optype { };/** -* caam_hash_ctx - ahash per-session context +* struct caam_hash_ctx - ahash per-session context * @flc: Flow Contexts array * @key: authentication key * @flc_dma: I/O virtual addresses of the Flow Contexts
drivers/crypto/caam/ctrl.c +3 -1
@@ -444,7 +444,9 @@ static int caam_get_era_from_hw(struct caam_ctrl __iomem *ctrl)* by u-boot. * In case this property is not passed an attempt to retrieve the CAAM * era via register reads will be made. -**/ +* +* @ctrl: controller region +*/ static int caam_get_era (struct caam_ctrl __iomem *ctrl) {struct device_node *caam_node;
drivers/crypto/caam/jr.c +5 -5
@@ -324,7 +324,7 @@ EXPORT_SYMBOL(caam_jr_alloc);/** * caam_jr_free() - Free the Job Ring -* @rdev - points to the dev that identifies the Job ring to +* @rdev: points to the dev that identifies the Job ring to * be released. **/ void caam_jr_free (struct device *rdev)
@@ -349,15 +349,15 @@ EXPORT_SYMBOL(caam_jr_free);* of this request. This has the form: * callback(struct device *dev, u32 *desc, u32 stat, void *arg) * where: -* @dev: contains the job ring device that processed this +* dev: contains the job ring device that processed this * response. -* @desc: descriptor that initiated the request, same as +* desc: descriptor that initiated the request, same as * "desc" being argued to caam_jr_enqueue(). -* @status: untranslated status received from CAAM. See the +* status: untranslated status received from CAAM. See the * reference manual for a detailed description of * error meaning, or see the JRSTA definitions in the * register header file -* @areq: optional pointer to an argument passed with the +* areq: optional pointer to an argument passed with the * original request * @areq: optional pointer to a user argument for use at callback * time.
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 7 lines · Krzysztof Kozlowski
Fix kerneldoc warnings like:
drivers/crypto/caam/caamalg_qi2.c:73: warning: cannot understand function prototype: 'structcaam_ctx'drivers/crypto/caam/caamalg_qi2.c:2962: warning: cannot understand function prototype: 'structcaam_hash_ctx'drivers/crypto/caam/ctrl.c:449: warning: Function parameter or member 'ctrl' not described in 'caam_get_era'Signed-off-by Krzysztof Kozlowski <[email protected]>
Quoted 95 lines
---
Changes since v1:
1. Fix more warnings--- drivers/crypto/caam/caamalg_desc.c | 1 + drivers/crypto/caam/caamalg_qi2.c | 4 ++-- drivers/crypto/caam/ctrl.c | 4 +++- drivers/crypto/caam/jr.c | 10 +++++----- 4 files changed, 11 insertions(+), 8 deletions(-)drivers/crypto/caam/caamalg_desc.c +1
-0@@ -373,6 +373,7 @@ EXPORT_SYMBOL(cnstr_shdsc_aead_encap);* with OP_ALG_AAI_HMAC_PRECOMP. * @ivsize: initialization vector size * @icvsize: integrity check value (ICV) size (truncated or full) +* @geniv: whether to generate Encrypted Chain IV * @is_rfc3686: true when ctr(aes) is wrapped by rfc3686 template * @nonce: pointer to rfc3686 nonce * @ctx1_iv_off: IV offset in CONTEXT1 register drivers/crypto/caam/caamalg_qi2.c +2
-2@@ -59,7 +59,7 @@ struct caam_skcipher_alg { };/** -* caam_ctx - per-session context +* struct caam_ctx - per-session context * @flc: Flow Contexts array * @key: [authentication key], encryption key * @flc_dma: I/O virtual addresses of the Flow Contexts @@ -2951,7 +2951,7 @@ enum hash_optype { };/** -* caam_hash_ctx - ahash per-session context +* struct caam_hash_ctx - ahash per-session context * @flc: Flow Contexts array * @key: authentication key * @flc_dma: I/O virtual addresses of the Flow Contexts drivers/crypto/caam/ctrl.c +3
-1@@ -444,7 +444,9 @@ static int caam_get_era_from_hw(struct caam_ctrl __iomem *ctrl)* by u-boot. * In case this property is not passed an attempt to retrieve the CAAM * era via register reads will be made. -**/ +* +* @ctrl: controller region +*/ static int caam_get_era (struct caam_ctrl __iomem *ctrl) {struct device_node *caam_node;drivers/crypto/caam/jr.c +5
-5@@ -324,7 +324,7 @@ EXPORT_SYMBOL(caam_jr_alloc);/** * caam_jr_free() - Free the Job Ring -* @rdev - points to the dev that identifies the Job ring to +* @rdev: points to the dev that identifies the Job ring to * be released. **/ void caam_jr_free (struct device *rdev)@@ -349,15 +349,15 @@ EXPORT_SYMBOL(caam_jr_free);* of this request. This has the form: * callback(struct device *dev, u32 *desc, u32 stat, void *arg) * where: -* @dev: contains the job ring device that processed this +* dev: contains the job ring device that processed this * response. -* @desc: descriptor that initiated the request, same as +* desc: descriptor that initiated the request, same as * "desc" being argued to caam_jr_enqueue(). -* @status: untranslated status received from CAAM. See the +* status: untranslated status received from CAAM. See the * reference manual for a detailed description of * error meaning, or see the JRSTA definitions in the * register header file -* @areq: optional pointer to an argument passed with the +* areq: optional pointer to an argument passed with the * original request * @areq: optional pointer to a user argument for use at callback * time.
Re: [PATCH v2 4/4] crypto: allwinner/sun8i - Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiQuoted 57 lines · Krzysztof Kozlowski
Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and the error value gets printed.Signed-off-by Krzysztof Kozlowski <[email protected]>---
Changes since v1:
1. None--- drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 9 +++------ drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-)drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c +3
-6@@ -573,12 +573,9 @@ static int sun8i_ce_probe(struct platform_device *pdev)return irq; ce->reset =devm_reset_control_get (&pdev->dev,NULL ); -if (IS_ERR (ce->reset)) { -if (PTR_ERR (ce->reset) == -EPROBE_DEFER ) -return PTR_ERR (ce->reset); -dev_err (&pdev->dev,"No reset control found\n" ); -return PTR_ERR (ce->reset); - } +if (IS_ERR (ce->reset)) +return dev_err_probe (&pdev->dev,PTR_ERR (ce->reset), +"No reset control found\n" );mutex_init (&ce->mlock);drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c +3
-6@@ -545,12 +545,9 @@ static int sun8i_ss_probe(struct platform_device *pdev)return irq; ss->reset =devm_reset_control_get (&pdev->dev,NULL ); -if (IS_ERR (ss->reset)) { -if (PTR_ERR (ss->reset) == -EPROBE_DEFER ) -return PTR_ERR (ss->reset); -dev_err (&pdev->dev,"No reset control found\n" ); -return PTR_ERR (ss->reset); - } +if (IS_ERR (ss->reset)) +return dev_err_probe (&pdev->dev,PTR_ERR (ss->reset), +"No reset control found\n" );mutex_init (&ss->mlock);Signature · 1 line
2.17.1
Hello
Thanks
Herbert Xu
maintainerQuoted 10 lines · Krzysztof Kozlowski
Fix kerneldoc warnings like:
drivers/crypto/caam/caamalg_qi2.c:73: warning: cannot understand function prototype: 'structcaam_ctx'drivers/crypto/caam/caamalg_qi2.c:2962: warning: cannot understand function prototype: 'structcaam_hash_ctx'drivers/crypto/caam/ctrl.c:449: warning: Function parameter or member 'ctrl' not described in 'caam_get_era'Signed-off-by Krzysztof Kozlowski <[email protected]>---
Quoted 8 lines
Changes since v1:
1. Fix more warnings--- drivers/crypto/caam/caamalg_desc.c | 1 + drivers/crypto/caam/caamalg_qi2.c | 4 ++-- drivers/crypto/caam/ctrl.c | 4 +++- drivers/crypto/caam/jr.c | 10 +++++----- 4 files changed, 11 insertions(+), 8 deletions(-)
All applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt