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: 433064 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2707302jao; Mon, 10 May 2021 03:35:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtDn8Q+vjTbyAtpMQcaMmmOutYMROqbl+uxDd4pKv9GfRZHrE2V7cMDt/jeOUYbnrAC5eA X-Received: by 2002:a17:907:765b:: with SMTP id kj27mr24888282ejc.537.1620642953962; Mon, 10 May 2021 03:35:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620642953; cv=none; d=google.com; s=arc-20160816; b=JINIYJR4+qbiw/tsiiMeWP2pHSrLWXg+Xh5d0P6L6HH3oadYWeFm/e9dAylpnMkjK7 uOO02PafLffNxtfC8WKXp8qrOT+/yhHZK+2XpyBdFblEEt1hKmhnTOlZ4E8Uilpqd3oj 1RW4XIxnkqFBsllP+G7YPSo2Y0BLXPCA1PtjHbGlBL6W/qdFDSdwlekyQnsc4z1nHRwS dEW2CqDYb08lde2PZYZmiByFySHgxVNGMaTOQe0p5Lc/H7qweg0JG2OncsA/DMEEbtLD jNnDa6qwbzD8SRHGveBBhbg+2OnAbw1tMGJfQH/TFKGLfh7o/dA3QFhV0sK1ejtYQDQr +SKw== 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=z2bGoThWy9v4PwF+pG6IdwBXC05eGFDQ6u1At+RGL9w=; b=UAtWzroGiv+wjz1KqTu3B2B/nY1b8Y9ZRqQ4M224JQRRLywKcx5bd1B8+C5kAcFSkY sR6fNYSaAr0MS15Qmm2cTmYq/tcUlbnuS9ZDvisy3m5/DE+BycRv4Spi16o7wuhDkxBc tRdA6b9kXVgI/kq+NGm2X8Z8pIa0iSqPmLRI7yko4vwOlHLG/+tgrLhAUdmTkDxcTiQA zlemt/W1l9Lo9qnFnjzg8T3WUdDPMUQBR/131S6lIN1N0ho+5Rh6gjmsAK4Ukd4Doaoe om7gXnfGkDvq4abKznWZKehYluj0pUaya0nsF9kRA7TIvEL0nazzSjoEOiSDkI7udx7q sGtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="In/qqq8r"; 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 y16si12967426edv.268.2021.05.10.03.35.53; Mon, 10 May 2021 03:35:53 -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="In/qqq8r"; 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 S232233AbhEJKgz (ORCPT + 12 others); Mon, 10 May 2021 06:36:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:41148 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232790AbhEJKfJ (ORCPT ); Mon, 10 May 2021 06:35:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9F18061581; Mon, 10 May 2021 10:28:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620642497; bh=RuguGrEi2naplWY6aytjF5jxaCLPOSg2TBV/f+Jxa3c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=In/qqq8reCcEhxEs3/k6G7GZqB1od1hZriUebY1TagGfnkJVuAudFTN/N+ZOTxprE IS8e/jCUWnlUgSRJBJe3GqMlFD1r8Hv4vE36WGJMbKqOZWRsyEeEoRZRLqtjA3PrHN 52r7UdNidf9lLPF6h8WVUXrJQPV5qA7KndLsz6Zc= 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.4 117/184] amdgpu: avoid incorrect %hu format string Date: Mon, 10 May 2021 12:20:11 +0200 Message-Id: <20210510101954.018739629@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510101950.200777181@linuxfoundation.org> References: <20210510101950.200777181@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 b2c364b8695f..cfa8324b9f51 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;