From 9292f05556becd639a91ae62f2041bf570a8bc2d Mon Sep 17 00:00:00 2001 From: Oleksij Rempel Date: Wed, 10 Oct 2012 15:25:56 +0200 Subject: hwmon: Update Alexey Fisher's name My name was change after migration. Signed-off-by: Oleksij Rempel Signed-off-by: Jean Delvare --- Documentation/hwmon/max1619 | 2 +- drivers/hwmon/max1619.c | 4 ++-- drivers/hwmon/max6642.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/hwmon/max1619 b/Documentation/hwmon/max1619 index d6f8d9cd7d7f..e6d87398cc8f 100644 --- a/Documentation/hwmon/max1619 +++ b/Documentation/hwmon/max1619 @@ -9,7 +9,7 @@ Supported chips: http://pdfserv.maxim-ic.com/en/ds/MAX1619.pdf Authors: - Alexey Fisher , + Oleksij Rempel , Jean Delvare Description diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c index 6c11ec214071..445e5d40ac82 100644 --- a/drivers/hwmon/max1619.c +++ b/drivers/hwmon/max1619.c @@ -1,7 +1,7 @@ /* * max1619.c - Part of lm_sensors, Linux kernel modules for hardware * monitoring - * Copyright (C) 2003-2004 Alexey Fisher + * Copyright (C) 2003-2004 Oleksij Rempel * Jean Delvare * * Based on the lm90 driver. The MAX1619 is a sensor chip made by Maxim. @@ -357,7 +357,7 @@ static struct max1619_data *max1619_update_device(struct device *dev) module_i2c_driver(max1619_driver); -MODULE_AUTHOR("Alexey Fisher and " +MODULE_AUTHOR("Oleksij Rempel and " "Jean Delvare "); MODULE_DESCRIPTION("MAX1619 sensor driver"); MODULE_LICENSE("GPL"); diff --git a/drivers/hwmon/max6642.c b/drivers/hwmon/max6642.c index bf236c0782b7..223461a6d70f 100644 --- a/drivers/hwmon/max6642.c +++ b/drivers/hwmon/max6642.c @@ -7,7 +7,7 @@ * Derived from: * * Based on the max1619 driver. - * Copyright (C) 2003-2004 Alexey Fisher + * Copyright (C) 2003-2004 Oleksij Rempel * Jean Delvare * * The MAX6642 is a sensor chip made by Maxim. -- cgit v1.2.3 From 4d7e47bc83438e366195512fde34015b30ec5921 Mon Sep 17 00:00:00 2001 From: Peter Meerwald Date: Wed, 10 Oct 2012 15:25:56 +0200 Subject: hwmon: Fix spelling of Celsius Signed-off-by: Peter Meerwald Signed-off-by: Jean Delvare --- Documentation/hwmon/da9052 | 2 +- Documentation/hwmon/twl4030-madc-hwmon | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/hwmon/da9052 b/Documentation/hwmon/da9052 index ef898553638e..5bc51346b689 100644 --- a/Documentation/hwmon/da9052 +++ b/Documentation/hwmon/da9052 @@ -56,6 +56,6 @@ The junction temperature is calculated: The junction temperature attribute is supported by the driver. The battery temperature is calculated: - Degree Celcius = 1 / (t1 + 1/298)- 273 + Degree Celsius = 1 / (t1 + 1/298)- 273 where t1 = (1/B)* ln(( ADCval * 2.5)/(R25*ITBAT*255)) Default values of R25, B, ITBAT are 10e3, 3380 and 50e-6 respectively. diff --git a/Documentation/hwmon/twl4030-madc-hwmon b/Documentation/hwmon/twl4030-madc-hwmon index ef7984317cec..c3a3a5be10ad 100644 --- a/Documentation/hwmon/twl4030-madc-hwmon +++ b/Documentation/hwmon/twl4030-madc-hwmon @@ -41,5 +41,5 @@ Channel Signal The Sysfs nodes will represent the voltage in the units of mV, the temperature channel shows the converted temperature in -degree celcius. The Battery charging current channel represents +degree Celsius. The Battery charging current channel represents battery charging current in mA. -- cgit v1.2.3 From dcd8f39230b9f724ba4f55f14ed2bb8119204385 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Wed, 10 Oct 2012 15:25:56 +0200 Subject: hwmon: Add missing inclusions of Many hwmon drivers use jiffies but omit the inclusion of the header file. Fix that, and also fix one driver which was including the header file but didn't need it. Signed-off-by: Jean Delvare Acked-by: Guenter Roeck Acked-by: Luca Tettamanti Cc: Marc Hulsman Cc: Rudolf Marek --- drivers/hwmon/adm9240.c | 1 + drivers/hwmon/adt7475.c | 1 + drivers/hwmon/asus_atk0110.c | 1 + drivers/hwmon/emc1403.c | 1 + drivers/hwmon/hih6130.c | 1 + drivers/hwmon/i5k_amb.c | 1 - drivers/hwmon/ina2xx.c | 1 + drivers/hwmon/lineage-pem.c | 1 + drivers/hwmon/lm92.c | 1 + drivers/hwmon/lm93.c | 1 + drivers/hwmon/ltc4151.c | 1 + drivers/hwmon/ltc4215.c | 1 + drivers/hwmon/ltc4245.c | 1 + drivers/hwmon/ltc4261.c | 1 + drivers/hwmon/pmbus/pmbus_core.c | 1 + drivers/hwmon/sht21.c | 1 + drivers/hwmon/smm665.c | 1 + drivers/hwmon/thmc50.c | 1 + drivers/hwmon/tmp102.c | 1 + drivers/hwmon/w83791d.c | 1 + drivers/hwmon/w83792d.c | 1 + drivers/hwmon/w83793.c | 1 + drivers/hwmon/w83795.c | 1 + drivers/hwmon/w83l786ng.c | 1 + 24 files changed, 23 insertions(+), 1 deletion(-) diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c index 8b24d1a4a2b4..dafa477715e3 100644 --- a/drivers/hwmon/adm9240.c +++ b/drivers/hwmon/adm9240.c @@ -50,6 +50,7 @@ #include #include #include +#include /* Addresses to scan */ static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, diff --git a/drivers/hwmon/adt7475.c b/drivers/hwmon/adt7475.c index 861c756e9536..989e54c39252 100644 --- a/drivers/hwmon/adt7475.c +++ b/drivers/hwmon/adt7475.c @@ -20,6 +20,7 @@ #include #include #include +#include /* Indexes for the sysfs hooks */ diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c index cccb0e9d45b4..c74b1d931854 100644 --- a/drivers/hwmon/asus_atk0110.c +++ b/drivers/hwmon/asus_atk0110.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include diff --git a/drivers/hwmon/emc1403.c b/drivers/hwmon/emc1403.c index 68ab94bde3f1..142e1cb8dea7 100644 --- a/drivers/hwmon/emc1403.c +++ b/drivers/hwmon/emc1403.c @@ -33,6 +33,7 @@ #include #include #include +#include #define THERMAL_PID_REG 0xfd #define THERMAL_SMSC_ID_REG 0xfe diff --git a/drivers/hwmon/hih6130.c b/drivers/hwmon/hih6130.c index e8ee75f55472..9a675efaa78d 100644 --- a/drivers/hwmon/hih6130.c +++ b/drivers/hwmon/hih6130.c @@ -33,6 +33,7 @@ #include #include #include +#include /** * struct hih6130 - HIH-6130 device specific data diff --git a/drivers/hwmon/i5k_amb.c b/drivers/hwmon/i5k_amb.c index a18882cc073d..da3fbab0c346 100644 --- a/drivers/hwmon/i5k_amb.c +++ b/drivers/hwmon/i5k_amb.c @@ -21,7 +21,6 @@ */ #include -#include #include #include #include diff --git a/drivers/hwmon/ina2xx.c b/drivers/hwmon/ina2xx.c index 70717d4a5e89..2b726346f8fa 100644 --- a/drivers/hwmon/ina2xx.c +++ b/drivers/hwmon/ina2xx.c @@ -33,6 +33,7 @@ #include #include #include +#include #include diff --git a/drivers/hwmon/lineage-pem.c b/drivers/hwmon/lineage-pem.c index bd75d2415432..41df29f59b0e 100644 --- a/drivers/hwmon/lineage-pem.c +++ b/drivers/hwmon/lineage-pem.c @@ -29,6 +29,7 @@ #include #include #include +#include /* * This driver supports various Lineage Compact Power Line DC/DC and AC/DC diff --git a/drivers/hwmon/lm92.c b/drivers/hwmon/lm92.c index 2282d77e83e8..71626f3c8742 100644 --- a/drivers/hwmon/lm92.c +++ b/drivers/hwmon/lm92.c @@ -48,6 +48,7 @@ #include #include #include +#include /* * The LM92 and MAX6635 have 2 two-state pins for address selection, diff --git a/drivers/hwmon/lm93.c b/drivers/hwmon/lm93.c index c3d4255ed154..1a003f73e4e4 100644 --- a/drivers/hwmon/lm93.c +++ b/drivers/hwmon/lm93.c @@ -47,6 +47,7 @@ #include #include #include +#include /* LM93 REGISTER ADDRESSES */ diff --git a/drivers/hwmon/ltc4151.c b/drivers/hwmon/ltc4151.c index 8496baa08bc8..4319a94f549d 100644 --- a/drivers/hwmon/ltc4151.c +++ b/drivers/hwmon/ltc4151.c @@ -36,6 +36,7 @@ #include #include #include +#include /* chip registers */ #define LTC4151_SENSE_H 0x00 diff --git a/drivers/hwmon/ltc4215.c b/drivers/hwmon/ltc4215.c index 98b3d04f98b7..e8876108a6b3 100644 --- a/drivers/hwmon/ltc4215.c +++ b/drivers/hwmon/ltc4215.c @@ -19,6 +19,7 @@ #include #include #include +#include /* Here are names of the chip's registers (a.k.a. commands) */ enum ltc4215_cmd { diff --git a/drivers/hwmon/ltc4245.c b/drivers/hwmon/ltc4245.c index 52075914eb0b..3653f79dc2de 100644 --- a/drivers/hwmon/ltc4245.c +++ b/drivers/hwmon/ltc4245.c @@ -21,6 +21,7 @@ #include #include #include +#include #include /* Here are names of the chip's registers (a.k.a. commands) */ diff --git a/drivers/hwmon/ltc4261.c b/drivers/hwmon/ltc4261.c index 77476a575c4e..84a2d2872b20 100644 --- a/drivers/hwmon/ltc4261.c +++ b/drivers/hwmon/ltc4261.c @@ -33,6 +33,7 @@ #include #include #include +#include /* chip registers */ #define LTC4261_STATUS 0x00 /* readonly */ diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index 29b319db573e..94c92723b0dd 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include "pmbus.h" diff --git a/drivers/hwmon/sht21.c b/drivers/hwmon/sht21.c index c2565d04cd4a..5f67546950b1 100644 --- a/drivers/hwmon/sht21.c +++ b/drivers/hwmon/sht21.c @@ -29,6 +29,7 @@ #include #include #include +#include /* I2C command bytes */ #define SHT21_TRIG_T_MEASUREMENT_HM 0xe3 diff --git a/drivers/hwmon/smm665.c b/drivers/hwmon/smm665.c index cbc51fb30dba..d9e1b7de78da 100644 --- a/drivers/hwmon/smm665.c +++ b/drivers/hwmon/smm665.c @@ -24,6 +24,7 @@ #include #include #include +#include /* Internal reference voltage (VREF, x 1000 */ #define SMM665_VREF_ADC_X1000 1250 diff --git a/drivers/hwmon/thmc50.c b/drivers/hwmon/thmc50.c index 080c26370480..3c2c48d904e6 100644 --- a/drivers/hwmon/thmc50.c +++ b/drivers/hwmon/thmc50.c @@ -28,6 +28,7 @@ #include #include #include +#include MODULE_LICENSE("GPL"); diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c index 4e1ff82c63e0..b8777e54190a 100644 --- a/drivers/hwmon/tmp102.c +++ b/drivers/hwmon/tmp102.c @@ -26,6 +26,7 @@ #include #include #include +#include #define DRIVER_NAME "tmp102" diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c index 93ea81a4bf35..39ab7bcc616e 100644 --- a/drivers/hwmon/w83791d.c +++ b/drivers/hwmon/w83791d.c @@ -41,6 +41,7 @@ #include #include #include +#include #define NUMBER_OF_VIN 10 #define NUMBER_OF_FANIN 5 diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c index 06d6f56d4f69..053645279f38 100644 --- a/drivers/hwmon/w83792d.c +++ b/drivers/hwmon/w83792d.c @@ -44,6 +44,7 @@ #include #include #include +#include /* Addresses to scan */ static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c index 4fc47e062071..99799fd1d917 100644 --- a/drivers/hwmon/w83793.c +++ b/drivers/hwmon/w83793.c @@ -46,6 +46,7 @@ #include #include #include +#include /* Default values */ #define WATCHDOG_TIMEOUT 2 /* 2 minute default timeout */ diff --git a/drivers/hwmon/w83795.c b/drivers/hwmon/w83795.c index b813c646c7ca..2f01b7f54305 100644 --- a/drivers/hwmon/w83795.c +++ b/drivers/hwmon/w83795.c @@ -35,6 +35,7 @@ #include #include #include +#include /* Addresses to scan */ static const unsigned short normal_i2c[] = { diff --git a/drivers/hwmon/w83l786ng.c b/drivers/hwmon/w83l786ng.c index c99c8a0473cf..f0e8286c3c70 100644 --- a/drivers/hwmon/w83l786ng.c +++ b/drivers/hwmon/w83l786ng.c @@ -33,6 +33,7 @@ #include #include #include +#include /* Addresses to scan */ static const unsigned short normal_i2c[] = { 0x2e, 0x2f, I2C_CLIENT_END }; -- cgit v1.2.3 From fa845740cbc565d8f52c32973bb598743eb0d995 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Wed, 10 Oct 2012 15:25:56 +0200 Subject: hwmon: Add missing inclusions of These drivers use IS_ERR so they should include . Signed-off-by: Jean Delvare Acked-by: Guenter Roeck Acked-by: Luca Tettamanti Cc: Henrik Rydberg --- drivers/hwmon/acpi_power_meter.c | 1 + drivers/hwmon/applesmc.c | 1 + drivers/hwmon/asus_atk0110.c | 1 + drivers/hwmon/ibmaem.c | 1 + drivers/hwmon/ibmpex.c | 1 + drivers/hwmon/ultra45_env.c | 1 + 6 files changed, 6 insertions(+) diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c index 23ab3c496b05..1672e2a5db46 100644 --- a/drivers/hwmon/acpi_power_meter.c +++ b/drivers/hwmon/acpi_power_meter.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c index 8f3f6f2c45fd..b41baffa20f0 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c @@ -43,6 +43,7 @@ #include #include #include +#include /* data port used by Apple SMC */ #define APPLESMC_DATA_PORT 0x300 diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c index c74b1d931854..56dbcfb3e301 100644 --- a/drivers/hwmon/asus_atk0110.c +++ b/drivers/hwmon/asus_atk0110.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c index 37f17e0d9d5d..a14f634248e7 100644 --- a/drivers/hwmon/ibmaem.c +++ b/drivers/hwmon/ibmaem.c @@ -36,6 +36,7 @@ #include #include #include +#include #define REFRESH_INTERVAL (HZ) #define IPMI_TIMEOUT (30 * HZ) diff --git a/drivers/hwmon/ibmpex.c b/drivers/hwmon/ibmpex.c index 41dbf8161ed7..b622a93ec32c 100644 --- a/drivers/hwmon/ibmpex.c +++ b/drivers/hwmon/ibmpex.c @@ -26,6 +26,7 @@ #include #include #include +#include #define REFRESH_INTERVAL (2 * HZ) #define DRVNAME "ibmpex" diff --git a/drivers/hwmon/ultra45_env.c b/drivers/hwmon/ultra45_env.c index c315c59f61fe..44136bb6d045 100644 --- a/drivers/hwmon/ultra45_env.c +++ b/drivers/hwmon/ultra45_env.c @@ -12,6 +12,7 @@ #include #include #include +#include #define DRV_MODULE_VERSION "0.1" -- cgit v1.2.3 From 0657777fcefffbf79d4a5fa0952a3f1a4248c0da Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Wed, 10 Oct 2012 15:25:57 +0200 Subject: hwmon: Drop needless includes of These drivers use no sleep or delay functions so they don't need to include . Signed-off-by: Jean Delvare Acked-by: Guenter Roeck Cc: Rudolf Marek --- drivers/hwmon/adt7411.c | 1 - drivers/hwmon/adt7462.c | 1 - drivers/hwmon/da9052-hwmon.c | 1 - drivers/hwmon/emc6w201.c | 1 - drivers/hwmon/i5k_amb.c | 1 - drivers/hwmon/k8temp.c | 1 - drivers/hwmon/max16065.c | 1 - drivers/hwmon/pmbus/pmbus_core.c | 1 - drivers/hwmon/s3c-hwmon.c | 1 - drivers/hwmon/w83795.c | 1 - 10 files changed, 10 deletions(-) diff --git a/drivers/hwmon/adt7411.c b/drivers/hwmon/adt7411.c index fe72c69a2d68..517f1856c706 100644 --- a/drivers/hwmon/adt7411.c +++ b/drivers/hwmon/adt7411.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/hwmon/adt7462.c b/drivers/hwmon/adt7462.c index baee482aedfc..98a7d81e25c5 100644 --- a/drivers/hwmon/adt7462.c +++ b/drivers/hwmon/adt7462.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include diff --git a/drivers/hwmon/da9052-hwmon.c b/drivers/hwmon/da9052-hwmon.c index fc65f2d3ec91..b8d01c5f5713 100644 --- a/drivers/hwmon/da9052-hwmon.c +++ b/drivers/hwmon/da9052-hwmon.c @@ -12,7 +12,6 @@ * */ -#include #include #include #include diff --git a/drivers/hwmon/emc6w201.c b/drivers/hwmon/emc6w201.c index ada12a98a97c..a98c917b5888 100644 --- a/drivers/hwmon/emc6w201.c +++ b/drivers/hwmon/emc6w201.c @@ -18,7 +18,6 @@ */ #include -#include #include #include #include diff --git a/drivers/hwmon/i5k_amb.c b/drivers/hwmon/i5k_amb.c index da3fbab0c346..46141abaafba 100644 --- a/drivers/hwmon/i5k_amb.c +++ b/drivers/hwmon/i5k_amb.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c index 49a69c5b3b8d..e8c7fb0bbf95 100644 --- a/drivers/hwmon/k8temp.c +++ b/drivers/hwmon/k8temp.c @@ -22,7 +22,6 @@ */ #include -#include #include #include #include diff --git a/drivers/hwmon/max16065.c b/drivers/hwmon/max16065.c index 019427d7a5fd..e0019c69d1bb 100644 --- a/drivers/hwmon/max16065.c +++ b/drivers/hwmon/max16065.c @@ -22,7 +22,6 @@ #include #include #include -#include #include enum chips { max16065, max16066, max16067, max16068, max16070, max16071 }; diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index 94c92723b0dd..7d19b1bb9ce6 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include "pmbus.h" diff --git a/drivers/hwmon/s3c-hwmon.c b/drivers/hwmon/s3c-hwmon.c index fe11b95670bd..bcecd025fcc4 100644 --- a/drivers/hwmon/s3c-hwmon.c +++ b/drivers/hwmon/s3c-hwmon.c @@ -22,7 +22,6 @@ #include #include -#include #include #include #include diff --git a/drivers/hwmon/w83795.c b/drivers/hwmon/w83795.c index 2f01b7f54305..55a4f4894531 100644 --- a/drivers/hwmon/w83795.c +++ b/drivers/hwmon/w83795.c @@ -34,7 +34,6 @@ #include #include #include -#include #include /* Addresses to scan */ -- cgit v1.2.3