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

drivers/staging: Remove unnecessary semicolons

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Joe Perches and committed by
Greg Kroah-Hartman
859171ca ae0d9eba

+47 -47
+1 -1
drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
··· 876 876 void 877 877 HIFUnMaskInterrupt(HIF_DEVICE *device) 878 878 { 879 - int ret;; 879 + int ret; 880 880 881 881 AR_DEBUG_ASSERT(device != NULL); 882 882 AR_DEBUG_ASSERT(device->func != NULL);
+1 -1
drivers/staging/ath6kl/os/linux/ar6000_drv.c
··· 4439 4439 for (i = assoc_req_ie_pos; i < assoc_req_ie_pos + assocReqLen - 4; i++) { 4440 4440 AR_DEBUG_PRINTF(ATH_DEBUG_WLAN_CONNECT,("%2.2x ", assocInfo[i])); 4441 4441 sprintf(pos, "%2.2x", assocInfo[i]); 4442 - pos += 2;; 4442 + pos += 2; 4443 4443 } 4444 4444 AR_DEBUG_PRINTF(ATH_DEBUG_WLAN_CONNECT,("\n")); 4445 4445
+1 -1
drivers/staging/bcm/InterfaceInit.c
··· 236 236 uint32_t uiNackZeroLengthInt=4; 237 237 if(wrmalt(psAdapter, DISABLE_USB_ZERO_LEN_INT, &uiNackZeroLengthInt, sizeof(uiNackZeroLengthInt))) 238 238 { 239 - return -EIO;; 239 + return -EIO; 240 240 } 241 241 } 242 242
+1 -1
drivers/staging/bcm/InterfaceIsr.c
··· 90 90 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Interrupt IN endPoint has got halted/stalled...need to clear this"); 91 91 Adapter->bEndPointHalted = TRUE ; 92 92 wake_up(&Adapter->tx_packet_wait_queue); 93 - urb->status = STATUS_SUCCESS ;; 93 + urb->status = STATUS_SUCCESS ; 94 94 return; 95 95 } 96 96 /* software-driven interface shutdown */
+2 -2
drivers/staging/bcm/Misc.c
··· 706 706 707 707 /* Wake the LED Thread with IDLEMODE_ENTER State */ 708 708 Adapter->DriverState = LOWPOWER_MODE_ENTER; 709 - BCM_DEBUG_PRINT(Adapter,DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL,"LED Thread is Running..Hence Setting LED Event as IDLEMODE_ENTER jiffies:%ld",jiffies);; 709 + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL,"LED Thread is Running..Hence Setting LED Event as IDLEMODE_ENTER jiffies:%ld",jiffies); 710 710 wake_up(&Adapter->LEDInfo.notify_led_event); 711 711 712 712 /* Wait for 1 SEC for LED to OFF */ ··· 1277 1277 1278 1278 void beceem_parse_target_struct(PMINI_ADAPTER Adapter) 1279 1279 { 1280 - UINT uiHostDrvrCfg6 =0, uiEEPROMFlag = 0;; 1280 + UINT uiHostDrvrCfg6 =0, uiEEPROMFlag = 0; 1281 1281 1282 1282 if(ntohl(Adapter->pstargetparams->m_u32PhyParameter2) & AUTO_SYNC_DISABLE) 1283 1283 {
+1 -1
drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
··· 1008 1008 b_ExternGate = (unsigned char) data[3]; 1009 1009 b_CycleMode = (unsigned char) data[4]; 1010 1010 b_InterruptEnable = (unsigned char) data[5]; 1011 - i_ReturnValue = insn->n;; 1011 + i_ReturnValue = insn->n; 1012 1012 devpriv->tsk_Current = current; /* Save the current process task structure */ 1013 1013 /**************************/ 1014 1014 /* Test the module number */
+1 -1
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
··· 2850 2850 i_Logic = 0; 2851 2851 i_CounterLogic = 0; 2852 2852 i_InterruptMask = 0; 2853 - i_InputChannel = 0;; 2853 + i_InputChannel = 0; 2854 2854 i_TimerCounter1Enabled = 0; 2855 2855 i_TimerCounter2Enabled = 0; 2856 2856 i_WatchdogCounter3Enabled = 0;
+1 -1
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
··· 335 335 return -EINVAL; 336 336 } /* if else data[3]==1) */ 337 337 } /* if else data[3]==0) */ 338 - return (insn->n);; 338 + return (insn->n); 339 339 } 340 340 341 341 /*
+1 -1
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
··· 339 339 int i_APCI3501_WriteAnalogOutput(struct comedi_device *dev, struct comedi_subdevice *s, 340 340 struct comedi_insn *insn, unsigned int *data) 341 341 { 342 - unsigned int ul_Command1 = 0, ul_Channel_no, ul_Polarity, ul_DAC_Ready = 0;; 342 + unsigned int ul_Command1 = 0, ul_Channel_no, ul_Polarity, ul_DAC_Ready = 0; 343 343 344 344 ul_Channel_no = CR_CHAN(insn->chanspec); 345 345
+1 -1
drivers/staging/comedi/drivers/amplc_pci230.c
··· 971 971 if (thisboard->ao_chans > 0) { 972 972 s->type = COMEDI_SUBD_AO; 973 973 s->subdev_flags = SDF_WRITABLE | SDF_GROUND; 974 - s->n_chan = thisboard->ao_chans;; 974 + s->n_chan = thisboard->ao_chans; 975 975 s->maxdata = (1 << thisboard->ao_bits) - 1; 976 976 s->range_table = &pci230_ao_range; 977 977 s->insn_write = &pci230_ao_winsn;
+1 -1
drivers/staging/comedi/drivers/cb_das16_cs.c
··· 169 169 if (!link) 170 170 return -EIO; 171 171 172 - dev->iobase = link->resource[0]->start;; 172 + dev->iobase = link->resource[0]->start; 173 173 printk("I/O base=0x%04lx ", dev->iobase); 174 174 175 175 printk("fingerprint:\n");
+1 -1
drivers/staging/comedi/drivers/comedi_bond.c
··· 370 370 struct comedi_device *devs_opened[COMEDI_NUM_BOARD_MINORS]; 371 371 372 372 memset(devs_opened, 0, sizeof(devs_opened)); 373 - devpriv->name[0] = 0;; 373 + devpriv->name[0] = 0; 374 374 /* Loop through all comedi devices specified on the command-line, 375 375 building our device list */ 376 376 for (i = 0; i < COMEDI_NDEVCONFOPTS && (!i || it->options[i]); ++i) {
+1 -1
drivers/staging/crystalhd/crystalhd_hw.c
··· 1711 1711 } 1712 1712 1713 1713 BCMLOG(BCMLOG_INFO, "Firmware Downloaded Successfully\n"); 1714 - return BC_STS_SUCCESS;; 1714 + return BC_STS_SUCCESS; 1715 1715 } 1716 1716 1717 1717 enum BC_STATUS crystalhd_do_fw_cmd(struct crystalhd_hw *hw,
+1 -1
drivers/staging/go7007/go7007-driver.c
··· 624 624 go->dvd_mode = 0; 625 625 go->interlace_coding = 0; 626 626 for (i = 0; i < 4; ++i) 627 - go->modet[i].enable = 0;; 627 + go->modet[i].enable = 0; 628 628 for (i = 0; i < 1624; ++i) 629 629 go->modet_map[i] = 0; 630 630 go->audio_deliver = NULL;
+1 -1
drivers/staging/iio/accel/lis3l02dq_ring.c
··· 517 517 518 518 ret = iio_alloc_pollfunc(indio_dev, NULL, &lis3l02dq_poll_func_th); 519 519 if (ret) 520 - goto error_iio_sw_rb_free;; 520 + goto error_iio_sw_rb_free; 521 521 indio_dev->modes |= INDIO_RING_TRIGGERED; 522 522 return 0; 523 523
+2 -2
drivers/staging/intel_sst/intel_sst_drv_interface.c
··· 173 173 case SST_CODEC_TYPE_MP3: 174 174 return str_param->sparams.uc.mp3_params.sfreq; 175 175 case SST_CODEC_TYPE_AAC: 176 - return str_param->sparams.uc.aac_params.sfreq;; 176 + return str_param->sparams.uc.aac_params.sfreq; 177 177 case SST_CODEC_TYPE_WMA9: 178 - return str_param->sparams.uc.wma_params.sfreq;; 178 + return str_param->sparams.uc.wma_params.sfreq; 179 179 default: 180 180 return 0; 181 181 }
+2 -2
drivers/staging/keucr/smilmain.c
··· 153 153 WORD len, bn; 154 154 155 155 //if (Check_D_MediaPower()) ; �b 6250 don't care 156 - // return(ErrCode); ; 156 + // return(ErrCode); 157 157 //if (Check_D_MediaFmt(fdoExt)) ; 158 - // return(ErrCode); ; 158 + // return(ErrCode); 159 159 if (Conv_D_MediaAddr(us, start)) 160 160 return(ErrCode); 161 161
+2 -2
drivers/staging/keucr/smilsub.c
··· 763 763 bcb->CDB[7] = (BYTE)addr; 764 764 bcb->CDB[6] = (BYTE)(addr/0x0100); 765 765 bcb->CDB[5] = Media.Zone/2; 766 - bcb->CDB[8] = *(redundant+REDT_ADDR1H);; 767 - bcb->CDB[9] = *(redundant+REDT_ADDR1L);; 766 + bcb->CDB[8] = *(redundant+REDT_ADDR1H); 767 + bcb->CDB[9] = *(redundant+REDT_ADDR1L); 768 768 769 769 result = ENE_SendScsiCmd(us, FDIR_WRITE, buf, 0); 770 770 if (result != USB_STOR_XFER_GOOD)
+1 -1
drivers/staging/msm/lcdc_toshiba_wvga_pt.c
··· 77 77 78 78 /* followed by parameter bytes */ 79 79 if (num) { 80 - bp = (char *)&data;; 80 + bp = (char *)&data; 81 81 bp += (num - 1); 82 82 while (num) { 83 83 toshiba_spi_write_byte(1, *bp);
+2 -2
drivers/staging/rt2860/common/cmm_data_pci.c
··· 137 137 138 138 pTxD->SDPtr0 = BufBasePaLow; 139 139 pTxD->SDLen0 = TXINFO_SIZE + TXWI_SIZE + hwHeaderLen; /* include padding */ 140 - pTxD->SDPtr1 = PCI_MAP_SINGLE(pAd, pTxBlk, 0, 1, PCI_DMA_TODEVICE);; 140 + pTxD->SDPtr1 = PCI_MAP_SINGLE(pAd, pTxBlk, 0, 1, PCI_DMA_TODEVICE); 141 141 pTxD->SDLen1 = pTxBlk->SrcBufLen; 142 142 pTxD->LastSec0 = 0; 143 143 pTxD->LastSec1 = (bIsLast) ? 1 : 0; ··· 215 215 216 216 pTxD->SDPtr0 = BufBasePaLow; 217 217 pTxD->SDLen0 = firstDMALen; /* include padding */ 218 - pTxD->SDPtr1 = PCI_MAP_SINGLE(pAd, pTxBlk, 0, 1, PCI_DMA_TODEVICE);; 218 + pTxD->SDPtr1 = PCI_MAP_SINGLE(pAd, pTxBlk, 0, 1, PCI_DMA_TODEVICE); 219 219 pTxD->SDLen1 = pTxBlk->SrcBufLen; 220 220 pTxD->LastSec0 = 0; 221 221 pTxD->LastSec1 = (bIsLast) ? 1 : 0;
+1 -1
drivers/staging/rt2860/rt_linux.c
··· 854 854 RSSI1, 855 855 RSSI_1), 856 856 ConvertToRssi(pAd, pRxBlk->pRxWI->RSSI2, 857 - RSSI_2));; 857 + RSSI_2)); 858 858 859 859 ph->signal.did = DIDmsg_lnxind_wlansniffrm_signal; 860 860 ph->signal.status = 0;
+1 -1
drivers/staging/rt2860/rtmp.h
··· 2979 2979 2980 2980 void IterateOnBssTab(struct rt_rtmp_adapter *pAd); 2981 2981 2982 - void IterateOnBssTab2(struct rt_rtmp_adapter *pAd);; 2982 + void IterateOnBssTab2(struct rt_rtmp_adapter *pAd); 2983 2983 2984 2984 void JoinParmFill(struct rt_rtmp_adapter *pAd, 2985 2985 struct rt_mlme_join_req *JoinReq, unsigned long BssIdx);
+1 -1
drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c
··· 822 822 { 823 823 txb->queue_index = UP2AC(skb->priority); 824 824 } else { 825 - txb->queue_index = WME_AC_BK;; 825 + txb->queue_index = WME_AC_BK; 826 826 } 827 827 828 828
+1 -1
drivers/staging/rtl8192e/r819xE_phy.c
··· 2596 2596 break; 2597 2597 } 2598 2598 2599 - return ret;; 2599 + return ret; 2600 2600 2601 2601 } 2602 2602 /******************************************************************************
+1 -1
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
··· 754 754 { 755 755 txb->queue_index = UP2AC(skb->priority); 756 756 } else { 757 - txb->queue_index = WME_AC_BK;; 757 + txb->queue_index = WME_AC_BK; 758 758 } 759 759 760 760
+1 -1
drivers/staging/rtl8192u/r8192U_core.c
··· 5085 5085 //Get Rx snr value in DB 5086 5086 tmp_rxsnr = pofdm_buf->rxsnr_X[i]; 5087 5087 rx_snrX = (char)(tmp_rxsnr); 5088 - //rx_snrX >>= 1;; 5088 + //rx_snrX >>= 1; 5089 5089 rx_snrX /= 2; 5090 5090 priv->stats.rxSNRdB[i] = (long)rx_snrX; 5091 5091
+1 -1
drivers/staging/rtl8192u/r819xU_phy.c
··· 1011 1011 break; 1012 1012 } 1013 1013 1014 - return ret;; 1014 + return ret; 1015 1015 1016 1016 } 1017 1017 /******************************************************************************
+1 -1
drivers/staging/rtl8712/rtl8712_efuse.c
··· 428 428 u16 cnts, u8 *data) 429 429 { 430 430 int i; 431 - u8 res = true;; 431 + u8 res = true; 432 432 433 433 if (start_addr > EFUSE_MAX_SIZE) 434 434 return false;
+1 -1
drivers/staging/rtl8712/rtl8712_xmit.c
··· 148 148 case 0x11: 149 149 case 0x12: 150 150 case 0x13: 151 - addr = RTL8712_DMA_H2CCMD;; 151 + addr = RTL8712_DMA_H2CCMD; 152 152 break; 153 153 default: 154 154 addr = RTL8712_DMA_BEQ;/*RTL8712_EP_LO;*/
+1 -1
drivers/staging/rtl8712/rtl871x_xmit.c
··· 372 372 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 373 373 0x0, 0x0}; 374 374 datalen = pattrib->pktlen - pattrib->hdrlen; 375 - pframe = pxmitframe->buf_addr + TXDESC_OFFSET;; 375 + pframe = pxmitframe->buf_addr + TXDESC_OFFSET; 376 376 if (bmcst) { 377 377 if (!memcmp(psecuritypriv->XGrptxmickey 378 378 [psecuritypriv->XGrpKeyid].skey,
+2 -2
drivers/staging/tidspbridge/core/tiomap3430.c
··· 596 596 dev_dbg(bridge, "DSP c_int00 Address = 0x%x\n", dsp_addr); 597 597 if (dsp_debug) 598 598 while (__raw_readw(dw_sync_addr)) 599 - ;; 599 + ; 600 600 601 601 /* Wait for DSP to clear word in shared memory */ 602 602 /* Read the Location */ ··· 1671 1671 /* Find a free L2 PT. */ 1672 1672 for (i = 0; (i < pt->l2_num_pages) && 1673 1673 (pt->pg_info[i].num_entries != 0); i++) 1674 - ;; 1674 + ; 1675 1675 if (i < pt->l2_num_pages) { 1676 1676 l2_page_num = i; 1677 1677 l2_base_pa = pt->l2_base_pa + (l2_page_num *
+1 -1
drivers/staging/tidspbridge/rmgr/nldr.c
··· 943 943 944 944 /* Determine which phase this section belongs to */ 945 945 for (pch = sect_name + 1; *pch && *pch != seps; pch++) 946 - ;; 946 + ; 947 947 948 948 if (*pch) { 949 949 pch++; /* Skip over the ':' */
+1 -1
drivers/staging/vt6655/card.c
··· 2058 2058 QWORD CARDqGetTSFOffset (unsigned char byRxRate, QWORD qwTSF1, QWORD qwTSF2) 2059 2059 { 2060 2060 QWORD qwTSFOffset; 2061 - unsigned short wRxBcnTSFOffst= 0;; 2061 + unsigned short wRxBcnTSFOffst= 0; 2062 2062 2063 2063 HIDWORD(qwTSFOffset) = 0; 2064 2064 LODWORD(qwTSFOffset) = 0;
+1 -1
drivers/staging/vt6655/iwctl.c
··· 2073 2073 struct iw_point *wrq, 2074 2074 char *extra) 2075 2075 { 2076 - return -EOPNOTSUPP;; 2076 + return -EOPNOTSUPP; 2077 2077 } 2078 2078 2079 2079 int iwctl_siwmlme(struct net_device *dev,
+2 -2
drivers/staging/vt6655/wpa2.c
··· 216 216 m = *((unsigned short *) &(pRSN->abyRSN[4])); 217 217 218 218 if (pRSN->len >= 10+m*4) { // ver(2) + GK(4) + PK count(2) + PKS(4*m) + AKMSS count(2) 219 - pBSSNode->wAKMSSAuthCount = *((unsigned short *) &(pRSN->abyRSN[6+4*m]));; 219 + pBSSNode->wAKMSSAuthCount = *((unsigned short *) &(pRSN->abyRSN[6+4*m])); 220 220 j = 0; 221 221 pbyOUI = &(pRSN->abyRSN[8+4*m]); 222 222 for (i = 0; (i < pBSSNode->wAKMSSAuthCount) && (j < sizeof(pBSSNode->abyAKMSSAuthType)/sizeof(unsigned char)); i++) { ··· 235 235 pBSSNode->wAKMSSAuthCount = (unsigned short)j; 236 236 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAKMSSAuthCount: %d\n", pBSSNode->wAKMSSAuthCount); 237 237 238 - n = *((unsigned short *) &(pRSN->abyRSN[6+4*m]));; 238 + n = *((unsigned short *) &(pRSN->abyRSN[6+4*m])); 239 239 if (pRSN->len >= 12+4*m+4*n) { // ver(2)+GK(4)+PKCnt(2)+PKS(4*m)+AKMSSCnt(2)+AKMSS(4*n)+Cap(2) 240 240 pBSSNode->sRSNCapObj.bRSNCapExist = true; 241 241 pBSSNode->sRSNCapObj.wRSNCap = *((unsigned short *) &(pRSN->abyRSN[8+4*m+4*n]));
+1 -1
drivers/staging/vt6656/baseband.c
··· 963 963 break; 964 964 case ANT_RXB: 965 965 pDevice->byBBRxConf &= 0xFE; 966 - pDevice->byBBRxConf |= 0x02;; 966 + pDevice->byBBRxConf |= 0x02; 967 967 break; 968 968 } 969 969
+1 -1
drivers/staging/vt6656/iwctl.c
··· 1883 1883 struct iw_point *wrq, 1884 1884 char *extra) 1885 1885 { 1886 - return -EOPNOTSUPP;; 1886 + return -EOPNOTSUPP; 1887 1887 } 1888 1888 1889 1889 int iwctl_siwmlme(struct net_device *dev,
+1 -1
drivers/staging/vt6656/power.c
··· 192 192 // check if already in Doze mode 193 193 ControlvReadByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PSCTL, &byData); 194 194 if ( (byData & PSCTL_PS) != 0 ) 195 - return TRUE;; 195 + return TRUE; 196 196 197 197 if (pMgmt->eCurrMode != WMAC_MODE_IBSS_STA) { 198 198 // check if in TIM wake period
+2 -2
drivers/staging/vt6656/wpa2.c
··· 215 215 m = *((PWORD) &(pRSN->abyRSN[4])); 216 216 217 217 if (pRSN->len >= 10+m*4) { // ver(2) + GK(4) + PK count(2) + PKS(4*m) + AKMSS count(2) 218 - pBSSNode->wAKMSSAuthCount = *((PWORD) &(pRSN->abyRSN[6+4*m]));; 218 + pBSSNode->wAKMSSAuthCount = *((PWORD) &(pRSN->abyRSN[6+4*m])); 219 219 j = 0; 220 220 pbyOUI = &(pRSN->abyRSN[8+4*m]); 221 221 for (i = 0; (i < pBSSNode->wAKMSSAuthCount) && (j < sizeof(pBSSNode->abyAKMSSAuthType)/sizeof(BYTE)); i++) { ··· 234 234 pBSSNode->wAKMSSAuthCount = (WORD)j; 235 235 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAKMSSAuthCount: %d\n", pBSSNode->wAKMSSAuthCount); 236 236 237 - n = *((PWORD) &(pRSN->abyRSN[6+4*m]));; 237 + n = *((PWORD) &(pRSN->abyRSN[6+4*m])); 238 238 if (pRSN->len >= 12+4*m+4*n) { // ver(2)+GK(4)+PKCnt(2)+PKS(4*m)+AKMSSCnt(2)+AKMSS(4*n)+Cap(2) 239 239 pBSSNode->sRSNCapObj.bRSNCapExist = TRUE; 240 240 pBSSNode->sRSNCapObj.wRSNCap = *((PWORD) &(pRSN->abyRSN[8+4*m+4*n]));