From 5c196ba3d895c57df13a72075378c63a6d437098 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Sat, 9 Jun 2012 13:18:39 +0200
Subject: [PATCH] kernel: Remove some bogus checks before returning anyway.

---
 sys/dev/drm/savage/savage_bci.c | 2 --
 sys/dev/video/i386/vesa/vesa.c  | 3 ---
 sys/netgraph7/ng_sppp.c         | 9 +--------
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/sys/dev/drm/savage/savage_bci.c b/sys/dev/drm/savage/savage_bci.c
index a1ae0fc096..17e79f16f7 100644
--- a/sys/dev/drm/savage/savage_bci.c
+++ b/sys/dev/drm/savage/savage_bci.c
@@ -646,8 +646,6 @@ int savage_driver_firstopen(struct drm_device *dev)
 	ret = drm_addmap(dev, aperture_base, SAVAGE_APERTURE_SIZE,
 			 _DRM_FRAME_BUFFER, _DRM_WRITE_COMBINING,
 			 &dev_priv->aperture);
-	if (ret)
-		return ret;
 
 	return ret;
 }
diff --git a/sys/dev/video/i386/vesa/vesa.c b/sys/dev/video/i386/vesa/vesa.c
index 6964a50ff2..b56eff8d52 100644
--- a/sys/dev/video/i386/vesa/vesa.c
+++ b/sys/dev/video/i386/vesa/vesa.c
@@ -1641,9 +1641,6 @@ vesa_diag(video_adapter_t *adp, int level)
 	if (adp != vesa_adp)
 		return 1;
 
-	if (level <= 0)
-		return 0;
-
 	return 0;
 }
 
diff --git a/sys/netgraph7/ng_sppp.c b/sys/netgraph7/ng_sppp.c
index f2c2464d70..9dac9dadda 100644
--- a/sys/netgraph7/ng_sppp.c
+++ b/sys/netgraph7/ng_sppp.c
@@ -17,7 +17,6 @@
  * Cronyx Id: ng_sppp.c,v 1.1.2.10 2004/03/01 15:17:21 rik Exp $
  *
  * $FreeBSD: src/sys/netgraph/ng_sppp.c,v 1.11 2006/12/29 13:59:50 jhb Exp $
- * $DragonFly: src/sys/netgraph7/ng_sppp.c,v 1.2 2008/06/26 23:05:35 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -180,13 +179,7 @@ ng_sppp_free_unit (int unit)
 static int
 ng_sppp_ioctl (struct ifnet *ifp, u_long command, caddr_t data)
 {
-	int error = 0;
-
-	error = sppp_ioctl (ifp, command, data);
-	if (error)
-		return error;
-
-	return error;
+	return sppp_ioctl (ifp, command, data);
 }
 
 /*
-- 
2.41.0