From patchwork Fri Mar 13 15:43:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 6006521 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 05B6C9F318 for ; Fri, 13 Mar 2015 15:51:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2E07E201F5 for ; Fri, 13 Mar 2015 15:51:26 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3E72C20211 for ; Fri, 13 Mar 2015 15:51:25 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YWRpD-0007UK-NT; Fri, 13 Mar 2015 15:48:35 +0000 Received: from mail-la0-f51.google.com ([209.85.215.51]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YWRlT-0003al-Aq for linux-arm-kernel@lists.infradead.org; Fri, 13 Mar 2015 15:44:44 +0000 Received: by labgq15 with SMTP id gq15so23487704lab.4 for ; Fri, 13 Mar 2015 08:44:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pkEhFHe4m+JxGZLefdHym5Vvrg8aAXD6yZT1ZYa8hIg=; b=NtcqaXPhGL2QH+W5ShYRMAKSs1RAEvVujSfNM1I6SEmffM4+fXVNor92QttcwHdi4r 8CfFXxWkkaVex3IXYw9ImM8VMvlgbckB5LD5yRdnGaBxjQ/B62RMSO9i/eDyIqlwYRCH zDYE91Oz1sX3n0le6p1m7sU/Pf2lL3E8JdtavE5iM+Smmi7Dp9w2qScr6Q3btjiKnEq3 5F2Qz75FKWH1dGrpZBtItm11UYvcCUxM9OKRb1Y7jBDwqXX2VrZqN5ZfDk4m8Gk6bpJa 6Jbl1cT5nNsIfVbUwlKIiyqCs7jGSlVq8suKQaw+w8Nd8bGQw0NczxM2KO5QjxON9Tna LKsg== X-Gm-Message-State: ALoCoQlaab2HF/Ld3zA7KV1CPpkPbRC90zS4V3xJttEQvvMtTMmnkgpfz+WsYrnczz9nxPbmqmyF X-Received: by 10.112.92.66 with SMTP id ck2mr43572840lbb.105.1426261460768; Fri, 13 Mar 2015 08:44:20 -0700 (PDT) Received: from uffe-Latitude-E6430s.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id i9sm471248lbs.26.2015.03.13.08.44.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Mar 2015 08:44:20 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , Kevin Hilman , linux-pm@vger.kernel.org Subject: [PATCH 7/9] mmc: core: Attach PM domain prior probing of SDIO func driver Date: Fri, 13 Mar 2015 16:43:47 +0100 Message-Id: <1426261429-31883-8-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426261429-31883-1-git-send-email-ulf.hansson@linaro.org> References: <1426261429-31883-1-git-send-email-ulf.hansson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150313_084443_632363_F987EE89 X-CRM114-Status: GOOD ( 10.54 ) X-Spam-Score: -0.7 (/) Cc: Aaron Lu , Ulf Hansson , Russell King , Geert Uytterhoeven , Wolfram Sang , Greg Kroah-Hartman , Dmitry Torokhov , Mark Brown , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Align the behvaior to how other buses are handling attachment of PM domains. Additionally, let's add error handling. Cc: Aaron Lu Signed-off-by: Ulf Hansson Acked-by: Aaron Lu --- For reference, this change has been discussed before. http://lists.infradead.org/pipermail/linux-arm-kernel/2014-October/294278.html --- drivers/mmc/core/sdio_bus.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c index bee02e6..71357b8 100644 --- a/drivers/mmc/core/sdio_bus.c +++ b/drivers/mmc/core/sdio_bus.c @@ -315,13 +315,19 @@ int sdio_add_func(struct sdio_func *func) sdio_set_of_node(func); sdio_acpi_set_handle(func); + + ret = dev_pm_domain_attach(&func->dev, false); + if (ret) + return ret; + ret = device_add(&func->dev); - if (ret == 0) { - sdio_func_set_present(func); - dev_pm_domain_attach(&func->dev, false); + if (ret) { + dev_pm_domain_detach(&func->dev, false); + return ret; } - return ret; + sdio_func_set_present(func); + return 0; } /*