Unverified Commit 122cef68 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: remaining simple i2c probe changes 

Merge series from Stephen Kitt <steve@sk2.org>:

This series covers all the remaining changes to migrate
sound/soc/codecs i2c probes to probe_new, where the const struct
i2c_client * argument is unused; there are a few remaining files which
use the argument and will need i2c_match_id migration.
parents 09b955f6 cbd5ce7f

sound/soc/codecs/ak4118.c

+2 −3
Original line number Diff line number Diff line
@@ -356,8 +356,7 @@ static const struct regmap_config ak4118_regmap = { 
	.max_register = AK4118_REG_MAX - 1,

};



static int ak4118_i2c_probe(struct i2c_client *i2c,

			    const struct i2c_device_id *id)

static int ak4118_i2c_probe(struct i2c_client *i2c)

{

	struct ak4118_priv *ak4118;

	int ret;
@@ -416,7 +415,7 @@ static struct i2c_driver ak4118_i2c_driver = { 
		.of_match_table = of_match_ptr(ak4118_of_match),

	},

	.id_table = ak4118_id_table,

	.probe  = ak4118_i2c_probe,

	.probe_new = ak4118_i2c_probe,

};



module_i2c_driver(ak4118_i2c_driver);

sound/soc/codecs/ak4535.c

+2 −3
Original line number Diff line number Diff line
@@ -405,8 +405,7 @@ static const struct snd_soc_component_driver soc_component_dev_ak4535 = { 
	.non_legacy_dai_naming	= 1,

};



static int ak4535_i2c_probe(struct i2c_client *i2c,

			    const struct i2c_device_id *id)

static int ak4535_i2c_probe(struct i2c_client *i2c)

{

	struct ak4535_priv *ak4535;

	int ret;
@@ -441,7 +440,7 @@ static struct i2c_driver ak4535_i2c_driver = { 
	.driver = {

		.name = "ak4535",

	},

	.probe =    ak4535_i2c_probe,

	.probe_new = ak4535_i2c_probe,

	.id_table = ak4535_i2c_id,

};

sound/soc/codecs/ak4641.c

+2 −3
Original line number Diff line number Diff line
@@ -548,8 +548,7 @@ static const struct regmap_config ak4641_regmap = { 
	.cache_type = REGCACHE_RBTREE,

};



static int ak4641_i2c_probe(struct i2c_client *i2c,

			    const struct i2c_device_id *id)

static int ak4641_i2c_probe(struct i2c_client *i2c)

{

	struct ak4641_platform_data *pdata = i2c->dev.platform_data;

	struct ak4641_priv *ak4641;
@@ -632,7 +631,7 @@ static struct i2c_driver ak4641_i2c_driver = { 
	.driver = {

		.name = "ak4641",

	},

	.probe =    ak4641_i2c_probe,

	.probe_new = ak4641_i2c_probe,

	.remove =   ak4641_i2c_remove,

	.id_table = ak4641_i2c_id,

};

sound/soc/codecs/ak4671.c

+2 −3
Original line number Diff line number Diff line
@@ -629,8 +629,7 @@ static const struct regmap_config ak4671_regmap = { 
	.cache_type = REGCACHE_RBTREE,

};



static int ak4671_i2c_probe(struct i2c_client *client,

			    const struct i2c_device_id *id)

static int ak4671_i2c_probe(struct i2c_client *client)

{

	struct regmap *regmap;

	int ret;
@@ -657,7 +656,7 @@ static struct i2c_driver ak4671_i2c_driver = { 
	.driver = {

		.name = "ak4671-codec",

	},

	.probe = ak4671_i2c_probe,

	.probe_new = ak4671_i2c_probe,

	.id_table = ak4671_i2c_id,

};

sound/soc/codecs/cx2072x.c

+2 −3
Original line number Diff line number Diff line
@@ -1626,8 +1626,7 @@ static int __maybe_unused cx2072x_runtime_resume(struct device *dev) 
	return clk_prepare_enable(cx2072x->mclk);

}



static int cx2072x_i2c_probe(struct i2c_client *i2c,

			     const struct i2c_device_id *id)

static int cx2072x_i2c_probe(struct i2c_client *i2c)

{

	struct cx2072x_priv *cx2072x;

	unsigned int ven_id, rev_id;
@@ -1710,7 +1709,7 @@ static struct i2c_driver cx2072x_i2c_driver = { 
		.acpi_match_table = ACPI_PTR(cx2072x_acpi_match),

		.pm = &cx2072x_runtime_pm,

	},

	.probe = cx2072x_i2c_probe,

	.probe_new = cx2072x_i2c_probe,

	.remove = cx2072x_i2c_remove,

	.id_table = cx2072x_i2c_id,

};