Commit 680b2f21 authored by Biju Das's avatar Biju Das Committed by Jonathan Cameron

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230818075600.24277-3-biju.das.jz@bp.renesas.comSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 4f9ea93a
...@@ -812,18 +812,6 @@ static const struct iio_info ak8975_info = { ...@@ -812,18 +812,6 @@ static const struct iio_info ak8975_info = {
.read_raw = &ak8975_read_raw, .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) static void ak8975_fill_buffer(struct iio_dev *indio_dev)
{ {
struct ak8975_data *data = iio_priv(indio_dev); struct ak8975_data *data = iio_priv(indio_dev);
...@@ -1061,16 +1049,27 @@ static int ak8975_runtime_resume(struct device *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, static DEFINE_RUNTIME_DEV_PM_OPS(ak8975_dev_pm_ops, ak8975_runtime_suspend,
ak8975_runtime_resume, NULL); 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[] = { 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] },
{"ak8963", (kernel_ulong_t)&ak_def_array[AK8963] },
{"ak8975", (kernel_ulong_t)&ak_def_array[AK8975] },
{"ak09911", (kernel_ulong_t)&ak_def_array[AK09911] }, {"ak09911", (kernel_ulong_t)&ak_def_array[AK09911] },
{"ak09912", (kernel_ulong_t)&ak_def_array[AK09912] }, {"ak09912", (kernel_ulong_t)&ak_def_array[AK09912] },
{"ak09916", (kernel_ulong_t)&ak_def_array[AK09916] }, {"ak09916", (kernel_ulong_t)&ak_def_array[AK09916] },
{} {}
}; };
MODULE_DEVICE_TABLE(i2c, ak8975_id); MODULE_DEVICE_TABLE(i2c, ak8975_id);
static const struct of_device_id ak8975_of_match[] = { static const struct of_device_id ak8975_of_match[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment