From: Sasha Levin Date: Mon, 31 May 2021 21:33:26 +0000 (-0400) Subject: Fix backport of net-netcp-fix-an-error-message.patch X-Git-Tag: v4.4.271~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bffabfa6c33f51c23b3c2a3c18e45dd9fe5b0e5;p=thirdparty%2Fkernel%2Fstable-queue.git Fix backport of net-netcp-fix-an-error-message.patch Signed-off-by: Sasha Levin --- 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 7347391c415..4cc23344b15 100644 --- 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 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 Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- - 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 574b7ca60a4..4cc23344b15 100644 --- 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 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 Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- - 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 f9b9ea7e056..4cc23344b15 100644 --- 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 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 Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- - 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 b41d29f5c3a..4cc23344b15 100644 --- 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 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 Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- - 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 6da85ef64fc..4cc23344b15 100644 --- 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 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 Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- - 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