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.7 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 013FCC31E45 for ; Thu, 13 Jun 2019 16:21:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C4FB12147A for ; Thu, 13 Jun 2019 16:21:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560442884; bh=/sJcTRTUnl8sOZXR26aYghkbLJA5ZN7KFjxG7cybJsE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kEyxxKE7WV7b+vGlrT6pqmYFClZP02GpnjCjCV3jCl0N+sQ2gHHyJC53UetGjSNoH +o9Oiqf0qTK4Cu1qKoiZxI8ay6i3Ch5EyG1IKyYVRtTGD/Uh48w7vbwwwlNO1FLqJc K4DUAfn7+nFoTTxWkOkHVGHwxqLu+jrl5kz4elz0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731688AbfFMQVF (ORCPT ); Thu, 13 Jun 2019 12:21:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:56544 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731066AbfFMIjA (ORCPT ); Thu, 13 Jun 2019 04:39:00 -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 8388521473; Thu, 13 Jun 2019 08:38:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560415140; bh=/sJcTRTUnl8sOZXR26aYghkbLJA5ZN7KFjxG7cybJsE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CqUWBhuwn+aNpJjn0tbELskvgu/vm72OfPTq6xYpzW9QEhrOYIyuqRvh6VCa9Z1lP 6n3Z3DtiMcllbUgJEQluPnXTMA/M+TziJAqExqXXHsWhAepGDREd5SeumTTUawDVYe 4msiLoE84MRlBt8bjUwXB11FZSXc1lPc7QMWRll8= 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.19 018/118] drivers: thermal: tsens: Dont print error message on -EPROBE_DEFER Date: Thu, 13 Jun 2019 10:32:36 +0200 Message-Id: <20190613075644.680914873@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190613075643.642092651@linuxfoundation.org> References: <20190613075643.642092651@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 a2c9bfae3d86..b139713289a4 100644 --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c @@ -171,7 +171,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