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

Commit 0a40acb2 authored by Samuel Ortiz's avatar Samuel Ortiz Committed by John W. Linville
Browse files

NFC: Core code identation fixes 



Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 427a2eb1

include/net/nfc/nfc.h

+12 −12
Original line number Diff line number Diff line
@@ -179,8 +179,8 @@ struct sk_buff *nfc_alloc_recv_skb(unsigned int size, gfp_t gfp); 
int nfc_set_remote_general_bytes(struct nfc_dev *dev,

				 u8 *gt, u8 gt_len);



int nfc_targets_found(struct nfc_dev *dev, struct nfc_target *targets,

							int ntargets);

int nfc_targets_found(struct nfc_dev *dev,

		      struct nfc_target *targets, int ntargets);



int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx,

		       u8 comm_mode, u8 rf_mode);

net/nfc/core.c

+12 −16
Original line number Diff line number Diff line
@@ -336,10 +336,8 @@ error: 
 *

 * The user must wait for the callback before calling this function again.

 */

int nfc_data_exchange(struct nfc_dev *dev, u32 target_idx,

					struct sk_buff *skb,

					data_exchange_cb_t cb,

					void *cb_context)

int nfc_data_exchange(struct nfc_dev *dev, u32 target_idx, struct sk_buff *skb,

		      data_exchange_cb_t cb, void *cb_context)

{

	int rc;
@@ -363,8 +361,7 @@ error: 


int nfc_set_remote_general_bytes(struct nfc_dev *dev, u8 *gb, u8 gb_len)

{

	pr_debug("dev_name=%s gb_len=%d\n",

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

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



	if (gb_len > NFC_MAX_GT_LEN)

		return -EINVAL;
@@ -428,8 +425,8 @@ EXPORT_SYMBOL(nfc_alloc_recv_skb); 
 * are found. After calling this function, the device driver must stop

 * polling for targets.

 */

int nfc_targets_found(struct nfc_dev *dev, struct nfc_target *targets,

							int n_targets)

int nfc_targets_found(struct nfc_dev *dev,

		      struct nfc_target *targets, int n_targets)

{

	pr_debug("dev_name=%s n_targets=%d\n", dev_name(&dev->dev), n_targets);
@@ -502,8 +499,7 @@ struct nfc_dev *nfc_get_device(unsigned idx) 
 */

struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,

				    u32 supported_protocols,

					int tx_headroom,

					int tx_tailroom)

				    int tx_headroom, int tx_tailroom)

{

	static atomic_t dev_no = ATOMIC_INIT(0);

	struct nfc_dev *dev;

net/nfc/netlink.c

+27 −30
Original line number Diff line number Diff line
@@ -64,8 +64,7 @@ static int nfc_genl_send_target(struct sk_buff *msg, struct nfc_target *target, 
	genl_dump_check_consistent(cb, hdr, &nfc_genl_family);



	NLA_PUT_U32(msg, NFC_ATTR_TARGET_INDEX, target->idx);

	NLA_PUT_U32(msg, NFC_ATTR_PROTOCOLS,

				target->supported_protocols);

	NLA_PUT_U32(msg, NFC_ATTR_PROTOCOLS, target->supported_protocols);

	NLA_PUT_U16(msg, NFC_ATTR_TARGET_SENS_RES, target->sens_res);

	NLA_PUT_U8(msg, NFC_ATTR_TARGET_SEL_RES, target->sel_res);

	if (target->nfcid1_len > 0)
@@ -300,8 +299,7 @@ static int nfc_genl_dump_devices(struct sk_buff *skb, 
		int rc;



		rc = nfc_genl_send_device(skb, dev, NETLINK_CB(cb->skb).pid,

							cb->nlh->nlmsg_seq,

							cb, NLM_F_MULTI);

					  cb->nlh->nlmsg_seq, cb, NLM_F_MULTI);

		if (rc < 0)

			break;
@@ -337,8 +335,7 @@ int nfc_genl_dep_link_up_event(struct nfc_dev *dev, u32 target_idx, 
	if (!msg)

		return -ENOMEM;



	hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,

				NFC_CMD_DEP_LINK_UP);

	hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0, NFC_CMD_DEP_LINK_UP);

	if (!hdr)

		goto free_msg;

net/nfc/nfc.h

+6 −7
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ static inline void nfc_llcp_unregister_device(struct nfc_dev *dev) 
{

}



static inline int nfc_llcp_set_remote_gb(struct nfc_dev *dev, u8 *gb, u8 gb_len)

static inline int nfc_llcp_set_remote_gb(struct nfc_dev *dev,

					 u8 *gb, u8 gb_len)

{

	return 0;

}
@@ -168,9 +169,7 @@ int nfc_activate_target(struct nfc_dev *dev, u32 target_idx, u32 protocol); 


int nfc_deactivate_target(struct nfc_dev *dev, u32 target_idx);



int nfc_data_exchange(struct nfc_dev *dev, u32 target_idx,

					struct sk_buff *skb,

					data_exchange_cb_t cb,

					void *cb_context);

int nfc_data_exchange(struct nfc_dev *dev, u32 target_idx, struct sk_buff *skb,

		      data_exchange_cb_t cb, void *cb_context);



#endif /* __LOCAL_NFC_H */

net/nfc/rawsock.c

+8 −8

File changed.

Contains only whitespace changes.

net/nfc/af_nfc.c

+1 −1

File changed.

Contains only whitespace changes.