From patchwork Thu Apr 25 17:08:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13643593 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CBDB8C4345F for ; Thu, 25 Apr 2024 17:09:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=O1ynmo8vczOfecm8kfBU/wMXypln4rtxiG4hdyk0YtY=; b=rOjuBdN5HhHhdb O+zxhR37ZOFTCMNTLX3uVNNH/Q1utpXTdsfqcKY11ejfNtAxSCX9vciR+wCNtyzm120rbjwP6p5E5 elKurKyNAWkDJVVI+RiKhxRcWr9YmvRwX+IfKNPB8MJxKwi7VW/AJUTH0IJMWyaNoIi9gs/9Dz6H8 2FVssbRrNkbNy07sl/FIzrJHIf837S4dbdmEAHr+/7ZHpO1uJkxHA9gfrMWRPDf3PYOffACLirV+o lZzuBxa8kn0mCYQ/m4utrNKjZcgFKMTEjstaGrXwHZQmjiIlg/i9WTxgCrYq7aba8xQVvO56GqlQq asrTl1pivFAN7K7S7ebg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s02az-00000009W9f-3Yz0; Thu, 25 Apr 2024 17:09:17 +0000 Received: from mgamail.intel.com ([192.198.163.18]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s02ao-00000009W5T-37Jc for linux-arm-kernel@lists.infradead.org; Thu, 25 Apr 2024 17:09:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1714064946; x=1745600946; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Poecu4f5dpmnBhjDNs+GIeQe2EIjAchr4YDeOe285sY=; b=GNmuC1cVmCvGBfkul0kjpLqN5Ojv9qlnrItTTWFG+TWSmmGPtwOex85v OiTZzrV7X4YtM4nE3IK/653Y2BJGaLIq2lwMZSBpjn4kT+nOMHhz4nNNA 1NlTAsaeUQvr60Ng2w+qLFQBl4pKv3aJVDrDCc/Qj4bOmVm2AtY4egNph 9I8roF9Vnxl7zWoflKAQ9zcHI7Ml1gXCp5Y+IlRyBqM1nOJjrMEl7kBRq Ncq6Na2/uvlrFMxoM73gPMNggC0lXYNGSo9aZvmeuUemJ4iHg9drARt/t xiaNRR2r2uyUSXcDdkwHcAV9mTSE/8q2yzqxj1znmuNbH8O3vsbBLFAsC g==; X-CSE-ConnectionGUID: C4Q5ZVZZSjaYd4lBaLIZaw== X-CSE-MsgGUID: 9CSVuoYJTCCJWX0BvXHjxw== X-IronPort-AV: E=McAfee;i="6600,9927,11055"; a="9618906" X-IronPort-AV: E=Sophos;i="6.07,230,1708416000"; d="scan'208";a="9618906" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Apr 2024 10:09:04 -0700 X-CSE-ConnectionGUID: LqkwhMLARgq9KjVdNaAqPw== X-CSE-MsgGUID: X+Lavs6MTwqvEI8THCiJtg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,230,1708416000"; d="scan'208";a="29945986" Received: from black.fi.intel.com ([10.237.72.28]) by orviesa004.jf.intel.com with ESMTP; 25 Apr 2024 10:09:03 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 8B5E75B2; Thu, 25 Apr 2024 20:09:01 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] mmc: atmel-mci: Switch to use dev_err_probe() Date: Thu, 25 Apr 2024 20:08:45 +0300 Message-ID: <20240425170900.3767990-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1336.g36b5255a03ac In-Reply-To: <20240425170900.3767990-1-andriy.shevchenko@linux.intel.com> References: <20240425170900.3767990-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240425_100906_825429_AFCF6547 X-CRM114-Status: GOOD ( 11.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aubin Constans , Ulf Hansson , Alexandre Belloni , Claudiu Beznea Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Switch to use dev_err_probe() to simplify the error path and unify a message template. Signed-off-by: Andy Shevchenko --- drivers/mmc/host/atmel-mci.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 9ae3ce14db50..8199d9620075 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -632,10 +632,8 @@ static int atmci_of_init(struct atmel_mci *host) u32 slot_id; int err; - if (!np) { - dev_err(dev, "device node not found\n"); - return ERR_PTR(-EINVAL); - } + if (!np) + return dev_err_probe(dev, -EINVAL, "device node not found\n"); for_each_child_of_node(np, cnp) { if (of_property_read_u32(cnp, "reg", &slot_id)) { @@ -2551,7 +2549,7 @@ static int atmci_probe(struct platform_device *pdev) } if (!nr_slots) { - dev_err(dev, "init failed: no slot defined\n"); + dev_err_probe(dev, ret, "init failed: no slot defined\n"); goto err_init_slot; } @@ -2560,8 +2558,7 @@ static int atmci_probe(struct platform_device *pdev) &host->buf_phys_addr, GFP_KERNEL); if (!host->buffer) { - ret = -ENOMEM; - dev_err(dev, "buffer allocation failed\n"); + ret = dev_err_probe(dev, -ENOMEM, "buffer allocation failed\n"); goto err_dma_alloc; } }