iio: magnetometer: ak8975: Sort ID and ACPI tables
authorBiju Das <biju.das.jz@bp.renesas.com>
Fri, 18 Aug 2023 07:55:57 +0000 (08:55 +0100)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Mon, 11 Sep 2023 19:12:42 +0000 (20:12 +0100)
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>
drivers/iio/magnetometer/ak8975.c

index 104798549de1123bfe0d283e3fcfd944be7c6364..8cfceb007936f2e103c5e6239a77d6a5d81305ba 100644 (file)
@@ -812,18 +812,6 @@ static const struct iio_info ak8975_info = {
        .read_raw = &ak8975_read_raw,
 };
 
-static const struct acpi_device_id ak_acpi_match[] = {
-       {"AK8975", (kernel_ulong_t)&ak_def_array[AK8975] },
-       {"AK8963", (kernel_ulong_t)&ak_def_array[AK8963] },
-       {"INVN6500", (kernel_ulong_t)&ak_def_array[AK8963] },
-       {"AK009911", (kernel_ulong_t)&ak_def_array[AK09911] },
-       {"AK09911", (kernel_ulong_t)&ak_def_array[AK09911] },
-       {"AKM9911", (kernel_ulong_t)&ak_def_array[AK09911] },
-       {"AK09912", (kernel_ulong_t)&ak_def_array[AK09912] },
-       { }
-};
-MODULE_DEVICE_TABLE(acpi, ak_acpi_match);
-
 static void ak8975_fill_buffer(struct iio_dev *indio_dev)
 {
        struct ak8975_data *data = iio_priv(indio_dev);
@@ -1061,16 +1049,27 @@ static int ak8975_runtime_resume(struct device *dev)
 static DEFINE_RUNTIME_DEV_PM_OPS(ak8975_dev_pm_ops, ak8975_runtime_suspend,
                                 ak8975_runtime_resume, NULL);
 
+static const struct acpi_device_id ak_acpi_match[] = {
+       {"AK8963", (kernel_ulong_t)&ak_def_array[AK8963] },
+       {"AK8975", (kernel_ulong_t)&ak_def_array[AK8975] },
+       {"AK009911", (kernel_ulong_t)&ak_def_array[AK09911] },
+       {"AK09911", (kernel_ulong_t)&ak_def_array[AK09911] },
+       {"AK09912", (kernel_ulong_t)&ak_def_array[AK09912] },
+       {"AKM9911", (kernel_ulong_t)&ak_def_array[AK09911] },
+       {"INVN6500", (kernel_ulong_t)&ak_def_array[AK8963] },
+       { }
+};
+MODULE_DEVICE_TABLE(acpi, ak_acpi_match);
+
 static const struct i2c_device_id ak8975_id[] = {
-       {"ak8975", (kernel_ulong_t)&ak_def_array[AK8975] },
-       {"ak8963", (kernel_ulong_t)&ak_def_array[AK8963] },
        {"AK8963", (kernel_ulong_t)&ak_def_array[AK8963] },
+       {"ak8963", (kernel_ulong_t)&ak_def_array[AK8963] },
+       {"ak8975", (kernel_ulong_t)&ak_def_array[AK8975] },
        {"ak09911", (kernel_ulong_t)&ak_def_array[AK09911] },
        {"ak09912", (kernel_ulong_t)&ak_def_array[AK09912] },
        {"ak09916", (kernel_ulong_t)&ak_def_array[AK09916] },
        {}
 };
-
 MODULE_DEVICE_TABLE(i2c, ak8975_id);
 
 static const struct of_device_id ak8975_of_match[] = {