Commit 936db833 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'redundant-of_match_ptr' 



Ruan Jinjie says:

====================
net: Remove redundant of_match_ptr() macro

Since these net drivers depend on CONFIG_OF, there is
no need to wrap the macro of_match_ptr() here.

Changes in v3:
- Collect responses from v1 and v2.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 61a9b174 cf2abd87

drivers/net/dsa/realtek/realtek-mdio.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ MODULE_DEVICE_TABLE(of, realtek_mdio_of_match); 
static struct mdio_driver realtek_mdio_driver = {

	.mdiodrv.driver = {

		.name = "realtek-mdio",

		.of_match_table = of_match_ptr(realtek_mdio_of_match),

		.of_match_table = realtek_mdio_of_match,

	},

	.probe  = realtek_mdio_probe,

	.remove = realtek_mdio_remove,

drivers/net/dsa/realtek/realtek-smi.c

+1 −1
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ MODULE_DEVICE_TABLE(of, realtek_smi_of_match); 
static struct platform_driver realtek_smi_driver = {

	.driver = {

		.name = "realtek-smi",

		.of_match_table = of_match_ptr(realtek_smi_of_match),

		.of_match_table = realtek_smi_of_match,

	},

	.probe  = realtek_smi_probe,

	.remove = realtek_smi_remove,

drivers/net/dsa/rzn1_a5psw.c

+1 −1
Original line number Diff line number Diff line
@@ -1314,7 +1314,7 @@ MODULE_DEVICE_TABLE(of, a5psw_of_mtable); 
static struct platform_driver a5psw_driver = {

	.driver = {

		.name	 = "rzn1_a5psw",

		.of_match_table = of_match_ptr(a5psw_of_mtable),

		.of_match_table = a5psw_of_mtable,

	},

	.probe = a5psw_probe,

	.remove = a5psw_remove,

drivers/net/ethernet/cortina/gemini.c

+2 −2
Original line number Diff line number Diff line
@@ -2538,7 +2538,7 @@ MODULE_DEVICE_TABLE(of, gemini_ethernet_port_of_match); 
static struct platform_driver gemini_ethernet_port_driver = {

	.driver = {

		.name = "gemini-ethernet-port",

		.of_match_table = of_match_ptr(gemini_ethernet_port_of_match),

		.of_match_table = gemini_ethernet_port_of_match,

	},

	.probe = gemini_ethernet_port_probe,

	.remove = gemini_ethernet_port_remove,
@@ -2604,7 +2604,7 @@ MODULE_DEVICE_TABLE(of, gemini_ethernet_of_match); 
static struct platform_driver gemini_ethernet_driver = {

	.driver = {

		.name = DRV_NAME,

		.of_match_table = of_match_ptr(gemini_ethernet_of_match),

		.of_match_table = gemini_ethernet_of_match,

	},

	.probe = gemini_ethernet_probe,

	.remove = gemini_ethernet_remove,

drivers/net/ethernet/qualcomm/qca_uart.c

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ static struct serdev_device_driver qca_uart_driver = { 
	.remove = qca_uart_remove,

	.driver = {

		.name = QCAUART_DRV_NAME,

		.of_match_table = of_match_ptr(qca_uart_of_match),

		.of_match_table = qca_uart_of_match,

	},

};