nfc: Remove useless Makefile line
Subsystems (3)
PATCH 1/1 nfc: Remove useless Makefile line
There's no Kconfig symbol NFC_DEBUG. Besides, there doesn't seem to be any nfc code that uses a DEBUG macro. This line can safely be removed.
---
Untested.
drivers/nfc/Makefile | 2 -- 1 file changed, 2 deletions(-)
drivers/nfc/Makefile +0 -2
@@ -6,5 +6,3 @@ obj-$(CONFIG_NFC_PN544) += pn544/ obj-$(CONFIG_NFC_MICROREAD) += microread/ obj-$(CONFIG_NFC_PN533) += pn533.o obj-$(CONFIG_NFC_WILINK) += nfcwilink.o - -ccflags-$(CONFIG_NFC_DEBUG) := -DDEBUG
Signature · 1 line
1.7.11.7
Quoted 2 lines · Paul Bolle
There's no
KconfigsymbolNFC_DEBUG. Besides, there doesn't seem to be any nfc code that uses a DEBUG macro. This line can safely be removed.
[]
drivers/nfc/Makefile
Quoted 1 line
drivers/nfc/Makefile +0
-0
[]
Quoted 1 line
-ccflags-$(CONFIG_NFC_DEBUG) := -DDEBUG
pr_debug/dev_dbg/nfc_dev_dbg logging messages
depend on this.
Quoted 5 lines · Joe Perches
Quoted 1 line · Paul Bolle
-ccflags-$(CONFIG_NFC_DEBUG) := -DDEBUG
pr_debug/dev_dbg/nfc_dev_dbg logging messages
depend on this.
Thanks. But then a NFC_DEBUG symbol needs to be added, because now the DEBUG macro will never be set, won't it?
Paul Bolle
Quoted 9 lines · Paul Bolle
Quoted 5 lines · Joe Perches
Quoted 1 line · Paul Bolle
-ccflags-$(CONFIG_NFC_DEBUG) := -DDEBUG
pr_debug/dev_dbg/nfc_dev_dbg logging messages
depend on this.Thanks. But then a
NFC_DEBUGsymbol needs to be added, because now the DEBUG macro will never be set, won't it?
Probably right.
I think all the nfc_dev_<level> uses are unsightly too. Almost all the nfc_dev_dbg uses are functdion enter/leave logging and should be done via the function tracer.
I'll submit some patches for that.
cover nfc: standardize logging styles
Fix some defects in the logging too
Joe Perches (3):
nfc: Replace nfc_dev_dbg with dev_dbg, remove function tracing
nfc: Convert nfc_dev_info and nfc_dev_err to nfc_<level>
nfc: Standardize logging style
drivers/nfc/microread/i2c.c | 32 ++--- drivers/nfc/microread/mei.c | 20 +-- drivers/nfc/microread/microread.c | 7 +- drivers/nfc/nfcwilink.c | 95 ++++++------- drivers/nfc/pn533.c | 271 ++++++++++++++++---------------------- drivers/nfc/pn544/i2c.c | 38 +++--- drivers/nfc/pn544/pn544.c | 13 +- include/net/nfc/nfc.h | 5 +- 8 files changed, 196 insertions(+), 285 deletions(-)
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
Re: [PATCH 0/3] nfc: standardize logging styles
Hi Joe,
Quoted 6 lines · Joe Perches
Fix some defects in the logging too
Joe Perches (3):
nfc: Replacenfc_dev_dbgwithdev_dbg, remove function tracing
nfc: Convertnfc_dev_infoandnfc_dev_errto nfc_<level>
nfc: Standardize logging style
All 3 patches applied, sorry for missing those ones.
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
PATCH 1/3 nfc: Replace nfc_dev_dbg with dev_dbg, remove function tracing
In reply to Joe PerchesUse the generic kernel function instead of a home-grown one that does the same thing. Remove empty function tracing style uses as the kernel function tracer does that too.
Add \n to uses not at the macro. Don't add \n where the nfc_dev_dbg macro mistakenly had them already.
--- drivers/nfc/nfcwilink.c | 51 +++++++-------------- drivers/nfc/pn533.c | 118 ++++++++++++++++-------------------------------- include/net/nfc/nfc.h | 1 - 3 files changed, 56 insertions(+), 114 deletions(-)
drivers/nfc/nfcwilink.c +17 -34
@@ -146,8 +146,6 @@ static int nfcwilink_get_bts_file_name(struct nfcwilink *drv, char *file_name)unsigned long comp_ret;int rc; -nfc_dev_dbg (&drv->pdev->dev,"get_bts_file_name entry" ); - skb =nfcwilink_skb_alloc (sizeof (struct nci_vs_nfcc_info_cmd ),GFP_KERNEL );if (!skb) {
@@ -172,17 +170,16 @@ static int nfcwilink_get_bts_file_name(struct nfcwilink *drv, char *file_name) comp_ret =wait_for_completion_timeout (&drv->completed,msecs_to_jiffies (NFCWILINK_CMD_TIMEOUT )); -nfc_dev_dbg (&drv->pdev->dev,"wait_for_completion_timeout returned %ld" , - comp_ret); +dev_dbg (&drv->pdev->dev,"wait_for_completion_timeout returned %ld\n" , + comp_ret);if (comp_ret ==0 ) { -nfc_dev_err (&drv->pdev->dev, -"timeout on wait_for_completion_timeout" ); +dev_err (&drv->pdev->dev, +"timeout on wait_for_completion_timeout\n" );return -ETIMEDOUT ; } -nfc_dev_dbg (&drv->pdev->dev,"nci_vs_nfcc_info_rsp: plen %d, status %d" , - drv->nfcc_info.plen, - drv->nfcc_info.status); +dev_dbg (&drv->pdev->dev,"nci_vs_nfcc_info_rsp: plen %d, status %d\n" , + drv->nfcc_info.plen, drv->nfcc_info.status);if ((drv->nfcc_info.plen !=5 ) || (drv->nfcc_info.status !=0 )) { nfc_dev_err(&drv->pdev->dev,
@@ -209,8 +206,6 @@ static int nfcwilink_send_bts_cmd(struct nfcwilink *drv, __u8 *data, int len)unsigned long comp_ret;int rc; -nfc_dev_dbg (&drv->pdev->dev,"send_bts_cmd entry" ); -/* verify valid cmd for the NFC channel */ if ((len <= sizeof(struct nfcwilink_hdr)) || (len > BTS_FILE_CMD_MAX_LEN) ||
@@ -242,8 +237,8 @@ static int nfcwilink_send_bts_cmd(struct nfcwilink *drv, __u8 *data, int len) comp_ret =wait_for_completion_timeout (&drv->completed,msecs_to_jiffies (NFCWILINK_CMD_TIMEOUT )); -nfc_dev_dbg (&drv->pdev->dev,"wait_for_completion_timeout returned %ld" , - comp_ret); +dev_dbg (&drv->pdev->dev,"wait_for_completion_timeout returned %ld\n" , + comp_ret);if (comp_ret ==0 ) {nfc_dev_err (&drv->pdev->dev,"timeout on wait_for_completion_timeout" );
@@ -261,8 +256,6 @@ static int nfcwilink_download_fw(struct nfcwilink *drv)__u8 *ptr;int len, rc; -nfc_dev_dbg (&drv->pdev->dev,"download_fw entry" ); -set_bit (NFCWILINK_FW_DOWNLOAD , &drv->flags); rc =nfcwilink_get_bts_file_name (drv, file_name);
@@ -284,8 +277,8 @@ static int nfcwilink_download_fw(struct nfcwilink *drv) ptr = (__u8 *)fw->data;if ((len ==0 ) || (ptr ==NULL )) { -nfc_dev_dbg (&drv->pdev->dev, -"request_firmware returned size %d" , len); +dev_dbg (&drv->pdev->dev, +"request_firmware returned size %d\n" , len); goto release_fw; }
@@ -306,8 +299,8 @@ static int nfcwilink_download_fw(struct nfcwilink *drv) action_len =__le16_to_cpu (((struct bts_file_action *)ptr)->len); -nfc_dev_dbg (&drv->pdev->dev,"bts_file_action type %d, len %d" , - action_type, action_len); +dev_dbg (&drv->pdev->dev,"bts_file_action type %d, len %d\n" , + action_type, action_len);switch (action_type) {case BTS_FILE_ACTION_TYPE_SEND_CMD :
@@ -337,8 +330,6 @@ static void nfcwilink_register_complete(void *priv_data, char data) {struct nfcwilink *drv = priv_data; -nfc_dev_dbg (&drv->pdev->dev,"register_complete entry" ); -/* store ST registration status */ drv->st_register_cb_status = data;
@@ -360,7 +351,7 @@ static long nfcwilink_receive(void *priv_data, struct sk_buff *skb)return -EFAULT ; } -nfc_dev_dbg (&drv->pdev->dev,"receive entry, len %d" , skb->len); +dev_dbg (&drv->pdev->dev,"receive entry, len %d\n" , skb->len);/* strip the ST header (apart for the chnl byte, which is not received in the hdr) */
@@ -402,8 +393,6 @@ static int nfcwilink_open(struct nci_dev *ndev)unsigned long comp_ret;int rc; -nfc_dev_dbg (&drv->pdev->dev,"open entry" ); -if (test_and_set_bit (NFCWILINK_RUNNING , &drv->flags)) { rc = -EBUSY ; goto exit;
@@ -421,9 +410,9 @@ static int nfcwilink_open(struct nci_dev *ndev) &drv->completed, msecs_to_jiffies(NFCWILINK_REGISTER_TIMEOUT)); -nfc_dev_dbg (&drv->pdev->dev, -"wait_for_completion_timeout returned %ld" , - comp_ret); +dev_dbg (&drv->pdev->dev, +"wait_for_completion_timeout returned %ld\n" , + comp_ret);if (comp_ret ==0 ) {/* timeout */
@@ -466,8 +455,6 @@ static int nfcwilink_close(struct nci_dev *ndev)struct nfcwilink *drv =nci_get_drvdata (ndev);int rc; -nfc_dev_dbg (&drv->pdev->dev,"close entry" ); -if (!test_and_clear_bit (NFCWILINK_RUNNING , &drv->flags))return 0 ;
@@ -487,7 +474,7 @@ static int nfcwilink_send(struct sk_buff *skb)struct nfcwilink_hdr hdr = {NFCWILINK_CHNL ,NFCWILINK_OPCODE ,0x0000 };long len; -nfc_dev_dbg (&drv->pdev->dev,"send entry, len %d" , skb->len); +dev_dbg (&drv->pdev->dev,"send entry, len %d\n" , skb->len);if (!test_bit (NFCWILINK_RUNNING , &drv->flags)) {kfree_skb (skb);
@@ -524,8 +511,6 @@ static int nfcwilink_probe(struct platform_device *pdev)int rc;__u32 protocols; -nfc_dev_dbg (&pdev->dev,"probe entry" ); - drv =devm_kzalloc (&pdev->dev,sizeof (struct nfcwilink ),GFP_KERNEL );if (!drv) { rc = -ENOMEM ;
@@ -576,8 +561,6 @@ static int nfcwilink_remove(struct platform_device *pdev)struct nfcwilink *drv =dev_get_drvdata (&pdev->dev);struct nci_dev *ndev; -nfc_dev_dbg (&pdev->dev,"remove entry" ); -if (!drv)return -EFAULT ;
drivers/nfc/pn533.c +39 -79
336 lines not on this page · raw message
include/net/nfc/nfc.h +0 -1
@@ -30,7 +30,6 @@ #define nfc_dev_info(dev, fmt, arg...) dev_info((dev), "NFC: " fmt "\n", ## arg) #define nfc_dev_err(dev, fmt, arg...) dev_err((dev), "NFC: " fmt "\n", ## arg) -#define nfc_dev_dbg(dev, fmt, arg...) dev_dbg((dev), fmt "\n", ## arg)struct nfc_dev ;
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 2/3 nfc: Convert nfc_dev_info and nfc_dev_err to nfc_<level>
In reply to Joe PerchesUse a more standard kernel style macro logging name.
Standardize the spacing of the "NFC: " prefix.
Add \n to uses, remove from macro.
Fix the defective uses that already had a \n.
--- drivers/nfc/nfcwilink.c | 44 +++++++------- drivers/nfc/pn533.c | 156 ++++++++++++++++++++++++------------------------ include/net/nfc/nfc.h | 4 +- 3 files changed, 100 insertions(+), 104 deletions(-)
drivers/nfc/nfcwilink.c +21 -23
@@ -149,8 +149,8 @@ static int nfcwilink_get_bts_file_name(struct nfcwilink *drv, char *file_name) skb =nfcwilink_skb_alloc (sizeof (struct nci_vs_nfcc_info_cmd ),GFP_KERNEL );if (!skb) { -nfc_dev_err (&drv->pdev->dev, -"no memory for nci_vs_nfcc_info_cmd" ); +nfc_err (&drv->pdev->dev, +"no memory for nci_vs_nfcc_info_cmd\n" );return -ENOMEM ; }
@@ -182,8 +182,7 @@ static int nfcwilink_get_bts_file_name(struct nfcwilink *drv, char *file_name) drv->nfcc_info.plen, drv->nfcc_info.status);if ((drv->nfcc_info.plen !=5 ) || (drv->nfcc_info.status !=0 )) { -nfc_dev_err (&drv->pdev->dev, -"invalid nci_vs_nfcc_info_rsp" ); +nfc_err (&drv->pdev->dev,"invalid nci_vs_nfcc_info_rsp\n" );return -EINVAL ; }
@@ -194,7 +193,7 @@ static int nfcwilink_get_bts_file_name(struct nfcwilink *drv, char *file_name) drv->nfcc_info.sw_ver_z, drv->nfcc_info.patch_id); -nfc_dev_info (&drv->pdev->dev,"nfcwilink FW file name: %s" , file_name); +nfc_info (&drv->pdev->dev,"nfcwilink FW file name: %s\n" , file_name);return 0 ; }
@@ -211,8 +210,8 @@ static int nfcwilink_send_bts_cmd(struct nfcwilink *drv, __u8 *data, int len) (len > BTS_FILE_CMD_MAX_LEN) || (hdr->chnl != NFCWILINK_CHNL) || (hdr->opcode != NFCWILINK_OPCODE)) { -nfc_dev_err (&drv->pdev->dev, -"ignoring invalid bts cmd, len %d, chnl %d, opcode %d" , +nfc_err (&drv->pdev->dev, +"ignoring invalid bts cmd, len %d, chnl %d, opcode %d\n" , len, hdr->chnl, hdr->opcode);return 0 ; }
@@ -223,7 +222,7 @@ static int nfcwilink_send_bts_cmd(struct nfcwilink *drv, __u8 *data, int len) skb =nfcwilink_skb_alloc (len,GFP_KERNEL );if (!skb) { -nfc_dev_err (&drv->pdev->dev,"no memory for bts cmd" ); +nfc_err (&drv->pdev->dev,"no memory for bts cmd\n" );return -ENOMEM ; }
@@ -240,8 +239,8 @@ static int nfcwilink_send_bts_cmd(struct nfcwilink *drv, __u8 *data, int len)dev_dbg (&drv->pdev->dev,"wait_for_completion_timeout returned %ld\n" , comp_ret);if (comp_ret ==0 ) { -nfc_dev_err (&drv->pdev->dev, -"timeout on wait_for_completion_timeout" ); +nfc_err (&drv->pdev->dev, +"timeout on wait_for_completion_timeout\n" );return -ETIMEDOUT ; }
@@ -264,7 +263,7 @@ static int nfcwilink_download_fw(struct nfcwilink *drv) rc =request_firmware (&fw, file_name, &drv->pdev->dev);if (rc) { -nfc_dev_err (&drv->pdev->dev,"request_firmware failed %d" , rc); +nfc_err (&drv->pdev->dev,"request_firmware failed %d\n" , rc);/* if the file is not found, don't exit with failure */ if (rc == -ENOENT )
@@ -284,7 +283,7 @@ static int nfcwilink_download_fw(struct nfcwilink *drv)if (__le32_to_cpu (((struct bts_file_hdr *)ptr)->magic) !=BTS_FILE_HDR_MAGIC ) { -nfc_dev_err (&drv->pdev->dev,"wrong bts magic number" ); +nfc_err (&drv->pdev->dev,"wrong bts magic number\n" ); rc = -EINVAL ; goto release_fw; }
@@ -367,7 +366,7 @@ static long nfcwilink_receive(void *priv_data, struct sk_buff *skb)/* Forward skb to NCI core layer */ rc =nci_recv_frame (skb);if (rc <0 ) { -nfc_dev_err (&drv->pdev->dev,"nci_recv_frame failed %d" , rc); +nfc_err (&drv->pdev->dev,"nci_recv_frame failed %d\n" , rc);return rc; }
@@ -420,13 +419,12 @@ static int nfcwilink_open(struct nci_dev *ndev) goto clear_exit; }else if (drv->st_register_cb_status !=0 ) { rc = drv->st_register_cb_status; -nfc_dev_err (&drv->pdev->dev, -"st_register_cb failed %d" , rc); +nfc_err (&drv->pdev->dev, +"st_register_cb failed %d\n" , rc); goto clear_exit; } }else { -nfc_dev_err (&drv->pdev->dev, -"st_register failed %d" , rc); +nfc_err (&drv->pdev->dev,"st_register failed %d\n" , rc); goto clear_exit; } }
@@ -436,8 +434,8 @@ static int nfcwilink_open(struct nci_dev *ndev) drv->st_write = nfcwilink_proto.write;if (nfcwilink_download_fw (drv)) { -nfc_dev_err (&drv->pdev->dev,"nfcwilink_download_fw failed %d" , - rc); +nfc_err (&drv->pdev->dev,"nfcwilink_download_fw failed %d\n" , + rc);/* open should succeed, even if the FW download failed */ }
@@ -460,7 +458,7 @@ static int nfcwilink_close(struct nci_dev *ndev) rc =st_unregister (&nfcwilink_proto);if (rc) -nfc_dev_err (&drv->pdev->dev,"st_unregister failed %d" , rc); +nfc_err (&drv->pdev->dev,"st_unregister failed %d\n" , rc); drv->st_write =NULL ;
@@ -492,7 +490,7 @@ static int nfcwilink_send(struct sk_buff *skb) len = drv->st_write (skb);if (len <0 ) {kfree_skb (skb); -nfc_dev_err (&drv->pdev->dev,"st_write failed %ld" , len); +nfc_err (&drv->pdev->dev,"st_write failed %ld\n" , len);return -EFAULT ; }
@@ -531,7 +529,7 @@ static int nfcwilink_probe(struct platform_device *pdev)NFCWILINK_HDR_LEN , 0);if (!drv->ndev) { -nfc_dev_err (&pdev->dev,"nci_allocate_device failed" ); +nfc_err (&pdev->dev,"nci_allocate_device failed\n" ); rc = -ENOMEM ; goto exit; }
@@ -541,7 +539,7 @@ static int nfcwilink_probe(struct platform_device *pdev) rc =nci_register_device (drv->ndev);if (rc <0 ) { -nfc_dev_err (&pdev->dev,"nci_register_device failed %d" , rc); +nfc_err (&pdev->dev,"nci_register_device failed %d\n" , rc); goto free_dev_exit; }
drivers/nfc/pn533.c +77 -79
390 lines not on this page · raw message
include/net/nfc/nfc.h +2 -2
@@ -28,8 +28,8 @@#include <linux/device.h> #include <linux/skbuff.h> -#define nfc_dev_info(dev, fmt, arg...) dev_info((dev), "NFC: " fmt "\n", ## arg) -#define nfc_dev_err(dev, fmt, arg...) dev_err((dev), "NFC: " fmt "\n", ## arg) +#define nfc_info (dev, fmt, ...) dev_info((dev), "NFC: " fmt, ##__VA_ARGS__) +#define nfc_err (dev, fmt, ...) dev_err((dev), "NFC: " fmt, ##__VA_ARGS__)struct nfc_dev ;
Signature · 6 lines
1.8.1.2.459.gbcd45b4.dirty -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 3/3 nfc: Standardize logging style
In reply to Joe PerchesUse standardized styles to minimize coding defects.
Always use nfc_<level> where feasible. Add \n to formats where appropriate. Tyop "it it" correction.
Add #define pr_fmt where appropriate. Remove function tracing logging messages. Remove OOM messages.
--- drivers/nfc/microread/i2c.c | 32 +++++++++++--------------------- drivers/nfc/microread/mei.c | 20 +++++--------------- drivers/nfc/microread/microread.c | 7 ++++--- drivers/nfc/nfcwilink.c | 2 +- drivers/nfc/pn533.c | 7 +++---- drivers/nfc/pn544/i2c.c | 38 +++++++++++++++----------------------- drivers/nfc/pn544/pn544.c | 13 +++++++------ 7 files changed, 46 insertions(+), 73 deletions(-)
drivers/nfc/microread/i2c.c +11 -21
@@ -18,6 +18,8 @@* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/module.h> #include <linux/i2c.h> #include <linux/delay.h>
@@ -95,12 +97,8 @@ static int check_crc(struct sk_buff *skb) crc = crc ^ skb->data[i];if (crc != skb->data[skb->len-1 ]) { -pr_err (MICROREAD_I2C_DRIVER_NAME -": CRC error 0x%x != 0x%x\n" , - crc, skb->data[skb->len-1 ]); - -pr_info (DRIVER_DESC ": %s : BAD CRC\n" , __func__); - +pr_err ("CRC error 0x%x != 0x%x\n" , crc, skb->data[skb->len-1 ]); +pr_info ("%s: BAD CRC\n" , __func__);return -EPERM ; }
@@ -160,18 +158,15 @@ static int microread_i2c_read(struct microread_i2c_phy *phy,u8 tmp[MICROREAD_I2C_LLC_MAX_SIZE -1 ];struct i2c_client *client = phy->i2c_dev; -pr_debug ("%s\n" , __func__); - r =i2c_master_recv (client, &len,1 );if (r !=1 ) { -dev_err (&client->dev,"cannot read len byte\n" ); +nfc_err (&client->dev,"cannot read len byte\n" );return -EREMOTEIO ; }if ((len <MICROREAD_I2C_LLC_MIN_SIZE ) || (len >MICROREAD_I2C_LLC_MAX_SIZE )) { -dev_err (&client->dev,"invalid len byte\n" ); -pr_err ("invalid len byte\n" ); +nfc_err (&client->dev,"invalid len byte\n" ); r = -EBADMSG ; goto flush; }
@@ -228,7 +223,6 @@ static irqreturn_t microread_i2c_irq_thread_fn(int irq, void *phy_id) } client = phy->i2c_dev; -dev_dbg (&client->dev,"IRQ\n" );if (phy->hard_fault !=0 )return IRQ_HANDLED ;
@@ -263,20 +257,18 @@ static int microread_i2c_probe(struct i2c_client *client,dev_get_platdata (&client->dev);int r; -dev_dbg (&client->dev,"client %p" , client); +dev_dbg (&client->dev,"client %p\n" , client);if (!pdata) { -dev_err (&client->dev,"client %p: missing platform data" , +nfc_err (&client->dev,"client %p: missing platform data\n" , client);return -EINVAL ; } phy =devm_kzalloc (&client->dev,sizeof (struct microread_i2c_phy ),GFP_KERNEL ); -if (!phy) { -dev_err (&client->dev,"Can't allocate microread phy" ); +if (!phy)return -ENOMEM ; - }i2c_set_clientdata (client, phy); phy->i2c_dev = client;
@@ -285,7 +277,7 @@ static int microread_i2c_probe(struct i2c_client *client,IRQF_TRIGGER_RISING |IRQF_ONESHOT , MICROREAD_I2C_DRIVER_NAME, phy);if (r) { -dev_err (&client->dev,"Unable to register IRQ handler" ); +nfc_err (&client->dev,"Unable to register IRQ handler\n" );return r; }
@@ -296,7 +288,7 @@ static int microread_i2c_probe(struct i2c_client *client,if (r <0 ) goto err_irq; -dev_info (&client->dev,"Probed" ); +nfc_info (&client->dev,"Probed" );return 0 ;
@@ -310,8 +302,6 @@ static int microread_i2c_remove(struct i2c_client *client) {struct microread_i2c_phy *phy =i2c_get_clientdata (client); -dev_dbg (&client->dev,"%s\n" , __func__); -microread_remove (phy->hdev);free_irq (client->irq, phy);
drivers/nfc/microread/mei.c +5 -15
@@ -18,6 +18,8 @@* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/module.h> #include <linux/slab.h> #include <linux/interrupt.h>
@@ -77,8 +79,6 @@ static int microread_mei_enable(void *phy_id) {struct microread_mei_phy *phy = phy_id; -pr_info (DRIVER_DESC ": %s\n" , __func__); - phy->powered =1 ;return 0 ;
@@ -88,8 +88,6 @@ static void microread_mei_disable(void *phy_id) {struct microread_mei_phy *phy = phy_id; -pr_info (DRIVER_DESC ": %s\n" , __func__); - phy->powered =0 ; }
@@ -155,20 +153,16 @@ static int microread_mei_probe(struct mei_device *device,struct microread_mei_phy *phy;int r; -pr_info ("Probing NFC microread\n" ); - phy =kzalloc (sizeof (struct microread_mei_phy ),GFP_KERNEL ); -if (!phy) { -pr_err ("Cannot allocate memory for microread mei phy.\n" ); +if (!phy)return -ENOMEM ; - } phy->device = device;mei_set_clientdata (device, phy); r =mei_register_event_cb (device, microread_event_cb, phy);if (r) { -pr_err (MICROREAD_DRIVER_NAME ": event cb registration failed\n" ); +pr_err ("event cb registration failed\n" ); goto err_out; }
@@ -190,8 +184,6 @@ static int microread_mei_remove(struct mei_device *device) {struct microread_mei_phy *phy =mei_get_clientdata (device); -pr_info ("Removing microread\n" ); -microread_remove (phy->hdev);if (phy->powered)
@@ -223,11 +215,9 @@ static int microread_mei_init(void) {int r; -pr_debug (DRIVER_DESC ": %s\n" , __func__); - r =mei_driver_register (µread_driver);if (r) { -pr_err (MICROREAD_DRIVER_NAME ": driver registration failed\n" ); +pr_err ("driver registration failed\n" );return r; }
drivers/nfc/microread/microread.c +4 -3
@@ -18,6 +18,8 @@* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/module.h> #include <linux/delay.h> #include <linux/slab.h>
@@ -546,7 +548,7 @@ exit:kfree_skb (skb);if (r) -pr_err ("Failed to handle discovered target err=%d" , r); +pr_err ("Failed to handle discovered target err=%d\n" , r); } static int microread_event_received(struct nfc_hci_dev *hdev, u8 gate,
@@ -656,7 +658,6 @@ int microread_probe(void *phy_id, struct nfc_phy_ops *phy_ops, char *llc_name, info =kzalloc (sizeof (struct microread_info ),GFP_KERNEL );if (!info) { -pr_err ("Cannot allocate memory for microread_info.\n" ); r = -ENOMEM ; goto err_info_alloc; }
@@ -688,7 +689,7 @@ int microread_probe(void *phy_id, struct nfc_phy_ops *phy_ops, char *llc_name,MICROREAD_CMD_TAILROOM , phy_payload);if (!info->hdev) { -pr_err ("Cannot allocate nfc hdev.\n" ); +pr_err ("Cannot allocate nfc hdev\n" ); r = -ENOMEM ; goto err_alloc_hdev; }
drivers/nfc/nfcwilink.c +1 -1
@@ -173,7 +173,7 @@ static int nfcwilink_get_bts_file_name(struct nfcwilink *drv, char *file_name)dev_dbg (&drv->pdev->dev,"wait_for_completion_timeout returned %ld\n" , comp_ret);if (comp_ret ==0 ) { -dev_err (&drv->pdev->dev, +nfc_err (&drv->pdev->dev,"timeout on wait_for_completion_timeout\n" );return -ETIMEDOUT ; }
drivers/nfc/pn533.c +3 -4
@@ -554,7 +554,7 @@ static void pn533_recv_response(struct urb *urb)if (!pn533_rx_frame_is_cmd_response (dev, in_frame)) {nfc_err (&dev->interface->dev, -"It it not the response to the last command\n" ); +"It is not the response to the last command\n" ); dev->wq_in_error = -EIO ; goto sched_wq; }
@@ -1233,7 +1233,7 @@ static int pn533_target_found(struct pn533 *dev, u8 tg, u8 *tgdata,struct nfc_target nfc_tgt;int rc; -dev_dbg (&dev->interface->dev,"%s - modulation=%d\n" , +dev_dbg (&dev->interface->dev,"%s: modulation=%d\n" , __func__, dev->poll_mod_curr);if (tg !=1 )
@@ -1723,8 +1723,7 @@ static int pn533_activate_target(struct nfc_dev *nfc_dev,struct pn533 *dev =nfc_get_drvdata (nfc_dev);int rc; -dev_dbg (&dev->interface->dev,"%s - protocol=%u\n" , - __func__, protocol); +dev_dbg (&dev->interface->dev,"%s: protocol=%u\n" , __func__, protocol);if (dev->poll_mod_count) { nfc_err(&dev->interface->dev,
drivers/nfc/pn544/i2c.c +15 -23
@@ -18,6 +18,8 @@* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/crc-ccitt.h> #include <linux/module.h> #include <linux/i2c.h>
@@ -85,8 +87,7 @@ static void pn544_hci_i2c_platform_init(struct pn544_i2c_phy *phy)char rset_cmd[] = {0x05 ,0xF9 ,0x04 ,0x00 ,0xC3 ,0xE5 };int count =sizeof (rset_cmd); -pr_info (DRIVER_DESC ": %s\n" , __func__); -dev_info (&phy->i2c_dev->dev,"Detecting nfc_en polarity\n" ); +nfc_info (&phy->i2c_dev->dev,"Detecting nfc_en polarity\n" );/* Disable fw download */ gpio_set_value (phy->gpio_fw,0 );
@@ -107,7 +108,7 @@ static void pn544_hci_i2c_platform_init(struct pn544_i2c_phy *phy)dev_dbg (&phy->i2c_dev->dev,"Sending reset cmd\n" ); ret =i2c_master_send (phy->i2c_dev, rset_cmd, count);if (ret == count) { -dev_info (&phy->i2c_dev->dev, +nfc_info (&phy->i2c_dev->dev,"nfc_en polarity : active %s\n" , (polarity ==0 ?"low" :"high" )); goto out;
@@ -115,7 +116,7 @@ static void pn544_hci_i2c_platform_init(struct pn544_i2c_phy *phy) } } -dev_err (&phy->i2c_dev->dev, +nfc_err (&phy->i2c_dev->dev,"Could not detect nfc_en polarity, fallback to active high\n" ); out:
@@ -126,8 +127,6 @@ static int pn544_hci_i2c_enable(void *phy_id) {struct pn544_i2c_phy *phy = phy_id; -pr_info (DRIVER_DESC ": %s\n" , __func__); -gpio_set_value (phy->gpio_fw,0 );gpio_set_value (phy->gpio_en, phy->en_polarity);usleep_range (10000 ,15000 );
@@ -141,8 +140,6 @@ static void pn544_hci_i2c_disable(void *phy_id) {struct pn544_i2c_phy *phy = phy_id; -pr_info (DRIVER_DESC ": %s\n" , __func__); -gpio_set_value (phy->gpio_fw,0 );gpio_set_value (phy->gpio_en, !phy->en_polarity);usleep_range (10000 ,15000 );
@@ -225,11 +222,9 @@ static int check_crc(u8 *buf, int buflen) crc = ~crc;if (buf[len -2 ] != (crc &0xff ) || buf[len -1 ] != (crc >>8 )) { -pr_err (PN544_HCI_I2C_DRIVER_NAME -": CRC error 0x%x != 0x%x 0x%x\n" , +pr_err ("CRC error 0x%x != 0x%x 0x%x\n" , crc, buf[len -1 ], buf[len -2 ]); - -pr_info (DRIVER_DESC ": %s : BAD CRC\n" , __func__); +pr_info ("%s: BAD CRC\n" , __func__);print_hex_dump (KERN_DEBUG ,"crc: " ,DUMP_PREFIX_NONE ,16 ,2 , buf, buflen, false);return -EPERM ;
@@ -255,13 +250,13 @@ static int pn544_hci_i2c_read(struct pn544_i2c_phy *phy, struct sk_buff **skb) r =i2c_master_recv (client, &len,1 );if (r !=1 ) { -dev_err (&client->dev,"cannot read len byte\n" ); +nfc_err (&client->dev,"cannot read len byte\n" );return -EREMOTEIO ; }if ((len < (PN544_HCI_I2C_LLC_MIN_SIZE -1 )) || (len > (PN544_HCI_I2C_LLC_MAX_SIZE -1 ))) { -dev_err (&client->dev,"invalid len byte\n" ); +nfc_err (&client->dev,"invalid len byte\n" ); r = -EBADMSG ; goto flush; }
@@ -372,35 +367,32 @@ static int pn544_hci_i2c_probe(struct i2c_client *client,dev_dbg (&client->dev,"IRQ: %d\n" , client->irq);if (!i2c_check_functionality (client->adapter,I2C_FUNC_I2C )) { -dev_err (&client->dev,"Need I2C_FUNC_I2C\n" ); +nfc_err (&client->dev,"Need I2C_FUNC_I2C\n" );return -ENODEV ; } phy =devm_kzalloc (&client->dev,sizeof (struct pn544_i2c_phy ),GFP_KERNEL ); -if (!phy) { -dev_err (&client->dev, -"Cannot allocate memory for pn544 i2c phy.\n" ); +if (!phy)return -ENOMEM ; - } phy->i2c_dev = client;i2c_set_clientdata (client, phy); pdata = client->dev.platform_data;if (pdata ==NULL ) { -dev_err (&client->dev,"No platform data\n" ); +nfc_err (&client->dev,"No platform data\n" );return -EINVAL ; }if (pdata->request_resources ==NULL ) { -dev_err (&client->dev,"request_resources() missing\n" ); +nfc_err (&client->dev,"request_resources() missing\n" );return -EINVAL ; } r = pdata->request_resources (client);if (r) { -dev_err (&client->dev,"Cannot get platform resources\n" ); +nfc_err (&client->dev,"Cannot get platform resources\n" );return r; }
@@ -414,7 +406,7 @@ static int pn544_hci_i2c_probe(struct i2c_client *client,IRQF_TRIGGER_RISING |IRQF_ONESHOT , PN544_HCI_I2C_DRIVER_NAME, phy);if (r <0 ) { -dev_err (&client->dev,"Unable to register IRQ handler\n" ); +nfc_err (&client->dev,"Unable to register IRQ handler\n" ); goto err_rti; }
drivers/nfc/pn544/pn544.c +7 -6
@@ -18,6 +18,8 @@* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/delay.h> #include <linux/slab.h> #include <linux/module.h>
@@ -395,7 +397,7 @@ static int pn544_hci_start_poll(struct nfc_hci_dev *hdev,if ((im_protocols | tm_protocols) &NFC_PROTO_NFC_DEP_MASK ) { hdev->gb =nfc_get_local_general_bytes (hdev->ndev, &hdev->gb_len); -pr_debug ("generate local bytes %p" , hdev->gb); +pr_debug ("generate local bytes %p\n" , hdev->gb);if (hdev->gb ==NULL || hdev->gb_len ==0 ) { im_protocols &= ~NFC_PROTO_NFC_DEP_MASK ; tm_protocols &= ~NFC_PROTO_NFC_DEP_MASK ;
@@ -692,7 +694,7 @@ static int pn544_hci_tm_send(struct nfc_hci_dev *hdev, struct sk_buff *skb)static int pn544_hci_check_presence (struct nfc_hci_dev *hdev,struct nfc_target *target) { -pr_debug ("supported protocol %d" , target->supported_protocols); +pr_debug ("supported protocol %d\b" , target->supported_protocols);if (target->supported_protocols & (NFC_PROTO_ISO14443_MASK |NFC_PROTO_ISO14443_B_MASK )) { return nfc_hci_send_cmd(hdev, target->hci_reader_gate,
@@ -732,7 +734,7 @@ static int pn544_hci_event_received(struct nfc_hci_dev *hdev, u8 gate, u8 event,struct sk_buff *rgb_skb =NULL ;int r; -pr_debug ("hci event %d" , event); +pr_debug ("hci event %d\n" , event);switch (event) {case PN544_HCI_EVT_ACTIVATED :if (gate ==PN544_RF_READER_NFCIP1_INITIATOR_GATE ) {
@@ -763,7 +765,7 @@ static int pn544_hci_event_received(struct nfc_hci_dev *hdev, u8 gate, u8 event, }if (skb->data[0 ] !=0 ) { -pr_debug ("data0 %d" , skb->data[0 ]); +pr_debug ("data0 %d\n" , skb->data[0 ]); r = -EPROTO ; goto exit; }
@@ -807,7 +809,6 @@ int pn544_hci_probe(void *phy_id, struct nfc_phy_ops *phy_ops, char *llc_name, info =kzalloc (sizeof (struct pn544_hci_info ),GFP_KERNEL );if (!info) { -pr_err ("Cannot allocate memory for pn544_hci_info.\n" ); r = -ENOMEM ; goto err_info_alloc; }
@@ -841,7 +842,7 @@ int pn544_hci_probe(void *phy_id, struct nfc_phy_ops *phy_ops, char *llc_name, phy_headroom +PN544_CMDS_HEADROOM , phy_tailroom, phy_payload);if (!info->hdev) { -pr_err ("Cannot allocate nfc hdev.\n" ); +pr_err ("Cannot allocate nfc hdev\n" ); r = -ENOMEM ; goto err_alloc_hdev; }
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty