diff --git a/backend/genesys.cc b/backend/genesys.cc
index 4c5984cbe..7bcaeb36e 100644
--- a/backend/genesys.cc
+++ b/backend/genesys.cc
@@ -6772,14 +6772,14 @@ set_option_value (Genesys_Scanner * s, int option, void *val,
     case OPT_LAMP_OFF_TIME:
         if (*reinterpret_cast<SANE_Word*>(val) != s->lamp_off_time) {
             s->lamp_off_time = *reinterpret_cast<SANE_Word*>(val);
-            RIE(s->dev->model->cmd_set->set_powersaving(s->dev, s->lamp_off_time));
+                s->dev->model->cmd_set->set_powersaving(s->dev, s->lamp_off_time);
         }
         break;
     case OPT_EXPIRATION_TIME:
         if (*reinterpret_cast<SANE_Word*>(val) != s->expiration_time) {
             s->expiration_time = *reinterpret_cast<SANE_Word*>(val);
             // BUG: this is most likely not intended behavior, found out during refactor
-            RIE(s->dev->model->cmd_set->set_powersaving(s->dev, s->expiration_time));
+                s->dev->model->cmd_set->set_powersaving(s->dev, s->expiration_time);
 	}
         break;
 
diff --git a/backend/genesys_gl124.cc b/backend/genesys_gl124.cc
index 3a38021fd..5f37b06a7 100644
--- a/backend/genesys_gl124.cc
+++ b/backend/genesys_gl124.cc
@@ -1493,8 +1493,7 @@ static void gl124_save_power(Genesys_Device* dev, SANE_Bool enable)
     DBG_HELPER_ARGS(dbg, "enable = %d", enable);
 }
 
-static SANE_Status
-gl124_set_powersaving (Genesys_Device * dev, int delay /* in minutes */ )
+static void gl124_set_powersaving(Genesys_Device* dev, int delay /* in minutes */)
 {
     DBG_HELPER_ARGS(dbg,  "delay = %d",  delay);
   GenesysRegister *r;
@@ -1509,8 +1508,6 @@ gl124_set_powersaving (Genesys_Device * dev, int delay /* in minutes */ )
     {
       r->value |= 0x0f;
     }
-
-  return SANE_STATUS_GOOD;
 }
 
 static void gl124_start_action(Genesys_Device* dev)
diff --git a/backend/genesys_gl646.cc b/backend/genesys_gl646.cc
index 3eb6f16b2..5fcbdafe9 100644
--- a/backend/genesys_gl646.cc
+++ b/backend/genesys_gl646.cc
@@ -1535,11 +1535,9 @@ static void gl646_save_power(Genesys_Device* dev, SANE_Bool enable)
     }
 }
 
-static SANE_Status
-gl646_set_powersaving (Genesys_Device * dev, int delay /* in minutes */ )
+static void gl646_set_powersaving(Genesys_Device* dev, int delay /* in minutes */)
 {
     DBG_HELPER_ARGS(dbg, "delay = %d", delay);
-  SANE_Status status = SANE_STATUS_GOOD;
   Genesys_Register_Set local_reg(Genesys_Register_Set::SEQUENTIAL);
   int rate, exposure_time, tgtime, time;
 
@@ -1595,8 +1593,6 @@ gl646_set_powersaving (Genesys_Device * dev, int delay /* in minutes */ )
   local_reg.find_reg(0x39).value = exposure_time & 255;
 
     sanei_genesys_bulk_write_register(dev, local_reg);
-
-  return status;
 }
 
 
@@ -3522,8 +3518,8 @@ gl646_init (Genesys_Device * dev)
 	  return status;
 	}
 
-      /* Set powersaving (default = 15 minutes) */
-      RIE (gl646_set_powersaving (dev, 15));
+        // Set powersaving(default = 15 minutes)
+        gl646_set_powersaving(dev, 15);
     }				/* end if cold */
 
     // Set analog frontend
diff --git a/backend/genesys_gl841.cc b/backend/genesys_gl841.cc
index d728487b3..ac09ae333 100644
--- a/backend/genesys_gl841.cc
+++ b/backend/genesys_gl841.cc
@@ -2403,12 +2403,9 @@ static void gl841_save_power(Genesys_Device* dev, SANE_Bool enable)
     }
 }
 
-static SANE_Status
-gl841_set_powersaving (Genesys_Device * dev,
-			     int delay /* in minutes */ )
+static void gl841_set_powersaving(Genesys_Device* dev, int delay /* in minutes */)
 {
     DBG_HELPER_ARGS(dbg, "delay = %d", delay);
-  SANE_Status status = SANE_STATUS_GOOD;
   // FIXME: SEQUENTIAL not really needed in this case
   Genesys_Register_Set local_reg(Genesys_Register_Set::SEQUENTIAL);
   int rate, exposure_time, tgtime, time;
@@ -2469,8 +2466,6 @@ gl841_set_powersaving (Genesys_Device * dev,
   local_reg.set8(0x39, exposure_time & 255);	/* lowbyte */
 
     sanei_genesys_bulk_write_register(dev, local_reg);
-
-  return status;
 }
 
 static void gl841_start_action(Genesys_Device* dev)
@@ -4451,8 +4446,8 @@ gl841_init (Genesys_Device * dev)
 
   regs = dev->reg;
 
-  /* Set powersaving (default = 15 minutes) */
-  RIE (gl841_set_powersaving (dev, 15));
+    // Set powersaving(default = 15 minutes)
+    gl841_set_powersaving(dev, 15);
   dev->already_initialized = SANE_TRUE;
 
   return SANE_STATUS_GOOD;
diff --git a/backend/genesys_gl843.cc b/backend/genesys_gl843.cc
index c9b388b98..1419590be 100644
--- a/backend/genesys_gl843.cc
+++ b/backend/genesys_gl843.cc
@@ -1688,16 +1688,10 @@ static void gl843_save_power(Genesys_Device* dev, SANE_Bool enable)
     }
 }
 
-static SANE_Status
-gl843_set_powersaving (Genesys_Device * dev, int delay /* in minutes */ )
+static void gl843_set_powersaving(Genesys_Device* dev, int delay /* in minutes */)
 {
+    (void) dev;
     DBG_HELPER_ARGS(dbg, "delay = %d", delay);
-  SANE_Status status = SANE_STATUS_GOOD;
-
-  if (dev == NULL)
-    return SANE_STATUS_INVAL;
-
-  return status;
 }
 
 static void gl843_start_action(Genesys_Device* dev)
diff --git a/backend/genesys_gl846.cc b/backend/genesys_gl846.cc
index 82dbffbe8..72e2d3cfd 100644
--- a/backend/genesys_gl846.cc
+++ b/backend/genesys_gl846.cc
@@ -1346,14 +1346,10 @@ static void gl846_save_power(Genesys_Device* dev, SANE_Bool enable)
     DBG_HELPER_ARGS(dbg, "enable = %d", enable);
 }
 
-static SANE_Status
-gl846_set_powersaving (Genesys_Device * dev, int delay /* in minutes */ )
+static void gl846_set_powersaving(Genesys_Device* dev, int delay /* in minutes */)
 {
+    (void) dev;
     DBG_HELPER_ARGS(dbg, "delay = %d", delay);
-  if (dev == NULL)
-    return SANE_STATUS_INVAL;
-
-  return SANE_STATUS_GOOD;
 }
 
 static void gl846_start_action(Genesys_Device* dev)
diff --git a/backend/genesys_gl847.cc b/backend/genesys_gl847.cc
index 805febfdf..fd110bc63 100644
--- a/backend/genesys_gl847.cc
+++ b/backend/genesys_gl847.cc
@@ -1362,14 +1362,10 @@ static void gl847_save_power(Genesys_Device* dev, SANE_Bool enable)
     (void) dev;
 }
 
-static SANE_Status
-gl847_set_powersaving (Genesys_Device * dev, int delay /* in minutes */ )
+static void gl847_set_powersaving(Genesys_Device* dev, int delay /* in minutes */)
 {
+    (void) dev;
     DBG_HELPER_ARGS(dbg, "delay = %d", delay);
-  if (dev == NULL)
-    return SANE_STATUS_INVAL;
-
-  return SANE_STATUS_GOOD;
 }
 
 static void gl847_start_action(Genesys_Device* dev)
diff --git a/backend/genesys_low.cc b/backend/genesys_low.cc
index fb1e617df..43258c344 100644
--- a/backend/genesys_low.cc
+++ b/backend/genesys_low.cc
@@ -1277,8 +1277,8 @@ sanei_genesys_asic_init(Genesys_Device* dev, int /*max_regs*/)
     dev->model->cmd_set->slow_back_home(dev, SANE_TRUE);
   dev->scanhead_position_in_steps = 0;
 
-  /* Set powersaving (default = 15 minutes) */
-  RIE (dev->model->cmd_set->set_powersaving (dev, 15));
+    // Set powersaving (default = 15 minutes)
+    dev->model->cmd_set->set_powersaving(dev, 15);
 
     return status;
 }
diff --git a/backend/genesys_low.h b/backend/genesys_low.h
index 96cfd4bf3..edec98e43 100644
--- a/backend/genesys_low.h
+++ b/backend/genesys_low.h
@@ -1066,7 +1066,7 @@ struct Genesys_Command_Set
     SANE_Bool (*test_motor_flag_bit) (SANE_Byte val);
 
     void (*set_fe) (Genesys_Device* dev, const Genesys_Sensor& sensor, uint8_t set);
-    SANE_Status (*set_powersaving) (Genesys_Device * dev, int delay);
+    void (*set_powersaving) (Genesys_Device* dev, int delay);
     void (*save_power) (Genesys_Device* dev, SANE_Bool enable);
 
     void (*begin_scan) (Genesys_Device* dev, const Genesys_Sensor& sensor,