From owner-svn-src-all@freebsd.org  Sat Feb  1 10:15:24 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4470F24A77A;
 Sat,  1 Feb 2020 10:15:24 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 488qj815t4z4NPZ;
 Sat,  1 Feb 2020 10:15:24 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2054E253FE;
 Sat,  1 Feb 2020 10:15:24 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 011AFNRZ081628;
 Sat, 1 Feb 2020 10:15:23 GMT (envelope-from pjd@FreeBSD.org)
Received: (from pjd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 011AFNPl081627;
 Sat, 1 Feb 2020 10:15:23 GMT (envelope-from pjd@FreeBSD.org)
Message-Id: <202002011015.011AFNPl081627@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pjd set sender to pjd@FreeBSD.org
 using -f
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sat, 1 Feb 2020 10:15:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r357363 - head/sys/geom
X-SVN-Group: head
X-SVN-Commit-Author: pjd
X-SVN-Commit-Paths: head/sys/geom
X-SVN-Commit-Revision: 357363
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Feb 2020 10:15:24 -0000

Author: pjd
Date: Sat Feb  1 10:15:23 2020
New Revision: 357363
URL: https://svnweb.freebsd.org/changeset/base/357363

Log:
  The error variable is not really needed. Remove it.

Modified:
  head/sys/geom/geom_disk.c

Modified: head/sys/geom/geom_disk.c
==============================================================================
--- head/sys/geom/geom_disk.c	Sat Feb  1 09:13:11 2020	(r357362)
+++ head/sys/geom/geom_disk.c	Sat Feb  1 10:15:23 2020	(r357363)
@@ -268,7 +268,6 @@ g_disk_ioctl(struct g_provider *pp, u_long cmd, void *
 {
 	struct disk *dp;
 	struct g_disk_softc *sc;
-	int error;
 
 	sc = pp->private;
 	dp = sc->dp;
@@ -277,8 +276,7 @@ g_disk_ioctl(struct g_provider *pp, u_long cmd, void *
 
 	if (dp->d_ioctl == NULL)
 		return (ENOIOCTL);
-	error = dp->d_ioctl(dp, cmd, data, fflag, td);
-	return (error);
+	return (dp->d_ioctl(dp, cmd, data, fflag, td));
 }
 
 static off_t