Skip to content

Commit f4f90ed

Browse files
committed
media: atomisp: improve ACPI/DMI detection logs
As there are several ways where the driver could possible retrieve sensor data, make the prints clearer about what was detected and from where. Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent c25ad35 commit f4f90ed

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,8 @@ int atomisp_gmin_register_vcm_control(struct camera_vcm_control *vcmCtrl)
922922
}
923923
EXPORT_SYMBOL_GPL(atomisp_gmin_register_vcm_control);
924924

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,
926927
const char *var8, char *out, size_t *out_len)
927928
{
928929
struct gmin_cfg_var *gv;
@@ -933,6 +934,8 @@ static int gmin_get_hardcoded_var(struct gmin_cfg_var *varlist,
933934
if (strcmp(var8, gv->name))
934935
continue;
935936

937+
dev_info(dev, "Found DMI entry for '%s'\n", var8);
938+
936939
vl = strlen(gv->val);
937940
if (vl > *out_len - 1)
938941
return -ENOSPC;
@@ -1056,9 +1059,10 @@ static int gmin_get_config_var(struct device *maindev,
10561059
*/
10571060
id = dmi_first_match(gmin_vars);
10581061
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;
10621066
}
10631067

10641068
/* Our variable names are ASCII by construction, but EFI names
@@ -1088,9 +1092,9 @@ static int gmin_get_config_var(struct device *maindev,
10881092
*out_len = ev->var.DataSize;
10891093
dev_info(maindev, "found EFI entry for '%s'\n", var8);
10901094
} 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);
10921096
} else {
1093-
dev_warn(maindev, "Failed to find variable %s\n", var8);
1097+
dev_info(maindev, "Failed to find EFI variable %s\n", var8);
10941098
}
10951099

10961100
kfree(ev);
@@ -1109,6 +1113,8 @@ int gmin_get_var_int(struct device *dev, bool is_gmin, const char *var, int def)
11091113
if (!ret) {
11101114
val[len] = 0;
11111115
ret = kstrtol(val, 0, &result);
1116+
} else {
1117+
dev_info(dev, "%s: using default (%d)\n", var, def);
11121118
}
11131119

11141120
return ret ? def : result;

0 commit comments

Comments
 (0)