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

staging: bcm: add missing blank lines after declarations

Fix "Missing blank line after declaration" warnings reported by
checkpatch.pl.

Signed-off-by: Pawel Lebioda <pawel.lebioda89@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Pawel Lebioda and committed by
Greg Kroah-Hartman
89fa037b 539889ee

+30 -1
+1
drivers/staging/bcm/CmHost.c
··· 972 972 pstAddIndication->sfAuthorizedSet.bValid = 1; 973 973 for (nIndex = 0; nIndex < nCurClassifierCnt; nIndex++) { 974 974 struct bcm_convergence_types *psfCSType = NULL; 975 + 975 976 psfCSType = &pstAddIndication->sfAuthorizedSet.cConvergenceSLTypes[nIndex]; 976 977 977 978 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "psfCSType = %p", psfCSType);
+6
drivers/staging/bcm/IPv6Protocol.c
··· 45 45 case IPV6HDR_TYPE_ROUTING: 46 46 { 47 47 struct bcm_ipv6_routing_hdr *pstIpv6RoutingHeader; 48 + 48 49 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG, 49 50 DBG_LVL_ALL, "\nIPv6 Routing Header"); 50 51 pstIpv6RoutingHeader = (struct bcm_ipv6_routing_hdr *)pucPayloadPtr; ··· 67 66 { 68 67 struct bcm_ipv6_dest_options_hdr *pstIpv6DestOptsHdr = (struct bcm_ipv6_dest_options_hdr *)pucPayloadPtr; 69 68 int nTotalOptions = pstIpv6DestOptsHdr->ucHdrExtLen; 69 + 70 70 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG, 71 71 DBG_LVL_ALL, 72 72 "\nIPv6 DestOpts Header Header"); ··· 80 78 { 81 79 struct bcm_ipv6_authentication_hdr *pstIpv6AuthHdr = (struct bcm_ipv6_authentication_hdr *)pucPayloadPtr; 82 80 int nHdrLen = pstIpv6AuthHdr->ucLength; 81 + 83 82 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG, 84 83 DBG_LVL_ALL, 85 84 "\nIPv6 Authentication Header"); ··· 278 275 279 276 if (bClassificationSucceed == TRUE) { 280 277 INT iMatchedSFQueueIndex = 0; 278 + 281 279 iMatchedSFQueueIndex = SearchSfid(Adapter, pstClassifierRule->ulSFID); 282 280 if (iMatchedSFQueueIndex >= NO_OF_QUEUES) { 283 281 bClassificationSucceed = false; ··· 411 407 UINT uiIpv6AddrNoLongWords = 4; 412 408 UINT uiIpv6AddIndex = 0; 413 409 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); 410 + 414 411 for (uiIpv6AddIndex = 0; uiIpv6AddIndex < uiIpv6AddrNoLongWords; uiIpv6AddIndex++) { 415 412 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, 416 413 ":%lx", puIpv6Address[uiIpv6AddIndex]); ··· 424 419 UCHAR ucVersion; 425 420 UCHAR ucPrio; 426 421 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); 422 + 427 423 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, 428 424 "----Ipv6 Header---"); 429 425 ucVersion = pstIpv6Header->ucVersionPrio & 0xf0;
+1
drivers/staging/bcm/InterfaceDld.c
··· 244 244 { 245 245 unsigned int len = 0; 246 246 int retval = STATUS_SUCCESS; 247 + 247 248 len = u32FirmwareLength; 248 249 249 250 while (u32FirmwareLength) {
+1
drivers/staging/bcm/InterfaceInit.c
··· 440 440 * Else USB_IF will fail. 441 441 */ 442 442 UINT _uiData = ntohl(EP2_CFG_INT); 443 + 443 444 BCM_DEBUG_PRINT(psAd, DBG_TYPE_INITEXIT, DRV_ENTRY, 444 445 DBG_LVL_ALL, 445 446 "Reverting Bulk to INT as it is in Full Speed mode.\n");
+1
drivers/staging/bcm/InterfaceMisc.c
··· 236 236 { 237 237 struct bcm_interface_adapter *psIntfAdapter = NULL; 238 238 struct usb_interface *intf = NULL; 239 + 239 240 psIntfAdapter = container_of(work, struct bcm_interface_adapter, 240 241 usbSuspendWork); 241 242 intf = psIntfAdapter->interface;
+1
drivers/staging/bcm/PHSModule.c
··· 287 287 pstServiceFlowTable = pPhsdeviceExtension->pstServiceFlowPhsRulesTable; 288 288 for (i = 0; i < MAX_SERVICEFLOWS; i++) { 289 289 struct bcm_phs_entry sServiceFlow = pstServiceFlowTable->stSFList[i]; 290 + 290 291 sServiceFlow.pstClassifierTable = kzalloc(sizeof(struct bcm_phs_classifier_table), GFP_KERNEL); 291 292 if (!sServiceFlow.pstClassifierTable) { 292 293 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nAllocation failed");
+8 -1
drivers/staging/bcm/Qos.c
··· 94 94 **************************************************************************/ 95 95 static bool MatchTos(struct bcm_classifier_rule *pstClassifierRule, UCHAR ucTypeOfService) 96 96 { 97 - 98 97 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); 98 + 99 99 if (3 != pstClassifierRule->ucIPTypeOfServiceLength) 100 100 return TRUE; 101 101 ··· 121 121 { 122 122 UCHAR ucLoopIndex = 0; 123 123 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); 124 + 124 125 if (0 == pstClassifierRule->ucProtocolLength) 125 126 return TRUE; 126 127 for (ucLoopIndex = 0; ucLoopIndex < pstClassifierRule->ucProtocolLength; ucLoopIndex++) { ··· 270 269 271 270 if (TRUE == bClassificationSucceed) { 272 271 INT iMatchedSFQueueIndex = 0; 272 + 273 273 iMatchedSFQueueIndex = SearchSfid(Adapter, pstClassifierRule->ulSFID); 274 274 if (iMatchedSFQueueIndex >= NO_OF_QUEUES) 275 275 bClassificationSucceed = false; ··· 582 580 * Create Frag CLS Entry 583 581 */ 584 582 struct bcm_fragmented_packet_info stFragPktInfo; 583 + 585 584 stFragPktInfo.bUsed = TRUE; 586 585 stFragPktInfo.ulSrcIpAddress = pIpHeader->saddr; 587 586 stFragPktInfo.usIpIdentification = pIpHeader->id; ··· 604 601 { 605 602 UINT i = 0; 606 603 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); 604 + 607 605 if (pstClassifierRule->ucEthCSSrcMACLen == 0) 608 606 return TRUE; 609 607 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s\n", __func__); ··· 621 617 { 622 618 UINT i = 0; 623 619 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); 620 + 624 621 if (pstClassifierRule->ucEthCSDestMACLen == 0) 625 622 return TRUE; 626 623 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s\n", __func__); ··· 637 632 static bool EthCSMatchEThTypeSAP(struct bcm_classifier_rule *pstClassifierRule, struct sk_buff *skb, struct bcm_eth_packet_info *pstEthCsPktInfo) 638 633 { 639 634 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); 635 + 640 636 if ((pstClassifierRule->ucEtherTypeLen == 0) || 641 637 (pstClassifierRule->au8EthCSEtherType[0] == 0)) 642 638 return TRUE; ··· 725 719 B_UINT8 EthCSCupport) 726 720 { 727 721 bool bClassificationSucceed = false; 722 + 728 723 bClassificationSucceed = EthCSMatchSrcMACAddress(pstClassifierRule, ((struct bcm_eth_header *)(skb->data))->au8SourceAddress); 729 724 if (!bClassificationSucceed) 730 725 return false;
+1
drivers/staging/bcm/Transmit.c
··· 148 148 status); 149 149 } else { 150 150 struct net_device_stats *netstats = &Adapter->dev->stats; 151 + 151 152 Adapter->PackInfo[QueueIndex].uiTotalTxBytes += Leader.PLength; 152 153 153 154 netstats->tx_bytes += Leader.PLength;
+4
drivers/staging/bcm/led_control.c
··· 6 6 static B_UINT16 CFG_CalculateChecksum(B_UINT8 *pu8Buffer, B_UINT32 u32Size) 7 7 { 8 8 B_UINT16 u16CheckSum = 0; 9 + 9 10 while (u32Size--) { 10 11 u16CheckSum += (B_UINT8)~(*pu8Buffer); 11 12 pu8Buffer++; ··· 17 16 bool IsReqGpioIsLedInNVM(struct bcm_mini_adapter *Adapter, UINT gpios) 18 17 { 19 18 INT Status; 19 + 20 20 Status = (Adapter->gpioBitMap & gpios) ^ gpios; 21 21 if (Status) 22 22 return false; ··· 491 489 PUCHAR puCFGData = NULL; 492 490 UCHAR bData = 0; 493 491 struct bcm_led_state_info *curr_led_state; 492 + 494 493 memset(GPIO_Array, DISABLE_GPIO_NUM, NUM_OF_LEDS+1); 495 494 496 495 if (!Adapter->pstargetparams || IS_ERR(Adapter->pstargetparams)) { ··· 718 715 UCHAR GPIO_num_rx = DISABLE_GPIO_NUM; 719 716 UCHAR uiLEDTx = 0; 720 717 UCHAR uiLEDRx = 0; 718 + 721 719 currdriverstate = NORMAL_OPERATION; 722 720 ad->LEDInfo.bIdle_led_off = false; 723 721
+6
drivers/staging/bcm/nvm.c
··· 361 361 } else { 362 362 /* Handle the reads less than 4 bytes... */ 363 363 PUCHAR pCharBuff = (PUCHAR)pBuffer; 364 + 364 365 pCharBuff += uiIndex; 365 366 if (ReadBeceemEEPROM(Adapter, uiOffset, &uiData[0]) == 0) { 366 367 memcpy(pCharBuff, &uiData[0], uiBytesRemaining); /* copy only bytes requested. */ ··· 915 914 static VOID BcmRestoreBlockProtectStatus(struct bcm_mini_adapter *Adapter, ULONG ulWriteStatus) 916 915 { 917 916 unsigned int value; 917 + 918 918 value = (FLASH_CMD_WRITE_ENABLE << 24); 919 919 wrmalt(Adapter, FLASH_SPI_CMDQ_REG, &value, sizeof(value)); 920 920 ··· 1156 1154 if (STATUS_SUCCESS == BeceemFlashBulkRead(Adapter, (PUINT)ucReadBk, uiOffsetFromSectStart + uiIndex, MAX_RW_SIZE)) { 1157 1155 if (Adapter->ulFlashWriteSize == 1) { 1158 1156 unsigned int uiReadIndex = 0; 1157 + 1159 1158 for (uiReadIndex = 0; uiReadIndex < 16; uiReadIndex++) { 1160 1159 if (ucReadBk[uiReadIndex] != pTempBuff[uiIndex + uiReadIndex]) { 1161 1160 if (STATUS_SUCCESS != (*Adapter->fpFlashWriteWithStatusCheck)(Adapter, uiPartOffset + uiIndex + uiReadIndex, &pTempBuff[uiIndex+uiReadIndex])) { ··· 1871 1868 if ((uiOffset + uiNumBytes) > EEPROM_CALPARAM_START) { 1872 1869 ULONG ulBytesTobeSkipped = 0; 1873 1870 PUCHAR pcBuffer = (PUCHAR)pBuffer; /* char pointer to take care of odd byte cases. */ 1871 + 1874 1872 uiNumBytes -= (EEPROM_CALPARAM_START - uiOffset); 1875 1873 ulBytesTobeSkipped += (EEPROM_CALPARAM_START - uiOffset); 1876 1874 uiOffset += (EEPROM_CALPARAM_START - uiOffset); ··· 2459 2455 #endif 2460 2456 2461 2457 unsigned int uiFlashLayoutMajorVersion; 2458 + 2462 2459 Adapter->uiFlashLayoutMinorVersion = 0; 2463 2460 Adapter->uiFlashLayoutMajorVersion = 0; 2464 2461 Adapter->ulFlashControlSectionStart = FLASH_CS_INFO_START_ADDR; ··· 4324 4319 static int ReadISOPriority(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val iso) 4325 4320 { 4326 4321 unsigned int ISOPri = STATUS_FAILURE; 4322 + 4327 4323 if (IsSectionWritable(Adapter, iso)) { 4328 4324 if (ReadISOSignature(Adapter, iso) == ISO_IMAGE_MAGIC_NUMBER) { 4329 4325 BcmFlash2xBulkRead(Adapter,