crypto: nx - do not emit extra output if status is disabled
authorNishanth Aravamudan <nacc@linux.vnet.ibm.com>
Thu, 2 Jul 2015 22:40:09 +0000 (15:40 -0700)
committerHerbert Xu <herbert@gondor.apana.org.au>
Mon, 6 Jul 2015 08:32:03 +0000 (16:32 +0800)
If the device-tree indicates the nx-842 device's status is 'disabled',
we emit two messages:

nx_compress_pseries ibm,compression-v1: nx842_OF_upd_status: status 'disabled' is not 'okay'.
nx_compress_pseries ibm,compression-v1: nx842_OF_upd: device disabled

Given that 'disabled' is a valid state, and we are going to emit that
the device is disabled, only print out a non-'okay' status if it is not
'disabled'.

Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/nx/nx-842-pseries.c

index e17f4d2e96e08810233638ad27e397223a7c592a..b84b0ceeb46ecaaeabab0f484332447d085d9547 100644 (file)
@@ -566,8 +566,14 @@ static int nx842_OF_upd_status(struct nx842_devdata *devdata,
        if (!strncmp(status, "okay", (size_t)prop->length)) {
                devdata->status = AVAILABLE;
        } else {
-               dev_info(devdata->dev, "%s: status '%s' is not 'okay'\n",
+               /*
+                * Caller will log that the device is disabled, so only
+                * output if there is an unexpected status.
+                */
+               if (strncmp(status, "disabled", (size_t)prop->length)) {
+                       dev_info(devdata->dev, "%s: status '%s' is not 'okay'\n",
                                __func__, status);
+               }
                devdata->status = UNAVAILABLE;
                ret = -ENODEV;
        }