Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp7076035ybi; Thu, 13 Jun 2019 09:09:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqzXzbmdL+f4kReBQk5yNF9b1pU/THNxAVEKZwFBzW6RS4pVCvmucWG112A77oi5YC0pvETn X-Received: by 2002:a17:902:b603:: with SMTP id b3mr30168925pls.72.1560442189447; Thu, 13 Jun 2019 09:09:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560442189; cv=none; d=google.com; s=arc-20160816; b=sjVQP6uYh/ZcmLUf4SNZDHolC0nVuPoLX/QogSMsTM70DeDlq7ES10q6+E8K76Xacg 1vlbxV/XAIHQ5sTzw//4yryLWWe1dsxmypJs3eTkpRLO8/CLcxukkkLGNyWqmnJmO2db FPLgQ0bAGdfeK2mOMp/YllOgKt3teFtE7ezvXjK9eGQc0q49P2bZjx4cGzc3sakrQ7K3 k9aDBL98COWHhgKyVGOaiOpTlox0+J5OSFMdYBk0ACdIhbg11HjTkIp4o6CNpjtRi3Ry Id+vLXpv+00ZhP4OklrCnKM7Ijp+Uv802KnKvz/BWmkjXiNE8DRV2MHmkvHfw66Lfd9O qxiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=kp0NPOkGA/Ko6yJjTCT7jwsQBqZpNSmKmT1D/LtrgzE=; b=dtFKuPhzBeM9y9gnZqMbLWmiVu0QQKe25MjJVQW5KWDJl5g7daZxtHcUDJTNgl5kVt SpmZ+09DEckpjQgmlNxNO8H78pIdr5oF+sqS/rgiuj/v5BGFUvhj73sQYycHNSm0OOBp IIxE9Sz0Qmxj+h/1ie7IBkoMY79yyYLjYpnApAU+MdUplnn9fgLsbLyG8rQnpGKMrI8p YDgwZNiWjd1wWtmTlfgjAqX58n1dX3Qr9lsE5j0ovALLCZoNivg5oflmhv/fYNdL31or sAkiOjrahG1LjB1HfxPZChseWskXH9YkCNtKBRHrdXGm+wQmpdRq27yHHF58RHeZyc2k tPtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nsouBOO7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 21si140036pgy.283.2019.06.13.09.09.34; Thu, 13 Jun 2019 09:09:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nsouBOO7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732629AbfFMQIT (ORCPT + 99 others); Thu, 13 Jun 2019 12:08:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:33928 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731286AbfFMIpH (ORCPT ); Thu, 13 Jun 2019 04:45:07 -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 C97922147A; Thu, 13 Jun 2019 08:45:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560415507; bh=Rg9J8u8/6rpgKgaXt5tFW1M/y8ShsrCS08QD82ERM4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nsouBOO72DT/Gu/t+XjYM+zeDMKXO7K7e3qoKFct73SABqvQDRIjiCaXCk0VuwYYJ tIXHymli0Hw5498QsVp9VWKB0FjkBFnN2tCs13uKx/qRe1VKjDL/OO5iEOZg9bYH4I 7d0EITU875xPGdtE2DYYCB/caEfeZA+Z80H1v+uM= 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 5.1 026/155] drivers: thermal: tsens: Dont print error message on -EPROBE_DEFER Date: Thu, 13 Jun 2019 10:32:18 +0200 Message-Id: <20190613075654.302800358@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190613075652.691765927@linuxfoundation.org> References: <20190613075652.691765927@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 f1ec9bbe4717..54b2c0e3c4f4 100644 --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c @@ -160,7 +160,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