tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

iio: magnetometer: ak8975: Sort ID and ACPI tables

Sort ID table alphabetically by name and ACPI table by HID.

While at it, drop blank line before ID table.

Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230818075600.24277-3-biju.das.jz@bp.renesas.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Biju Das and committed by
Jonathan Cameron 680b2f21 4f9ea93a

+15 -16
+15 -16
drivers/iio/magnetometer/ak8975.c
··· 812 812 .read_raw = &ak8975_read_raw, 813 813 }; 814 814 815 - static const struct acpi_device_id ak_acpi_match[] = { 816 - {"AK8975", (kernel_ulong_t)&ak_def_array[AK8975] }, 817 - {"AK8963", (kernel_ulong_t)&ak_def_array[AK8963] }, 818 - {"INVN6500", (kernel_ulong_t)&ak_def_array[AK8963] }, 819 - {"AK009911", (kernel_ulong_t)&ak_def_array[AK09911] }, 820 - {"AK09911", (kernel_ulong_t)&ak_def_array[AK09911] }, 821 - {"AKM9911", (kernel_ulong_t)&ak_def_array[AK09911] }, 822 - {"AK09912", (kernel_ulong_t)&ak_def_array[AK09912] }, 823 - { } 824 - }; 825 - MODULE_DEVICE_TABLE(acpi, ak_acpi_match); 826 - 827 815 static void ak8975_fill_buffer(struct iio_dev *indio_dev) 828 816 { 829 817 struct ak8975_data *data = iio_priv(indio_dev); ··· 1049 1061 static DEFINE_RUNTIME_DEV_PM_OPS(ak8975_dev_pm_ops, ak8975_runtime_suspend, 1050 1062 ak8975_runtime_resume, NULL); 1051 1063 1052 - static const struct i2c_device_id ak8975_id[] = { 1053 - {"ak8975", (kernel_ulong_t)&ak_def_array[AK8975] }, 1054 - {"ak8963", (kernel_ulong_t)&ak_def_array[AK8963] }, 1064 + static const struct acpi_device_id ak_acpi_match[] = { 1055 1065 {"AK8963", (kernel_ulong_t)&ak_def_array[AK8963] }, 1066 + {"AK8975", (kernel_ulong_t)&ak_def_array[AK8975] }, 1067 + {"AK009911", (kernel_ulong_t)&ak_def_array[AK09911] }, 1068 + {"AK09911", (kernel_ulong_t)&ak_def_array[AK09911] }, 1069 + {"AK09912", (kernel_ulong_t)&ak_def_array[AK09912] }, 1070 + {"AKM9911", (kernel_ulong_t)&ak_def_array[AK09911] }, 1071 + {"INVN6500", (kernel_ulong_t)&ak_def_array[AK8963] }, 1072 + { } 1073 + }; 1074 + MODULE_DEVICE_TABLE(acpi, ak_acpi_match); 1075 + 1076 + static const struct i2c_device_id ak8975_id[] = { 1077 + {"AK8963", (kernel_ulong_t)&ak_def_array[AK8963] }, 1078 + {"ak8963", (kernel_ulong_t)&ak_def_array[AK8963] }, 1079 + {"ak8975", (kernel_ulong_t)&ak_def_array[AK8975] }, 1056 1080 {"ak09911", (kernel_ulong_t)&ak_def_array[AK09911] }, 1057 1081 {"ak09912", (kernel_ulong_t)&ak_def_array[AK09912] }, 1058 1082 {"ak09916", (kernel_ulong_t)&ak_def_array[AK09916] }, 1059 1083 {} 1060 1084 }; 1061 - 1062 1085 MODULE_DEVICE_TABLE(i2c, ak8975_id); 1063 1086 1064 1087 static const struct of_device_id ak8975_of_match[] = {