From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (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 AD3993570CD; Thu, 23 Oct 2025 19:55:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761249334; cv=pass; b=DlACW97YRZndEujgxmaw4KQIsWgu/G26u1se3atm3w6xTb57gN6NQy178MBhwFC1Z1RNTWTdKkgIyuVo6Ykv/ZevOLXen/IXJqtuwfUXqngGEViioXp3c4DjJvvNQ0Jwyk9sWfIGxI3vwYQlQ5VI2+urv+92GVl2KhZSjoo6UxI= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761249334; c=relaxed/simple; bh=JeFKi7qccnoOO4MrHzHsoqcWA38+VyjzLzZHUFKpaW0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LevAMQfp3wFgS6Ho4h+K9pYW7JMcYrrcmYsC6s6ctxrwakUy+IrhpgCwvJ2pc7pNiy0oCLkkiZwbkdUqhBzfpRnf+j2z5gs3mjMo/HFJeKP8phAfziPSKy48/3FxNW6a2e6sNaILVUEagJxayHP9YBWC6toWQ3Fy1Q+6XmhDRWA= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b=Zv4MOrKn; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b="Zv4MOrKn" ARC-Seal: i=1; a=rsa-sha256; t=1761249064; cv=none; d=zohomail.com; s=zohoarc; b=j8TPr1raiaiGVwFd2scEfxIvXznQGjP/bwE+MpSZarIK15pg+ZO8R9rmLQx3xKv3ZPWu6KxpajGNbVntSvym+oUXDJzf5GzUOtAWAFc+PUKPI4r9l8vZhjTyUQQ/IIvpZhsb46UmU74nj8GZ8dzjpl+DHI64m1pYZ9+Q3d5ddsk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761249064; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=sC4S4OgvI8rYow2KhwwhYEnTyWYds7Q2RbkM5QQk8rM=; b=LECtg6z+Z5h2IS8wKz6CMGyGjerYBGQQD+7NSlgdcvU3rP91WFekPgcZEcFlUJK4wkCnjKPuBFXCERwypkffzrP6PQLIAghz4Ph3WmYFPC4+kqnSRCslEifAoOen8UyI2g7jeb16GB04l4PyEJXFI2/bEnYb2cYDumuZ+P6A9vU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=nicolas.frattaroli@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1761249064; s=zohomail; d=collabora.com; i=nicolas.frattaroli@collabora.com; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:References:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=sC4S4OgvI8rYow2KhwwhYEnTyWYds7Q2RbkM5QQk8rM=; b=Zv4MOrKniMIGtMnmt6iOln+TEQ79dc3VScoA//1eetuvPJ3hh1iTiWCDimYLvbvw RiO1DeuqilsCHSqIKuPvLNrtz522CjXSVmtCk18vs+IUArn0KgSquBJtEp/RBuPHjVb 0WJFK9Gf3MqDneUs9wDICSRsWMkPQ1HooLCA1C9I= Received: by mx.zohomail.com with SMTPS id 1761249062931154.5897707928499; Thu, 23 Oct 2025 12:51:02 -0700 (PDT) From: Nicolas Frattaroli Date: Thu, 23 Oct 2025 21:49:26 +0200 Subject: [PATCH v3 08/24] scsi: ufs: mediatek: Rework init function Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251023-mt8196-ufs-v3-8-0f04b4a795ff@collabora.com> References: <20251023-mt8196-ufs-v3-0-0f04b4a795ff@collabora.com> In-Reply-To: <20251023-mt8196-ufs-v3-0-0f04b4a795ff@collabora.com> To: Alim Akhtar , Avri Altman , Bart Van Assche , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Chunfeng Yun , Vinod Koul , Kishon Vijay Abraham I , Peter Wang , Stanley Jhu , "James E.J. Bottomley" , "Martin K. Petersen" , Philipp Zabel , Liam Girdwood , Mark Brown Cc: Louis-Alexis Eyraud , kernel@collabora.com, linux-scsi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-phy@lists.infradead.org, Nicolas Frattaroli X-Mailer: b4 0.14.3 Printing an error message on ENOMEM is pointless. The print will not work because there is no memory. Adding an of_match_device to the init function is pointless. Why would a different device with a different probe function ever use the same init function? Get rid of it. zero-initialising an error variable just so you can then goto a bare return statement with that error variable to signal success is also pointless, just return directly, there's no unwind being done. Signed-off-by: Nicolas Frattaroli --- drivers/ufs/host/ufs-mediatek.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c index a7aab2332ef2..131f71145a12 100644 --- a/drivers/ufs/host/ufs-mediatek.c +++ b/drivers/ufs/host/ufs-mediatek.c @@ -1248,29 +1248,19 @@ static int ufs_mtk_get_supplies(struct ufs_mtk_host *host) */ static int ufs_mtk_init(struct ufs_hba *hba) { - const struct of_device_id *id; struct device *dev = hba->dev; struct ufs_mtk_host *host; struct Scsi_Host *shost = hba->host; - int err = 0; + int err; struct arm_smccc_res res; host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL); - if (!host) { - err = -ENOMEM; - dev_info(dev, "%s: no memory for mtk ufs host\n", __func__); - goto out; - } + if (!host) + return -ENOMEM; host->hba = hba; ufshcd_set_variant(hba, host); - id = of_match_device(ufs_mtk_of_match, dev); - if (!id) { - err = -EINVAL; - goto out; - } - /* Initialize host capability */ ufs_mtk_init_host_caps(hba); @@ -1344,11 +1334,10 @@ static int ufs_mtk_init(struct ufs_hba *hba) ufs_mtk_get_hw_ip_version(hba); - goto out; + return 0; out_variant_clear: ufshcd_set_variant(hba, NULL); -out: return err; } -- 2.51.1.dirty