From 16c55bf330f80db64f886cd5bc9ceda588e00ba0 Mon Sep 17 00:00:00 2001
From: Povilas Kanapickas <povilas@radix.lt>
Date: Fri, 2 Aug 2019 22:39:05 +0300
Subject: [PATCH] genesys: Init cmd_set directly instead of going through a
 function

---
 backend/genesys_gl124.cc |  7 +------
 backend/genesys_gl646.cc |  7 +------
 backend/genesys_gl841.cc |  7 +------
 backend/genesys_gl843.cc |  7 +------
 backend/genesys_gl846.cc |  7 +------
 backend/genesys_gl847.cc |  7 +------
 backend/genesys_low.cc   | 19 +++++++++++++------
 backend/genesys_low.h    |  6 ------
 8 files changed, 19 insertions(+), 48 deletions(-)

diff --git a/backend/genesys_gl124.cc b/backend/genesys_gl124.cc
index bc82cf8a3..285ba545e 100644
--- a/backend/genesys_gl124.cc
+++ b/backend/genesys_gl124.cc
@@ -3063,7 +3063,7 @@ static void gl124_update_hardware_sensors(Genesys_Scanner* s)
 
 
 /** the gl124 command set */
-static Genesys_Command_Set gl124_cmd_set = {
+Genesys_Command_Set gl124_cmd_set = {
   "gl124-generic",                /* the name of this set */
 
   [](Genesys_Device* dev) -> bool { (void) dev; return true; },
@@ -3118,8 +3118,3 @@ static Genesys_Command_Set gl124_cmd_set = {
   gl124_calculate_current_setup,
   gl124_boot
 };
-
-void sanei_gl124_init_cmd_set(Genesys_Device* dev)
-{
-    dev->cmd_set = &gl124_cmd_set;
-}
diff --git a/backend/genesys_gl646.cc b/backend/genesys_gl646.cc
index 611d43a03..d41ca05a2 100644
--- a/backend/genesys_gl646.cc
+++ b/backend/genesys_gl646.cc
@@ -4093,7 +4093,7 @@ static void gl646_search_strip(Genesys_Device* dev, const Genesys_Sensor& sensor
 }
 
 /** the gl646 command set */
-static Genesys_Command_Set gl646_cmd_set = {
+Genesys_Command_Set gl646_cmd_set = {
   "gl646-generic",		/* the name of this set */
 
   gl646_needs_home_before_init_regs_for_scan,
@@ -4148,8 +4148,3 @@ static Genesys_Command_Set gl646_cmd_set = {
   NULL,
   NULL
 };
-
-void sanei_gl646_init_cmd_set(Genesys_Device* dev)
-{
-    dev->cmd_set = &gl646_cmd_set;
-}
diff --git a/backend/genesys_gl841.cc b/backend/genesys_gl841.cc
index 0b6a5bf5e..9ae095120 100644
--- a/backend/genesys_gl841.cc
+++ b/backend/genesys_gl841.cc
@@ -4658,7 +4658,7 @@ static void gl841_send_shading_data(Genesys_Device* dev, const Genesys_Sensor& s
 
 
 /** the gl841 command set */
-static Genesys_Command_Set gl841_cmd_set = {
+Genesys_Command_Set gl841_cmd_set = {
   "gl841-generic",		/* the name of this set */
 
   [](Genesys_Device* dev) -> bool { (void) dev; return true; },
@@ -4712,8 +4712,3 @@ static Genesys_Command_Set gl841_cmd_set = {
   gl841_calculate_current_setup,
   NULL
 };
-
-void sanei_gl841_init_cmd_set(Genesys_Device* dev)
-{
-    dev->cmd_set = &gl841_cmd_set;
-}
diff --git a/backend/genesys_gl843.cc b/backend/genesys_gl843.cc
index ae9146ffe..56a8fbd0a 100644
--- a/backend/genesys_gl843.cc
+++ b/backend/genesys_gl843.cc
@@ -3917,7 +3917,7 @@ static void gl843_send_shading_data(Genesys_Device* dev, const Genesys_Sensor& s
 
 
 /** the gl843 command set */
-static Genesys_Command_Set gl843_cmd_set = {
+Genesys_Command_Set gl843_cmd_set = {
   "gl843-generic",		/* the name of this set */
 
   [](Genesys_Device* dev) -> bool { (void) dev; return true; },
@@ -3971,8 +3971,3 @@ static Genesys_Command_Set gl843_cmd_set = {
   gl843_calculate_current_setup,
   gl843_boot
 };
-
-void sanei_gl843_init_cmd_set(Genesys_Device* dev)
-{
-    dev->cmd_set = &gl843_cmd_set;
-}
diff --git a/backend/genesys_gl846.cc b/backend/genesys_gl846.cc
index c85586eef..65eb63f58 100644
--- a/backend/genesys_gl846.cc
+++ b/backend/genesys_gl846.cc
@@ -2848,7 +2848,7 @@ static void gl846_coarse_gain_calibration(Genesys_Device* dev, const Genesys_Sen
 
 
 /** the gl846 command set */
-static Genesys_Command_Set gl846_cmd_set = {
+Genesys_Command_Set gl846_cmd_set = {
   "gl846-generic",		/* the name of this set */
 
   nullptr,
@@ -2902,8 +2902,3 @@ static Genesys_Command_Set gl846_cmd_set = {
   gl846_calculate_current_setup,
   gl846_boot
 };
-
-void sanei_gl846_init_cmd_set(Genesys_Device* dev)
-{
-    dev->cmd_set = &gl846_cmd_set;
-}
diff --git a/backend/genesys_gl847.cc b/backend/genesys_gl847.cc
index b009bed5e..5cef05a89 100644
--- a/backend/genesys_gl847.cc
+++ b/backend/genesys_gl847.cc
@@ -2958,7 +2958,7 @@ static void gl847_coarse_gain_calibration(Genesys_Device* dev, const Genesys_Sen
 
 
 /** the gl847 command set */
-static Genesys_Command_Set gl847_cmd_set = {
+Genesys_Command_Set gl847_cmd_set = {
   "gl847-generic",		/* the name of this set */
 
   nullptr,
@@ -3012,8 +3012,3 @@ static Genesys_Command_Set gl847_cmd_set = {
   gl847_calculate_current_setup,
   gl847_boot
 };
-
-void sanei_gl847_init_cmd_set(Genesys_Device* dev)
-{
-    dev->cmd_set = &gl847_cmd_set;
-}
diff --git a/backend/genesys_low.cc b/backend/genesys_low.cc
index 5890992b6..a407a0b3b 100644
--- a/backend/genesys_low.cc
+++ b/backend/genesys_low.cc
@@ -56,18 +56,25 @@
 /**
  * setup the hardware dependent functions
  */
+extern Genesys_Command_Set gl124_cmd_set;
+extern Genesys_Command_Set gl646_cmd_set;
+extern Genesys_Command_Set gl841_cmd_set;
+extern Genesys_Command_Set gl843_cmd_set;
+extern Genesys_Command_Set gl846_cmd_set;
+extern Genesys_Command_Set gl847_cmd_set;
+
 void sanei_genesys_init_cmd_set(Genesys_Device* dev)
 {
   DBG_INIT ();
     DBG_HELPER(dbg);
     switch (dev->model->asic_type) {
-        case GENESYS_GL646: sanei_gl646_init_cmd_set(dev); break;
-        case GENESYS_GL841: sanei_gl841_init_cmd_set(dev); break;
-        case GENESYS_GL843: sanei_gl843_init_cmd_set(dev); break;
+        case GENESYS_GL646: dev->cmd_set = &gl646_cmd_set; break;
+        case GENESYS_GL841: dev->cmd_set = &gl841_cmd_set; break;
+        case GENESYS_GL843: dev->cmd_set = &gl843_cmd_set; break;
         case GENESYS_GL845: // since only a few reg bits differs we handle both together
-        case GENESYS_GL846: sanei_gl846_init_cmd_set(dev); break;
-        case GENESYS_GL847: sanei_gl847_init_cmd_set(dev); break;
-        case GENESYS_GL124: sanei_gl124_init_cmd_set(dev); break;
+        case GENESYS_GL846: dev->cmd_set = &gl846_cmd_set; break;
+        case GENESYS_GL847: dev->cmd_set = &gl847_cmd_set; break;
+        case GENESYS_GL124: dev->cmd_set = &gl124_cmd_set; break;
         default: throw SaneException(SANE_STATUS_INVAL, "unknown ASIC type");
     }
 }
diff --git a/backend/genesys_low.h b/backend/genesys_low.h
index 03eb40e57..cf62fbd26 100644
--- a/backend/genesys_low.h
+++ b/backend/genesys_low.h
@@ -681,12 +681,6 @@ extern void sanei_genesys_generate_gamma_buffer(Genesys_Device* dev,
 /*---------------------------------------------------------------------------*/
 /*                ASIC specific functions declarations                       */
 /*---------------------------------------------------------------------------*/
-extern void sanei_gl646_init_cmd_set(Genesys_Device* dev);
-extern void sanei_gl841_init_cmd_set(Genesys_Device* dev);
-extern void sanei_gl843_init_cmd_set(Genesys_Device* dev);
-extern void sanei_gl846_init_cmd_set(Genesys_Device* dev);
-extern void sanei_gl847_init_cmd_set(Genesys_Device* dev);
-extern void sanei_gl124_init_cmd_set(Genesys_Device* dev);
 
 // same as usleep, except that it does nothing if testing mode is enabled
 extern void sanei_genesys_usleep(unsigned int useconds);