crypto: ux500 - Adjust two condition checks in ux500_cryp_probe()
authorMarkus Elfring <elfring@users.sourceforge.net>
Wed, 14 Feb 2018 09:38:44 +0000 (10:38 +0100)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 22 Feb 2018 14:16:34 +0000 (22:16 +0800)
The local variable "cryp_error" was used only for two condition checks.

* Check the return values from these function calls directly instead.

* Delete this variable which became unnecessary with this refactoring.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/ux500/cryp/cryp_core.c

index 50bfc7b4c641d0842416d1109a94145fedf6b667..07cc92f889332cd287e3a648b91e28aaa1a55ac9 100644 (file)
@@ -1404,7 +1404,6 @@ static void cryp_algs_unregister_all(void)
 static int ux500_cryp_probe(struct platform_device *pdev)
 {
        int ret;
-       int cryp_error = 0;
        struct resource *res = NULL;
        struct resource *res_irq = NULL;
        struct cryp_device_data *device_data;
@@ -1478,15 +1477,13 @@ static int ux500_cryp_probe(struct platform_device *pdev)
                goto out_clk_unprepare;
        }
 
-       cryp_error = cryp_check(device_data);
-       if (cryp_error != 0) {
+       if (cryp_check(device_data)) {
                dev_err(dev, "[%s]: cryp_init() failed!", __func__);
                ret = -EINVAL;
                goto out_power;
        }
 
-       cryp_error = cryp_configure_protection(device_data, &prot);
-       if (cryp_error != 0) {
+       if (cryp_configure_protection(device_data, &prot)) {
                dev_err(dev, "[%s]: cryp_configure_protection() failed!",
                        __func__);
                ret = -EINVAL;