lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NFC: pn533: Fix quoted strings split across lines

Browse Source 
Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Waldemar Rymarkiewicz
2012-12-10 14:42:49 +01:00
committed by Samuel Ortiz
parent b5193e5da2
commit 6ca55372bf
1 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
drivers/nfc/pn533.c
View File

@@ -515,13 +515,13 @@ static void pn533_recv_response(struct urb *urb)
case -ECONNRESET: case -ECONNRESET:
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: case -ESHUTDOWN:
nfc_dev_dbg(&dev->interface->dev, "Urb shutting down with" nfc_dev_dbg(&dev->interface->dev,
" status: %d", urb->status); "Urb shutting down with status: %d", urb->status);
dev->wq_in_error = urb->status; dev->wq_in_error = urb->status;
goto sched_wq; goto sched_wq;
default: default:
nfc_dev_err(&dev->interface->dev, "Nonzero urb status received:" nfc_dev_err(&dev->interface->dev,
" %d", urb->status); "Nonzero urb status received: %d", urb->status);
dev->wq_in_error = urb->status; dev->wq_in_error = urb->status;
goto sched_wq; goto sched_wq;
} }
@@ -538,8 +538,8 @@ static void pn533_recv_response(struct urb *urb)
} }
if (!pn533_rx_frame_is_cmd_response(in_frame, dev->cmd)) { if (!pn533_rx_frame_is_cmd_response(in_frame, dev->cmd)) {
nfc_dev_err(&dev->interface->dev, "The received frame is not " nfc_dev_err(&dev->interface->dev,
"response to the last command"); "It it not the response to the last command");
dev->wq_in_error = -EIO; dev->wq_in_error = -EIO;
goto sched_wq; goto sched_wq;
} }
@@ -572,13 +572,13 @@ static void pn533_recv_ack(struct urb *urb)
case -ECONNRESET: case -ECONNRESET:
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: case -ESHUTDOWN:
nfc_dev_dbg(&dev->interface->dev, "Urb shutting down with" nfc_dev_dbg(&dev->interface->dev,
" status: %d", urb->status); "Urb shutting down with status: %d", urb->status);
dev->wq_in_error = urb->status; dev->wq_in_error = urb->status;
goto sched_wq; goto sched_wq;
default: default:
nfc_dev_err(&dev->interface->dev, "Nonzero urb status received:" nfc_dev_err(&dev->interface->dev,
" %d", urb->status); "Nonzero urb status received: %d", urb->status);
dev->wq_in_error = urb->status; dev->wq_in_error = urb->status;
goto sched_wq; goto sched_wq;
} }
@@ -595,8 +595,8 @@ static void pn533_recv_ack(struct urb *urb)
rc = pn533_submit_urb_for_response(dev, GFP_ATOMIC); rc = pn533_submit_urb_for_response(dev, GFP_ATOMIC);
if (rc) { if (rc) {
nfc_dev_err(&dev->interface->dev, "usb_submit_urb failed with" nfc_dev_err(&dev->interface->dev,
" result %d", rc); "usb_submit_urb failed with result %d", rc);
dev->wq_in_error = rc; dev->wq_in_error = rc;
goto sched_wq; goto sched_wq;
} }
@@ -1044,12 +1044,12 @@ static void pn533_send_complete(struct urb *urb)
case -ECONNRESET: case -ECONNRESET:
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: case -ESHUTDOWN:
nfc_dev_dbg(&dev->interface->dev, "Urb shutting down with" nfc_dev_dbg(&dev->interface->dev,
" status: %d", urb->status); "Urb shutting down with status: %d", urb->status);
break; break;
default: default:
nfc_dev_dbg(&dev->interface->dev, "Nonzero urb status received:" nfc_dev_dbg(&dev->interface->dev,
" %d", urb->status); "Nonzero urb status received: %d", urb->status);
} }
} }
@@ -1753,8 +1753,8 @@ static void pn533_stop_poll(struct nfc_dev *nfc_dev)
del_timer(&dev->listen_timer); del_timer(&dev->listen_timer);
if (!dev->poll_mod_count) { if (!dev->poll_mod_count) {
nfc_dev_dbg(&dev->interface->dev, "Polling operation was not" nfc_dev_dbg(&dev->interface->dev,
" running"); "Polling operation was not running");
return; return;
} }
@@ -1813,35 +1813,35 @@ static int pn533_activate_target(struct nfc_dev *nfc_dev,
protocol); protocol);
if (dev->poll_mod_count) { if (dev->poll_mod_count) {
nfc_dev_err(&dev->interface->dev, "Cannot activate while" nfc_dev_err(&dev->interface->dev,
" polling"); "Cannot activate while polling");
return -EBUSY; return -EBUSY;
} }
if (dev->tgt_active_prot) { if (dev->tgt_active_prot) {
nfc_dev_err(&dev->interface->dev, "There is already an active" nfc_dev_err(&dev->interface->dev,
" target"); "There is already an active target");
return -EBUSY; return -EBUSY;
} }
if (!dev->tgt_available_prots) { if (!dev->tgt_available_prots) {
nfc_dev_err(&dev->interface->dev, "There is no available target" nfc_dev_err(&dev->interface->dev,
" to activate"); "There is no available target to activate");
return -EINVAL; return -EINVAL;
} }
if (!(dev->tgt_available_prots & (1 << protocol))) { if (!(dev->tgt_available_prots & (1 << protocol))) {
nfc_dev_err(&dev->interface->dev, "The target does not support" nfc_dev_err(&dev->interface->dev,
" the requested protocol %u", protocol); "Target doesn't support requested proto %u",
protocol);
return -EINVAL; return -EINVAL;
} }
if (protocol == NFC_PROTO_NFC_DEP) { if (protocol == NFC_PROTO_NFC_DEP) {
rc = pn533_activate_target_nfcdep(dev); rc = pn533_activate_target_nfcdep(dev);
if (rc) { if (rc) {
nfc_dev_err(&dev->interface->dev, "Error %d when" nfc_dev_err(&dev->interface->dev,
" activating target with" "Activating target with DEP failed %d", rc);
" NFC_DEP protocol", rc);
return rc; return rc;
} }
} }
@@ -1884,8 +1884,8 @@ static void pn533_deactivate_target(struct nfc_dev *nfc_dev,
rc = resp->data[0] & PN533_CMD_RET_MASK; rc = resp->data[0] & PN533_CMD_RET_MASK;
if (rc != PN533_CMD_RET_SUCCESS) if (rc != PN533_CMD_RET_SUCCESS)
nfc_dev_err(&dev->interface->dev, "Error 0x%x when releasing" nfc_dev_err(&dev->interface->dev,
" the target", rc); "Error 0x%x when releasing the target", rc);
dev_kfree_skb(resp); dev_kfree_skb(resp);
return; return;
@@ -2181,8 +2181,8 @@ static int pn533_transceive(struct nfc_dev *nfc_dev,
} }
if (!dev->tgt_active_prot) { if (!dev->tgt_active_prot) {
nfc_dev_err(&dev->interface->dev, "Cannot exchange data if" nfc_dev_err(&dev->interface->dev,
" there is no active target"); "Can't exchange data if there is no active target");
rc = -EINVAL; rc = -EINVAL;
goto error; goto error;
} }
@@ -2522,8 +2522,8 @@ static int pn533_probe(struct usb_interface *interface,
} }
if (!in_endpoint || !out_endpoint) { if (!in_endpoint || !out_endpoint) {
nfc_dev_err(&interface->dev, "Could not find bulk-in or" nfc_dev_err(&interface->dev,
" bulk-out endpoint"); "Could not find bulk-in or bulk-out endpoint");
rc = -ENODEV; rc = -ENODEV;
goto error; goto error;
} }