ipmi:ssif: Change some pr_xxx to dev_xxx calls

Trying to make things more consistent and compliant with what should
be in drivers.

Signed-off-by: Corey Minyard <cminyard@mvista.com>

diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c
index 11ac025..8b5aec5 100644 (file)
--- a/drivers/char/ipmi/ipmi_ssif.c
+++ b/drivers/char/ipmi/ipmi_ssif.c
@@ -28,6 +28,7 @@
  */
 
 #define pr_fmt(fmt) "ipmi_ssif: " fmt
+#define dev_fmt(fmt) "ipmi_ssif: " fmt
 
 #if defined(MODVERSIONS)
 #include <linux/modversions.h>
@@ -328,7 +329,8 @@ static void deliver_recv_msg(struct ssif_info *ssif_info,
 {
        if (msg->rsp_size < 0) {
                return_hosed_msg(ssif_info, msg);
-               pr_err("%s: Malformed message: rsp_size = %d\n",
+               dev_err(&ssif_info->client->dev,
+                       "%s: Malformed message: rsp_size = %d\n",
                       __func__, msg->rsp_size);
        } else {
                ipmi_smi_msg_received(ssif_info->intf, msg);
@@ -545,7 +547,8 @@ static void start_get(struct ssif_info *ssif_info)
        if (rv < 0) {
                /* request failed, just return the error. */
                if (ssif_info->ssif_debug & SSIF_DEBUG_MSG)
-                       pr_info("Error from i2c_non_blocking_op(5)\n");
+                       dev_dbg(&ssif_info->client->dev,
+                               "Error from i2c_non_blocking_op(5)\n");
 
                msg_done_handler(ssif_info, -EIO, NULL, 0);
        }
@@ -647,7 +650,8 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
                ssif_inc_stat(ssif_info, receive_errors);
 
                if  (ssif_info->ssif_debug & SSIF_DEBUG_MSG)
-                       pr_info("Error in msg_done_handler: %d\n", result);
+                       dev_dbg(&ssif_info->client->dev,
+                               "%s: Error %d\n", __func__, result);
                len = 0;
                goto continue_op;
        }
@@ -672,7 +676,8 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
                                  ssif_info->recv, I2C_SMBUS_BLOCK_DATA);
                if (rv < 0) {
                        if (ssif_info->ssif_debug & SSIF_DEBUG_MSG)
-                               pr_info("Error from i2c_non_blocking_op(1)\n");
+                               dev_dbg(&ssif_info->client->dev,
+                                       "Error from i2c_non_blocking_op(1)\n");
 
                        result = -EIO;
                } else
@@ -685,7 +690,8 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
                if (len == 0) {
                        result = -EIO;
                        if (ssif_info->ssif_debug & SSIF_DEBUG_MSG)
-                               pr_info("Middle message with no data\n");
+                               dev_dbg(&ssif_info->client->dev,
+                                       "Middle message with no data\n");
 
                        goto continue_op;
                }
@@ -698,7 +704,8 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
                    /* All blocks but the last must have 31 data bytes. */
                        result = -EIO;
                        if (ssif_info->ssif_debug & SSIF_DEBUG_MSG)
-                               pr_info("Received middle message <31\n");
+                               dev_dbg(&ssif_info->client->dev,
+                                       "Received middle message <31\n");
 
                        goto continue_op;
                }
@@ -707,7 +714,8 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
                        /* Received message too big, abort the operation. */
                        result = -E2BIG;
                        if (ssif_info->ssif_debug & SSIF_DEBUG_MSG)
-                               pr_info("Received message too big\n");
+                               dev_dbg(&ssif_info->client->dev,
+                                       "Received message too big\n");
 
                        goto continue_op;
                }
@@ -738,7 +746,8 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
                                           I2C_SMBUS_BLOCK_DATA);
                        if (rv < 0) {
                                if (ssif_info->ssif_debug & SSIF_DEBUG_MSG)
-                                       pr_info("Error from ssif_i2c_send\n");
+                                       dev_dbg(&ssif_info->client->dev,
+                                               "Error from ssif_i2c_send\n");
 
                                result = -EIO;
                        } else
@@ -755,7 +764,8 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
        }
 
        if (ssif_info->ssif_debug & SSIF_DEBUG_STATE)
-               pr_info("DONE 1: state = %d, result=%d\n",
+               dev_dbg(&ssif_info->client->dev,
+                       "DONE 1: state = %d, result=%d\n",
                        ssif_info->ssif_state, result);
 
        flags = ipmi_ssif_lock_cond(ssif_info, &oflags);
@@ -789,8 +799,9 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
                         */
                        ssif_info->ssif_state = SSIF_NORMAL;
                        ipmi_ssif_unlock_cond(ssif_info, flags);
-                       pr_warn("Error getting flags: %d %d, %x\n",
-                               result, len, (len >= 3) ? data[2] : 0);
+                       dev_warn(&ssif_info->client->dev,
+                                "Error getting flags: %d %d, %x\n",
+                                result, len, (len >= 3) ? data[2] : 0);
                } else if (data[0] != (IPMI_NETFN_APP_REQUEST | 1) << 2
                           || data[1] != IPMI_GET_MSG_FLAGS_CMD) {
                        /*
@@ -798,8 +809,9 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
                         * response to a previous command.
                         */
                        ipmi_ssif_unlock_cond(ssif_info, flags);
-                       pr_warn("Invalid response getting flags: %x %x\n",
-                               data[0], data[1]);
+                       dev_warn(&ssif_info->client->dev,
+                                "Invalid response getting flags: %x %x\n",
+                                data[0], data[1]);
                } else {
                        ssif_inc_stat(ssif_info, flag_fetches);
                        ssif_info->msg_flags = data[3];
@@ -811,12 +823,14 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
                /* We cleared the flags. */
                if ((result < 0) || (len < 3) || (data[2] != 0)) {
                        /* Error clearing flags */
-                       pr_warn("Error clearing flags: %d %d, %x\n",
-                               result, len, (len >= 3) ? data[2] : 0);
+                       dev_warn(&ssif_info->client->dev,
+                                "Error clearing flags: %d %d, %x\n",
+                                result, len, (len >= 3) ? data[2] : 0);
                } else if (data[0] != (IPMI_NETFN_APP_REQUEST | 1) << 2
                           || data[1] != IPMI_CLEAR_MSG_FLAGS_CMD) {
-                       pr_warn("Invalid response clearing flags: %x %x\n",
-                               data[0], data[1]);
+                       dev_warn(&ssif_info->client->dev,
+                                "Invalid response clearing flags: %x %x\n",
+                                data[0], data[1]);
                }
                ssif_info->ssif_state = SSIF_NORMAL;
                ipmi_ssif_unlock_cond(ssif_info, flags);
@@ -832,8 +846,9 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
                        handle_flags(ssif_info, flags);
                } else if (msg->rsp[0] != (IPMI_NETFN_APP_REQUEST | 1) << 2
                           || msg->rsp[1] != IPMI_READ_EVENT_MSG_BUFFER_CMD) {
-                       pr_warn("Invalid response getting events: %x %x\n",
-                               msg->rsp[0], msg->rsp[1]);
+                       dev_warn(&ssif_info->client->dev,
+                                "Invalid response getting events: %x %x\n",
+                                msg->rsp[0], msg->rsp[1]);
                        msg->done(msg);
                        /* Take off the event flag. */
                        ssif_info->msg_flags &= ~EVENT_MSG_BUFFER_FULL;
@@ -855,8 +870,9 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
                        handle_flags(ssif_info, flags);
                } else if (msg->rsp[0] != (IPMI_NETFN_APP_REQUEST | 1) << 2
                           || msg->rsp[1] != IPMI_GET_MSG_CMD) {
-                       pr_warn("Invalid response clearing flags: %x %x\n",
-                               msg->rsp[0], msg->rsp[1]);
+                       dev_warn(&ssif_info->client->dev,
+                                "Invalid response clearing flags: %x %x\n",
+                                msg->rsp[0], msg->rsp[1]);
                        msg->done(msg);
 
                        /* Take off the msg flag. */
@@ -882,7 +898,8 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
                ipmi_ssif_unlock_cond(ssif_info, flags);
 
        if (ssif_info->ssif_debug & SSIF_DEBUG_STATE)
-               pr_info("DONE 2: state = %d.\n", ssif_info->ssif_state);
+               dev_dbg(&ssif_info->client->dev,
+                       "DONE 2: state = %d.\n", ssif_info->ssif_state);
 }
 
 static void msg_written_handler(struct ssif_info *ssif_info, int result,
@@ -902,7 +919,8 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result,
                        ssif_inc_stat(ssif_info, send_errors);
 
                        if (ssif_info->ssif_debug & SSIF_DEBUG_MSG)
-                               pr_info("%s: Out of retries\n", __func__);
+                               dev_dbg(&ssif_info->client->dev,
+                                       "%s: Out of retries\n", __func__);
                        msg_done_handler(ssif_info, -EIO, NULL, 0);
                        return;
                }
@@ -914,7 +932,8 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result,
                 * handle it.
                 */
                if (ssif_info->ssif_debug & SSIF_DEBUG_MSG)
-                       pr_info("Error in msg_written_handler: %d\n", result);
+                       dev_dbg(&ssif_info->client->dev,
+                               "%s: Error  %d\n", __func__, result);
 
                msg_done_handler(ssif_info, result, NULL, 0);
                return;
@@ -958,7 +977,8 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result,
                        ssif_inc_stat(ssif_info, send_errors);
 
                        if (ssif_info->ssif_debug & SSIF_DEBUG_MSG)
-                               pr_info("Error from i2c_non_blocking_op(3)\n");
+                               dev_dbg(&ssif_info->client->dev,
+                                       "Error from i2c_non_blocking_op(3)\n");
                        msg_done_handler(ssif_info, -EIO, NULL, 0);
                }
        } else {
@@ -1014,7 +1034,8 @@ static int start_resend(struct ssif_info *ssif_info)
        rv = ssif_i2c_send(ssif_info, msg_written_handler, I2C_SMBUS_WRITE,
                          command, ssif_info->data, I2C_SMBUS_BLOCK_DATA);
        if (rv && (ssif_info->ssif_debug & SSIF_DEBUG_MSG))
-               pr_info("Error from i2c_non_blocking_op(4)\n");
+               dev_dbg(&ssif_info->client->dev,
+                       "Error from i2c_non_blocking_op(4)\n");
        return rv;
 }
 
@@ -1083,7 +1104,8 @@ static void sender(void                *send_info,
                struct timespec64 t;
 
                ktime_get_real_ts64(&t);
-               pr_info("**Enqueue %02x %02x: %lld.%6.6ld\n",
+               dev_dbg(&ssif_info->client->dev,
+                       "**Enqueue %02x %02x: %lld.%6.6ld\n",
                        msg->data[0], msg->data[1],
                        (long long)t.tv_sec, (long)t.tv_nsec / NSEC_PER_USEC);
        }
@@ -1614,7 +1636,8 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)
 
        slave_addr = find_slave_address(client, slave_addr);
 
-       pr_info("Trying %s-specified SSIF interface at i2c address 0x%x, adapter %s, slave address 0x%x\n",
+       dev_info(&client->dev,
+                "Trying %s-specified SSIF interface at i2c address 0x%x, adapter %s, slave address 0x%x\n",
                ipmi_addr_src_to_str(ssif_info->addr_source),
                client->addr, client->adapter->name, slave_addr);
 
@@ -1629,7 +1652,8 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)
        if (!rv && (len >= 3) && (resp[2] == 0)) {
                if (len < 7) {
                        if (ssif_dbg_probe)
-                               pr_info("SSIF info too short: %d\n", len);
+                               dev_dbg(&ssif_info->client->dev,
+                                       "SSIF info too short: %d\n", len);
                        goto no_support;
                }
 
@@ -1666,7 +1690,8 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)
        } else {
  no_support:
                /* Assume no multi-part or PEC support */
-               pr_info("Error fetching SSIF: %d %d %2.2x, your system probably doesn't support this command so using defaults\n",
+               dev_info(&ssif_info->client->dev,
+                        "Error fetching SSIF: %d %d %2.2x, your system probably doesn't support this command so using defaults\n",
                        rv, len, resp[2]);
 
                ssif_info->max_xmit_msg_size = 32;
@@ -1683,16 +1708,18 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)
        msg[2] = WDT_PRE_TIMEOUT_INT;
        rv = do_cmd(client, 3, msg, &len, resp);
        if (rv || (len < 3) || (resp[2] != 0))
-               pr_warn("Unable to clear message flags: %d %d %2.2x\n",
-                       rv, len, resp[2]);
+               dev_warn(&ssif_info->client->dev,
+                        "Unable to clear message flags: %d %d %2.2x\n",
+                        rv, len, resp[2]);
 
        /* Attempt to enable the event buffer. */
        msg[0] = IPMI_NETFN_APP_REQUEST << 2;
        msg[1] = IPMI_GET_BMC_GLOBAL_ENABLES_CMD;
        rv = do_cmd(client, 2, msg, &len, resp);
        if (rv || (len < 4) || (resp[2] != 0)) {
-               pr_warn("Error getting global enables: %d %d %2.2x\n",
-                       rv, len, resp[2]);
+               dev_warn(&ssif_info->client->dev,
+                        "Error getting global enables: %d %d %2.2x\n",
+                        rv, len, resp[2]);
                rv = 0; /* Not fatal */
                goto found;
        }
@@ -1710,8 +1737,9 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)
        msg[2] = ssif_info->global_enables | IPMI_BMC_EVT_MSG_BUFF;
        rv = do_cmd(client, 3, msg, &len, resp);
        if (rv || (len < 2)) {
-               pr_warn("Error setting global enables: %d %d %2.2x\n",
-                       rv, len, resp[2]);
+               dev_warn(&ssif_info->client->dev,
+                        "Error setting global enables: %d %d %2.2x\n",
+                        rv, len, resp[2]);
                rv = 0; /* Not fatal */
                goto found;
        }
@@ -1731,8 +1759,9 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)
        msg[2] = ssif_info->global_enables | IPMI_BMC_RCV_MSG_INTR;
        rv = do_cmd(client, 3, msg, &len, resp);
        if (rv || (len < 2)) {
-               pr_warn("Error setting global enables: %d %d %2.2x\n",
-                       rv, len, resp[2]);
+               dev_warn(&ssif_info->client->dev,
+                        "Error setting global enables: %d %d %2.2x\n",
+                        rv, len, resp[2]);
                rv = 0; /* Not fatal */
                goto found;
        }
@@ -1745,8 +1774,9 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)
 
  found:
        if (ssif_dbg_probe) {
-               pr_info("ssif_probe: i2c_probe found device at i2c address %x\n",
-                       client->addr);
+               dev_dbg(&ssif_info->client->dev,
+                      "%s: i2c_probe found device at i2c address %x\n",
+                      __func__, client->addr);
        }
 
        spin_lock_init(&ssif_info->lock);
@@ -1801,7 +1831,8 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)
                               &ssif_info->client->dev,
                               slave_addr);
        if (rv) {
-               pr_err("Unable to register device: error %d\n", rv);
+               dev_err(&ssif_info->client->dev,
+                       "Unable to register device: error %d\n", rv);
                goto out_remove_attr;
        }
 
@@ -1810,7 +1841,8 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)
                if (addr_info)
                        addr_info->client = NULL;
 
-               dev_err(&client->dev, "Unable to start IPMI SSIF: %d\n", rv);
+               dev_err(&ssif_info->client->dev,
+                       "Unable to start IPMI SSIF: %d\n", rv);
                kfree(ssif_info);
        }
        kfree(resp);