diff options
author | Guenter Roeck <linux@roeck-us.net> | 2012-01-19 14:02:15 -0500 |
---|---|---|
committer | Guenter Roeck <guenter.roeck@ericsson.com> | 2012-03-18 21:27:14 -0400 |
commit | ca3c7b63423c7f723258797bcb5b11652d32500b (patch) | |
tree | 3d20785f5b2a75216493b61c7d2467e96c3b28d8 /drivers/hwmon/amc6821.c | |
parent | 10775d18995f50def96c7affea5eb3ca293485d6 (diff) |
hwmon: (amc6821) Fix multi-line comments
Cc: T. Mertelj <tomaz.mertelj@guest.arnes.si>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/amc6821.c')
-rw-r--r-- | drivers/hwmon/amc6821.c | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/drivers/hwmon/amc6821.c b/drivers/hwmon/amc6821.c index 5298855d4c43..f600fa1f92e3 100644 --- a/drivers/hwmon/amc6821.c +++ b/drivers/hwmon/amc6821.c | |||
@@ -1,25 +1,25 @@ | |||
1 | /* | 1 | /* |
2 | amc6821.c - Part of lm_sensors, Linux kernel modules for hardware | 2 | * amc6821.c - Part of lm_sensors, Linux kernel modules for hardware |
3 | monitoring | 3 | * monitoring |
4 | Copyright (C) 2009 T. Mertelj <tomaz.mertelj@guest.arnes.si> | 4 | * Copyright (C) 2009 T. Mertelj <tomaz.mertelj@guest.arnes.si> |
5 | 5 | * | |
6 | Based on max6650.c: | 6 | * Based on max6650.c: |
7 | Copyright (C) 2007 Hans J. Koch <hjk@hansjkoch.de> | 7 | * Copyright (C) 2007 Hans J. Koch <hjk@hansjkoch.de> |
8 | 8 | * | |
9 | This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
10 | it under the terms of the GNU General Public License as published by | 10 | * it under the terms of the GNU General Public License as published by |
11 | the Free Software Foundation; either version 2 of the License, or | 11 | * the Free Software Foundation; either version 2 of the License, or |
12 | (at your option) any later version. | 12 | * (at your option) any later version. |
13 | 13 | * | |
14 | This program is distributed in the hope that it will be useful, | 14 | * This program is distributed in the hope that it will be useful, |
15 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
17 | GNU General Public License for more details. | 17 | * GNU General Public License for more details. |
18 | 18 | * | |
19 | You should have received a copy of the GNU General Public License | 19 | * You should have received a copy of the GNU General Public License |
20 | along with this program; if not, write to the Free Software | 20 | * along with this program; if not, write to the Free Software |
21 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 21 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | 24 | ||
25 | #include <linux/kernel.h> /* Needed for KERN_INFO */ | 25 | #include <linux/kernel.h> /* Needed for KERN_INFO */ |
@@ -188,7 +188,7 @@ static struct i2c_driver amc6821_driver = { | |||
188 | 188 | ||
189 | /* | 189 | /* |
190 | * Client data (each client gets its own) | 190 | * Client data (each client gets its own) |
191 | */ | 191 | */ |
192 | 192 | ||
193 | struct amc6821_data { | 193 | struct amc6821_data { |
194 | struct device *hwmon_dev; | 194 | struct device *hwmon_dev; |
@@ -836,8 +836,10 @@ static int amc6821_detect( | |||
836 | return -ENODEV; | 836 | return -ENODEV; |
837 | } | 837 | } |
838 | 838 | ||
839 | /* Bit 7 of the address register is ignored, so we can check the | 839 | /* |
840 | ID registers again */ | 840 | * Bit 7 of the address register is ignored, so we can check the |
841 | * ID registers again | ||
842 | */ | ||
841 | dev_id = i2c_smbus_read_byte_data(client, 0x80 | AMC6821_REG_DEV_ID); | 843 | dev_id = i2c_smbus_read_byte_data(client, 0x80 | AMC6821_REG_DEV_ID); |
842 | comp_id = i2c_smbus_read_byte_data(client, 0x80 | AMC6821_REG_COMP_ID); | 844 | comp_id = i2c_smbus_read_byte_data(client, 0x80 | AMC6821_REG_COMP_ID); |
843 | if (dev_id != 0x21 || comp_id != 0x49) { | 845 | if (dev_id != 0x21 || comp_id != 0x49) { |
@@ -1080,9 +1082,10 @@ static struct amc6821_data *amc6821_update_device(struct device *dev) | |||
1080 | data->pwm1_auto_channels_temp = 3; | 1082 | data->pwm1_auto_channels_temp = 3; |
1081 | data->pwm1_enable = 3; | 1083 | data->pwm1_enable = 3; |
1082 | break; | 1084 | break; |
1083 | case 1: /*semi-open loop: software sets rpm, chip controls pwm1, | 1085 | case 1: /* |
1084 | *currently not implemented | 1086 | * semi-open loop: software sets rpm, chip controls |
1085 | */ | 1087 | * pwm1, currently not implemented |
1088 | */ | ||
1086 | data->pwm1_auto_channels_temp = 0; | 1089 | data->pwm1_auto_channels_temp = 0; |
1087 | data->pwm1_enable = 0; | 1090 | data->pwm1_enable = 0; |
1088 | break; | 1091 | break; |