summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorNishanth Aravamudan <nacc@linux.vnet.ibm.com>2015-07-02 22:40:09 (GMT)
committerHerbert Xu <herbert@gondor.apana.org.au>2015-07-06 08:32:03 (GMT)
commit7abd75bf7ac6d04e0389472cf2cd3a8bf53e4894 (patch)
tree2c0b858b5a057fdb65414f156ddcaac5aaf7925a /drivers
parentec13bcbe07a202c32ea74927e27479aa4d19d1b1 (diff)
downloadlinux-7abd75bf7ac6d04e0389472cf2cd3a8bf53e4894.tar.xz
crypto: nx - do not emit extra output if status is disabled
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/crypto/nx/nx-842-pseries.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/crypto/nx/nx-842-pseries.c b/drivers/crypto/nx/nx-842-pseries.c
index e17f4d2..b84b0ce 100644
--- a/drivers/crypto/nx/nx-842-pseries.c
+++ b/drivers/crypto/nx/nx-842-pseries.c
@@ -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;
}