From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23335C43613 for ; Thu, 20 Jun 2019 18:29:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EA8F320675 for ; Thu, 20 Jun 2019 18:29:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561055346; bh=WBnnoiV2xbfIcvYiH9S//5uTnemkNf6L1oc41kGnPM4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BmZ+pJcgvEOx3vgwNpxCryvmO7yWTm7SL7HfvOQABXxAX6wbZ0XKjv3WG51y21otY y8j2fXUGZzitrtfZ6+rDKhhhesOgqwQaNgyo/VPPos280x4d438yzN5kRGenUK9VdO a1q59CHg+Rvs9gpLv5ng1Hgxmz2ZcN6e6nfYywO4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726877AbfFTSDV (ORCPT ); Thu, 20 Jun 2019 14:03:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:54316 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727176AbfFTSDQ (ORCPT ); Thu, 20 Jun 2019 14:03:16 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1250721479; Thu, 20 Jun 2019 18:03:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561053795; bh=WBnnoiV2xbfIcvYiH9S//5uTnemkNf6L1oc41kGnPM4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0kkcB8IknGFakML9jIvTdHgS/J5e1EpsZ6BQ8O1pEd/OhTC60Y17TM7M8QvUeiEOq ZigU6bCCNlEGGA23tP3sM/6NKMAyEk0xhIAs1ysNi8HULi08Lm0P9UxtdmpNOQ0VXX wEiNBrHmQ79HrytFJU9Njx+od7TTCCdlVnAgbt5g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Amit Kucheria , Eduardo Valentin , Sasha Levin Subject: [PATCH 4.9 012/117] drivers: thermal: tsens: Dont print error message on -EPROBE_DEFER Date: Thu, 20 Jun 2019 19:55:46 +0200 Message-Id: <20190620174352.722099714@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190620174351.964339809@linuxfoundation.org> References: <20190620174351.964339809@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit fc7d18cf6a923cde7f5e7ba2c1105bb106d3e29a ] We print a calibration failure message on -EPROBE_DEFER from nvmem/qfprom as follows: [ 3.003090] qcom-tsens 4a9000.thermal-sensor: version: 1.4 [ 3.005376] qcom-tsens 4a9000.thermal-sensor: tsens calibration failed [ 3.113248] qcom-tsens 4a9000.thermal-sensor: version: 1.4 This confuses people when, in fact, calibration succeeds later when nvmem/qfprom device is available. Don't print this message on a -EPROBE_DEFER. Signed-off-by: Amit Kucheria Signed-off-by: Eduardo Valentin Signed-off-by: Sasha Levin --- drivers/thermal/qcom/tsens.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c index 3f9fe6aa51cc..ebbe1ec7b9e8 100644 --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c @@ -162,7 +162,8 @@ static int tsens_probe(struct platform_device *pdev) if (tmdev->ops->calibrate) { ret = tmdev->ops->calibrate(tmdev); if (ret < 0) { - dev_err(dev, "tsens calibration failed\n"); + if (ret != -EPROBE_DEFER) + dev_err(dev, "tsens calibration failed\n"); return ret; } } -- 2.20.1