Commit f3c48ecc authored by Valentin Ilie's avatar Valentin Ilie Committed by David S. Miller

drivers: connector: fixed coding style issues

V2: Replaced assignment in if statement.
Fixed coding style issues.
Signed-off-by: default avatarValentin Ilie <valentin.ilie@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ad8c9453
...@@ -46,7 +46,7 @@ static DEFINE_PER_CPU(__u32, proc_event_counts) = { 0 }; ...@@ -46,7 +46,7 @@ static DEFINE_PER_CPU(__u32, proc_event_counts) = { 0 };
static inline void get_seq(__u32 *ts, int *cpu) static inline void get_seq(__u32 *ts, int *cpu)
{ {
preempt_disable(); preempt_disable();
*ts = __this_cpu_inc_return(proc_event_counts) -1; *ts = __this_cpu_inc_return(proc_event_counts) - 1;
*cpu = smp_processor_id(); *cpu = smp_processor_id();
preempt_enable(); preempt_enable();
} }
...@@ -62,8 +62,8 @@ void proc_fork_connector(struct task_struct *task) ...@@ -62,8 +62,8 @@ void proc_fork_connector(struct task_struct *task)
if (atomic_read(&proc_event_num_listeners) < 1) if (atomic_read(&proc_event_num_listeners) < 1)
return; return;
msg = (struct cn_msg*)buffer; msg = (struct cn_msg *)buffer;
ev = (struct proc_event*)msg->data; ev = (struct proc_event *)msg->data;
get_seq(&msg->seq, &ev->cpu); get_seq(&msg->seq, &ev->cpu);
ktime_get_ts(&ts); /* get high res monotonic timestamp */ ktime_get_ts(&ts); /* get high res monotonic timestamp */
put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
...@@ -93,8 +93,8 @@ void proc_exec_connector(struct task_struct *task) ...@@ -93,8 +93,8 @@ void proc_exec_connector(struct task_struct *task)
if (atomic_read(&proc_event_num_listeners) < 1) if (atomic_read(&proc_event_num_listeners) < 1)
return; return;
msg = (struct cn_msg*)buffer; msg = (struct cn_msg *)buffer;
ev = (struct proc_event*)msg->data; ev = (struct proc_event *)msg->data;
get_seq(&msg->seq, &ev->cpu); get_seq(&msg->seq, &ev->cpu);
ktime_get_ts(&ts); /* get high res monotonic timestamp */ ktime_get_ts(&ts); /* get high res monotonic timestamp */
put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
...@@ -119,8 +119,8 @@ void proc_id_connector(struct task_struct *task, int which_id) ...@@ -119,8 +119,8 @@ void proc_id_connector(struct task_struct *task, int which_id)
if (atomic_read(&proc_event_num_listeners) < 1) if (atomic_read(&proc_event_num_listeners) < 1)
return; return;
msg = (struct cn_msg*)buffer; msg = (struct cn_msg *)buffer;
ev = (struct proc_event*)msg->data; ev = (struct proc_event *)msg->data;
ev->what = which_id; ev->what = which_id;
ev->event_data.id.process_pid = task->pid; ev->event_data.id.process_pid = task->pid;
ev->event_data.id.process_tgid = task->tgid; ev->event_data.id.process_tgid = task->tgid;
...@@ -241,8 +241,8 @@ void proc_exit_connector(struct task_struct *task) ...@@ -241,8 +241,8 @@ void proc_exit_connector(struct task_struct *task)
if (atomic_read(&proc_event_num_listeners) < 1) if (atomic_read(&proc_event_num_listeners) < 1)
return; return;
msg = (struct cn_msg*)buffer; msg = (struct cn_msg *)buffer;
ev = (struct proc_event*)msg->data; ev = (struct proc_event *)msg->data;
get_seq(&msg->seq, &ev->cpu); get_seq(&msg->seq, &ev->cpu);
ktime_get_ts(&ts); /* get high res monotonic timestamp */ ktime_get_ts(&ts); /* get high res monotonic timestamp */
put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
...@@ -276,8 +276,8 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack) ...@@ -276,8 +276,8 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack)
if (atomic_read(&proc_event_num_listeners) < 1) if (atomic_read(&proc_event_num_listeners) < 1)
return; return;
msg = (struct cn_msg*)buffer; msg = (struct cn_msg *)buffer;
ev = (struct proc_event*)msg->data; ev = (struct proc_event *)msg->data;
msg->seq = rcvd_seq; msg->seq = rcvd_seq;
ktime_get_ts(&ts); /* get high res monotonic timestamp */ ktime_get_ts(&ts); /* get high res monotonic timestamp */
put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
...@@ -303,7 +303,7 @@ static void cn_proc_mcast_ctl(struct cn_msg *msg, ...@@ -303,7 +303,7 @@ static void cn_proc_mcast_ctl(struct cn_msg *msg,
if (msg->len != sizeof(*mc_op)) if (msg->len != sizeof(*mc_op))
return; return;
mc_op = (enum proc_cn_mcast_op*)msg->data; mc_op = (enum proc_cn_mcast_op *)msg->data;
switch (*mc_op) { switch (*mc_op) {
case PROC_CN_MCAST_LISTEN: case PROC_CN_MCAST_LISTEN:
atomic_inc(&proc_event_num_listeners); atomic_inc(&proc_event_num_listeners);
...@@ -325,11 +325,11 @@ static void cn_proc_mcast_ctl(struct cn_msg *msg, ...@@ -325,11 +325,11 @@ static void cn_proc_mcast_ctl(struct cn_msg *msg,
*/ */
static int __init cn_proc_init(void) static int __init cn_proc_init(void)
{ {
int err; int err = cn_add_callback(&cn_proc_event_id,
"cn_proc",
if ((err = cn_add_callback(&cn_proc_event_id, "cn_proc", &cn_proc_mcast_ctl);
&cn_proc_mcast_ctl))) { if (err) {
printk(KERN_WARNING "cn_proc failed to register\n"); pr_warn("cn_proc failed to register\n");
return err; return err;
} }
return 0; return 0;
......
...@@ -34,13 +34,14 @@ ...@@ -34,13 +34,14 @@
static struct cn_callback_entry * static struct cn_callback_entry *
cn_queue_alloc_callback_entry(struct cn_queue_dev *dev, const char *name, cn_queue_alloc_callback_entry(struct cn_queue_dev *dev, const char *name,
struct cb_id *id, struct cb_id *id,
void (*callback)(struct cn_msg *, struct netlink_skb_parms *)) void (*callback)(struct cn_msg *,
struct netlink_skb_parms *))
{ {
struct cn_callback_entry *cbq; struct cn_callback_entry *cbq;
cbq = kzalloc(sizeof(*cbq), GFP_KERNEL); cbq = kzalloc(sizeof(*cbq), GFP_KERNEL);
if (!cbq) { if (!cbq) {
printk(KERN_ERR "Failed to create new callback queue.\n"); pr_err("Failed to create new callback queue.\n");
return NULL; return NULL;
} }
...@@ -71,7 +72,8 @@ int cn_cb_equal(struct cb_id *i1, struct cb_id *i2) ...@@ -71,7 +72,8 @@ int cn_cb_equal(struct cb_id *i1, struct cb_id *i2)
int cn_queue_add_callback(struct cn_queue_dev *dev, const char *name, int cn_queue_add_callback(struct cn_queue_dev *dev, const char *name,
struct cb_id *id, struct cb_id *id,
void (*callback)(struct cn_msg *, struct netlink_skb_parms *)) void (*callback)(struct cn_msg *,
struct netlink_skb_parms *))
{ {
struct cn_callback_entry *cbq, *__cbq; struct cn_callback_entry *cbq, *__cbq;
int found = 0; int found = 0;
...@@ -149,7 +151,7 @@ void cn_queue_free_dev(struct cn_queue_dev *dev) ...@@ -149,7 +151,7 @@ void cn_queue_free_dev(struct cn_queue_dev *dev)
spin_unlock_bh(&dev->queue_lock); spin_unlock_bh(&dev->queue_lock);
while (atomic_read(&dev->refcnt)) { while (atomic_read(&dev->refcnt)) {
printk(KERN_INFO "Waiting for %s to become free: refcnt=%d.\n", pr_info("Waiting for %s to become free: refcnt=%d.\n",
dev->name, atomic_read(&dev->refcnt)); dev->name, atomic_read(&dev->refcnt));
msleep(1000); msleep(1000);
} }
......
...@@ -185,7 +185,8 @@ static void cn_rx_skb(struct sk_buff *__skb) ...@@ -185,7 +185,8 @@ static void cn_rx_skb(struct sk_buff *__skb)
* May sleep. * May sleep.
*/ */
int cn_add_callback(struct cb_id *id, const char *name, int cn_add_callback(struct cb_id *id, const char *name,
void (*callback)(struct cn_msg *, struct netlink_skb_parms *)) void (*callback)(struct cn_msg *,
struct netlink_skb_parms *))
{ {
int err; int err;
struct cn_dev *dev = &cdev; struct cn_dev *dev = &cdev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment