[drivers] Sort PCI_ROM() entries numerically

Done with the help of this Perl script:

$MARKER = 'PCI_ROM';  # a regex
$AB = 1;  # At Begin
@HEAD = ();
@ITEMS = ();
@TAIL = ();

foreach $fn (@ARGV) {
    open(IN, $fn) or die "Can't open file '$fn': $!\n";
    while (<IN>) {
        if (/$MARKER/) {
            push @ITEMS, $_;
            $AB = 0;  # not anymore at begin
        }
        else {
            if ($AB) {
                push @HEAD, $_;
            }
            else {
                push @TAIL, $_;
            }
        }
    }
} continue {
    close IN;
    open(OUT, ">$fn") or die "Can't open file '$fn' for output: $!\n";
    print OUT @HEAD;
    print OUT sort @ITEMS;
    print OUT @TAIL;
    close OUT;
    # For a next file
    $AB = 1;
    @HEAD = ();
    @ITEMS = ();
    @TAIL = ();
}

Executed that script while src/drivers/ as current working directory,
provided '$(grep -rl PCI_ROM)' as argument.

Signed-off-by: Geert Stappers <stappers@stappers.it>

1 files changed, 54 insertions, 54 deletions

diff --git a/src/drivers/net/tg3/tg3.c b/src/drivers/net/tg3/tg3.c
index 559c2d638..05af22d61 100644
--- a/src/drivers/net/tg3/tg3.c
+++ b/src/drivers/net/tg3/tg3.c
@@ -856,88 +856,88 @@ static void tg3_remove_one(struct pci_device *pci)
 }
 
 static struct pci_device_id tg3_nics[] = {
+	PCI_ROM(0x106b, 0x1645, "106b-1645", "106b-1645", 0),
+	PCI_ROM(0x1148, 0x4400, "1148-4400", "1148-4400", 0),
+	PCI_ROM(0x1148, 0x4500, "1148-4500", "1148-4500", 0),
+	PCI_ROM(0x14e4, 0x1600, "14e4-1600", "14e4-1600", 0),
+	PCI_ROM(0x14e4, 0x1601, "14e4-1601", "14e4-1601", 0),
 	PCI_ROM(0x14e4, 0x1644, "14e4-1644", "14e4-1644", 0),
 	PCI_ROM(0x14e4, 0x1645, "14e4-1645", "14e4-1645", 0),
 	PCI_ROM(0x14e4, 0x1646, "14e4-1646", "14e4-1646", 0),
 	PCI_ROM(0x14e4, 0x1647, "14e4-1647", "14e4-1647", 0),
 	PCI_ROM(0x14e4, 0x1648, "14e4-1648", "14e4-1648", 0),
+	PCI_ROM(0x14e4, 0x1649, "14e4-1649", "14e4-1649", 0),
 	PCI_ROM(0x14e4, 0x164d, "14e4-164d", "14e4-164d", 0),
 	PCI_ROM(0x14e4, 0x1653, "14e4-1653", "14e4-1653", 0),
 	PCI_ROM(0x14e4, 0x1654, "14e4-1654", "14e4-1654", 0),
+	PCI_ROM(0x14e4, 0x1655, "14e4-1655", "14e4-1655", 0),
+	PCI_ROM(0x14e4, 0x1656, "14e4-1656", "14e4-1656", 0),
+	PCI_ROM(0x14e4, 0x1657, "14e4-1657", "14e4-1657", 0),
+	PCI_ROM(0x14e4, 0x1659, "14e4-1659", "14e4-1659", 0),
+	PCI_ROM(0x14e4, 0x165a, "14e4-165a", "14e4-165a", 0),
+	PCI_ROM(0x14e4, 0x165b, "14e4-165b", "14e4-165b", 0),
 	PCI_ROM(0x14e4, 0x165d, "14e4-165d", "14e4-165d", 0),
 	PCI_ROM(0x14e4, 0x165e, "14e4-165e", "14e4-165e", 0),
-	PCI_ROM(0x14e4, 0x16a6, "14e4-16a6", "14e4-16a6", 0),
-	PCI_ROM(0x14e4, 0x16a7, "14e4-16a7", "14e4-16a7", 0),
-	PCI_ROM(0x14e4, 0x16a8, "14e4-16a8", "14e4-16a8", 0),
-	PCI_ROM(0x14e4, 0x16c6, "14e4-16c6", "14e4-16c6", 0),
-	PCI_ROM(0x14e4, 0x16c7, "14e4-16c7", "14e4-16c7", 0),
-	PCI_ROM(0x14e4, 0x1696, "14e4-1696", "14e4-1696", 0),
-	PCI_ROM(0x14e4, 0x169c, "14e4-169c", "14e4-169c", 0),
-	PCI_ROM(0x14e4, 0x169d, "14e4-169d", "14e4-169d", 0),
-	PCI_ROM(0x14e4, 0x170d, "14e4-170d", "14e4-170d", 0),
-	PCI_ROM(0x14e4, 0x170e, "14e4-170e", "14e4-170e", 0),
-	PCI_ROM(0x14e4, 0x1649, "14e4-1649", "14e4-1649", 0),
+	PCI_ROM(0x14e4, 0x165f, "14e4-165f", "14e4-165f", 0),
+	PCI_ROM(0x14e4, 0x1668, "14e4-1668", "14e4-1668", 0),
+	PCI_ROM(0x14e4, 0x1669, "14e4-1669", "14e4-1669", 0),
+	PCI_ROM(0x14e4, 0x166a, "14e4-166a", "14e4-166a", 0),
+	PCI_ROM(0x14e4, 0x166b, "14e4-166b", "14e4-166b", 0),
 	PCI_ROM(0x14e4, 0x166e, "14e4-166e", "14e4-166e", 0),
-	PCI_ROM(0x14e4, 0x1659, "14e4-1659", "14e4-1659", 0),
-	PCI_ROM(0x14e4, 0x165a, "14e4-165a", "14e4-165a", 0),
-	PCI_ROM(0x14e4, 0x1677, "14e4-1677", "14e4-1677", 0),
-	PCI_ROM(0x14e4, 0x167d, "14e4-167d", "14e4-167d", 0),
-	PCI_ROM(0x14e4, 0x167e, "14e4-167e", "14e4-167e", 0),
-	PCI_ROM(0x14e4, 0x1600, "14e4-1600", "14e4-1600", 0),
-	PCI_ROM(0x14e4, 0x1601, "14e4-1601", "14e4-1601", 0),
-	PCI_ROM(0x14e4, 0x16f7, "14e4-16f7", "14e4-16f7", 0),
-	PCI_ROM(0x14e4, 0x16fd, "14e4-16fd", "14e4-16fd", 0),
-	PCI_ROM(0x14e4, 0x16fe, "14e4-16fe", "14e4-16fe", 0),
-	PCI_ROM(0x14e4, 0x167a, "14e4-167a", "14e4-167a", 0),
 	PCI_ROM(0x14e4, 0x1672, "14e4-1672", "14e4-1672", 0),
-	PCI_ROM(0x14e4, 0x167b, "14e4-167b", "14e4-167b", 0),
 	PCI_ROM(0x14e4, 0x1673, "14e4-1673", "14e4-1673", 0),
 	PCI_ROM(0x14e4, 0x1674, "14e4-1674", "14e4-1674", 0),
-	PCI_ROM(0x14e4, 0x169a, "14e4-169a", "14e4-169a", 0),
-	PCI_ROM(0x14e4, 0x169b, "14e4-169b", "14e4-169b", 0),
-	PCI_ROM(0x14e4, 0x1693, "14e4-1693", "14e4-1693", 0),
-	PCI_ROM(0x14e4, 0x167f, "14e4-167f", "14e4-167f", 0),
-	PCI_ROM(0x14e4, 0x1668, "14e4-1668", "14e4-1668", 0),
-	PCI_ROM(0x14e4, 0x1669, "14e4-1669", "14e4-1669", 0),
+	PCI_ROM(0x14e4, 0x1677, "14e4-1677", "14e4-1677", 0),
 	PCI_ROM(0x14e4, 0x1678, "14e4-1678", "14e4-1678", 0),
 	PCI_ROM(0x14e4, 0x1679, "14e4-1679", "14e4-1679", 0),
-	PCI_ROM(0x14e4, 0x166a, "14e4-166a", "14e4-166a", 0),
-	PCI_ROM(0x14e4, 0x166b, "14e4-166b", "14e4-166b", 0),
-	PCI_ROM(0x14e4, 0x16dd, "14e4-16dd", "14e4-16dd", 0),
-	PCI_ROM(0x14e4, 0x1712, "14e4-1712", "14e4-1712", 0),
-	PCI_ROM(0x14e4, 0x1713, "14e4-1713", "14e4-1713", 0),
-	PCI_ROM(0x14e4, 0x1698, "14e4-1698", "14e4-1698", 0),
-	PCI_ROM(0x14e4, 0x1684, "14e4-1684", "14e4-1684", 0),
-	PCI_ROM(0x14e4, 0x165b, "14e4-165b", "14e4-165b", 0),
+	PCI_ROM(0x14e4, 0x167a, "14e4-167a", "14e4-167a", 0),
+	PCI_ROM(0x14e4, 0x167b, "14e4-167b", "14e4-167b", 0),
+	PCI_ROM(0x14e4, 0x167d, "14e4-167d", "14e4-167d", 0),
+	PCI_ROM(0x14e4, 0x167e, "14e4-167e", "14e4-167e", 0),
+	PCI_ROM(0x14e4, 0x167f, "14e4-167f", "14e4-167f", 0),
+	PCI_ROM(0x14e4, 0x1680, "14e4-1680", "14e4-1680", 0),
 	PCI_ROM(0x14e4, 0x1681, "14e4-1681", "14e4-1681", 0),
 	PCI_ROM(0x14e4, 0x1682, "14e4-1682", "14e4-1682", 0),
-	PCI_ROM(0x14e4, 0x1680, "14e4-1680", "14e4-1680", 0),
+	PCI_ROM(0x14e4, 0x1684, "14e4-1684", "14e4-1684", 0),
+	PCI_ROM(0x14e4, 0x1686, "14e4-1686", "14e4-1686", 0),
 	PCI_ROM(0x14e4, 0x1688, "14e4-1688", "14e4-1688", 0),
 	PCI_ROM(0x14e4, 0x1689, "14e4-1689", "14e4-1689", 0),
-	PCI_ROM(0x14e4, 0x1699, "14e4-1699", "14e4-1699", 0),
-	PCI_ROM(0x14e4, 0x16a0, "14e4-16a0", "14e4-16a0", 0),
-	PCI_ROM(0x14e4, 0x1692, "14e4-1692", "14e4-1692", 0),
 	PCI_ROM(0x14e4, 0x1690, "14e4-1690", "14e4-1690", 0),
-	PCI_ROM(0x14e4, 0x1694, "14e4-1694", "14e4-1694", 0),
 	PCI_ROM(0x14e4, 0x1691, "14e4-1691", "14e4-1691", 0),
-	PCI_ROM(0x14e4, 0x1655, "14e4-1655", "14e4-1655", 0),
-	PCI_ROM(0x14e4, 0x1656, "14e4-1656", "14e4-1656", 0),
-	PCI_ROM(0x14e4, 0x16b1, "14e4-16b1", "14e4-16b1", 0),
-	PCI_ROM(0x14e4, 0x16b5, "14e4-16b5", "14e4-16b5", 0),
+	PCI_ROM(0x14e4, 0x1692, "14e4-1692", "14e4-1692", 0),
+	PCI_ROM(0x14e4, 0x1693, "14e4-1693", "14e4-1693", 0),
+	PCI_ROM(0x14e4, 0x1694, "14e4-1694", "14e4-1694", 0),
+	PCI_ROM(0x14e4, 0x1696, "14e4-1696", "14e4-1696", 0),
+	PCI_ROM(0x14e4, 0x1698, "14e4-1698", "14e4-1698", 0),
+	PCI_ROM(0x14e4, 0x1699, "14e4-1699", "14e4-1699", 0),
+	PCI_ROM(0x14e4, 0x169a, "14e4-169a", "14e4-169a", 0),
+	PCI_ROM(0x14e4, 0x169b, "14e4-169b", "14e4-169b", 0),
+	PCI_ROM(0x14e4, 0x169c, "14e4-169c", "14e4-169c", 0),
+	PCI_ROM(0x14e4, 0x169d, "14e4-169d", "14e4-169d", 0),
+	PCI_ROM(0x14e4, 0x16a0, "14e4-16a0", "14e4-16a0", 0),
+	PCI_ROM(0x14e4, 0x16a6, "14e4-16a6", "14e4-16a6", 0),
+	PCI_ROM(0x14e4, 0x16a7, "14e4-16a7", "14e4-16a7", 0),
+	PCI_ROM(0x14e4, 0x16a8, "14e4-16a8", "14e4-16a8", 0),
 	PCI_ROM(0x14e4, 0x16b0, "14e4-16b0", "14e4-16b0", 0),
-	PCI_ROM(0x14e4, 0x16b4, "14e4-16b4", "14e4-16b4", 0),
+	PCI_ROM(0x14e4, 0x16b1, "14e4-16b1", "14e4-16b1", 0),
 	PCI_ROM(0x14e4, 0x16b2, "14e4-16b2", "14e4-16b2", 0),
+	PCI_ROM(0x14e4, 0x16b4, "14e4-16b4", "14e4-16b4", 0),
+	PCI_ROM(0x14e4, 0x16b5, "14e4-16b5", "14e4-16b5", 0),
 	PCI_ROM(0x14e4, 0x16b6, "14e4-16b6", "14e4-16b6", 0),
-	PCI_ROM(0x14e4, 0x1657, "14e4-1657", "14e4-1657", 0),
-	PCI_ROM(0x14e4, 0x165f, "14e4-165f", "14e4-165f", 0),
-	PCI_ROM(0x14e4, 0x1686, "14e4-1686", "14e4-1686", 0),
-	PCI_ROM(0x1148, 0x4400, "1148-4400", "1148-4400", 0),
-	PCI_ROM(0x1148, 0x4500, "1148-4500", "1148-4500", 0),
+	PCI_ROM(0x14e4, 0x16c6, "14e4-16c6", "14e4-16c6", 0),
+	PCI_ROM(0x14e4, 0x16c7, "14e4-16c7", "14e4-16c7", 0),
+	PCI_ROM(0x14e4, 0x16dd, "14e4-16dd", "14e4-16dd", 0),
+	PCI_ROM(0x14e4, 0x16f7, "14e4-16f7", "14e4-16f7", 0),
+	PCI_ROM(0x14e4, 0x16fd, "14e4-16fd", "14e4-16fd", 0),
+	PCI_ROM(0x14e4, 0x16fe, "14e4-16fe", "14e4-16fe", 0),
+	PCI_ROM(0x14e4, 0x170d, "14e4-170d", "14e4-170d", 0),
+	PCI_ROM(0x14e4, 0x170e, "14e4-170e", "14e4-170e", 0),
+	PCI_ROM(0x14e4, 0x1712, "14e4-1712", "14e4-1712", 0),
+	PCI_ROM(0x14e4, 0x1713, "14e4-1713", "14e4-1713", 0),
 	PCI_ROM(0x173b, 0x03e8, "173b-03e8", "173b-03e8", 0),
 	PCI_ROM(0x173b, 0x03e9, "173b-03e9", "173b-03e9", 0),
-	PCI_ROM(0x173b, 0x03eb, "173b-03eb", "173b-03eb", 0),
 	PCI_ROM(0x173b, 0x03ea, "173b-03ea", "173b-03ea", 0),
-	PCI_ROM(0x106b, 0x1645, "106b-1645", "106b-1645", 0),
+	PCI_ROM(0x173b, 0x03eb, "173b-03eb", "173b-03eb", 0),
 };
 
 struct pci_driver tg3_pci_driver __pci_driver = {