linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] input: altera_ps2: Use of_match_ptr
@ 2012-03-07 13:48 Tobias Klauser
  2012-03-17  6:32 ` Dmitry Torokhov
  0 siblings, 1 reply; 2+ messages in thread
From: Tobias Klauser @ 2012-03-07 13:48 UTC (permalink / raw)
  To: Dmitry Torokhov; +Cc: linux-input

Instead of having to define the match table to NULL if CONFIG_OF isn't
set, use the of_match_ptr() macro which will do this for us.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 drivers/input/serio/altera_ps2.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c
index 35864c6..cc11f4e 100644
--- a/drivers/input/serio/altera_ps2.c
+++ b/drivers/input/serio/altera_ps2.c
@@ -180,8 +180,6 @@ static const struct of_device_id altera_ps2_match[] = {
 	{},
 };
 MODULE_DEVICE_TABLE(of, altera_ps2_match);
-#else /* CONFIG_OF */
-#define altera_ps2_match NULL
 #endif /* CONFIG_OF */
 
 /*
@@ -193,7 +191,7 @@ static struct platform_driver altera_ps2_driver = {
 	.driver	= {
 		.name	= DRV_NAME,
 		.owner	= THIS_MODULE,
-		.of_match_table = altera_ps2_match,
+		.of_match_table = of_match_ptr(altera_ps2_match),
 	},
 };
 module_platform_driver(altera_ps2_driver);
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] input: altera_ps2: Use of_match_ptr
  2012-03-07 13:48 [PATCH] input: altera_ps2: Use of_match_ptr Tobias Klauser
@ 2012-03-17  6:32 ` Dmitry Torokhov
  0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2012-03-17  6:32 UTC (permalink / raw)
  To: Tobias Klauser; +Cc: linux-input

On Wed, Mar 07, 2012 at 02:48:07PM +0100, Tobias Klauser wrote:
> Instead of having to define the match table to NULL if CONFIG_OF isn't
> set, use the of_match_ptr() macro which will do this for us.
> 

Applied, thank you.

-- 
Dmitry

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-03-17  6:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-07 13:48 [PATCH] input: altera_ps2: Use of_match_ptr Tobias Klauser
2012-03-17  6:32 ` Dmitry Torokhov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).