Received-SPF: pass (google.com: domain of linux-crypto+bounces-1011-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: ovidiu.panait@windriver.com
To: linux-crypto@vger.kernel.org
Cc: herbert@gondor.apana.org.au, davem@davemloft.net, festevam@gmail.com
Subject: [PATCH v2 10/14] crypto: sahara - use dev_err_probe()
Date: Sun, 24 Dec 2023 10:21:40 +0200
Message-Id: <20231224082144.3894863-11-ovidiu.panait@windriver.com>
In-Reply-To: <20231224082144.3894863-1-ovidiu.panait@windriver.com>
References: <20231224082144.3894863-1-ovidiu.panait@windriver.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?5VS2W+R9sGgyv3DwsjcyGeVk1zwVvuJLfpI3B9VT+M5TFz342+ZRzH7AX4A7?=
 =?us-ascii?Q?lhBxxS7qAgMtSbD3jVwSRx+4+9s6hJcrcn8dxdA23B0K9npPJhCFCbFBZcdw?=
 =?us-ascii?Q?wCQ5bDms7X7SVZAtmRK3Fqu4/wGqOYgqsZu6eT/iwMh93DOS5s7jalhaJtrP?=
 =?us-ascii?Q?K6zPG5yH7VkhWh4vrEXAv+hyDnfO3I9fdAAL/eIfcxEOFLdVloTYcWq1C+77?=
 =?us-ascii?Q?W7SLgvlNr308/7jV3kMbofaUvpKxB88cxlN6NScLEUGFqNkuNlFDfVCfmJxO?=
 =?us-ascii?Q?z21ytkaDA4Wz+qd58O119YF6qcXdOfqUB1oocAtPcKWBL3fWA7qpKpOpVNU6?=
 =?us-ascii?Q?dn8iARte7TuUDzGtV4vIA9pbh2yXIw/76KSKRlfldo3heqiyB8tEQp1jYDAy?=
 =?us-ascii?Q?h5SI5J2VGx0QQwDfltpSeey8Vk6+xwJXBoEXiJsB0d8glf1L9F5rHuhvec/9?=
 =?us-ascii?Q?uEdJUJgkjQlnpBlBs48vILHT7LPxBXRym5j3EmQYPMeIX4jnNo8pSA+jJCBO?=
 =?us-ascii?Q?Gj8CCZ7FT3fRXCymcYz6+CPkwW6RYr1kcTkLUySdDQfeBnK8UJK0DAG/TmHN?=
 =?us-ascii?Q?1IYEgwmC5v3r64YbGmk2qhq93U0WwyFHin0+npi4oS4IzHzk+Y8tdy7gXuP2?=
 =?us-ascii?Q?UjysPGLFtvlf2xvcePkzzSCrfGSyMcfHqEQN+ut405r4Ebqk/vVqQgCrGXR9?=
 =?us-ascii?Q?tSFvES43S4nLwikCpKaAZL/MHmEDCETVNwR1OXFewvsd4fFdMfJG5Bv2Botp?=
 =?us-ascii?Q?VMTudqj9kQM1djwTyUlM7pZ2Oa6ktg1ta3DJmf3At6jS/pXFFWB2BBfj4AJU?=
 =?us-ascii?Q?G45y5ANKEFEEcPSvn9KTEjrr7dLsXFR52Hyblyt0cqQvhKIhT1tfBkqIKxca?=
 =?us-ascii?Q?xu9d7YSKOl4O6p7p1pE4xcy63zz+NCXsNyNp6GKi3n+i9dErPnzGKQN0CE9R?=
 =?us-ascii?Q?IdaGTiE2b+8SbH//lzfxcJ6mCGaNxMpIBZwrQk3vHDkkwTj068SzqV0FFxts?=
 =?us-ascii?Q?h9vKqyWR9DdjD5SEDvNvW7zyeU+h3QHQ42A4sKgiKdXtqV9GzfKhcedJA550?=
 =?us-ascii?Q?Pn/HcGsr9OTAIsWPGAxqAa+98YisU4ygIqb4zIWsW2oByAU/fXljsDRxnvch?=
 =?us-ascii?Q?FIEQ3dTbIsbddDOp9nttSvE1yQwDvt3I9laZ8YZJfvgF3cC5HKH9/OWcYvYL?=
 =?us-ascii?Q?sB6X8ciJbd6n+2sAAqk7BzHbWs8KXyWetDfUUYGD3umGy3EAIfMnHCqKmt87?=
 =?us-ascii?Q?VclgLc76qKWmZ8c8WQYwmNpKKyDHt5ovUlHVNS9A06+MZYPYQn7ilKeEs4Zv?=
 =?us-ascii?Q?CJ0Jcp/I4VqSjr/yp32yzVewvPrRQvvN0iX5sA24D+oBgoDx+pqZ6AYm7Vio?=
 =?us-ascii?Q?D4xsKJGyUitY5S65vT/Xbjy5voJePoNzEZgu84wcT+tyIgPkuoq5Pw1Po+Ty?=
 =?us-ascii?Q?eTKb7CLSeJVbJuwxfIbMoGy5pvdXaq00wTUjxy45c5KBcRPxjwsxc0U9dyTo?=
 =?us-ascii?Q?O4XlK6cVEKusNPI456hf/Y+F3jLqs4r0NHcp+YBK+/7iINm/QVVuFOQXK93O?=
 =?us-ascii?Q?018boGrXJw88ELQjv2oscJmn7iACaxyj2d4y0Ca+DtFrSACJk6MxPk2/vBAC?=
 =?us-ascii?Q?Eg=3D=3D?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e390fe2b-4b7f-403a-ca61-08dc04594b72
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Dec 2023 08:21:14.5820
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 8XmgqTiU4BUNU3uPY6jh8JRZJzPyPU1S6TCQrmCtLVz8mgacd2Qsqf3FUhL0asnZj3NVIWra2SLw1NT0YBD8fjGjpXIRaDPTXgJcyhtOK7M=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4693
X-Proofpoint-ORIG-GUID: tlhS4KvElg-AzNiDnyHk4qpmW557Of5d
X-Proofpoint-GUID: tlhS4KvElg-AzNiDnyHk4qpmW557Of5d
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2023-11-16_25,2023-11-16_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0
 priorityscore=1501 clxscore=1015 malwarescore=0 suspectscore=0 spamscore=0
 adultscore=0 mlxscore=0 mlxlogscore=861 bulkscore=0 impostorscore=0
 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.19.0-2311290000 definitions=main-2312240066

From: Ovidiu Panait <ovidiu.panait@windriver.com>

Switch to use dev_err_probe() to simplify the error paths and unify
message template. While at it, also remove explicit error messages
from every potential -ENOMEM.

Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---
 drivers/crypto/sahara.c | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/drivers/crypto/sahara.c b/drivers/crypto/sahara.c
index 619a1df69410..253a3dafdff1 100644
--- a/drivers/crypto/sahara.c
+++ b/drivers/crypto/sahara.c
@@ -1346,10 +1346,9 @@ static int sahara_probe(struct platform_device *pdev)
 
 	err = devm_request_irq(&pdev->dev, irq, sahara_irq_handler,
 			       0, dev_name(&pdev->dev), dev);
-	if (err) {
-		dev_err(&pdev->dev, "failed to request irq\n");
-		return err;
-	}
+	if (err)
+		return dev_err_probe(&pdev->dev, err,
+				     "failed to request irq\n");
 
 	/* clocks */
 	dev->clk_ipg = devm_clk_get_enabled(&pdev->dev, "ipg");
@@ -1366,10 +1365,8 @@ static int sahara_probe(struct platform_device *pdev)
 	dev->hw_desc[0] = dmam_alloc_coherent(&pdev->dev,
 			SAHARA_MAX_HW_DESC * sizeof(struct sahara_hw_desc),
 			&dev->hw_phys_desc[0], GFP_KERNEL);
-	if (!dev->hw_desc[0]) {
-		dev_err(&pdev->dev, "Could not allocate hw descriptors\n");
+	if (!dev->hw_desc[0])
 		return -ENOMEM;
-	}
 	dev->hw_desc[1] = dev->hw_desc[0] + 1;
 	dev->hw_phys_desc[1] = dev->hw_phys_desc[0] +
 				sizeof(struct sahara_hw_desc);
@@ -1377,10 +1374,8 @@ static int sahara_probe(struct platform_device *pdev)
 	/* Allocate space for iv and key */
 	dev->key_base = dmam_alloc_coherent(&pdev->dev, 2 * AES_KEYSIZE_128,
 				&dev->key_phys_base, GFP_KERNEL);
-	if (!dev->key_base) {
-		dev_err(&pdev->dev, "Could not allocate memory for key\n");
+	if (!dev->key_base)
 		return -ENOMEM;
-	}
 	dev->iv_base = dev->key_base + AES_KEYSIZE_128;
 	dev->iv_phys_base = dev->key_phys_base + AES_KEYSIZE_128;
 
@@ -1388,19 +1383,15 @@ static int sahara_probe(struct platform_device *pdev)
 	dev->context_base = dmam_alloc_coherent(&pdev->dev,
 					SHA256_DIGEST_SIZE + 4,
 					&dev->context_phys_base, GFP_KERNEL);
-	if (!dev->context_base) {
-		dev_err(&pdev->dev, "Could not allocate memory for MDHA context\n");
+	if (!dev->context_base)
 		return -ENOMEM;
-	}
 
 	/* Allocate space for HW links */
 	dev->hw_link[0] = dmam_alloc_coherent(&pdev->dev,
 			SAHARA_MAX_HW_LINK * sizeof(struct sahara_hw_link),
 			&dev->hw_phys_link[0], GFP_KERNEL);
-	if (!dev->hw_link[0]) {
-		dev_err(&pdev->dev, "Could not allocate hw links\n");
+	if (!dev->hw_link[0])
 		return -ENOMEM;
-	}
 	for (i = 1; i < SAHARA_MAX_HW_LINK; i++) {
 		dev->hw_phys_link[i] = dev->hw_phys_link[i - 1] +
 					sizeof(struct sahara_hw_link);
@@ -1431,8 +1422,8 @@ static int sahara_probe(struct platform_device *pdev)
 		version = (version >> 8) & 0xff;
 	}
 	if (err == -ENODEV) {
-		dev_err(&pdev->dev, "SAHARA version %d not supported\n",
-				version);
+		dev_err_probe(&pdev->dev, err,
+			      "SAHARA version %d not supported\n", version);
 		goto err_algs;
 	}
 
-- 
2.34.1