Merge tag 'aspeed-5.14-devicetree-2' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / ps3 / ps3av.c

diff --git a/drivers/ps3/ps3av.c b/drivers/ps3/ps3av.c
index 9d66257..516e6d1 100644 (file)
--- a/drivers/ps3/ps3av.c
+++ b/drivers/ps3/ps3av.c
@@ -217,9 +217,9 @@ static int ps3av_send_cmd_pkt(const struct ps3av_send_hdr *send_buf,
        /* send pkt */
        res = ps3av_vuart_write(ps3av->dev, send_buf, write_len);
        if (res < 0) {
-               dev_dbg(&ps3av->dev->core,
-                       "%s: ps3av_vuart_write() failed (result=%d)\n",
-                       __func__, res);
+               dev_warn(&ps3av->dev->core,
+                       "%s:%d: ps3av_vuart_write() failed: %s\n", __func__,
+                       __LINE__, ps3_result(res));
                return res;
        }
 
@@ -230,9 +230,9 @@ static int ps3av_send_cmd_pkt(const struct ps3av_send_hdr *send_buf,
                res = ps3av_vuart_read(ps3av->dev, recv_buf, PS3AV_HDR_SIZE,
                                       timeout);
                if (res != PS3AV_HDR_SIZE) {
-                       dev_dbg(&ps3av->dev->core,
-                               "%s: ps3av_vuart_read() failed (result=%d)\n",
-                               __func__, res);
+                       dev_warn(&ps3av->dev->core,
+                               "%s:%d: ps3av_vuart_read() failed: %s\n", __func__,
+                               __LINE__, ps3_result(res));
                        return res;
                }
 
@@ -240,9 +240,9 @@ static int ps3av_send_cmd_pkt(const struct ps3av_send_hdr *send_buf,
                res = ps3av_vuart_read(ps3av->dev, &recv_buf->cid,
                                       recv_buf->size, timeout);
                if (res < 0) {
-                       dev_dbg(&ps3av->dev->core,
-                               "%s: ps3av_vuart_read() failed (result=%d)\n",
-                               __func__, res);
+                       dev_warn(&ps3av->dev->core,
+                               "%s:%d: ps3av_vuart_read() failed: %s\n", __func__,
+                               __LINE__, ps3_result(res));
                        return res;
                }
                res += PS3AV_HDR_SIZE;  /* total len */
@@ -251,8 +251,8 @@ static int ps3av_send_cmd_pkt(const struct ps3av_send_hdr *send_buf,
        } while (event);
 
        if ((cmd | PS3AV_REPLY_BIT) != recv_buf->cid) {
-               dev_dbg(&ps3av->dev->core, "%s: reply err (result=%x)\n",
-                       __func__, recv_buf->cid);
+               dev_warn(&ps3av->dev->core, "%s:%d: reply err: %x\n", __func__,
+                       __LINE__, recv_buf->cid);
                return -EINVAL;
        }