From patchwork Mon May 10 10:20:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 433079 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2746301jao; Mon, 10 May 2021 04:29:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwK67OoUH/HSrSiXgFthiMj/RUr9GPyGcZgUt74VUZ/A/zs46nOlgySF8zuZ+5sr+TMwgCF X-Received: by 2002:a17:906:1f54:: with SMTP id d20mr6681435ejk.94.1620646192225; Mon, 10 May 2021 04:29:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620646192; cv=none; d=google.com; s=arc-20160816; b=Rugr8hc6yecUWWMUc28ku3hBXLcJt2fzqfdkikZG9yUXLZQIgrBQS03NBoZ/pZfVZF Fi7TKsOpZB+yF61d28pl3Ssx+Dz/e3vZSmA+p2DNcMH/6oyF3BQAYHvfCj0nAmDKTjqu YL2VS+Rjp+5E4y14y1B1moufGtxzvrg9kElptW79tMvSe2Aag0gsg6SHtGjrDbiiVHEH v/5qg/SkYNVTZCqq2q4m6/D+rK0Y5lTI0+cAHt5JZIfN/tfKq0hAcHXJRvRkFn+D05cA ZCu4eD39bOnnOVO8Zdco7A0KTcLBIPxK+JjNXtGNVGvSNwHBBFrIXMSZnVa7Q8gkKBSY xqng== 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=vEE+/Dw63Xe889f1s4JguRugMpb53lNjAjhnChXknHc=; b=q4INVXkTZp/vir7K6t83ue5cYpq7HCkebmy1oehqxTrJm3OL314pOBfTeBKhNCLBQM uM+wFEIfglrvEgXbIjA73GxtAil8GGvjUuBvwSu93rcVLpcCZWR2oBj87hlDtc/pUuNG EsuOQr4e215Dex+NHyJy4SGfBI4+bP5c/tt/dcyhUw6XtGhQbw1mf0Tin8ifIo0xgN2n O5RH4WIGj+kP02P/9Z5s1Wc28KTVyCksTeuG+wzxChMBLidN+N9f7zxjFOeoAVdt5/48 djqh9zhyO4DomxArHs0cKGn8Kbd/OmFZizuz0DR5b9N49fcHXtEaLRr+WqIIVUEsZTIJ G0iQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VMD1UyrP; 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 r17si13500365edw.273.2021.05.10.04.29.52; Mon, 10 May 2021 04:29:52 -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=VMD1UyrP; 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 S234845AbhEJLFV (ORCPT + 12 others); Mon, 10 May 2021 07:05:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:55456 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232900AbhEJK5r (ORCPT ); Mon, 10 May 2021 06:57:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B58526195A; Mon, 10 May 2021 10:52:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620643935; bh=Ra4qf382GcJ+sV/uxHERuAFgydpX23OJscrYbfJkSQg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VMD1UyrPn1djPVJYTPef5aoRbIDVQMNpxY5l2EfOvtkcuJD/rew2TYEiNCSGH8Y0X 5RIeUml+2NpMXYra7xD2IBgbUaPH84TgXTMy/3Rdajr2O9zCe43bcHuvuPmq40P+dv V+mUxPJvyo+stIfVBn9aOGdsfPxev+EliULoOu2s= 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.11 221/342] amdgpu: avoid incorrect %hu format string Date: Mon, 10 May 2021 12:20:11 +0200 Message-Id: <20210510102017.396722301@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102010.096403571@linuxfoundation.org> References: <20210510102010.096403571@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 8b989670ed66..431ae134a163 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;