Message ID | 1524732790-2234-7-git-send-email-ulf.hansson@linaro.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> 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 C9D0B602DC for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 26 Apr 2018 08:53:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B96AB2907F for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 26 Apr 2018 08:53:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE0272908D; Thu, 26 Apr 2018 08:53:58 +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 D74762907F for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 26 Apr 2018 08:53:57 +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=0+XU+UpF7vSajoPD/YYojLKjxyImhKUadSh4ZJpZADM=; b=QX3AMFTEe3H1RZ7DOh6Fk4OUm1 UNPrifFBPc3Q2b+2erPailGWVBCrcTRu5ZN3tV+gXl8RzVe1aIjGUhL/VIqR0XjfJhIwloo3jtv0a e/kEXYQ5OtFN1bpRW1259vkWTbX5wdcZdX4ScDIWmdCWZlL7n9nE64ucS379KmJQ2B83T1NY8rhd+ 37IaBmxqDrMle2e4Twa2cjF/9loVvR5ruGIkmv5ERHkPMS1yL2odtyelarODRJiajzmh49pD1af91 CBPzRksR5z6wMC8ssgQ73S2DSmoZ0ECxwqhCAHz2UmnOe/0V/anTZkJoK7W8VyPC4HjPqSfxHQ3EH wMfYoQUw==; 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 1fBcew-0004j3-Ax; Thu, 26 Apr 2018 08:53:46 +0000 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fBced-0004Yw-IX for linux-arm-kernel@lists.infradead.org; Thu, 26 Apr 2018 08:53:36 +0000 Received: by mail-lf0-x241.google.com with SMTP id j16-v6so12294189lfb.7 for <linux-arm-kernel@lists.infradead.org>; Thu, 26 Apr 2018 01:53:25 -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=soNOtJTU3RLapthGVgaxgE2rq+eWjefBnIsGZ8fdPIU=; b=XNyT9mzJnUkGkoFXZutUPqR6OUTdzK7zOJtCsxtOa4FzXYXviyirFT13T/Udc9yQn4 guB3FCR/XQKjsCm3Bex2FGOY08H959IC2f8xPmw+Tq6U4nLaJrFI8eOKZmlnIIe0ONtU 9+mwEATHkJkNqOfN2ZiFRaJ39a2GeuDi+XgJY= 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=soNOtJTU3RLapthGVgaxgE2rq+eWjefBnIsGZ8fdPIU=; b=pZJMmZfCNpA1Hzfwna2gBjdf0xulTsdNaq5nQFRzBJL3ZokY5TLEKWamF9F/8hX5Hx uuoCC5tG0esDmVM9+QytXYp6xp8pmr1guNUgLHj5NwEQ7H6Kl1bxcwShwSctNFugP1a7 3cIwGVyj8Bq2enm4HwBKCcb9a9bXdZB6ELiBePx2JgyZBvwaEuU5PuxL3WilW1Y/fRPU kKen7xmnk+tESBJGrijH7AukIQ/GjWvihK1VIpl6+1lccougj5RZ7ISsIz9tRy+LeOVJ /Wjc43W7wR+nFhacTlYIn6p8ZlBjj/ZNXcP8/BzPXr4GHtAkYmENva0MvCUwFQgIuCF9 MFXw== X-Gm-Message-State: ALQs6tAzGeOR7rQswjfBi/3HgCnGS/kugAtnC7mtGkdfjA8nwN3E8H7x 8arUbPOTkilNUTx08W4JB53/uQ== X-Google-Smtp-Source: AB8JxZpUUskqWy8u6tjl2FAxw4EfS+g2nkLhpili7g5TEQVTRxrLN9JQ6GyyueALctaQCs06aqn/+Q== X-Received: by 2002:a19:dd83:: with SMTP id w3-v6mr16829692lfi.82.1524732804044; Thu, 26 Apr 2018 01:53:24 -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.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Apr 2018 01:53:23 -0700 (PDT) From: Ulf Hansson <ulf.hansson@linaro.org> To: "Rafael J . Wysocki" <rjw@rjwysocki.net>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-pm@vger.kernel.org Subject: [PATCH 06/11] amba: Respect all error codes from dev_pm_domain_attach() Date: Thu, 26 Apr 2018 10:53:05 +0200 Message-Id: <1524732790-2234-7-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_015327_688163_B444E6CF X-CRM114-Status: GOOD ( 15.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: Ulf Hansson <ulf.hansson@linaro.org>, Vincent Guittot <vincent.guittot@linaro.org>, Geert Uytterhoeven <geert+renesas@glider.be>, Kevin Hilman <khilman@kernel.org>, Vinod Koul <vinod.koul@intel.com>, Viresh Kumar <viresh.kumar@linaro.org>, Wolfram Sang <wsa@the-dreams.de>, Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>, Russell King <linux@armlinux.org.uk>, Mark Brown <broonie@kernel.org>, linux-arm-kernel@lists.infradead.org, Sanyog Kale <sanyog.r.kale@intel.com>, linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index 594c228..79fcbff 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -243,7 +243,7 @@ static int amba_probe(struct device *dev) break; ret = dev_pm_domain_attach(dev, true); - if (ret == -EPROBE_DEFER) + if (ret) break; ret = amba_get_enable_pclk(pcdev); @@ -370,7 +370,7 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent) } ret = dev_pm_domain_attach(&dev->dev, true); - if (ret == -EPROBE_DEFER) { + if (ret) { iounmap(tmp); goto err_release; }
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: Russell King <linux@armlinux.org.uk> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- drivers/amba/bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)