diff options
Diffstat (limited to 'drivers/hwmon/ibmaem.c')
-rw-r--r-- | drivers/hwmon/ibmaem.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c index a14f634248e7..1429f6e177f4 100644 --- a/drivers/hwmon/ibmaem.c +++ b/drivers/hwmon/ibmaem.c | |||
@@ -289,8 +289,9 @@ static int aem_init_ipmi_data(struct aem_ipmi_data *data, int iface, | |||
289 | err = ipmi_create_user(data->interface, &driver_data.ipmi_hndlrs, | 289 | err = ipmi_create_user(data->interface, &driver_data.ipmi_hndlrs, |
290 | data, &data->user); | 290 | data, &data->user); |
291 | if (err < 0) { | 291 | if (err < 0) { |
292 | dev_err(bmc, "Unable to register user with IPMI " | 292 | dev_err(bmc, |
293 | "interface %d\n", data->interface); | 293 | "Unable to register user with IPMI interface %d\n", |
294 | data->interface); | ||
294 | return -EACCES; | 295 | return -EACCES; |
295 | } | 296 | } |
296 | 297 | ||
@@ -328,8 +329,8 @@ static void aem_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data) | |||
328 | struct aem_ipmi_data *data = user_msg_data; | 329 | struct aem_ipmi_data *data = user_msg_data; |
329 | 330 | ||
330 | if (msg->msgid != data->tx_msgid) { | 331 | if (msg->msgid != data->tx_msgid) { |
331 | dev_err(data->bmc_device, "Mismatch between received msgid " | 332 | dev_err(data->bmc_device, |
332 | "(%02x) and transmitted msgid (%02x)!\n", | 333 | "Mismatch between received msgid (%02x) and transmitted msgid (%02x)!\n", |
333 | (int)msg->msgid, | 334 | (int)msg->msgid, |
334 | (int)data->tx_msgid); | 335 | (int)data->tx_msgid); |
335 | ipmi_free_recv_msg(msg); | 336 | ipmi_free_recv_msg(msg); |
@@ -575,8 +576,8 @@ static int aem_init_aem1_inst(struct aem_ipmi_data *probe, u8 module_handle) | |||
575 | /* Register with hwmon */ | 576 | /* Register with hwmon */ |
576 | data->hwmon_dev = hwmon_device_register(&data->pdev->dev); | 577 | data->hwmon_dev = hwmon_device_register(&data->pdev->dev); |
577 | if (IS_ERR(data->hwmon_dev)) { | 578 | if (IS_ERR(data->hwmon_dev)) { |
578 | dev_err(&data->pdev->dev, "Unable to register hwmon " | 579 | dev_err(&data->pdev->dev, |
579 | "device for IPMI interface %d\n", | 580 | "Unable to register hwmon device for IPMI interface %d\n", |
580 | probe->interface); | 581 | probe->interface); |
581 | res = PTR_ERR(data->hwmon_dev); | 582 | res = PTR_ERR(data->hwmon_dev); |
582 | goto hwmon_reg_err; | 583 | goto hwmon_reg_err; |
@@ -715,8 +716,8 @@ static int aem_init_aem2_inst(struct aem_ipmi_data *probe, | |||
715 | /* Register with hwmon */ | 716 | /* Register with hwmon */ |
716 | data->hwmon_dev = hwmon_device_register(&data->pdev->dev); | 717 | data->hwmon_dev = hwmon_device_register(&data->pdev->dev); |
717 | if (IS_ERR(data->hwmon_dev)) { | 718 | if (IS_ERR(data->hwmon_dev)) { |
718 | dev_err(&data->pdev->dev, "Unable to register hwmon " | 719 | dev_err(&data->pdev->dev, |
719 | "device for IPMI interface %d\n", | 720 | "Unable to register hwmon device for IPMI interface %d\n", |
720 | probe->interface); | 721 | probe->interface); |
721 | res = PTR_ERR(data->hwmon_dev); | 722 | res = PTR_ERR(data->hwmon_dev); |
722 | goto hwmon_reg_err; | 723 | goto hwmon_reg_err; |
@@ -768,8 +769,8 @@ static void aem_init_aem2(struct aem_ipmi_data *probe) | |||
768 | 769 | ||
769 | while (!aem_find_aem2(probe, &fi_resp, i)) { | 770 | while (!aem_find_aem2(probe, &fi_resp, i)) { |
770 | if (fi_resp.major != 2) { | 771 | if (fi_resp.major != 2) { |
771 | dev_err(probe->bmc_device, "Unknown AEM v%d; please " | 772 | dev_err(probe->bmc_device, |
772 | "report this to the maintainer.\n", | 773 | "Unknown AEM v%d; please report this to the maintainer.\n", |
773 | fi_resp.major); | 774 | fi_resp.major); |
774 | i++; | 775 | i++; |
775 | continue; | 776 | continue; |