Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ecb044e authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Mark M. Hoffman
Browse files

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



Clean up printk use in ibmpex.

Signed-off-by: default avatarDarrick J. Wong <djwong@us.ibm.com>
Acked-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarMark M. Hoffman <mhoffman@lightlink.com>
parent 298c7524

drivers/hwmon/ibmpex.c

+23 −25
Original line number Diff line number Diff line
@@ -140,10 +140,10 @@ static int ibmpex_send_message(struct ibmpex_bmc_data *data) 


	return 0;

out1:

	printk(KERN_ERR "%s: request_settime=%x\n", __FUNCTION__, err);

	dev_err(data->bmc_device, "request_settime=%x\n", err);

	return err;

out:

	printk(KERN_ERR "%s: validate_addr=%x\n", __FUNCTION__, err);

	dev_err(data->bmc_device, "validate_addr=%x\n", err);

	return err;

}
@@ -161,7 +161,7 @@ static int ibmpex_ver_check(struct ibmpex_bmc_data *data) 
	data->sensor_major = data->rx_msg_data[0];

	data->sensor_minor = data->rx_msg_data[1];



	printk(KERN_INFO DRVNAME ": Found BMC with sensor interface "

	dev_info(data->bmc_device, "Found BMC with sensor interface "

		 "v%d.%d %d-%02d-%02d on interface %d\n",

		 data->sensor_major,

		 data->sensor_minor,
@@ -212,7 +212,7 @@ static int ibmpex_query_sensor_data(struct ibmpex_bmc_data *data, int sensor) 
	wait_for_completion(&data->read_complete);



	if (data->rx_result || data->rx_msg_len < 26) {

		printk(KERN_ERR "Error reading sensor %d, please check.\n",

		dev_err(data->bmc_device, "Error reading sensor %d.\n",

			sensor);

		return -ENOENT;

	}
@@ -456,8 +456,7 @@ static void ibmpex_register_bmc(int iface, struct device *dev) 


	data = kzalloc(sizeof(*data), GFP_KERNEL);

	if (!data) {

		printk(KERN_ERR DRVNAME ": Insufficient memory for BMC "

		       "interface.\n");

		dev_err(dev, "Insufficient memory for BMC interface.\n");

		return;

	}
@@ -471,9 +470,8 @@ static void ibmpex_register_bmc(int iface, struct device *dev) 
	err = ipmi_create_user(data->interface, &driver_data.ipmi_hndlrs,

			       data, &data->user);

	if (err < 0) {

		printk(KERN_ERR DRVNAME ": Error, unable to register user with "

		       "ipmi interface %d\n",

		       data->interface);

		dev_err(dev, "Unable to register user with IPMI "

			"interface %d\n", data->interface);

		goto out;

	}
@@ -495,8 +493,8 @@ static void ibmpex_register_bmc(int iface, struct device *dev) 
	data->hwmon_dev = hwmon_device_register(data->bmc_device);



	if (IS_ERR(data->hwmon_dev)) {

		printk(KERN_ERR DRVNAME ": Error, unable to register hwmon "

		       "class device for interface %d\n",

		dev_err(data->bmc_device, "Unable to register hwmon "

			"device for IPMI interface %d\n",

			data->interface);

		goto out_user;

	}
@@ -508,7 +506,7 @@ static void ibmpex_register_bmc(int iface, struct device *dev) 
	/* Now go find all the sensors */

	err = ibmpex_find_sensors(data);

	if (err) {

		printk(KERN_ERR "Error %d allocating memory\n", err);

		dev_err(data->bmc_device, "Error %d finding sensors\n", err);

		goto out_register;

	}
@@ -561,8 +559,8 @@ static void ibmpex_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data) 
	struct ibmpex_bmc_data *data = (struct ibmpex_bmc_data *)user_msg_data;



	if (msg->msgid != data->tx_msgid) {

		printk(KERN_ERR "Received msgid (%02x) and transmitted "

		       "msgid (%02x) mismatch!\n",

		dev_err(data->bmc_device, "Mismatch between received msgid "

			"(%02x) and transmitted msgid (%02x)!\n",

			(int)msg->msgid,

			(int)data->tx_msgid);

		ipmi_free_recv_msg(msg);