From patchwork Mon Feb 26 03:59:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiapeng Chong X-Patchwork-Id: 206239 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1862281dyb; Sun, 25 Feb 2024 20:20:59 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWb1TCV37y4p/rDTWSivLqMsTQ2575jYQFev7mHA08SDxi7kCwKfRBEM+UuTqxJU8FEsNhwzIF2JOqGQCa89bsQ9tb9Gg== X-Google-Smtp-Source: AGHT+IFdtADVkDVsgZjlPTcoSz412j64kNMHrYW7QM09iFUOn7j6IsV6AohD5uDKkDb29+RsdPmJ X-Received: by 2002:a05:6a21:350f:b0:1a0:e8dd:f488 with SMTP id zc15-20020a056a21350f00b001a0e8ddf488mr5099151pzb.3.1708921259488; Sun, 25 Feb 2024 20:20:59 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708921259; cv=pass; d=google.com; s=arc-20160816; b=E8j9/AVFJDXWTTVZptV1hrGHw7i6enk+jZ3+7veGxQqCbrxx014c4CFYXNocoR4Q2c uE5o4dujGr5RWJhj694ZE/3u/rpZ7jqUk4EZ28FI/xrQmoHXCEHRpNUtcCxqwbg4difm j6Z2pJNJ/pLAxSc9+O8yv7B8BS7XT/RKceka4MozQz5hSl+dAelJQWDY3tNLt7Z4dqMk QC+g+ZrrIzWMzPHFqpaBITkHj1emgjb7HyNuoJdCA3gLPZN6jq2Ka7zLRLqQ8cz0P8KM 1Yt8KKsO8ez6Ipe2rCSaEIAN0KReU1DyMDFS59POrILdcXRNMontrxoHWN6JV8z/4fOZ fomQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=UXXJovU2AesrIYqdlrvFTpqhm0SaeJKemqLy2O2LCkE=; fh=yQXE7MzEPOykVXVUjOAD0To2kfdkROyXMiM5ulDw1uA=; b=NaPcGAt+lzP+qID0pT6umny0aBFaLjHjIYPOA6sDSWsYM+DbYWpvyNPndmuwKQK6z4 SVPzATDwt6jabUIe783Hnopk+SmeEqy2DGZg8dRpO0dzGD3++emm1VO6jqE2AEqbNw5N 1Fsb9X9VwJ0BJaqkOpOywUL8u8Gun5nFst5kLYv0RSk1UK62uj5X2EM9BoQ5AGFm2kJD D/x8yCSTMzyhjnPsvxGiXlUspYn4R17v8+hkc8IK6rAPCQUnf/cw+gSUvsH/k0lhKqLo SROpbRf2j7/Ru7JxyYF+JPaRccc6lPbEHbPOU9BGePuZkbF1/EcykNC/Jg7cZZi2r6NB DIoA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linux.alibaba.com header.s=default header.b=Gn8GkfzH; arc=pass (i=1 spf=pass spfdomain=linux.alibaba.com dkim=pass dkdomain=linux.alibaba.com dmarc=pass fromdomain=linux.alibaba.com); spf=pass (google.com: domain of linux-kernel+bounces-80520-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80520-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.alibaba.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id fy24-20020a17090b021800b00299d0616577si4941033pjb.116.2024.02.25.20.20.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 20:20:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80520-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.alibaba.com header.s=default header.b=Gn8GkfzH; arc=pass (i=1 spf=pass spfdomain=linux.alibaba.com dkim=pass dkdomain=linux.alibaba.com dmarc=pass fromdomain=linux.alibaba.com); spf=pass (google.com: domain of linux-kernel+bounces-80520-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80520-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.alibaba.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id CE91BB24526 for ; Mon, 26 Feb 2024 04:06:20 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 29AE850A6A; Mon, 26 Feb 2024 03:59:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="Gn8GkfzH" Received: from out30-100.freemail.mail.aliyun.com (out30-100.freemail.mail.aliyun.com [115.124.30.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D2D94F881 for ; Mon, 26 Feb 2024 03:59:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708919985; cv=none; b=UbThDaxaYgidq4SE+/aQggK3zUDtuQs6zvtsm/ZVwpBswQAOJRWqHn5wp5MKZMOl7//XxEn4Wj3P9kB/cuWmKHgrs6tDz4XMaDZZngzjQacdkfCd2VKvi2f46m+6BKYjArmo7lvxUsHqv9hcZuNnwe245A187RvxOVFsZjzWpMw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708919985; c=relaxed/simple; bh=GhHUS0qNgMKXHhSXNAAzftwt3OGmUS1ag6QLR7q1+lg=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=CCF6/PYvpE8F647eoH0F1ZqnIcbd+SCAVkaYGvHORXg7JKDfVkLSBhpYvv7gbWBFE/YUIcrF1gpHqche5lbM6DbcMa0a/gUAGjR4d97mxlkytbK6C6dM5wYCOT0jj5gHT0ZKvqCqXTc3TY1yxEwsBac1hDymUyvXfnXfsj3TG5s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=Gn8GkfzH; arc=none smtp.client-ip=115.124.30.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1708919980; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=UXXJovU2AesrIYqdlrvFTpqhm0SaeJKemqLy2O2LCkE=; b=Gn8GkfzHWYxuQ2tsi/WP9YVta1kvM1x6iGRLLvEB9ux9iNfKzzluAAu+dBEGH7Esgv7pdOQgvRFbCykZY5yNcgVZjTYwD1g/0He7UWGuLwKLMNfHodUImQd4iHg6tBF4ZCDtO514h4CbKOJT0ycamFLGez1oQQiKpD5q/mQXcfc= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R711e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045170;MF=jiapeng.chong@linux.alibaba.com;NM=1;PH=DS;RN=13;SR=0;TI=SMTPD_---0W1AMyXd_1708919967; Received: from localhost(mailfrom:jiapeng.chong@linux.alibaba.com fp:SMTPD_---0W1AMyXd_1708919967) by smtp.aliyun-inc.com; Mon, 26 Feb 2024 11:59:40 +0800 From: Jiapeng Chong To: airlied@redhat.com Cc: kraxel@redhat.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch, virtualization@lists.linux.dev, spice-devel@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Jiapeng Chong , Abaci Robot Subject: [PATCH] drm/qxl: remove redundant code Date: Mon, 26 Feb 2024 11:59:26 +0800 Message-Id: <20240226035926.102859-1-jiapeng.chong@linux.alibaba.com> X-Mailer: git-send-email 2.20.1.7.g153144c Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791933818404758559 X-GMAIL-MSGID: 1791933818404758559 Variable num_relocs is not effectively used, so delete it. Having two labels seems somewhat redundant; the 'out_free_release' can be removed, leaving 'out_free_bos'. drivers/gpu/drm/qxl/qxl_ioctl.c:148:14: warning: variable 'num_relocs' set but not used. Reported-by: Abaci Robot Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=8316 Signed-off-by: Jiapeng Chong --- drivers/gpu/drm/qxl/qxl_ioctl.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c index dd0f834d881c..c1dd5709d37a 100644 --- a/drivers/gpu/drm/qxl/qxl_ioctl.c +++ b/drivers/gpu/drm/qxl/qxl_ioctl.c @@ -145,7 +145,7 @@ static int qxl_process_single_command(struct qxl_device *qdev, struct qxl_release *release; struct qxl_bo *cmd_bo; void *fb_cmd; - int i, ret, num_relocs; + int i, ret; int unwritten; switch (cmd->type) { @@ -196,11 +196,10 @@ static int qxl_process_single_command(struct qxl_device *qdev, if (unwritten) { DRM_ERROR("got unwritten %d\n", unwritten); ret = -EFAULT; - goto out_free_release; + goto out_free_bos; } /* fill out reloc info structs */ - num_relocs = 0; for (i = 0; i < cmd->relocs_num; ++i) { struct drm_qxl_reloc reloc; struct drm_qxl_reloc __user *u = u64_to_user_ptr(cmd->relocs); @@ -230,7 +229,6 @@ static int qxl_process_single_command(struct qxl_device *qdev, reloc_info[i].dst_bo = cmd_bo; reloc_info[i].dst_offset = reloc.dst_offset + release->release_offset; } - num_relocs++; /* reserve and validate the reloc dst bo */ if (reloc.reloc_type == QXL_RELOC_TYPE_BO || reloc.src_handle) { @@ -261,7 +259,6 @@ static int qxl_process_single_command(struct qxl_device *qdev, ret = qxl_push_command_ring_release(qdev, release, cmd->type, true); out_free_bos: -out_free_release: if (ret) qxl_release_free(qdev, release); out_free_reloc: