From patchwork Fri Nov 28 09:43:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 5402351 X-Patchwork-Delegate: eduardo.valentin@ti.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E69A39F47A for ; Fri, 28 Nov 2014 09:44:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D6DCB20142 for ; Fri, 28 Nov 2014 09:44:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ECC492013D for ; Fri, 28 Nov 2014 09:44:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751658AbaK1Jox (ORCPT ); Fri, 28 Nov 2014 04:44:53 -0500 Received: from mail-pd0-f173.google.com ([209.85.192.173]:58990 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751605AbaK1Jow (ORCPT ); Fri, 28 Nov 2014 04:44:52 -0500 Received: by mail-pd0-f173.google.com with SMTP id ft15so6411677pdb.4 for ; Fri, 28 Nov 2014 01:44:52 -0800 (PST) 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:in-reply-to:references; bh=l7ObMBdurAistg70qHhpLg1MtcTYPLWGAR8dQAtgTTw=; b=DV7E0B5IRddt8wFlECZouz65QArwVsAVp/FoX71KIzEtnH2cu44sHX8fJi8oXRyWAv OSmtSIlyUPoPGh50qIdyRdjjEOJeSZxKZ5IOkIixHhrxS+/b023+aoLy7IcplCdBKB9d LgtfCqQcTBjguMrN7dWiKBgvqbXRrCpMFx7zU0RADPlyQYUG2XxBVffIoWHV/4uxQ3k7 kinbkIs14BvYF2zeCpq/2FM6cChnZYqrgo2L4SmGc+HyzxdG0WJMF0h7a+xelBLqdDc4 I39hE3ckIV1RfoaTPUazQKjH2XWw2acAN9L3shh0YEQFXMDt5ZcMJ1wtkNxMtLw45Zon JQkA== X-Gm-Message-State: ALoCoQnkZQ1M1qxbKjQZY8KSC6YdJU8wHRkq49NlhW7Vc8LTt7BuuXpK3WWopMFzEksBEFcNY93c X-Received: by 10.66.140.8 with SMTP id rc8mr72259618pab.83.1417167892039; Fri, 28 Nov 2014 01:44:52 -0800 (PST) Received: from localhost ([122.167.111.40]) by mx.google.com with ESMTPSA id ir2sm9343047pbc.57.2014.11.28.01.44.50 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 28 Nov 2014 01:44:51 -0800 (PST) From: Viresh Kumar To: linux-pm@vger.kernel.org, edubezval@gmail.com Cc: linaro-kernel@lists.linaro.org, rui.zhang@intel.com, Viresh Kumar , Chanwoo Choi , Kyungmin Park , Amit Daniel Kachhap , Lukasz Majewski Subject: [PATCH 04/26] thermal: exynos: Handle -EPROBE_DEFER properly Date: Fri, 28 Nov 2014 15:13:58 +0530 Message-Id: <79bbedd743bdd82f37a578ece26359432ddccc72.1417167599.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.0.3.693.g996b0fd In-Reply-To: References: In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 cpufreq_cooling_register() can return -EPROBE_DEFER if cpufreq driver isn't ready yet and so the callers must defer their initialization. Exynos thermal drivers weren't handling this well and were raising false error message when -EPROBE_DEFER is returned to them. Fix them to handle -EPROBE_DEFER. Cc: Chanwoo Choi Cc: Kyungmin Park Cc: Amit Daniel Kachhap Cc: Lukasz Majewski Signed-off-by: Viresh Kumar --- drivers/thermal/samsung/exynos_thermal_common.c | 7 ++++--- drivers/thermal/samsung/exynos_tmu.c | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/thermal/samsung/exynos_thermal_common.c b/drivers/thermal/samsung/exynos_thermal_common.c index bf39212..0be1d54 100644 --- a/drivers/thermal/samsung/exynos_thermal_common.c +++ b/drivers/thermal/samsung/exynos_thermal_common.c @@ -369,9 +369,10 @@ int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf) th_zone->cool_dev[th_zone->cool_dev_size] = cpufreq_cooling_register(cpu_present_mask); if (IS_ERR(th_zone->cool_dev[th_zone->cool_dev_size])) { - dev_err(sensor_conf->dev, - "Failed to register cpufreq cooling device\n"); - ret = -EINVAL; + ret = PTR_ERR(th_zone->cool_dev[th_zone->cool_dev_size]); + if (ret != -EPROBE_DEFER) + dev_err(sensor_conf->dev, + "Failed to register cpufreq cooling device\n"); goto err_unregister; } th_zone->cool_dev_size++; diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index 49c0924..cc3677f 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -683,7 +683,9 @@ static int exynos_tmu_probe(struct platform_device *pdev) /* Register the sensor with thermal management interface */ ret = exynos_register_thermal(sensor_conf); if (ret) { - dev_err(&pdev->dev, "Failed to register thermal interface\n"); + if (ret != -EPROBE_DEFER) + dev_err(&pdev->dev, + "Failed to register thermal interface\n"); goto err_clk; } data->reg_conf = sensor_conf;