Remove unused global variable g_pDeviceFile and associated logic.

backend/mustek_usb2.c

@@ -1167,7 +1167,7 @@ IsTAConnected ()
 
   DBG (DBG_FUNC, "StopScan: start\n");
 
-  if (Asic_Open (&g_chip, g_pDeviceFile) != STATUS_GOOD)
+  if (Asic_Open (&g_chip) != STATUS_GOOD)
     {
       return FALSE;
     }
@@ -1204,7 +1204,7 @@ GetKeyStatus (SANE_Byte * pKey)
   STATUS status = Asic_CheckFunctionKey (&g_chip, &pKeyTemp);
   DBG (DBG_FUNC, "GetKeyStatus: start\n");
 
-  if (STATUS_GOOD != Asic_Open (&g_chip, g_pDeviceFile))
+  if (STATUS_GOOD != Asic_Open (&g_chip))
     {
       DBG (DBG_ERR, "GetKeyStatus: Asic_Open is fail\n");
       return FALSE;
@@ -2139,12 +2139,6 @@ sane_close (SANE_Handle handle)
 
   CarriageHome ();
 
-  if (NULL != g_pDeviceFile)
-    {
-      free (g_pDeviceFile);
-      g_pDeviceFile = NULL;
-    }
-
   if (s->Scan_data_buf != NULL)
     free (s->Scan_data_buf);
 

backend/mustek_usb2_asic.c

@@ -3533,7 +3533,7 @@ attach_one_scanner (SANE_String_Const devname)
 }
 
 static STATUS
-Asic_Open (PAsic chip, SANE_Byte *pDeviceName)
+Asic_Open (PAsic chip)
 {
   STATUS status;
   SANE_Status sane_status;
@@ -3607,13 +3607,7 @@ Asic_Open (PAsic chip, SANE_Byte *pDeviceName)
       return status;
     }
 
-  pDeviceName = (SANE_Byte *) strdup (device_name);
-  if (!pDeviceName)
-    {
-      DBG (DBG_ERR, "Asic_Open: not enough memory\n");
-      return STATUS_INVAL;
-    }
-  DBG (DBG_INFO, "Asic_Open: device %s successfully opened\n", pDeviceName);
+  DBG (DBG_INFO, "Asic_Open: device %s successfully opened\n", device_name);
   DBG (DBG_ASIC, "Asic_Open: Exit\n");
   return status;
 }

backend/mustek_usb2_asic.h

@@ -1252,8 +1252,8 @@ static STATUS Mustek_DMAWrite (PAsic chip, unsigned int size, SANE_Byte * lpdata
 static STATUS Mustek_ClearFIFO (PAsic chip);
 static STATUS SetRWSize (PAsic chip, SANE_Byte ReadWrite, unsigned int size);
 
-/* Open Scanner by Scanner Name and return Chip Information */
-static STATUS Asic_Open (PAsic chip, SANE_Byte *pDeviceName);
+/* Open Scanner */
+static STATUS Asic_Open (PAsic chip);
 /* Close Scanner */
 static STATUS Asic_Close (PAsic chip);
 #if SANE_UNUSED

backend/mustek_usb2_high.c

@@ -100,7 +100,6 @@ static unsigned int g_dwBufferSize;
 static unsigned int g_dwTotalTotalXferLines;
 
 static unsigned short *g_pGammaTable;
-static unsigned char *g_pDeviceFile;
 
 static pthread_t g_threadid_readimage;
 
@@ -206,7 +205,7 @@ MustScanner_Init ()
   DBG (DBG_FUNC, "MustScanner_Init: Call in\n");
 
   g_chip.firmwarestate = FS_NULL;
-  if (STATUS_GOOD != Asic_Open (&g_chip, g_pDeviceFile))
+  if (STATUS_GOOD != Asic_Open (&g_chip))
     {
       DBG (DBG_FUNC, "MustScanner_Init: Asic_Open return error\n");
       return FALSE;
@@ -233,12 +232,6 @@ MustScanner_Init ()
   g_isSelfGamma = FALSE;
   g_pGammaTable = NULL;
 
-  if (NULL != g_pDeviceFile)
-    {
-      free (g_pDeviceFile);
-      g_pDeviceFile = NULL;
-    }
-
   g_ssScanSource = SS_Reflective;
   g_PixelFlavor = PF_BlackIs0;
 
@@ -265,7 +258,7 @@ static SANE_Bool
 MustScanner_GetScannerState ()
 {
 
-  if (STATUS_GOOD != Asic_Open (&g_chip, g_pDeviceFile))
+  if (STATUS_GOOD != Asic_Open (&g_chip))
     {
       DBG (DBG_FUNC, "MustScanner_GetScannerState: Asic_Open return error\n");
       return FALSE;
@@ -295,7 +288,7 @@ MustScanner_PowerControl (SANE_Bool isLampOn, SANE_Bool isTALampOn)
 {
   SANE_Bool hasTA;
   DBG (DBG_FUNC, "MustScanner_PowerControl: Call in\n");
-  if (STATUS_GOOD != Asic_Open (&g_chip, g_pDeviceFile))
+  if (STATUS_GOOD != Asic_Open (&g_chip))
     {
       DBG (DBG_FUNC, "MustScanner_PowerControl: Asic_Open return error\n");
       return FALSE;
@@ -349,7 +342,7 @@ MustScanner_BackHome ()
 {
   DBG (DBG_FUNC, "MustScanner_BackHome: call in \n");
 
-  if (STATUS_GOOD != Asic_Open (&g_chip, g_pDeviceFile))
+  if (STATUS_GOOD != Asic_Open (&g_chip))
     {
       DBG (DBG_FUNC, "MustScanner_BackHome: Asic_Open return error\n");
       return FALSE;
@@ -392,7 +385,7 @@ MustScanner_Prepare (SANE_Byte bScanSource)
 {
   DBG (DBG_FUNC, "MustScanner_Prepare: call in\n");
 
-  if (STATUS_GOOD != Asic_Open (&g_chip, g_pDeviceFile))
+  if (STATUS_GOOD != Asic_Open (&g_chip))
 
 
     {

backend/mustek_usb2_reflective.c

@@ -84,7 +84,7 @@ Reflective_Reset ()
       return FALSE;
     }
 
-  if (STATUS_GOOD != Asic_Open (&g_chip, g_pDeviceFile))
+  if (STATUS_GOOD != Asic_Open (&g_chip))
     {
       DBG (DBG_FUNC, "Reflective_Reset: Asic_Open return error\n");
       return FALSE;
@@ -127,12 +127,6 @@ Reflective_Reset ()
 
   g_pGammaTable = NULL;
 
-  if (NULL != g_pDeviceFile)
-    {
-      free (g_pDeviceFile);
-      g_pDeviceFile = NULL;
-    }
-
   DBG (DBG_FUNC, "Reflective_Reset: exit\n");
 
   return TRUE;
@@ -441,7 +435,7 @@ Reflective_SetupScan (COLORMODE ColorMode,
       break;
     }
 
-  if (Asic_Open (&g_chip, g_pDeviceFile) != STATUS_GOOD)
+  if (Asic_Open (&g_chip) != STATUS_GOOD)
     {
       DBG (DBG_FUNC, "Reflective_SetupScan: Asic_Open return error\n");
       return FALSE;

backend/mustek_usb2_transparent.c

@@ -84,7 +84,7 @@ Transparent_Reset ()
       DBG (DBG_FUNC, "Transparent_Reset: scanner has been opened\n");
       return FALSE;
     }
-  if (STATUS_GOOD != Asic_Open (&g_chip, g_pDeviceFile))
+  if (STATUS_GOOD != Asic_Open (&g_chip))
     {
       DBG (DBG_FUNC, "Transparent_Reset: can not open scanner\n");
       return FALSE;
@@ -393,7 +393,7 @@ Transparent_SetupScan (COLORMODE ColorMode, unsigned short XDpi, unsigned short
       break;
     }
 
-  if (Asic_Open (&g_chip, g_pDeviceFile) != STATUS_GOOD)
+  if (Asic_Open (&g_chip) != STATUS_GOOD)
     {
       DBG (DBG_FUNC, "Transparent_SetupScan: Asic_Open return error\n");
       return FALSE;