Web lists-archives.com

[PATCH 2/3] drivers: block: xsysace: use MODULE_OF_TABLE() and of_match_ptr()




Using MODULE_OF_TABLE() and of_match_ptr() macros to get rid of
some #ifdef CONFIG_OF and thus make the code a bit slimmer.

These macros already check whether CONFIG_OF is set and if it's
not, just no-op. The compiler then should be able to optimize-
away unreferenced structs.

Signed-off-by: Enrico Weigelt, metux IT consult <info@xxxxxxxxx>
---
 drivers/block/xsysace.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index 464c9092..6ebd656 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -1219,7 +1219,6 @@ static int ace_remove(struct platform_device *dev)
 	return 0;
 }
 
-#if defined(CONFIG_OF)
 /* Match table for of_platform binding */
 static const struct of_device_id ace_of_match[] = {
 	{ .compatible = "xlnx,opb-sysace-1.00.b", },
@@ -1228,17 +1227,14 @@ static int ace_remove(struct platform_device *dev)
 	{ .compatible = "xlnx,sysace", },
 	{},
 };
-MODULE_DEVICE_TABLE(of, ace_of_match);
-#else /* CONFIG_OF */
-#define ace_of_match NULL
-#endif /* CONFIG_OF */
+MODULE_OF_TABLE(ace_of_match);
 
 static struct platform_driver ace_platform_driver = {
 	.probe = ace_probe,
 	.remove = ace_remove,
 	.driver = {
 		.name = "xsysace",
-		.of_match_table = ace_of_match,
+		.of_match_table = of_match_ptr(ace_of_match),
 	},
 };
 
-- 
1.9.1