summaryrefslogtreecommitdiff
path: root/drivers/nfc/st21nfcb
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2015-04-07 10:17:00 +0300
committerSamuel Ortiz <sameo@linux.intel.com>2015-04-07 13:05:12 +0300
commit3590ebc040c9ee5d06754ce926f0e7c3a595e46d (patch)
tree62d4e1160321ab1d8172e780280232311e4cd5e3 /drivers/nfc/st21nfcb
parent5df848f37b1d20e5dd64bea16ba9f69ed321e11b (diff)
downloadlinux-3590ebc040c9ee5d06754ce926f0e7c3a595e46d.tar.xz
NFC: logging neatening
Add missing terminating newlines to nfc_info and nfc_err to avoid possible interleaving from other messages. Miscellanea: o typo fix of "unknonwn" in message o remove unnecessary OOM messages as there's a generic dump_stack() o realign arguments Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc/st21nfcb')
-rw-r--r--drivers/nfc/st21nfcb/i2c.c5
-rw-r--r--drivers/nfc/st21nfcb/ndlc.c5
2 files changed, 3 insertions, 7 deletions
diff --git a/drivers/nfc/st21nfcb/i2c.c b/drivers/nfc/st21nfcb/i2c.c
index 7b53a5c84041..76a4cad41cec 100644
--- a/drivers/nfc/st21nfcb/i2c.c
+++ b/drivers/nfc/st21nfcb/i2c.c
@@ -313,11 +313,8 @@ static int st21nfcb_nci_i2c_probe(struct i2c_client *client,
phy = devm_kzalloc(&client->dev, sizeof(struct st21nfcb_i2c_phy),
GFP_KERNEL);
- if (!phy) {
- nfc_err(&client->dev,
- "Cannot allocate memory for st21nfcb i2c phy.\n");
+ if (!phy)
return -ENOMEM;
- }
phy->i2c_dev = client;
diff --git a/drivers/nfc/st21nfcb/ndlc.c b/drivers/nfc/st21nfcb/ndlc.c
index 5fbf59d2138c..6014b5859465 100644
--- a/drivers/nfc/st21nfcb/ndlc.c
+++ b/drivers/nfc/st21nfcb/ndlc.c
@@ -256,10 +256,9 @@ int ndlc_probe(void *phy_id, struct nfc_phy_ops *phy_ops, struct device *dev,
struct llt_ndlc *ndlc;
ndlc = devm_kzalloc(dev, sizeof(struct llt_ndlc), GFP_KERNEL);
- if (!ndlc) {
- nfc_err(dev, "Cannot allocate memory for ndlc.\n");
+ if (!ndlc)
return -ENOMEM;
- }
+
ndlc->ops = phy_ops;
ndlc->phy_id = phy_id;
ndlc->dev = dev;