Re: [PATCH] hwmon: (applesmc) Fix checkpatch errors

[Henrik Rydberg]

On 11/10/2010 07:53 PM, Guenter Roeck wrote:

> Fix all checkpatch errors and most of the warnings.
> 
> Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
> ---
>  drivers/hwmon/applesmc.c |   40 +++++++++++++++++++++-------------------
>  1 files changed, 21 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
> index 1e49b30..365761b 100644
> --- a/drivers/hwmon/applesmc.c
> +++ b/drivers/hwmon/applesmc.c
> @@ -174,9 +174,8 @@ 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;
> @@ -431,7 +430,7 @@ static int applesmc_has_key(const char *key, bool *value)
>  /*
>   * applesmc_read_motion_sensor - Read motion sensor (X, Y or Z).
>   */
> -static int applesmc_read_motion_sensor(int index, s16* value)
> +static int applesmc_read_motion_sensor(int index, s16 *value)
>  {
>  	u8 buffer[2];
>  	int ret;
> @@ -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 */


Thanks for the bug fix, I forgot to include it.

>
>  	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]);
> @@ -977,7 +975,11 @@ static ssize_t applesmc_key_at_index_show(struct device *dev,
>  static ssize_t applesmc_key_at_index_store(struct device *dev,
>  	struct device_attribute *attr, const char *sysfsbuf, size_t count)
>  {
> -	key_at_index = simple_strtoul(sysfsbuf, NULL, 10);
> +	unsigned long newkey;
> +
> +	if (strict_strtoul(sysfsbuf, 10, &newkey) < 0)
> +		return -EINVAL;
> +	key_at_index = newkey;


Crash alert - key_at_index is not range checked, and the remake uses this value
as an array index...

>  	return count;
>  }
> @@ -1193,24 +1195,24 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
>  	  DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") },
>  	},
>  	{ applesmc_dmi_match, "Apple MacBook Pro", {
> -	  DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
> -	  DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") },
> +	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
> +	  DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro") },
>  	},
>  	{ applesmc_dmi_match, "Apple MacBook", {
> -	  DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
> -	  DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") },
> +	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
> +	  DMI_MATCH(DMI_PRODUCT_NAME, "MacBook") },
>  	},
>  	{ applesmc_dmi_match, "Apple Macmini", {
> -	  DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
> -	  DMI_MATCH(DMI_PRODUCT_NAME,"Macmini") },
> +	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
> +	  DMI_MATCH(DMI_PRODUCT_NAME, "Macmini") },
>  	},
>  	{ applesmc_dmi_match, "Apple MacPro", {
>  	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
>  	  DMI_MATCH(DMI_PRODUCT_NAME, "MacPro") },
>  	},
>  	{ applesmc_dmi_match, "Apple iMac", {
> -	  DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
> -	  DMI_MATCH(DMI_PRODUCT_NAME,"iMac") },
> +	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
> +	  DMI_MATCH(DMI_PRODUCT_NAME, "iMac") },
>  	},
>  	{ .ident = NULL }
>  };


Thanks,
Henrik
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/