From patchwork Thu Dec 23 17:11:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Shtylyov X-Patchwork-Id: 12698513 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 9C7F1C433FE for ; Thu, 23 Dec 2021 17:13:52 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7ms4yTBPSgv6HHp5Q/jHX3XUHtrm9kgv3DQzNUMqBXA=; b=OBuzAeH9yd+5Ty YWVa8YMDq8c51gUUE4ezWRskx2BzLfjbbBVavTW+tYEMqJ1jCIM5TccYlQpeV2mFpxV/tCBPDAmWt dMHdnrdfRTLtW57ltnnv6qLCzUfh4bNCfAQXRQ5smlIVqeJjKoqBH1WgdQzmaTD4y1x2s4Vim6fbo O5Ro/5JF97Y8FU7VBg5et2OhzVYXAAF9e2Ss+7RvGy+uRzuIn93swgz43KceWWLhXaAHBuFxG5rW2 jNvHBwzr4Vv5Kb0uRQBQPZeoYybGjOOdj+71+Zpl9uYISCkEorxX2+FtwE8HYF/ABc84LnE/s13Ka Di4eyXV8EW0dcaVKJRYA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n0Rdc-00D8Jg-0w; Thu, 23 Dec 2021 17:12:20 +0000 Received: from mxout01.lancloud.ru ([45.84.86.81]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n0RdY-00D8G6-2a for linux-arm-kernel@lists.infradead.org; Thu, 23 Dec 2021 17:12:17 +0000 Received: from LanCloud DKIM-Filter: OpenDKIM Filter v2.11.0 mxout01.lancloud.ru 4B0B520279EF Received: from LanCloud Received: from LanCloud Received: from LanCloud From: Sergey Shtylyov To: Ulf Hansson , CC: Ben Dooks , Subject: [PATCH RFC 08/13] mmc: s3mci: fix deferred probing Date: Thu, 23 Dec 2021 20:11:57 +0300 Message-ID: <20211223171202.8224-9-s.shtylyov@omp.ru> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20211223171202.8224-1-s.shtylyov@omp.ru> References: <20211223171202.8224-1-s.shtylyov@omp.ru> MIME-Version: 1.0 X-Originating-IP: [192.168.11.198] X-ClientProxiedBy: LFEXT02.lancloud.ru (fd00:f066::142) To LFEX1907.lancloud.ru (fd00:f066::207) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211223_091216_317237_546FA67A X-CRM114-Status: GOOD ( 12.64 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The driver overrides the error codes and IRQ0 returned by platform_get_irq() to -EINVAL, so if it returns -EPROBE_DEFER, the driver will fail the probe permanently instead of the deferred probing. Switch to propagating the error codes upstream. IRQ0 is no longer returned by platform_get_irq(), so we now can safely ignore it... Fixes: e584e0750213 ("mmc: host: s3cmci: allow probing from device tree") Signed-off-by: Sergey Shtylyov --- drivers/mmc/host/s3cmci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index 8d5929a32d34..719a0b9a2c9e 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c @@ -1573,8 +1573,8 @@ static int s3cmci_probe(struct platform_device *pdev) } host->irq = platform_get_irq(pdev, 0); - if (host->irq <= 0) { - ret = -EINVAL; + if (host->irq < 0) { + ret = host->irq; goto probe_iounmap; }