From patchwork Mon May 10 10:19:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 433070 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2716851jao; Mon, 10 May 2021 03:50:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQ4KeHsJNHM3TppjN2fSBlsVRTgtK4rH/vivFrCUcS6SVeYeY6cLhzYqtaBHZPWtnnfrs4 X-Received: by 2002:a17:906:3e42:: with SMTP id t2mr24848277eji.508.1620643851195; Mon, 10 May 2021 03:50:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620643851; cv=none; d=google.com; s=arc-20160816; b=Y6K8CnOgHYnfDgr+ARbJ5sj4yp58njUqbMMSxqYoDlzAJib1t4SUsf1xDiAfWIFXRW zCMvT6xr5OjQtYfhA/Mt1/1B/M7pVFfoO1QXOTZ8WOIu4MwP4AfnzhejNuvLSAHYFfc0 BJzFCATA154gSSGwyRgn9qVYMh9XFnulBmYFBbDizGHEwzyeeVp7ISAKwYtp654dHMI/ OM7BzbJ5i7TzNUU8D36cWcX8SQ3Wzt8mvuxv1BoOO0HYuEaojYSDOh/w4sxaWfE79KUC eNDZjNfVw3YszfkWNeqSbnG4heZwAqy8FiVJKHxqLNX5oyW6fR9GedbKR2JHkt0+PptF Btzw== 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=7/xKMv/Rwp7DZRKVp1TNPxWuzbAUrrJAj3HV6iTTWwU=; b=CylVkRGnKDqcoIFes/GY3w6Zh/DOcUYMCpgJl8TpZp/rxsoYdIbfFhwppZGwPB+G/t FioJqU1Agl+2MlnnQ100FkGT4zSjUvl5SGXvjl6ocUaXyCtmBwJ/PMVZRC/0qQ41r1Il xuLyf54KqlK/n+q0j1QAN8ij8UUbijtCzU/FKj6xM2X42BCbEI5OUPkmdrjVAtrNOGU9 zvYWGoeP4ZCOO9M39MjiaPTWEGANoEuE2KFFQ2xWwjsVCH395Mi0sGrLhc2DeFK3JWvc D8VyWd+fhoVo3jA361OjFFLO6sq/r4A65ibS9J6lc8M14/dpZ9oRwD8ZrfDRY3yK/gp8 cpIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=S5X790rm; 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 gu21si13494880ejb.12.2021.05.10.03.50.51; Mon, 10 May 2021 03:50:51 -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=S5X790rm; 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 S233100AbhEJKvj (ORCPT + 12 others); Mon, 10 May 2021 06:51:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:42196 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233491AbhEJKuI (ORCPT ); Mon, 10 May 2021 06:50:08 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9316A61944; Mon, 10 May 2021 10:39:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620643141; bh=zEaw3zcLJD+oaYX/gXnVh3nZV+0dX9pjyV3rpI/3UX8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S5X790rmXteUJN0xbLvx2weH4y17skxqnKgnex7yOW1jjGMB10SDCWfDqO+Fpy+Qv 1z1vcNDsPzFAlwGu4zFu6UbQux4MzV/PqgmCFwDelXZgfn7dzE+44os81vMUIRPZGK Yo1L8Nkwas98nF1UNcZ1oVJKbs/hGaW9NDYe7gkk= 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 5.10 193/299] amdgpu: avoid incorrect %hu format string Date: Mon, 10 May 2021 12:19:50 +0200 Message-Id: <20210510102011.324065512@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102004.821838356@linuxfoundation.org> References: <20210510102004.821838356@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 f8bebf18ee36..665ead139c30 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c @@ -259,7 +259,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;