Unverified Commit 690f5c8d authored by Mark Brown's avatar Mark Brown
Browse files

sound: Remove redundant of_match_ptr() macro 

Merge series from Ruan Jinjie <ruanjinjie@huawei.com>:

Since these sound drivers depend on CONFIG_OF, there is
no need to wrap the macro of_match_ptr() here.
parents 8acf4de3 f479832b

sound/drivers/serial-generic.c

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ MODULE_DEVICE_TABLE(of, snd_serial_generic_dt_ids); 
static struct serdev_device_driver snd_serial_generic_driver = {

	.driver	= {

		.name		= "snd-serial-generic",

		.of_match_table	= of_match_ptr(snd_serial_generic_dt_ids),

		.of_match_table	= snd_serial_generic_dt_ids,

	},

	.probe	= snd_serial_generic_probe,

};

sound/soc/atmel/atmel-i2s.c

+1 −1
Original line number Diff line number Diff line
@@ -730,7 +730,7 @@ static void atmel_i2s_remove(struct platform_device *pdev) 
static struct platform_driver atmel_i2s_driver = {

	.driver		= {

		.name	= "atmel_i2s",

		.of_match_table	= of_match_ptr(atmel_i2s_dt_ids),

		.of_match_table	= atmel_i2s_dt_ids,

	},

	.probe		= atmel_i2s_probe,

	.remove_new	= atmel_i2s_remove,

sound/soc/atmel/atmel-pdmic.c

+1 −1
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ static int atmel_pdmic_probe(struct platform_device *pdev) 
static struct platform_driver atmel_pdmic_driver = {

	.driver	= {

		.name		= "atmel-pdmic",

		.of_match_table	= of_match_ptr(atmel_pdmic_of_match),

		.of_match_table	= atmel_pdmic_of_match,

		.pm		= &snd_soc_pm_ops,

	},

	.probe	= atmel_pdmic_probe,

sound/soc/atmel/mchp-i2s-mcc.c

+1 −1
Original line number Diff line number Diff line
@@ -1098,7 +1098,7 @@ static void mchp_i2s_mcc_remove(struct platform_device *pdev) 
static struct platform_driver mchp_i2s_mcc_driver = {

	.driver		= {

		.name	= "mchp_i2s_mcc",

		.of_match_table	= of_match_ptr(mchp_i2s_mcc_dt_ids),

		.of_match_table	= mchp_i2s_mcc_dt_ids,

	},

	.probe		= mchp_i2s_mcc_probe,

	.remove_new	= mchp_i2s_mcc_remove,

sound/soc/atmel/mchp-spdifrx.c

+1 −1
Original line number Diff line number Diff line
@@ -1197,7 +1197,7 @@ static struct platform_driver mchp_spdifrx_driver = { 
	.remove_new = mchp_spdifrx_remove,

	.driver	= {

		.name	= "mchp_spdifrx",

		.of_match_table = of_match_ptr(mchp_spdifrx_dt_ids),

		.of_match_table = mchp_spdifrx_dt_ids,

		.pm	= pm_ptr(&mchp_spdifrx_pm_ops),

	},

};