From patchwork Thu Apr 26 08:53:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 10365059 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 34E56602DC for ; Thu, 26 Apr 2018 09:00:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 26DA729097 for ; Thu, 26 Apr 2018 09:00:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1AAF22909E; Thu, 26 Apr 2018 09:00:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5A9F02909B for ; Thu, 26 Apr 2018 09:00:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=sk8c5j0nS2eSlEvao155RCgHjr44Gox4b076ra209bw=; b=Y/smNHi1BuWtJCjh1gTEC59jOf 8d3GN6X5/jMEFg9m1MEwb+sCatIOwdroqdTxmFXfUy8YlXkCNC/TAWhgDV0RMCsbwzSw1m6B/TpP6 shRzGyUrQN8lr3YWew2b6VRGN+tcni7NxVp4zxaN8ZIahBo3mzd6PXhIp7soM/iP0d+7B58iVQY0O 0ZpVBTT1vKZ8LWxYFM+gq0Pnaijp20oNW32c7vVFcM1288/s/l9gf4JArul4ArxvZGYUZ0e2MYUXE 2+pMxMASBas3xY71oVGO4D6GHEJHXfVdjP7HMBgIcKDPYgCWKZK8NmuMQv3K3V0tuugfnn8u15MLG kN4T7EcQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fBclC-0000sg-Rm; Thu, 26 Apr 2018 09:00:14 +0000 Received: from mail-lf0-x242.google.com ([2a00:1450:4010:c07::242]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fBceh-0004bC-03 for linux-arm-kernel@lists.infradead.org; Thu, 26 Apr 2018 08:53:50 +0000 Received: by mail-lf0-x242.google.com with SMTP id m18-v6so12232813lfb.0 for ; Thu, 26 Apr 2018 01:53:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rlrpHb/IeX5xP3SDTjra/zpY68YkXnTDM31XH0nhg+w=; b=erboZ726gLb32PLZTg+zkx7X3M1NsEd2Otmi4MtLIBl3FQu2qsH7HMyqy7gOY0SR1h Ztof8dJRE3lAPsjQgjMQR8jGHKjRKqeDmJW5ZnLfam6z+EcJMru4RBZ1wm7kU6t7TDmV xXrEujyGJp6nko5wdATO1OR8cqgvGnCGmYo2E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rlrpHb/IeX5xP3SDTjra/zpY68YkXnTDM31XH0nhg+w=; b=oPDeclJsGPnyVjbLfBZql9TBdPHwHlcxMDsZnL6Iih1MzUZKegaP2qr9FlY0hCCh3V oKqHB0vNLarW7E0mt6s+sFlTUC1nOyeTVBk8e6g4lnFhFbEHoENObHhxmaEu2vJexKcw el2l+k1q1Y5fEZSq/HF/F8w/eDIFm4D8qY3g37CN6V0zslEgTwMHOojriNeWiIV7LD2t 3MmNmuZd8JcJKBJgupDXanNxcRsGMBoCZ8Cc4/1PsFgXYrbgRSy9YBAv7KMKY3BwjjpO HLZg4tKNKSvTrUZH6iB48Mc7lIyKsT7ebCqSVxszXBOZnSJdIwVwbyKrzngqpZVycP1G vvRg== X-Gm-Message-State: ALQs6tDtqOr1JoRNm4zdlzbaydz8ylNOoQN/bu5uk1vteAtnd6IiXUpu DCoG/IHriC4rqCeNqR3XpInkQQ== X-Google-Smtp-Source: AB8JxZo4zVxcacJ9yKjlB/IJFq/AqR9WWf+d4AGgC5HSHcYgPfMP7Tn5imDu+bDc+/qfDi1F25griA== X-Received: by 2002:a19:8dd4:: with SMTP id p203-v6mr3651009lfd.137.1524732809021; Thu, 26 Apr 2018 01:53:29 -0700 (PDT) Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id u83-v6sm681097lff.65.2018.04.26.01.53.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Apr 2018 01:53:28 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Greg Kroah-Hartman , linux-pm@vger.kernel.org Subject: [PATCH 10/11] soundwire: Respect all error codes from dev_pm_domain_attach() Date: Thu, 26 Apr 2018 10:53:09 +0200 Message-Id: <1524732790-2234-11-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524732790-2234-1-git-send-email-ulf.hansson@linaro.org> References: <1524732790-2234-1-git-send-email-ulf.hansson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180426_015331_147002_09A7192F X-CRM114-Status: GOOD ( 17.69 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ulf Hansson , Vincent Guittot , Geert Uytterhoeven , Kevin Hilman , Vinod Koul , Viresh Kumar , Wolfram Sang , Pierre-Louis Bossart , Russell King , Mark Brown , linux-arm-kernel@lists.infradead.org, Sanyog Kale , linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The limitation of being able to check only for -EPROBE_DEFER from dev_pm_domain_attach() has been removed. Hence let's respect all error codes and bail out accordingly. Cc: Vinod Koul Cc: Sanyog Kale Cc: Pierre-Louis Bossart Signed-off-by: Ulf Hansson Acked-by: Vinod Koul --- drivers/soundwire/bus_type.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c index d5f3a70..283b283 100644 --- a/drivers/soundwire/bus_type.c +++ b/drivers/soundwire/bus_type.c @@ -83,17 +83,16 @@ static int sdw_drv_probe(struct device *dev) * attach to power domain but don't turn on (last arg) */ ret = dev_pm_domain_attach(dev, false); - if (ret != -EPROBE_DEFER) { - ret = drv->probe(slave, id); - if (ret) { - dev_err(dev, "Probe of %s failed: %d\n", drv->name, ret); - dev_pm_domain_detach(dev, false); - } - } - if (ret) return ret; + ret = drv->probe(slave, id); + if (ret) { + dev_err(dev, "Probe of %s failed: %d\n", drv->name, ret); + dev_pm_domain_detach(dev, false); + return ret; + } + /* device is probed so let's read the properties now */ if (slave->ops && slave->ops->read_prop) slave->ops->read_prop(slave);