Use a named initializer for the acpi_device_id::id field for readability. Also drop setting the list terminator fields explicitly and unify the type of the list terminator to be a single space between the brackets.
Signed-off-by: Pawel Zalewski (The Capable Hub) <[email protected]> --- drivers/acpi/x86/cmos_rtc.c | 2 +- drivers/acpi/x86/lpss.c | 54 ++++++++++++++++++++++----------------------- drivers/acpi/x86/s2idle.c | 14 ++++++------ drivers/acpi/x86/utils.c | 16 +++++++------- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/drivers/acpi/x86/cmos_rtc.c b/drivers/acpi/x86/cmos_rtc.c index ced334e19896..d9891b00d090 100644 --- a/drivers/acpi/x86/cmos_rtc.c +++ b/drivers/acpi/x86/cmos_rtc.c @@ -18,7 +18,7 @@ #include "../internal.h" static const struct acpi_device_id acpi_cmos_rtc_ids[] = { - { "ACPI000E", 1 }, /* ACPI Time and Alarm Device (TAD) */ + { .id = "ACPI000E", .driver_data = 1 }, /* ACPI Time and Alarm Device (TAD) */ ACPI_CMOS_RTC_IDS }; diff --git a/drivers/acpi/x86/lpss.c b/drivers/acpi/x86/lpss.c index 0171eef00484..50b6db40bb18 100644 --- a/drivers/acpi/x86/lpss.c +++ b/drivers/acpi/x86/lpss.c @@ -351,41 +351,41 @@ static const struct x86_cpu_id lpss_cpu_ids[] = { static const struct acpi_device_id acpi_lpss_device_ids[] = { /* Generic LPSS devices */ - { "INTL9C60", LPSS_ADDR(lpss_dma_desc) }, + { .id = "INTL9C60", .driver_data = LPSS_ADDR(lpss_dma_desc) }, /* Lynxpoint LPSS devices */ - { "INT33C0", LPSS_ADDR(lpt_spi_dev_desc) }, - { "INT33C1", LPSS_ADDR(lpt_spi_dev_desc) }, - { "INT33C2", LPSS_ADDR(lpt_i2c_dev_desc) }, - { "INT33C3", LPSS_ADDR(lpt_i2c_dev_desc) }, - { "INT33C4", LPSS_ADDR(lpt_uart_dev_desc) }, - { "INT33C5", LPSS_ADDR(lpt_uart_dev_desc) }, - { "INT33C6", LPSS_ADDR(lpt_sdio_dev_desc) }, + { .id = "INT33C0", .driver_data = LPSS_ADDR(lpt_spi_dev_desc) }, + { .id = "INT33C1", .driver_data = LPSS_ADDR(lpt_spi_dev_desc) }, + { .id = "INT33C2", .driver_data = LPSS_ADDR(lpt_i2c_dev_desc) }, + { .id = "INT33C3", .driver_data = LPSS_ADDR(lpt_i2c_dev_desc) }, + { .id = "INT33C4", .driver_data = LPSS_ADDR(lpt_uart_dev_desc) }, + { .id = "INT33C5", .driver_data = LPSS_ADDR(lpt_uart_dev_desc) }, + { .id = "INT33C6", .driver_data = LPSS_ADDR(lpt_sdio_dev_desc) }, /* BayTrail LPSS devices */ - { "80860F09", LPSS_ADDR(byt_pwm_dev_desc) }, - { "80860F0A", LPSS_ADDR(byt_uart_dev_desc) }, - { "80860F0E", LPSS_ADDR(byt_spi_dev_desc) }, - { "80860F14", LPSS_ADDR(byt_sdio_dev_desc) }, - { "80860F41", LPSS_ADDR(byt_i2c_dev_desc) }, + { .id = "80860F09", .driver_data = LPSS_ADDR(byt_pwm_dev_desc) }, + { .id = "80860F0A", .driver_data = LPSS_ADDR(byt_uart_dev_desc) }, + { .id = "80860F0E", .driver_data = LPSS_ADDR(byt_spi_dev_desc) }, + { .id = "80860F14", .driver_data = LPSS_ADDR(byt_sdio_dev_desc) }, + { .id = "80860F41", .driver_data = LPSS_ADDR(byt_i2c_dev_desc) }, /* Braswell LPSS devices */ - { "80862286", LPSS_ADDR(lpss_dma_desc) }, - { "80862288", LPSS_ADDR(bsw_pwm_dev_desc) }, - { "80862289", LPSS_ADDR(bsw_pwm2_dev_desc) }, - { "8086228A", LPSS_ADDR(bsw_uart_dev_desc) }, - { "8086228E", LPSS_ADDR(bsw_spi_dev_desc) }, - { "808622C0", LPSS_ADDR(lpss_dma_desc) }, - { "808622C1", LPSS_ADDR(bsw_i2c_dev_desc) }, + { .id = "80862286", .driver_data = LPSS_ADDR(lpss_dma_desc) }, + { .id = "80862288", .driver_data = LPSS_ADDR(bsw_pwm_dev_desc) }, + { .id = "80862289", .driver_data = LPSS_ADDR(bsw_pwm2_dev_desc) }, + { .id = "8086228A", .driver_data = LPSS_ADDR(bsw_uart_dev_desc) }, + { .id = "8086228E", .driver_data = LPSS_ADDR(bsw_spi_dev_desc) }, + { .id = "808622C0", .driver_data = LPSS_ADDR(lpss_dma_desc) }, + { .id = "808622C1", .driver_data = LPSS_ADDR(bsw_i2c_dev_desc) }, /* Broadwell LPSS devices */ - { "INT3430", LPSS_ADDR(lpt_spi_dev_desc) }, - { "INT3431", LPSS_ADDR(lpt_spi_dev_desc) }, - { "INT3432", LPSS_ADDR(lpt_i2c_dev_desc) }, - { "INT3433", LPSS_ADDR(lpt_i2c_dev_desc) }, - { "INT3434", LPSS_ADDR(lpt_uart_dev_desc) }, - { "INT3435", LPSS_ADDR(lpt_uart_dev_desc) }, - { "INT3436", LPSS_ADDR(lpt_sdio_dev_desc) }, + { .id = "INT3430", .driver_data = LPSS_ADDR(lpt_spi_dev_desc) }, + { .id = "INT3431", .driver_data = LPSS_ADDR(lpt_spi_dev_desc) }, + { .id = "INT3432", .driver_data = LPSS_ADDR(lpt_i2c_dev_desc) }, + { .id = "INT3433", .driver_data = LPSS_ADDR(lpt_i2c_dev_desc) }, + { .id = "INT3434", .driver_data = LPSS_ADDR(lpt_uart_dev_desc) }, + { .id = "INT3435", .driver_data = LPSS_ADDR(lpt_uart_dev_desc) }, + { .id = "INT3436", .driver_data = LPSS_ADDR(lpt_sdio_dev_desc) }, { } }; diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c index b6b1dd76a06b..64c4e10e71a1 100644 --- a/drivers/acpi/x86/s2idle.c +++ b/drivers/acpi/x86/s2idle.c @@ -33,8 +33,8 @@ module_param(check_lps0_constraints, bool, 0644); MODULE_PARM_DESC(check_lps0_constraints, "Check LPS0 device constraints"); static const struct acpi_device_id lps0_device_ids[] = { - {"PNP0D80", }, - {"", }, + { .id = "PNP0D80" }, + { } }; /* Microsoft platform agnostic UUID */ @@ -431,11 +431,11 @@ static const struct amd_lps0_hid_device_data amd_cezanne = { }; static const struct acpi_device_id amd_hid_ids[] = { - {"AMD0004", (kernel_ulong_t)&amd_picasso, }, - {"AMD0005", (kernel_ulong_t)&amd_picasso, }, - {"AMDI0005", (kernel_ulong_t)&amd_picasso, }, - {"AMDI0006", (kernel_ulong_t)&amd_cezanne, }, - {} + { .id = "AMD0004", .driver_data = (kernel_ulong_t)&amd_picasso }, + { .id = "AMD0005", .driver_data = (kernel_ulong_t)&amd_picasso }, + { .id = "AMDI0005", .driver_data = (kernel_ulong_t)&amd_picasso }, + { .id = "AMDI0006", .driver_data = (kernel_ulong_t)&amd_cezanne }, + { } }; static int lps0_device_attach(struct acpi_device *adev, diff --git a/drivers/acpi/x86/utils.c b/drivers/acpi/x86/utils.c index 418951639f51..35580d77d8af 100644 --- a/drivers/acpi/x86/utils.c +++ b/drivers/acpi/x86/utils.c @@ -463,14 +463,14 @@ static const struct dmi_system_id acpi_quirk_skip_dmi_ids[] = { #if IS_ENABLED(CONFIG_X86_ANDROID_TABLETS) static const struct acpi_device_id i2c_acpi_known_good_ids[] = { - { "10EC5640", 0 }, /* RealTek ALC5640 audio codec */ - { "10EC5651", 0 }, /* RealTek ALC5651 audio codec */ - { "INT33F4", 0 }, /* X-Powers AXP288 PMIC */ - { "INT33F5", 0 }, /* TI Dollar Cove PMIC */ - { "INT33FD", 0 }, /* Intel Crystal Cove PMIC */ - { "INT34D3", 0 }, /* Intel Whiskey Cove PMIC */ - { "NPCE69A", 0 }, /* Asus Transformer keyboard dock */ - {} + { .id = "10EC5640" }, /* RealTek ALC5640 audio codec */ + { .id = "10EC5651" }, /* RealTek ALC5651 audio codec */ + { .id = "INT33F4" }, /* X-Powers AXP288 PMIC */ + { .id = "INT33F5" }, /* TI Dollar Cove PMIC */ + { .id = "INT33FD" }, /* Intel Crystal Cove PMIC */ + { .id = "INT34D3" }, /* Intel Whiskey Cove PMIC */ + { .id = "NPCE69A" }, /* Asus Transformer keyboard dock */ + { } }; bool acpi_quirk_skip_i2c_client_enumeration(struct acpi_device *adev) -- 2.43.0
