Skip to content

Commit

Permalink
hwmon: (pmbus) Drop unnecessary error messages in probe error path
Browse files Browse the repository at this point in the history
Drop error messages due to implementation errors and due to memory allocation
errors.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
  • Loading branch information
Guenter Roeck committed Feb 6, 2013
1 parent ceeadc5 commit 77493ef
Showing 1 changed file with 6 additions and 18 deletions.
24 changes: 6 additions & 18 deletions drivers/hwmon/pmbus/pmbus_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1685,21 +1685,17 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
struct pmbus_data *data;
int ret;

if (!info) {
dev_err(&client->dev, "Missing chip information");
if (!info)
return -ENODEV;
}

if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WRITE_BYTE
| I2C_FUNC_SMBUS_BYTE_DATA
| I2C_FUNC_SMBUS_WORD_DATA))
return -ENODEV;

data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
if (!data) {
dev_err(&client->dev, "No memory to allocate driver data\n");
if (!data)
return -ENOMEM;
}

i2c_set_clientdata(client, data);
mutex_init(&data->update_lock);
Expand Down Expand Up @@ -1739,31 +1735,23 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
ret = -ENOMEM;
data->sensors = devm_kzalloc(&client->dev, sizeof(struct pmbus_sensor)
* data->max_sensors, GFP_KERNEL);
if (!data->sensors) {
dev_err(&client->dev, "No memory to allocate sensor data\n");
if (!data->sensors)
return -ENOMEM;
}

data->booleans = devm_kzalloc(&client->dev, sizeof(struct pmbus_boolean)
* data->max_booleans, GFP_KERNEL);
if (!data->booleans) {
dev_err(&client->dev, "No memory to allocate boolean data\n");
if (!data->booleans)
return -ENOMEM;
}

data->labels = devm_kzalloc(&client->dev, sizeof(struct pmbus_label)
* data->max_labels, GFP_KERNEL);
if (!data->labels) {
dev_err(&client->dev, "No memory to allocate label data\n");
if (!data->labels)
return -ENOMEM;
}

data->attributes = devm_kzalloc(&client->dev, sizeof(struct attribute *)
* data->max_attributes, GFP_KERNEL);
if (!data->attributes) {
dev_err(&client->dev, "No memory to allocate attribute data\n");
if (!data->attributes)
return -ENOMEM;
}

pmbus_find_attributes(client, data);

Expand Down

0 comments on commit 77493ef

Please sign in to comment.