Commit 273f4bef authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

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



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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b0b0fb0f

drivers/staging/comedi/drivers/pcl724.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

drivers/staging/comedi/drivers/pcm3724.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

drivers/staging/vt6655/ioctl.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/staging/vt6655/wmgr.c

+1 −1
Original line number Diff line number Diff line
@@ -3179,7 +3179,7 @@ s_vMgrFormatTIM( 
            }

            wEndIndex = ii;

        }

    };

    }





    // Round start index down to nearest even number

drivers/staging/vt6655/wpactl.c

+2 −2
Original line number Diff line number Diff line
@@ -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);