From patchwork Thu Apr 26 08:53:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 10365025 X-Patchwork-Delegate: rjw@sisk.pl 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 939F86054E for ; Thu, 26 Apr 2018 08:54:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8664A2907F for ; Thu, 26 Apr 2018 08:54:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79DE229091; Thu, 26 Apr 2018 08:54:49 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 02E9C2907F for ; Thu, 26 Apr 2018 08:54:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754774AbeDZIyr (ORCPT ); Thu, 26 Apr 2018 04:54:47 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:44304 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754745AbeDZIx0 (ORCPT ); Thu, 26 Apr 2018 04:53:26 -0400 Received: by mail-lf0-f66.google.com with SMTP id h197-v6so2141189lfg.11 for ; Thu, 26 Apr 2018 01:53:26 -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=H5Anx8HHtixBsfJHQkkyvqYQI+3r9uHRYHoqlZJ0xFo=; b=YdPW6sbQPY8Muux5gkatKh561Txo8eyhKxXlPQ8jkQ58z67Q639FkquWzMa+en0XeL DA9GalT/t8Yks8vsnzSB9hhLGn6oEvCHyqz8x3NYrChLmnxv4/rfXTI7R3wXqEhgNg// S1L8IU5RI9UEGk5XLjEc+S0Kgqr4EVd/1K4YY= 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=H5Anx8HHtixBsfJHQkkyvqYQI+3r9uHRYHoqlZJ0xFo=; b=KRslMiy/hcRZI3iPyIh42c15bEgY8msPNMtiCjWBm5R7obww4HNV+BHWZvwl2a3Ujl 9vqDmt5BjWFW//7vLI4sIRd8+GQUGrbqIVRLc9Rn3CK0I43Kk4g3LhDHHfy85a0fFEJy SjoFtz1HS/QbgL5L2V2/8h/NSYUwyh9vk8v+csV2/+7IUDtdoJaDYT/Fm9TPdbQtzs1i eW7z2mLWkyQUTI3fIKiGQb5StuMSFSTWJloQKLJBPQmIBfiSfgt9owy4+PDNoGwvEoRV XsNtn/OZCk3+hVdo51H0/oGPEvRzHijta7FispF/kDs9PJyYj1XB3+qZz84+w0okO5FC 7FvQ== X-Gm-Message-State: ALQs6tBG/JlM3gcWybjvWEecNlrl4p5X2KVnRiNDLiOMyXDEcDkCaJQm b1pFHKstShMhYJKTQ285mIIQAg== X-Google-Smtp-Source: AB8JxZq8Upp3SruXHrnUeX4byXevOhdkpWfiIciJPXCcvr+cFZc5+nFzRwL9rxyhIE/fhbS4O8MBnw== X-Received: by 2002:a19:b587:: with SMTP id g7-v6mr16791341lfk.90.1524732805294; Thu, 26 Apr 2018 01:53:25 -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.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Apr 2018 01:53:24 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Greg Kroah-Hartman , linux-pm@vger.kernel.org Cc: Ulf Hansson , Kevin Hilman , Geert Uytterhoeven , Viresh Kumar , Vincent Guittot , Mark Brown , Vinod Koul , Sanyog Kale , Pierre-Louis Bossart , Wolfram Sang , Russell King , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 07/11] driver core: Respect all error codes from dev_pm_domain_attach() Date: Thu, 26 Apr 2018 10:53:06 +0200 Message-Id: <1524732790-2234-8-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> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.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: Greg Kroah-Hartman Signed-off-by: Ulf Hansson Acked-by: Greg Kroah-Hartman --- drivers/base/platform.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 8075ddc..9460139 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -572,17 +572,16 @@ static int platform_drv_probe(struct device *_dev) return ret; ret = dev_pm_domain_attach(_dev, true); - if (ret != -EPROBE_DEFER) { - if (drv->probe) { - ret = drv->probe(dev); - if (ret) - dev_pm_domain_detach(_dev, true); - } else { - /* don't fail if just dev_pm_domain_attach failed */ - ret = 0; - } + if (ret) + goto out; + + if (drv->probe) { + ret = drv->probe(dev); + if (ret) + dev_pm_domain_detach(_dev, true); } +out: if (drv->prevent_deferred_probe && ret == -EPROBE_DEFER) { dev_warn(_dev, "probe deferral not supported\n"); ret = -ENXIO;