ata: use named initializers for acpi_device_id

Use a named 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.

While we are at it - unify the list terminator to have a single space
between the brackets and no trailing comma.

Signed-off-by: Pawel Zalewski (The Capable Hub) <pzalewski@thegoodpenguin.co.uk>
Reviewed-by: Niklas Cassel <cassel@kernel.org>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
This commit is contained in:
Pawel Zalewski (The Capable Hub)
2026-08-04 10:44:26 +01:00
committed by Damien Le Moal
parent c303c3619a
commit 73b6bf3c31
4 changed files with 8 additions and 8 deletions

View File

@@ -87,9 +87,9 @@ static const struct of_device_id ahci_of_match[] = {
MODULE_DEVICE_TABLE(of, ahci_of_match);
static const struct acpi_device_id ahci_acpi_match[] = {
{ "APMC0D33", (unsigned long)&ahci_port_info_nolpm },
{ .id = "APMC0D33", .driver_data = (unsigned long)&ahci_port_info_nolpm },
{ ACPI_DEVICE_CLASS(PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff) },
{},
{ }
};
MODULE_DEVICE_TABLE(acpi, ahci_acpi_match);

View File

@@ -80,7 +80,7 @@ static const struct of_device_id ahci_qoriq_of_match[] = {
MODULE_DEVICE_TABLE(of, ahci_qoriq_of_match);
static const struct acpi_device_id ahci_qoriq_acpi_match[] = {
{"NXP0004", .driver_data = (kernel_ulong_t)AHCI_LX2160A},
{ .id = "NXP0004", .driver_data = (kernel_ulong_t)AHCI_LX2160A },
{ }
};
MODULE_DEVICE_TABLE(acpi, ahci_qoriq_acpi_match);

View File

@@ -178,8 +178,8 @@ static SIMPLE_DEV_PM_OPS(ahci_pm_ops, ahci_platform_suspend,
ahci_platform_resume);
static const struct acpi_device_id ahci_acpi_match[] = {
{ "AMDI0600", 0 },
{}
{ .id = "AMDI0600" },
{ }
};
MODULE_DEVICE_TABLE(acpi, ahci_acpi_match);

View File

@@ -710,9 +710,9 @@ static const struct scsi_host_template ahci_platform_sht = {
#ifdef CONFIG_ACPI
static const struct acpi_device_id xgene_ahci_acpi_match[] = {
{ "APMC0D0D", XGENE_AHCI_V1},
{ "APMC0D32", XGENE_AHCI_V2},
{},
{ .id = "APMC0D0D", .driver_data = XGENE_AHCI_V1 },
{ .id = "APMC0D32", .driver_data = XGENE_AHCI_V2 },
{ }
};
MODULE_DEVICE_TABLE(acpi, xgene_ahci_acpi_match);
#endif