aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-12-04 13:24:19 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-12-05 01:11:37 -0500
commitc45fc81ec6a9bd6cca42e60b35b31f9df822860b (patch)
treef07b66d0df18ef1399af627f671e96e8cab3c83d /drivers/input
parentf909b1df0a068f30e252d8dc3e9d45ca25bf266f (diff)
Input: atkbd - remove identification strings from DMI table
The driver does not reference identification strings in DMI table and since these strings are no longer required by DMI core we can safely remove them and save some memory. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/atkbd.c26
1 files changed, 9 insertions, 17 deletions
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 28e6110d1ff8..a3573570c52f 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -1567,9 +1567,8 @@ static int __init atkbd_setup_scancode_fixup(const struct dmi_system_id *id)
1567 return 0; 1567 return 0;
1568} 1568}
1569 1569
1570static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = { 1570static const struct dmi_system_id atkbd_dmi_quirk_table[] __initconst = {
1571 { 1571 {
1572 .ident = "Dell Laptop",
1573 .matches = { 1572 .matches = {
1574 DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), 1573 DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
1575 DMI_MATCH(DMI_CHASSIS_TYPE, "8"), /* Portable */ 1574 DMI_MATCH(DMI_CHASSIS_TYPE, "8"), /* Portable */
@@ -1578,7 +1577,6 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
1578 .driver_data = atkbd_dell_laptop_forced_release_keys, 1577 .driver_data = atkbd_dell_laptop_forced_release_keys,
1579 }, 1578 },
1580 { 1579 {
1581 .ident = "Dell Laptop",
1582 .matches = { 1580 .matches = {
1583 DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), 1581 DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
1584 DMI_MATCH(DMI_CHASSIS_TYPE, "8"), /* Portable */ 1582 DMI_MATCH(DMI_CHASSIS_TYPE, "8"), /* Portable */
@@ -1587,7 +1585,6 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
1587 .driver_data = atkbd_dell_laptop_forced_release_keys, 1585 .driver_data = atkbd_dell_laptop_forced_release_keys,
1588 }, 1586 },
1589 { 1587 {
1590 .ident = "HP 2133",
1591 .matches = { 1588 .matches = {
1592 DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), 1589 DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
1593 DMI_MATCH(DMI_PRODUCT_NAME, "HP 2133"), 1590 DMI_MATCH(DMI_PRODUCT_NAME, "HP 2133"),
@@ -1596,7 +1593,6 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
1596 .driver_data = atkbd_hp_forced_release_keys, 1593 .driver_data = atkbd_hp_forced_release_keys,
1597 }, 1594 },
1598 { 1595 {
1599 .ident = "HP Pavilion ZV6100",
1600 .matches = { 1596 .matches = {
1601 DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), 1597 DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
1602 DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion ZV6100"), 1598 DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion ZV6100"),
@@ -1605,7 +1601,6 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
1605 .driver_data = atkbd_volume_forced_release_keys, 1601 .driver_data = atkbd_volume_forced_release_keys,
1606 }, 1602 },
1607 { 1603 {
1608 .ident = "HP Presario R4000",
1609 .matches = { 1604 .matches = {
1610 DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), 1605 DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
1611 DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4000"), 1606 DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4000"),
@@ -1614,7 +1609,6 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
1614 .driver_data = atkbd_volume_forced_release_keys, 1609 .driver_data = atkbd_volume_forced_release_keys,
1615 }, 1610 },
1616 { 1611 {
1617 .ident = "HP Presario R4100",
1618 .matches = { 1612 .matches = {
1619 DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), 1613 DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
1620 DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4100"), 1614 DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4100"),
@@ -1623,7 +1617,6 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
1623 .driver_data = atkbd_volume_forced_release_keys, 1617 .driver_data = atkbd_volume_forced_release_keys,
1624 }, 1618 },
1625 { 1619 {
1626 .ident = "HP Presario R4200",
1627 .matches = { 1620 .matches = {
1628 DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), 1621 DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
1629 DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4200"), 1622 DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4200"),
@@ -1632,7 +1625,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
1632 .driver_data = atkbd_volume_forced_release_keys, 1625 .driver_data = atkbd_volume_forced_release_keys,
1633 }, 1626 },
1634 { 1627 {
1635 .ident = "Inventec Symphony", 1628 /* Inventec Symphony */
1636 .matches = { 1629 .matches = {
1637 DMI_MATCH(DMI_SYS_VENDOR, "INVENTEC"), 1630 DMI_MATCH(DMI_SYS_VENDOR, "INVENTEC"),
1638 DMI_MATCH(DMI_PRODUCT_NAME, "SYMPHONY 6.0/7.0"), 1631 DMI_MATCH(DMI_PRODUCT_NAME, "SYMPHONY 6.0/7.0"),
@@ -1641,7 +1634,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
1641 .driver_data = atkbd_volume_forced_release_keys, 1634 .driver_data = atkbd_volume_forced_release_keys,
1642 }, 1635 },
1643 { 1636 {
1644 .ident = "Samsung NC10", 1637 /* Samsung NC10 */
1645 .matches = { 1638 .matches = {
1646 DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), 1639 DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
1647 DMI_MATCH(DMI_PRODUCT_NAME, "NC10"), 1640 DMI_MATCH(DMI_PRODUCT_NAME, "NC10"),
@@ -1650,7 +1643,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
1650 .driver_data = atkbd_samsung_forced_release_keys, 1643 .driver_data = atkbd_samsung_forced_release_keys,
1651 }, 1644 },
1652 { 1645 {
1653 .ident = "Samsung NC20", 1646 /* Samsung NC20 */
1654 .matches = { 1647 .matches = {
1655 DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), 1648 DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
1656 DMI_MATCH(DMI_PRODUCT_NAME, "NC20"), 1649 DMI_MATCH(DMI_PRODUCT_NAME, "NC20"),
@@ -1659,7 +1652,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
1659 .driver_data = atkbd_samsung_forced_release_keys, 1652 .driver_data = atkbd_samsung_forced_release_keys,
1660 }, 1653 },
1661 { 1654 {
1662 .ident = "Samsung SQ45S70S", 1655 /* Samsung SQ45S70S */
1663 .matches = { 1656 .matches = {
1664 DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), 1657 DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
1665 DMI_MATCH(DMI_PRODUCT_NAME, "SQ45S70S"), 1658 DMI_MATCH(DMI_PRODUCT_NAME, "SQ45S70S"),
@@ -1668,7 +1661,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
1668 .driver_data = atkbd_samsung_forced_release_keys, 1661 .driver_data = atkbd_samsung_forced_release_keys,
1669 }, 1662 },
1670 { 1663 {
1671 .ident = "Fujitsu Amilo PA 1510", 1664 /* Fujitsu Amilo PA 1510 */
1672 .matches = { 1665 .matches = {
1673 DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), 1666 DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
1674 DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pa 1510"), 1667 DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pa 1510"),
@@ -1677,7 +1670,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
1677 .driver_data = atkbd_volume_forced_release_keys, 1670 .driver_data = atkbd_volume_forced_release_keys,
1678 }, 1671 },
1679 { 1672 {
1680 .ident = "Fujitsu Amilo Pi 3525", 1673 /* Fujitsu Amilo Pi 3525 */
1681 .matches = { 1674 .matches = {
1682 DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), 1675 DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
1683 DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pi 3525"), 1676 DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pi 3525"),
@@ -1686,7 +1679,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
1686 .driver_data = atkbd_amilo_pi3525_forced_release_keys, 1679 .driver_data = atkbd_amilo_pi3525_forced_release_keys,
1687 }, 1680 },
1688 { 1681 {
1689 .ident = "Fujitsu Amilo Xi 3650", 1682 /* Fujitsu Amilo Xi 3650 */
1690 .matches = { 1683 .matches = {
1691 DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), 1684 DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
1692 DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xi 3650"), 1685 DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xi 3650"),
@@ -1695,7 +1688,6 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
1695 .driver_data = atkbd_amilo_xi3650_forced_release_keys, 1688 .driver_data = atkbd_amilo_xi3650_forced_release_keys,
1696 }, 1689 },
1697 { 1690 {
1698 .ident = "Soltech Corporation TA12",
1699 .matches = { 1691 .matches = {
1700 DMI_MATCH(DMI_SYS_VENDOR, "Soltech Corporation"), 1692 DMI_MATCH(DMI_SYS_VENDOR, "Soltech Corporation"),
1701 DMI_MATCH(DMI_PRODUCT_NAME, "TA12"), 1693 DMI_MATCH(DMI_PRODUCT_NAME, "TA12"),
@@ -1704,7 +1696,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
1704 .driver_data = atkdb_soltech_ta12_forced_release_keys, 1696 .driver_data = atkdb_soltech_ta12_forced_release_keys,
1705 }, 1697 },
1706 { 1698 {
1707 .ident = "OQO Model 01+", 1699 /* OQO Model 01+ */
1708 .matches = { 1700 .matches = {
1709 DMI_MATCH(DMI_SYS_VENDOR, "OQO"), 1701 DMI_MATCH(DMI_SYS_VENDOR, "OQO"),
1710 DMI_MATCH(DMI_PRODUCT_NAME, "ZEPTO"), 1702 DMI_MATCH(DMI_PRODUCT_NAME, "ZEPTO"),