aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-03-14 06:01:51 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-01 09:27:14 -0400
commit691ee4edd410dd6f19227642e01a93fb88620eff (patch)
tree26fc10b2e2573949f9c3fdc6c67bd9675712432d /drivers/spi
parent9547acce669ec7b5613eb9be0838bff47258ccbf (diff)
spi: spi-sh-msiof: Use of_match_ptr() macro
This eliminates having an #ifdef returning NULL for the case when OF is disabled. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-sh-msiof.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index 8b40d0884f8b..2bc5a6b86300 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -764,8 +764,6 @@ static const struct of_device_id sh_msiof_match[] = {
764 {}, 764 {},
765}; 765};
766MODULE_DEVICE_TABLE(of, sh_msiof_match); 766MODULE_DEVICE_TABLE(of, sh_msiof_match);
767#else
768#define sh_msiof_match NULL
769#endif 767#endif
770 768
771static struct dev_pm_ops sh_msiof_spi_dev_pm_ops = { 769static struct dev_pm_ops sh_msiof_spi_dev_pm_ops = {
@@ -780,7 +778,7 @@ static struct platform_driver sh_msiof_spi_drv = {
780 .name = "spi_sh_msiof", 778 .name = "spi_sh_msiof",
781 .owner = THIS_MODULE, 779 .owner = THIS_MODULE,
782 .pm = &sh_msiof_spi_dev_pm_ops, 780 .pm = &sh_msiof_spi_dev_pm_ops,
783 .of_match_table = sh_msiof_match, 781 .of_match_table = of_match_ptr(sh_msiof_match),
784 }, 782 },
785}; 783};
786module_platform_driver(sh_msiof_spi_drv); 784module_platform_driver(sh_msiof_spi_drv);