Unverified Commit 7f7d7214 authored by Stephen Kitt's avatar Stephen Kitt Committed by Mark Brown
Browse files

ASoC: pcm*: use simple i2c probe function 



The i2c probe functions here don't use the id information provided in
their second argument, so the single-parameter i2c probe function
("probe_new") can be used instead.

This avoids scanning the identifier tables during probes.

Signed-off-by: default avatarStephen Kitt <steve@sk2.org>
Link: https://lore.kernel.org/r/20220405165836.2165310-9-steve@sk2.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7325ed4d

sound/soc/codecs/pcm1681.c

+2 −3
Original line number Diff line number Diff line
@@ -299,8 +299,7 @@ static const struct i2c_device_id pcm1681_i2c_id[] = { 
};

MODULE_DEVICE_TABLE(i2c, pcm1681_i2c_id);



static int pcm1681_i2c_probe(struct i2c_client *client,

			      const struct i2c_device_id *id)

static int pcm1681_i2c_probe(struct i2c_client *client)

{

	int ret;

	struct pcm1681_private *priv;
@@ -329,7 +328,7 @@ static struct i2c_driver pcm1681_i2c_driver = { 
		.of_match_table = of_match_ptr(pcm1681_dt_ids),

	},

	.id_table	= pcm1681_i2c_id,

	.probe		= pcm1681_i2c_probe,

	.probe_new	= pcm1681_i2c_probe,

};



module_i2c_driver(pcm1681_i2c_driver);

sound/soc/codecs/pcm1789-i2c.c

+2 −3
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ 


#include "pcm1789.h"



static int pcm1789_i2c_probe(struct i2c_client *client,

			     const struct i2c_device_id *id)

static int pcm1789_i2c_probe(struct i2c_client *client)

{

	struct regmap *regmap;

	int ret;
@@ -53,7 +52,7 @@ static struct i2c_driver pcm1789_i2c_driver = { 
		.of_match_table = of_match_ptr(pcm1789_of_match),

	},

	.id_table	= pcm1789_i2c_ids,

	.probe		= pcm1789_i2c_probe,

	.probe_new	= pcm1789_i2c_probe,

	.remove	= pcm1789_i2c_remove,

};

sound/soc/codecs/pcm179x-i2c.c

+2 −3
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 


#include "pcm179x.h"



static int pcm179x_i2c_probe(struct i2c_client *client,

			      const struct i2c_device_id *id)

static int pcm179x_i2c_probe(struct i2c_client *client)

{

	struct regmap *regmap;

	int ret;
@@ -50,7 +49,7 @@ static struct i2c_driver pcm179x_i2c_driver = { 
		.of_match_table = of_match_ptr(pcm179x_of_match),

	},

	.id_table	= pcm179x_i2c_ids,

	.probe		= pcm179x_i2c_probe,

	.probe_new	= pcm179x_i2c_probe,

};



module_i2c_driver(pcm179x_i2c_driver);

sound/soc/codecs/pcm3168a-i2c.c

+2 −3
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ 


#include "pcm3168a.h"



static int pcm3168a_i2c_probe(struct i2c_client *i2c,

			     const struct i2c_device_id *id)

static int pcm3168a_i2c_probe(struct i2c_client *i2c)

{

	struct regmap *regmap;
@@ -47,7 +46,7 @@ static const struct of_device_id pcm3168a_of_match[] = { 
MODULE_DEVICE_TABLE(of, pcm3168a_of_match);



static struct i2c_driver pcm3168a_i2c_driver = {

	.probe		= pcm3168a_i2c_probe,

	.probe_new	= pcm3168a_i2c_probe,

	.remove		= pcm3168a_i2c_remove,

	.id_table	= pcm3168a_i2c_id,

	.driver		= {

sound/soc/codecs/pcm512x-i2c.c

+2 −3
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ 


#include "pcm512x.h"



static int pcm512x_i2c_probe(struct i2c_client *i2c,

			     const struct i2c_device_id *id)

static int pcm512x_i2c_probe(struct i2c_client *i2c)

{

	struct regmap *regmap;

	struct regmap_config config = pcm512x_regmap;
@@ -68,7 +67,7 @@ MODULE_DEVICE_TABLE(acpi, pcm512x_acpi_match); 
#endif



static struct i2c_driver pcm512x_i2c_driver = {

	.probe 		= pcm512x_i2c_probe,

	.probe_new	= pcm512x_i2c_probe,

	.remove 	= pcm512x_i2c_remove,

	.id_table	= pcm512x_i2c_id,

	.driver		= {