diff --git a/backend/genesys.cc b/backend/genesys.cc
index c7524910e..48b5531b5 100644
--- a/backend/genesys.cc
+++ b/backend/genesys.cc
@@ -3629,7 +3629,7 @@ genesys_warmup_lamp (Genesys_Device * dev)
       RIE(dev->model->cmd_set->begin_scan(dev, sensor, &dev->reg, SANE_FALSE));
       do
 	{
-	  sanei_genesys_test_buffer_empty (dev, &empty);
+        sanei_genesys_test_buffer_empty(dev, &empty);
 	}
       while (empty);
 
@@ -3650,7 +3650,7 @@ genesys_warmup_lamp (Genesys_Device * dev)
       RIE(dev->model->cmd_set->begin_scan(dev, sensor, &dev->reg, SANE_FALSE));
       do
 	{
-	  sanei_genesys_test_buffer_empty (dev, &empty);
+        sanei_genesys_test_buffer_empty(dev, &empty);
           sanei_genesys_sleep_ms(100);
 	}
       while (empty);
@@ -3954,13 +3954,10 @@ genesys_start_scan (Genesys_Device * dev, SANE_Bool lamp_off)
         }
     }
   while (steps < expected);
-
-  /* wait for buffers to be filled */
-  do
-    {
-      RIE (sanei_genesys_test_buffer_empty (dev, &empty));
-    }
-  while (empty);
+        // wait for buffers to be filled
+        do {
+            sanei_genesys_test_buffer_empty(dev, &empty);
+        } while (empty);
 
   /* when doing one or two-table movement, let the motor settle to scanning speed */
   /* and scanning start before reading data                                        */
diff --git a/backend/genesys_gl124.cc b/backend/genesys_gl124.cc
index 8b7ccd91c..a5ebb894e 100644
--- a/backend/genesys_gl124.cc
+++ b/backend/genesys_gl124.cc
@@ -2161,10 +2161,10 @@ gl124_search_start_position (Genesys_Device * dev)
       return status;
     }
 
-  /* waits for valid data */
-  do
-    sanei_genesys_test_buffer_empty (dev, &steps);
-  while (steps);
+    // waits for valid data
+    do {
+        sanei_genesys_test_buffer_empty(dev, &steps);
+    } while (steps);
 
   /* now we're on target, we can read data */
   status = sanei_genesys_read_data_from_scanner (dev, data.data(), size);
diff --git a/backend/genesys_gl646.cc b/backend/genesys_gl646.cc
index cac430253..94b4fafec 100644
--- a/backend/genesys_gl646.cc
+++ b/backend/genesys_gl646.cc
@@ -4038,7 +4038,7 @@ simple_scan (Genesys_Device * dev, const Genesys_Sensor& sensor,
 	{
 	  print_status (val);
 	}
-      RIE (sanei_genesys_test_buffer_empty (dev, &empty));
+        sanei_genesys_test_buffer_empty(dev, &empty);
       count++;
     }
   while (empty && count < 1000);
diff --git a/backend/genesys_gl841.cc b/backend/genesys_gl841.cc
index 05437a590..dc78bebcc 100644
--- a/backend/genesys_gl841.cc
+++ b/backend/genesys_gl841.cc
@@ -3415,10 +3415,10 @@ gl841_search_start_position (Genesys_Device * dev)
       return status;
     }
 
-  /* waits for valid data */
-  do
-    sanei_genesys_test_buffer_empty (dev, &steps);
-  while (steps);
+        // waits for valid data
+        do {
+            sanei_genesys_test_buffer_empty(dev, &steps);
+        } while (steps);
 
   /* now we're on target, we can read data */
   status = sanei_genesys_read_data_from_scanner(dev, data.data(), size);
@@ -5035,10 +5035,10 @@ gl841_search_strip(Genesys_Device * dev, const Genesys_Sensor& sensor,
       return status;
     }
 
-  /* waits for valid data */
-  do
-    sanei_genesys_test_buffer_empty (dev, &steps);
-  while (steps);
+        // waits for valid data
+        do {
+            sanei_genesys_test_buffer_empty(dev, &steps);
+        } while (steps);
 
   /* now we're on target, we can read data */
   status = sanei_genesys_read_data_from_scanner(dev, data.data(), size);
@@ -5077,10 +5077,10 @@ gl841_search_strip(Genesys_Device * dev, const Genesys_Sensor& sensor,
 	  return status;
 	}
 
-      /* waits for valid data */
-      do
-	sanei_genesys_test_buffer_empty (dev, &steps);
-      while (steps);
+        // waits for valid data
+        do {
+            sanei_genesys_test_buffer_empty(dev, &steps);
+        } while (steps);
 
       /* now we're on target, we can read data */
       status = sanei_genesys_read_data_from_scanner (dev, data.data(), size);
diff --git a/backend/genesys_gl843.cc b/backend/genesys_gl843.cc
index 58fa1cf47..1cab0af7e 100644
--- a/backend/genesys_gl843.cc
+++ b/backend/genesys_gl843.cc
@@ -2606,10 +2606,10 @@ gl843_search_start_position (Genesys_Device * dev)
       return status;
     }
 
-  /* waits for valid data */
-  do
-    sanei_genesys_test_buffer_empty (dev, &steps);
-  while (steps);
+        // waits for valid data
+        do {
+            sanei_genesys_test_buffer_empty(dev, &steps);
+        } while (steps);
 
   /* now we're on target, we can read data */
   status = sanei_genesys_read_data_from_scanner(dev, data.data(), size);
@@ -4077,10 +4077,10 @@ gl843_search_strip (Genesys_Device * dev, const Genesys_Sensor& sensor,
       return status;
     }
 
-  /* waits for valid data */
-  do
-    sanei_genesys_test_buffer_empty (dev, &steps);
-  while (steps);
+        // waits for valid data
+        do {
+            sanei_genesys_test_buffer_empty(dev, &steps);
+        } while (steps);
 
   /* now we're on target, we can read data */
   status = sanei_genesys_read_data_from_scanner(dev, data.data(), size);
@@ -4120,10 +4120,10 @@ gl843_search_strip (Genesys_Device * dev, const Genesys_Sensor& sensor,
 	  return status;
 	}
 
-      /* waits for valid data */
-      do
-	sanei_genesys_test_buffer_empty (dev, &steps);
-      while (steps);
+        // waits for valid data
+        do {
+            sanei_genesys_test_buffer_empty(dev, &steps);
+        } while (steps);
 
       /* now we're on target, we can read data */
       status = sanei_genesys_read_data_from_scanner(dev, data.data(), size);
diff --git a/backend/genesys_gl846.cc b/backend/genesys_gl846.cc
index 5f8fe1643..294efb6f9 100644
--- a/backend/genesys_gl846.cc
+++ b/backend/genesys_gl846.cc
@@ -1791,10 +1791,10 @@ gl846_search_start_position (Genesys_Device * dev)
       return status;
     }
 
-  /* waits for valid data */
-  do
-    sanei_genesys_test_buffer_empty (dev, &steps);
-  while (steps);
+        // waits for valid data
+        do {
+            sanei_genesys_test_buffer_empty(dev, &steps);
+        } while (steps);
 
   /* now we're on target, we can read data */
   status = sanei_genesys_read_data_from_scanner(dev, data.data(), size);
@@ -2722,10 +2722,10 @@ gl846_search_strip(Genesys_Device * dev, const Genesys_Sensor& sensor,
       return status;
     }
 
-  /* waits for valid data */
-  do
-    sanei_genesys_test_buffer_empty (dev, &steps);
-  while (steps);
+        // waits for valid data
+        do {
+            sanei_genesys_test_buffer_empty(dev, &steps);
+        } while (steps);
 
   /* now we're on target, we can read data */
   status = sanei_genesys_read_data_from_scanner(dev, data.data(), size);
@@ -2764,10 +2764,10 @@ gl846_search_strip(Genesys_Device * dev, const Genesys_Sensor& sensor,
           return status;
         }
 
-      /* waits for valid data */
-      do
-        sanei_genesys_test_buffer_empty (dev, &steps);
-      while (steps);
+        // waits for valid data
+        do {
+            sanei_genesys_test_buffer_empty(dev, &steps);
+        } while (steps);
 
       /* now we're on target, we can read data */
       status = sanei_genesys_read_data_from_scanner(dev, data.data(), size);
diff --git a/backend/genesys_gl847.cc b/backend/genesys_gl847.cc
index ce9e28bbf..b08427ce2 100644
--- a/backend/genesys_gl847.cc
+++ b/backend/genesys_gl847.cc
@@ -1847,10 +1847,10 @@ gl847_search_start_position (Genesys_Device * dev)
       return status;
     }
 
-  /* waits for valid data */
-  do
-    sanei_genesys_test_buffer_empty (dev, &steps);
-  while (steps);
+        // waits for valid data
+        do {
+            sanei_genesys_test_buffer_empty(dev, &steps);
+        } while (steps);
 
   /* now we're on target, we can read data */
   status = sanei_genesys_read_data_from_scanner(dev, data.data(), size);
@@ -2809,10 +2809,10 @@ gl847_search_strip (Genesys_Device * dev, const Genesys_Sensor& sensor,
       return status;
     }
 
-  /* waits for valid data */
-  do
-    sanei_genesys_test_buffer_empty (dev, &steps);
-  while (steps);
+        // waits for valid data
+        do {
+            sanei_genesys_test_buffer_empty(dev, &steps);
+        } while (steps);
 
   /* now we're on target, we can read data */
   status = sanei_genesys_read_data_from_scanner(dev, data.data(), size);
@@ -2851,10 +2851,10 @@ gl847_search_strip (Genesys_Device * dev, const Genesys_Sensor& sensor,
 	  return status;
 	}
 
-      /* waits for valid data */
-      do
-	sanei_genesys_test_buffer_empty (dev, &steps);
-      while (steps);
+        // waits for valid data
+        do {
+            sanei_genesys_test_buffer_empty(dev, &steps);
+        } while (steps);
 
       /* now we're on target, we can read data */
       status = sanei_genesys_read_data_from_scanner(dev, data.data(), size);
diff --git a/backend/genesys_low.cc b/backend/genesys_low.cc
index ecc90e18a..4323036ee 100644
--- a/backend/genesys_low.cc
+++ b/backend/genesys_low.cc
@@ -807,8 +807,7 @@ sanei_genesys_read_scancnt (Genesys_Device * dev, unsigned int *words)
  * @param *empty return value
  * @return empty will be set to SANE_TRUE if there is no scanned data.
  **/
-SANE_Status
-sanei_genesys_test_buffer_empty (Genesys_Device * dev, SANE_Bool * empty)
+void sanei_genesys_test_buffer_empty(Genesys_Device* dev, SANE_Bool* empty)
 {
     DBG_HELPER(dbg);
   uint8_t val = 0;
@@ -824,13 +823,12 @@ sanei_genesys_test_buffer_empty (Genesys_Device * dev, SANE_Bool * empty)
       sanei_genesys_sleep_ms(1);
       DBG(DBG_io2, "%s: buffer is empty\n", __func__);
       *empty = SANE_TRUE;
-      return SANE_STATUS_GOOD;
+      return;
     }
 
   *empty = SANE_FALSE;
 
   DBG(DBG_io, "%s: buffer is filled\n", __func__);
-  return SANE_STATUS_GOOD;
 }
 
 
diff --git a/backend/genesys_low.h b/backend/genesys_low.h
index 2735616ba..7f038a2a4 100644
--- a/backend/genesys_low.h
+++ b/backend/genesys_low.h
@@ -1856,8 +1856,7 @@ extern SANE_Status
 sanei_genesys_write_pnm_file (const char *filename, uint8_t * data, int depth,
 			      int channels, int pixels_per_line, int lines);
 
-extern SANE_Status
-sanei_genesys_test_buffer_empty (Genesys_Device * dev, SANE_Bool * empty);
+extern void sanei_genesys_test_buffer_empty(Genesys_Device* dev, SANE_Bool* empty);
 
 extern SANE_Status
 sanei_genesys_read_data_from_scanner (Genesys_Device * dev, uint8_t * data,