Commit a055f9ec authored by Darren Hart (VMware)'s avatar Darren Hart (VMware)
Browse files

platform/x86: hp-wmi: Do not shadow errors in sysfs show functions



The new hp_wmi_read_int function returns a negative value in case of
error, pass this on directly rather than always replacing it with
-EINVAL.

Signed-off-by: default avatarDarren Hart (VMware) <dvhart@infradead.org>
Tested-by: default avatarCarlo Caione <carlo@endlessm.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
parent c21ee12f
Loading
Loading
Loading
Loading
+6 −6
Original line number Original line Diff line number Diff line
@@ -408,7 +408,7 @@ static ssize_t display_show(struct device *dev, struct device_attribute *attr,
{
{
	int value = hp_wmi_read_int(HPWMI_DISPLAY_QUERY);
	int value = hp_wmi_read_int(HPWMI_DISPLAY_QUERY);
	if (value < 0)
	if (value < 0)
		return -EINVAL;
		return value;
	return sprintf(buf, "%d\n", value);
	return sprintf(buf, "%d\n", value);
}
}


@@ -417,7 +417,7 @@ static ssize_t hddtemp_show(struct device *dev, struct device_attribute *attr,
{
{
	int value = hp_wmi_read_int(HPWMI_HDDTEMP_QUERY);
	int value = hp_wmi_read_int(HPWMI_HDDTEMP_QUERY);
	if (value < 0)
	if (value < 0)
		return -EINVAL;
		return value;
	return sprintf(buf, "%d\n", value);
	return sprintf(buf, "%d\n", value);
}
}


@@ -426,7 +426,7 @@ static ssize_t als_show(struct device *dev, struct device_attribute *attr,
{
{
	int value = hp_wmi_read_int(HPWMI_ALS_QUERY);
	int value = hp_wmi_read_int(HPWMI_ALS_QUERY);
	if (value < 0)
	if (value < 0)
		return -EINVAL;
		return value;
	return sprintf(buf, "%d\n", value);
	return sprintf(buf, "%d\n", value);
}
}


@@ -435,7 +435,7 @@ static ssize_t dock_show(struct device *dev, struct device_attribute *attr,
{
{
	int value = hp_wmi_hw_state(HPWMI_DOCK_MASK);
	int value = hp_wmi_hw_state(HPWMI_DOCK_MASK);
	if (value < 0)
	if (value < 0)
		return -EINVAL;
		return value;
	return sprintf(buf, "%d\n", value);
	return sprintf(buf, "%d\n", value);
}
}


@@ -444,7 +444,7 @@ static ssize_t tablet_show(struct device *dev, struct device_attribute *attr,
{
{
	int value = hp_wmi_hw_state(HPWMI_TABLET_MASK);
	int value = hp_wmi_hw_state(HPWMI_TABLET_MASK);
	if (value < 0)
	if (value < 0)
		return -EINVAL;
		return value;
	return sprintf(buf, "%d\n", value);
	return sprintf(buf, "%d\n", value);
}
}


@@ -454,7 +454,7 @@ static ssize_t postcode_show(struct device *dev, struct device_attribute *attr,
	/* Get the POST error code of previous boot failure. */
	/* Get the POST error code of previous boot failure. */
	int value = hp_wmi_read_int(HPWMI_POSTCODEERROR_QUERY);
	int value = hp_wmi_read_int(HPWMI_POSTCODEERROR_QUERY);
	if (value < 0)
	if (value < 0)
		return -EINVAL;
		return value;
	return sprintf(buf, "0x%x\n", value);
	return sprintf(buf, "0x%x\n", value);
}
}