[no-relnote] Minor code cleanup in WSL2 discoverer

Signed-off-by: Evan Lezar <elezar@nvidia.com>

Author: elezar

pkg/nvcdi/driver-wsl.go

@@ -40,13 +40,12 @@ var requiredDriverStoreFiles = []string{
 
 // newWSLDriverDiscoverer returns a Discoverer for WSL2 drivers.
 func newWSLDriverDiscoverer(logger logger.Interface, driverRoot string, hookCreator discover.HookCreator, ldconfigPath string) (discover.Discover, error) {
-	err := dxcore.Init()
-	if err != nil {
-		return nil, fmt.Errorf("failed to initialize dxcore: %v", err)
+	if err := dxcore.Init(); err != nil {
+		return nil, fmt.Errorf("failed to initialize dxcore: %w", err)
 	}
 	defer func() {
 		if err := dxcore.Shutdown(); err != nil {
-			logger.Warningf("failed to shutdown dxcore: %v", err)
+			logger.Warningf("failed to shutdown dxcore: %w", err)
 		}
 	}()
 
@@ -61,7 +60,7 @@ func newWSLDriverDiscoverer(logger logger.Interface, driverRoot string, hookCrea
 
 	driverStorePaths = append(driverStorePaths, "/usr/lib/wsl/lib")
 
-	libraries := discover.NewMounts(
+	driverStoreMounts := discover.NewMounts(
 		logger,
 		lookup.NewFileLocator(
 			lookup.WithLogger(logger),
@@ -76,14 +75,14 @@ func newWSLDriverDiscoverer(logger logger.Interface, driverRoot string, hookCrea
 
 	symlinkHook := nvidiaSMISimlinkHook{
 		logger:      logger,
-		mountsFrom:  libraries,
+		mountsFrom:  driverStoreMounts,
 		hookCreator: hookCreator,
 	}
 
-	ldcacheHook, _ := discover.NewLDCacheUpdateHook(logger, libraries, hookCreator, ldconfigPath)
+	ldcacheHook, _ := discover.NewLDCacheUpdateHook(logger, driverStoreMounts, hookCreator, ldconfigPath)
 
 	d := discover.Merge(
-		libraries,
+		driverStoreMounts,
 		symlinkHook,
 		ldcacheHook,
 	)