Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-25 22:44:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: Remove unnecessary semicolons when for (foo) {...};

Browse Source 
Done via perl script:

$ cat remove_semi_for.pl
my $match_balanced_parentheses = qr/(\((?:[^\(\)]++|(?-1))*\))/;
my $match_balanced_braces      = qr/(\{(?:[^\{\}]++|(?-1))*\})/;

foreach my $file (@ARGV) {
    my $f;
    my $text;
    my $oldtext;

    next if ((-d $file));

    open($f, '<', $file)
	or die "$P: Can't open $file for read\n";
    $oldtext = do { local($/) ; <$f> };
    close($f);

    next if ($oldtext eq "");

    $text = $oldtext;

    my $count = 0;
    do {
	$count = 0;
	$count += $text =~ s@\b(for\s*${match_balanced_parentheses}\s*)${match_balanced_braces}\s*;@"$1$3"@egx;
    } while ($count > 0);

    if ($text ne $oldtext) {
	my $newfile = $file;

	open($f, '>', $newfile)
	    or die "$P: Can't open $newfile for write\n";
	print $f $text;
	close($f);
    }
}

$

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Joe Perches 2011-04-10 14:31:34 -07:00 committed by Greg Kroah-Hartman
parent b0b0fb0fd5
commit 273f4bef18
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/comedi/drivers/pcl724.c
View File

@ -209,7 +209,7 @@ static int pcl724_attach(struct comedi_device *dev, struct comedi_devconfig *it)
subdev_8255_cb,
(unsigned long)(dev->iobase +
SIZE_8255 * i));
};
}
return 0;
}

2
drivers/staging/comedi/drivers/pcm3724.c
View File

@ -301,7 +301,7 @@ static int pcm3724_attach(struct comedi_device *dev,
subdev_8255_init(dev, dev->subdevices + i, subdev_8255_cb,
(unsigned long)(dev->iobase + SIZE_8255 * i));
((dev->subdevices) + i)->insn_config = subdev_3724_insn_config;
};
}
return 0;
}

6
drivers/staging/vt6655/ioctl.c
View File

@ -312,7 +312,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
if (!pBSS->bActive)
continue;
cbListCount++;
};
}
sList.uItem = cbListCount;
if (copy_to_user(pReq->data, &sList, sizeof(SBSSIDList))) {
result = -EFAULT;
@ -606,7 +606,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
if (!pNode->bActive)
continue;
cbListCount++;
};
}
sNodeList.uItem = cbListCount;
if (copy_to_user(pReq->data, &sNodeList, sizeof(SNodeList))) {
@ -657,7 +657,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
if (jj >= pNodeList->uItem)
break;
}
};
}
if (copy_to_user(pReq->data, pNodeList, sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)))) {
result = -EFAULT;
break;

2
drivers/staging/vt6655/wmgr.c
View File

@ -3179,7 +3179,7 @@ s_vMgrFormatTIM(
}
wEndIndex = ii;
}
};
}
// Round start index down to nearest even number

4
drivers/staging/vt6655/wpactl.c
View File

@ -653,7 +653,7 @@ static int wpa_get_scan(PSDevice pDevice,
}
};
}
kfree(ptempBSS);
@ -679,7 +679,7 @@ static int wpa_get_scan(PSDevice pDevice,
if (!pBSS->bActive)
continue;
count++;
};
}
pBuf = kcalloc(count, sizeof(struct viawget_scan_result), (int)GFP_ATOMIC);

6
drivers/staging/vt6656/ioctl.c
View File

@ -307,7 +307,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
if (!pBSS->bActive)
continue;
cbListCount++;
};
}
sList.uItem = cbListCount;
if (copy_to_user(pReq->data, &sList, sizeof(SBSSIDList))) {
result = -EFAULT;
@ -594,7 +594,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
if (!pNode->bActive)
continue;
cbListCount++;
};
}
sNodeList.uItem = cbListCount;
if (copy_to_user(pReq->data, &sNodeList, sizeof(SNodeList))) {
@ -645,7 +645,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
if (jj >= pNodeList->uItem)
break;
}
};
}
if (copy_to_user(pReq->data, pNodeList, sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)))) {
result = -EFAULT;
break;

2
drivers/staging/vt6656/wmgr.c
View File

@ -3167,7 +3167,7 @@ s_vMgrFormatTIM(
}
wEndIndex = (WORD)ii;
}
};
}
// Round start index down to nearest even number

4
drivers/staging/vt6656/wpactl.c
View File

@ -660,7 +660,7 @@ static int wpa_get_scan(PSDevice pDevice,
}
};
}
kfree(ptempBSS);
@ -673,7 +673,7 @@ static int wpa_get_scan(PSDevice pDevice,
if (!pBSS->bActive)
continue;
count++;
};
}
pBuf = kcalloc(count, sizeof(struct viawget_scan_result), (int)GFP_ATOMIC);

2
drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c
View File

@ -768,7 +768,7 @@ uint32_t cy_as_hal_processor_hw_init(void)
cy_as_hal_print_message(KERN_INFO "%s virt_addr=%x\n",
gpio_vma_tab[i].name,
(u32)gpio_vma_tab[i].virt_addr);
};
}
/*
* force OMAP_GPIO_126 to rleased state,