|
18 | 18 | #include <linux/module.h>
|
19 | 19 | #include <linux/mutex.h>
|
20 | 20 | #include <linux/nvmem-provider.h>
|
21 |
| -#include <linux/of.h> |
22 |
| -#include <linux/of_device.h> |
23 | 21 | #include <linux/pm_runtime.h>
|
24 | 22 | #include <linux/property.h>
|
25 | 23 | #include <linux/regmap.h>
|
@@ -252,7 +250,7 @@ static const struct i2c_device_id at24_ids[] = {
|
252 | 250 | };
|
253 | 251 | MODULE_DEVICE_TABLE(i2c, at24_ids);
|
254 | 252 |
|
255 |
| -static const struct of_device_id __maybe_unused at24_of_match[] = { |
| 253 | +static const struct of_device_id at24_of_match[] = { |
256 | 254 | { .compatible = "atmel,24c00", .data = &at24_data_24c00 },
|
257 | 255 | { .compatible = "atmel,24c01", .data = &at24_data_24c01 },
|
258 | 256 | { .compatible = "atmel,24cs01", .data = &at24_data_24cs01 },
|
@@ -286,7 +284,7 @@ static const struct of_device_id __maybe_unused at24_of_match[] = {
|
286 | 284 | };
|
287 | 285 | MODULE_DEVICE_TABLE(of, at24_of_match);
|
288 | 286 |
|
289 |
| -static const struct acpi_device_id __maybe_unused at24_acpi_ids[] = { |
| 287 | +static const struct acpi_device_id at24_acpi_ids[] = { |
290 | 288 | { "INT3499", (kernel_ulong_t)&at24_data_INT3499 },
|
291 | 289 | { "TPF0001", (kernel_ulong_t)&at24_data_24c1024 },
|
292 | 290 | { /* END OF LIST */ }
|
@@ -848,8 +846,8 @@ static struct i2c_driver at24_driver = {
|
848 | 846 | .driver = {
|
849 | 847 | .name = "at24",
|
850 | 848 | .pm = &at24_pm_ops,
|
851 |
| - .of_match_table = of_match_ptr(at24_of_match), |
852 |
| - .acpi_match_table = ACPI_PTR(at24_acpi_ids), |
| 849 | + .of_match_table = at24_of_match, |
| 850 | + .acpi_match_table = at24_acpi_ids, |
853 | 851 | },
|
854 | 852 | .probe = at24_probe,
|
855 | 853 | .remove = at24_remove,
|
|
0 commit comments