Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20c239c1 authored by Joe Perches's avatar Joe Perches Committed by John W. Linville
Browse files

nfc: Convert nfc_dbg to pr_debug 



Using the standard debugging mechanisms is better than
subsystem specific ones when the subsystem doesn't use
a specific struct.

Coalesce long formats.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ed1e0ad8

net/nfc/core.c

+19 −18
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ int nfc_dev_up(struct nfc_dev *dev) 
{

	int rc = 0;



	nfc_dbg("dev_name=%s", dev_name(&dev->dev));

	pr_debug("dev_name=%s\n", dev_name(&dev->dev));



	device_lock(&dev->dev);
@@ -99,7 +99,7 @@ int nfc_dev_down(struct nfc_dev *dev) 
{

	int rc = 0;



	nfc_dbg("dev_name=%s", dev_name(&dev->dev));

	pr_debug("dev_name=%s\n", dev_name(&dev->dev));



	device_lock(&dev->dev);
@@ -141,7 +141,8 @@ int nfc_start_poll(struct nfc_dev *dev, u32 protocols) 
{

	int rc;



	nfc_dbg("dev_name=%s protocols=0x%x", dev_name(&dev->dev), protocols);

	pr_debug("dev_name=%s protocols=0x%x\n",

		 dev_name(&dev->dev), protocols);



	if (!protocols)

		return -EINVAL;
@@ -176,7 +177,7 @@ int nfc_stop_poll(struct nfc_dev *dev) 
{

	int rc = 0;



	nfc_dbg("dev_name=%s", dev_name(&dev->dev));

	pr_debug("dev_name=%s\n", dev_name(&dev->dev));



	device_lock(&dev->dev);
@@ -209,8 +210,8 @@ int nfc_activate_target(struct nfc_dev *dev, u32 target_idx, u32 protocol) 
{

	int rc;



	nfc_dbg("dev_name=%s target_idx=%u protocol=%u", dev_name(&dev->dev),

							target_idx, protocol);

	pr_debug("dev_name=%s target_idx=%u protocol=%u\n",

		 dev_name(&dev->dev), target_idx, protocol);



	device_lock(&dev->dev);
@@ -238,7 +239,8 @@ int nfc_deactivate_target(struct nfc_dev *dev, u32 target_idx) 
{

	int rc = 0;



	nfc_dbg("dev_name=%s target_idx=%u", dev_name(&dev->dev), target_idx);

	pr_debug("dev_name=%s target_idx=%u\n",

		 dev_name(&dev->dev), target_idx);



	device_lock(&dev->dev);
@@ -273,8 +275,8 @@ int nfc_data_exchange(struct nfc_dev *dev, u32 target_idx, 
{

	int rc;



	nfc_dbg("dev_name=%s target_idx=%u skb->len=%u", dev_name(&dev->dev),

							target_idx, skb->len);

	pr_debug("dev_name=%s target_idx=%u skb->len=%u\n",

		 dev_name(&dev->dev), target_idx, skb->len);



	device_lock(&dev->dev);
@@ -328,7 +330,7 @@ int nfc_targets_found(struct nfc_dev *dev, struct nfc_target *targets, 
{

	int i;



	nfc_dbg("dev_name=%s n_targets=%d", dev_name(&dev->dev), n_targets);

	pr_debug("dev_name=%s n_targets=%d\n", dev_name(&dev->dev), n_targets);



	dev->polling = false;
@@ -362,7 +364,7 @@ static void nfc_release(struct device *d) 
{

	struct nfc_dev *dev = to_nfc_dev(d);



	nfc_dbg("dev_name=%s", dev_name(&dev->dev));

	pr_debug("dev_name=%s\n", dev_name(&dev->dev));



	nfc_genl_data_exit(&dev->genl_data);

	kfree(dev->targets);
@@ -448,7 +450,7 @@ int nfc_register_device(struct nfc_dev *dev) 
{

	int rc;



	nfc_dbg("dev_name=%s", dev_name(&dev->dev));

	pr_debug("dev_name=%s\n", dev_name(&dev->dev));



	mutex_lock(&nfc_devlist_mutex);

	nfc_devlist_generation++;
@@ -460,9 +462,8 @@ int nfc_register_device(struct nfc_dev *dev) 


	rc = nfc_genl_device_added(dev);

	if (rc)

		nfc_dbg("The userspace won't be notified that the device %s was"

						" added", dev_name(&dev->dev));



		pr_debug("The userspace won't be notified that the device %s was added\n",

			 dev_name(&dev->dev));



	return 0;

}
@@ -477,7 +478,7 @@ void nfc_unregister_device(struct nfc_dev *dev) 
{

	int rc;



	nfc_dbg("dev_name=%s", dev_name(&dev->dev));

	pr_debug("dev_name=%s\n", dev_name(&dev->dev));



	mutex_lock(&nfc_devlist_mutex);

	nfc_devlist_generation++;
@@ -492,8 +493,8 @@ void nfc_unregister_device(struct nfc_dev *dev) 


	rc = nfc_genl_device_removed(dev);

	if (rc)

		nfc_dbg("The userspace won't be notified that the device %s"

					" was removed", dev_name(&dev->dev));

		pr_debug("The userspace won't be notified that the device %s was removed\n",

			 dev_name(&dev->dev));



}

EXPORT_SYMBOL(nfc_unregister_device);

net/nfc/nci/core.c

+28 −28
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static int __nci_request(struct nci_dev *ndev, 
							&ndev->req_completion,

							timeout);



	nfc_dbg("wait_for_completion return %ld", completion_rc);

	pr_debug("wait_for_completion return %ld\n", completion_rc);



	if (completion_rc > 0) {

		switch (ndev->req_status) {
@@ -325,7 +325,7 @@ static void nci_cmd_timer(unsigned long arg) 
{

	struct nci_dev *ndev = (void *) arg;



	nfc_dbg("entry");

	pr_debug("entry\n");



	atomic_set(&ndev->cmd_cnt, 1);

	queue_work(ndev->cmd_wq, &ndev->cmd_work);
@@ -335,7 +335,7 @@ static int nci_dev_up(struct nfc_dev *nfc_dev) 
{

	struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);



	nfc_dbg("entry");

	pr_debug("entry\n");



	return nci_open_device(ndev);

}
@@ -344,7 +344,7 @@ static int nci_dev_down(struct nfc_dev *nfc_dev) 
{

	struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);



	nfc_dbg("entry");

	pr_debug("entry\n");



	return nci_close_device(ndev);

}
@@ -354,7 +354,7 @@ static int nci_start_poll(struct nfc_dev *nfc_dev, __u32 protocols) 
	struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);

	int rc;



	nfc_dbg("entry");

	pr_debug("entry\n");



	if (test_bit(NCI_DISCOVERY, &ndev->flags)) {

		pr_err("unable to start poll, since poll is already active\n");
@@ -367,7 +367,7 @@ static int nci_start_poll(struct nfc_dev *nfc_dev, __u32 protocols) 
	}



	if (test_bit(NCI_POLL_ACTIVE, &ndev->flags)) {

		nfc_dbg("target is active, implicitly deactivate...");

		pr_debug("target is active, implicitly deactivate...\n");



		rc = nci_request(ndev, nci_rf_deactivate_req, 0,

			msecs_to_jiffies(NCI_RF_DEACTIVATE_TIMEOUT));
@@ -388,7 +388,7 @@ static void nci_stop_poll(struct nfc_dev *nfc_dev) 
{

	struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);



	nfc_dbg("entry");

	pr_debug("entry\n");



	if (!test_bit(NCI_DISCOVERY, &ndev->flags)) {

		pr_err("unable to stop poll, since poll is not active\n");
@@ -404,7 +404,7 @@ static int nci_activate_target(struct nfc_dev *nfc_dev, __u32 target_idx, 
{

	struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);



	nfc_dbg("entry, target_idx %d, protocol 0x%x", target_idx, protocol);

	pr_debug("entry, target_idx %d, protocol 0x%x\n", target_idx, protocol);



	if (!test_bit(NCI_POLL_ACTIVE, &ndev->flags)) {

		pr_err("there is no available target to activate\n");
@@ -432,7 +432,7 @@ static void nci_deactivate_target(struct nfc_dev *nfc_dev, __u32 target_idx) 
{

	struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);



	nfc_dbg("entry, target_idx %d", target_idx);

	pr_debug("entry, target_idx %d\n", target_idx);



	if (!ndev->target_active_prot) {

		pr_err("unable to deactivate target, no active target\n");
@@ -455,7 +455,7 @@ static int nci_data_exchange(struct nfc_dev *nfc_dev, __u32 target_idx, 
	struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);

	int rc;



	nfc_dbg("entry, target_idx %d, len %d", target_idx, skb->len);

	pr_debug("entry, target_idx %d, len %d\n", target_idx, skb->len);



	if (!ndev->target_active_prot) {

		pr_err("unable to exchange data, no active target\n");
@@ -501,7 +501,7 @@ struct nci_dev *nci_allocate_device(struct nci_ops *ops, 
{

	struct nci_dev *ndev;



	nfc_dbg("entry, supported_protocols 0x%x", supported_protocols);

	pr_debug("entry, supported_protocols 0x%x\n", supported_protocols);



	if (!ops->open || !ops->close || !ops->send)

		return NULL;
@@ -541,7 +541,7 @@ EXPORT_SYMBOL(nci_allocate_device); 
 */

void nci_free_device(struct nci_dev *ndev)

{

	nfc_dbg("entry");

	pr_debug("entry\n");



	nfc_free_device(ndev->nfc_dev);

	kfree(ndev);
@@ -559,7 +559,7 @@ int nci_register_device(struct nci_dev *ndev) 
	struct device *dev = &ndev->nfc_dev->dev;

	char name[32];



	nfc_dbg("entry");

	pr_debug("entry\n");



	rc = nfc_register_device(ndev->nfc_dev);

	if (rc)
@@ -623,7 +623,7 @@ EXPORT_SYMBOL(nci_register_device); 
 */

void nci_unregister_device(struct nci_dev *ndev)

{

	nfc_dbg("entry");

	pr_debug("entry\n");



	nci_close_device(ndev);
@@ -644,7 +644,7 @@ int nci_recv_frame(struct sk_buff *skb) 
{

	struct nci_dev *ndev = (struct nci_dev *) skb->dev;



	nfc_dbg("entry, len %d", skb->len);

	pr_debug("entry, len %d\n", skb->len);



	if (!ndev || (!test_bit(NCI_UP, &ndev->flags)

		&& !test_bit(NCI_INIT, &ndev->flags))) {
@@ -664,7 +664,7 @@ static int nci_send_frame(struct sk_buff *skb) 
{

	struct nci_dev *ndev = (struct nci_dev *) skb->dev;



	nfc_dbg("entry, len %d", skb->len);

	pr_debug("entry, len %d\n", skb->len);



	if (!ndev) {

		kfree_skb(skb);
@@ -683,7 +683,7 @@ int nci_send_cmd(struct nci_dev *ndev, __u16 opcode, __u8 plen, void *payload) 
	struct nci_ctrl_hdr *hdr;

	struct sk_buff *skb;



	nfc_dbg("entry, opcode 0x%x, plen %d", opcode, plen);

	pr_debug("entry, opcode 0x%x, plen %d\n", opcode, plen);



	skb = nci_skb_alloc(ndev, (NCI_CTRL_HDR_SIZE + plen), GFP_KERNEL);

	if (!skb) {
@@ -717,7 +717,7 @@ static void nci_tx_work(struct work_struct *work) 
	struct nci_dev *ndev = container_of(work, struct nci_dev, tx_work);

	struct sk_buff *skb;



	nfc_dbg("entry, credits_cnt %d", atomic_read(&ndev->credits_cnt));

	pr_debug("entry, credits_cnt %d\n", atomic_read(&ndev->credits_cnt));



	/* Send queued tx data */

	while (atomic_read(&ndev->credits_cnt)) {
@@ -730,7 +730,7 @@ static void nci_tx_work(struct work_struct *work) 
				NCI_DATA_FLOW_CONTROL_NOT_USED)

			atomic_dec(&ndev->credits_cnt);



		nfc_dbg("NCI TX: MT=data, PBF=%d, conn_id=%d, plen=%d",

		pr_debug("NCI TX: MT=data, PBF=%d, conn_id=%d, plen=%d\n",

			 nci_pbf(skb->data),

			 nci_conn_id(skb->data),

			 nci_plen(skb->data));
@@ -776,7 +776,7 @@ static void nci_cmd_work(struct work_struct *work) 
	struct nci_dev *ndev = container_of(work, struct nci_dev, cmd_work);

	struct sk_buff *skb;



	nfc_dbg("entry, cmd_cnt %d", atomic_read(&ndev->cmd_cnt));

	pr_debug("entry, cmd_cnt %d\n", atomic_read(&ndev->cmd_cnt));



	/* Send queued command */

	if (atomic_read(&ndev->cmd_cnt)) {
@@ -786,7 +786,7 @@ static void nci_cmd_work(struct work_struct *work) 


		atomic_dec(&ndev->cmd_cnt);



		nfc_dbg("NCI TX: MT=cmd, PBF=%d, GID=0x%x, OID=0x%x, plen=%d",

		pr_debug("NCI TX: MT=cmd, PBF=%d, GID=0x%x, OID=0x%x, plen=%d\n",

			 nci_pbf(skb->data),

			 nci_opcode_gid(nci_opcode(skb->data)),

			 nci_opcode_oid(nci_opcode(skb->data)),

net/nfc/nci/data.c

+11 −11
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ void nci_data_exchange_complete(struct nci_dev *ndev, 
	data_exchange_cb_t cb = ndev->data_exchange_cb;

	void *cb_context = ndev->data_exchange_cb_context;



	nfc_dbg("entry, len %d, err %d", ((skb) ? (skb->len) : (0)), err);

	pr_debug("entry, len %d, err %d\n", skb ? skb->len : 0, err);



	if (cb) {

		ndev->data_exchange_cb = NULL;
@@ -92,7 +92,7 @@ static int nci_queue_tx_data_frags(struct nci_dev *ndev, 
	int frag_len;

	int rc = 0;



	nfc_dbg("entry, conn_id 0x%x, total_len %d", conn_id, total_len);

	pr_debug("entry, conn_id 0x%x, total_len %d\n", conn_id, total_len);



	__skb_queue_head_init(&frags_q);
@@ -121,7 +121,7 @@ static int nci_queue_tx_data_frags(struct nci_dev *ndev, 
		data += frag_len;

		total_len -= frag_len;



		nfc_dbg("frag_len %d, remaining total_len %d",

		pr_debug("frag_len %d, remaining total_len %d\n",

			 frag_len, total_len);

	}
@@ -151,7 +151,7 @@ int nci_send_data(struct nci_dev *ndev, __u8 conn_id, struct sk_buff *skb) 
{

	int rc = 0;



	nfc_dbg("entry, conn_id 0x%x, plen %d", conn_id, skb->len);

	pr_debug("entry, conn_id 0x%x, plen %d\n", conn_id, skb->len);



	/* check if the packet need to be fragmented */

	if (skb->len <= ndev->max_data_pkt_payload_size) {
@@ -230,9 +230,9 @@ void nci_rx_data_packet(struct nci_dev *ndev, struct sk_buff *skb) 
{

	__u8 pbf = nci_pbf(skb->data);



	nfc_dbg("entry, len %d", skb->len);

	pr_debug("entry, len %d\n", skb->len);



	nfc_dbg("NCI RX: MT=data, PBF=%d, conn_id=%d, plen=%d",

	pr_debug("NCI RX: MT=data, PBF=%d, conn_id=%d, plen=%d\n",

		 nci_pbf(skb->data),

		 nci_conn_id(skb->data),

		 nci_plen(skb->data));
@@ -242,7 +242,7 @@ void nci_rx_data_packet(struct nci_dev *ndev, struct sk_buff *skb) 


	if (ndev->target_active_prot == NFC_PROTO_MIFARE) {

		/* frame I/F => remove the status byte */

		nfc_dbg("NFC_PROTO_MIFARE => remove the status byte");

		pr_debug("NFC_PROTO_MIFARE => remove the status byte\n");

		skb_trim(skb, (skb->len - 1));

	}

net/nfc/nci/ntf.c

+33 −34
Original line number Diff line number Diff line
@@ -45,15 +45,15 @@ static void nci_core_conn_credits_ntf_packet(struct nci_dev *ndev, 
	struct nci_core_conn_credit_ntf *ntf = (void *) skb->data;

	int i;



	nfc_dbg("entry, num_entries %d", ntf->num_entries);

	pr_debug("entry, num_entries %d\n", ntf->num_entries);



	if (ntf->num_entries > NCI_MAX_NUM_CONN)

		ntf->num_entries = NCI_MAX_NUM_CONN;



	/* update the credits */

	for (i = 0; i < ntf->num_entries; i++) {

		nfc_dbg("entry[%d]: conn_id %d, credits %d", i,

			ntf->conn_entries[i].conn_id,

		pr_debug("entry[%d]: conn_id %d, credits %d\n",

			 i, ntf->conn_entries[i].conn_id,

			 ntf->conn_entries[i].credits);



		if (ntf->conn_entries[i].conn_id == NCI_STATIC_RF_CONN_ID) {
@@ -80,9 +80,8 @@ static __u8 *nci_extract_rf_params_nfca_passive_poll(struct nci_dev *ndev, 


	nfca_poll->nfcid1_len = *data++;



	nfc_dbg("sens_res 0x%x, nfcid1_len %d",

		nfca_poll->sens_res,

		nfca_poll->nfcid1_len);

	pr_debug("sens_res 0x%x, nfcid1_len %d\n",

		 nfca_poll->sens_res, nfca_poll->nfcid1_len);



	memcpy(nfca_poll->nfcid1, data, nfca_poll->nfcid1_len);

	data += nfca_poll->nfcid1_len;
@@ -92,7 +91,7 @@ static __u8 *nci_extract_rf_params_nfca_passive_poll(struct nci_dev *ndev, 
	if (nfca_poll->sel_res_len != 0)

		nfca_poll->sel_res = *data++;



	nfc_dbg("sel_res_len %d, sel_res 0x%x",

	pr_debug("sel_res_len %d, sel_res 0x%x\n",

		 nfca_poll->sel_res_len,

		 nfca_poll->sel_res);
@@ -140,11 +139,11 @@ static void nci_target_found(struct nci_dev *ndev, 
	nfc_tgt.sel_res = ntf->rf_tech_specific_params.nfca_poll.sel_res;



	if (!(nfc_tgt.supported_protocols & ndev->poll_prots)) {

		nfc_dbg("the target found does not have the desired protocol");

		pr_debug("the target found does not have the desired protocol\n");

		return;

	}



	nfc_dbg("new target found,  supported_protocols 0x%x",

	pr_debug("new target found,  supported_protocols 0x%x\n",

		 nfc_tgt.supported_protocols);



	ndev->target_available_prots = nfc_tgt.supported_protocols;
@@ -168,12 +167,12 @@ static void nci_rf_intf_activated_ntf_packet(struct nci_dev *ndev, 
	ntf.activation_rf_tech_and_mode = *data++;

	ntf.rf_tech_specific_params_len = *data++;



	nfc_dbg("rf_discovery_id %d", ntf.rf_discovery_id);

	nfc_dbg("rf_interface_type 0x%x", ntf.rf_interface_type);

	nfc_dbg("rf_protocol 0x%x", ntf.rf_protocol);

	nfc_dbg("activation_rf_tech_and_mode 0x%x",

	pr_debug("rf_discovery_id %d\n", ntf.rf_discovery_id);

	pr_debug("rf_interface_type 0x%x\n", ntf.rf_interface_type);

	pr_debug("rf_protocol 0x%x\n", ntf.rf_protocol);

	pr_debug("activation_rf_tech_and_mode 0x%x\n",

		 ntf.activation_rf_tech_and_mode);

	nfc_dbg("rf_tech_specific_params_len %d",

	pr_debug("rf_tech_specific_params_len %d\n",

		 ntf.rf_tech_specific_params_len);



	if (ntf.rf_tech_specific_params_len > 0) {
@@ -195,13 +194,13 @@ static void nci_rf_intf_activated_ntf_packet(struct nci_dev *ndev, 
	ntf.data_exch_rx_bit_rate = *data++;

	ntf.activation_params_len = *data++;



	nfc_dbg("data_exch_rf_tech_and_mode 0x%x",

	pr_debug("data_exch_rf_tech_and_mode 0x%x\n",

		 ntf.data_exch_rf_tech_and_mode);

	nfc_dbg("data_exch_tx_bit_rate 0x%x",

	pr_debug("data_exch_tx_bit_rate 0x%x\n",

		 ntf.data_exch_tx_bit_rate);

	nfc_dbg("data_exch_rx_bit_rate 0x%x",

	pr_debug("data_exch_rx_bit_rate 0x%x\n",

		 ntf.data_exch_rx_bit_rate);

	nfc_dbg("activation_params_len %d",

	pr_debug("activation_params_len %d\n",

		 ntf.activation_params_len);



	if (ntf.activation_params_len > 0) {
@@ -231,7 +230,7 @@ static void nci_rf_deactivate_ntf_packet(struct nci_dev *ndev, 
{

	struct nci_rf_deactivate_ntf *ntf = (void *) skb->data;



	nfc_dbg("entry, type 0x%x, reason 0x%x", ntf->type, ntf->reason);

	pr_debug("entry, type 0x%x, reason 0x%x\n", ntf->type, ntf->reason);



	clear_bit(NCI_POLL_ACTIVE, &ndev->flags);

	ndev->target_active_prot = 0;
@@ -257,7 +256,7 @@ void nci_ntf_packet(struct nci_dev *ndev, struct sk_buff *skb) 
{

	__u16 ntf_opcode = nci_opcode(skb->data);



	nfc_dbg("NCI RX: MT=ntf, PBF=%d, GID=0x%x, OID=0x%x, plen=%d",

	pr_debug("NCI RX: MT=ntf, PBF=%d, GID=0x%x, OID=0x%x, plen=%d\n",

		 nci_pbf(skb->data),

		 nci_opcode_gid(ntf_opcode),

		 nci_opcode_oid(ntf_opcode),

net/nfc/nci/rsp.c

+40 −40
Original line number Diff line number Diff line
@@ -42,11 +42,11 @@ static void nci_core_reset_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb) 
{

	struct nci_core_reset_rsp *rsp = (void *) skb->data;



	nfc_dbg("entry, status 0x%x", rsp->status);

	pr_debug("entry, status 0x%x\n", rsp->status);



	if (rsp->status == NCI_STATUS_OK) {

		ndev->nci_ver = rsp->nci_ver;

		nfc_dbg("nci_ver 0x%x, config_status 0x%x",

		pr_debug("nci_ver 0x%x, config_status 0x%x\n",

			 rsp->nci_ver, rsp->config_status);

	}
@@ -58,7 +58,7 @@ static void nci_core_init_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb) 
	struct nci_core_init_rsp_1 *rsp_1 = (void *) skb->data;

	struct nci_core_init_rsp_2 *rsp_2;



	nfc_dbg("entry, status 0x%x", rsp_1->status);

	pr_debug("entry, status 0x%x\n", rsp_1->status);



	if (rsp_1->status != NCI_STATUS_OK)

		goto exit;
@@ -97,33 +97,33 @@ static void nci_core_init_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb) 


	atomic_set(&ndev->credits_cnt, ndev->initial_num_credits);



	nfc_dbg("nfcc_features 0x%x",

	pr_debug("nfcc_features 0x%x\n",

		 ndev->nfcc_features);

	nfc_dbg("num_supported_rf_interfaces %d",

	pr_debug("num_supported_rf_interfaces %d\n",

		 ndev->num_supported_rf_interfaces);

	nfc_dbg("supported_rf_interfaces[0] 0x%x",

	pr_debug("supported_rf_interfaces[0] 0x%x\n",

		 ndev->supported_rf_interfaces[0]);

	nfc_dbg("supported_rf_interfaces[1] 0x%x",

	pr_debug("supported_rf_interfaces[1] 0x%x\n",

		 ndev->supported_rf_interfaces[1]);

	nfc_dbg("supported_rf_interfaces[2] 0x%x",

	pr_debug("supported_rf_interfaces[2] 0x%x\n",

		 ndev->supported_rf_interfaces[2]);

	nfc_dbg("supported_rf_interfaces[3] 0x%x",

	pr_debug("supported_rf_interfaces[3] 0x%x\n",

		 ndev->supported_rf_interfaces[3]);

	nfc_dbg("max_logical_connections %d",

	pr_debug("max_logical_connections %d\n",

		 ndev->max_logical_connections);

	nfc_dbg("max_routing_table_size %d",

	pr_debug("max_routing_table_size %d\n",

		 ndev->max_routing_table_size);

	nfc_dbg("max_ctrl_pkt_payload_len %d",

	pr_debug("max_ctrl_pkt_payload_len %d\n",

		 ndev->max_ctrl_pkt_payload_len);

	nfc_dbg("max_size_for_large_params %d",

	pr_debug("max_size_for_large_params %d\n",

		 ndev->max_size_for_large_params);

	nfc_dbg("max_data_pkt_payload_size %d",

	pr_debug("max_data_pkt_payload_size %d\n",

		 ndev->max_data_pkt_payload_size);

	nfc_dbg("initial_num_credits %d",

	pr_debug("initial_num_credits %d\n",

		 ndev->initial_num_credits);

	nfc_dbg("manufact_id 0x%x",

	pr_debug("manufact_id 0x%x\n",

		 ndev->manufact_id);

	nfc_dbg("manufact_specific_info 0x%x",

	pr_debug("manufact_specific_info 0x%x\n",

		 ndev->manufact_specific_info);



exit:
@@ -135,7 +135,7 @@ static void nci_rf_disc_map_rsp_packet(struct nci_dev *ndev, 
{

	__u8 status = skb->data[0];



	nfc_dbg("entry, status 0x%x", status);

	pr_debug("entry, status 0x%x\n", status);



	nci_req_complete(ndev, status);

}
@@ -144,7 +144,7 @@ static void nci_rf_disc_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb) 
{

	__u8 status = skb->data[0];



	nfc_dbg("entry, status 0x%x", status);

	pr_debug("entry, status 0x%x\n", status);



	if (status == NCI_STATUS_OK)

		set_bit(NCI_DISCOVERY, &ndev->flags);
@@ -157,7 +157,7 @@ static void nci_rf_deactivate_rsp_packet(struct nci_dev *ndev, 
{

	__u8 status = skb->data[0];



	nfc_dbg("entry, status 0x%x", status);

	pr_debug("entry, status 0x%x\n", status);



	clear_bit(NCI_DISCOVERY, &ndev->flags);
@@ -171,7 +171,7 @@ void nci_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb) 
	/* we got a rsp, stop the cmd timer */

	del_timer(&ndev->cmd_timer);



	nfc_dbg("NCI RX: MT=rsp, PBF=%d, GID=0x%x, OID=0x%x, plen=%d",

	pr_debug("NCI RX: MT=rsp, PBF=%d, GID=0x%x, OID=0x%x, plen=%d\n",

		 nci_pbf(skb->data),

		 nci_opcode_gid(rsp_opcode),

		 nci_opcode_oid(rsp_opcode),