From patchwork Mon May 10 10:20:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 433106 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2791825jao; Mon, 10 May 2021 05:26:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUv+0/NHIOPwChyXnxyjdUkkTmQnkIsVyZoTLWBrM0e0mok4qCPS535FMlkfXj/jaD33lC X-Received: by 2002:a05:6402:702:: with SMTP id w2mr14591861edx.85.1620649609227; Mon, 10 May 2021 05:26:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620649609; cv=none; d=google.com; s=arc-20160816; b=vYH6kRhRhBhgcS36ZyfifOVPr4ikY87GgLcrXZn2Q0Cy0/IcfBAOEUAjndM62JpLEb FZbPU28n31HherpYosKoiXkWb4btFfl5ikXWroK6Q7fggSvaOIT4PzyoW+L912L/y8o3 tV5Hd4riogLXe+HHn2AqpxkNn0jbRlK7/SdU3h0YmgUkiK3lyEO8/vNIES/dFrpE0psp m8sbk5CuqfSxN8OvFXFSmrJTxYHb60TwvEokg+QGs8bsFTcmzOEqr2WsN50nrnEtiK66 P5UjEvqiFsWDLqE80Nk8TSz9uFyyU0P/WDwRJhq7HUfkmqUaJo1QFOudeXOw2jEvt3HE tvlQ== 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=SyDblkOudjvghn8TrNhwZ56CH79ya2lj/iAvOYpnX7k=; b=oz/Do64wesTs+xvtWJfUqEXfNsEx/YVyORSjBU2+DElQgjwOAhRgSaOwIkHE/xsNhg QFXvvNTt/WG3tNVOIgumfthGjuhWXuMpbsHQ9ime4irjRUTt8Tw6lX+h4g0Sdb1sR6XM 6MsIuCVMGG8MWh2cYyQD9Jl+2PyNNYD9uWIcamLGZETW7OYW8DON8zf6tlOY/NqFf/9b H42IqEt+qmCUvAfS0Uc8hEPTt3kj0vRtsou2E7wrGrsUPlxyNt0It12AjvuA95aYiAXd b3AJb1mJbXeBMkgvuGwB6z4dkf6zwoD+8ENFPwiMym5viPh6kUm6WqfG8/f4Jq3EsSj5 umoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DD3gk8iY; 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.05.26.49; Mon, 10 May 2021 05:26:49 -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=DD3gk8iY; 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 S233857AbhEJLVb (ORCPT + 12 others); Mon, 10 May 2021 07:21:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:53306 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237132AbhEJLL0 (ORCPT ); Mon, 10 May 2021 07:11:26 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A8F1C616EC; Mon, 10 May 2021 11:07:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620644847; bh=U2phoJE4h+M3Npxv3Av0LVnX6uds6j6AcKMURa1/aew=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DD3gk8iYbnO2yekdfz/KNA48Lc/Dn8JWdvwh1eZ/3ebOBhSe6HmlDvrL1iwidiR5+ CayC59XAuLbsnmpn6fdZuFJ+m3qqr3CGaKtTB/sY1I8atjxpQ0GdICntMbmFCr9Eoz Y+YSsq2tGyZsiZuOFUu4h5r74VRSm+E3JPVmIK6M= 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.12 248/384] amdgpu: avoid incorrect %hu format string Date: Mon, 10 May 2021 12:20:37 +0200 Message-Id: <20210510102023.061939113@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@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 e2ed4689118a..c6dbc0801604 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;