Skip to content

Commit

Permalink
NFC: Core code identation fixes
Browse files Browse the repository at this point in the history 
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
@linvjw
Samuel Ortiz authored and linvjw committed Mar 6, 2012
1 parent 427a2eb commit 0a40acb
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 74 deletions.
24 changes: 12 additions & 12 deletions include/net/nfc/nfc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ struct nfc_ops {
u8 *gb, size_t gb_len);
int (*dep_link_down)(struct nfc_dev *dev);
int (*activate_target)(struct nfc_dev *dev, u32 target_idx,
u32 protocol);
u32 protocol);
void (*deactivate_target)(struct nfc_dev *dev, u32 target_idx);
int (*data_exchange)(struct nfc_dev *dev, u32 target_idx,
struct sk_buff *skb, data_exchange_cb_t cb,
void *cb_context);
struct sk_buff *skb, data_exchange_cb_t cb,
void *cb_context);
};

#define NFC_TARGET_IDX_ANY -1
Expand Down Expand Up @@ -110,9 +110,9 @@ struct nfc_dev {
extern struct class nfc_class;

struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,
u32 supported_protocols,
int tx_headroom,
int tx_tailroom);
u32 supported_protocols,
int tx_headroom,
int tx_tailroom);

/**
* nfc_free_device - free nfc device
Expand All @@ -135,7 +135,7 @@ void nfc_unregister_device(struct nfc_dev *dev);
* @dev: The parent device
*/
static inline void nfc_set_parent_dev(struct nfc_dev *nfc_dev,
struct device *dev)
struct device *dev)
{
nfc_dev->dev.parent = dev;
}
Expand Down Expand Up @@ -172,15 +172,15 @@ static inline const char *nfc_device_name(struct nfc_dev *dev)
}

struct sk_buff *nfc_alloc_send_skb(struct nfc_dev *dev, struct sock *sk,
unsigned int flags, unsigned int size,
unsigned int *err);
unsigned int flags, unsigned int size,
unsigned int *err);
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);
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);
Expand Down
2 changes: 1 addition & 1 deletion net/nfc/af_nfc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ static DEFINE_RWLOCK(proto_tab_lock);
static const struct nfc_protocol *proto_tab[NFC_SOCKPROTO_MAX];

static int nfc_sock_create(struct net *net, struct socket *sock, int proto,
int kern)
int kern)
{
int rc = -EPROTONOSUPPORT;

Expand Down
28 changes: 12 additions & 16 deletions net/nfc/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ int nfc_dep_link_down(struct nfc_dev *dev)
}

int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx,
u8 comm_mode, u8 rf_mode)
u8 comm_mode, u8 rf_mode)
{
dev->dep_link_up = true;
dev->dep_rf_mode = rf_mode;
Expand Down Expand Up @@ -336,10 +336,8 @@ int nfc_deactivate_target(struct nfc_dev *dev, u32 target_idx)
*
* 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;

Expand All @@ -363,8 +361,7 @@ int nfc_data_exchange(struct nfc_dev *dev, u32 target_idx,

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;
Expand All @@ -380,8 +377,8 @@ EXPORT_SYMBOL(nfc_set_remote_general_bytes);
* @gfp: gfp flags
*/
struct sk_buff *nfc_alloc_send_skb(struct nfc_dev *dev, struct sock *sk,
unsigned int flags, unsigned int size,
unsigned int *err)
unsigned int flags, unsigned int size,
unsigned int *err)
{
struct sk_buff *skb;
unsigned int total_size;
Expand Down Expand Up @@ -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);

Expand All @@ -441,7 +438,7 @@ int nfc_targets_found(struct nfc_dev *dev, struct nfc_target *targets,

kfree(dev->targets);
dev->targets = kmemdup(targets, n_targets * sizeof(struct nfc_target),
GFP_ATOMIC);
GFP_ATOMIC);

if (!dev->targets) {
dev->n_targets = 0;
Expand Down Expand Up @@ -501,15 +498,14 @@ struct nfc_dev *nfc_get_device(unsigned idx)
* @supported_protocols: NFC protocols supported by the device
*/
struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,
u32 supported_protocols,
int tx_headroom,
int tx_tailroom)
u32 supported_protocols,
int tx_headroom, int tx_tailroom)
{
static atomic_t dev_no = ATOMIC_INIT(0);
struct nfc_dev *dev;

if (!ops->start_poll || !ops->stop_poll || !ops->activate_target ||
!ops->deactivate_target || !ops->data_exchange)
!ops->deactivate_target || !ops->data_exchange)
return NULL;

if (!supported_protocols)
Expand Down
57 changes: 27 additions & 30 deletions net/nfc/netlink.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,31 +52,30 @@ static const struct nla_policy nfc_genl_policy[NFC_ATTR_MAX + 1] = {
};

static int nfc_genl_send_target(struct sk_buff *msg, struct nfc_target *target,
struct netlink_callback *cb, int flags)
struct netlink_callback *cb, int flags)
{
void *hdr;

hdr = genlmsg_put(msg, NETLINK_CB(cb->skb).pid, cb->nlh->nlmsg_seq,
&nfc_genl_family, flags, NFC_CMD_GET_TARGET);
&nfc_genl_family, flags, NFC_CMD_GET_TARGET);
if (!hdr)
return -EMSGSIZE;

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)
NLA_PUT(msg, NFC_ATTR_TARGET_NFCID1, target->nfcid1_len,
target->nfcid1);
target->nfcid1);
if (target->sensb_res_len > 0)
NLA_PUT(msg, NFC_ATTR_TARGET_SENSB_RES, target->sensb_res_len,
target->sensb_res);
target->sensb_res);
if (target->sensf_res_len > 0)
NLA_PUT(msg, NFC_ATTR_TARGET_SENSF_RES, target->sensf_res_len,
target->sensf_res);
target->sensf_res);

return genlmsg_end(msg, hdr);

Expand All @@ -92,9 +91,9 @@ static struct nfc_dev *__get_device_from_cb(struct netlink_callback *cb)
u32 idx;

rc = nlmsg_parse(cb->nlh, GENL_HDRLEN + nfc_genl_family.hdrsize,
nfc_genl_family.attrbuf,
nfc_genl_family.maxattr,
nfc_genl_policy);
nfc_genl_family.attrbuf,
nfc_genl_family.maxattr,
nfc_genl_policy);
if (rc < 0)
return ERR_PTR(rc);

Expand All @@ -111,7 +110,7 @@ static struct nfc_dev *__get_device_from_cb(struct netlink_callback *cb)
}

static int nfc_genl_dump_targets(struct sk_buff *skb,
struct netlink_callback *cb)
struct netlink_callback *cb)
{
int i = cb->args[0];
struct nfc_dev *dev = (struct nfc_dev *) cb->args[1];
Expand All @@ -131,7 +130,7 @@ static int nfc_genl_dump_targets(struct sk_buff *skb,

while (i < dev->n_targets) {
rc = nfc_genl_send_target(skb, &dev->targets[i], cb,
NLM_F_MULTI);
NLM_F_MULTI);
if (rc < 0)
break;

Expand Down Expand Up @@ -167,7 +166,7 @@ int nfc_genl_targets_found(struct nfc_dev *dev)
return -ENOMEM;

hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
NFC_EVENT_TARGETS_FOUND);
NFC_EVENT_TARGETS_FOUND);
if (!hdr)
goto free_msg;

Expand All @@ -194,7 +193,7 @@ int nfc_genl_device_added(struct nfc_dev *dev)
return -ENOMEM;

hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
NFC_EVENT_DEVICE_ADDED);
NFC_EVENT_DEVICE_ADDED);
if (!hdr)
goto free_msg;

Expand Down Expand Up @@ -226,7 +225,7 @@ int nfc_genl_device_removed(struct nfc_dev *dev)
return -ENOMEM;

hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
NFC_EVENT_DEVICE_REMOVED);
NFC_EVENT_DEVICE_REMOVED);
if (!hdr)
goto free_msg;

Expand All @@ -246,14 +245,14 @@ int nfc_genl_device_removed(struct nfc_dev *dev)
}

static int nfc_genl_send_device(struct sk_buff *msg, struct nfc_dev *dev,
u32 pid, u32 seq,
struct netlink_callback *cb,
int flags)
u32 pid, u32 seq,
struct netlink_callback *cb,
int flags)
{
void *hdr;

hdr = genlmsg_put(msg, pid, seq, &nfc_genl_family, flags,
NFC_CMD_GET_DEVICE);
NFC_CMD_GET_DEVICE);
if (!hdr)
return -EMSGSIZE;

Expand All @@ -273,7 +272,7 @@ static int nfc_genl_send_device(struct sk_buff *msg, struct nfc_dev *dev,
}

static int nfc_genl_dump_devices(struct sk_buff *skb,
struct netlink_callback *cb)
struct netlink_callback *cb)
{
struct class_dev_iter *iter = (struct class_dev_iter *) cb->args[0];
struct nfc_dev *dev = (struct nfc_dev *) cb->args[1];
Expand All @@ -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;

Expand All @@ -326,7 +324,7 @@ static int nfc_genl_dump_devices_done(struct netlink_callback *cb)
}

int nfc_genl_dep_link_up_event(struct nfc_dev *dev, u32 target_idx,
u8 comm_mode, u8 rf_mode)
u8 comm_mode, u8 rf_mode)
{
struct sk_buff *msg;
void *hdr;
Expand All @@ -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;

Expand Down Expand Up @@ -375,7 +372,7 @@ int nfc_genl_dep_link_down_event(struct nfc_dev *dev)
return -ENOMEM;

hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
NFC_CMD_DEP_LINK_DOWN);
NFC_CMD_DEP_LINK_DOWN);
if (!hdr)
goto free_msg;

Expand Down Expand Up @@ -417,7 +414,7 @@ static int nfc_genl_get_device(struct sk_buff *skb, struct genl_info *info)
}

rc = nfc_genl_send_device(msg, dev, info->snd_pid, info->snd_seq,
NULL, 0);
NULL, 0);
if (rc < 0)
goto out_free;

Expand Down Expand Up @@ -484,7 +481,7 @@ static int nfc_genl_start_poll(struct sk_buff *skb, struct genl_info *info)
pr_debug("Poll start\n");

if (!info->attrs[NFC_ATTR_DEVICE_INDEX] ||
!info->attrs[NFC_ATTR_PROTOCOLS])
!info->attrs[NFC_ATTR_PROTOCOLS])
return -EINVAL;

idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
Expand Down Expand Up @@ -640,7 +637,7 @@ static struct genl_ops nfc_genl_ops[] = {
};

static int nfc_genl_rcv_nl_event(struct notifier_block *this,
unsigned long event, void *ptr)
unsigned long event, void *ptr)
{
struct netlink_notify *n = ptr;
struct class_dev_iter iter;
Expand Down Expand Up @@ -693,7 +690,7 @@ int __init nfc_genl_init(void)
int rc;

rc = genl_register_family_with_ops(&nfc_genl_family, nfc_genl_ops,
ARRAY_SIZE(nfc_genl_ops));
ARRAY_SIZE(nfc_genl_ops));
if (rc)
return rc;

Expand Down
13 changes: 6 additions & 7 deletions net/nfc/nfc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ struct nfc_protocol {
struct proto *proto;
struct module *owner;
int (*create)(struct net *net, struct socket *sock,
const struct nfc_protocol *nfc_proto);
const struct nfc_protocol *nfc_proto);
};

struct nfc_rawsock {
Expand Down Expand Up @@ -65,7 +65,7 @@ static inline void nfc_llcp_mac_is_down(struct nfc_dev *dev)
}

static inline void nfc_llcp_mac_is_up(struct nfc_dev *dev, u32 target_idx,
u8 comm_mode, u8 rf_mode)
u8 comm_mode, u8 rf_mode)
{
}

Expand All @@ -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;
}
Expand Down Expand Up @@ -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 */
Loading

0 comments on commit 0a40acb

Please sign in to comment.