svn commit: r188912 - head/sys/dev/ata

[Alexander Motin]

Author: mav
Date: Sun Feb 22 10:26:02 2009
New Revision: 188912
URL: http://svn.freebsd.org/changeset/base/188912

Log:
  Remove one more place of master/slave terms usage.

Modified:
  head/sys/dev/ata/ata-all.c

Modified: head/sys/dev/ata/ata-all.c
==============================================================================
--- head/sys/dev/ata/ata-all.c	Sun Feb 22 10:25:07 2009	(r188911)
+++ head/sys/dev/ata/ata-all.c	Sun Feb 22 10:26:02 2009	(r188912)
@@ -932,8 +932,7 @@ ata_atapi(device_t dev)
     struct ata_channel *ch = device_get_softc(device_get_parent(dev));
     struct ata_device *atadev = device_get_softc(dev);
 
-    return ((atadev->unit == ATA_MASTER && ch->devices & ATA_ATAPI_MASTER) ||
-            (atadev->unit == ATA_SLAVE && ch->devices & ATA_ATAPI_SLAVE));
+    return (ch->devices & (ATA_ATAPI_MASTER << atadev->unit));
 }
 
 int