aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJustin P. Mattock <justinmattock@gmail.com>2011-04-08 22:49:08 -0400
committerJiri Kosina <jkosina@suse.cz>2011-04-10 11:01:05 -0400
commit6eab04a87677a37cf15b52e2b4b4fd57917102ad (patch)
treedc92e25473e7e5c9183312d7feeeaeabb2157baf /drivers
parent9f0af69b2dd34d2c21817d599db7bdb3c972a759 (diff)
treewide: remove extra semicolons
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpio/langwell_gpio.c2
-rw-r--r--drivers/leds/leds-mc13783.c2
-rw-r--r--drivers/net/can/softing/softing_main.c2
-rw-r--r--drivers/net/wireless/ath/ath9k/phy.h2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c2
-rw-r--r--drivers/net/wireless/rtlwifi/core.c2
-rw-r--r--drivers/net/wireless/rtlwifi/pci.c2
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192ce/hw.c4
-rw-r--r--drivers/power/intel_mid_battery.c2
-rw-r--r--drivers/scsi/be2iscsi/be_main.c4
-rw-r--r--drivers/scsi/lpfc/lpfc_bsg.c2
-rw-r--r--drivers/scsi/pm8001/pm8001_init.c2
-rw-r--r--drivers/scsi/qla2xxx/qla_isr.c4
-rw-r--r--drivers/target/target_core_alua.c4
-rw-r--r--drivers/target/target_core_transport.c2
-rw-r--r--drivers/tty/serial/mrst_max3110.c2
-rw-r--r--drivers/video/mxsfb.c2
-rw-r--r--drivers/xen/evtchn.c2
-rw-r--r--drivers/xen/swiotlb-xen.c2
19 files changed, 23 insertions, 23 deletions
diff --git a/drivers/gpio/langwell_gpio.c b/drivers/gpio/langwell_gpio.c
index 560ab648cf18..1b06f67e1f69 100644
--- a/drivers/gpio/langwell_gpio.c
+++ b/drivers/gpio/langwell_gpio.c
@@ -122,7 +122,7 @@ static int lnw_gpio_direction_output(struct gpio_chip *chip,
122 lnw_gpio_set(chip, offset, value); 122 lnw_gpio_set(chip, offset, value);
123 spin_lock_irqsave(&lnw->lock, flags); 123 spin_lock_irqsave(&lnw->lock, flags);
124 value = readl(gpdr); 124 value = readl(gpdr);
125 value |= BIT(offset % 32);; 125 value |= BIT(offset % 32);
126 writel(value, gpdr); 126 writel(value, gpdr);
127 spin_unlock_irqrestore(&lnw->lock, flags); 127 spin_unlock_irqrestore(&lnw->lock, flags);
128 return 0; 128 return 0;
diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c
index f05bb08d0f09..f369e56d6547 100644
--- a/drivers/leds/leds-mc13783.c
+++ b/drivers/leds/leds-mc13783.c
@@ -234,7 +234,7 @@ static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
234 MC13783_LED_Cx_PERIOD; 234 MC13783_LED_Cx_PERIOD;
235 235
236 if (pdata->flags & MC13783_LED_TRIODE_TC3) 236 if (pdata->flags & MC13783_LED_TRIODE_TC3)
237 reg |= MC13783_LED_Cx_TRIODE_TC_BIT;; 237 reg |= MC13783_LED_Cx_TRIODE_TC_BIT;
238 238
239 ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_5, reg); 239 ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_5, reg);
240 if (ret) 240 if (ret)
diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
index aeea9f9ff6e8..8d7595344a62 100644
--- a/drivers/net/can/softing/softing_main.c
+++ b/drivers/net/can/softing/softing_main.c
@@ -797,7 +797,7 @@ static __devinit int softing_pdev_probe(struct platform_device *pdev)
797 ret = -EINVAL; 797 ret = -EINVAL;
798 pres = platform_get_resource(pdev, IORESOURCE_MEM, 0); 798 pres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
799 if (!pres) 799 if (!pres)
800 goto platform_resource_failed;; 800 goto platform_resource_failed;
801 card->dpram_phys = pres->start; 801 card->dpram_phys = pres->start;
802 card->dpram_size = pres->end - pres->start + 1; 802 card->dpram_size = pres->end - pres->start + 1;
803 card->dpram = ioremap_nocache(card->dpram_phys, card->dpram_size); 803 card->dpram = ioremap_nocache(card->dpram_phys, card->dpram_size);
diff --git a/drivers/net/wireless/ath/ath9k/phy.h b/drivers/net/wireless/ath/ath9k/phy.h
index 5e3d7496986e..3a7cd7523d5c 100644
--- a/drivers/net/wireless/ath/ath9k/phy.h
+++ b/drivers/net/wireless/ath/ath9k/phy.h
@@ -54,7 +54,7 @@
54#define RF_BANK_SETUP(_bank, _iniarray, _col) do { \ 54#define RF_BANK_SETUP(_bank, _iniarray, _col) do { \
55 int i; \ 55 int i; \
56 for (i = 0; i < (_iniarray)->ia_rows; i++) \ 56 for (i = 0; i < (_iniarray)->ia_rows; i++) \
57 (_bank)[i] = INI_RA((_iniarray), i, _col);; \ 57 (_bank)[i] = INI_RA((_iniarray), i, _col); \
58 } while (0) 58 } while (0)
59 59
60#define AR_PHY_TIMING11_SPUR_FREQ_SD 0x3FF00000 60#define AR_PHY_TIMING11_SPUR_FREQ_SD 0x3FF00000
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 581dc9f10273..31233a330372 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2062,7 +2062,7 @@ static const char *desc_lookup(u32 num)
2062 max = ARRAY_SIZE(advanced_lookup) - 1; 2062 max = ARRAY_SIZE(advanced_lookup) - 1;
2063 for (i = 0; i < max; i++) { 2063 for (i = 0; i < max; i++) {
2064 if (advanced_lookup[i].num == num) 2064 if (advanced_lookup[i].num == num)
2065 break;; 2065 break;
2066 } 2066 }
2067 return advanced_lookup[i].name; 2067 return advanced_lookup[i].name;
2068} 2068}
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index e4f4aee8f298..d52fa27103c6 100644
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@ -719,7 +719,7 @@ static void rtl_op_set_tsf(struct ieee80211_hw *hw, u64 tsf)
719{ 719{
720 struct rtl_priv *rtlpriv = rtl_priv(hw); 720 struct rtl_priv *rtlpriv = rtl_priv(hw);
721 struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); 721 struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
722 u8 bibss = (mac->opmode == NL80211_IFTYPE_ADHOC) ? 1 : 0;; 722 u8 bibss = (mac->opmode == NL80211_IFTYPE_ADHOC) ? 1 : 0;
723 723
724 mac->tsf = tsf; 724 mac->tsf = tsf;
725 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_CORRECT_TSF, (u8 *) (&bibss)); 725 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_CORRECT_TSF, (u8 *) (&bibss));
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 9cd7703c2a30..baa2efeeedf6 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -1226,7 +1226,7 @@ static unsigned int _rtl_mac_to_hwqueue(__le16 fc,
1226 hw_queue_index = VI_QUEUE; 1226 hw_queue_index = VI_QUEUE;
1227 break; 1227 break;
1228 case 2: 1228 case 2:
1229 hw_queue_index = BE_QUEUE;; 1229 hw_queue_index = BE_QUEUE;
1230 break; 1230 break;
1231 case 3: 1231 case 3:
1232 hw_queue_index = BK_QUEUE; 1232 hw_queue_index = BK_QUEUE;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
index 05477f465a75..7432c85a8dff 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
@@ -729,7 +729,7 @@ static bool _rtl92ce_init_mac(struct ieee80211_hw *hw)
729 rtl_write_word(rtlpriv, REG_CR, 0x2ff); 729 rtl_write_word(rtlpriv, REG_CR, 0x2ff);
730 730
731 if (_rtl92ce_llt_table_init(hw) == false) 731 if (_rtl92ce_llt_table_init(hw) == false)
732 return false;; 732 return false;
733 733
734 rtl_write_dword(rtlpriv, REG_HISR, 0xffffffff); 734 rtl_write_dword(rtlpriv, REG_HISR, 0xffffffff);
735 rtl_write_byte(rtlpriv, REG_HISRE, 0xff); 735 rtl_write_byte(rtlpriv, REG_HISRE, 0xff);
@@ -786,7 +786,7 @@ static bool _rtl92ce_init_mac(struct ieee80211_hw *hw)
786 786
787 rtl_write_dword(rtlpriv, REG_MCUTST_1, 0x0); 787 rtl_write_dword(rtlpriv, REG_MCUTST_1, 0x0);
788 788
789 return true;; 789 return true;
790} 790}
791 791
792static void _rtl92ce_hw_configure(struct ieee80211_hw *hw) 792static void _rtl92ce_hw_configure(struct ieee80211_hw *hw)
diff --git a/drivers/power/intel_mid_battery.c b/drivers/power/intel_mid_battery.c
index bce3a01da2f0..cffcb7c00b00 100644
--- a/drivers/power/intel_mid_battery.c
+++ b/drivers/power/intel_mid_battery.c
@@ -522,7 +522,7 @@ static int pmic_battery_set_charger(struct pmic_power_module_info *pbi,
522 if (retval) { 522 if (retval) {
523 dev_warn(pbi->dev, "%s(): ipc pmic read failed\n", 523 dev_warn(pbi->dev, "%s(): ipc pmic read failed\n",
524 __func__); 524 __func__);
525 return retval;; 525 return retval;
526 } 526 }
527 527
528 return 0; 528 return 0;
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 24e20ba9633c..44ac4aef879f 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -618,7 +618,7 @@ static void beiscsi_get_params(struct beiscsi_hba *phba)
618 + BE2_NOPOUT_REQ)); 618 + BE2_NOPOUT_REQ));
619 phba->params.cxns_per_ctrl = phba->fw_config.iscsi_cid_count; 619 phba->params.cxns_per_ctrl = phba->fw_config.iscsi_cid_count;
620 phba->params.asyncpdus_per_ctrl = phba->fw_config.iscsi_cid_count * 2; 620 phba->params.asyncpdus_per_ctrl = phba->fw_config.iscsi_cid_count * 2;
621 phba->params.icds_per_ctrl = phba->fw_config.iscsi_icd_count;; 621 phba->params.icds_per_ctrl = phba->fw_config.iscsi_icd_count;
622 phba->params.num_sge_per_io = BE2_SGE; 622 phba->params.num_sge_per_io = BE2_SGE;
623 phba->params.defpdu_hdr_sz = BE2_DEFPDU_HDR_SZ; 623 phba->params.defpdu_hdr_sz = BE2_DEFPDU_HDR_SZ;
624 phba->params.defpdu_data_sz = BE2_DEFPDU_DATA_SZ; 624 phba->params.defpdu_data_sz = BE2_DEFPDU_DATA_SZ;
@@ -781,7 +781,7 @@ static irqreturn_t be_isr(int irq, void *dev_id)
781 int isr; 781 int isr;
782 782
783 phba = dev_id; 783 phba = dev_id;
784 ctrl = &phba->ctrl;; 784 ctrl = &phba->ctrl;
785 isr = ioread32(ctrl->csr + CEV_ISR0_OFFSET + 785 isr = ioread32(ctrl->csr + CEV_ISR0_OFFSET +
786 (PCI_FUNC(ctrl->pdev->devfn) * CEV_ISR_SIZE)); 786 (PCI_FUNC(ctrl->pdev->devfn) * CEV_ISR_SIZE));
787 if (!isr) 787 if (!isr)
diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index 0dd43bb91618..04fef038b1ff 100644
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -595,7 +595,7 @@ lpfc_bsg_rport_els(struct fc_bsg_job *job)
595 dd_data->context_un.iocb.cmdiocbq = cmdiocbq; 595 dd_data->context_un.iocb.cmdiocbq = cmdiocbq;
596 dd_data->context_un.iocb.rspiocbq = rspiocbq; 596 dd_data->context_un.iocb.rspiocbq = rspiocbq;
597 dd_data->context_un.iocb.set_job = job; 597 dd_data->context_un.iocb.set_job = job;
598 dd_data->context_un.iocb.bmp = NULL;; 598 dd_data->context_un.iocb.bmp = NULL;
599 dd_data->context_un.iocb.ndlp = ndlp; 599 dd_data->context_un.iocb.ndlp = ndlp;
600 600
601 if (phba->cfg_poll & DISABLE_FCP_RING_INT) { 601 if (phba->cfg_poll & DISABLE_FCP_RING_INT) {
diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index 002360da01e3..172cefb6deb9 100644
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -160,7 +160,7 @@ static void pm8001_free(struct pm8001_hba_info *pm8001_ha)
160static void pm8001_tasklet(unsigned long opaque) 160static void pm8001_tasklet(unsigned long opaque)
161{ 161{
162 struct pm8001_hba_info *pm8001_ha; 162 struct pm8001_hba_info *pm8001_ha;
163 pm8001_ha = (struct pm8001_hba_info *)opaque;; 163 pm8001_ha = (struct pm8001_hba_info *)opaque;
164 if (unlikely(!pm8001_ha)) 164 if (unlikely(!pm8001_ha))
165 BUG_ON(1); 165 BUG_ON(1);
166 PM8001_CHIP_DISP->isr(pm8001_ha); 166 PM8001_CHIP_DISP->isr(pm8001_ha);
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index d17ed9a94a0c..8b4d99a224f3 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1051,7 +1051,7 @@ qla2x00_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
1051 } 1051 }
1052 DEBUG2(qla2x00_dump_buffer((uint8_t *)pkt, sizeof(*pkt))); 1052 DEBUG2(qla2x00_dump_buffer((uint8_t *)pkt, sizeof(*pkt)));
1053 } else { 1053 } else {
1054 bsg_job->reply->result = DID_OK << 16;; 1054 bsg_job->reply->result = DID_OK << 16;
1055 bsg_job->reply->reply_payload_rcv_len = 1055 bsg_job->reply->reply_payload_rcv_len =
1056 bsg_job->reply_payload.payload_len; 1056 bsg_job->reply_payload.payload_len;
1057 bsg_job->reply_len = 0; 1057 bsg_job->reply_len = 0;
@@ -1146,7 +1146,7 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
1146 DEBUG2(qla2x00_dump_buffer((uint8_t *)pkt, sizeof(*pkt))); 1146 DEBUG2(qla2x00_dump_buffer((uint8_t *)pkt, sizeof(*pkt)));
1147 } 1147 }
1148 else { 1148 else {
1149 bsg_job->reply->result = DID_OK << 16;; 1149 bsg_job->reply->result = DID_OK << 16;
1150 bsg_job->reply->reply_payload_rcv_len = bsg_job->reply_payload.payload_len; 1150 bsg_job->reply->reply_payload_rcv_len = bsg_job->reply_payload.payload_len;
1151 bsg_job->reply_len = 0; 1151 bsg_job->reply_len = 0;
1152 } 1152 }
diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c
index 2c5fcfed5934..e7dddafe73f6 100644
--- a/drivers/target/target_core_alua.c
+++ b/drivers/target/target_core_alua.c
@@ -1036,7 +1036,7 @@ core_alua_allocate_lu_gp(const char *name, int def_group)
1036 lu_gp = kmem_cache_zalloc(t10_alua_lu_gp_cache, GFP_KERNEL); 1036 lu_gp = kmem_cache_zalloc(t10_alua_lu_gp_cache, GFP_KERNEL);
1037 if (!(lu_gp)) { 1037 if (!(lu_gp)) {
1038 printk(KERN_ERR "Unable to allocate struct t10_alua_lu_gp\n"); 1038 printk(KERN_ERR "Unable to allocate struct t10_alua_lu_gp\n");
1039 return ERR_PTR(-ENOMEM);; 1039 return ERR_PTR(-ENOMEM);
1040 } 1040 }
1041 INIT_LIST_HEAD(&lu_gp->lu_gp_list); 1041 INIT_LIST_HEAD(&lu_gp->lu_gp_list);
1042 INIT_LIST_HEAD(&lu_gp->lu_gp_mem_list); 1042 INIT_LIST_HEAD(&lu_gp->lu_gp_mem_list);
@@ -1044,7 +1044,7 @@ core_alua_allocate_lu_gp(const char *name, int def_group)
1044 atomic_set(&lu_gp->lu_gp_ref_cnt, 0); 1044 atomic_set(&lu_gp->lu_gp_ref_cnt, 0);
1045 1045
1046 if (def_group) { 1046 if (def_group) {
1047 lu_gp->lu_gp_id = se_global->alua_lu_gps_counter++;; 1047 lu_gp->lu_gp_id = se_global->alua_lu_gps_counter++;
1048 lu_gp->lu_gp_valid_id = 1; 1048 lu_gp->lu_gp_valid_id = 1;
1049 se_global->alua_lu_gps_count++; 1049 se_global->alua_lu_gps_count++;
1050 } 1050 }
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index ff9ace01e27a..39ac190080e2 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -2131,7 +2131,7 @@ static void transport_failure_reset_queue_depth(struct se_device *dev)
2131{ 2131{
2132 unsigned long flags; 2132 unsigned long flags;
2133 2133
2134 spin_lock_irqsave(&SE_HBA(dev)->hba_queue_lock, flags);; 2134 spin_lock_irqsave(&SE_HBA(dev)->hba_queue_lock, flags);
2135 atomic_inc(&dev->depth_left); 2135 atomic_inc(&dev->depth_left);
2136 atomic_inc(&SE_HBA(dev)->left_queue_depth); 2136 atomic_inc(&SE_HBA(dev)->left_queue_depth);
2137 spin_unlock_irqrestore(&SE_HBA(dev)->hba_queue_lock, flags); 2137 spin_unlock_irqrestore(&SE_HBA(dev)->hba_queue_lock, flags);
diff --git a/drivers/tty/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c
index 37e13c3d91d9..8890612a8d9a 100644
--- a/drivers/tty/serial/mrst_max3110.c
+++ b/drivers/tty/serial/mrst_max3110.c
@@ -56,7 +56,7 @@ struct uart_max3110 {
56 wait_queue_head_t wq; 56 wait_queue_head_t wq;
57 struct task_struct *main_thread; 57 struct task_struct *main_thread;
58 struct task_struct *read_thread; 58 struct task_struct *read_thread;
59 struct mutex thread_mutex;; 59 struct mutex thread_mutex;
60 60
61 u32 baud; 61 u32 baud;
62 u16 cur_conf; 62 u16 cur_conf;
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 7d0284882984..0b2f2dd41416 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -401,7 +401,7 @@ static int mxsfb_set_par(struct fb_info *fb_info)
401 writel(CTRL1_FIFO_CLEAR, host->base + LCDC_CTRL1 + REG_SET); 401 writel(CTRL1_FIFO_CLEAR, host->base + LCDC_CTRL1 + REG_SET);
402 402
403 ctrl = CTRL_BYPASS_COUNT | CTRL_MASTER | 403 ctrl = CTRL_BYPASS_COUNT | CTRL_MASTER |
404 CTRL_SET_BUS_WIDTH(host->ld_intf_width);; 404 CTRL_SET_BUS_WIDTH(host->ld_intf_width);
405 405
406 switch (fb_info->var.bits_per_pixel) { 406 switch (fb_info->var.bits_per_pixel) {
407 case 16: 407 case 16:
diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
index ef11daf0cafe..dbc13e94b612 100644
--- a/drivers/xen/evtchn.c
+++ b/drivers/xen/evtchn.c
@@ -470,7 +470,7 @@ static int evtchn_open(struct inode *inode, struct file *filp)
470 470
471 filp->private_data = u; 471 filp->private_data = u;
472 472
473 return nonseekable_open(inode, filp);; 473 return nonseekable_open(inode, filp);
474} 474}
475 475
476static int evtchn_release(struct inode *inode, struct file *filp) 476static int evtchn_release(struct inode *inode, struct file *filp)
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 54469c3eeacd..65ea21a97492 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -54,7 +54,7 @@ u64 start_dma_addr;
54 54
55static dma_addr_t xen_phys_to_bus(phys_addr_t paddr) 55static dma_addr_t xen_phys_to_bus(phys_addr_t paddr)
56{ 56{
57 return phys_to_machine(XPADDR(paddr)).maddr;; 57 return phys_to_machine(XPADDR(paddr)).maddr;
58} 58}
59 59
60static phys_addr_t xen_bus_to_phys(dma_addr_t baddr) 60static phys_addr_t xen_bus_to_phys(dma_addr_t baddr)