Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

platform/mellanox: Rename i2c bus to nr

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

Signed-off-by: Vadim Pasternak <vadimp@mellanox.com>
Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
[dvhart: refactored commit into smaller functional changes]
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
This commit is contained in:
Vadim Pasternak 2018-01-22 18:43:27 -08:00 committed by Darren Hart (VMware)
parent 4abdbfa733
commit 3d838f5514
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/platform/mellanox/mlxreg-hotplug.c
View file

@ -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, static int mlxreg_hotplug_device_create(struct device *dev,
struct mlxreg_hotplug_device *item) struct mlxreg_hotplug_device *item)
{ {
item->adapter = i2c_get_adapter(item->bus); item->adapter = i2c_get_adapter(item->nr);
if (!item->adapter) { if (!item->adapter) {
dev_err(dev, "Failed to get adapter for bus %d\n", dev_err(dev, "Failed to get adapter for bus %d\n",
item->bus); item->nr);
return -EFAULT; return -EFAULT;
} }
item->client = i2c_new_device(item->adapter, &item->brdinfo); item->client = i2c_new_device(item->adapter, &item->brdinfo);
if (!item->client) { if (!item->client) {
dev_err(dev, "Failed to create client %s at bus %d at addr 0x%02x\n", 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); i2c_put_adapter(item->adapter);
item->adapter = NULL; item->adapter = NULL;
return -EFAULT; return -EFAULT;

16
drivers/platform/x86/mlx-platform.c
View file

@ -141,41 +141,41 @@ static struct i2c_mux_reg_platform_data mlxplat_mux_data[] = {
static struct mlxreg_hotplug_device mlxplat_mlxcpld_psu[] = { static struct mlxreg_hotplug_device mlxplat_mlxcpld_psu[] = {
{ {
.brdinfo = { I2C_BOARD_INFO("24c02", 0x51) }, .brdinfo = { I2C_BOARD_INFO("24c02", 0x51) },
.bus = 10, .nr = 10,
}, },
{ {
.brdinfo = { I2C_BOARD_INFO("24c02", 0x50) }, .brdinfo = { I2C_BOARD_INFO("24c02", 0x50) },
.bus = 10, .nr = 10,
}, },
}; };
static struct mlxreg_hotplug_device mlxplat_mlxcpld_pwr[] = { static struct mlxreg_hotplug_device mlxplat_mlxcpld_pwr[] = {
{ {
.brdinfo = { I2C_BOARD_INFO("dps460", 0x59) }, .brdinfo = { I2C_BOARD_INFO("dps460", 0x59) },
.bus = 10, .nr = 10,
}, },
{ {
.brdinfo = { I2C_BOARD_INFO("dps460", 0x58) }, .brdinfo = { I2C_BOARD_INFO("dps460", 0x58) },
.bus = 10, .nr = 10,
}, },
}; };
static struct mlxreg_hotplug_device mlxplat_mlxcpld_fan[] = { static struct mlxreg_hotplug_device mlxplat_mlxcpld_fan[] = {
{ {
.brdinfo = { I2C_BOARD_INFO("24c32", 0x50) }, .brdinfo = { I2C_BOARD_INFO("24c32", 0x50) },
.bus = 11, .nr = 11,
}, },
{ {
.brdinfo = { I2C_BOARD_INFO("24c32", 0x50) }, .brdinfo = { I2C_BOARD_INFO("24c32", 0x50) },
.bus = 12, .nr = 12,
}, },
{ {
.brdinfo = { I2C_BOARD_INFO("24c32", 0x50) }, .brdinfo = { I2C_BOARD_INFO("24c32", 0x50) },
.bus = 13, .nr = 13,
}, },
{ {
.brdinfo = { I2C_BOARD_INFO("24c32", 0x50) }, .brdinfo = { I2C_BOARD_INFO("24c32", 0x50) },
.bus = 14, .nr = 14,
}, },
}; };

4
include/linux/platform_data/mlxreg.h
View file

@ -39,7 +39,7 @@
* @adapter: I2C device adapter; * @adapter: I2C device adapter;
* @client: I2C device client; * @client: I2C device client;
* @brdinfo: device board information; * @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 * Structure represents I2C hotplug device static data (board topology) and
* dynamic data (related kernel objects handles). * dynamic data (related kernel objects handles).
@ -48,7 +48,7 @@ struct mlxreg_hotplug_device {
struct i2c_adapter *adapter; struct i2c_adapter *adapter;
struct i2c_client *client; struct i2c_client *client;
struct i2c_board_info brdinfo; struct i2c_board_info brdinfo;
u16 bus; int nr;
}; };
/** /**