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

Configure Feed

Select the types of activity you want to include in your feed.

pcmcia: fix kernel-doc comments

Fix kernel-doc comments in drivers/pcmcia/:

- ti113x.h does not contain kernel-doc, so don't use /** to begin a doc
comment
- yenta_socket.c: remove /** on non-kernel-doc comments;
escape the ':' in an "http:" comment so that it won't be treated as a
section heading;
- cs.c: remove /** on non-kernel-doc comments & add function parameter info
- ds.c: fix function parameter info

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Randy Dunlap and committed by
Linus Torvalds
78187865 24601bbc

+13 -9
+5 -3
drivers/pcmcia/cs.c
··· 89 89 EXPORT_SYMBOL(pcmcia_socket_list_rwsem); 90 90 91 91 92 - /** 92 + /* 93 93 * Low-level PCMCIA socket drivers need to register with the PCCard 94 94 * core using pcmcia_register_socket. 95 95 * ··· 174 174 175 175 /** 176 176 * pcmcia_register_socket - add a new pcmcia socket device 177 + * @socket: the &socket to register 177 178 */ 178 179 int pcmcia_register_socket(struct pcmcia_socket *socket) 179 180 { ··· 269 268 270 269 /** 271 270 * pcmcia_unregister_socket - remove a pcmcia socket device 271 + * @socket: the &socket to unregister 272 272 */ 273 273 void pcmcia_unregister_socket(struct pcmcia_socket *socket) 274 274 { ··· 313 311 } 314 312 EXPORT_SYMBOL(pcmcia_get_socket_by_nr); 315 313 316 - /** 314 + /* 317 315 * The central event handler. Send_event() sends an event to the 318 316 * 16-bit subsystem, which then calls the relevant device drivers. 319 317 * Parse_events() interprets the event bits from ··· 382 380 return CS_GENERAL_FAILURE; 383 381 } 384 382 385 - /** 383 + /* 386 384 * socket_setup() and socket_shutdown() are called by the main event handler 387 385 * when card insertion and removal events are received. 388 386 * socket_setup() turns on socket power and resets the socket, in two stages.
+4 -2
drivers/pcmcia/ds.c
··· 320 320 321 321 /** 322 322 * pcmcia_register_driver - register a PCMCIA driver with the bus core 323 + * @driver: the &driver being registered 323 324 * 324 325 * Registers a PCMCIA driver with the PCMCIA bus core. 325 326 */ ··· 355 354 356 355 /** 357 356 * pcmcia_unregister_driver - unregister a PCMCIA driver with the bus core 357 + * @driver: the &driver being unregistered 358 358 */ 359 359 void pcmcia_unregister_driver(struct pcmcia_driver *driver) 360 360 { ··· 842 840 843 841 /** 844 842 * pcmcia_load_firmware - load CIS from userspace if device-provided is broken 845 - * @dev - the pcmcia device which needs a CIS override 846 - * @filename - requested filename in /lib/firmware/ 843 + * @dev: the pcmcia device which needs a CIS override 844 + * @filename: requested filename in /lib/firmware/ 847 845 * 848 846 * This uses the in-kernel firmware loading mechanism to use a "fake CIS" if 849 847 * the one provided by the card is broken. The firmware files reside in
+1 -1
drivers/pcmcia/ti113x.h
··· 874 874 */ 875 875 876 876 #ifdef CONFIG_YENTA_ENE_TUNE 877 - /** 877 + /* 878 878 * set/clear various test bits: 879 879 * Defaults to clear the bit. 880 880 * - mask (u8) defines what bits to change
+3 -3
drivers/pcmcia/yenta_socket.c
··· 48 48 #define to_cycles(ns) ((ns)/120) 49 49 #define to_ns(cycles) ((cycles)*120) 50 50 51 - /** 51 + /* 52 52 * yenta PCI irq probing. 53 53 * currently only used in the TI/EnE initialization code 54 54 */ ··· 888 888 } 889 889 890 890 891 - /** 891 + /* 892 892 * yenta PCI irq probing. 893 893 * currently only used in the TI/EnE initialization code 894 894 */ ··· 1012 1012 * invisible during PCI scans because of a misconfigured subordinate number 1013 1013 * of the parent brige - some BIOSes seem to be too lazy to set it right. 1014 1014 * Does the fixup carefully by checking how far it can go without conflicts. 1015 - * See http://bugzilla.kernel.org/show_bug.cgi?id=2944 for more information. 1015 + * See http\://bugzilla.kernel.org/show_bug.cgi?id=2944 for more information. 1016 1016 */ 1017 1017 static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge) 1018 1018 {