nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

hwmon: (amc6821) Fix multi-line comments

Browse source 
Cc: T. Mertelj <tomaz.mertelj@guest.arnes.si>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2012-01-19 11:02:15 -08:00 committed by Guenter Roeck
parent 10775d1899
commit ca3c7b6342
1 changed files with 30 additions and 27 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

53
drivers/hwmon/amc6821.c
View file

@ -1,25 +1,25 @@
/* /*
amc6821.c - Part of lm_sensors, Linux kernel modules for hardware * amc6821.c - Part of lm_sensors, Linux kernel modules for hardware
monitoring * monitoring
Copyright (C) 2009 T. Mertelj <tomaz.mertelj@guest.arnes.si> * Copyright (C) 2009 T. Mertelj <tomaz.mertelj@guest.arnes.si>
*
Based on max6650.c: * Based on max6650.c:
Copyright (C) 2007 Hans J. Koch <hjk@hansjkoch.de> * Copyright (C) 2007 Hans J. Koch <hjk@hansjkoch.de>
*
This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. * (at your option) any later version.
*
This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. * GNU General Public License for more details.
*
You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include <linux/kernel.h> /* Needed for KERN_INFO */ #include <linux/kernel.h> /* Needed for KERN_INFO */
@ -836,8 +836,10 @@ static int amc6821_detect(
return -ENODEV; return -ENODEV;
} }
/* Bit 7 of the address register is ignored, so we can check the /*
ID registers again */ * Bit 7 of the address register is ignored, so we can check the
* ID registers again
*/
dev_id = i2c_smbus_read_byte_data(client, 0x80 | AMC6821_REG_DEV_ID); dev_id = i2c_smbus_read_byte_data(client, 0x80 | AMC6821_REG_DEV_ID);
comp_id = i2c_smbus_read_byte_data(client, 0x80 | AMC6821_REG_COMP_ID); comp_id = i2c_smbus_read_byte_data(client, 0x80 | AMC6821_REG_COMP_ID);
if (dev_id != 0x21 || comp_id != 0x49) { if (dev_id != 0x21 || comp_id != 0x49) {
@ -1080,8 +1082,9 @@ static struct amc6821_data *amc6821_update_device(struct device *dev)
data->pwm1_auto_channels_temp = 3; data->pwm1_auto_channels_temp = 3;
data->pwm1_enable = 3; data->pwm1_enable = 3;
break; break;
case 1: /*semi-open loop: software sets rpm, chip controls pwm1, case 1: /*
*currently not implemented * semi-open loop: software sets rpm, chip controls
* pwm1, currently not implemented
*/ */
data->pwm1_auto_channels_temp = 0; data->pwm1_auto_channels_temp = 0;
data->pwm1_enable = 0; data->pwm1_enable = 0;