diff options
author | Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com> | 2012-12-10 08:42:49 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-01-09 18:51:38 -0500 |
commit | 6ca55372bf55885e02d17c58cd29ceef045ee699 (patch) | |
tree | aa7396b5c54d4f2dc00a0783ceb7c5132c93df72 /drivers/nfc | |
parent | b5193e5da24fb278c68fc0493c0a1073a1b27ab9 (diff) |
NFC: pn533: Fix quoted strings split across lines
Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r-- | drivers/nfc/pn533.c | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c index 1016e0962068..43970610c710 100644 --- a/drivers/nfc/pn533.c +++ b/drivers/nfc/pn533.c | |||
@@ -515,13 +515,13 @@ static void pn533_recv_response(struct urb *urb) | |||
515 | case -ECONNRESET: | 515 | case -ECONNRESET: |
516 | case -ENOENT: | 516 | case -ENOENT: |
517 | case -ESHUTDOWN: | 517 | case -ESHUTDOWN: |
518 | nfc_dev_dbg(&dev->interface->dev, "Urb shutting down with" | 518 | nfc_dev_dbg(&dev->interface->dev, |
519 | " status: %d", urb->status); | 519 | "Urb shutting down with status: %d", urb->status); |
520 | dev->wq_in_error = urb->status; | 520 | dev->wq_in_error = urb->status; |
521 | goto sched_wq; | 521 | goto sched_wq; |
522 | default: | 522 | default: |
523 | nfc_dev_err(&dev->interface->dev, "Nonzero urb status received:" | 523 | nfc_dev_err(&dev->interface->dev, |
524 | " %d", urb->status); | 524 | "Nonzero urb status received: %d", urb->status); |
525 | dev->wq_in_error = urb->status; | 525 | dev->wq_in_error = urb->status; |
526 | goto sched_wq; | 526 | goto sched_wq; |
527 | } | 527 | } |
@@ -538,8 +538,8 @@ static void pn533_recv_response(struct urb *urb) | |||
538 | } | 538 | } |
539 | 539 | ||
540 | if (!pn533_rx_frame_is_cmd_response(in_frame, dev->cmd)) { | 540 | if (!pn533_rx_frame_is_cmd_response(in_frame, dev->cmd)) { |
541 | nfc_dev_err(&dev->interface->dev, "The received frame is not " | 541 | nfc_dev_err(&dev->interface->dev, |
542 | "response to the last command"); | 542 | "It it not the response to the last command"); |
543 | dev->wq_in_error = -EIO; | 543 | dev->wq_in_error = -EIO; |
544 | goto sched_wq; | 544 | goto sched_wq; |
545 | } | 545 | } |
@@ -572,13 +572,13 @@ static void pn533_recv_ack(struct urb *urb) | |||
572 | case -ECONNRESET: | 572 | case -ECONNRESET: |
573 | case -ENOENT: | 573 | case -ENOENT: |
574 | case -ESHUTDOWN: | 574 | case -ESHUTDOWN: |
575 | nfc_dev_dbg(&dev->interface->dev, "Urb shutting down with" | 575 | nfc_dev_dbg(&dev->interface->dev, |
576 | " status: %d", urb->status); | 576 | "Urb shutting down with status: %d", urb->status); |
577 | dev->wq_in_error = urb->status; | 577 | dev->wq_in_error = urb->status; |
578 | goto sched_wq; | 578 | goto sched_wq; |
579 | default: | 579 | default: |
580 | nfc_dev_err(&dev->interface->dev, "Nonzero urb status received:" | 580 | nfc_dev_err(&dev->interface->dev, |
581 | " %d", urb->status); | 581 | "Nonzero urb status received: %d", urb->status); |
582 | dev->wq_in_error = urb->status; | 582 | dev->wq_in_error = urb->status; |
583 | goto sched_wq; | 583 | goto sched_wq; |
584 | } | 584 | } |
@@ -595,8 +595,8 @@ static void pn533_recv_ack(struct urb *urb) | |||
595 | 595 | ||
596 | rc = pn533_submit_urb_for_response(dev, GFP_ATOMIC); | 596 | rc = pn533_submit_urb_for_response(dev, GFP_ATOMIC); |
597 | if (rc) { | 597 | if (rc) { |
598 | nfc_dev_err(&dev->interface->dev, "usb_submit_urb failed with" | 598 | nfc_dev_err(&dev->interface->dev, |
599 | " result %d", rc); | 599 | "usb_submit_urb failed with result %d", rc); |
600 | dev->wq_in_error = rc; | 600 | dev->wq_in_error = rc; |
601 | goto sched_wq; | 601 | goto sched_wq; |
602 | } | 602 | } |
@@ -1044,12 +1044,12 @@ static void pn533_send_complete(struct urb *urb) | |||
1044 | case -ECONNRESET: | 1044 | case -ECONNRESET: |
1045 | case -ENOENT: | 1045 | case -ENOENT: |
1046 | case -ESHUTDOWN: | 1046 | case -ESHUTDOWN: |
1047 | nfc_dev_dbg(&dev->interface->dev, "Urb shutting down with" | 1047 | nfc_dev_dbg(&dev->interface->dev, |
1048 | " status: %d", urb->status); | 1048 | "Urb shutting down with status: %d", urb->status); |
1049 | break; | 1049 | break; |
1050 | default: | 1050 | default: |
1051 | nfc_dev_dbg(&dev->interface->dev, "Nonzero urb status received:" | 1051 | nfc_dev_dbg(&dev->interface->dev, |
1052 | " %d", urb->status); | 1052 | "Nonzero urb status received: %d", urb->status); |
1053 | } | 1053 | } |
1054 | } | 1054 | } |
1055 | 1055 | ||
@@ -1753,8 +1753,8 @@ static void pn533_stop_poll(struct nfc_dev *nfc_dev) | |||
1753 | del_timer(&dev->listen_timer); | 1753 | del_timer(&dev->listen_timer); |
1754 | 1754 | ||
1755 | if (!dev->poll_mod_count) { | 1755 | if (!dev->poll_mod_count) { |
1756 | nfc_dev_dbg(&dev->interface->dev, "Polling operation was not" | 1756 | nfc_dev_dbg(&dev->interface->dev, |
1757 | " running"); | 1757 | "Polling operation was not running"); |
1758 | return; | 1758 | return; |
1759 | } | 1759 | } |
1760 | 1760 | ||
@@ -1813,35 +1813,35 @@ static int pn533_activate_target(struct nfc_dev *nfc_dev, | |||
1813 | protocol); | 1813 | protocol); |
1814 | 1814 | ||
1815 | if (dev->poll_mod_count) { | 1815 | if (dev->poll_mod_count) { |
1816 | nfc_dev_err(&dev->interface->dev, "Cannot activate while" | 1816 | nfc_dev_err(&dev->interface->dev, |
1817 | " polling"); | 1817 | "Cannot activate while polling"); |
1818 | return -EBUSY; | 1818 | return -EBUSY; |
1819 | } | 1819 | } |
1820 | 1820 | ||
1821 | if (dev->tgt_active_prot) { | 1821 | if (dev->tgt_active_prot) { |
1822 | nfc_dev_err(&dev->interface->dev, "There is already an active" | 1822 | nfc_dev_err(&dev->interface->dev, |
1823 | " target"); | 1823 | "There is already an active target"); |
1824 | return -EBUSY; | 1824 | return -EBUSY; |
1825 | } | 1825 | } |
1826 | 1826 | ||
1827 | if (!dev->tgt_available_prots) { | 1827 | if (!dev->tgt_available_prots) { |
1828 | nfc_dev_err(&dev->interface->dev, "There is no available target" | 1828 | nfc_dev_err(&dev->interface->dev, |
1829 | " to activate"); | 1829 | "There is no available target to activate"); |
1830 | return -EINVAL; | 1830 | return -EINVAL; |
1831 | } | 1831 | } |
1832 | 1832 | ||
1833 | if (!(dev->tgt_available_prots & (1 << protocol))) { | 1833 | if (!(dev->tgt_available_prots & (1 << protocol))) { |
1834 | nfc_dev_err(&dev->interface->dev, "The target does not support" | 1834 | nfc_dev_err(&dev->interface->dev, |
1835 | " the requested protocol %u", protocol); | 1835 | "Target doesn't support requested proto %u", |
1836 | protocol); | ||
1836 | return -EINVAL; | 1837 | return -EINVAL; |
1837 | } | 1838 | } |
1838 | 1839 | ||
1839 | if (protocol == NFC_PROTO_NFC_DEP) { | 1840 | if (protocol == NFC_PROTO_NFC_DEP) { |
1840 | rc = pn533_activate_target_nfcdep(dev); | 1841 | rc = pn533_activate_target_nfcdep(dev); |
1841 | if (rc) { | 1842 | if (rc) { |
1842 | nfc_dev_err(&dev->interface->dev, "Error %d when" | 1843 | nfc_dev_err(&dev->interface->dev, |
1843 | " activating target with" | 1844 | "Activating target with DEP failed %d", rc); |
1844 | " NFC_DEP protocol", rc); | ||
1845 | return rc; | 1845 | return rc; |
1846 | } | 1846 | } |
1847 | } | 1847 | } |
@@ -1884,8 +1884,8 @@ static void pn533_deactivate_target(struct nfc_dev *nfc_dev, | |||
1884 | 1884 | ||
1885 | rc = resp->data[0] & PN533_CMD_RET_MASK; | 1885 | rc = resp->data[0] & PN533_CMD_RET_MASK; |
1886 | if (rc != PN533_CMD_RET_SUCCESS) | 1886 | if (rc != PN533_CMD_RET_SUCCESS) |
1887 | nfc_dev_err(&dev->interface->dev, "Error 0x%x when releasing" | 1887 | nfc_dev_err(&dev->interface->dev, |
1888 | " the target", rc); | 1888 | "Error 0x%x when releasing the target", rc); |
1889 | 1889 | ||
1890 | dev_kfree_skb(resp); | 1890 | dev_kfree_skb(resp); |
1891 | return; | 1891 | return; |
@@ -2181,8 +2181,8 @@ static int pn533_transceive(struct nfc_dev *nfc_dev, | |||
2181 | } | 2181 | } |
2182 | 2182 | ||
2183 | if (!dev->tgt_active_prot) { | 2183 | if (!dev->tgt_active_prot) { |
2184 | nfc_dev_err(&dev->interface->dev, "Cannot exchange data if" | 2184 | nfc_dev_err(&dev->interface->dev, |
2185 | " there is no active target"); | 2185 | "Can't exchange data if there is no active target"); |
2186 | rc = -EINVAL; | 2186 | rc = -EINVAL; |
2187 | goto error; | 2187 | goto error; |
2188 | } | 2188 | } |
@@ -2522,8 +2522,8 @@ static int pn533_probe(struct usb_interface *interface, | |||
2522 | } | 2522 | } |
2523 | 2523 | ||
2524 | if (!in_endpoint || !out_endpoint) { | 2524 | if (!in_endpoint || !out_endpoint) { |
2525 | nfc_dev_err(&interface->dev, "Could not find bulk-in or" | 2525 | nfc_dev_err(&interface->dev, |
2526 | " bulk-out endpoint"); | 2526 | "Could not find bulk-in or bulk-out endpoint"); |
2527 | rc = -ENODEV; | 2527 | rc = -ENODEV; |
2528 | goto error; | 2528 | goto error; |
2529 | } | 2529 | } |