Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85888069 authored by Ben Dooks's avatar Ben Dooks Committed by Grant Likely
Browse files

tty: use of_match_ptr() for of_match_table entry 



Use the new of_match_ptr() macro for the of_match_table
pointer entry to avoid having to #dfine match NULL

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 3a1e362e

drivers/tty/serial/altera_jtaguart.c

+1 −3
Original line number Diff line number Diff line
@@ -472,8 +472,6 @@ static struct of_device_id altera_jtaguart_match[] = { 
	{},

};

MODULE_DEVICE_TABLE(of, altera_jtaguart_match);

#else

#define altera_jtaguart_match NULL

#endif /* CONFIG_OF */



static struct platform_driver altera_jtaguart_platform_driver = {
@@ -482,7 +480,7 @@ static struct platform_driver altera_jtaguart_platform_driver = { 
	.driver	= {

		.name		= DRV_NAME,

		.owner		= THIS_MODULE,

		.of_match_table	= altera_jtaguart_match,

		.of_match_table	= of_match_ptr(altera_jtaguart_match),

	},

};

drivers/tty/serial/altera_uart.c

+1 −3
Original line number Diff line number Diff line
@@ -616,8 +616,6 @@ static struct of_device_id altera_uart_match[] = { 
	{},

};

MODULE_DEVICE_TABLE(of, altera_uart_match);

#else

#define altera_uart_match NULL

#endif /* CONFIG_OF */



static struct platform_driver altera_uart_platform_driver = {
@@ -626,7 +624,7 @@ static struct platform_driver altera_uart_platform_driver = { 
	.driver	= {

		.name		= DRV_NAME,

		.owner		= THIS_MODULE,

		.of_match_table	= altera_uart_match,

		.of_match_table	= of_match_ptr(altera_uart_match),

	},

};

drivers/tty/serial/uartlite.c

+1 −3
Original line number Diff line number Diff line
@@ -568,8 +568,6 @@ static struct of_device_id ulite_of_match[] __devinitdata = { 
	{}

};

MODULE_DEVICE_TABLE(of, ulite_of_match);

#else /* CONFIG_OF */

#define ulite_of_match NULL

#endif /* CONFIG_OF */



static int __devinit ulite_probe(struct platform_device *pdev)
@@ -609,7 +607,7 @@ static struct platform_driver ulite_platform_driver = { 
	.driver = {

		.owner = THIS_MODULE,

		.name  = "uartlite",

		.of_match_table = ulite_of_match,

		.of_match_table = of_match_ptr(ulite_of_match),

	},

};