adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 11:16:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

trivial: remove unnecessary semicolons

Browse source 
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Joe Perches 2009-08-18 11:18:35 -07:00 committed by Jiri Kosina
parent 2944fcbe03
commit a419aef8b8
54 changed files with 61 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/s390/hypfs/inode.c
View file

@ -496,7 +496,7 @@ static int __init hypfs_init(void)
} }
s390_kobj = kobject_create_and_add("s390", hypervisor_kobj); s390_kobj = kobject_create_and_add("s390", hypervisor_kobj);
if (!s390_kobj) { if (!s390_kobj) {
rc = -ENOMEM;; rc = -ENOMEM;
goto fail_sysfs; goto fail_sysfs;
} }
rc = register_filesystem(&hypfs_type); rc = register_filesystem(&hypfs_type);

2
arch/s390/kvm/interrupt.c
View file

@ -478,7 +478,7 @@ int kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code)
if (!inti) if (!inti)
return -ENOMEM; return -ENOMEM;
inti->type = KVM_S390_PROGRAM_INT;; inti->type = KVM_S390_PROGRAM_INT;
inti->pgm.code = code; inti->pgm.code = code;
VCPU_EVENT(vcpu, 3, "inject: program check %d (from kernel)", code); VCPU_EVENT(vcpu, 3, "inject: program check %d (from kernel)", code);

2
arch/sparc/kernel/irq_64.c
View file

@ -229,7 +229,7 @@ static unsigned int sun4u_compute_tid(unsigned long imap, unsigned long cpuid)
tid = ((a << IMAP_AID_SHIFT) | tid = ((a << IMAP_AID_SHIFT) |
(n << IMAP_NID_SHIFT)); (n << IMAP_NID_SHIFT));
tid &= (IMAP_AID_SAFARI | tid &= (IMAP_AID_SAFARI |
IMAP_NID_SAFARI);; IMAP_NID_SAFARI);
} }
} else { } else {
tid = cpuid << IMAP_TID_SHIFT; tid = cpuid << IMAP_TID_SHIFT;

2
arch/um/drivers/net_kern.c
View file

@ -533,7 +533,7 @@ static int eth_parse(char *str, int *index_out, char **str_out,
char **error_out) char **error_out)
{ {
char *end; char *end;
int n, err = -EINVAL;; int n, err = -EINVAL;
n = simple_strtoul(str, &end, 0); n = simple_strtoul(str, &end, 0);
if (end == str) { if (end == str) {

4
drivers/block/DAC960.c
View file

@ -6653,7 +6653,7 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request,
else ErrorCode = get_user(ControllerNumber, else ErrorCode = get_user(ControllerNumber,
&UserSpaceControllerInfo->ControllerNumber); &UserSpaceControllerInfo->ControllerNumber);
if (ErrorCode != 0) if (ErrorCode != 0)
break;; break;
ErrorCode = -ENXIO; ErrorCode = -ENXIO;
if (ControllerNumber < 0 || if (ControllerNumber < 0 ||
ControllerNumber > DAC960_ControllerCount - 1) { ControllerNumber > DAC960_ControllerCount - 1) {
@ -6661,7 +6661,7 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request,
} }
Controller = DAC960_Controllers[ControllerNumber]; Controller = DAC960_Controllers[ControllerNumber];
if (Controller == NULL) if (Controller == NULL)
break;; break;
memset(&ControllerInfo, 0, sizeof(DAC960_ControllerInfo_T)); memset(&ControllerInfo, 0, sizeof(DAC960_ControllerInfo_T));
ControllerInfo.ControllerNumber = ControllerNumber; ControllerInfo.ControllerNumber = ControllerNumber;
ControllerInfo.FirmwareType = Controller->FirmwareType; ControllerInfo.FirmwareType = Controller->FirmwareType;

2
drivers/block/swim3.c
View file

@ -1062,7 +1062,7 @@ static int swim3_add_device(struct macio_dev *mdev, int index)
goto out_release; goto out_release;
} }
fs->swim3_intr = macio_irq(mdev, 0); fs->swim3_intr = macio_irq(mdev, 0);
fs->dma_intr = macio_irq(mdev, 1);; fs->dma_intr = macio_irq(mdev, 1);
fs->cur_cyl = -1; fs->cur_cyl = -1;
fs->cur_sector = -1; fs->cur_sector = -1;
fs->secpercyl = 36; fs->secpercyl = 36;

2
drivers/char/epca.c
View file

@ -2239,7 +2239,7 @@ static void do_softint(struct work_struct *work)
struct channel *ch = container_of(work, struct channel, tqueue); struct channel *ch = container_of(work, struct channel, tqueue);
/* Called in response to a modem change event */ /* Called in response to a modem change event */
if (ch && ch->magic == EPCA_MAGIC) { if (ch && ch->magic == EPCA_MAGIC) {
struct tty_struct *tty = tty_port_tty_get(&ch->port);; struct tty_struct *tty = tty_port_tty_get(&ch->port);
if (tty && tty->driver_data) { if (tty && tty->driver_data) {
if (test_and_clear_bit(EPCA_EVENT_HANGUP, &ch->event)) { if (test_and_clear_bit(EPCA_EVENT_HANGUP, &ch->event)) {

2
drivers/gpu/drm/i915/intel_dp.c
View file

@ -232,7 +232,7 @@ intel_dp_aux_ch(struct intel_output *intel_output,
for (try = 0; try < 5; try++) { for (try = 0; try < 5; try++) {
/* Load the send data into the aux channel data registers */ /* Load the send data into the aux channel data registers */
for (i = 0; i < send_bytes; i += 4) { for (i = 0; i < send_bytes; i += 4) {
uint32_t d = pack_aux(send + i, send_bytes - i);; uint32_t d = pack_aux(send + i, send_bytes - i);
I915_WRITE(ch_data + i, d); I915_WRITE(ch_data + i, d);
} }

4
drivers/gpu/drm/radeon/r300.c
View file

@ -1319,11 +1319,11 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
case 0x443C: case 0x443C:
/* TX_FILTER0_[0-15] */ /* TX_FILTER0_[0-15] */
i = (reg - 0x4400) >> 2; i = (reg - 0x4400) >> 2;
tmp = ib_chunk->kdata[idx] & 0x7;; tmp = ib_chunk->kdata[idx] & 0x7;
if (tmp == 2 || tmp == 4 || tmp == 6) { if (tmp == 2 || tmp == 4 || tmp == 6) {
track->textures[i].roundup_w = false; track->textures[i].roundup_w = false;
} }
tmp = (ib_chunk->kdata[idx] >> 3) & 0x7;; tmp = (ib_chunk->kdata[idx] >> 3) & 0x7;
if (tmp == 2 || tmp == 4 || tmp == 6) { if (tmp == 2 || tmp == 4 || tmp == 6) {
track->textures[i].roundup_h = false; track->textures[i].roundup_h = false;
} }

2
drivers/ide/ide-probe.c
View file

@ -1212,7 +1212,7 @@ static int ide_find_port_slot(const struct ide_port_info *d)
{ {
int idx = -ENOENT; int idx = -ENOENT;
u8 bootable = (d && (d->host_flags & IDE_HFLAG_NON_BOOTABLE)) ? 0 : 1; u8 bootable = (d && (d->host_flags & IDE_HFLAG_NON_BOOTABLE)) ? 0 : 1;
u8 i = (d && (d->host_flags & IDE_HFLAG_QD_2ND_PORT)) ? 1 : 0;; u8 i = (d && (d->host_flags & IDE_HFLAG_QD_2ND_PORT)) ? 1 : 0;
/* /*
* Claim an unassigned slot. * Claim an unassigned slot.

4
drivers/ide/umc8672.c
View file

@ -170,9 +170,9 @@ static int __init umc8672_init(void)
goto out; goto out;
if (umc8672_probe() == 0) if (umc8672_probe() == 0)
return 0;; return 0;
out: out:
return -ENODEV;; return -ENODEV;
} }
module_init(umc8672_init); module_init(umc8672_init);

2
drivers/isdn/capi/capiutil.c
View file

@ -1019,7 +1019,7 @@ int __init cdebug_init(void)
if (!g_debbuf->buf) { if (!g_debbuf->buf) {
kfree(g_cmsg); kfree(g_cmsg);
kfree(g_debbuf); kfree(g_debbuf);
return -ENOMEM;; return -ENOMEM;
} }
g_debbuf->size = CDEBUG_GSIZE; g_debbuf->size = CDEBUG_GSIZE;
g_debbuf->buf[0] = 0; g_debbuf->buf[0] = 0;

2
drivers/macintosh/rack-meter.c
View file

@ -274,7 +274,7 @@ static void __devinit rackmeter_init_cpu_sniffer(struct rackmeter *rm)
if (cpu > 1) if (cpu > 1)
continue; continue;
rcpu = &rm->cpu[cpu];; rcpu = &rm->cpu[cpu];
rcpu->prev_idle = get_cpu_idle_time(cpu); rcpu->prev_idle = get_cpu_idle_time(cpu);
rcpu->prev_wall = jiffies64_to_cputime64(get_jiffies_64()); rcpu->prev_wall = jiffies64_to_cputime64(get_jiffies_64());
schedule_delayed_work_on(cpu, &rm->cpu[cpu].sniffer, schedule_delayed_work_on(cpu, &rm->cpu[cpu].sniffer,

1
drivers/net/arcnet/arc-rawmode.c
View file

@ -123,7 +123,6 @@ static void rx(struct net_device *dev, int bufnum,
BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx"); BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx");
skb->protocol = cpu_to_be16(ETH_P_ARCNET); skb->protocol = cpu_to_be16(ETH_P_ARCNET);
;
netif_rx(skb); netif_rx(skb);
} }

1
drivers/net/arcnet/capmode.c
View file

@ -149,7 +149,6 @@ static void rx(struct net_device *dev, int bufnum,
BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx"); BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx");
skb->protocol = cpu_to_be16(ETH_P_ARCNET); skb->protocol = cpu_to_be16(ETH_P_ARCNET);
;
netif_rx(skb); netif_rx(skb);
} }

2
drivers/net/gianfar_ethtool.c
View file

@ -293,7 +293,7 @@ static int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals
rxtime = get_ictt_value(priv->rxic); rxtime = get_ictt_value(priv->rxic);
rxcount = get_icft_value(priv->rxic); rxcount = get_icft_value(priv->rxic);
txtime = get_ictt_value(priv->txic); txtime = get_ictt_value(priv->txic);
txcount = get_icft_value(priv->txic);; txcount = get_icft_value(priv->txic);
cvals->rx_coalesce_usecs = gfar_ticks2usecs(priv, rxtime); cvals->rx_coalesce_usecs = gfar_ticks2usecs(priv, rxtime);
cvals->rx_max_coalesced_frames = rxcount; cvals->rx_max_coalesced_frames = rxcount;

8
drivers/net/ibm_newemac/core.c
View file

@ -2556,13 +2556,13 @@ static int __devinit emac_init_config(struct emac_instance *dev)
if (emac_read_uint_prop(np, "mdio-device", &dev->mdio_ph, 0)) if (emac_read_uint_prop(np, "mdio-device", &dev->mdio_ph, 0))
dev->mdio_ph = 0; dev->mdio_ph = 0;
if (emac_read_uint_prop(np, "zmii-device", &dev->zmii_ph, 0)) if (emac_read_uint_prop(np, "zmii-device", &dev->zmii_ph, 0))
dev->zmii_ph = 0;; dev->zmii_ph = 0;
if (emac_read_uint_prop(np, "zmii-channel", &dev->zmii_port, 0)) if (emac_read_uint_prop(np, "zmii-channel", &dev->zmii_port, 0))
dev->zmii_port = 0xffffffff;; dev->zmii_port = 0xffffffff;
if (emac_read_uint_prop(np, "rgmii-device", &dev->rgmii_ph, 0)) if (emac_read_uint_prop(np, "rgmii-device", &dev->rgmii_ph, 0))
dev->rgmii_ph = 0;; dev->rgmii_ph = 0;
if (emac_read_uint_prop(np, "rgmii-channel", &dev->rgmii_port, 0)) if (emac_read_uint_prop(np, "rgmii-channel", &dev->rgmii_port, 0))
dev->rgmii_port = 0xffffffff;; dev->rgmii_port = 0xffffffff;
if (emac_read_uint_prop(np, "fifo-entry-size", &dev->fifo_entry_size, 0)) if (emac_read_uint_prop(np, "fifo-entry-size", &dev->fifo_entry_size, 0))
dev->fifo_entry_size = 16; dev->fifo_entry_size = 16;
if (emac_read_uint_prop(np, "mal-burst-size", &dev->mal_burst_size, 0)) if (emac_read_uint_prop(np, "mal-burst-size", &dev->mal_burst_size, 0))

2
drivers/net/igb/igb_main.c
View file

@ -3966,7 +3966,7 @@ static int igb_set_vf_multicasts(struct igb_adapter *adapter,
/* VFs are limited to using the MTA hash table for their multicast /* VFs are limited to using the MTA hash table for their multicast
* addresses */ * addresses */
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
vf_data->vf_mc_hashes[i] = hash_list[i];; vf_data->vf_mc_hashes[i] = hash_list[i];
/* Flush and reset the mta with the new values */ /* Flush and reset the mta with the new values */
igb_set_rx_mode(adapter->netdev); igb_set_rx_mode(adapter->netdev);

2
drivers/net/ll_temac_main.c
View file

@ -865,7 +865,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
dcrs = dcr_resource_start(np, 0); dcrs = dcr_resource_start(np, 0);
if (dcrs == 0) { if (dcrs == 0) {
dev_err(&op->dev, "could not get DMA register address\n"); dev_err(&op->dev, "could not get DMA register address\n");
goto nodev;; goto nodev;
} }
lp->sdma_dcrs = dcr_map(np, dcrs, dcr_resource_len(np, 0)); lp->sdma_dcrs = dcr_map(np, dcrs, dcr_resource_len(np, 0));
dev_dbg(&op->dev, "DCR base: %x\n", dcrs); dev_dbg(&op->dev, "DCR base: %x\n", dcrs);

4
drivers/net/ni52.c
View file

@ -615,10 +615,10 @@ static int init586(struct net_device *dev)
/* addr_len |!src_insert |pre-len |loopback */ /* addr_len |!src_insert |pre-len |loopback */
writeb(0x2e, &cfg_cmd->adr_len); writeb(0x2e, &cfg_cmd->adr_len);
writeb(0x00, &cfg_cmd->priority); writeb(0x00, &cfg_cmd->priority);
writeb(0x60, &cfg_cmd->ifs);; writeb(0x60, &cfg_cmd->ifs);
writeb(0x00, &cfg_cmd->time_low); writeb(0x00, &cfg_cmd->time_low);
writeb(0xf2, &cfg_cmd->time_high); writeb(0xf2, &cfg_cmd->time_high);
writeb(0x00, &cfg_cmd->promisc);; writeb(0x00, &cfg_cmd->promisc);
if (dev->flags & IFF_ALLMULTI) { if (dev->flags & IFF_ALLMULTI) {
int len = ((char __iomem *)p->iscp - (char __iomem *)ptr - 8) / 6; int len = ((char __iomem *)p->iscp - (char __iomem *)ptr - 8) / 6;
if (num_addrs > len) { if (num_addrs > len) {

4
drivers/net/qlge/qlge_main.c
View file

@ -2630,7 +2630,7 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring)
FLAGS_LI; /* Load irq delay values */ FLAGS_LI; /* Load irq delay values */
if (rx_ring->lbq_len) { if (rx_ring->lbq_len) {
cqicb->flags |= FLAGS_LL; /* Load lbq values */ cqicb->flags |= FLAGS_LL; /* Load lbq values */
tmp = (u64)rx_ring->lbq_base_dma;; tmp = (u64)rx_ring->lbq_base_dma;
base_indirect_ptr = (__le64 *) rx_ring->lbq_base_indirect; base_indirect_ptr = (__le64 *) rx_ring->lbq_base_indirect;
page_entries = 0; page_entries = 0;
do { do {
@ -2654,7 +2654,7 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring)
} }
if (rx_ring->sbq_len) { if (rx_ring->sbq_len) {
cqicb->flags |= FLAGS_LS; /* Load sbq values */ cqicb->flags |= FLAGS_LS; /* Load sbq values */
tmp = (u64)rx_ring->sbq_base_dma;; tmp = (u64)rx_ring->sbq_base_dma;
base_indirect_ptr = (__le64 *) rx_ring->sbq_base_indirect; base_indirect_ptr = (__le64 *) rx_ring->sbq_base_indirect;
page_entries = 0; page_entries = 0;
do { do {

2
drivers/net/skfp/pcmplc.c
View file

@ -960,7 +960,7 @@ static void pcm_fsm(struct s_smc *smc, struct s_phy *phy, int cmd)
/*PC88b*/ /*PC88b*/
if (!phy->cf_join) { if (!phy->cf_join) {
phy->cf_join = TRUE ; phy->cf_join = TRUE ;
queue_event(smc,EVENT_CFM,CF_JOIN+np) ; ; queue_event(smc,EVENT_CFM,CF_JOIN+np) ;
} }
if (cmd == PC_JOIN) if (cmd == PC_JOIN)
GO_STATE(PC8_ACTIVE) ; GO_STATE(PC8_ACTIVE) ;

8
drivers/net/skfp/pmf.c
View file

@ -807,9 +807,9 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,
mib_p->fddiPORTLerFlag ; mib_p->fddiPORTLerFlag ;
sp->p4050_pad = 0 ; sp->p4050_pad = 0 ;
sp->p4050_cutoff = sp->p4050_cutoff =
mib_p->fddiPORTLer_Cutoff ; ; mib_p->fddiPORTLer_Cutoff ;
sp->p4050_alarm = sp->p4050_alarm =
mib_p->fddiPORTLer_Alarm ; ; mib_p->fddiPORTLer_Alarm ;
sp->p4050_estimate = sp->p4050_estimate =
mib_p->fddiPORTLer_Estimate ; mib_p->fddiPORTLer_Estimate ;
sp->p4050_reject_ct = sp->p4050_reject_ct =
@ -829,7 +829,7 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,
sp->p4051_porttype = sp->p4051_porttype =
mib_p->fddiPORTMy_Type ; mib_p->fddiPORTMy_Type ;
sp->p4051_connectstate = sp->p4051_connectstate =
mib_p->fddiPORTConnectState ; ; mib_p->fddiPORTConnectState ;
sp->p4051_pc_neighbor = sp->p4051_pc_neighbor =
mib_p->fddiPORTNeighborType ; mib_p->fddiPORTNeighborType ;
sp->p4051_pc_withhold = sp->p4051_pc_withhold =
@ -853,7 +853,7 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,
struct smt_p_4053 *sp ; struct smt_p_4053 *sp ;
sp = (struct smt_p_4053 *) to ; sp = (struct smt_p_4053 *) to ;
sp->p4053_multiple = sp->p4053_multiple =
mib_p->fddiPORTMultiple_P ; ; mib_p->fddiPORTMultiple_P ;
sp->p4053_availablepaths = sp->p4053_availablepaths =
mib_p->fddiPORTAvailablePaths ; mib_p->fddiPORTAvailablePaths ;
sp->p4053_currentpath = sp->p4053_currentpath =

2
drivers/net/skge.c
View file

@ -215,7 +215,7 @@ static void skge_wol_init(struct skge_port *skge)
if (skge->wol & WAKE_MAGIC) if (skge->wol & WAKE_MAGIC)
ctrl |= WOL_CTL_ENA_PME_ON_MAGIC_PKT|WOL_CTL_ENA_MAGIC_PKT_UNIT; ctrl |= WOL_CTL_ENA_PME_ON_MAGIC_PKT|WOL_CTL_ENA_MAGIC_PKT_UNIT;
else else
ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;; ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;
ctrl |= WOL_CTL_DIS_PME_ON_PATTERN|WOL_CTL_DIS_PATTERN_UNIT; ctrl |= WOL_CTL_DIS_PME_ON_PATTERN|WOL_CTL_DIS_PATTERN_UNIT;
skge_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl); skge_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl);

2
drivers/net/sky2.c
View file

@ -765,7 +765,7 @@ static void sky2_wol_init(struct sky2_port *sky2)
if (sky2->wol & WAKE_MAGIC) if (sky2->wol & WAKE_MAGIC)
ctrl |= WOL_CTL_ENA_PME_ON_MAGIC_PKT|WOL_CTL_ENA_MAGIC_PKT_UNIT; ctrl |= WOL_CTL_ENA_PME_ON_MAGIC_PKT|WOL_CTL_ENA_MAGIC_PKT_UNIT;
else else
ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;; ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;
ctrl |= WOL_CTL_DIS_PME_ON_PATTERN|WOL_CTL_DIS_PATTERN_UNIT; ctrl |= WOL_CTL_DIS_PME_ON_PATTERN|WOL_CTL_DIS_PATTERN_UNIT;
sky2_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl); sky2_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl);

2
drivers/net/vxge/vxge-config.h
View file

@ -1541,7 +1541,7 @@ void vxge_hw_ring_rxd_1b_info_get(
rxd_info->l4_cksum_valid = rxd_info->l4_cksum_valid =
(u32)VXGE_HW_RING_RXD_L4_CKSUM_CORRECT_GET(rxdp->control_0); (u32)VXGE_HW_RING_RXD_L4_CKSUM_CORRECT_GET(rxdp->control_0);
rxd_info->l4_cksum = rxd_info->l4_cksum =
(u32)VXGE_HW_RING_RXD_L4_CKSUM_GET(rxdp->control_0);; (u32)VXGE_HW_RING_RXD_L4_CKSUM_GET(rxdp->control_0);
rxd_info->frame = rxd_info->frame =
(u32)VXGE_HW_RING_RXD_ETHER_ENCAP_GET(rxdp->control_0); (u32)VXGE_HW_RING_RXD_ETHER_ENCAP_GET(rxdp->control_0);
rxd_info->proto = rxd_info->proto =

2
drivers/net/vxge/vxge-main.c
View file

@ -2350,7 +2350,7 @@ static int vxge_enable_msix(struct vxgedev *vdev)
enum vxge_hw_status status; enum vxge_hw_status status;
/* 0 - Tx, 1 - Rx */ /* 0 - Tx, 1 - Rx */
int tim_msix_id[4]; int tim_msix_id[4];
int alarm_msix_id = 0, msix_intr_vect = 0;; int alarm_msix_id = 0, msix_intr_vect = 0;
vdev->intr_cnt = 0; vdev->intr_cnt = 0;
/* allocate msix vectors */ /* allocate msix vectors */

2
drivers/rtc/rtc-omap.c
View file

@ -430,7 +430,7 @@ fail:
static int __exit omap_rtc_remove(struct platform_device *pdev) static int __exit omap_rtc_remove(struct platform_device *pdev)
{ {
struct rtc_device *rtc = platform_get_drvdata(pdev);; struct rtc_device *rtc = platform_get_drvdata(pdev);
device_init_wakeup(&pdev->dev, 0); device_init_wakeup(&pdev->dev, 0);

2
drivers/s390/block/dasd_eckd.c
View file

@ -706,7 +706,7 @@ static int dasd_eckd_generate_uid(struct dasd_device *device,
sizeof(uid->serial) - 1); sizeof(uid->serial) - 1);
EBCASC(uid->serial, sizeof(uid->serial) - 1); EBCASC(uid->serial, sizeof(uid->serial) - 1);
uid->ssid = private->gneq->subsystemID; uid->ssid = private->gneq->subsystemID;
uid->real_unit_addr = private->ned->unit_addr;; uid->real_unit_addr = private->ned->unit_addr;
if (private->sneq) { if (private->sneq) {
uid->type = private->sneq->sua_flags; uid->type = private->sneq->sua_flags;
if (uid->type == UA_BASE_PAV_ALIAS) if (uid->type == UA_BASE_PAV_ALIAS)

2
drivers/s390/net/netiucv.c
View file

@ -2113,7 +2113,7 @@ static ssize_t remove_write (struct device_driver *drv,
IUCV_DBF_TEXT(trace, 3, __func__); IUCV_DBF_TEXT(trace, 3, __func__);
if (count >= IFNAMSIZ) if (count >= IFNAMSIZ)
count = IFNAMSIZ - 1;; count = IFNAMSIZ - 1;
for (i = 0, p = buf; i < count && *p; i++, p++) { for (i = 0, p = buf; i < count && *p; i++, p++) {
if (*p == '\n' || *p == ' ') if (*p == '\n' || *p == ' ')

2
drivers/s390/scsi/zfcp_scsi.c
View file

@ -102,7 +102,7 @@ static int zfcp_scsi_queuecommand(struct scsi_cmnd *scpnt,
if (unlikely((status & ZFCP_STATUS_COMMON_ERP_FAILED) || if (unlikely((status & ZFCP_STATUS_COMMON_ERP_FAILED) ||
!(status & ZFCP_STATUS_COMMON_RUNNING))) { !(status & ZFCP_STATUS_COMMON_RUNNING))) {
zfcp_scsi_command_fail(scpnt, DID_ERROR); zfcp_scsi_command_fail(scpnt, DID_ERROR);
return 0;; return 0;
} }
ret = zfcp_fsf_send_fcp_command_task(unit, scpnt); ret = zfcp_fsf_send_fcp_command_task(unit, scpnt);

2
drivers/scsi/bnx2i/bnx2i_hwi.c
View file

@ -1340,7 +1340,7 @@ static int bnx2i_process_login_resp(struct iscsi_session *session,
resp_hdr->opcode = login->op_code; resp_hdr->opcode = login->op_code;
resp_hdr->flags = login->response_flags; resp_hdr->flags = login->response_flags;
resp_hdr->max_version = login->version_max; resp_hdr->max_version = login->version_max;
resp_hdr->active_version = login->version_active;; resp_hdr->active_version = login->version_active;
resp_hdr->hlength = 0; resp_hdr->hlength = 0;
hton24(resp_hdr->dlength, login->data_length); hton24(resp_hdr->dlength, login->data_length);

2
drivers/scsi/lpfc/lpfc_ct.c
View file

@ -1207,7 +1207,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
vport->ct_flags &= ~FC_CT_RFF_ID; vport->ct_flags &= ~FC_CT_RFF_ID;
CtReq->CommandResponse.bits.CmdRsp = CtReq->CommandResponse.bits.CmdRsp =
be16_to_cpu(SLI_CTNS_RFF_ID); be16_to_cpu(SLI_CTNS_RFF_ID);
CtReq->un.rff.PortId = cpu_to_be32(vport->fc_myDID);; CtReq->un.rff.PortId = cpu_to_be32(vport->fc_myDID);
CtReq->un.rff.fbits = FC4_FEATURE_INIT; CtReq->un.rff.fbits = FC4_FEATURE_INIT;
CtReq->un.rff.type_code = FC_FCP_DATA; CtReq->un.rff.type_code = FC_FCP_DATA;
cmpl = lpfc_cmpl_ct_cmd_rff_id; cmpl = lpfc_cmpl_ct_cmd_rff_id;

2
drivers/spi/omap_uwire.c
View file

@ -213,7 +213,7 @@ static int uwire_txrx(struct spi_device *spi, struct spi_transfer *t)
unsigned bits = ust->bits_per_word; unsigned bits = ust->bits_per_word;
unsigned bytes; unsigned bytes;
u16 val, w; u16 val, w;
int status = 0;; int status = 0;
if (!t->tx_buf && !t->rx_buf) if (!t->tx_buf && !t->rx_buf)
return 0; return 0;

2
drivers/spi/spi_s3c24xx.c
View file

@ -388,7 +388,7 @@ static int __init s3c24xx_spi_probe(struct platform_device *pdev)
err_no_iores: err_no_iores:
err_no_pdata: err_no_pdata:
spi_master_put(hw->master);; spi_master_put(hw->master);
err_nomem: err_nomem:
return err; return err;

2
drivers/usb/class/cdc-wdm.c
View file

@ -506,8 +506,6 @@ static int wdm_open(struct inode *inode, struct file *file)
desc = usb_get_intfdata(intf); desc = usb_get_intfdata(intf);
if (test_bit(WDM_DISCONNECTING, &desc->flags)) if (test_bit(WDM_DISCONNECTING, &desc->flags))
goto out; goto out;
;
file->private_data = desc; file->private_data = desc;
rv = usb_autopm_get_interface(desc->intf); rv = usb_autopm_get_interface(desc->intf);

2
drivers/usb/serial/spcp8x5.c
View file

@ -544,7 +544,7 @@ static void spcp8x5_set_termios(struct tty_struct *tty,
} }
/* Set Baud Rate */ /* Set Baud Rate */
baud = tty_get_baud_rate(tty);; baud = tty_get_baud_rate(tty);
switch (baud) { switch (baud) {
case 300: buf[0] = 0x00; break; case 300: buf[0] = 0x00; break;
case 600: buf[0] = 0x01; break; case 600: buf[0] = 0x01; break;

2
drivers/uwb/i1480/i1480u-wlp/netdev.c
View file

@ -214,7 +214,7 @@ int i1480u_open(struct net_device *net_dev)
netif_wake_queue(net_dev); netif_wake_queue(net_dev);
#ifdef i1480u_FLOW_CONTROL #ifdef i1480u_FLOW_CONTROL
result = usb_submit_urb(i1480u->notif_urb, GFP_KERNEL);; result = usb_submit_urb(i1480u->notif_urb, GFP_KERNEL);
if (result < 0) { if (result < 0) {
dev_err(dev, "Can't submit notification URB: %d\n", result); dev_err(dev, "Can't submit notification URB: %d\n", result);
goto error_notif_urb_submit; goto error_notif_urb_submit;

2
drivers/video/cfbcopyarea.c
View file

@ -114,7 +114,7 @@ bitcpy(struct fb_info *p, unsigned long __iomem *dst, int dst_idx,
d0 >>= right; d0 >>= right;
} else if (src_idx+n <= bits) { } else if (src_idx+n <= bits) {
// Single source word // Single source word
d0 <<= left;; d0 <<= left;
} else { } else {
// 2 source words // 2 source words
d1 = FB_READL(src + 1); d1 = FB_READL(src + 1);

2
drivers/video/imxfb.c
View file

@ -710,7 +710,7 @@ static int __init imxfb_probe(struct platform_device *pdev)
fbi->clk = clk_get(&pdev->dev, NULL); fbi->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(fbi->clk)) { if (IS_ERR(fbi->clk)) {
ret = PTR_ERR(fbi->clk);; ret = PTR_ERR(fbi->clk);
dev_err(&pdev->dev, "unable to get clock: %d\n", ret); dev_err(&pdev->dev, "unable to get clock: %d\n", ret);
goto failed_getclock; goto failed_getclock;
} }

2
drivers/video/s3c2410fb.c
View file

@ -1119,7 +1119,7 @@ int __init s3c2410fb_init(void)
int ret = platform_driver_register(&s3c2410fb_driver); int ret = platform_driver_register(&s3c2410fb_driver);
if (ret == 0) if (ret == 0)
ret = platform_driver_register(&s3c2412fb_driver);; ret = platform_driver_register(&s3c2412fb_driver);
return ret; return ret;
} }

2
drivers/xen/balloon.c
View file

@ -214,7 +214,7 @@ static int increase_reservation(unsigned long nr_pages)
page = balloon_first_page(); page = balloon_first_page();
for (i = 0; i < nr_pages; i++) { for (i = 0; i < nr_pages; i++) {
BUG_ON(page == NULL); BUG_ON(page == NULL);
frame_list[i] = page_to_pfn(page);; frame_list[i] = page_to_pfn(page);
page = balloon_next_page(page); page = balloon_next_page(page);
} }

2
fs/autofs/dirhash.c
View file

@ -90,7 +90,7 @@ struct autofs_dir_ent *autofs_expire(struct super_block *sb,
DPRINTK(("autofs: not expirable (not a mounted directory): %s\n", ent->name)); DPRINTK(("autofs: not expirable (not a mounted directory): %s\n", ent->name));
continue; continue;
} }
while (d_mountpoint(path.dentry) && follow_down(&path)); while (d_mountpoint(path.dentry) && follow_down(&path))
; ;
umount_ok = may_umount(path.mnt); umount_ok = may_umount(path.mnt);
path_put(&path); path_put(&path);

2
fs/btrfs/tree-log.c
View file

@ -2605,7 +2605,7 @@ static noinline int copy_items(struct btrfs_trans_handle *trans,
extent); extent);
cs = btrfs_file_extent_offset(src, extent); cs = btrfs_file_extent_offset(src, extent);
cl = btrfs_file_extent_num_bytes(src, cl = btrfs_file_extent_num_bytes(src,
extent);; extent);
if (btrfs_file_extent_compression(src, if (btrfs_file_extent_compression(src,
extent)) { extent)) {
cs = 0; cs = 0;

2
fs/cifs/cifs_dfs_ref.c
View file

@ -142,7 +142,7 @@ char *cifs_compose_mount_options(const char *sb_mountdata,
rc = dns_resolve_server_name_to_ip(*devname, &srvIP); rc = dns_resolve_server_name_to_ip(*devname, &srvIP);
if (rc != 0) { if (rc != 0) {
cERROR(1, ("%s: Failed to resolve server part of %s to IP: %d", cERROR(1, ("%s: Failed to resolve server part of %s to IP: %d",
__func__, *devname, rc));; __func__, *devname, rc));
goto compose_mount_options_err; goto compose_mount_options_err;
} }
/* md_len = strlen(...) + 12 for 'sep+prefixpath=' /* md_len = strlen(...) + 12 for 'sep+prefixpath='

2
fs/nfs/callback_xdr.c
View file

@ -222,7 +222,7 @@ static unsigned decode_sessionid(struct xdr_stream *xdr,
p = read_buf(xdr, len); p = read_buf(xdr, len);
if (unlikely(p == NULL)) if (unlikely(p == NULL))
return htonl(NFS4ERR_RESOURCE);; return htonl(NFS4ERR_RESOURCE);
memcpy(sid->data, p, len); memcpy(sid->data, p, len);
return 0; return 0;

2
fs/ocfs2/quota_global.c
View file

@ -154,7 +154,7 @@ static int ocfs2_get_quota_block(struct inode *inode, int block,
err = -EIO; err = -EIO;
mlog_errno(err); mlog_errno(err);
} }
return err;; return err;
} }
/* Read data from global quotafile - avoid pagecache and such because we cannot /* Read data from global quotafile - avoid pagecache and such because we cannot

3
include/scsi/fc/fc_fc2.h
View file

@ -92,8 +92,7 @@ struct fc_esb {
__u8 _esb_resvd[4]; __u8 _esb_resvd[4];
__u8 esb_service_params[112]; /* TBD */ __u8 esb_service_params[112]; /* TBD */
__u8 esb_seq_status[8]; /* sequence statuses, 8 bytes each */ __u8 esb_seq_status[8]; /* sequence statuses, 8 bytes each */
} __attribute__((packed));; } __attribute__((packed));
/* /*
* Define expected size for ASSERTs. * Define expected size for ASSERTs.

2
kernel/trace/trace_hw_branches.c
View file

@ -155,7 +155,7 @@ static enum print_line_t bts_trace_print_line(struct trace_iterator *iter)
seq_print_ip_sym(seq, it->from, symflags) && seq_print_ip_sym(seq, it->from, symflags) &&
trace_seq_printf(seq, "\n")) trace_seq_printf(seq, "\n"))
return TRACE_TYPE_HANDLED; return TRACE_TYPE_HANDLED;
return TRACE_TYPE_PARTIAL_LINE;; return TRACE_TYPE_PARTIAL_LINE;
} }
return TRACE_TYPE_UNHANDLED; return TRACE_TYPE_UNHANDLED;
} }

2
net/wireless/wext-compat.c
View file

@ -834,7 +834,7 @@ int cfg80211_wext_siwtxpower(struct net_device *dev,
return 0; return 0;
} }
return rdev->ops->set_tx_power(wdev->wiphy, type, dbm);; return rdev->ops->set_tx_power(wdev->wiphy, type, dbm);
} }
EXPORT_SYMBOL_GPL(cfg80211_wext_siwtxpower); EXPORT_SYMBOL_GPL(cfg80211_wext_siwtxpower);

3
sound/oss/sys_timer.c
View file

@ -100,9 +100,6 @@ def_tmr_open(int dev, int mode)
curr_tempo = 60; curr_tempo = 60;
curr_timebase = 100; curr_timebase = 100;
opened = 1; opened = 1;
;
{ {
def_tmr.expires = (1) + jiffies; def_tmr.expires = (1) + jiffies;
add_timer(&def_tmr); add_timer(&def_tmr);

2
sound/soc/codecs/wm9081.c
View file

@ -1027,7 +1027,7 @@ static int wm9081_hw_params(struct snd_pcm_substream *substream,
- wm9081->fs); - wm9081->fs);
for (i = 1; i < ARRAY_SIZE(clk_sys_rates); i++) { for (i = 1; i < ARRAY_SIZE(clk_sys_rates); i++) {
cur_val = abs((wm9081->sysclk_rate / cur_val = abs((wm9081->sysclk_rate /
clk_sys_rates[i].ratio) - wm9081->fs);; clk_sys_rates[i].ratio) - wm9081->fs);
if (cur_val < best_val) { if (cur_val < best_val) {
best = i; best = i;
best_val = cur_val; best_val = cur_val;

2
sound/soc/pxa/pxa-ssp.c
View file

@ -351,7 +351,7 @@ static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai,
do_div(tmp, freq_out); do_div(tmp, freq_out);
val = tmp; val = tmp;
val = (val << 16) | 64;; val = (val << 16) | 64;
ssp_write_reg(ssp, SSACDD, val); ssp_write_reg(ssp, SSACDD, val);
ssacd |= (0x6 << 4); ssacd |= (0x6 << 4);

2
sound/soc/s3c24xx/s3c24xx_uda134x.c
View file

@ -67,7 +67,7 @@ static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream)
{ {
int ret = 0; int ret = 0;
#ifdef ENFORCE_RATES #ifdef ENFORCE_RATES
struct snd_pcm_runtime *runtime = substream->runtime;; struct snd_pcm_runtime *runtime = substream->runtime;
#endif #endif
mutex_lock(&clk_lock); mutex_lock(&clk_lock);