Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bfe8148 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (applesmc) Fix checkpatch errors and fix value range checks



This patch fixes all checkpatch errors and most of the checkpatch warnings.
It also fixes the range check in applesmc_store_fan_speed().

Signed-off-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
Acked-by: default avatarHenrik Rydberg <rydberg@euromail.se>
parent 41e71f97
Loading
Loading
Loading
Loading
+16 −18
Original line number Diff line number Diff line
@@ -174,10 +174,9 @@ static int __wait_status(u8 val)

	for (us = APPLESMC_MIN_WAIT; us < APPLESMC_MAX_WAIT; us <<= 1) {
		udelay(us);
		if ((inb(APPLESMC_CMD_PORT) & APPLESMC_STATUS_MASK) == val) {
		if ((inb(APPLESMC_CMD_PORT) & APPLESMC_STATUS_MASK) == val)
			return 0;
	}
	}

	return -EIO;
}
@@ -779,14 +778,12 @@ static ssize_t applesmc_store_fan_speed(struct device *dev,
					const char *sysfsbuf, size_t count)
{
	int ret;
	u32 speed;
	unsigned long speed;
	char newkey[5];
	u8 buffer[2];

	speed = simple_strtoul(sysfsbuf, NULL, 10);

	if (speed > 0x4000) /* Bigger than a 14-bit value */
		return -EINVAL;
	if (strict_strtoul(sysfsbuf, 10, &speed) < 0 || speed >= 0x4000)
		return -EINVAL;		/* Bigger than a 14-bit value */

	sprintf(newkey, fan_speed_fmt[to_option(attr)], to_index(attr));

@@ -822,10 +819,11 @@ static ssize_t applesmc_store_fan_manual(struct device *dev,
{
	int ret;
	u8 buffer[2];
	u32 input;
	unsigned long input;
	u16 val;

	input = simple_strtoul(sysfsbuf, NULL, 10);
	if (strict_strtoul(sysfsbuf, 10, &input) < 0)
		return -EINVAL;

	ret = applesmc_read_key(FANS_MANUAL, buffer, 2);
	val = (buffer[0] << 8 | buffer[1]);