From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9662AC47082 for ; Mon, 31 May 2021 21:42:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 798056128A for ; Mon, 31 May 2021 21:42:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232245AbhEaVoN (ORCPT ); Mon, 31 May 2021 17:44:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:33896 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232042AbhEaVoK (ORCPT ); Mon, 31 May 2021 17:44:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CC6E86101C; Mon, 31 May 2021 21:42:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1622497350; bh=7xqVdJ6VbiQeEU+7EPsKt6LFV9qCZNw0B2oWnGh0sFM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Dv2L+3SysDrZhPc45UFKLI5WmZtzuoO91R84zSJ9SX6VeUDdb8K9WA+RyG2qcoLXE oedyKP8WX7sbO5uM3VZpFkGxdmRvzRLK+E8vUBWA8Blb+47yUdT78Id9OyUWRQCvJY nrm6G8raeKaZhiuNNnmcWxmhcOoA8wjYXEjyvl3AxZ6NLRvlk5KrrMVnE9Ju9UsLdn 8FYWnKGB269awrra1Lj0vtWwrADRXIT34m2cokfq+76srU6IBJSDUt2bmIUmUI1r5O LDA/NGIvHVtcIMdbVbo0/YnxinkgBmni/RBgLGQ+DUuZaYBD5yZdMQd8PhrPr8cq/f A3y1V+obuFssA== Date: Mon, 31 May 2021 17:42:28 -0400 From: Sasha Levin To: Marion & Christophe JAILLET Cc: Greg Kroah-Hartman , linux-kernel@vger.kernel.org, stable@vger.kernel.org, "David S. Miller" , Dan Carpenter Subject: Re: [PATCH 5.4 135/177] net: netcp: Fix an error message Message-ID: References: <20210531130647.887605866@linuxfoundation.org> <20210531130652.606363904@linuxfoundation.org> <60ba11bd-acc0-d48d-ad80-6987847e6e79@wanadoo.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <60ba11bd-acc0-d48d-ad80-6987847e6e79@wanadoo.fr> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, May 31, 2021 at 08:46:03PM +0200, Marion & Christophe JAILLET wrote: > >Le 31/05/2021 à 15:14, Greg Kroah-Hartman a écrit : >>From: Christophe JAILLET >> >>[ Upstream commit ddb6e00f8413e885ff826e32521cff7924661de0 ] >> >>'ret' is known to be 0 here. >>The expected error code is stored in 'tx_pipe->dma_queue', so use it >>instead. >> >>While at it, switch from %d to %pe which is more user friendly. >> >>Fixes: 84640e27f230 ("net: netcp: Add Keystone NetCP core ethernet driver") >>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(-) >> >>diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c >>index 1b2702f74455..c0025bb8a584 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) >> 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); >> goto err; >> } > > >Hi, > >Apparently %pe is only supported up to (including) 5.5. It is not part >of 5.4.123. > >So this patch should not be backported here or should be backported >differently, ie: >   leave dev_err as-is >   move "ret = PTR_ERR(tx_pipe->dma_queue);" 1 line above I'll fix it up the way you've described above. Thanks! -- Thanks, Sasha