mirror of
https://github.com/torvalds/linux.git
synced 2026-11-07 06:17:02 +01:00
Input: touchscreen - use named initializers for acpi_device_id
Use a designated initializer for the acpi_device_id fields which makes the code more readable and consistent with how lists are initialized in the rest of the kernel code base. Also drop explicitly setting fields to 0 where it is redundant. Unify the list terminator to have a single space between the brackets and no trailing comma. Signed-off-by: Pawel Zalewski <pzalewski@thegoodpenguin.co.uk> Link: https://patch.msgid.link/20261013-acpi-input-v1-4-53ad09ba82b7@thegoodpenguin.co.uk Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
parent
4aaa4f16c9
commit
29ee387509
|
|
@ -3409,8 +3409,8 @@ MODULE_DEVICE_TABLE(of, mxt_of_match);
|
|||
|
||||
#ifdef CONFIG_ACPI
|
||||
static const struct acpi_device_id mxt_acpi_id[] = {
|
||||
{ "ATML0000", 0 }, /* Touchpad */
|
||||
{ "ATML0001", 0 }, /* Touchscreen */
|
||||
{ .id = "ATML0000" }, /* Touchpad */
|
||||
{ .id = "ATML0001" }, /* Touchscreen */
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(acpi, mxt_acpi_id);
|
||||
|
|
|
|||
|
|
@ -486,7 +486,7 @@ static int icn8505_resume(struct device *dev)
|
|||
static DEFINE_SIMPLE_DEV_PM_OPS(icn8505_pm_ops, icn8505_suspend, icn8505_resume);
|
||||
|
||||
static const struct acpi_device_id icn8505_acpi_match[] = {
|
||||
{ "CHPN0001" },
|
||||
{ .id = "CHPN0001" },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(acpi, icn8505_acpi_match);
|
||||
|
|
|
|||
|
|
@ -1360,9 +1360,9 @@ static void elants_i2c_power_off(void *_data)
|
|||
|
||||
#ifdef CONFIG_ACPI
|
||||
static const struct acpi_device_id i2c_hid_ids[] = {
|
||||
{"ACPI0C50", 0 },
|
||||
{"PNP0C50", 0 },
|
||||
{ },
|
||||
{ .id = "ACPI0C50" },
|
||||
{ .id = "PNP0C50" },
|
||||
{ }
|
||||
};
|
||||
|
||||
static const guid_t i2c_hid_guid =
|
||||
|
|
@ -1624,7 +1624,7 @@ MODULE_DEVICE_TABLE(i2c, elants_i2c_id);
|
|||
|
||||
#ifdef CONFIG_ACPI
|
||||
static const struct acpi_device_id elants_acpi_id[] = {
|
||||
{ "ELAN0001", EKTH3500 },
|
||||
{ .id = "ELAN0001", .driver_data = EKTH3500 },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(acpi, elants_acpi_id);
|
||||
|
|
|
|||
|
|
@ -453,7 +453,7 @@ MODULE_DEVICE_TABLE(of, exc3000_of_match);
|
|||
|
||||
#ifdef CONFIG_ACPI
|
||||
static const struct acpi_device_id exc3000_acpi_match[] = {
|
||||
{ "EGA00001", .driver_data = (kernel_ulong_t)&exc3000_info[EETI_EXC80H60] },
|
||||
{ .id = "EGA00001", .driver_data = (kernel_ulong_t)&exc3000_info[EETI_EXC80H60] },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(acpi, exc3000_acpi_match);
|
||||
|
|
|
|||
|
|
@ -1531,10 +1531,10 @@ MODULE_DEVICE_TABLE(i2c, goodix_ts_id);
|
|||
|
||||
#ifdef CONFIG_ACPI
|
||||
static const struct acpi_device_id goodix_acpi_match[] = {
|
||||
{ "GDIX1001", 0 },
|
||||
{ "GDIX1002", 0 },
|
||||
{ "GDIX1003", 0 },
|
||||
{ "GDX9110", 0 },
|
||||
{ .id = "GDIX1001" },
|
||||
{ .id = "GDIX1002" },
|
||||
{ .id = "GDIX1003" },
|
||||
{ .id = "GDX9110" },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(acpi, goodix_acpi_match);
|
||||
|
|
|
|||
|
|
@ -1088,7 +1088,7 @@ MODULE_DEVICE_TABLE(i2c, hideep_i2c_id);
|
|||
|
||||
#ifdef CONFIG_ACPI
|
||||
static const struct acpi_device_id hideep_acpi_id[] = {
|
||||
{ "HIDP0001", 0 },
|
||||
{ .id = "HIDP0001" },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(acpi, hideep_acpi_id);
|
||||
|
|
|
|||
|
|
@ -646,8 +646,8 @@ MODULE_DEVICE_TABLE(i2c, ilitek_ts_i2c_id);
|
|||
|
||||
#ifdef CONFIG_ACPI
|
||||
static const struct acpi_device_id ilitekts_acpi_id[] = {
|
||||
{ "ILTK0001", 0 },
|
||||
{ },
|
||||
{ .id = "ILTK0001" },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(acpi, ilitekts_acpi_id);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1529,8 +1529,8 @@ MODULE_DEVICE_TABLE(of, mip4_of_match);
|
|||
|
||||
#ifdef CONFIG_ACPI
|
||||
static const struct acpi_device_id mip4_acpi_match[] = {
|
||||
{ "MLFS0000", 0},
|
||||
{ },
|
||||
{ .id = "MLFS0000" },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(acpi, mip4_acpi_match);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1227,8 +1227,8 @@ MODULE_DEVICE_TABLE(i2c, raydium_i2c_id);
|
|||
|
||||
#ifdef CONFIG_ACPI
|
||||
static const struct acpi_device_id raydium_acpi_id[] = {
|
||||
{ "RAYD0001", 0 },
|
||||
{ /* sentinel */ }
|
||||
{ .id = "RAYD0001" },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(acpi, raydium_acpi_id);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -788,15 +788,15 @@ MODULE_DEVICE_TABLE(i2c, silead_ts_id);
|
|||
|
||||
#ifdef CONFIG_ACPI
|
||||
static const struct acpi_device_id silead_ts_acpi_match[] = {
|
||||
{ "GSL1680", 0 },
|
||||
{ "GSL1688", 0 },
|
||||
{ "GSL3670", 0 },
|
||||
{ "GSL3675", 0 },
|
||||
{ "GSL3692", 0 },
|
||||
{ "MSSL1680", 0 },
|
||||
{ "MSSL0001", 0 },
|
||||
{ "MSSL0002", 0 },
|
||||
{ "MSSL0017", 0 },
|
||||
{ .id = "GSL1680" },
|
||||
{ .id = "GSL1688" },
|
||||
{ .id = "GSL3670" },
|
||||
{ .id = "GSL3675" },
|
||||
{ .id = "GSL3692" },
|
||||
{ .id = "MSSL1680" },
|
||||
{ .id = "MSSL0001" },
|
||||
{ .id = "MSSL0002" },
|
||||
{ .id = "MSSL0017" },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(acpi, silead_ts_acpi_match);
|
||||
|
|
|
|||
|
|
@ -392,7 +392,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(surface3_spi_pm_ops,
|
|||
|
||||
#ifdef CONFIG_ACPI
|
||||
static const struct acpi_device_id surface3_spi_acpi_match[] = {
|
||||
{ "MSHW0037", 0 },
|
||||
{ .id = "MSHW0037" },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(acpi, surface3_spi_acpi_match);
|
||||
|
|
|
|||
|
|
@ -1147,7 +1147,7 @@ MODULE_DEVICE_TABLE(i2c, wdt87xx_dev_id);
|
|||
|
||||
#ifdef CONFIG_ACPI
|
||||
static const struct acpi_device_id wdt87xx_acpi_id[] = {
|
||||
{ "WDHT0001", 0 },
|
||||
{ .id = "WDHT0001" },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(acpi, wdt87xx_acpi_id);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user