Fix backport of net-netcp-fix-an-error-message.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/net-netcp-fix-an-error-message.patch b/queue-4.14/net-netcp-fix-an-error-message.patch
index 7347391c41599910faea90958c5ccbc1ad876f37..4cc23344b15dccbdc6caf3692a1568c3cf3db3dc 100644 (file)
--- a/queue-4.14/net-netcp-fix-an-error-message.patch
+++ b/queue-4.14/net-netcp-fix-an-error-message.patch
@@ -1,4 +1,4 @@
-From 2e8da76e120722237d7c0818468c3668f8988354 Mon Sep 17 00:00:00 2001
+From 1732de0900ad7f2ee02870586e73c41194bea6ed Mon Sep 17 00:00:00 2001
 From: Sasha Levin <sashal@kernel.org>
 Date: Sat, 8 May 2021 07:38:22 +0200
 Subject: net: netcp: Fix an error message
@@ -18,24 +18,24 @@ Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/net/ethernet/ti/netcp_core.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ drivers/net/ethernet/ti/netcp_core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
-index 437d36289786..67167bc49a3a 100644
+index 1b2702f74455..4154c48d1ddf 100644
 --- a/drivers/net/ethernet/ti/netcp_core.c
 +++ b/drivers/net/ethernet/ti/netcp_core.c
-@@ -1364,8 +1364,8 @@ int netcp_txpipe_open(struct netcp_tx_pipe *tx_pipe)
+@@ -1350,9 +1350,9 @@ int netcp_txpipe_open(struct netcp_tx_pipe *tx_pipe)
        tx_pipe->dma_queue = knav_queue_open(name, tx_pipe->dma_queue_id,
                                             KNAV_QUEUE_SHARED);
        if (IS_ERR(tx_pipe->dma_queue)) {
--              dev_err(dev, "Could not open DMA queue for channel \"%s\": %d\n",
--                      name, ret);
-+              dev_err(dev, "Could not open DMA queue for channel \"%s\": %pe\n",
-+                      name, tx_pipe->dma_queue);
-               ret = PTR_ERR(tx_pipe->dma_queue);
++              ret = PTR_ERR(tx_pipe->dma_queue);
+               dev_err(dev, "Could not open DMA queue for channel \"%s\": %d\n",
+                       name, ret);
+-              ret = PTR_ERR(tx_pipe->dma_queue);
                goto err;
        }
+ 
 -- 
 2.30.2
 

diff --git a/queue-4.19/net-netcp-fix-an-error-message.patch b/queue-4.19/net-netcp-fix-an-error-message.patch
index 574b7ca60a4d7837c2f3c0c5f50d33357cb0bff6..4cc23344b15dccbdc6caf3692a1568c3cf3db3dc 100644 (file)
--- a/queue-4.19/net-netcp-fix-an-error-message.patch
+++ b/queue-4.19/net-netcp-fix-an-error-message.patch
@@ -1,4 +1,4 @@
-From 63a4d7f495e8303a7b77e1a8e3469bcfeb2cd7f4 Mon Sep 17 00:00:00 2001
+From 1732de0900ad7f2ee02870586e73c41194bea6ed Mon Sep 17 00:00:00 2001
 From: Sasha Levin <sashal@kernel.org>
 Date: Sat, 8 May 2021 07:38:22 +0200
 Subject: net: netcp: Fix an error message
@@ -18,24 +18,24 @@ Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/net/ethernet/ti/netcp_core.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ drivers/net/ethernet/ti/netcp_core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
-index a1d335a3c5e4..60d411bbbdc6 100644
+index 1b2702f74455..4154c48d1ddf 100644
 --- a/drivers/net/ethernet/ti/netcp_core.c
 +++ b/drivers/net/ethernet/ti/netcp_core.c
-@@ -1364,8 +1364,8 @@ int netcp_txpipe_open(struct netcp_tx_pipe *tx_pipe)
+@@ -1350,9 +1350,9 @@ int netcp_txpipe_open(struct netcp_tx_pipe *tx_pipe)
        tx_pipe->dma_queue = knav_queue_open(name, tx_pipe->dma_queue_id,
                                             KNAV_QUEUE_SHARED);
        if (IS_ERR(tx_pipe->dma_queue)) {
--              dev_err(dev, "Could not open DMA queue for channel \"%s\": %d\n",
--                      name, ret);
-+              dev_err(dev, "Could not open DMA queue for channel \"%s\": %pe\n",
-+                      name, tx_pipe->dma_queue);
-               ret = PTR_ERR(tx_pipe->dma_queue);
++              ret = PTR_ERR(tx_pipe->dma_queue);
+               dev_err(dev, "Could not open DMA queue for channel \"%s\": %d\n",
+                       name, ret);
+-              ret = PTR_ERR(tx_pipe->dma_queue);
                goto err;
        }
+ 
 -- 
 2.30.2
 

diff --git a/queue-4.4/net-netcp-fix-an-error-message.patch b/queue-4.4/net-netcp-fix-an-error-message.patch
index f9b9ea7e0564f3586354c61b05bb7c7ee4d48639..4cc23344b15dccbdc6caf3692a1568c3cf3db3dc 100644 (file)
--- a/queue-4.4/net-netcp-fix-an-error-message.patch
+++ b/queue-4.4/net-netcp-fix-an-error-message.patch
@@ -1,4 +1,4 @@
-From 34054b0d8ba397015e0af483dbd852083d54a186 Mon Sep 17 00:00:00 2001
+From 1732de0900ad7f2ee02870586e73c41194bea6ed Mon Sep 17 00:00:00 2001
 From: Sasha Levin <sashal@kernel.org>
 Date: Sat, 8 May 2021 07:38:22 +0200
 Subject: net: netcp: Fix an error message
@@ -18,24 +18,24 @@ Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/net/ethernet/ti/netcp_core.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ drivers/net/ethernet/ti/netcp_core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
-index 37b9b39192ec..8f7610805dda 100644
+index 1b2702f74455..4154c48d1ddf 100644
 --- a/drivers/net/ethernet/ti/netcp_core.c
 +++ b/drivers/net/ethernet/ti/netcp_core.c
-@@ -1284,8 +1284,8 @@ int netcp_txpipe_open(struct netcp_tx_pipe *tx_pipe)
+@@ -1350,9 +1350,9 @@ int netcp_txpipe_open(struct netcp_tx_pipe *tx_pipe)
        tx_pipe->dma_queue = knav_queue_open(name, tx_pipe->dma_queue_id,
                                             KNAV_QUEUE_SHARED);
        if (IS_ERR(tx_pipe->dma_queue)) {
--              dev_err(dev, "Could not open DMA queue for channel \"%s\": %d\n",
--                      name, ret);
-+              dev_err(dev, "Could not open DMA queue for channel \"%s\": %pe\n",
-+                      name, tx_pipe->dma_queue);
-               ret = PTR_ERR(tx_pipe->dma_queue);
++              ret = PTR_ERR(tx_pipe->dma_queue);
+               dev_err(dev, "Could not open DMA queue for channel \"%s\": %d\n",
+                       name, ret);
+-              ret = PTR_ERR(tx_pipe->dma_queue);
                goto err;
        }
+ 
 -- 
 2.30.2
 

diff --git a/queue-4.9/net-netcp-fix-an-error-message.patch b/queue-4.9/net-netcp-fix-an-error-message.patch
index b41d29f5c3aab56bc96e3852d177e852ae439ab5..4cc23344b15dccbdc6caf3692a1568c3cf3db3dc 100644 (file)
--- a/queue-4.9/net-netcp-fix-an-error-message.patch
+++ b/queue-4.9/net-netcp-fix-an-error-message.patch
@@ -1,4 +1,4 @@
-From 8b1ff5766fc718633afb414211c9aba5056b36a4 Mon Sep 17 00:00:00 2001
+From 1732de0900ad7f2ee02870586e73c41194bea6ed Mon Sep 17 00:00:00 2001
 From: Sasha Levin <sashal@kernel.org>
 Date: Sat, 8 May 2021 07:38:22 +0200
 Subject: net: netcp: Fix an error message
@@ -18,24 +18,24 @@ Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/net/ethernet/ti/netcp_core.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ drivers/net/ethernet/ti/netcp_core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
-index 32516661f180..a55e83a0946a 100644
+index 1b2702f74455..4154c48d1ddf 100644
 --- a/drivers/net/ethernet/ti/netcp_core.c
 +++ b/drivers/net/ethernet/ti/netcp_core.c
-@@ -1325,8 +1325,8 @@ int netcp_txpipe_open(struct netcp_tx_pipe *tx_pipe)
+@@ -1350,9 +1350,9 @@ int netcp_txpipe_open(struct netcp_tx_pipe *tx_pipe)
        tx_pipe->dma_queue = knav_queue_open(name, tx_pipe->dma_queue_id,
                                             KNAV_QUEUE_SHARED);
        if (IS_ERR(tx_pipe->dma_queue)) {
--              dev_err(dev, "Could not open DMA queue for channel \"%s\": %d\n",
--                      name, ret);
-+              dev_err(dev, "Could not open DMA queue for channel \"%s\": %pe\n",
-+                      name, tx_pipe->dma_queue);
-               ret = PTR_ERR(tx_pipe->dma_queue);
++              ret = PTR_ERR(tx_pipe->dma_queue);
+               dev_err(dev, "Could not open DMA queue for channel \"%s\": %d\n",
+                       name, ret);
+-              ret = PTR_ERR(tx_pipe->dma_queue);
                goto err;
        }
+ 
 -- 
 2.30.2
 

diff --git a/queue-5.4/net-netcp-fix-an-error-message.patch b/queue-5.4/net-netcp-fix-an-error-message.patch
index 6da85ef64fc41345c55d816517881140a1276d32..4cc23344b15dccbdc6caf3692a1568c3cf3db3dc 100644 (file)
--- a/queue-5.4/net-netcp-fix-an-error-message.patch
+++ b/queue-5.4/net-netcp-fix-an-error-message.patch
@@ -1,4 +1,4 @@
-From c451d6034843a505bd5b3507bdfdc77a736fcd5f Mon Sep 17 00:00:00 2001
+From 1732de0900ad7f2ee02870586e73c41194bea6ed Mon Sep 17 00:00:00 2001
 From: Sasha Levin <sashal@kernel.org>
 Date: Sat, 8 May 2021 07:38:22 +0200
 Subject: net: netcp: Fix an error message
@@ -18,24 +18,24 @@ Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/net/ethernet/ti/netcp_core.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ drivers/net/ethernet/ti/netcp_core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
-index 1b2702f74455..c0025bb8a584 100644
+index 1b2702f74455..4154c48d1ddf 100644
 --- a/drivers/net/ethernet/ti/netcp_core.c
 +++ b/drivers/net/ethernet/ti/netcp_core.c
-@@ -1350,8 +1350,8 @@ int netcp_txpipe_open(struct netcp_tx_pipe *tx_pipe)
+@@ -1350,9 +1350,9 @@ int netcp_txpipe_open(struct netcp_tx_pipe *tx_pipe)
        tx_pipe->dma_queue = knav_queue_open(name, tx_pipe->dma_queue_id,
                                             KNAV_QUEUE_SHARED);
        if (IS_ERR(tx_pipe->dma_queue)) {
--              dev_err(dev, "Could not open DMA queue for channel \"%s\": %d\n",
--                      name, ret);
-+              dev_err(dev, "Could not open DMA queue for channel \"%s\": %pe\n",
-+                      name, tx_pipe->dma_queue);
-               ret = PTR_ERR(tx_pipe->dma_queue);
++              ret = PTR_ERR(tx_pipe->dma_queue);
+               dev_err(dev, "Could not open DMA queue for channel \"%s\": %d\n",
+                       name, ret);
+-              ret = PTR_ERR(tx_pipe->dma_queue);
                goto err;
        }
+ 
 -- 
 2.30.2