diff options
| author | Joe Perches <joe@perches.com> | 2011-11-29 23:37:32 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-01 00:08:36 +0400 |
| commit | ed1e0ad8816389ceefa2d94a9a3d3520088e410f (patch) | |
| tree | bb15b4ed37d9e43f8ac1501f9fac26a808a36c22 /net/nfc/nci/data.c | |
| parent | acda130b0e615596c63640f05febb02d2e681dde (diff) | |
| download | linux-ed1e0ad8816389ceefa2d94a9a3d3520088e410f.tar.xz | |
nfc: Use standard logging styles
Using the normal logging styles is preferred over
subsystem specific styles when the subsystem does
not take a specific struct.
Convert nfc_<level> specific messages to pr_<level>
Add newlines to uses.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/nfc/nci/data.c')
| -rw-r--r-- | net/nfc/nci/data.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/nfc/nci/data.c b/net/nfc/nci/data.c index 511fb96e21bc..7d8a1251c76b 100644 --- a/net/nfc/nci/data.c +++ b/net/nfc/nci/data.c @@ -21,6 +21,8 @@ * */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/types.h> #include <linux/interrupt.h> #include <linux/wait.h> @@ -49,7 +51,7 @@ void nci_data_exchange_complete(struct nci_dev *ndev, /* forward skb to nfc core */ cb(cb_context, skb, err); } else if (skb) { - nfc_err("no rx callback, dropping rx data..."); + pr_err("no rx callback, dropping rx data...\n"); /* no waiting callback, free skb */ kfree_skb(skb); @@ -161,7 +163,7 @@ int nci_send_data(struct nci_dev *ndev, __u8 conn_id, struct sk_buff *skb) /* fragment packet and queue the fragments */ rc = nci_queue_tx_data_frags(ndev, conn_id, skb); if (rc) { - nfc_err("failed to fragment tx data packet"); + pr_err("failed to fragment tx data packet\n"); goto free_exit; } } @@ -191,7 +193,7 @@ static void nci_add_rx_data_frag(struct nci_dev *ndev, /* first, make enough room for the already accumulated data */ if (skb_cow_head(skb, reassembly_len)) { - nfc_err("error adding room for accumulated rx data"); + pr_err("error adding room for accumulated rx data\n"); kfree_skb(skb); skb = 0; |