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

staging: slicoss: Fixes block comment style

This patch fixes the checkpatch.pl warnings:

WARNING: Block comments use * on subsequent lines
WARNING: Block comments use a trailing */ on a separate line

Signed-off-by: Amarjargal Gundjalam <amarjargal.gundjalam@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Amarjargal Gundjalam and committed by
Greg Kroah-Hartman
f773a834 0d45ffcd

+113 -73
+9 -8
drivers/staging/slicoss/slic.h
··· 93 93 u32 lastid; 94 94 }; 95 95 /* 96 - SLIC Handle structure. Used to restrict handle values to 97 - 32 bits by using an index rather than an address. 98 - Simplifies ucode in 64-bit systems 99 - */ 96 + * SLIC Handle structure. Used to restrict handle values to 97 + * 32 bits by using an index rather than an address. 98 + * Simplifies ucode in 64-bit systems 99 + */ 100 100 struct slic_handle_word { 101 101 union { 102 102 struct { ··· 333 333 struct physcard *next; 334 334 uint adapters_allocd; 335 335 336 - /* the following is not currently needed 337 - u32 bridge_busnum; 338 - u32 bridge_cfg[NUM_CFG_SPACES][NUM_CFG_REG_ULONGS]; 339 - */ 336 + /* 337 + * the following is not currently needed 338 + * u32 bridge_busnum; 339 + * u32 bridge_cfg[NUM_CFG_SPACES][NUM_CFG_REG_ULONGS]; 340 + */ 340 341 }; 341 342 342 343 struct base_driver {
+24 -14
drivers/staging/slicoss/slichw.h
··· 307 307 308 308 u32 slic_hbar; /* Header buffer address reg */ 309 309 u32 pad4; 310 - /* 31-8 - phy addr of set of contiguous hdr buffers 311 - 7-0 - number of buffers passed 312 - Buffers are 256 bytes long on 256-byte boundaries. */ 310 + /* 311 + * 31-8 - phy addr of set of contiguous hdr buffers 312 + * 7-0 - number of buffers passed 313 + * Buffers are 256 bytes long on 256-byte boundaries. 314 + */ 313 315 #define SLIC_HBAR 0x0020 314 316 #define SLIC_HBAR_CNT_MSK 0x000000FF 315 317 ··· 323 321 #define SLIC_DBAR_SIZE 2048 324 322 325 323 u32 slic_cbar; /* Xmt Cmd buf addr regs.*/ 326 - /* 1 per XMT interface 327 - 31-5 - phy addr of host command buffer 328 - 4-0 - length of cmd in multiples of 32 bytes 329 - Buffers are 32 bytes up to 512 bytes long */ 324 + /* 325 + * 1 per XMT interface 326 + * 31-5 - phy addr of host command buffer 327 + * 4-0 - length of cmd in multiples of 32 bytes 328 + * Buffers are 32 bytes up to 512 bytes long 329 + */ 330 330 #define SLIC_CBAR 0x0030 331 331 #define SLIC_CBAR_LEN_MSK 0x0000001F 332 332 #define SLIC_CBAR_ALIGN 0x00000020 ··· 340 336 341 337 u32 slic_rbar; /* Response buffer address reg.*/ 342 338 u32 pad7; 343 - /*31-8 - phy addr of set of contiguous response buffers 344 - 7-0 - number of buffers passed 345 - Buffers are 32 bytes long on 32-byte boundaries.*/ 339 + /* 340 + * 31-8 - phy addr of set of contiguous response buffers 341 + * 7-0 - number of buffers passed 342 + * Buffers are 32 bytes long on 32-byte boundaries. 343 + */ 346 344 #define SLIC_RBAR 0x0038 347 345 #define SLIC_RBAR_CNT_MSK 0x000000FF 348 346 #define SLIC_RBAR_SIZE 32 ··· 436 430 #define SLIC_LOW_POWER 0x00e0 437 431 438 432 u32 slic_quiesce; /* force slic into quiescent state 439 - before soft reset */ 433 + * before soft reset 434 + */ 440 435 u32 pad30; 441 436 #define SLIC_QUIESCE 0x00e8 442 437 ··· 725 718 u16 DSize2Pci; /* 15 DRAM size to PCI (bytes * 64K) */ 726 719 u16 RSize2Pci; /* 16 ROM extension size to PCI (bytes * 4k) */ 727 720 u8 NetIntPin1; /* 17 Network Interface Pin 1 728 - (simba/leone only) */ 721 + * (simba/leone only) 722 + */ 729 723 u8 NetIntPin2; /* Network Interface Pin 2 (simba/leone only)*/ 730 724 union { 731 725 u8 NetIntPin3; /* 18 Network Interface Pin 3 (simba only) */ ··· 756 748 union oemfru OemFru; /* optional OEM FRU information */ 757 749 u8 Pad[4]; /* Pad to 128 bytes - includes 2 cksum bytes 758 750 * (if OEM FRU info exists) and two unusable 759 - * bytes at the end */ 751 + * bytes at the end 752 + */ 760 753 }; 761 754 762 755 /* SLIC EEPROM structure for Oasis */ ··· 781 772 u16 FlashSize; /* 14 Flash size (bytes / 4K) */ 782 773 u16 DSize2Pci; /* 15 DRAM size to PCI (bytes / 64K) */ 783 774 u16 RSize2Pci; /* 16 Flash (ROM extension) size to PCI 784 - (bytes / 4K) */ 775 + * (bytes / 4K) 776 + */ 785 777 u16 DeviceId1; /* 17 Device Id (function 1) */ 786 778 u16 DeviceId2; /* 18 Device Id (function 2) */ 787 779 u16 CfgByte6; /* 19 Device Status Config Bytes 6-7 */
+80 -51
drivers/staging/slicoss/slicoss.c
··· 158 158 unsigned char crcpoly; 159 159 160 160 /* Get the CRC polynomial for the mac address */ 161 - /* we use bits 1-8 (lsb), bitwise reversed, 162 - * msb (= lsb bit 0 before bitrev) is automatically discarded */ 161 + /* 162 + * we use bits 1-8 (lsb), bitwise reversed, 163 + * msb (= lsb bit 0 before bitrev) is automatically discarded 164 + */ 163 165 crcpoly = ether_crc(ETH_ALEN, address) >> 23; 164 166 165 - /* We only have space on the SLIC for 64 entries. Lop 167 + /* 168 + * We only have space on the SLIC for 64 entries. Lop 166 169 * off the top two bits. (2^6 = 64) 167 170 */ 168 171 crcpoly &= 0x3F; ··· 179 176 __iomem struct slic_regs *slic_regs = adapter->slic_regs; 180 177 181 178 if (adapter->macopts & (MAC_ALLMCAST | MAC_PROMISC)) { 182 - /* Turn on all multicast addresses. We have to do this for 179 + /* 180 + * Turn on all multicast addresses. We have to do this for 183 181 * promiscuous mode as well as ALLMCAST mode. It saves the 184 182 * Microcode from having to keep state about the MAC 185 183 * configuration. ··· 189 185 slic_reg32_write(&slic_regs->slic_mcasthigh, 0xFFFFFFFF, 190 186 FLUSH); 191 187 } else { 192 - /* Commit our multicast mast to the SLIC by writing to the 188 + /* 189 + * Commit our multicast mast to the SLIC by writing to the 193 190 * multicast address mask registers 194 191 */ 195 192 slic_reg32_write(&slic_regs->slic_mcastlow, ··· 247 242 248 243 if ((linkspeed == LINK_AUTOSPEED) || (linkspeed == LINK_1000MB)) { 249 244 if (adapter->flags & ADAPT_FLAGS_FIBERMEDIA) { 250 - /* We've got a fiber gigabit interface, and register 245 + /* 246 + * We've got a fiber gigabit interface, and register 251 247 * 4 is different in fiber mode than in copper mode 252 248 */ 253 249 ··· 266 260 PCR_AUTONEG_RST)); 267 261 slic_reg32_write(wphy, phy_config, FLUSH); 268 262 } else { /* forced 1000 Mb FD*/ 269 - /* power down phy to break link 270 - this may not work) */ 263 + /* 264 + * power down phy to break link 265 + * this may not work) 266 + */ 271 267 phy_config = (MIICR_REG_PCR | PCR_POWERDOWN); 272 268 slic_reg32_write(wphy, phy_config, FLUSH); 273 - /* wait, Marvell says 1 sec, 274 - try to get away with 10 ms */ 269 + /* 270 + * wait, Marvell says 1 sec, 271 + * try to get away with 10 ms 272 + */ 275 273 mdelay(10); 276 274 277 - /* disable auto-neg, set speed/duplex, 278 - soft reset phy, powerup */ 275 + /* 276 + * disable auto-neg, set speed/duplex, 277 + * soft reset phy, powerup 278 + */ 279 279 phy_config = 280 280 (MIICR_REG_PCR | 281 281 (PCR_RESET | PCR_SPEED_1000 | ··· 290 278 } 291 279 } else { /* copper gigabit */ 292 280 293 - /* Auto-Negotiate or 1000 Mb must be auto negotiated 281 + /* 282 + * Auto-Negotiate or 1000 Mb must be auto negotiated 294 283 * We've got a copper gigabit interface, and 295 284 * register 4 is different in copper mode than 296 285 * in fiber mode ··· 303 290 (PAR_ADV100FD | PAR_ADV100HD | PAR_ADV10FD 304 291 | PAR_ADV10HD)); 305 292 } else { 306 - /* linkspeed == LINK_1000MB - 307 - don't advertise 10/100 Mb modes */ 293 + /* 294 + * linkspeed == LINK_1000MB - 295 + * don't advertise 10/100 Mb modes 296 + */ 308 297 phy_advreg = MIICR_REG_4; 309 298 } 310 299 /* enable PAUSE frames */ ··· 319 304 slic_reg32_write(wphy, phy_gctlreg, FLUSH); 320 305 321 306 if (adapter->subsysid != SLIC_1GB_CICADA_SUBSYS_ID) { 322 - /* if a Marvell PHY 323 - enable auto crossover */ 307 + /* 308 + * if a Marvell PHY 309 + * enable auto crossover 310 + */ 324 311 phy_config = 325 312 (MIICR_REG_16 | (MRV_REG16_XOVERON)); 326 313 slic_reg32_write(wphy, phy_config, FLUSH); ··· 353 336 duplex = PCR_DUPLEX_FULL; 354 337 355 338 if (adapter->subsysid != SLIC_1GB_CICADA_SUBSYS_ID) { 356 - /* if a Marvell PHY 357 - disable auto crossover */ 339 + /* 340 + * if a Marvell PHY 341 + * disable auto crossover 342 + */ 358 343 phy_config = (MIICR_REG_16 | (MRV_REG16_XOVEROFF)); 359 344 slic_reg32_write(wphy, phy_config, FLUSH); 360 345 } ··· 369 350 mdelay(10); 370 351 371 352 if (adapter->subsysid != SLIC_1GB_CICADA_SUBSYS_ID) { 372 - /* if a Marvell PHY 373 - disable auto-neg, set speed, 374 - soft reset phy, powerup */ 353 + /* 354 + * if a Marvell PHY 355 + * disable auto-neg, set speed, 356 + * soft reset phy, powerup 357 + */ 375 358 phy_config = 376 359 (MIICR_REG_PCR | (PCR_RESET | speed | duplex)); 377 360 slic_reg32_write(wphy, phy_config, FLUSH); ··· 550 529 index += 4; 551 530 552 531 /* Check SRAM location zero. If it is non-zero. Abort.*/ 553 - /* failure = readl((u32 __iomem *)&slic_regs->slic_reset); 554 - if (failure) { 555 - release_firmware(fw); 556 - return -EIO; 557 - }*/ 532 + /* 533 + * failure = readl((u32 __iomem *)&slic_regs->slic_reset); 534 + * if (failure) { 535 + * release_firmware(fw); 536 + * return -EIO; 537 + * } 538 + */ 558 539 } 559 540 } 560 541 release_firmware(fw); ··· 564 541 mdelay(10); 565 542 slic_reg32_write(&slic_regs->slic_wcs, SLIC_WCS_START, FLUSH); 566 543 567 - /* stall for 20 ms, long enough for ucode to init card 568 - and reach mainloop */ 544 + /* 545 + * stall for 20 ms, long enough for ucode to init card 546 + * and reach mainloop 547 + */ 569 548 mdelay(20); 570 549 571 550 return 0; ··· 627 602 slic_reg32_write(&slic_regs->slic_wraddrah, value2, FLUSH); 628 603 slic_reg32_write(&slic_regs->slic_wraddrbh, value2, FLUSH); 629 604 630 - /* Write our multicast mask out to the card. This is done */ 631 - /* here in addition to the slic_mcast_addr_set routine */ 632 - /* because ALL_MCAST may have been enabled or disabled */ 605 + /* 606 + * Write our multicast mask out to the card. This is done 607 + * here in addition to the slic_mcast_addr_set routine 608 + * because ALL_MCAST may have been enabled or disabled 609 + */ 633 610 slic_mcast_set_mask(adapter); 634 611 } 635 612 ··· 912 885 struct slic_upr *upr; 913 886 __iomem struct slic_regs *slic_regs = adapter->slic_regs; 914 887 /* 915 - char * ptr1; 916 - char * ptr2; 917 - uint cmdoffset; 918 - */ 888 + * char * ptr1; 889 + * char * ptr2; 890 + * uint cmdoffset; 891 + */ 919 892 upr = adapter->upr_list; 920 893 if (!upr) 921 894 return; ··· 2076 2049 adapter->xmit_completes++; 2077 2050 adapter->card->events++; 2078 2051 /* 2079 - Get the complete host command buffer 2080 - */ 2052 + * Get the complete host command buffer 2053 + */ 2081 2054 slic_handle_word.handle_token = rspbuf->hosthandle; 2082 2055 hcmd = 2083 2056 adapter->slic_handles[slic_handle_word.handle_index]. ··· 2785 2758 oemfruformat = pOeeprom->OemFruFormat; 2786 2759 poemfru = &pOeeprom->OemFru; 2787 2760 macaddrs = 2; 2788 - /* Minor kludge for Oasis card 2789 - get 2 MAC addresses from the 2790 - EEPROM to ensure that function 1 2791 - gets the Port 1 MAC address */ 2761 + /* 2762 + * Minor kludge for Oasis card 2763 + * get 2 MAC addresses from the 2764 + * EEPROM to ensure that function 1 2765 + * gets the Port 1 MAC address 2766 + */ 2792 2767 break; 2793 2768 default: 2794 2769 /* extract EEPROM data and pointers to EEPROM data */ ··· 2813 2784 ee_chksum = 2814 2785 *(u16 *)((char *)peeprom + (eecodesize - 2)); 2815 2786 /* 2816 - calculate the EEPROM checksum 2817 - */ 2787 + * calculate the EEPROM checksum 2788 + */ 2818 2789 calc_chksum = slic_eeprom_cksum(peeprom, 2819 2790 eecodesize - 2); 2820 2791 /* 2821 - if the ucdoe chksum flag bit worked, 2822 - we wouldn't need this 2823 - */ 2792 + * if the ucdoe chksum flag bit worked, 2793 + * we wouldn't need this 2794 + */ 2824 2795 if (ee_chksum == calc_chksum) 2825 2796 card->config.EepromValid = true; 2826 2797 } ··· 2919 2890 2920 2891 adapter->card_size = 1; 2921 2892 /* 2922 - Initialize slic_handle array 2923 - */ 2893 + * Initialize slic_handle array 2894 + */ 2924 2895 /* 2925 - Start with 1. 0 is an invalid host handle. 2926 - */ 2896 + * Start with 1. 0 is an invalid host handle. 2897 + */ 2927 2898 for (index = 1, pslic_handle = &adapter->slic_handles[1]; 2928 2899 index < SLIC_CMDQ_MAXCMDS; index++, pslic_handle++) { 2929 2900