From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BCF1E219A8A for ; Tue, 30 Jun 2026 03:44:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=192.198.163.16 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782791069; cv=fail; b=SP3uEuhVXP/fZU5mrt53Pns9SUsxnS3nlbuSXn9mENfISSr6S9f4Wl7+1399R64BR0NpiVO1sZGGGMwaQt/pjD0YAJQNAroWxNqXrHf5I9/olkXtyEQ5EE0kvgbmKSn7JywPxqwlxRbjqS7YUWd1BJpYdemsREg+6OlJFJHkQf0= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782791069; c=relaxed/simple; bh=YIx4erVzuVBi3DpLICYRmyqx6YAtIGBrgyXQ7beGI48=; h=Message-ID:Date:Subject:To:CC:References:From:In-Reply-To: Content-Type:MIME-Version; b=EmT3t/tleWMzysEO/4pUQ2LbXqB2lV+TxkFkXggyTGyfS8yljoPpHOiBfcTHD+gR0sOkvznDXfuCIsSWBbeDRCnSMxGKbW05LVeBgEsPzsZEaPVOY1uvfObCkbQUTMo3sLp7ZHrTyP8k/vIKZdQBbUweRZNi+GkZ+JcgrpFq66s= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=MDlQtDe7; arc=fail smtp.client-ip=192.198.163.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="MDlQtDe7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1782791068; x=1814327068; h=message-id:date:subject:to:cc:references:from: in-reply-to:content-transfer-encoding:mime-version; bh=YIx4erVzuVBi3DpLICYRmyqx6YAtIGBrgyXQ7beGI48=; b=MDlQtDe7N3gr6MgfqpBIB92cf7PABu++r3t6McS/oLOZQiSqtb1A2mTl kF1cXbLiV583ImI1POZfw9uddSYeIHiwUXrcWHmt/epaxMHFJYo4tXpnS RNcoj2J1RF15djKLQVPmK0/Y0lv4a6z7C5Jax2MwYv2sd5goGJCXKcUWe u19IZ11PsiK/zsQk6/AVXMuPb+T1MfwYsdhoyrKx4fGGUzxrW0E7p/tb/ S+NhFXrrEcP0nzbCzAx58TST86yRT7eX639XewzGBWWHrQ/jfQSeiohRK sx5zFJOBIuH74cdoDuPK1ykCoi9CaOC7xz4gmHSh87A+U3UwnKzrfB1Bu g==; X-CSE-ConnectionGUID: KOVc3IhnQf6FBbKwxY+dDg== X-CSE-MsgGUID: TG0ir6FXQEShdhEdhUwg+g== X-IronPort-AV: E=McAfee;i="6800,10657,11832"; a="71019703" X-IronPort-AV: E=Sophos;i="6.24,233,1774335600"; d="scan'208";a="71019703" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2026 20:44:27 -0700 X-CSE-ConnectionGUID: pbNs4EW8RKCvhBc4Y7P1Jw== X-CSE-MsgGUID: ELA7+t/wTvSZfZ0CF1HcHQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,233,1774335600"; d="scan'208";a="249503568" Received: from orsmsx903.amr.corp.intel.com ([10.22.229.25]) by fmviesa008.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2026 20:44:27 -0700 Received: from ORSMSX903.amr.corp.intel.com (10.22.229.25) by ORSMSX903.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.43; Mon, 29 Jun 2026 20:44:26 -0700 Received: from ORSEDG903.ED.cps.intel.com (10.7.248.13) by ORSMSX903.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.43 via Frontend Transport; Mon, 29 Jun 2026 20:44:26 -0700 Received: from SA9PR02CU001.outbound.protection.outlook.com (40.93.196.71) by edgegateway.intel.com (134.134.137.113) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.43; Mon, 29 Jun 2026 20:44:26 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=zAlYmmjXbonwTphayH4PW4ADPHeQJyjmjSAwXYCxJyXaEZB6fHRakNJcUdPZY3JVwZGcosTwzez4oC7H3Byht/lP7SoJh1E4dlXExu4EUap4UNRX8JvUKUUYD20MaRkPGv/qHGGTo8w6HRmVYMyj86Si0+NbDXaUh1tdzjP1qRmlhP3/qxVprUSm4MB2DMjvnmL25jvVOpekKc54sjd+CiHZ0xsKekfRwt3lIJHpw8nWDqUJAhGSKZWeWrU8LsVTHwlFt9+oFHwx2Z0mLzQYTo8DIecYszsQODe+XwRzcfiMWaeDIABOo+WFvtcjoPOeZxfAAY24ldf9ucef/PUuow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=wk/HdwV7XLjnYwYfAzi35SWsecUob7hElr0UYoi8W6I=; b=RD6GYQMYq6XGWtlm3iQ66hOoH4PUDszFNKxEHSZXbaroJuRfYG/AeTgDYXsmR6eXKut/pp3SRZYJKjFK6TvHoWgYzzYTaaQb00Zwl7fUiMkH0l4VSpDK5eDKXwz8yDzsQ0ONOnJrDB4w9vGt/d54V3WBy/CmRa3qPJEuLfr+eHpHPb9SDHF6bIav5WjI6/LywgSnN6A/GcWAlWVb7IJDC7CtojSJ8yAT78Wo1I6PKYI+MTRTTK2o/f9SDzsXMAIUonvjO4HUXw1V5uICjC7KGUfWyQrhe20mXOgDoLEOCarwT+46Wwb4XQk6GoggzGUZehioOWftltPOVPi5JRJhig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from CH3PR11MB8496.namprd11.prod.outlook.com (2603:10b6:610:1ba::22) by SA3PR11MB7626.namprd11.prod.outlook.com (2603:10b6:806:307::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.159.17; Tue, 30 Jun 2026 03:44:15 +0000 Received: from CH3PR11MB8496.namprd11.prod.outlook.com ([fe80::5627:e3a5:cb26:b555]) by CH3PR11MB8496.namprd11.prod.outlook.com ([fe80::5627:e3a5:cb26:b555%4]) with mapi id 15.21.0159.018; Tue, 30 Jun 2026 03:44:15 +0000 Message-ID: <263433ed-bd6d-4adc-9c8d-5ab77312993d@intel.com> Date: Tue, 30 Jun 2026 05:43:49 +0200 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net-next v1] ice: use dev_err_probe in all appropriate places in ice_probe() To: Rongguang Wei , CC: , , , Rongguang Wei References: <20260630032537.42605-1-clementwei90@163.com> From: Przemek Kitszel Content-Language: en-US In-Reply-To: <20260630032537.42605-1-clementwei90@163.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: DUZPR01CA0096.eurprd01.prod.exchangelabs.com (2603:10a6:10:4bb::19) To LV3PR11MB8508.namprd11.prod.outlook.com (2603:10b6:408:1b4::8) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR11MB8496:EE_|SA3PR11MB7626:EE_ X-MS-Office365-Filtering-Correlation-Id: 7c422489-9689-49a7-b660-08ded659d0e7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|23010399003|22082099003|18002099003|5023799004|56012099006|11063799006|6133799003; X-Microsoft-Antispam-Message-Info: KX4s6RmbutdbbMVLYm8Qc9NOFUKcYnY5KbvDHk61IWcfdCLzNDKKzBA2de+6vrgJsV8nL55U+xnCzBbP/8aWxMgu4iRU/xh2XRyzquzfkvtvJRNGecWdKt29T7CGgu/aZ7epDBzpkn3E5FFd1ZA3jAH0HhInPbbSRHg0VJPwCz5wEgyfxZ0i3u8IdNZs+3NBhBcn5AyT0MFWdLz960N8j61t2j4uUpLUpq63MY47yyWnlkOx59Q1BNaC7v/d3V2/jLu2t18W8FRIpj4KJDB+7QfF2pqq+HEJUAGBXSsrvrHyFmvSqMVf63LKPj/GUz5OWyDgqXSdOfXMOnvieUcLZUUDFxWqWGD55SmufQAkfcK6Z4+4HR6DIldh3AOP9hHZ5H+zI01Ch/oxLpuufkEmFRUCC+bkY5Ni+tIOVwgqj8lYI1d6JIPHBhDIiPq3D4gvuN50mzMZsiOLk76ys6ciZZixbtHAkQdT7PWNKXuZOfeMBrFKbWKIskhJuuclWPBzsE5Aci6qfnj7ldH2Ei9dJXQbiA9AmG7ks5cnacmchlfFe7uxk5v41I4hxsLydvHrsDv/thAjy7JM6Zs/yc5k7X5GCCAv04xG5ELkVNyJ6cZkWedZOI2qmEBICNYyt3YKwsEnjPlfjzu+h7c6bmzyPkDrCknJYiDPZOF2yhGnXEI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH3PR11MB8496.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(23010399003)(22082099003)(18002099003)(5023799004)(56012099006)(11063799006)(6133799003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QmxKU0RvcFJ5eVFLbG03VUx5SmFyZFdNUGcvbmdyd2VpVkorY2NBbHBnT2Rr?= =?utf-8?B?bm5abmUvZVN0QjJldG9jMUhLbWdMaGdKMmlQeHh6b3M0R0Fpd3N6MGhJZkJX?= =?utf-8?B?dW9LTUlZOERoKzhHMFBqY3Y4eWlEMThVNGNuSnNjTGVQMFI1cm9PYWlrcWM0?= =?utf-8?B?aU5PZGZNMjRBWVVldnIzemJsdS9lRjd5MzNWZmI4Y1NzY3lVMWE5VGV6OGJr?= =?utf-8?B?M1lGYjA0UEQzc1lacGh0bitVYmtVSk9BVzFFMGJmOEgyWjR2ZjRtVFp3SGM2?= =?utf-8?B?MjR1ZE5Ockc3dVhtZW12Z2twUFdoYlQwb1JzUGlQM05UWGNicElzaEw0NWtB?= =?utf-8?B?WElhZ0RPbTU0ZnFqbXFZZWprdGVNOW4vcDBhenlNSXlKcWprMXZVbHBWT2xY?= =?utf-8?B?WEtCalUzUytZTFVjb3NuLzBia1QwV2FjMkZKdWZJQ2I5dlFFLytvczg4bmxx?= =?utf-8?B?Yy82V3NzbFY5UDRZd2RkTktjOW5oS3ltS3JRUjRlbUllS0JxVEdjTUVoem9v?= =?utf-8?B?SUlRMlpWL1hjQkgrTDBFUWF0NDM5STZzWkJRYnUxeXNmM2N5ZDVjcU02cjQy?= =?utf-8?B?Tk1ZOHYzeUNNdENjbEkwQTNzblNTOUtPUSt6NDBCYUxHWXVpMTRudDRsNjJL?= =?utf-8?B?YXFiSFFXRDZkQ1pteEptZEFtRURkVUhXaTZwZzJHNy9LMExPTUJYMUhCanZj?= =?utf-8?B?WDlLOUxvYUhZYUY5ZGk2VHNEWWZkU0syZFh5ME9yeVd6RHgwUWF2ZUErU2NT?= =?utf-8?B?TE5MeDd3MU9lN1NyRzFjUTR6NlROTi9rbHZ0Y3h5aFpIQ1M5OXVDOHloWFRQ?= =?utf-8?B?aEU4ak5vNDlNaGtmRS8xMjJETWlTNzlpM2dUUGdKUnFxbGZSc0V2WEpPL2Ex?= =?utf-8?B?TEdNdldyM3psenNZK2RXMmp3Z3ZnNVA3N0JZUUhZMTIyT1BkaXNZajVjT1dr?= =?utf-8?B?QzlCSUV3S3UycUN1OVZiRDRFeUc1aEdsUkxSdWU1a1VhWXByakhoVzZFbE9B?= =?utf-8?B?SFBuN3VZRzJwUHRQcG90SHpvSUpJM0JVM1pDNWNNRDNnemY5RTRZOXk1QjFl?= =?utf-8?B?UTRiV3NPcXV4bEg1cXlSOWtWUkVXQXhFVGVCZnJUU2FsRmYzMENXRmQvZ1hI?= =?utf-8?B?VDAwWUJkRk0vcnEydVdwaGtTSlFvY3oxNlNjUmNkbGdQc3AxVi9NSHgrTmlm?= =?utf-8?B?bENRZWdSZENwMFdLMXQrTnA3MU9acER0MnVDdkFxMngzbDljbExRaUhlNGZi?= =?utf-8?B?L1BQNUxKTDBVU3dMZ1RnMjlNeElVaklTc3R3KzBQUkM5ZUVwOHhIQ1FSTnNs?= =?utf-8?B?dFRyOGJUd3dydWhsSlVhbXdQQU5Jb1Z5RHhubEtwUFJWckRndmVuU0hieTh5?= =?utf-8?B?NHNDZFlwR1l5c09KTm9KOTRHanI0eHluR1pNcDNUQlpvWFUyeFQrUUE2eUhL?= =?utf-8?B?M1ZHNTV3MDFURVhhcUUrTFBxeDl2cmt1TVgrbElEaC9OTkRkM0hPRmoyQUZW?= =?utf-8?B?dDJUUXhrdDZYaW11MGNnQXB1TjE2Q3hITkV5Z3JHcGlCTlk5TjBGenhHaDdD?= =?utf-8?B?QlFNd3FSL3VvWWFnNUpSQVAvMEVlNXBGbUlXVjhFb3J4bDc0MzllVE95a2tv?= =?utf-8?B?NnR4YlowckoxNVM0ZytFS1hDRGZxUDlMRHFCR3lFT2FMY0pqOWRrdFdIYk9z?= =?utf-8?B?WCtYTmhDSW5QblFsRDN5cGRJaWM3Y1JuS2pHdE4yV010VFdndzgvUG9hNDEr?= =?utf-8?B?bnRma0x6NGpBUTk4d1VtM2FkZ0RoOEdjQTF6OHdDSEpMSEdValp4ekZoQ04r?= =?utf-8?B?ZEUyd2hxWGtJUkt2NzB0ZURaN0RaMUtyUjI1cnNTNEt2L1duQ2JHYjkvenlF?= =?utf-8?B?d1JVUmRROWd0WDZFWWExbjQyNjhVcDVwSVMvOHZrcEtVWitkQTZLRUlHazU1?= =?utf-8?B?VlZsNmNhdUtZZzBKbk1ZZDNtOFdwVUhKbmRrUUUwNDJ1V3o0a0FjZWxCQVFl?= =?utf-8?B?TVA2c0ZHc3BCU0pSSXBOL3VlZmtjZy9TRUcxUThsaXBoQWd5eGduc1RYZTFV?= =?utf-8?B?eTduZ1VpaHhDZjBlUis4TG55Vm5pdFpuYVhteGpFWDgxYVNZcWhCdHdEdmxN?= =?utf-8?B?NnhwNjYycGduT1VyRUVlSjFKM04wSGtZQzFQaHZCSmFYRU1WWXR1b2NwNmxT?= =?utf-8?B?QTIvTjdjaWQrMjRBR3doVStOc2pBcWVQdFpnSUJCRkFmSWJPOGYycW9pRVEv?= =?utf-8?B?MG5teWRraUJwYWljT21WZlUvS2d2NTZpYlVrd0swaGg0VTFhajZ1eUxMRHFi?= =?utf-8?B?R21oOFJIajdHelpHRmlZREFmRk9UUGhzK1RpT0FOaS85eVVzdERsVGdCUEVO?= =?utf-8?Q?fGrvXReUamrol0E4=3D?= X-Exchange-RoutingPolicyChecked: aZtZY+xmZbwwteNhXFQfo5ZcsHvdCA2VAeSC7FbJCGcz9wWZwlC/RqCwbjZJwNQ27Lvi1WicDGrbBYf1ziD1/s41dSGr+LFzTzleq6Pz0xgfsZXJPxSwir7jDL3Hn14wDkn317Pi7GHp5Binwfb2aBwDoqoJBA2C5gRdBFFPHjNtF1+OXLFxkMAfqv7BE0u+I/T5vEyKChaU6171qLYxrvnK+vZDi/Muh7BgvaJpegXbh7yLSSl0mKktzDd7pC1wUNq4j4JEAdsLp6jkUS21zBJyeG4WKh+CZsWgGKHntlqWMz71ONuAHeswlVRTnOhjpb5UfxyoIcRSitLUDNSSPg== X-MS-Exchange-CrossTenant-Network-Message-Id: 7c422489-9689-49a7-b660-08ded659d0e7 X-MS-Exchange-CrossTenant-AuthSource: LV3PR11MB8508.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2026 03:44:15.6219 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nAC7npIAqCtap1PKzuwBny8x1adaPkJYs+kUXYqW2i0WP4VW8aFrB7HPulY2EZHAS8e/fXozOHN5+Sf02fvMq2fFKqldl8uRfz3djbljFpQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR11MB7626 X-OriginatorOrg: intel.com On 6/30/26 05:25, Rongguang Wei wrote: > From: Rongguang Wei > > Use dev_err_probe() can conveniently combines printing s/combines/combine/ you could also wrap at 75 chars, to have better formatting. > an error message with returning the errno and also > simplify the code. > > Signed-off-by: Rongguang Wei thank you, Reviewed-by: Przemek Kitszel > --- > drivers/net/ethernet/intel/ice/ice_main.c | 24 ++++++++--------------- > 1 file changed, 8 insertions(+), 16 deletions(-) > > diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c > index e2fbe111f849..81959eaec708 100644 > --- a/drivers/net/ethernet/intel/ice/ice_main.c > +++ b/drivers/net/ethernet/intel/ice/ice_main.c > @@ -5167,10 +5167,8 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent) > struct ice_hw *hw; > int err; > > - if (pdev->is_virtfn) { > - dev_err(dev, "can't probe a virtual function\n"); > - return -EINVAL; > - } > + if (pdev->is_virtfn) > + return dev_err_probe(dev, -EINVAL, "can't probe a virtual function\n"); > > /* when under a kdump kernel initiate a reset before enabling the > * device in order to clear out any pending DMA transactions. These > @@ -5194,10 +5192,8 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent) > return err; > > err = pcim_iomap_regions(pdev, BIT(ICE_BAR0), dev_driver_string(dev)); > - if (err) { > - dev_err(dev, "BAR0 I/O map error %d\n", err); > - return err; > - } > + if (err) > + return dev_err_probe(dev, err, "BAR0 I/O map error %d\n", err); > > pf = ice_allocate_pf(dev); > if (!pf) > @@ -5208,10 +5204,8 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent) > > /* set up for high or low DMA */ > err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)); > - if (err) { > - dev_err(dev, "DMA configuration failed: 0x%x\n", err); > - return err; > - } > + if (err) > + return dev_err_probe(dev, err, "DMA configuration failed: 0x%x\n", err); > > pci_set_master(pdev); > pf->pdev = pdev; > @@ -5246,10 +5240,8 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent) > return ice_probe_recovery_mode(pf); > > err = ice_init_hw(hw); > - if (err) { > - dev_err(dev, "ice_init_hw failed: %d\n", err); > - return err; > - } > + if (err) > + return dev_err_probe(dev, err, "ice_init_hw failed: %d\n", err); > > ice_init_dev_hw(pf); >