diff options
| author | Joe Perches <joe@perches.com> | 2015-04-07 00:17:00 -0700 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-04-07 12:05:12 +0200 |
| commit | 3590ebc040c9ee5d06754ce926f0e7c3a595e46d (patch) | |
| tree | 62d4e1160321ab1d8172e780280232311e4cd5e3 /drivers/nfc/pn544/i2c.c | |
| parent | 5df848f37b1d20e5dd64bea16ba9f69ed321e11b (diff) | |
| download | blackbird-op-linux-3590ebc040c9ee5d06754ce926f0e7c3a595e46d.tar.gz blackbird-op-linux-3590ebc040c9ee5d06754ce926f0e7c3a595e46d.zip | |
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/pn544/i2c.c')
| -rw-r--r-- | drivers/nfc/pn544/i2c.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c index cdde745b96bd..6fd986f5ac3e 100644 --- a/drivers/nfc/pn544/i2c.c +++ b/drivers/nfc/pn544/i2c.c @@ -953,7 +953,7 @@ static int pn544_hci_i2c_acpi_request_resources(struct i2c_client *client) } nfc_info(dev, "GPIO resource, no:%d irq:%d\n", - desc_to_gpio(gpiod_irq), ret); + desc_to_gpio(gpiod_irq), ret); client->irq = ret; return 0; @@ -1062,11 +1062,8 @@ static int pn544_hci_i2c_probe(struct i2c_client *client, phy = devm_kzalloc(&client->dev, sizeof(struct pn544_i2c_phy), GFP_KERNEL); - if (!phy) { - nfc_err(&client->dev, - "Cannot allocate memory for pn544 i2c phy.\n"); + if (!phy) return -ENOMEM; - } INIT_WORK(&phy->fw_work, pn544_hci_i2c_fw_work); phy->fw_work_state = FW_WORK_STATE_IDLE; |
