diff --git a/drivers/nvme/macros.inc b/drivers/nvme/macros.inc
index d3294c5..49728b9 100644
--- a/drivers/nvme/macros.inc
+++ b/drivers/nvme/macros.inc
@@ -8,16 +8,14 @@
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;include "../fdo.inc"
-
-macro PCI_DEBUGF _level*, _ptr*, _fmt*, [_args] {
+macro PDEBUGF _level*, _fmt*, _bus*, _devfn*, [_args] {
 	push 	ebx
 	push 	ecx
-	movzx   ebx, byte [_ptr + PCIDEV.devfn]
+	movzx   ebx, _devfn
 	shr     ebx, 3 ; get rid of 3 lowest bits (function code), the rest bits is device code
-	movzx   ecx, byte [_ptr + PCIDEV.devfn]
+	movzx   ecx, _devfn
 	and     ecx, 00000111b ; get only 3 lowest bits (function code)
-	DEBUGF  _level, _fmt, [_ptr + PCIDEV.bus], ebx, ecx, _args
+	DEBUGF  _level, _fmt, _bus, ebx, ecx, _args
 	pop		ecx
 	pop 	ebx
 }