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

staging/frontier: Fixed up incorrect formatted comments

The existing comments are using an odd style. Fixed them up to adhereto the
StyleGuide. No code changes.

Signed-off-by: Sara Bird <sara.bird.iar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Sara Bird and committed by
Greg Kroah-Hartman
15f10bd1 396b7fd6

+33 -40
+18 -31
drivers/staging/frontier/alphatrack.c
··· 24 24 * raw interrupt reports. 25 25 */ 26 26 27 - /* Note: this currently uses a dumb ringbuffer for reads and writes. 27 + /* 28 + * Note: this currently uses a dumb ringbuffer for reads and writes. 28 29 * A more optimal driver would cache and kill off outstanding urbs that are 29 30 * now invalid, and ignore ones that already were in the queue but valid 30 31 * as we only have 30 commands for the alphatrack. In particular this is 31 32 * key for getting lights to flash in time as otherwise many commands 32 33 * can be buffered up before the light change makes it to the interface. 33 - */ 34 + */ 34 35 35 36 #include <linux/kernel.h> 36 37 #include <linux/errno.h> ··· 101 100 module_param(debug, int, S_IRUGO | S_IWUSR); 102 101 MODULE_PARM_DESC(debug, "Debug enabled or not"); 103 102 104 - /* All interrupt in transfers are collected in a ring buffer to 103 + /* 104 + * All interrupt in transfers are collected in a ring buffer to 105 105 * avoid racing conditions and get better performance of the driver. 106 106 */ 107 107 ··· 111 109 module_param(ring_buffer_size, int, S_IRUGO); 112 110 MODULE_PARM_DESC(ring_buffer_size, "Read ring buffer size"); 113 111 114 - /* The write_buffer can one day contain more than one interrupt out transfer. 115 - */ 112 + /* The write_buffer can one day contain more than one interrupt out transfer.*/ 116 113 117 114 static int write_buffer_size = WRITE_BUFFER_SIZE; 118 115 module_param(write_buffer_size, int, S_IRUGO); ··· 200 199 usb_kill_urb(dev->interrupt_out_urb); 201 200 } 202 201 203 - /** 204 - * usb_alphatrack_delete 205 - */ 202 + /** usb_alphatrack_delete */ 206 203 static void usb_alphatrack_delete(struct usb_alphatrack *dev) 207 204 { 208 205 usb_alphatrack_abort_transfers(dev); ··· 212 213 kfree(dev); /* fixme oldi_buffer */ 213 214 } 214 215 215 - /** 216 - * usb_alphatrack_interrupt_in_callback 217 - */ 216 + /** usb_alphatrack_interrupt_in_callback */ 218 217 219 218 static void usb_alphatrack_interrupt_in_callback(struct urb *urb) 220 219 { ··· 293 296 wake_up_interruptible(&dev->read_wait); 294 297 } 295 298 296 - /** 297 - * usb_alphatrack_interrupt_out_callback 298 - */ 299 + /** usb_alphatrack_interrupt_out_callback */ 299 300 static void usb_alphatrack_interrupt_out_callback(struct urb *urb) 300 301 { 301 302 struct usb_alphatrack *dev = urb->context; ··· 310 315 wake_up_interruptible(&dev->write_wait); 311 316 } 312 317 313 - /** 314 - * usb_alphatrack_open 315 - */ 318 + /** usb_alphatrack_open */ 316 319 static int usb_alphatrack_open(struct inode *inode, struct file *file) 317 320 { 318 321 struct usb_alphatrack *dev; ··· 391 398 return retval; 392 399 } 393 400 394 - /** 395 - * usb_alphatrack_release 396 - */ 401 + /** usb_alphatrack_release */ 397 402 static int usb_alphatrack_release(struct inode *inode, struct file *file) 398 403 { 399 404 struct usb_alphatrack *dev; ··· 438 447 return retval; 439 448 } 440 449 441 - /** 442 - * usb_alphatrack_poll 443 - */ 450 + /** usb_alphatrack_poll */ 444 451 static unsigned int usb_alphatrack_poll(struct file *file, poll_table *wait) 445 452 { 446 453 struct usb_alphatrack *dev; ··· 457 468 return mask; 458 469 } 459 470 460 - /** 461 - * usb_alphatrack_read 462 - */ 471 + /** usb_alphatrack_read */ 463 472 static ssize_t usb_alphatrack_read(struct file *file, char __user *buffer, 464 473 size_t count, loff_t *ppos) 465 474 { ··· 526 539 return retval; 527 540 } 528 541 529 - /** 530 - * usb_alphatrack_write 531 - */ 542 + /** usb_alphatrack_write */ 532 543 static ssize_t usb_alphatrack_write(struct file *file, 533 544 const char __user *buffer, size_t count, 534 545 loff_t *ppos) ··· 703 718 704 719 true_size = min(ring_buffer_size, RING_BUFFER_SIZE); 705 720 706 - /* FIXME - there are more usb_alloc routines for dma correctness. 707 - Needed? */ 721 + /* 722 + * FIXME - there are more usb_alloc routines for dma correctness. 723 + * Needed? 724 + */ 708 725 dev->ring_buffer = kmalloc_array(true_size, 709 726 sizeof(struct alphatrack_icmd), 710 727 GFP_KERNEL);
+4 -2
drivers/staging/frontier/alphatrack.h
··· 6 6 unsigned char cmd[8]; 7 7 }; 8 8 9 - /* These are unused by the present driver but provide documentation for the 9 + /* 10 + * These are unused by the present driver but provide documentation for the 10 11 * userspace API. 11 12 */ 12 13 enum LightID { ··· 59 58 #define BUTTONMASK_PRESS2 0x00008010 60 59 #define BUTTONMASK_PRESS3 0x00002020 61 60 62 - /* last 3 bytes are the slider position 61 + /* 62 + * last 3 bytes are the slider position 63 63 * 40 is the actual slider moving, the most sig bits, and 3 lsb 64 64 */ 65 65
+11 -7
drivers/staging/frontier/tranzport.c
··· 86 86 module_param(debug, int, S_IRUGO | S_IWUSR); 87 87 MODULE_PARM_DESC(debug, "Debug enabled or not"); 88 88 89 - /* All interrupt in transfers are collected in a ring buffer to 89 + /* 90 + * All interrupt in transfers are collected in a ring buffer to 90 91 * avoid racing conditions and get better performance of the driver. 91 92 */ 92 93 ··· 96 95 module_param(ring_buffer_size, int, S_IRUGO); 97 96 MODULE_PARM_DESC(ring_buffer_size, "Read ring buffer size in reports"); 98 97 99 - /* The write_buffer can one day contain more than one interrupt out transfer. 98 + /* 99 + * The write_buffer can one day contain more than one interrupt out transfer. 100 100 */ 101 101 static int write_buffer_size = WRITE_BUFFER_SIZE; 102 102 module_param(write_buffer_size, int, S_IRUGO); ··· 567 565 newwheel = (*dev->ring_buffer)[next_tail].cmd[6]; 568 566 oldwheel = (*dev->ring_buffer)[dev->ring_tail].cmd[6]; 569 567 /* if both are wheel events, and 570 - no buttons have changes (FIXME, do I have to check?), 571 - and we are the same sign, we can compress +- 7F 572 - */ 568 + * no buttons have changes (FIXME, do I have to check?), 569 + * and we are the same sign, we can compress +- 7F 570 + */ 573 571 dbg_info(&dev->intf->dev, 574 572 "%s: trying to compress: " 575 573 "%02x%02x%02x%02x%02x%02x%02x%02x\n", ··· 844 842 ring_buffer_size = RING_BUFFER_SIZE; 845 843 true_size = min(ring_buffer_size, RING_BUFFER_SIZE); 846 844 847 - /* FIXME - there are more usb_alloc routines for dma correctness. 848 - Needed? */ 845 + /* 846 + * FIXME - there are more usb_alloc routines for dma correctness. 847 + * Needed? 848 + */ 849 849 850 850 dev->ring_buffer = 851 851 kmalloc((true_size * sizeof(struct tranzport_cmd)) + 8, GFP_KERNEL);