[src/netbsd-3]: src/sys/dev/ic Pull up revision 1.223 (requested by bouyer in...

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

details:   https://anonhg.NetBSD.org/src/rev/59f54dd7e45b
branches:  netbsd-3
changeset: 576319:59f54dd7e45b
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Jun 22 18:38:33 2005 +0000

description:
Pull up revision 1.223 (requested by bouyer in ticket #480):
Remove a (wdc == NULL) test. We know wdc is not NULL at this point.

diffstat:

 sys/dev/ic/wdc.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r f201a2011434 -r 59f54dd7e45b sys/dev/ic/wdc.c
--- a/sys/dev/ic/wdc.c  Wed Jun 22 18:35:44 2005 +0000
+++ b/sys/dev/ic/wdc.c  Wed Jun 22 18:38:33 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wdc.c,v 1.220 2005/03/02 12:25:27 mycroft Exp $ */
+/*     $NetBSD: wdc.c,v 1.220.2.1 2005/06/22 18:38:33 tron Exp $ */
 
 /*
  * Copyright (c) 1998, 2001, 2003 Manuel Bouyer.  All rights reserved.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.220 2005/03/02 12:25:27 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.220.2.1 2005/06/22 18:38:33 tron Exp $");
 
 #ifndef ATADEBUG
 #define ATADEBUG
@@ -665,8 +665,7 @@
                        chp->ch_drive[drive].drive_flags |= DRIVE_ATAPI;
                } else {
                        chp->ch_drive[drive].drive_flags |= DRIVE_ATA;
-                       if (wdc == NULL ||
-                           (wdc->cap & WDC_CAPABILITY_PREATA) != 0)
+                       if ((wdc->cap & WDC_CAPABILITY_PREATA) != 0)
                                chp->ch_drive[drive].drive_flags |= DRIVE_OLD;
                }
                splx(s);