mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
platform/mellanox: mlxreg-hotplug: Change input for device create routine
Change the first input parameter in mlxreg_hotplug_device_create to the pointer to mlxreg_hotplug private data in order to use the fields from the private data structure. Signed-off-by: Vadim Pasternak <vadimp@mellanox.com> [dvhart: Cleaned up commit message] Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
This commit is contained in:
parent
d726f6b199
commit
f709e1bfb0
1 changed files with 6 additions and 6 deletions
|
@ -93,7 +93,7 @@ struct mlxreg_hotplug_priv_data {
|
||||||
bool after_probe;
|
bool after_probe;
|
||||||
};
|
};
|
||||||
|
|
||||||
static int mlxreg_hotplug_device_create(struct device *dev,
|
static int mlxreg_hotplug_device_create(struct mlxreg_hotplug_priv_data *priv,
|
||||||
struct mlxreg_core_data *data)
|
struct mlxreg_core_data *data)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
|
@ -105,7 +105,7 @@ static int mlxreg_hotplug_device_create(struct device *dev,
|
||||||
|
|
||||||
data->hpdev.adapter = i2c_get_adapter(data->hpdev.nr);
|
data->hpdev.adapter = i2c_get_adapter(data->hpdev.nr);
|
||||||
if (!data->hpdev.adapter) {
|
if (!data->hpdev.adapter) {
|
||||||
dev_err(dev, "Failed to get adapter for bus %d\n",
|
dev_err(priv->dev, "Failed to get adapter for bus %d\n",
|
||||||
data->hpdev.nr);
|
data->hpdev.nr);
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
}
|
}
|
||||||
|
@ -113,7 +113,7 @@ static int mlxreg_hotplug_device_create(struct device *dev,
|
||||||
data->hpdev.client = i2c_new_device(data->hpdev.adapter,
|
data->hpdev.client = i2c_new_device(data->hpdev.adapter,
|
||||||
data->hpdev.brdinfo);
|
data->hpdev.brdinfo);
|
||||||
if (!data->hpdev.client) {
|
if (!data->hpdev.client) {
|
||||||
dev_err(dev, "Failed to create client %s at bus %d at addr 0x%02x\n",
|
dev_err(priv->dev, "Failed to create client %s at bus %d at addr 0x%02x\n",
|
||||||
data->hpdev.brdinfo->type, data->hpdev.nr,
|
data->hpdev.brdinfo->type, data->hpdev.nr,
|
||||||
data->hpdev.brdinfo->addr);
|
data->hpdev.brdinfo->addr);
|
||||||
|
|
||||||
|
@ -270,10 +270,10 @@ mlxreg_hotplug_work_helper(struct mlxreg_hotplug_priv_data *priv,
|
||||||
if (item->inversed)
|
if (item->inversed)
|
||||||
mlxreg_hotplug_device_destroy(data);
|
mlxreg_hotplug_device_destroy(data);
|
||||||
else
|
else
|
||||||
mlxreg_hotplug_device_create(priv->dev, data);
|
mlxreg_hotplug_device_create(priv, data);
|
||||||
} else {
|
} else {
|
||||||
if (item->inversed)
|
if (item->inversed)
|
||||||
mlxreg_hotplug_device_create(priv->dev, data);
|
mlxreg_hotplug_device_create(priv, data);
|
||||||
else
|
else
|
||||||
mlxreg_hotplug_device_destroy(data);
|
mlxreg_hotplug_device_destroy(data);
|
||||||
}
|
}
|
||||||
|
@ -319,7 +319,7 @@ mlxreg_hotplug_health_work_helper(struct mlxreg_hotplug_priv_data *priv,
|
||||||
if (regval == MLXREG_HOTPLUG_HEALTH_MASK) {
|
if (regval == MLXREG_HOTPLUG_HEALTH_MASK) {
|
||||||
if ((data->health_cntr++ == MLXREG_HOTPLUG_RST_CNTR) ||
|
if ((data->health_cntr++ == MLXREG_HOTPLUG_RST_CNTR) ||
|
||||||
!priv->after_probe) {
|
!priv->after_probe) {
|
||||||
mlxreg_hotplug_device_create(priv->dev, data);
|
mlxreg_hotplug_device_create(priv, data);
|
||||||
data->attached = true;
|
data->attached = true;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue