Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

hwmon: (ibmpex) Change printk to dev_{info,err} macros

Clean up printk use in ibmpex.

Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>

authored by

Darrick J. Wong and committed by
Mark M. Hoffman
2ecb044e 298c7524

+23 -25
+23 -25
drivers/hwmon/ibmpex.c
··· 140 140 141 141 return 0; 142 142 out1: 143 - printk(KERN_ERR "%s: request_settime=%x\n", __FUNCTION__, err); 143 + dev_err(data->bmc_device, "request_settime=%x\n", err); 144 144 return err; 145 145 out: 146 - printk(KERN_ERR "%s: validate_addr=%x\n", __FUNCTION__, err); 146 + dev_err(data->bmc_device, "validate_addr=%x\n", err); 147 147 return err; 148 148 } 149 149 ··· 161 161 data->sensor_major = data->rx_msg_data[0]; 162 162 data->sensor_minor = data->rx_msg_data[1]; 163 163 164 - printk(KERN_INFO DRVNAME ": Found BMC with sensor interface " 165 - "v%d.%d %d-%02d-%02d on interface %d\n", 166 - data->sensor_major, 167 - data->sensor_minor, 168 - extract_value(data->rx_msg_data, 2), 169 - data->rx_msg_data[4], 170 - data->rx_msg_data[5], 171 - data->interface); 164 + dev_info(data->bmc_device, "Found BMC with sensor interface " 165 + "v%d.%d %d-%02d-%02d on interface %d\n", 166 + data->sensor_major, 167 + data->sensor_minor, 168 + extract_value(data->rx_msg_data, 2), 169 + data->rx_msg_data[4], 170 + data->rx_msg_data[5], 171 + data->interface); 172 172 173 173 return 0; 174 174 } ··· 212 212 wait_for_completion(&data->read_complete); 213 213 214 214 if (data->rx_result || data->rx_msg_len < 26) { 215 - printk(KERN_ERR "Error reading sensor %d, please check.\n", 216 - sensor); 215 + dev_err(data->bmc_device, "Error reading sensor %d.\n", 216 + sensor); 217 217 return -ENOENT; 218 218 } 219 219 ··· 456 456 457 457 data = kzalloc(sizeof(*data), GFP_KERNEL); 458 458 if (!data) { 459 - printk(KERN_ERR DRVNAME ": Insufficient memory for BMC " 460 - "interface.\n"); 459 + dev_err(dev, "Insufficient memory for BMC interface.\n"); 461 460 return; 462 461 } 463 462 ··· 470 471 err = ipmi_create_user(data->interface, &driver_data.ipmi_hndlrs, 471 472 data, &data->user); 472 473 if (err < 0) { 473 - printk(KERN_ERR DRVNAME ": Error, unable to register user with " 474 - "ipmi interface %d\n", 475 - data->interface); 474 + dev_err(dev, "Unable to register user with IPMI " 475 + "interface %d\n", data->interface); 476 476 goto out; 477 477 } 478 478 ··· 493 495 data->hwmon_dev = hwmon_device_register(data->bmc_device); 494 496 495 497 if (IS_ERR(data->hwmon_dev)) { 496 - printk(KERN_ERR DRVNAME ": Error, unable to register hwmon " 497 - "class device for interface %d\n", 498 - data->interface); 498 + dev_err(data->bmc_device, "Unable to register hwmon " 499 + "device for IPMI interface %d\n", 500 + data->interface); 499 501 goto out_user; 500 502 } 501 503 ··· 506 508 /* Now go find all the sensors */ 507 509 err = ibmpex_find_sensors(data); 508 510 if (err) { 509 - printk(KERN_ERR "Error %d allocating memory\n", err); 511 + dev_err(data->bmc_device, "Error %d finding sensors\n", err); 510 512 goto out_register; 511 513 } 512 514 ··· 559 561 struct ibmpex_bmc_data *data = (struct ibmpex_bmc_data *)user_msg_data; 560 562 561 563 if (msg->msgid != data->tx_msgid) { 562 - printk(KERN_ERR "Received msgid (%02x) and transmitted " 563 - "msgid (%02x) mismatch!\n", 564 - (int)msg->msgid, 565 - (int)data->tx_msgid); 564 + dev_err(data->bmc_device, "Mismatch between received msgid " 565 + "(%02x) and transmitted msgid (%02x)!\n", 566 + (int)msg->msgid, 567 + (int)data->tx_msgid); 566 568 ipmi_free_recv_msg(msg); 567 569 return; 568 570 }