Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d838f55 authored by Vadim Pasternak's avatar Vadim Pasternak Committed by Darren Hart (VMware)
Browse files

platform/mellanox: Rename i2c bus to nr 



Use Linux convention of nr instead of bus for i2c adapter number.

Signed-off-by: default avatarVadim Pasternak <vadimp@mellanox.com>
Acked-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
[dvhart: refactored commit into smaller functional changes]
Signed-off-by: default avatarDarren Hart (VMware) <dvhart@infradead.org>
parent 4abdbfa7

drivers/platform/mellanox/mlxreg-hotplug.c

+3 −3
Original line number Diff line number Diff line
@@ -186,17 +186,17 @@ static int mlxreg_hotplug_attr_init(struct mlxreg_hotplug_priv_data *priv) 
static int mlxreg_hotplug_device_create(struct device *dev,

					struct mlxreg_hotplug_device *item)

{

	item->adapter = i2c_get_adapter(item->bus);

	item->adapter = i2c_get_adapter(item->nr);

	if (!item->adapter) {

		dev_err(dev, "Failed to get adapter for bus %d\n",

			item->bus);

			item->nr);

		return -EFAULT;

	}



	item->client = i2c_new_device(item->adapter, &item->brdinfo);

	if (!item->client) {

		dev_err(dev, "Failed to create client %s at bus %d at addr 0x%02x\n",

			item->brdinfo.type, item->bus, item->brdinfo.addr);

			item->brdinfo.type, item->nr, item->brdinfo.addr);

		i2c_put_adapter(item->adapter);

		item->adapter = NULL;

		return -EFAULT;

drivers/platform/x86/mlx-platform.c

+8 −8
Original line number Diff line number Diff line
@@ -141,41 +141,41 @@ static struct i2c_mux_reg_platform_data mlxplat_mux_data[] = { 
static struct mlxreg_hotplug_device mlxplat_mlxcpld_psu[] = {

	{

		.brdinfo = { I2C_BOARD_INFO("24c02", 0x51) },

		.bus = 10,

		.nr = 10,

	},

	{

		.brdinfo = { I2C_BOARD_INFO("24c02", 0x50) },

		.bus = 10,

		.nr = 10,

	},

};



static struct mlxreg_hotplug_device mlxplat_mlxcpld_pwr[] = {

	{

		.brdinfo = { I2C_BOARD_INFO("dps460", 0x59) },

		.bus = 10,

		.nr = 10,

	},

	{

		.brdinfo = { I2C_BOARD_INFO("dps460", 0x58) },

		.bus = 10,

		.nr = 10,

	},

};



static struct mlxreg_hotplug_device mlxplat_mlxcpld_fan[] = {

	{

		.brdinfo = { I2C_BOARD_INFO("24c32", 0x50) },

		.bus = 11,

		.nr = 11,

	},

	{

		.brdinfo = { I2C_BOARD_INFO("24c32", 0x50) },

		.bus = 12,

		.nr = 12,

	},

	{

		.brdinfo = { I2C_BOARD_INFO("24c32", 0x50) },

		.bus = 13,

		.nr = 13,

	},

	{

		.brdinfo = { I2C_BOARD_INFO("24c32", 0x50) },

		.bus = 14,

		.nr = 14,

	},

};

include/linux/platform_data/mlxreg.h

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
 * @adapter: I2C device adapter;

 * @client: I2C device client;

 * @brdinfo: device board information;

 * @bus: I2C bus, where device is attached;

 * @nr: I2C device adapter number, to which device is to be attached;

 *

 * Structure represents I2C hotplug device static data (board topology) and

 * dynamic data (related kernel objects handles).
@@ -48,7 +48,7 @@ struct mlxreg_hotplug_device { 
	struct i2c_adapter *adapter;

	struct i2c_client *client;

	struct i2c_board_info brdinfo;

	u16 bus;

	int nr;

};



/**