From patchwork Thu May 20 09:17:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 443183 Delivered-To: patch@linaro.org Received: by 2002:a17:907:2b0d:0:0:0:0 with SMTP id gc13csp2437905ejc; Thu, 20 May 2021 02:41:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvFYRsAMzoaID0Ri+iA5rB7i0x25OFDTPudAEsQwWHQNFRslXnNBJmYBXGWdRFGNXUgpiY X-Received: by 2002:a5e:9907:: with SMTP id t7mr4247496ioj.155.1621503666332; Thu, 20 May 2021 02:41:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621503666; cv=none; d=google.com; s=arc-20160816; b=UQwHgmb0X3nXul+2+fcesRfBh7NJUIrcI0FKOpZImQw92q/HUgYMruVXEfVkgMFdOi +D7cb791HvSJAmozuz//CoqFNnCkbyDsLRxL61PTe+vSqWeEwWLE71r8X4+K4ZxIIGaR YTkfqJiyv/BkbVFqcgmgoOip6+StOEqJMghWEcE6zFCRLrOQkw/VZYUi20g/H/FugFJT QAPl88PDnqcRJ3QdHlEwoSM7OVi7b0lvtOGHA2GL5Sgmi+BB0wyxF6HqKSrufMiKmpZe Juz4P/Rms9lnojfWQtf0Ys0oQgMYHUAcuk7ierT+wGh3Wccvdra3yNlmerkQ+B6u6i77 v50w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Zo+QD3F6RNRD3Ja/YOGWblQP8PjfrwP8vWpn88gC8f8=; b=qutBOAWwyLkXL25Ts4Wx7nuRczE92sqhSRMkx9+2JZg9Xz81P53kkv25tGsjHZ5GEN urE5AlLgMm+/dnzPnmCBPLzrJt/k9HM95Yz86kTC3VcQ8lT8f++0wfX/joVSnz/2GHOm 63jHMTb1xkxp56gAS4DoZy+LDUpvFOohwMZH3z4qJKxEyyqT5m4WT5lg4QrW3AcaYvvA 3N3eGOcg5eZVLgjDu/ufbikz86jjcDMB0rJccnX1PiCYc8iyuN6tegrPkAT9RL3njWjI +WL6c2M7jCb5ddynQPQRH+ZIyItmsf1/i2x+ztDn5AHyHT1rNakuFT4v3EXqqtksXr1+ /rBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kHZAPANn; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b5si1749043ioh.5.2021.05.20.02.41.06; Thu, 20 May 2021 02:41:06 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kHZAPANn; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233114AbhETJmZ (ORCPT + 12 others); Thu, 20 May 2021 05:42:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:41364 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232171AbhETJkX (ORCPT ); Thu, 20 May 2021 05:40:23 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CACAD60BD3; Thu, 20 May 2021 09:31:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621503102; bh=4cmfOlk2AwKjf5dDlH4Uogi8Rqs2A8gaqjb+hamRd+s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kHZAPANnKLdztUsfQ0ziuRuZPGlxJcUZFBZ7EtRDkM21ZwWOsU6PYpTgWlsx/7mt4 9jeCXe9HLoDv/pr9fQ9kwd5nskZGOzPpO4IyngRRQ02RsyCrNq8gbUW1GfsyAesM8F yPO8nvaHULFt1g6cwKnHLw+CoyqINH1YtR3F0ZDw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?utf-8?q?Christian_K=C3=B6nig?= , Tom Rix , Arnd Bergmann , Alex Deucher , Sasha Levin Subject: [PATCH 4.19 068/425] amdgpu: avoid incorrect %hu format string Date: Thu, 20 May 2021 11:17:17 +0200 Message-Id: <20210520092133.681841439@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092131.308959589@linuxfoundation.org> References: <20210520092131.308959589@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 7d98d416c2cc1c1f7d9508e887de4630e521d797 ] clang points out that the %hu format string does not match the type of the variables here: drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c:263:7: warning: format specifies type 'unsigned short' but the argument has type 'unsigned int' [-Wformat] version_major, version_minor); ^~~~~~~~~~~~~ include/drm/drm_print.h:498:19: note: expanded from macro 'DRM_ERROR' __drm_err(fmt, ##__VA_ARGS__) ~~~ ^~~~~~~~~~~ Change it to a regular %u, the same way a previous patch did for another instance of the same warning. Reviewed-by: Christian König Reviewed-by: Tom Rix Signed-off-by: Arnd Bergmann Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c index e5a6db6beab7..8c5f39beee7c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c @@ -231,7 +231,7 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev) if ((adev->asic_type == CHIP_POLARIS10 || adev->asic_type == CHIP_POLARIS11) && (adev->uvd.fw_version < FW_1_66_16)) - DRM_ERROR("POLARIS10/11 UVD firmware version %hu.%hu is too old.\n", + DRM_ERROR("POLARIS10/11 UVD firmware version %u.%u is too old.\n", version_major, version_minor); } else { unsigned int enc_major, enc_minor, dec_minor;