[src/trunk]: src/sys/external/bsd/drm2/i915drm Omit redundant vga_is_console ...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6dbc1f94f032
branches:  trunk
changeset: 797602:6dbc1f94f032
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 23 18:05:44 2014 +0000

description:
Omit redundant vga_is_console test.

This was a copypasta error -- before it tested iot then memt -- but I
see no evidence that passing memt to vga_is_console is ever sensible.

diffstat:

 sys/external/bsd/drm2/i915drm/i915_pci.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r bbb1cb9c99cf -r 6dbc1f94f032 sys/external/bsd/drm2/i915drm/i915_pci.c
--- a/sys/external/bsd/drm2/i915drm/i915_pci.c  Wed Jul 23 16:56:49 2014 +0000
+++ b/sys/external/bsd/drm2/i915drm/i915_pci.c  Wed Jul 23 18:05:44 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_pci.c,v 1.12 2014/07/16 23:25:18 riastradh Exp $  */
+/*     $NetBSD: i915_pci.c,v 1.13 2014/07/23 18:05:44 riastradh Exp $  */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.12 2014/07/16 23:25:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.13 2014/07/23 18:05:44 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "vga.h"
@@ -301,8 +301,7 @@
        int ret;
 
 #if NVGA > 0
-       if (vga_is_console(dev->pdev->pd_pa.pa_iot, -1) ||
-           vga_is_console(dev->pdev->pd_pa.pa_iot, -1)) {
+       if (vga_is_console(dev->pdev->pd_pa.pa_iot, -1)) {
                what_was_cons = CONS_VGA;
                prop_dictionary_set_bool(dict, "is_console", true);
                /*