From patchwork Tue Nov 10 19:30:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 322862 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp500361ils; Tue, 10 Nov 2020 11:31:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJxwHV4Dnz2JHhSbS3ag/cZEf41wzaOxPq4xfVefWBMEP96j3rKDmuMN94J56CBKg0ctO/YH X-Received: by 2002:a17:90a:6b0d:: with SMTP id v13mr705588pjj.206.1605036703536; Tue, 10 Nov 2020 11:31:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605036703; cv=none; d=google.com; s=arc-20160816; b=CiQwrM5zytN3ytwRVRGSRzgObJfgw5eMZ5t5NQmihn1IghcAIzW3Q8MPZPLhxwQEYh Bf1svZDYt57RFkgvjBSddKV4BtIuK6KroW1+5j3amiLZBXWlVDS9mjMt3hoO5REvIHxC rS107T/rkvFcutTvLojcQgvoMa95zXfQU0H84jNyiTDQOauTMxRiEQoOSKEJ7MYKwOWf QS2U7SrqUD9NTBT65399hXmtl+pVv4+hr/uBAMvSYRQhj6wCKY0iEKQtLiDsuf5/blg+ ZdsvciOwrGoV56pIy8XBFGGmLOxknwUzXmntATIKGu+8yJ9F5wu9wuGd3/tSyJWTCRig JTgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=4M+OHfQuSobGZUDCMsLPIeOm6J74mMwXt+zkmWsXa58=; b=0MmJwmYwHKoZjA/c/+9154ytlepCw1qhzmdp6A397lhL5X0On8wqCVV947TJ1qmvfO /2ELjoHbuW8vNm89ZUru3qwnO34IzRc1p/3KjMBsHJPrj8GFwrftGv9EOXg6S9r5iNu3 dhSipeuvwB3WebwO0aEqgjxzAJxIjqmS60d0ZzkYVzkH7mH7ocvRJxkcgd2ff205RppW a2NXV6Zf6j+Oe9wWQvvIhoKgbwuE/cDrnp34e48L6x2Rf8lk8RY926rwf2HigL702VEq RzRUavHZIMKkBarSXBvR97n2PTqQEoIyXXid6cNepJG3l6pl8YYnrdkpuqLgFpIX9qZq h8fQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=iM7SQKT+; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id e6si12385487pfd.161.2020.11.10.11.31.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 11:31:43 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=iM7SQKT+; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1938689BFE; Tue, 10 Nov 2020 19:31:35 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by gabe.freedesktop.org (Postfix) with ESMTPS id D7CF189BFC for ; Tue, 10 Nov 2020 19:31:32 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id b8so14010239wrn.0 for ; Tue, 10 Nov 2020 11:31:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ya0KOHBj5YEQtB7YNRLKjFwwnQlrRlrUyTmR5vFE0Ms=; b=iM7SQKT+43Kp8b2PREMcIXXq6cm29sGsG50wr3Rsh3aEH7Av9D+TiUBErtQWNcLtXu KWhzdxVXzoDCE642pA6rkWKWOcuUB830UwNmIg5rI7bKtD0mRnFHwRZ7AYtu+ctpym6k Tv4e4S2Y9b82lfK4juqKqwKn6ajT1oJ7QO9ZuT+GEKDlGc7d7bNzT68wq/W+PlmFdEbR 2b6Yc1zmKfBSPLgkTMmSM5aamjvOh0AJ0bHPv6XqHaIY0V8EgpCpLUb5UZUY4Bft1GhC ydBGXYmD6ryT8HLVarK9aWMLDjremqLMcAuMrtFWZ4saFKoTrAKLg3FgYe17JBQ/UHAr 3Z6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ya0KOHBj5YEQtB7YNRLKjFwwnQlrRlrUyTmR5vFE0Ms=; b=CBIEfFpGoSPWgDVbbupS9Kjs026AGKsynn8JRkfnai8B7ia62rHgAC/N2+2KekdE4g 4yHlN+u0BZK6K3R/qDG0+El7yrdH4rUXHD5gqIGmIYM1ifqLsL/6sHJZbzfDMcEe4I5J vazzc1ScT4KfqonI9K+QymsIFzgZWGAKhrnOVIBpTRl1HBsEETG2LEh/Yo3qv0afXW13 bbz/sFWxQOtKpftrSXthKL40gdTNfV+euL1l59Xr5cVJnvRo59XxXuBSzt/Fg2Ogm5Uz P5wSfSYGFE9DZRz/vjvTEu0GYGsSF/+WylGW3TCYds56fxjpnGVh6a3PwFsk/3p0Mnww rs1A== X-Gm-Message-State: AOAM531Z85a7fDwj+KDeJ6qRUloQWsO1zjSyhn+hng7a+tLy3GeeRzZ+ c0plmAZ1rDCYfTkEIWfQgkEpvg== X-Received: by 2002:adf:f644:: with SMTP id x4mr26076211wrp.5.1605036691550; Tue, 10 Nov 2020 11:31:31 -0800 (PST) Received: from dell.default ([91.110.221.139]) by smtp.gmail.com with ESMTPSA id 30sm17635335wrs.84.2020.11.10.11.31.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 11:31:30 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 12/30] drm/radeon/radeon_dp_mst: Remove unused variable 'ret' from radeon_mst_encoder_dpms() Date: Tue, 10 Nov 2020 19:30:54 +0000 Message-Id: <20201110193112.988999-13-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201110193112.988999-1-lee.jones@linaro.org> References: <20201110193112.988999-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/radeon_dp_mst.c: In function ‘radeon_mst_encoder_dpms’: drivers/gpu/drm/radeon/radeon_dp_mst.c:366:6: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable] Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/radeon_dp_mst.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c index 008308780443c..2c32186c4acd9 100644 --- a/drivers/gpu/drm/radeon/radeon_dp_mst.c +++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c @@ -363,7 +363,7 @@ radeon_mst_encoder_dpms(struct drm_encoder *encoder, int mode) struct radeon_connector *radeon_connector; struct drm_crtc *crtc; struct radeon_crtc *radeon_crtc; - int ret, slots; + int slots; s64 fixed_pbn, fixed_pbn_per_slot, avg_time_slots_per_mtp; if (!ASIC_IS_DCE5(rdev)) { DRM_ERROR("got mst dpms on non-DCE5\n"); @@ -418,10 +418,10 @@ radeon_mst_encoder_dpms(struct drm_encoder *encoder, int mode) slots = drm_dp_find_vcpi_slots(&radeon_connector->mst_port->mst_mgr, mst_enc->pbn); - ret = drm_dp_mst_allocate_vcpi(&radeon_connector->mst_port->mst_mgr, - radeon_connector->port, - mst_enc->pbn, slots); - ret = drm_dp_update_payload_part1(&radeon_connector->mst_port->mst_mgr); + drm_dp_mst_allocate_vcpi(&radeon_connector->mst_port->mst_mgr, + radeon_connector->port, + mst_enc->pbn, slots); + drm_dp_update_payload_part1(&radeon_connector->mst_port->mst_mgr); radeon_dp_mst_set_be_cntl(primary, mst_enc, radeon_connector->mst_port->hpd.hpd, true); @@ -436,9 +436,9 @@ radeon_mst_encoder_dpms(struct drm_encoder *encoder, int mode) atombios_dig_encoder_setup2(&primary->base, ATOM_ENCODER_CMD_DP_VIDEO_ON, 0, mst_enc->fe); - ret = drm_dp_check_act_status(&radeon_connector->mst_port->mst_mgr); + drm_dp_check_act_status(&radeon_connector->mst_port->mst_mgr); - ret = drm_dp_update_payload_part2(&radeon_connector->mst_port->mst_mgr); + drm_dp_update_payload_part2(&radeon_connector->mst_port->mst_mgr); break; case DRM_MODE_DPMS_STANDBY: @@ -450,7 +450,7 @@ radeon_mst_encoder_dpms(struct drm_encoder *encoder, int mode) return; drm_dp_mst_reset_vcpi_slots(&radeon_connector->mst_port->mst_mgr, mst_enc->port); - ret = drm_dp_update_payload_part1(&radeon_connector->mst_port->mst_mgr); + drm_dp_update_payload_part1(&radeon_connector->mst_port->mst_mgr); drm_dp_check_act_status(&radeon_connector->mst_port->mst_mgr); /* and this can also fail */