diff --git a/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp b/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp
index 58d30bdc5a..0bd81b0e34 100644
--- a/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp
+++ b/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp
@@ -218,7 +218,7 @@ AHCIController::Init()
 	}
 	TRACE("ghc: AHCI Enable: %s\n",	(fRegs->ghc & GHC_AE) ? "yes" : "no");
 	TRACE("Ports Implemented Mask: %#08" B_PRIx32 " Number of Available Ports:"
-		" %d\n", fPortImplementedMask, count_bits_set(fPortImplementedMask));
+		" %d\n", fPortImplementedMask, count_set_bits(fPortImplementedMask));
 	TRACE("AHCI Version %02" B_PRIx32 "%02" B_PRIx32 ".%02" B_PRIx32 ".%02"
 		B_PRIx32 " Interrupt %" B_PRIu32 "\n", fRegs->vs >> 24, (fRegs->vs >> 16) & 0xff,
 		(fRegs->vs >> 8) & 0xff, fRegs->vs & 0xff, fIRQ);
diff --git a/src/add-ons/kernel/busses/scsi/ahci/ahci_defs.h b/src/add-ons/kernel/busses/scsi/ahci/ahci_defs.h
index 10a09be153..02a578e9b5 100644
--- a/src/add-ons/kernel/busses/scsi/ahci/ahci_defs.h
+++ b/src/add-ons/kernel/busses/scsi/ahci/ahci_defs.h
@@ -344,16 +344,6 @@ extern scsi_for_sim_interface *gSCSI;
 
 #ifdef __cplusplus
 
-template <class T>
-int count_bits_set(T value)
-{
-	int count = 0;
-	for (T mask = 1; mask; mask <<= 1)
-		if (value & mask)
-			count++;
-	return count;
-}
-
 inline
 status_t
 wait_until_set(volatile uint32 *reg, uint32 bits, bigtime_t timeout)