Commit 2094dbbd authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-complete-conversion-to-i2c_probe_new' 

Jakub Kicinski says:

====================
net: Complete conversion to i2c_probe_new

Reposting for Uwe the networking slice of his mega-series:
https://lore.kernel.org/all/20221118224540.619276-1-uwe@kleine-koenig.org/
so that our build bot can confirm the obvious.

fix mlx5 -> mlxsw while at it.
====================

Link: https://lore.kernel.org/r/20221123045507.2091409-1-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e80bd08f 1fa08273

drivers/net/dsa/lan9303_i2c.c

+2 −3
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@ static const struct regmap_config lan9303_i2c_regmap_config = { 
	.cache_type = REGCACHE_NONE,

};



static int lan9303_i2c_probe(struct i2c_client *client,

			     const struct i2c_device_id *id)

static int lan9303_i2c_probe(struct i2c_client *client)

{

	struct lan9303_i2c *sw_dev;

	int ret;
@@ -106,7 +105,7 @@ static struct i2c_driver lan9303_i2c_driver = { 
		.name = "LAN9303_I2C",

		.of_match_table = of_match_ptr(lan9303_i2c_of_match),

	},

	.probe = lan9303_i2c_probe,

	.probe_new = lan9303_i2c_probe,

	.remove = lan9303_i2c_remove,

	.shutdown = lan9303_i2c_shutdown,

	.id_table = lan9303_i2c_id,

drivers/net/dsa/microchip/ksz9477_i2c.c

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


KSZ_REGMAP_TABLE(ksz9477, not_used, 16, 0, 0);



static int ksz9477_i2c_probe(struct i2c_client *i2c,

			     const struct i2c_device_id *i2c_id)

static int ksz9477_i2c_probe(struct i2c_client *i2c)

{

	struct regmap_config rc;

	struct ksz_device *dev;
@@ -120,7 +119,7 @@ static struct i2c_driver ksz9477_i2c_driver = { 
		.name	= "ksz9477-switch",

		.of_match_table = of_match_ptr(ksz9477_dt_ids),

	},

	.probe	= ksz9477_i2c_probe,

	.probe_new = ksz9477_i2c_probe,

	.remove	= ksz9477_i2c_remove,

	.shutdown = ksz9477_i2c_shutdown,

	.id_table = ksz9477_i2c_id,

drivers/net/dsa/xrs700x/xrs700x_i2c.c

+2 −3
Original line number Diff line number Diff line
@@ -76,8 +76,7 @@ static const struct regmap_config xrs700x_i2c_regmap_config = { 
	.val_format_endian = REGMAP_ENDIAN_BIG

};



static int xrs700x_i2c_probe(struct i2c_client *i2c,

			     const struct i2c_device_id *i2c_id)

static int xrs700x_i2c_probe(struct i2c_client *i2c)

{

	struct xrs700x *priv;

	int ret;
@@ -148,7 +147,7 @@ static struct i2c_driver xrs700x_i2c_driver = { 
		.name	= "xrs700x-i2c",

		.of_match_table = of_match_ptr(xrs700x_i2c_dt_ids),

	},

	.probe	= xrs700x_i2c_probe,

	.probe_new = xrs700x_i2c_probe,

	.remove	= xrs700x_i2c_remove,

	.shutdown = xrs700x_i2c_shutdown,

	.id_table = xrs700x_i2c_id,

drivers/net/ethernet/mellanox/mlxsw/i2c.c

+3 −3
Original line number Diff line number Diff line
@@ -632,9 +632,9 @@ static const struct mlxsw_bus mlxsw_i2c_bus = { 
	.cmd_exec		= mlxsw_i2c_cmd_exec,

};



static int mlxsw_i2c_probe(struct i2c_client *client,

			   const struct i2c_device_id *id)

static int mlxsw_i2c_probe(struct i2c_client *client)

{

	const struct i2c_device_id *id = i2c_client_get_device_id(client);

	const struct i2c_adapter_quirks *quirks = client->adapter->quirks;

	struct mlxsw_i2c *mlxsw_i2c;

	u8 status;
@@ -751,7 +751,7 @@ static void mlxsw_i2c_remove(struct i2c_client *client) 


int mlxsw_i2c_driver_register(struct i2c_driver *i2c_driver)

{

	i2c_driver->probe = mlxsw_i2c_probe;

	i2c_driver->probe_new = mlxsw_i2c_probe;

	i2c_driver->remove = mlxsw_i2c_remove;

	return i2c_add_driver(i2c_driver);

}

drivers/nfc/microread/i2c.c

+2 −3
Original line number Diff line number Diff line
@@ -231,8 +231,7 @@ static const struct nfc_phy_ops i2c_phy_ops = { 
	.disable = microread_i2c_disable,

};



static int microread_i2c_probe(struct i2c_client *client,

			       const struct i2c_device_id *id)

static int microread_i2c_probe(struct i2c_client *client)

{

	struct microread_i2c_phy *phy;

	int r;
@@ -287,7 +286,7 @@ static struct i2c_driver microread_i2c_driver = { 
	.driver = {

		.name = MICROREAD_I2C_DRIVER_NAME,

	},

	.probe		= microread_i2c_probe,

	.probe_new	= microread_i2c_probe,

	.remove		= microread_i2c_remove,

	.id_table	= microread_i2c_id,

};