提交 c19a28e1 编写于 作者: F Fernando Carrijo 提交者: Linus Torvalds

remove lots of double-semicolons

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Acked-by: NTheodore Ts'o <tytso@mit.edu>
Acked-by: NMark Fasheh <mfasheh@suse.com>
Acked-by: NDavid S. Miller <davem@davemloft.net>
Cc: James Morris <jmorris@namei.org>
Acked-by: NCasey Schaufler <casey@schaufler-ca.com>
Acked-by: NTakashi Iwai <tiwai@suse.de>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 f1565962
...@@ -982,7 +982,7 @@ static int __init longhaul_init(void) ...@@ -982,7 +982,7 @@ static int __init longhaul_init(void)
case 10: case 10:
printk(KERN_ERR PFX "Use acpi-cpufreq driver for VIA C7\n"); printk(KERN_ERR PFX "Use acpi-cpufreq driver for VIA C7\n");
default: default:
;; ;
} }
return -ENODEV; return -ENODEV;
......
...@@ -3868,7 +3868,7 @@ static void ocfs2_split_record(struct inode *inode, ...@@ -3868,7 +3868,7 @@ static void ocfs2_split_record(struct inode *inode,
struct ocfs2_extent_list *left_el = NULL, *right_el, *insert_el, *el; struct ocfs2_extent_list *left_el = NULL, *right_el, *insert_el, *el;
struct ocfs2_extent_rec *rec, *tmprec; struct ocfs2_extent_rec *rec, *tmprec;
right_el = path_leaf_el(right_path);; right_el = path_leaf_el(right_path);
if (left_path) if (left_path)
left_el = path_leaf_el(left_path); left_el = path_leaf_el(left_path);
......
...@@ -1605,7 +1605,7 @@ int ocfs2_change_file_space(struct file *file, unsigned int cmd, ...@@ -1605,7 +1605,7 @@ int ocfs2_change_file_space(struct file *file, unsigned int cmd,
struct ocfs2_space_resv *sr) struct ocfs2_space_resv *sr)
{ {
struct inode *inode = file->f_path.dentry->d_inode; struct inode *inode = file->f_path.dentry->d_inode;
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);; struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
if ((cmd == OCFS2_IOC_RESVSP || cmd == OCFS2_IOC_RESVSP64) && if ((cmd == OCFS2_IOC_RESVSP || cmd == OCFS2_IOC_RESVSP64) &&
!ocfs2_writes_unwritten_extents(osb)) !ocfs2_writes_unwritten_extents(osb))
......
...@@ -2752,7 +2752,7 @@ int __init ip6_route_init(void) ...@@ -2752,7 +2752,7 @@ int __init ip6_route_init(void)
kmem_cache_create("ip6_dst_cache", sizeof(struct rt6_info), 0, kmem_cache_create("ip6_dst_cache", sizeof(struct rt6_info), 0,
SLAB_HWCACHE_ALIGN, NULL); SLAB_HWCACHE_ALIGN, NULL);
if (!ip6_dst_ops_template.kmem_cachep) if (!ip6_dst_ops_template.kmem_cachep)
goto out;; goto out;
ret = register_pernet_subsys(&ip6_route_net_ops); ret = register_pernet_subsys(&ip6_route_net_ops);
if (ret) if (ret)
......
...@@ -128,7 +128,7 @@ static struct ctl_table_header *ip6_header; ...@@ -128,7 +128,7 @@ static struct ctl_table_header *ip6_header;
int ipv6_sysctl_register(void) int ipv6_sysctl_register(void)
{ {
int err = -ENOMEM;; int err = -ENOMEM;
ip6_header = register_net_sysctl_rotable(net_ipv6_ctl_path, ipv6_table); ip6_header = register_net_sysctl_rotable(net_ipv6_ctl_path, ipv6_table);
if (ip6_header == NULL) if (ip6_header == NULL)
......
...@@ -435,7 +435,7 @@ static int sfq_init(struct Qdisc *sch, struct nlattr *opt) ...@@ -435,7 +435,7 @@ static int sfq_init(struct Qdisc *sch, struct nlattr *opt)
int i; int i;
q->perturb_timer.function = sfq_perturbation; q->perturb_timer.function = sfq_perturbation;
q->perturb_timer.data = (unsigned long)sch;; q->perturb_timer.data = (unsigned long)sch;
init_timer_deferrable(&q->perturb_timer); init_timer_deferrable(&q->perturb_timer);
for (i = 0; i < SFQ_HASH_DIVISOR; i++) for (i = 0; i < SFQ_HASH_DIVISOR; i++)
......
...@@ -569,7 +569,7 @@ static ssize_t smk_write_cipso(struct file *file, const char __user *buf, ...@@ -569,7 +569,7 @@ static ssize_t smk_write_cipso(struct file *file, const char __user *buf,
if (skp == NULL) if (skp == NULL)
goto out; goto out;
rule += SMK_LABELLEN;; rule += SMK_LABELLEN;
ret = sscanf(rule, "%d", &maplevel); ret = sscanf(rule, "%d", &maplevel);
if (ret != 1 || maplevel > SMACK_CIPSO_MAXLEVEL) if (ret != 1 || maplevel > SMACK_CIPSO_MAXLEVEL)
goto out; goto out;
......
...@@ -187,7 +187,7 @@ static int au1x_pcm_dbdma_realloc(struct au1xpsc_audio_dmadata *pcd, ...@@ -187,7 +187,7 @@ static int au1x_pcm_dbdma_realloc(struct au1xpsc_audio_dmadata *pcd,
au1x_pcm_dmatx_cb, (void *)pcd); au1x_pcm_dmatx_cb, (void *)pcd);
if (!pcd->ddma_chan) if (!pcd->ddma_chan)
return -ENOMEM;; return -ENOMEM;
au1xxx_dbdma_set_devwidth(pcd->ddma_chan, msbits); au1xxx_dbdma_set_devwidth(pcd->ddma_chan, msbits);
au1xxx_dbdma_ring_alloc(pcd->ddma_chan, 2); au1xxx_dbdma_ring_alloc(pcd->ddma_chan, 2);
......
...@@ -212,7 +212,7 @@ davinci_pcm_pointer(struct snd_pcm_substream *substream) ...@@ -212,7 +212,7 @@ davinci_pcm_pointer(struct snd_pcm_substream *substream)
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
count = src - runtime->dma_addr; count = src - runtime->dma_addr;
else else
count = dst - runtime->dma_addr;; count = dst - runtime->dma_addr;
spin_unlock(&prtd->lock); spin_unlock(&prtd->lock);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册