@@ -922,7 +922,8 @@ int atomisp_gmin_register_vcm_control(struct camera_vcm_control *vcmCtrl)
922
922
}
923
923
EXPORT_SYMBOL_GPL (atomisp_gmin_register_vcm_control );
924
924
925
- static int gmin_get_hardcoded_var (struct gmin_cfg_var * varlist ,
925
+ static int gmin_get_hardcoded_var (struct device * dev ,
926
+ struct gmin_cfg_var * varlist ,
926
927
const char * var8 , char * out , size_t * out_len )
927
928
{
928
929
struct gmin_cfg_var * gv ;
@@ -933,6 +934,8 @@ static int gmin_get_hardcoded_var(struct gmin_cfg_var *varlist,
933
934
if (strcmp (var8 , gv -> name ))
934
935
continue ;
935
936
937
+ dev_info (dev , "Found DMI entry for '%s'\n" , var8 );
938
+
936
939
vl = strlen (gv -> val );
937
940
if (vl > * out_len - 1 )
938
941
return - ENOSPC ;
@@ -1056,9 +1059,10 @@ static int gmin_get_config_var(struct device *maindev,
1056
1059
*/
1057
1060
id = dmi_first_match (gmin_vars );
1058
1061
if (id ) {
1059
- dev_info (maindev , "Found DMI entry for '%s'\n" , var8 );
1060
- return gmin_get_hardcoded_var (id -> driver_data , var8 , out ,
1061
- out_len );
1062
+ ret = gmin_get_hardcoded_var (maindev , id -> driver_data , var8 ,
1063
+ out , out_len );
1064
+ if (!ret )
1065
+ return 0 ;
1062
1066
}
1063
1067
1064
1068
/* Our variable names are ASCII by construction, but EFI names
@@ -1088,9 +1092,9 @@ static int gmin_get_config_var(struct device *maindev,
1088
1092
* out_len = ev -> var .DataSize ;
1089
1093
dev_info (maindev , "found EFI entry for '%s'\n" , var8 );
1090
1094
} else if (is_gmin ) {
1091
- dev_warn (maindev , "Failed to find gmin variable %s\n" , var8 );
1095
+ dev_info (maindev , "Failed to find EFI gmin variable %s\n" , var8 );
1092
1096
} else {
1093
- dev_warn (maindev , "Failed to find variable %s\n" , var8 );
1097
+ dev_info (maindev , "Failed to find EFI variable %s\n" , var8 );
1094
1098
}
1095
1099
1096
1100
kfree (ev );
@@ -1109,6 +1113,8 @@ int gmin_get_var_int(struct device *dev, bool is_gmin, const char *var, int def)
1109
1113
if (!ret ) {
1110
1114
val [len ] = 0 ;
1111
1115
ret = kstrtol (val , 0 , & result );
1116
+ } else {
1117
+ dev_info (dev , "%s: using default (%d)\n" , var , def );
1112
1118
}
1113
1119
1114
1120
return ret ? def : result ;
0 commit comments