Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp6017761ybc; Wed, 27 Nov 2019 13:29:29 -0800 (PST) X-Google-Smtp-Source: APXvYqykM4sCh4mLdtzbnbVuQ2Gd9yVH9PNTke4tli4Oqcuk/59UkCuIa4FrMv4OeOHspMdcIHYL X-Received: by 2002:a17:907:42d3:: with SMTP id ng3mr25901549ejb.9.1574890169700; Wed, 27 Nov 2019 13:29:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574890169; cv=none; d=google.com; s=arc-20160816; b=cB9UBusVozB3WOI6AHI1yeMwoiHAE2oAvcurHY1mEUhzhu/YkteW3UVOLRkmuWTCvr 0l94GbzOMMcEFgFxfR9qXYIwBcuEfPxy78ZpJ2rSkeU6JVe/yuqn0r0AalWTTwQkv21+ TIKJfsP4AoSxTQeRW6Nrs9Lhi3xm6cvuqqUw6LGpHiAOkkLy2SSMYJ7sw3KRmECtAfnW QwbdpbKD3OEUqD0uQgyokFjpzumzzL5pRI83AF3pvNurRxto7JqJYl44uKDcZJvHNRXb quUvHqWQ2YnM/f96CVT4S2qs3S+uFJOdXl/IjhQ7OJ6YijFYZahbP2fC3iXuUpD30g6k AnDA== 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=5mKZx69lVwUoplO+flXeaxg4DLHkoeNWbBGQA1+jnd4=; b=m+V6llIp7yMHrBEDcmFm1I4lg/UmpSITpRr1q2Ek2XvYP+5034g0hsC/WHQPyJtifx MrzRMUB1J8hQoyOdWPR+qhVILv//1pRmEGRWKTNmhLEDK3ZCIeCU0up5tg/3GmdDfsSE wVWSeVMxhnYa6Cc/PQsbiAfh0S/JIhQdJTzmleuFCb8vZPwz0U6ISHSr3FhQm7y7omi3 J9+9i3B/TVB8hnXMyt005wT/VMCyVJL9wgE5DOsA5PJ7FkeatGXPCBQ3nl/FRBFHfZio T14pKlNUXLkCxdWCFQPPF7jcI6qj8UP7A1I1zAwGjL4mX5jyiSP5FzjjAhiTV1IExek+ w9cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yeuFFZmu; 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 w7si291560edv.169.2019.11.27.13.29.06; Wed, 27 Nov 2019 13:29:29 -0800 (PST) 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=yeuFFZmu; 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 S1731619AbfK0VAv (ORCPT + 99 others); Wed, 27 Nov 2019 16:00:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:52778 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731608AbfK0VAt (ORCPT ); Wed, 27 Nov 2019 16:00:49 -0500 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 2CE4A21556; Wed, 27 Nov 2019 21:00:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574888448; bh=ArEb2f18QmJygKaaZnogCTVHbEhcpUrues3qVydbb7o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yeuFFZmuaVdChBWWDW5wPM3gai0fZp9kvzwZLn9M4Bh/j+LdCbIdpNEk7l1iyI4ao VdkGxu8pkXlY/zD9NcIg/fTPLDFEI8/9lpALJUXeiq2S5elS+LOs50jp5HOTiRUJXm d3sNKus0QlD/6jQ/4h5Bgc4MSA++SD8XCpC7+AG4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jerry Hoemann , "Shuah Khan (Samsung OSG)" , Sasha Levin Subject: [PATCH 4.19 136/306] selftests: watchdog: Fix error message. Date: Wed, 27 Nov 2019 21:29:46 +0100 Message-Id: <20191127203124.986247152@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203114.766709977@linuxfoundation.org> References: <20191127203114.766709977@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 From: Jerry Hoemann [ Upstream commit 04d5e4bd37516ad60854eb74592c7dbddd75d277 ] Printf's say errno but print the string version of error. Make consistent. Signed-off-by: Jerry Hoemann Signed-off-by: Shuah Khan (Samsung OSG) Signed-off-by: Sasha Levin --- tools/testing/selftests/watchdog/watchdog-test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/watchdog/watchdog-test.c b/tools/testing/selftests/watchdog/watchdog-test.c index e029e2017280f..f1c6e025cbe54 100644 --- a/tools/testing/selftests/watchdog/watchdog-test.c +++ b/tools/testing/selftests/watchdog/watchdog-test.c @@ -109,7 +109,7 @@ int main(int argc, char *argv[]) printf("Last boot is caused by: %s.\n", (flags != 0) ? "Watchdog" : "Power-On-Reset"); else - printf("WDIOC_GETBOOTSTATUS errno '%s'\n", strerror(errno)); + printf("WDIOC_GETBOOTSTATUS error '%s'\n", strerror(errno)); break; case 'd': flags = WDIOS_DISABLECARD; @@ -117,7 +117,7 @@ int main(int argc, char *argv[]) if (!ret) printf("Watchdog card disabled.\n"); else - printf("WDIOS_DISABLECARD errno '%s'\n", strerror(errno)); + printf("WDIOS_DISABLECARD error '%s'\n", strerror(errno)); break; case 'e': flags = WDIOS_ENABLECARD; @@ -125,7 +125,7 @@ int main(int argc, char *argv[]) if (!ret) printf("Watchdog card enabled.\n"); else - printf("WDIOS_ENABLECARD errno '%s'\n", strerror(errno)); + printf("WDIOS_ENABLECARD error '%s'\n", strerror(errno)); break; case 'p': ping_rate = strtoul(optarg, NULL, 0); @@ -139,7 +139,7 @@ int main(int argc, char *argv[]) if (!ret) printf("Watchdog timeout set to %u seconds.\n", flags); else - printf("WDIOC_SETTIMEOUT errno '%s'\n", strerror(errno)); + printf("WDIOC_SETTIMEOUT error '%s'\n", strerror(errno)); break; default: usage(argv[0]); -- 2.20.1