drivers: connector: fixed coding style issues

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

V2: Replaced assignment in if statement.
Fixed coding style issues.

Signed-off-by: Valentin Ilie <valentin.ilie@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Valentin Ilie and committed by

David S. Miller 13 years ago f3c48ecc ad8c9453

+28 -25

3 changed files

expand all

drivers

connector

cn_proc.c

cn_queue.c

connector.c

+18 -18

drivers/connector/cn_proc.c

··· 46 46 static inline void get_seq(__u32 *ts, int *cpu) 47 47 { 48 48 preempt_disable(); 49 - *ts = __this_cpu_inc_return(proc_event_counts) -1; 49 + *ts = __this_cpu_inc_return(proc_event_counts) - 1; 50 50 *cpu = smp_processor_id(); 51 51 preempt_enable(); 52 52 } ··· 62 62 if (atomic_read(&proc_event_num_listeners) < 1) 63 63 return; 64 64 65 - msg = (struct cn_msg*)buffer; 66 - ev = (struct proc_event*)msg->data; 65 + msg = (struct cn_msg *)buffer; 66 + ev = (struct proc_event *)msg->data; 67 67 get_seq(&msg->seq, &ev->cpu); 68 68 ktime_get_ts(&ts); /* get high res monotonic timestamp */ 69 69 put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); ··· 93 93 if (atomic_read(&proc_event_num_listeners) < 1) 94 94 return; 95 95 96 - msg = (struct cn_msg*)buffer; 97 - ev = (struct proc_event*)msg->data; 96 + msg = (struct cn_msg *)buffer; 97 + ev = (struct proc_event *)msg->data; 98 98 get_seq(&msg->seq, &ev->cpu); 99 99 ktime_get_ts(&ts); /* get high res monotonic timestamp */ 100 100 put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); ··· 119 119 if (atomic_read(&proc_event_num_listeners) < 1) 120 120 return; 121 121 122 - msg = (struct cn_msg*)buffer; 123 - ev = (struct proc_event*)msg->data; 122 + msg = (struct cn_msg *)buffer; 123 + ev = (struct proc_event *)msg->data; 124 124 ev->what = which_id; 125 125 ev->event_data.id.process_pid = task->pid; 126 126 ev->event_data.id.process_tgid = task->tgid; ··· 134 134 ev->event_data.id.e.egid = cred->egid; 135 135 } else { 136 136 rcu_read_unlock(); 137 - return; 137 + return; 138 138 } 139 139 rcu_read_unlock(); 140 140 get_seq(&msg->seq, &ev->cpu); ··· 241 241 if (atomic_read(&proc_event_num_listeners) < 1) 242 242 return; 243 243 244 - msg = (struct cn_msg*)buffer; 245 - ev = (struct proc_event*)msg->data; 244 + msg = (struct cn_msg *)buffer; 245 + ev = (struct proc_event *)msg->data; 246 246 get_seq(&msg->seq, &ev->cpu); 247 247 ktime_get_ts(&ts); /* get high res monotonic timestamp */ 248 248 put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); ··· 276 276 if (atomic_read(&proc_event_num_listeners) < 1) 277 277 return; 278 278 279 - msg = (struct cn_msg*)buffer; 280 - ev = (struct proc_event*)msg->data; 279 + msg = (struct cn_msg *)buffer; 280 + ev = (struct proc_event *)msg->data; 281 281 msg->seq = rcvd_seq; 282 282 ktime_get_ts(&ts); /* get high res monotonic timestamp */ 283 283 put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); ··· 303 303 if (msg->len != sizeof(*mc_op)) 304 304 return; 305 305 306 - mc_op = (enum proc_cn_mcast_op*)msg->data; 306 + mc_op = (enum proc_cn_mcast_op *)msg->data; 307 307 switch (*mc_op) { 308 308 case PROC_CN_MCAST_LISTEN: 309 309 atomic_inc(&proc_event_num_listeners); ··· 325 325 */ 326 326 static int __init cn_proc_init(void) 327 327 { 328 - int err; 329 - 330 - if ((err = cn_add_callback(&cn_proc_event_id, "cn_proc", 331 - &cn_proc_mcast_ctl))) { 332 - printk(KERN_WARNING "cn_proc failed to register\n"); 328 + int err = cn_add_callback(&cn_proc_event_id, 329 + "cn_proc", 330 + &cn_proc_mcast_ctl); 331 + if (err) { 332 + pr_warn("cn_proc failed to register\n"); 333 333 return err; 334 334 } 335 335 return 0;

+7 -5

drivers/connector/cn_queue.c

··· 1 1 /* 2 - * cn_queue.c 2 + * cn_queue.c 3 3 * 4 4 * 2004+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net> 5 5 * All rights reserved. ··· 34 34 static struct cn_callback_entry * 35 35 cn_queue_alloc_callback_entry(struct cn_queue_dev *dev, const char *name, 36 36 struct cb_id *id, 37 - void (*callback)(struct cn_msg *, struct netlink_skb_parms *)) 37 + void (*callback)(struct cn_msg *, 38 + struct netlink_skb_parms *)) 38 39 { 39 40 struct cn_callback_entry *cbq; 40 41 41 42 cbq = kzalloc(sizeof(*cbq), GFP_KERNEL); 42 43 if (!cbq) { 43 - printk(KERN_ERR "Failed to create new callback queue.\n"); 44 + pr_err("Failed to create new callback queue.\n"); 44 45 return NULL; 45 46 } 46 47 ··· 72 71 73 72 int cn_queue_add_callback(struct cn_queue_dev *dev, const char *name, 74 73 struct cb_id *id, 75 - void (*callback)(struct cn_msg *, struct netlink_skb_parms *)) 74 + void (*callback)(struct cn_msg *, 75 + struct netlink_skb_parms *)) 76 76 { 77 77 struct cn_callback_entry *cbq, *__cbq; 78 78 int found = 0; ··· 151 149 spin_unlock_bh(&dev->queue_lock); 152 150 153 151 while (atomic_read(&dev->refcnt)) { 154 - printk(KERN_INFO "Waiting for %s to become free: refcnt=%d.\n", 152 + pr_info("Waiting for %s to become free: refcnt=%d.\n", 155 153 dev->name, atomic_read(&dev->refcnt)); 156 154 msleep(1000); 157 155 }

+3 -2

drivers/connector/connector.c

··· 1 1 /* 2 - * connector.c 2 + * connector.c 3 3 * 4 4 * 2004+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net> 5 5 * All rights reserved. ··· 185 185 * May sleep. 186 186 */ 187 187 int cn_add_callback(struct cb_id *id, const char *name, 188 - void (*callback)(struct cn_msg *, struct netlink_skb_parms *)) 188 + void (*callback)(struct cn_msg *, 189 + struct netlink_skb_parms *)) 189 190 { 190 191 int err; 191 192 struct cn_dev *dev = &cdev;