diff options
| author | Justin P. Mattock <justinmattock@gmail.com> | 2011-04-08 22:49:08 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-10 11:01:05 -0400 |
| commit | 6eab04a87677a37cf15b52e2b4b4fd57917102ad (patch) | |
| tree | dc92e25473e7e5c9183312d7feeeaeabb2157baf | |
| parent | 9f0af69b2dd34d2c21817d599db7bdb3c972a759 (diff) | |
treewide: remove extra semicolons
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
33 files changed, 40 insertions, 40 deletions
diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c index d1f775e86353..308ce7a87edd 100644 --- a/arch/arm/mach-at91/at91cap9_devices.c +++ b/arch/arm/mach-at91/at91cap9_devices.c | |||
| @@ -171,7 +171,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data) | |||
| 171 | */ | 171 | */ |
| 172 | usba_udc_data.pdata.vbus_pin = -EINVAL; | 172 | usba_udc_data.pdata.vbus_pin = -EINVAL; |
| 173 | usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); | 173 | usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); |
| 174 | memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));; | 174 | memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep)); |
| 175 | 175 | ||
| 176 | if (data && data->vbus_pin > 0) { | 176 | if (data && data->vbus_pin > 0) { |
| 177 | at91_set_gpio_input(data->vbus_pin, 0); | 177 | at91_set_gpio_input(data->vbus_pin, 0); |
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index 1e8f275c17f6..5e9f8a4c38df 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c | |||
| @@ -256,7 +256,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data) | |||
| 256 | { | 256 | { |
| 257 | usba_udc_data.pdata.vbus_pin = -EINVAL; | 257 | usba_udc_data.pdata.vbus_pin = -EINVAL; |
| 258 | usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); | 258 | usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); |
| 259 | memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));; | 259 | memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep)); |
| 260 | 260 | ||
| 261 | if (data && data->vbus_pin > 0) { | 261 | if (data && data->vbus_pin > 0) { |
| 262 | at91_set_gpio_input(data->vbus_pin, 0); | 262 | at91_set_gpio_input(data->vbus_pin, 0); |
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c index 53aaa94df75a..c49262bddd85 100644 --- a/arch/arm/mach-at91/at91sam9rl_devices.c +++ b/arch/arm/mach-at91/at91sam9rl_devices.c | |||
| @@ -145,7 +145,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data) | |||
| 145 | */ | 145 | */ |
| 146 | usba_udc_data.pdata.vbus_pin = -EINVAL; | 146 | usba_udc_data.pdata.vbus_pin = -EINVAL; |
| 147 | usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); | 147 | usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); |
| 148 | memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));; | 148 | memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep)); |
| 149 | 149 | ||
| 150 | if (data && data->vbus_pin > 0) { | 150 | if (data && data->vbus_pin > 0) { |
| 151 | at91_set_gpio_input(data->vbus_pin, 0); | 151 | at91_set_gpio_input(data->vbus_pin, 0); |
diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c index 6d7c4eea4dcb..3b6f290fde4c 100644 --- a/arch/arm/mach-tegra/tegra2_clocks.c +++ b/arch/arm/mach-tegra/tegra2_clocks.c | |||
| @@ -337,7 +337,7 @@ static int tegra2_super_clk_set_parent(struct clk *c, struct clk *p) | |||
| 337 | const struct clk_mux_sel *sel; | 337 | const struct clk_mux_sel *sel; |
| 338 | int shift; | 338 | int shift; |
| 339 | 339 | ||
| 340 | val = clk_readl(c->reg + SUPER_CLK_MUX);; | 340 | val = clk_readl(c->reg + SUPER_CLK_MUX); |
| 341 | BUG_ON(((val & SUPER_STATE_MASK) != SUPER_STATE_RUN) && | 341 | BUG_ON(((val & SUPER_STATE_MASK) != SUPER_STATE_RUN) && |
| 342 | ((val & SUPER_STATE_MASK) != SUPER_STATE_IDLE)); | 342 | ((val & SUPER_STATE_MASK) != SUPER_STATE_IDLE)); |
| 343 | shift = ((val & SUPER_STATE_MASK) == SUPER_STATE_IDLE) ? | 343 | shift = ((val & SUPER_STATE_MASK) == SUPER_STATE_IDLE) ? |
diff --git a/arch/s390/hypfs/hypfs.h b/arch/s390/hypfs/hypfs.h index 80c1526f2af3..d9df5a060a83 100644 --- a/arch/s390/hypfs/hypfs.h +++ b/arch/s390/hypfs/hypfs.h | |||
| @@ -47,7 +47,7 @@ struct hypfs_dbfs_data { | |||
| 47 | void *buf; | 47 | void *buf; |
| 48 | void *buf_free_ptr; | 48 | void *buf_free_ptr; |
| 49 | size_t size; | 49 | size_t size; |
| 50 | struct hypfs_dbfs_file *dbfs_file;; | 50 | struct hypfs_dbfs_file *dbfs_file; |
| 51 | struct kref kref; | 51 | struct kref kref; |
| 52 | }; | 52 | }; |
| 53 | 53 | ||
diff --git a/arch/um/drivers/mmapper_kern.c b/arch/um/drivers/mmapper_kern.c index 7e0619c2c2c6..c0ef803c7c70 100644 --- a/arch/um/drivers/mmapper_kern.c +++ b/arch/um/drivers/mmapper_kern.c | |||
| @@ -116,7 +116,7 @@ static int __init mmapper_init(void) | |||
| 116 | if (err) { | 116 | if (err) { |
| 117 | printk(KERN_ERR "mmapper - misc_register failed, err = %d\n", | 117 | printk(KERN_ERR "mmapper - misc_register failed, err = %d\n", |
| 118 | err); | 118 | err); |
| 119 | return err;; | 119 | return err; |
| 120 | } | 120 | } |
| 121 | return 0; | 121 | return 0; |
| 122 | } | 122 | } |
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 | ||
| 792 | static void _rtl92ce_hw_configure(struct ieee80211_hw *hw) | 792 | static 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) | |||
| 160 | static void pm8001_tasklet(unsigned long opaque) | 160 | static 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 | ||
| 476 | static int evtchn_release(struct inode *inode, struct file *filp) | 476 | static 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 | ||
| 55 | static dma_addr_t xen_phys_to_bus(phys_addr_t paddr) | 55 | static 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 | ||
| 60 | static phys_addr_t xen_bus_to_phys(dma_addr_t baddr) | 60 | static phys_addr_t xen_bus_to_phys(dma_addr_t baddr) |
diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c index ee99a9f5dfd3..3dcb3a60c331 100644 --- a/fs/logfs/readwrite.c +++ b/fs/logfs/readwrite.c | |||
| @@ -481,7 +481,7 @@ static int inode_write_alias(struct super_block *sb, | |||
| 481 | val = inode_val0(inode); | 481 | val = inode_val0(inode); |
| 482 | break; | 482 | break; |
| 483 | case INODE_USED_OFS: | 483 | case INODE_USED_OFS: |
| 484 | val = cpu_to_be64(li->li_used_bytes);; | 484 | val = cpu_to_be64(li->li_used_bytes); |
| 485 | break; | 485 | break; |
| 486 | case INODE_SIZE_OFS: | 486 | case INODE_SIZE_OFS: |
| 487 | val = cpu_to_be64(i_size_read(inode)); | 487 | val = cpu_to_be64(i_size_read(inode)); |
diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c index c384d634872a..c4feceda2d96 100644 --- a/fs/ocfs2/refcounttree.c +++ b/fs/ocfs2/refcounttree.c | |||
| @@ -3707,7 +3707,7 @@ int ocfs2_refcount_cow_xattr(struct inode *inode, | |||
| 3707 | context->cow_start = cow_start; | 3707 | context->cow_start = cow_start; |
| 3708 | context->cow_len = cow_len; | 3708 | context->cow_len = cow_len; |
| 3709 | context->ref_tree = ref_tree; | 3709 | context->ref_tree = ref_tree; |
| 3710 | context->ref_root_bh = ref_root_bh;; | 3710 | context->ref_root_bh = ref_root_bh; |
| 3711 | context->cow_object = xv; | 3711 | context->cow_object = xv; |
| 3712 | 3712 | ||
| 3713 | context->cow_duplicate_clusters = ocfs2_duplicate_clusters_by_jbd; | 3713 | context->cow_duplicate_clusters = ocfs2_duplicate_clusters_by_jbd; |
diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c index 0da058bff8eb..beb184689af9 100644 --- a/kernel/pm_qos_params.c +++ b/kernel/pm_qos_params.c | |||
| @@ -385,7 +385,7 @@ static ssize_t pm_qos_power_read(struct file *filp, char __user *buf, | |||
| 385 | s32 value; | 385 | s32 value; |
| 386 | unsigned long flags; | 386 | unsigned long flags; |
| 387 | struct pm_qos_object *o; | 387 | struct pm_qos_object *o; |
| 388 | struct pm_qos_request_list *pm_qos_req = filp->private_data;; | 388 | struct pm_qos_request_list *pm_qos_req = filp->private_data; |
| 389 | 389 | ||
| 390 | if (!pm_qos_req) | 390 | if (!pm_qos_req) |
| 391 | return -EINVAL; | 391 | return -EINVAL; |
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index bb0b7c128015..838fe25f704c 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
| @@ -475,7 +475,7 @@ static struct page *dequeue_huge_page_vma(struct hstate *h, | |||
| 475 | 475 | ||
| 476 | /* If reserves cannot be used, ensure enough pages are in the pool */ | 476 | /* If reserves cannot be used, ensure enough pages are in the pool */ |
| 477 | if (avoid_reserve && h->free_huge_pages - h->resv_huge_pages == 0) | 477 | if (avoid_reserve && h->free_huge_pages - h->resv_huge_pages == 0) |
| 478 | goto err;; | 478 | goto err; |
| 479 | 479 | ||
| 480 | for_each_zone_zonelist_nodemask(zone, z, zonelist, | 480 | for_each_zone_zonelist_nodemask(zone, z, zonelist, |
| 481 | MAX_NR_ZONES - 1, nodemask) { | 481 | MAX_NR_ZONES - 1, nodemask) { |
diff --git a/net/netfilter/ipset/ip_set_bitmap_ip.c b/net/netfilter/ipset/ip_set_bitmap_ip.c index bca96990218d..cc2992299e74 100644 --- a/net/netfilter/ipset/ip_set_bitmap_ip.c +++ b/net/netfilter/ipset/ip_set_bitmap_ip.c | |||
| @@ -293,7 +293,7 @@ bitmap_ip_uadt(struct ip_set *set, struct nlattr *tb[], | |||
| 293 | 293 | ||
| 294 | for (; !before(ip_to, ip); ip += map->hosts) { | 294 | for (; !before(ip_to, ip); ip += map->hosts) { |
| 295 | id = ip_to_id(map, ip); | 295 | id = ip_to_id(map, ip); |
| 296 | ret = adtfn(set, &id, timeout);; | 296 | ret = adtfn(set, &id, timeout); |
| 297 | 297 | ||
| 298 | if (ret && !ip_set_eexist(ret, flags)) | 298 | if (ret && !ip_set_eexist(ret, flags)) |
| 299 | return ret; | 299 | return ret; |
diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c index 1419d0cdbbac..4195233c4914 100644 --- a/net/sunrpc/addr.c +++ b/net/sunrpc/addr.c | |||
| @@ -151,7 +151,7 @@ static size_t rpc_pton4(const char *buf, const size_t buflen, | |||
| 151 | return 0; | 151 | return 0; |
| 152 | 152 | ||
| 153 | sin->sin_family = AF_INET; | 153 | sin->sin_family = AF_INET; |
| 154 | return sizeof(struct sockaddr_in);; | 154 | return sizeof(struct sockaddr_in); |
| 155 | } | 155 | } |
| 156 | 156 | ||
| 157 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 157 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) |
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index ea39cb742ae5..47b7d624a6e1 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c | |||
| @@ -280,7 +280,7 @@ static ssize_t sel_write_disable(struct file *file, const char __user *buf, | |||
| 280 | 280 | ||
| 281 | length = -ENOMEM; | 281 | length = -ENOMEM; |
| 282 | if (count >= PAGE_SIZE) | 282 | if (count >= PAGE_SIZE) |
| 283 | goto out;; | 283 | goto out; |
| 284 | 284 | ||
| 285 | /* No partial writes. */ | 285 | /* No partial writes. */ |
| 286 | length = -EINVAL; | 286 | length = -EINVAL; |
| @@ -876,12 +876,12 @@ static ssize_t sel_write_user(struct file *file, char *buf, size_t size) | |||
| 876 | 876 | ||
| 877 | length = task_has_security(current, SECURITY__COMPUTE_USER); | 877 | length = task_has_security(current, SECURITY__COMPUTE_USER); |
| 878 | if (length) | 878 | if (length) |
| 879 | goto out;; | 879 | goto out; |
| 880 | 880 | ||
| 881 | length = -ENOMEM; | 881 | length = -ENOMEM; |
| 882 | con = kzalloc(size + 1, GFP_KERNEL); | 882 | con = kzalloc(size + 1, GFP_KERNEL); |
| 883 | if (!con) | 883 | if (!con) |
| 884 | goto out;; | 884 | goto out; |
| 885 | 885 | ||
| 886 | length = -ENOMEM; | 886 | length = -ENOMEM; |
| 887 | user = kzalloc(size + 1, GFP_KERNEL); | 887 | user = kzalloc(size + 1, GFP_KERNEL); |
| @@ -941,7 +941,7 @@ static ssize_t sel_write_member(struct file *file, char *buf, size_t size) | |||
| 941 | length = -ENOMEM; | 941 | length = -ENOMEM; |
| 942 | scon = kzalloc(size + 1, GFP_KERNEL); | 942 | scon = kzalloc(size + 1, GFP_KERNEL); |
| 943 | if (!scon) | 943 | if (!scon) |
| 944 | goto out;; | 944 | goto out; |
| 945 | 945 | ||
| 946 | length = -ENOMEM; | 946 | length = -ENOMEM; |
| 947 | tcon = kzalloc(size + 1, GFP_KERNEL); | 947 | tcon = kzalloc(size + 1, GFP_KERNEL); |
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 362a0cb448db..6d8ef4a3a9b5 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c | |||
| @@ -990,7 +990,7 @@ int fork_it(char **argv) | |||
| 990 | if (!retval) | 990 | if (!retval) |
| 991 | print_counters(cnt_delta); | 991 | print_counters(cnt_delta); |
| 992 | 992 | ||
| 993 | fprintf(stderr, "%.6f sec\n", tv_delta.tv_sec + tv_delta.tv_usec/1000000.0);; | 993 | fprintf(stderr, "%.6f sec\n", tv_delta.tv_sec + tv_delta.tv_usec/1000000.0); |
| 994 | 994 | ||
| 995 | return 0; | 995 | return 0; |
| 996 | } | 996 | } |
