diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c index e049c32cf58..062abc0b8c0 100644 --- a/sys/dev/ahci/ahci.c +++ b/sys/dev/ahci/ahci.c @@ -148,7 +148,6 @@ ahci_ctlr_reset(device_t dev) if ((ATA_INL(ctlr->r_mem, AHCI_VS) >= 0x00010200) && (ATA_INL(ctlr->r_mem, AHCI_CAP2) & AHCI_CAP2_BOH) && ((v = ATA_INL(ctlr->r_mem, AHCI_BOHC)) & AHCI_BOHC_OOS) == 0) { - /* Request OS ownership. */ ATA_OUTL(ctlr->r_mem, AHCI_BOHC, v | AHCI_BOHC_OOS); @@ -193,7 +192,6 @@ ahci_ctlr_reset(device_t dev) return (0); } - int ahci_attach(device_t dev) { diff --git a/sys/dev/ahci/ahci.h b/sys/dev/ahci/ahci.h index 60155bc05cd..888f8893e30 100644 --- a/sys/dev/ahci/ahci.h +++ b/sys/dev/ahci/ahci.h @@ -679,4 +679,3 @@ struct ahci_channel * ahci_getch(device_t dev, int n); void ahci_putch(struct ahci_channel *ch); extern devclass_t ahci_devclass; - diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index 1ff0d5a873a..8b7a8487ab7 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -545,7 +545,6 @@ ahci_pci_attach(device_t dev) } } - if (ctlr->quirks & AHCI_Q_NOMSIX) msix_count = 0;