Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9961e259 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: psmouse - remove identification strings from DMI tables 



The driver does not reference identification strings in DMI tables and
since these strings are no longer required by DMI core we can safely
remove them and save some memory.

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent c45fc81e

drivers/input/mouse/lifebook.c

+11 −11
Original line number Diff line number Diff line
@@ -46,50 +46,50 @@ static int lifebook_set_6byte_proto(const struct dmi_system_id *d) 
static const struct dmi_system_id __initconst lifebook_dmi_table[] = {

#if defined(CONFIG_DMI) && defined(CONFIG_X86)

	{

		.ident = "FLORA-ie 55mi",

		/* FLORA-ie 55mi */

		.matches = {

			DMI_MATCH(DMI_PRODUCT_NAME, "FLORA-ie 55mi"),

		},

	},

	{

		.ident = "LifeBook B",

		/* LifeBook B */

		.matches = {

			DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B Series"),

		},

	},

	{

		.ident = "Lifebook B",

		/* Lifebook B */

		.matches = {

			DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK B Series"),

		},

	},

	{

		.ident = "Lifebook B-2130",

		/* Lifebook B-2130 */

		.matches = {

			DMI_MATCH(DMI_BOARD_NAME, "ZEPHYR"),

		},

	},

	{

		.ident = "Lifebook B213x/B2150",

		/* Lifebook B213x/B2150 */

		.matches = {

			DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B2131/B2133/B2150"),

		},

	},

	{

		.ident = "Zephyr",

		/* Zephyr */

		.matches = {

			DMI_MATCH(DMI_PRODUCT_NAME, "ZEPHYR"),

		},

	},

	{

		.ident = "CF-18",

		/* Panasonic CF-18 */

		.matches = {

			DMI_MATCH(DMI_PRODUCT_NAME, "CF-18"),

		},

		.callback = lifebook_limit_serio3,

	},

	{

		.ident = "Panasonic CF-28",

		/* Panasonic CF-28 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"),

			DMI_MATCH(DMI_PRODUCT_NAME, "CF-28"),
@@ -97,7 +97,7 @@ static const struct dmi_system_id __initconst lifebook_dmi_table[] = { 
		.callback = lifebook_set_6byte_proto,

	},

	{

		.ident = "Panasonic CF-29",

		/* Panasonic CF-29 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"),

			DMI_MATCH(DMI_PRODUCT_NAME, "CF-29"),
@@ -105,14 +105,14 @@ static const struct dmi_system_id __initconst lifebook_dmi_table[] = { 
		.callback = lifebook_set_6byte_proto,

	},

	{

		.ident = "CF-72",

		/* Panasonic CF-72 */

		.matches = {

			DMI_MATCH(DMI_PRODUCT_NAME, "CF-72"),

		},

		.callback = lifebook_set_6byte_proto,

	},

	{

		.ident = "Lifebook B142",

		/* Lifebook B142 */

		.matches = {

			DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),

		},

drivers/input/mouse/synaptics.c

+4 −4
Original line number Diff line number Diff line
@@ -635,21 +635,21 @@ static bool impaired_toshiba_kbc; 
static const struct dmi_system_id __initconst toshiba_dmi_table[] = {

#if defined(CONFIG_DMI) && defined(CONFIG_X86)

	{

		.ident = "Toshiba Satellite",

		/* Toshiba Satellite */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Satellite"),

		},

	},

	{

		.ident = "Toshiba Dynabook",

		/* Toshiba Dynabook */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

			DMI_MATCH(DMI_PRODUCT_NAME, "dynabook"),

		},

	},

	{

		.ident = "Toshiba Portege M300",

		/* Toshiba Portege M300 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

			DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M300"),
@@ -657,7 +657,7 @@ static const struct dmi_system_id __initconst toshiba_dmi_table[] = { 


	},

	{

		.ident = "Toshiba Portege M300",

		/* Toshiba Portege M300 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"),