You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
trivial: remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
@@ -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);
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -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) {
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
+1
-1
@@ -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)) {
|
||||||
|
|||||||
@@ -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);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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.
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -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,
|
||||||
|
|||||||
@@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|
||||||
|
|||||||
@@ -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))
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
+2
-2
@@ -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) {
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user