diff options
author | Andrew F. Davis <afd@ti.com> | 2016-05-01 16:36:52 -0400 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2016-05-04 05:59:04 -0400 |
commit | daffd7a75c7e878845ddae8e16d9dc76eea7e2d2 (patch) | |
tree | 96818ffe8d03e741e4c7ec5daf9d4fc7d159f045 /drivers/iio | |
parent | f59e6b5ae0a9dd94ac9a3d5d95f8650649343dc3 (diff) |
iio: health/afe440x: Remove of_match_ptr and ifdefs
The drivers DT tables are not built-in when OF is not enabled, this does
not save us enough to justify ugly ifdefs. Clean this up.
Signed-off-by: Andrew F. Davis <afd@ti.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio')
-rw-r--r-- | drivers/iio/health/afe4403.c | 4 | ||||
-rw-r--r-- | drivers/iio/health/afe4404.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/iio/health/afe4403.c b/drivers/iio/health/afe4403.c index 209411332665..e3700cfec23d 100644 --- a/drivers/iio/health/afe4403.c +++ b/drivers/iio/health/afe4403.c | |||
@@ -498,13 +498,11 @@ static const struct regmap_config afe4403_regmap_config = { | |||
498 | .volatile_table = &afe4403_volatile_table, | 498 | .volatile_table = &afe4403_volatile_table, |
499 | }; | 499 | }; |
500 | 500 | ||
501 | #ifdef CONFIG_OF | ||
502 | static const struct of_device_id afe4403_of_match[] = { | 501 | static const struct of_device_id afe4403_of_match[] = { |
503 | { .compatible = "ti,afe4403", }, | 502 | { .compatible = "ti,afe4403", }, |
504 | { /* sentinel */ } | 503 | { /* sentinel */ } |
505 | }; | 504 | }; |
506 | MODULE_DEVICE_TABLE(of, afe4403_of_match); | 505 | MODULE_DEVICE_TABLE(of, afe4403_of_match); |
507 | #endif | ||
508 | 506 | ||
509 | static int __maybe_unused afe4403_suspend(struct device *dev) | 507 | static int __maybe_unused afe4403_suspend(struct device *dev) |
510 | { | 508 | { |
@@ -694,7 +692,7 @@ MODULE_DEVICE_TABLE(spi, afe4403_ids); | |||
694 | static struct spi_driver afe4403_spi_driver = { | 692 | static struct spi_driver afe4403_spi_driver = { |
695 | .driver = { | 693 | .driver = { |
696 | .name = AFE4403_DRIVER_NAME, | 694 | .name = AFE4403_DRIVER_NAME, |
697 | .of_match_table = of_match_ptr(afe4403_of_match), | 695 | .of_match_table = afe4403_of_match, |
698 | .pm = &afe4403_pm_ops, | 696 | .pm = &afe4403_pm_ops, |
699 | }, | 697 | }, |
700 | .probe = afe4403_probe, | 698 | .probe = afe4403_probe, |
diff --git a/drivers/iio/health/afe4404.c b/drivers/iio/health/afe4404.c index 7127d038b512..783b9b437716 100644 --- a/drivers/iio/health/afe4404.c +++ b/drivers/iio/health/afe4404.c | |||
@@ -469,13 +469,11 @@ static const struct regmap_config afe4404_regmap_config = { | |||
469 | .volatile_table = &afe4404_volatile_table, | 469 | .volatile_table = &afe4404_volatile_table, |
470 | }; | 470 | }; |
471 | 471 | ||
472 | #ifdef CONFIG_OF | ||
473 | static const struct of_device_id afe4404_of_match[] = { | 472 | static const struct of_device_id afe4404_of_match[] = { |
474 | { .compatible = "ti,afe4404", }, | 473 | { .compatible = "ti,afe4404", }, |
475 | { /* sentinel */ } | 474 | { /* sentinel */ } |
476 | }; | 475 | }; |
477 | MODULE_DEVICE_TABLE(of, afe4404_of_match); | 476 | MODULE_DEVICE_TABLE(of, afe4404_of_match); |
478 | #endif | ||
479 | 477 | ||
480 | static int __maybe_unused afe4404_suspend(struct device *dev) | 478 | static int __maybe_unused afe4404_suspend(struct device *dev) |
481 | { | 479 | { |
@@ -665,7 +663,7 @@ MODULE_DEVICE_TABLE(i2c, afe4404_ids); | |||
665 | static struct i2c_driver afe4404_i2c_driver = { | 663 | static struct i2c_driver afe4404_i2c_driver = { |
666 | .driver = { | 664 | .driver = { |
667 | .name = AFE4404_DRIVER_NAME, | 665 | .name = AFE4404_DRIVER_NAME, |
668 | .of_match_table = of_match_ptr(afe4404_of_match), | 666 | .of_match_table = afe4404_of_match, |
669 | .pm = &afe4404_pm_ops, | 667 | .pm = &afe4404_pm_ops, |
670 | }, | 668 | }, |
671 | .probe = afe4404_probe, | 669 | .probe = afe4404_probe, |