From c7575b36791694f835433bec70ed42d38ab0c8a3 Mon Sep 17 00:00:00 2001
From: Thierry HUCHARD <thierry@ordissimo.com>
Date: Wed, 15 Dec 2021 22:37:02 +0200
Subject: [PATCH] plustek-pp: Reuse sanei_directio for inb/outb

---
 backend/plustek-pp_io.c   | 20 ++++++++++----------
 backend/plustek-pp_misc.c |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/backend/plustek-pp_io.c b/backend/plustek-pp_io.c
index af3e8c43e..42b40b8c9 100644
--- a/backend/plustek-pp_io.c
+++ b/backend/plustek-pp_io.c
@@ -959,37 +959,37 @@ _LOC void IOReadScannerImageData( pScanData ps, pUChar pBuf, ULong size )
  */
 _LOC void IOOut( Byte data, UShort port )
 {
-	DBG( DBG_IOF, "outb(0x%04x, 0x%02x)\n", port, data );
-	outb( data, port );
+	DBG( DBG_IOF, "sanei_outb(0x%04x, 0x%02x)\n", port, data );
+	sanei_outb( port, data );
 }
 
 _LOC void IOOutDelayed( Byte data, UShort port )
 {
-	DBG( DBG_IOF, "outb_p(0x%04x, 0x%02x)\n", port, data );
-	outb_p( data, port );
+	DBG( DBG_IOF, "sanei_outb_p(0x%04x, 0x%02x)\n", port, data );
+	sanei_outb_p( port, data );
 }
 
 _LOC Byte IOIn( UShort port )
 {
 #ifdef DEBUG
-	Byte data = inb( port );
+	Byte data = sani_inb( port );
 
-	DBG( DBG_IOF, "inb(0x%04x) = 0x%02x\n", port, data );
+	DBG( DBG_IOF, "sanei_inb(0x%04x) = 0x%02x\n", port, data );
 	return data;
 #else
-	return inb( port );
+	return sanei_inb( port );
 #endif
 }
 
 _LOC Byte IOInDelayed( UShort port )
 {
 #ifdef DEBUG
-	Byte data = inb_p( port );
+	Byte data = sanei_inb_p( port );
 
-	DBG( DBG_IOF, "inb_p(0x%04x) = 0x%02x\n", port, data );
+	DBG( DBG_IOF, "sanei_inb_p(0x%04x) = 0x%02x\n", port, data );
 	return data;
 #else
-	return inb_p( port );
+	return sanei_inb_p( port );
 #endif
 }
 #endif /* guard __KERNEL__ */
diff --git a/backend/plustek-pp_misc.c b/backend/plustek-pp_misc.c
index ec2f12904..876f3cf93 100644
--- a/backend/plustek-pp_misc.c
+++ b/backend/plustek-pp_misc.c
@@ -320,7 +320,7 @@ static int miscSetFastMode( pScanData ps )
 
 		_OUTB_DATA(ps,0x55);
 		_DO_UDELAY(1);
-		if ((inb(ps->IO.portBase)) != 0x55)	/* read data */
+		if ((sanei_inb(ps->IO.portBase)) != 0x55)	/* read data */
 			a++;
 
 		_OUTB_DATA(ps,0xAA);