Skip to content

L
linux
Commit a0894881 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging 

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: (44 commits)
  hwmon: Support for Dallas Semiconductor DS620
  hwmon: driver for Sensirion SHT21 humidity and temperature sensor
  hwmon: Add humidity attribute to sysfs ABI
  hwmon: sysfs ABI updates
  hwmon: (via-cputemp) sync hotplug handling with coretemp/pkgtemp
  hwmon: (lm95241) Rewrite to avoid using macros
  hwmon: (applesmc) Fix checkpatch errors and fix value range checks
  hwmon: (applesmc) Update copyright information
  hwmon: (applesmc) Silence driver
  hwmon: (applesmc) Simplify feature sysfs handling
  hwmon: (applesmc) Dynamic creation of fan files
  hwmon: (applesmc) Extract all features generically
  hwmon: (applesmc) Handle new temperature format
  hwmon: (applesmc) Dynamic creation of temperature files
  hwmon: (applesmc) Introduce a register lookup table
  hwmon: (applesmc) Use pr_fmt and pr_<level>
  hwmon: (applesmc) Relax the severity of device init failure
  hwmon: (applesmc) Add MacBookAir3,1(3,2) support
  hwmon: (w83627hf) Use pr_fmt and pr_<level>
  hwmon: (w83627ehf) Use pr_fmt and pr_<level>
  ...
parents 0bd2cbcd 60994698
Show whitespace changes
Inline Side-by-side
Showing with 1827 additions and 1546 deletions
Documentation/hwmon/ds620 0 → 100644
View file @ a0894881
Kernel driver ds620
===================
Supported chips:
* Dallas Semiconductor DS620
Prefix: 'ds620'
Datasheet: Publicly available at the Dallas Semiconductor website
http://www.dalsemi.com/
Authors:
Roland Stigge <stigge@antcom.de>
based on ds1621.c by
Christian W. Zuckschwerdt <zany@triq.net>
Description
-----------
The DS620 is a (one instance) digital thermometer and thermostat. It has both
high and low temperature limits which can be user defined (i.e. programmed
into non-volatile on-chip registers). Temperature range is -55 degree Celsius
to +125. Between 0 and 70 degree Celsius, accuracy is 0.5 Kelvin. The value
returned via sysfs displays post decimal positions.
The thermostat function works as follows: When configured via platform_data
(struct ds620_platform_data) .pomode == 0 (default), the thermostat output pin
PO is always low. If .pomode == 1, the thermostat is in PO_LOW mode. I.e., the
output pin PO becomes active when the temperature falls below temp1_min and
stays active until the temperature goes above temp1_max.
Likewise, with .pomode == 2, the thermostat is in PO_HIGH mode. I.e., the PO
output pin becomes active when the temperature goes above temp1_max and stays
active until the temperature falls below temp1_min.
The PO output pin of the DS620 operates active-low.
Documentation/hwmon/sht21 0 → 100644
View file @ a0894881
Kernel driver sht21
===================
Supported chips:
* Sensirion SHT21
Prefix: 'sht21'
Addresses scanned: none
Datasheet: Publicly available at the Sensirion website
http://www.sensirion.com/en/pdf/product_information/Datasheet-humidity-sensor-SHT21.pdf
* Sensirion SHT25
Prefix: 'sht21'
Addresses scanned: none
Datasheet: Publicly available at the Sensirion website
http://www.sensirion.com/en/pdf/product_information/Datasheet-humidity-sensor-SHT25.pdf
Author:
Urs Fleisch <urs.fleisch@sensirion.com>
Description
-----------
The SHT21 and SHT25 are humidity and temperature sensors in a DFN package of
only 3 x 3 mm footprint and 1.1 mm height. The difference between the two
devices is the higher level of precision of the SHT25 (1.8% relative humidity,
0.2 degree Celsius) compared with the SHT21 (2.0% relative humidity,
0.3 degree Celsius).
The devices communicate with the I2C protocol. All sensors are set to the same
I2C address 0x40, so an entry with I2C_BOARD_INFO("sht21", 0x40) can be used
in the board setup code.
sysfs-Interface
---------------
temp1_input - temperature input
humidity1_input - humidity input
Notes
-----
The driver uses the default resolution settings of 12 bit for humidity and 14
bit for temperature, which results in typical measurement times of 22 ms for
humidity and 66 ms for temperature. To keep self heating below 0.1 degree
Celsius, the device should not be active for more than 10% of the time,
e.g. maximum two measurements per second at the given resolution.
Different resolutions, the on-chip heater, using the CRC checksum and reading
the serial number are not supported yet.
Documentation/hwmon/sysfs-interface
View file @ a0894881
...@@ -384,10 +384,20 @@ curr[1-*]_min Current min value. ...@@ -384,10 +384,20 @@ curr[1-*]_min Current min value.
Unit: milliampere Unit: milliampere
RW RW
curr[1-*]_lcrit Current critical low value
Unit: milliampere
RW
curr[1-*]_crit Current critical high value.
Unit: milliampere
RW
curr[1-*]_input Current input value curr[1-*]_input Current input value
Unit: milliampere Unit: milliampere
RO RO
Also see the Alarms section for status flags associated with currents.
********* *********
* Power * * Power *
********* *********
...@@ -450,13 +460,6 @@ power[1-*]_accuracy Accuracy of the power meter. ...@@ -450,13 +460,6 @@ power[1-*]_accuracy Accuracy of the power meter.
Unit: Percent Unit: Percent
RO RO
power[1-*]_alarm 1 if the system is drawing more power than the
cap allows; 0 otherwise. A poll notification is
sent to this file when the power use exceeds the
cap. This file only appears if the cap is known
to be enforced by hardware.
RO
power[1-*]_cap If power use rises above this limit, the power[1-*]_cap If power use rises above this limit, the
system should take action to reduce power use. system should take action to reduce power use.
A poll notification is sent to this file if the A poll notification is sent to this file if the
...@@ -479,6 +482,20 @@ power[1-*]_cap_min Minimum cap that can be set. ...@@ -479,6 +482,20 @@ power[1-*]_cap_min Minimum cap that can be set.
Unit: microWatt Unit: microWatt
RO RO
power[1-*]_max Maximum power.
Unit: microWatt
RW
power[1-*]_crit Critical maximum power.
If power rises to or above this limit, the
system is expected take drastic action to reduce
power consumption, such as a system shutdown or
a forced powerdown of some devices.
Unit: microWatt
RW
Also see the Alarms section for status flags associated with power readings.
********** **********
* Energy * * Energy *
********** **********
...@@ -488,6 +505,15 @@ energy[1-*]_input Cumulative energy use ...@@ -488,6 +505,15 @@ energy[1-*]_input Cumulative energy use
RO RO
************
* Humidity *
************
humidity[1-*]_input Humidity
Unit: milli-percent (per cent mille, pcm)
RO
********** **********
* Alarms * * Alarms *
********** **********
...@@ -501,6 +527,7 @@ implementation. ...@@ -501,6 +527,7 @@ implementation.
in[0-*]_alarm in[0-*]_alarm
curr[1-*]_alarm curr[1-*]_alarm
power[1-*]_alarm
fan[1-*]_alarm fan[1-*]_alarm
temp[1-*]_alarm temp[1-*]_alarm
Channel alarm Channel alarm
...@@ -512,12 +539,20 @@ OR ...@@ -512,12 +539,20 @@ OR
in[0-*]_min_alarm in[0-*]_min_alarm
in[0-*]_max_alarm in[0-*]_max_alarm
in[0-*]_lcrit_alarm
in[0-*]_crit_alarm
curr[1-*]_min_alarm curr[1-*]_min_alarm
curr[1-*]_max_alarm curr[1-*]_max_alarm
curr[1-*]_lcrit_alarm
curr[1-*]_crit_alarm
power[1-*]_cap_alarm
power[1-*]_max_alarm
power[1-*]_crit_alarm
fan[1-*]_min_alarm fan[1-*]_min_alarm
fan[1-*]_max_alarm fan[1-*]_max_alarm
temp[1-*]_min_alarm temp[1-*]_min_alarm
temp[1-*]_max_alarm temp[1-*]_max_alarm
temp[1-*]_lcrit_alarm
temp[1-*]_crit_alarm temp[1-*]_crit_alarm
temp[1-*]_emergency_alarm temp[1-*]_emergency_alarm
Limit alarm Limit alarm
......
drivers/hwmon/Kconfig
View file @ a0894881
...@@ -274,6 +274,16 @@ config SENSORS_ATXP1 ...@@ -274,6 +274,16 @@ config SENSORS_ATXP1
This driver can also be built as a module. If so, the module This driver can also be built as a module. If so, the module
will be called atxp1. will be called atxp1.
config SENSORS_DS620
tristate "Dallas Semiconductor DS620"
depends on I2C
help
If you say yes here you get support for Dallas Semiconductor
DS620 sensor chip.
This driver can also be built as a module. If so, the module
will be called ds620.
config SENSORS_DS1621 config SENSORS_DS1621
tristate "Dallas Semiconductor DS1621 and DS1625" tristate "Dallas Semiconductor DS1621 and DS1625"
depends on I2C depends on I2C
...@@ -734,6 +744,16 @@ config SENSORS_SHT15 ...@@ -734,6 +744,16 @@ config SENSORS_SHT15
This driver can also be built as a module. If so, the module This driver can also be built as a module. If so, the module
will be called sht15. will be called sht15.
config SENSORS_SHT21
tristate "Sensiron humidity and temperature sensors. SHT21 and compat."
depends on I2C
help
If you say yes here you get support for the Sensiron SHT21, SHT25
humidity and temperature sensors.
This driver can also be built as a module. If so, the module
will be called sht21.
config SENSORS_S3C config SENSORS_S3C
tristate "Samsung built-in ADC" tristate "Samsung built-in ADC"
depends on S3C_ADC depends on S3C_ADC
......
drivers/hwmon/Makefile
View file @ a0894881
...@@ -41,6 +41,7 @@ obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o ...@@ -41,6 +41,7 @@ obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o
obj-$(CONFIG_SENSORS_CORETEMP) += coretemp.o obj-$(CONFIG_SENSORS_CORETEMP) += coretemp.o
obj-$(CONFIG_SENSORS_PKGTEMP) += pkgtemp.o obj-$(CONFIG_SENSORS_PKGTEMP) += pkgtemp.o
obj-$(CONFIG_SENSORS_DME1737) += dme1737.o obj-$(CONFIG_SENSORS_DME1737) += dme1737.o
obj-$(CONFIG_SENSORS_DS620) += ds620.o
obj-$(CONFIG_SENSORS_DS1621) += ds1621.o obj-$(CONFIG_SENSORS_DS1621) += ds1621.o
obj-$(CONFIG_SENSORS_EMC1403) += emc1403.o obj-$(CONFIG_SENSORS_EMC1403) += emc1403.o
obj-$(CONFIG_SENSORS_EMC2103) += emc2103.o obj-$(CONFIG_SENSORS_EMC2103) += emc2103.o
...@@ -90,6 +91,7 @@ obj-$(CONFIG_SENSORS_PC87427) += pc87427.o ...@@ -90,6 +91,7 @@ obj-$(CONFIG_SENSORS_PC87427) += pc87427.o
obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o
obj-$(CONFIG_SENSORS_S3C) += s3c-hwmon.o obj-$(CONFIG_SENSORS_S3C) += s3c-hwmon.o
obj-$(CONFIG_SENSORS_SHT15) += sht15.o obj-$(CONFIG_SENSORS_SHT15) += sht15.o
obj-$(CONFIG_SENSORS_SHT21) += sht21.o
obj-$(CONFIG_SENSORS_SIS5595) += sis5595.o obj-$(CONFIG_SENSORS_SIS5595) += sis5595.o
obj-$(CONFIG_SENSORS_SMM665) += smm665.o obj-$(CONFIG_SENSORS_SMM665) += smm665.o
obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o
......
drivers/hwmon/abituguru.c
View file @ a0894881
...@@ -20,6 +20,9 @@ ...@@ -20,6 +20,9 @@
the custom Abit uGuru chip found on Abit uGuru motherboards. Note: because the custom Abit uGuru chip found on Abit uGuru motherboards. Note: because
of lack of specs the CPU/RAM voltage & frequency control is not supported! of lack of specs the CPU/RAM voltage & frequency control is not supported!
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -220,6 +223,10 @@ struct abituguru_data { ...@@ -220,6 +223,10 @@ struct abituguru_data {
u8 pwm_settings[ABIT_UGURU_MAX_PWMS][5]; u8 pwm_settings[ABIT_UGURU_MAX_PWMS][5];
}; };
static const char *never_happen = "This should never happen.";
static const char *report_this =
"Please report this to the abituguru maintainer (see MAINTAINERS)";
/* wait till the uguru is in the specified state */ /* wait till the uguru is in the specified state */
static int abituguru_wait(struct abituguru_data *data, u8 state) static int abituguru_wait(struct abituguru_data *data, u8 state)
{ {
...@@ -438,8 +445,7 @@ abituguru_detect_bank1_sensor_type(struct abituguru_data *data, ...@@ -438,8 +445,7 @@ abituguru_detect_bank1_sensor_type(struct abituguru_data *data,
/* Test val is sane / usable for sensor type detection. */ /* Test val is sane / usable for sensor type detection. */
if ((val < 10u) || (val > 250u)) { if ((val < 10u) || (val > 250u)) {
printk(KERN_WARNING ABIT_UGURU_NAME pr_warn("bank1-sensor: %d reading (%d) too close to limits, "
": bank1-sensor: %d reading (%d) too close to limits, "
"unable to determine sensor type, skipping sensor\n", "unable to determine sensor type, skipping sensor\n",
(int)sensor_addr, (int)val); (int)sensor_addr, (int)val);
/* assume no sensor is there for sensors for which we can't /* assume no sensor is there for sensors for which we can't
...@@ -535,10 +541,8 @@ abituguru_detect_bank1_sensor_type(struct abituguru_data *data, ...@@ -535,10 +541,8 @@ abituguru_detect_bank1_sensor_type(struct abituguru_data *data,
3) == 3) 3) == 3)
break; break;
if (i == 3) { if (i == 3) {
printk(KERN_ERR ABIT_UGURU_NAME pr_err("Fatal error could not restore original settings. %s %s\n",
": Fatal error could not restore original settings. " never_happen, report_this);
"This should never happen please report this to the "
"abituguru maintainer (see MAINTAINERS)\n");
return -ENODEV; return -ENODEV;
} }
return ret; return ret;
...@@ -1268,14 +1272,12 @@ static int __devinit abituguru_probe(struct platform_device *pdev) ...@@ -1268,14 +1272,12 @@ static int __devinit abituguru_probe(struct platform_device *pdev)
} }
/* Fail safe check, this should never happen! */ /* Fail safe check, this should never happen! */
if (sysfs_names_free < 0) { if (sysfs_names_free < 0) {
printk(KERN_ERR ABIT_UGURU_NAME ": Fatal error ran out of " pr_err("Fatal error ran out of space for sysfs attr names. %s %s",
"space for sysfs attr names. This should never " never_happen, report_this);
"happen please report to the abituguru maintainer "
"(see MAINTAINERS)\n");
res = -ENAMETOOLONG; res = -ENAMETOOLONG;
goto abituguru_probe_error; goto abituguru_probe_error;
} }
printk(KERN_INFO ABIT_UGURU_NAME ": found Abit uGuru\n"); pr_info("found Abit uGuru\n");
/* Register sysfs hooks */ /* Register sysfs hooks */
for (i = 0; i < sysfs_attr_i; i++) for (i = 0; i < sysfs_attr_i; i++)
...@@ -1432,8 +1434,7 @@ static int __init abituguru_detect(void) ...@@ -1432,8 +1434,7 @@ static int __init abituguru_detect(void)
"0x%02X\n", (unsigned int)data_val, (unsigned int)cmd_val); "0x%02X\n", (unsigned int)data_val, (unsigned int)cmd_val);
if (force) { if (force) {
printk(KERN_INFO ABIT_UGURU_NAME ": Assuming Abit uGuru is " pr_info("Assuming Abit uGuru is present because of \"force\" parameter\n");
"present because of \"force\" parameter\n");
return ABIT_UGURU_BASE; return ABIT_UGURU_BASE;
} }
...@@ -1467,8 +1468,7 @@ static int __init abituguru_init(void) ...@@ -1467,8 +1468,7 @@ static int __init abituguru_init(void)
abituguru_pdev = platform_device_alloc(ABIT_UGURU_NAME, address); abituguru_pdev = platform_device_alloc(ABIT_UGURU_NAME, address);
if (!abituguru_pdev) { if (!abituguru_pdev) {
printk(KERN_ERR ABIT_UGURU_NAME pr_err("Device allocation failed\n");
": Device allocation failed\n");
err = -ENOMEM; err = -ENOMEM;
goto exit_driver_unregister; goto exit_driver_unregister;
} }
...@@ -1479,15 +1479,13 @@ static int __init abituguru_init(void) ...@@ -1479,15 +1479,13 @@ static int __init abituguru_init(void)
err = platform_device_add_resources(abituguru_pdev, &res, 1); err = platform_device_add_resources(abituguru_pdev, &res, 1);
if (err) { if (err) {
printk(KERN_ERR ABIT_UGURU_NAME pr_err("Device resource addition failed (%d)\n", err);
": Device resource addition failed (%d)\n", err);
goto exit_device_put; goto exit_device_put;
} }
err = platform_device_add(abituguru_pdev); err = platform_device_add(abituguru_pdev);
if (err) { if (err) {
printk(KERN_ERR ABIT_UGURU_NAME pr_err("Device addition failed (%d)\n", err);
": Device addition failed (%d)\n", err);
goto exit_device_put; goto exit_device_put;
} }
......
drivers/hwmon/abituguru3.c
View file @ a0894881
...@@ -23,6 +23,9 @@ ...@@ -23,6 +23,9 @@
chip found on newer Abit uGuru motherboards. Note: because of lack of specs chip found on newer Abit uGuru motherboards. Note: because of lack of specs
only reading the sensors and their settings is supported. only reading the sensors and their settings is supported.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -608,6 +611,9 @@ static int verbose = 1; ...@@ -608,6 +611,9 @@ static int verbose = 1;
module_param(verbose, bool, 0644); module_param(verbose, bool, 0644);
MODULE_PARM_DESC(verbose, "Enable/disable verbose error reporting"); MODULE_PARM_DESC(verbose, "Enable/disable verbose error reporting");
static const char *never_happen = "This should never happen.";
static const char *report_this =
"Please report this to the abituguru3 maintainer (see MAINTAINERS)";
/* wait while the uguru is busy (usually after a write) */ /* wait while the uguru is busy (usually after a write) */
static int abituguru3_wait_while_busy(struct abituguru3_data *data) static int abituguru3_wait_while_busy(struct abituguru3_data *data)
...@@ -940,15 +946,13 @@ static int __devinit abituguru3_probe(struct platform_device *pdev) ...@@ -940,15 +946,13 @@ static int __devinit abituguru3_probe(struct platform_device *pdev)
if (abituguru3_motherboards[i].id == id) if (abituguru3_motherboards[i].id == id)
break; break;
if (!abituguru3_motherboards[i].id) { if (!abituguru3_motherboards[i].id) {
printk(KERN_ERR ABIT_UGURU3_NAME ": error unknown motherboard " pr_err("error unknown motherboard ID: %04X. %s\n",
"ID: %04X. Please report this to the abituguru3 " (unsigned int)id, report_this);
"maintainer (see MAINTAINERS)\n", (unsigned int)id);
goto abituguru3_probe_error; goto abituguru3_probe_error;
} }
data->sensors = abituguru3_motherboards[i].sensors; data->sensors = abituguru3_motherboards[i].sensors;
printk(KERN_INFO ABIT_UGURU3_NAME ": found Abit uGuru3, motherboard " pr_info("found Abit uGuru3, motherboard ID: %04X\n", (unsigned int)id);
"ID: %04X\n", (unsigned int)id);
/* Fill the sysfs attr array */ /* Fill the sysfs attr array */
sysfs_attr_i = 0; sysfs_attr_i = 0;
...@@ -957,11 +961,8 @@ static int __devinit abituguru3_probe(struct platform_device *pdev) ...@@ -957,11 +961,8 @@ static int __devinit abituguru3_probe(struct platform_device *pdev)
for (i = 0; data->sensors[i].name; i++) { for (i = 0; data->sensors[i].name; i++) {
/* Fail safe check, this should never happen! */ /* Fail safe check, this should never happen! */
if (i >= ABIT_UGURU3_MAX_NO_SENSORS) { if (i >= ABIT_UGURU3_MAX_NO_SENSORS) {
printk(KERN_ERR ABIT_UGURU3_NAME pr_err("Fatal error motherboard has more sensors then ABIT_UGURU3_MAX_NO_SENSORS. %s %s\n",
": Fatal error motherboard has more sensors " never_happen, report_this);
"then ABIT_UGURU3_MAX_NO_SENSORS. This should "
"never happen please report to the abituguru3 "
"maintainer (see MAINTAINERS)\n");
res = -ENAMETOOLONG; res = -ENAMETOOLONG;
goto abituguru3_probe_error; goto abituguru3_probe_error;
} }
...@@ -983,10 +984,8 @@ static int __devinit abituguru3_probe(struct platform_device *pdev) ...@@ -983,10 +984,8 @@ static int __devinit abituguru3_probe(struct platform_device *pdev)
} }
/* Fail safe check, this should never happen! */ /* Fail safe check, this should never happen! */
if (sysfs_names_free < 0) { if (sysfs_names_free < 0) {
printk(KERN_ERR ABIT_UGURU3_NAME pr_err("Fatal error ran out of space for sysfs attr names. %s %s\n",
": Fatal error ran out of space for sysfs attr names. " never_happen, report_this);
"This should never happen please report to the "
"abituguru3 maintainer (see MAINTAINERS)\n");
res = -ENAMETOOLONG; res = -ENAMETOOLONG;
goto abituguru3_probe_error; goto abituguru3_probe_error;
} }
...@@ -1189,8 +1188,7 @@ static int __init abituguru3_detect(void) ...@@ -1189,8 +1188,7 @@ static int __init abituguru3_detect(void)
"0x%02X\n", (unsigned int)data_val, (unsigned int)cmd_val); "0x%02X\n", (unsigned int)data_val, (unsigned int)cmd_val);
if (force) { if (force) {
printk(KERN_INFO ABIT_UGURU3_NAME ": Assuming Abit uGuru3 is " pr_info("Assuming Abit uGuru3 is present because of \"force\" parameter\n");
"present because of \"force\" parameter\n");
return 0; return 0;
} }
...@@ -1219,10 +1217,8 @@ static int __init abituguru3_init(void) ...@@ -1219,10 +1217,8 @@ static int __init abituguru3_init(void)
return err; return err;
#ifdef CONFIG_DMI #ifdef CONFIG_DMI
printk(KERN_WARNING ABIT_UGURU3_NAME ": this motherboard was " pr_warn("this motherboard was not detected using DMI. "
"not detected using DMI. Please send the output of " "Please send the output of \"dmidecode\" to the abituguru3 maintainer (see MAINTAINERS)\n");
"\"dmidecode\" to the abituguru3 maintainer "
"(see MAINTAINERS)\n");
#endif #endif
} }
...@@ -1233,8 +1229,7 @@ static int __init abituguru3_init(void) ...@@ -1233,8 +1229,7 @@ static int __init abituguru3_init(void)
abituguru3_pdev = platform_device_alloc(ABIT_UGURU3_NAME, abituguru3_pdev = platform_device_alloc(ABIT_UGURU3_NAME,
ABIT_UGURU3_BASE); ABIT_UGURU3_BASE);
if (!abituguru3_pdev) { if (!abituguru3_pdev) {
printk(KERN_ERR ABIT_UGURU3_NAME pr_err("Device allocation failed\n");
": Device allocation failed\n");
err = -ENOMEM; err = -ENOMEM;
goto exit_driver_unregister; goto exit_driver_unregister;
} }
...@@ -1245,15 +1240,13 @@ static int __init abituguru3_init(void) ...@@ -1245,15 +1240,13 @@ static int __init abituguru3_init(void)
err = platform_device_add_resources(abituguru3_pdev, &res, 1); err = platform_device_add_resources(abituguru3_pdev, &res, 1);
if (err) { if (err) {
printk(KERN_ERR ABIT_UGURU3_NAME pr_err("Device resource addition failed (%d)\n", err);
": Device resource addition failed (%d)\n", err);
goto exit_device_put; goto exit_device_put;
} }
err = platform_device_add(abituguru3_pdev); err = platform_device_add(abituguru3_pdev);
if (err) { if (err) {
printk(KERN_ERR ABIT_UGURU3_NAME pr_err("Device addition failed (%d)\n", err);
": Device addition failed (%d)\n", err);
goto exit_device_put; goto exit_device_put;
} }
......
drivers/hwmon/adt7470.c
View file @ a0894881
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/i2c.h> #include <linux/i2c.h>
...@@ -274,7 +276,7 @@ static int adt7470_read_temperatures(struct i2c_client *client, ...@@ -274,7 +276,7 @@ static int adt7470_read_temperatures(struct i2c_client *client,
i2c_smbus_write_byte_data(client, ADT7470_REG_PWM_CFG(2), pwm_cfg[1]); i2c_smbus_write_byte_data(client, ADT7470_REG_PWM_CFG(2), pwm_cfg[1]);
if (res) { if (res) {
printk(KERN_ERR "ha ha, interrupted"); pr_err("ha ha, interrupted\n");
return -EAGAIN; return -EAGAIN;
} }
......
drivers/hwmon/applesmc.c
View file @ a0894881
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
* computers. * computers.
* *
* Copyright (C) 2007 Nicolas Boichat <nicolas@boichat.ch> * Copyright (C) 2007 Nicolas Boichat <nicolas@boichat.ch>
* Copyright (C) 2010 Henrik Rydberg <rydberg@euromail.se>
* *
* Based on hdaps.c driver: * Based on hdaps.c driver:
* Copyright (C) 2005 Robert Love <rml@novell.com> * Copyright (C) 2005 Robert Love <rml@novell.com>
...@@ -26,10 +27,13 @@ ...@@ -26,10 +27,13 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/input-polldev.h> #include <linux/input-polldev.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/dmi.h> #include <linux/dmi.h>
...@@ -49,6 +53,7 @@ ...@@ -49,6 +53,7 @@
#define APPLESMC_MAX_DATA_LENGTH 32 #define APPLESMC_MAX_DATA_LENGTH 32
/* wait up to 32 ms for a status change. */
#define APPLESMC_MIN_WAIT 0x0040 #define APPLESMC_MIN_WAIT 0x0040
#define APPLESMC_MAX_WAIT 0x8000 #define APPLESMC_MAX_WAIT 0x8000
...@@ -73,104 +78,15 @@ ...@@ -73,104 +78,15 @@
#define FANS_COUNT "FNum" /* r-o ui8 */ #define FANS_COUNT "FNum" /* r-o ui8 */
#define FANS_MANUAL "FS! " /* r-w ui16 */ #define FANS_MANUAL "FS! " /* r-w ui16 */
#define FAN_ACTUAL_SPEED "F0Ac" /* r-o fpe2 (2 bytes) */ #define FAN_ID_FMT "F%dID" /* r-o char[16] */
#define FAN_MIN_SPEED "F0Mn" /* r-o fpe2 (2 bytes) */
#define FAN_MAX_SPEED "F0Mx" /* r-o fpe2 (2 bytes) */
#define FAN_SAFE_SPEED "F0Sf" /* r-o fpe2 (2 bytes) */
#define FAN_TARGET_SPEED "F0Tg" /* r-w fpe2 (2 bytes) */
#define FAN_POSITION "F0ID" /* r-o char[16] */
/*
* Temperature sensors keys (sp78 - 2 bytes).
*/
static const char *temperature_sensors_sets[][41] = {
/* Set 0: Macbook Pro */
{ "TA0P", "TB0T", "TC0D", "TC0P", "TG0H", "TG0P", "TG0T", "Th0H",
"Th1H", "Tm0P", "Ts0P", "Ts1P", NULL },
/* Set 1: Macbook2 set */
{ "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TN1P", "TTF0", "Th0H",
"Th0S", "Th1H", NULL },
/* Set 2: Macbook set */
{ "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TN1P", "Th0H", "Th0S",
"Th1H", "Ts0P", NULL },
/* Set 3: Macmini set */
{ "TC0D", "TC0P", NULL },
/* Set 4: Mac Pro (2 x Quad-Core) */
{ "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", "TC0C", "TC0D", "TC0P",
"TC1C", "TC1D", "TC2C", "TC2D", "TC3C", "TC3D", "THTG", "TH0P",
"TH1P", "TH2P", "TH3P", "TMAP", "TMAS", "TMBS", "TM0P", "TM0S",
"TM1P", "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", "TM8S", "TM9P",
"TM9S", "TN0H", "TS0C", NULL },
/* Set 5: iMac */
{ "TC0D", "TA0P", "TG0P", "TG0D", "TG0H", "TH0P", "Tm0P", "TO0P",
"Tp0C", NULL },
/* Set 6: Macbook3 set */
{ "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TTF0", "TW0P", "Th0H",
"Th0S", "Th1H", NULL },
/* Set 7: Macbook Air */
{ "TB0T", "TB1S", "TB1T", "TB2S", "TB2T", "TC0D", "TC0P", "TCFP",
"TTF0", "TW0P", "Th0H", "Tp0P", "TpFP", "Ts0P", "Ts0S", NULL },
/* Set 8: Macbook Pro 4,1 (Penryn) */
{ "TB0T", "TC0D", "TC0P", "TG0D", "TG0H", "TTF0", "TW0P", "Th0H",
"Th1H", "Th2H", "Tm0P", "Ts0P", NULL },
/* Set 9: Macbook Pro 3,1 (Santa Rosa) */
{ "TALP", "TB0T", "TC0D", "TC0P", "TG0D", "TG0H", "TTF0", "TW0P",
"Th0H", "Th1H", "Th2H", "Tm0P", "Ts0P", NULL },
/* Set 10: iMac 5,1 */
{ "TA0P", "TC0D", "TC0P", "TG0D", "TH0P", "TO0P", "Tm0P", NULL },
/* Set 11: Macbook 5,1 */
{ "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0P", "TN0D", "TN0P",
"TTF0", "Th0H", "Th1H", "ThFH", "Ts0P", "Ts0S", NULL },
/* Set 12: Macbook Pro 5,1 */
{ "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0F", "TC0P", "TG0D",
"TG0F", "TG0H", "TG0P", "TG0T", "TG1H", "TN0D", "TN0P", "TTF0",
"Th2H", "Tm0P", "Ts0P", "Ts0S", NULL },
/* Set 13: iMac 8,1 */
{ "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TG0P", "TH0P",
"TL0P", "TO0P", "TW0P", "Tm0P", "Tp0P", NULL },
/* Set 14: iMac 6,1 */
{ "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TG0P", "TH0P",
"TO0P", "Tp0P", NULL },
/* Set 15: MacBook Air 2,1 */
{ "TB0T", "TB1S", "TB1T", "TB2S", "TB2T", "TC0D", "TN0D", "TTF0",
"TV0P", "TVFP", "TW0P", "Th0P", "Tp0P", "Tp1P", "TpFP", "Ts0P",
"Ts0S", NULL },
/* Set 16: Mac Pro 3,1 (2 x Quad-Core) */
{ "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", "TC0C", "TC0D", "TC0P",
"TC1C", "TC1D", "TC2C", "TC2D", "TC3C", "TC3D", "TH0P", "TH1P",
"TH2P", "TH3P", "TMAP", "TMAS", "TMBS", "TM0P", "TM0S", "TM1P",
"TM1S", "TM2P", "TM2S", "TM3S", "TM8P", "TM8S", "TM9P", "TM9S",
"TN0C", "TN0D", "TN0H", "TS0C", "Tp0C", "Tp1C", "Tv0S", "Tv1S",
NULL },
/* Set 17: iMac 9,1 */
{ "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TH0P", "TL0P",
"TN0D", "TN0H", "TN0P", "TO0P", "Tm0P", "Tp0P", NULL },
/* Set 18: MacBook Pro 2,2 */
{ "TB0T", "TC0D", "TC0P", "TG0H", "TG0P", "TG0T", "TM0P", "TTF0",
"Th0H", "Th1H", "Tm0P", "Ts0P", NULL },
/* Set 19: Macbook Pro 5,3 */
{ "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0F", "TC0P", "TG0D",
"TG0F", "TG0H", "TG0P", "TG0T", "TN0D", "TN0P", "TTF0", "Th2H",
"Tm0P", "Ts0P", "Ts0S", NULL },
/* Set 20: MacBook Pro 5,4 */
{ "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0F", "TC0P", "TN0D",
"TN0P", "TTF0", "Th2H", "Ts0P", "Ts0S", NULL },
/* Set 21: MacBook Pro 6,2 */
{ "TB0T", "TB1T", "TB2T", "TC0C", "TC0D", "TC0P", "TC1C", "TG0D",
"TG0P", "TG0T", "TMCD", "TP0P", "TPCD", "Th1H", "Th2H", "Tm0P",
"Ts0P", "Ts0S", NULL },
/* Set 22: MacBook Pro 7,1 */
{ "TB0T", "TB1T", "TB2T", "TC0D", "TC0P", "TN0D", "TN0P", "TN0S",
"TN1D", "TN1F", "TN1G", "TN1S", "Th1H", "Ts0P", "Ts0S", NULL },
};
/* List of keys used to read/write fan speeds */ /* List of keys used to read/write fan speeds */
static const char* fan_speed_keys[] = { static const char *const fan_speed_fmt[] = {
FAN_ACTUAL_SPEED, "F%dAc", /* actual speed */
FAN_MIN_SPEED, "F%dMn", /* minimum speed (rw) */
FAN_MAX_SPEED, "F%dMx", /* maximum speed */
FAN_SAFE_SPEED, "F%dSf", /* safe speed - not all models */
FAN_TARGET_SPEED "F%dTg", /* target speed (manual: rw) */
}; };
#define INIT_TIMEOUT_MSECS 5000 /* wait up to 5s for device init ... */ #define INIT_TIMEOUT_MSECS 5000 /* wait up to 5s for device init ... */
...@@ -184,14 +100,48 @@ static const char* fan_speed_keys[] = { ...@@ -184,14 +100,48 @@ static const char* fan_speed_keys[] = {
#define SENSOR_Y 1 #define SENSOR_Y 1
#define SENSOR_Z 2 #define SENSOR_Z 2
/* Structure to be passed to DMI_MATCH function */ #define to_index(attr) (to_sensor_dev_attr(attr)->index & 0xffff)
struct dmi_match_data { #define to_option(attr) (to_sensor_dev_attr(attr)->index >> 16)
/* Indicates whether this computer has an accelerometer. */
int accelerometer; /* Dynamic device node attributes */
/* Indicates whether this computer has light sensors and keyboard backlight. */ struct applesmc_dev_attr {
int light; struct sensor_device_attribute sda; /* hwmon attributes */
/* Indicates which temperature sensors set to use. */ char name[32]; /* room for node file name */
int temperature_set; };
/* Dynamic device node group */
struct applesmc_node_group {
char *format; /* format string */
void *show; /* show function */
void *store; /* store function */
int option; /* function argument */
struct applesmc_dev_attr *nodes; /* dynamic node array */
};
/* AppleSMC entry - cached register information */
struct applesmc_entry {
char key[5]; /* four-letter key code */
u8 valid; /* set when entry is successfully read once */
u8 len; /* bounded by APPLESMC_MAX_DATA_LENGTH */
char type[5]; /* four-letter type code */
u8 flags; /* 0x10: func; 0x40: write; 0x80: read */
};
/* Register lookup and registers common to all SMCs */
static struct applesmc_registers {
struct mutex mutex; /* register read/write mutex */
unsigned int key_count; /* number of SMC registers */
unsigned int fan_count; /* number of fans */
unsigned int temp_count; /* number of temperature registers */
unsigned int temp_begin; /* temperature lower index bound */
unsigned int temp_end; /* temperature upper index bound */
int num_light_sensors; /* number of light sensors */
bool has_accelerometer; /* has motion sensor */
bool has_key_backlight; /* has keyboard backlight */
bool init_complete; /* true when fully initialized */
struct applesmc_entry *cache; /* cached key entries */
} smcreg = {
.mutex = __MUTEX_INITIALIZER(smcreg.mutex),
}; };
static const int debug; static const int debug;
...@@ -203,20 +153,6 @@ static u8 backlight_state[2]; ...@@ -203,20 +153,6 @@ static u8 backlight_state[2];
static struct device *hwmon_dev; static struct device *hwmon_dev;
static struct input_polled_dev *applesmc_idev; static struct input_polled_dev *applesmc_idev;
/* Indicates whether this computer has an accelerometer. */
static unsigned int applesmc_accelerometer;
/* Indicates whether this computer has light sensors and keyboard backlight. */
static unsigned int applesmc_light;
/* The number of fans handled by the driver */
static unsigned int fans_handled;
/* Indicates which temperature sensors set to use. */
static unsigned int applesmc_temperature_set;
static DEFINE_MUTEX(applesmc_lock);
/* /*
* Last index written to key_at_index sysfs file, and value to use for all other * Last index written to key_at_index sysfs file, and value to use for all other
* key_at_index_* sysfs files. * key_at_index_* sysfs files.
...@@ -238,17 +174,9 @@ static int __wait_status(u8 val) ...@@ -238,17 +174,9 @@ static int __wait_status(u8 val)
for (us = APPLESMC_MIN_WAIT; us < APPLESMC_MAX_WAIT; us <<= 1) { for (us = APPLESMC_MIN_WAIT; us < APPLESMC_MAX_WAIT; us <<= 1) {
udelay(us); udelay(us);
if ((inb(APPLESMC_CMD_PORT) & APPLESMC_STATUS_MASK) == val) { if ((inb(APPLESMC_CMD_PORT) & APPLESMC_STATUS_MASK) == val)
if (debug)
printk(KERN_DEBUG
"Waited %d us for status %x\n",
2 * us - APPLESMC_MIN_WAIT, val);
return 0; return 0;
} }
}
printk(KERN_WARNING "applesmc: wait status failed: %x != %x\n",
val, inb(APPLESMC_CMD_PORT));
return -EIO; return -EIO;
} }
...@@ -267,159 +195,242 @@ static int send_command(u8 cmd) ...@@ -267,159 +195,242 @@ static int send_command(u8 cmd)
if ((inb(APPLESMC_CMD_PORT) & APPLESMC_STATUS_MASK) == 0x0c) if ((inb(APPLESMC_CMD_PORT) & APPLESMC_STATUS_MASK) == 0x0c)
return 0; return 0;
} }
printk(KERN_WARNING "applesmc: command failed: %x -> %x\n",
cmd, inb(APPLESMC_CMD_PORT));
return -EIO; return -EIO;
} }
/* static int send_argument(const char *key)
* applesmc_read_key - reads len bytes from a given key, and put them in buffer.
* Returns zero on success or a negative error on failure. Callers must
* hold applesmc_lock.
*/
static int applesmc_read_key(const char* key, u8* buffer, u8 len)
{ {
int i; int i;
if (len > APPLESMC_MAX_DATA_LENGTH) {
printk(KERN_ERR "applesmc_read_key: cannot read more than "
"%d bytes\n", APPLESMC_MAX_DATA_LENGTH);
return -EINVAL;
}
if (send_command(APPLESMC_READ_CMD))
return -EIO;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
outb(key[i], APPLESMC_DATA_PORT); outb(key[i], APPLESMC_DATA_PORT);
if (__wait_status(0x04)) if (__wait_status(0x04))
return -EIO; return -EIO;
} }
if (debug) return 0;
printk(KERN_DEBUG "<%s", key); }
static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len)
{
int i;
if (send_command(cmd) || send_argument(key)) {
pr_warn("%s: read arg fail\n", key);
return -EIO;
}
outb(len, APPLESMC_DATA_PORT); outb(len, APPLESMC_DATA_PORT);
if (debug)
printk(KERN_DEBUG ">%x", len);
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (__wait_status(0x05)) if (__wait_status(0x05)) {
pr_warn("%s: read data fail\n", key);
return -EIO; return -EIO;
}
buffer[i] = inb(APPLESMC_DATA_PORT); buffer[i] = inb(APPLESMC_DATA_PORT);
if (debug)
printk(KERN_DEBUG "<%x", buffer[i]);
} }
if (debug)
printk(KERN_DEBUG "\n");
return 0; return 0;
} }
/* static int write_smc(u8 cmd, const char *key, const u8 *buffer, u8 len)
* applesmc_write_key - writes len bytes from buffer to a given key.
* Returns zero on success or a negative error on failure. Callers must
* hold applesmc_lock.
*/
static int applesmc_write_key(const char* key, u8* buffer, u8 len)
{ {
int i; int i;
if (len > APPLESMC_MAX_DATA_LENGTH) { if (send_command(cmd) || send_argument(key)) {
printk(KERN_ERR "applesmc_write_key: cannot write more than " pr_warn("%s: write arg fail\n", key);
"%d bytes\n", APPLESMC_MAX_DATA_LENGTH);
return -EINVAL;
}
if (send_command(APPLESMC_WRITE_CMD))
return -EIO;
for (i = 0; i < 4; i++) {
outb(key[i], APPLESMC_DATA_PORT);
if (__wait_status(0x04))
return -EIO; return -EIO;
} }
outb(len, APPLESMC_DATA_PORT); outb(len, APPLESMC_DATA_PORT);
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (__wait_status(0x04)) if (__wait_status(0x04)) {
pr_warn("%s: write data fail\n", key);
return -EIO; return -EIO;
}
outb(buffer[i], APPLESMC_DATA_PORT); outb(buffer[i], APPLESMC_DATA_PORT);
} }
return 0; return 0;
} }
static int read_register_count(unsigned int *count)
{
__be32 be;
int ret;
ret = read_smc(APPLESMC_READ_CMD, KEY_COUNT_KEY, (u8 *)&be, 4);
if (ret)
return ret;
*count = be32_to_cpu(be);
return 0;
}
/* /*
* applesmc_get_key_at_index - get key at index, and put the result in key * Serialized I/O
* (char[6]). Returns zero on success or a negative error on failure. Callers *
* must hold applesmc_lock. * Returns zero on success or a negative error on failure.
* All functions below are concurrency safe - callers should NOT hold lock.
*/ */
static int applesmc_get_key_at_index(int index, char* key)
static int applesmc_read_entry(const struct applesmc_entry *entry,
u8 *buf, u8 len)
{ {
int i; int ret;
u8 readkey[4];
readkey[0] = index >> 24;
readkey[1] = index >> 16;
readkey[2] = index >> 8;
readkey[3] = index;
if (send_command(APPLESMC_GET_KEY_BY_INDEX_CMD)) if (entry->len != len)
return -EIO; return -EINVAL;
mutex_lock(&smcreg.mutex);
ret = read_smc(APPLESMC_READ_CMD, entry->key, buf, len);
mutex_unlock(&smcreg.mutex);
for (i = 0; i < 4; i++) { return ret;
outb(readkey[i], APPLESMC_DATA_PORT); }
if (__wait_status(0x04))
return -EIO; static int applesmc_write_entry(const struct applesmc_entry *entry,
const u8 *buf, u8 len)
{
int ret;
if (entry->len != len)
return -EINVAL;
mutex_lock(&smcreg.mutex);
ret = write_smc(APPLESMC_WRITE_CMD, entry->key, buf, len);
mutex_unlock(&smcreg.mutex);
return ret;
}
static const struct applesmc_entry *applesmc_get_entry_by_index(int index)
{
struct applesmc_entry *cache = &smcreg.cache[index];
u8 key[4], info[6];
__be32 be;
int ret = 0;
if (cache->valid)
return cache;
mutex_lock(&smcreg.mutex);
if (cache->valid)
goto out;
be = cpu_to_be32(index);
ret = read_smc(APPLESMC_GET_KEY_BY_INDEX_CMD, (u8 *)&be, key, 4);
if (ret)
goto out;
ret = read_smc(APPLESMC_GET_KEY_TYPE_CMD, key, info, 6);
if (ret)
goto out;
memcpy(cache->key, key, 4);
cache->len = info[0];
memcpy(cache->type, &info[1], 4);
cache->flags = info[5];
cache->valid = 1;
out:
mutex_unlock(&smcreg.mutex);
if (ret)
return ERR_PTR(ret);
return cache;
}
static int applesmc_get_lower_bound(unsigned int *lo, const char *key)
{
int begin = 0, end = smcreg.key_count;
const struct applesmc_entry *entry;
while (begin != end) {
int middle = begin + (end - begin) / 2;
entry = applesmc_get_entry_by_index(middle);
if (IS_ERR(entry))
return PTR_ERR(entry);
if (strcmp(entry->key, key) < 0)
begin = middle + 1;
else
end = middle;
} }
outb(4, APPLESMC_DATA_PORT); *lo = begin;
return 0;
}
for (i = 0; i < 4; i++) { static int applesmc_get_upper_bound(unsigned int *hi, const char *key)
if (__wait_status(0x05)) {
return -EIO; int begin = 0, end = smcreg.key_count;
key[i] = inb(APPLESMC_DATA_PORT); const struct applesmc_entry *entry;
while (begin != end) {
int middle = begin + (end - begin) / 2;
entry = applesmc_get_entry_by_index(middle);
if (IS_ERR(entry))
return PTR_ERR(entry);
if (strcmp(key, entry->key) < 0)
end = middle;
else
begin = middle + 1;
} }
key[4] = 0;
*hi = begin;
return 0; return 0;
} }
/* static const struct applesmc_entry *applesmc_get_entry_by_key(const char *key)
* applesmc_get_key_type - get key type, and put the result in type (char[6]).
* Returns zero on success or a negative error on failure. Callers must
* hold applesmc_lock.
*/
static int applesmc_get_key_type(char* key, char* type)
{ {
int i; int begin, end;
int ret;
if (send_command(APPLESMC_GET_KEY_TYPE_CMD)) ret = applesmc_get_lower_bound(&begin, key);
return -EIO; if (ret)
return ERR_PTR(ret);
ret = applesmc_get_upper_bound(&end, key);
if (ret)
return ERR_PTR(ret);
if (end - begin != 1)
return ERR_PTR(-EINVAL);
for (i = 0; i < 4; i++) { return applesmc_get_entry_by_index(begin);
outb(key[i], APPLESMC_DATA_PORT); }
if (__wait_status(0x04))
return -EIO; static int applesmc_read_key(const char *key, u8 *buffer, u8 len)
} {
const struct applesmc_entry *entry;
outb(6, APPLESMC_DATA_PORT); entry = applesmc_get_entry_by_key(key);
if (IS_ERR(entry))
return PTR_ERR(entry);
for (i = 0; i < 6; i++) { return applesmc_read_entry(entry, buffer, len);
if (__wait_status(0x05)) }
return -EIO;
type[i] = inb(APPLESMC_DATA_PORT); static int applesmc_write_key(const char *key, const u8 *buffer, u8 len)
} {
type[5] = 0; const struct applesmc_entry *entry;
entry = applesmc_get_entry_by_key(key);
if (IS_ERR(entry))
return PTR_ERR(entry);
return applesmc_write_entry(entry, buffer, len);
}
static int applesmc_has_key(const char *key, bool *value)
{
const struct applesmc_entry *entry;
entry = applesmc_get_entry_by_key(key);
if (IS_ERR(entry) && PTR_ERR(entry) != -EINVAL)
return PTR_ERR(entry);
*value = !IS_ERR(entry);
return 0; return 0;
} }
/* /*
* applesmc_read_motion_sensor - Read motion sensor (X, Y or Z). Callers must * applesmc_read_motion_sensor - Read motion sensor (X, Y or Z).
* hold applesmc_lock.
*/ */
static int applesmc_read_motion_sensor(int index, s16* value) static int applesmc_read_motion_sensor(int index, s16 *value)
{ {
u8 buffer[2]; u8 buffer[2];
int ret; int ret;
...@@ -444,69 +455,120 @@ static int applesmc_read_motion_sensor(int index, s16* value) ...@@ -444,69 +455,120 @@ static int applesmc_read_motion_sensor(int index, s16* value)
} }
/* /*
* applesmc_device_init - initialize the accelerometer. Returns zero on success * applesmc_device_init - initialize the accelerometer. Can sleep.
* and negative error code on failure. Can sleep.
*/ */
static int applesmc_device_init(void) static void applesmc_device_init(void)
{ {
int total, ret = -ENXIO; int total;
u8 buffer[2]; u8 buffer[2];
if (!applesmc_accelerometer) if (!smcreg.has_accelerometer)
return 0; return;
mutex_lock(&applesmc_lock);
for (total = INIT_TIMEOUT_MSECS; total > 0; total -= INIT_WAIT_MSECS) { for (total = INIT_TIMEOUT_MSECS; total > 0; total -= INIT_WAIT_MSECS) {
if (debug)
printk(KERN_DEBUG "applesmc try %d\n", total);
if (!applesmc_read_key(MOTION_SENSOR_KEY, buffer, 2) && if (!applesmc_read_key(MOTION_SENSOR_KEY, buffer, 2) &&
(buffer[0] != 0x00 || buffer[1] != 0x00)) { (buffer[0] != 0x00 || buffer[1] != 0x00))
if (total == INIT_TIMEOUT_MSECS) { return;
printk(KERN_DEBUG "applesmc: device has"
" already been initialized"
" (0x%02x, 0x%02x).\n",
buffer[0], buffer[1]);
} else {
printk(KERN_DEBUG "applesmc: device"
" successfully initialized"
" (0x%02x, 0x%02x).\n",
buffer[0], buffer[1]);
}
ret = 0;
goto out;
}
buffer[0] = 0xe0; buffer[0] = 0xe0;
buffer[1] = 0x00; buffer[1] = 0x00;
applesmc_write_key(MOTION_SENSOR_KEY, buffer, 2); applesmc_write_key(MOTION_SENSOR_KEY, buffer, 2);
msleep(INIT_WAIT_MSECS); msleep(INIT_WAIT_MSECS);
} }
printk(KERN_WARNING "applesmc: failed to init the device\n"); pr_warn("failed to init the device\n");
out:
mutex_unlock(&applesmc_lock);
return ret;
} }
/* /*
* applesmc_get_fan_count - get the number of fans. Callers must NOT hold * applesmc_init_smcreg_try - Try to initialize register cache. Idempotent.
* applesmc_lock.
*/ */
static int applesmc_get_fan_count(void) static int applesmc_init_smcreg_try(void)
{ {
struct applesmc_registers *s = &smcreg;
bool left_light_sensor, right_light_sensor;
u8 tmp[1];
int ret; int ret;
u8 buffer[1];
mutex_lock(&applesmc_lock); if (s->init_complete)
return 0;
ret = applesmc_read_key(FANS_COUNT, buffer, 1); ret = read_register_count(&s->key_count);
if (ret)
return ret;
if (!s->cache)
s->cache = kcalloc(s->key_count, sizeof(*s->cache), GFP_KERNEL);
if (!s->cache)
return -ENOMEM;
mutex_unlock(&applesmc_lock); ret = applesmc_read_key(FANS_COUNT, tmp, 1);
if (ret) if (ret)
return ret; return ret;
else s->fan_count = tmp[0];
return buffer[0];
ret = applesmc_get_lower_bound(&s->temp_begin, "T");
if (ret)
return ret;
ret = applesmc_get_lower_bound(&s->temp_end, "U");
if (ret)
return ret;
s->temp_count = s->temp_end - s->temp_begin;
ret = applesmc_has_key(LIGHT_SENSOR_LEFT_KEY, &left_light_sensor);
if (ret)
return ret;
ret = applesmc_has_key(LIGHT_SENSOR_RIGHT_KEY, &right_light_sensor);
if (ret)
return ret;
ret = applesmc_has_key(MOTION_SENSOR_KEY, &s->has_accelerometer);
if (ret)
return ret;
ret = applesmc_has_key(BACKLIGHT_KEY, &s->has_key_backlight);
if (ret)
return ret;
s->num_light_sensors = left_light_sensor + right_light_sensor;
s->init_complete = true;
pr_info("key=%d fan=%d temp=%d acc=%d lux=%d kbd=%d\n",
s->key_count, s->fan_count, s->temp_count,
s->has_accelerometer,
s->num_light_sensors,
s->has_key_backlight);
return 0;
}
/*
* applesmc_init_smcreg - Initialize register cache.
*
* Retries until initialization is successful, or the operation times out.
*
*/
static int applesmc_init_smcreg(void)
{
int ms, ret;
for (ms = 0; ms < INIT_TIMEOUT_MSECS; ms += INIT_WAIT_MSECS) {
ret = applesmc_init_smcreg_try();
if (!ret) {
if (ms)
pr_info("init_smcreg() took %d ms\n", ms);
return 0;
}
msleep(INIT_WAIT_MSECS);
}
kfree(smcreg.cache);
smcreg.cache = NULL;
return ret;
}
static void applesmc_destroy_smcreg(void)
{
kfree(smcreg.cache);
smcreg.cache = NULL;
smcreg.init_complete = false;
} }
/* Device model stuff */ /* Device model stuff */
...@@ -514,30 +576,27 @@ static int applesmc_probe(struct platform_device *dev) ...@@ -514,30 +576,27 @@ static int applesmc_probe(struct platform_device *dev)
{ {
int ret; int ret;
ret = applesmc_device_init(); ret = applesmc_init_smcreg();
if (ret) if (ret)
return ret; return ret;
printk(KERN_INFO "applesmc: device successfully initialized.\n"); applesmc_device_init();
return 0; return 0;
} }
/* Synchronize device with memorized backlight state */ /* Synchronize device with memorized backlight state */
static int applesmc_pm_resume(struct device *dev) static int applesmc_pm_resume(struct device *dev)
{ {
mutex_lock(&applesmc_lock); if (smcreg.has_key_backlight)
if (applesmc_light)
applesmc_write_key(BACKLIGHT_KEY, backlight_state, 2); applesmc_write_key(BACKLIGHT_KEY, backlight_state, 2);
mutex_unlock(&applesmc_lock);
return 0; return 0;
} }
/* Reinitialize device on resume from hibernation */ /* Reinitialize device on resume from hibernation */
static int applesmc_pm_restore(struct device *dev) static int applesmc_pm_restore(struct device *dev)
{ {
int ret = applesmc_device_init(); applesmc_device_init();
if (ret)
return ret;
return applesmc_pm_resume(dev); return applesmc_pm_resume(dev);
} }
...@@ -571,20 +630,15 @@ static void applesmc_idev_poll(struct input_polled_dev *dev) ...@@ -571,20 +630,15 @@ static void applesmc_idev_poll(struct input_polled_dev *dev)
struct input_dev *idev = dev->input; struct input_dev *idev = dev->input;
s16 x, y; s16 x, y;
mutex_lock(&applesmc_lock);
if (applesmc_read_motion_sensor(SENSOR_X, &x)) if (applesmc_read_motion_sensor(SENSOR_X, &x))
goto out; return;
if (applesmc_read_motion_sensor(SENSOR_Y, &y)) if (applesmc_read_motion_sensor(SENSOR_Y, &y))
goto out; return;
x = -x; x = -x;
input_report_abs(idev, ABS_X, x - rest_x); input_report_abs(idev, ABS_X, x - rest_x);
input_report_abs(idev, ABS_Y, y - rest_y); input_report_abs(idev, ABS_Y, y - rest_y);
input_sync(idev); input_sync(idev);
out:
mutex_unlock(&applesmc_lock);
} }
/* Sysfs Files */ /* Sysfs Files */
...@@ -601,8 +655,6 @@ static ssize_t applesmc_position_show(struct device *dev, ...@@ -601,8 +655,6 @@ static ssize_t applesmc_position_show(struct device *dev,
int ret; int ret;
s16 x, y, z; s16 x, y, z;
mutex_lock(&applesmc_lock);
ret = applesmc_read_motion_sensor(SENSOR_X, &x); ret = applesmc_read_motion_sensor(SENSOR_X, &x);
if (ret) if (ret)
goto out; goto out;
...@@ -614,7 +666,6 @@ static ssize_t applesmc_position_show(struct device *dev, ...@@ -614,7 +666,6 @@ static ssize_t applesmc_position_show(struct device *dev,
goto out; goto out;
out: out:
mutex_unlock(&applesmc_lock);
if (ret) if (ret)
return ret; return ret;
else else
...@@ -624,20 +675,20 @@ static ssize_t applesmc_position_show(struct device *dev, ...@@ -624,20 +675,20 @@ static ssize_t applesmc_position_show(struct device *dev,
static ssize_t applesmc_light_show(struct device *dev, static ssize_t applesmc_light_show(struct device *dev,
struct device_attribute *attr, char *sysfsbuf) struct device_attribute *attr, char *sysfsbuf)
{ {
const struct applesmc_entry *entry;
static int data_length; static int data_length;
int ret; int ret;
u8 left = 0, right = 0; u8 left = 0, right = 0;
u8 buffer[10], query[6]; u8 buffer[10];
mutex_lock(&applesmc_lock);
if (!data_length) { if (!data_length) {
ret = applesmc_get_key_type(LIGHT_SENSOR_LEFT_KEY, query); entry = applesmc_get_entry_by_key(LIGHT_SENSOR_LEFT_KEY);
if (ret) if (IS_ERR(entry))
goto out; return PTR_ERR(entry);
data_length = clamp_val(query[0], 0, 10); if (entry->len > 10)
printk(KERN_INFO "applesmc: light sensor data length set to " return -ENXIO;
"%d\n", data_length); data_length = entry->len;
pr_info("light sensor data length set to %d\n", data_length);
} }
ret = applesmc_read_key(LIGHT_SENSOR_LEFT_KEY, buffer, data_length); ret = applesmc_read_key(LIGHT_SENSOR_LEFT_KEY, buffer, data_length);
...@@ -653,7 +704,6 @@ static ssize_t applesmc_light_show(struct device *dev, ...@@ -653,7 +704,6 @@ static ssize_t applesmc_light_show(struct device *dev,
right = buffer[2]; right = buffer[2];
out: out:
mutex_unlock(&applesmc_lock);
if (ret) if (ret)
return ret; return ret;
else else
...@@ -664,35 +714,43 @@ static ssize_t applesmc_light_show(struct device *dev, ...@@ -664,35 +714,43 @@ static ssize_t applesmc_light_show(struct device *dev,
static ssize_t applesmc_show_sensor_label(struct device *dev, static ssize_t applesmc_show_sensor_label(struct device *dev,
struct device_attribute *devattr, char *sysfsbuf) struct device_attribute *devattr, char *sysfsbuf)
{ {
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); int index = smcreg.temp_begin + to_index(devattr);
const char *key = const struct applesmc_entry *entry;
temperature_sensors_sets[applesmc_temperature_set][attr->index];
entry = applesmc_get_entry_by_index(index);
if (IS_ERR(entry))
return PTR_ERR(entry);
return snprintf(sysfsbuf, PAGE_SIZE, "%s\n", key); return snprintf(sysfsbuf, PAGE_SIZE, "%s\n", entry->key);
} }
/* Displays degree Celsius * 1000 */ /* Displays degree Celsius * 1000 */
static ssize_t applesmc_show_temperature(struct device *dev, static ssize_t applesmc_show_temperature(struct device *dev,
struct device_attribute *devattr, char *sysfsbuf) struct device_attribute *devattr, char *sysfsbuf)
{ {
int index = smcreg.temp_begin + to_index(devattr);
const struct applesmc_entry *entry;
int ret; int ret;
u8 buffer[2]; u8 buffer[2];
unsigned int temp; unsigned int temp;
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
const char* key =
temperature_sensors_sets[applesmc_temperature_set][attr->index];
mutex_lock(&applesmc_lock);
ret = applesmc_read_key(key, buffer, 2);
temp = buffer[0]*1000;
temp += (buffer[1] >> 6) * 250;
mutex_unlock(&applesmc_lock); entry = applesmc_get_entry_by_index(index);
if (IS_ERR(entry))
return PTR_ERR(entry);
if (entry->len > 2)
return -EINVAL;
ret = applesmc_read_entry(entry, buffer, entry->len);
if (ret) if (ret)
return ret; return ret;
else
if (entry->len == 2) {
temp = buffer[0] * 1000;
temp += (buffer[1] >> 6) * 250;
} else {
temp = buffer[0] * 4000;
}
return snprintf(sysfsbuf, PAGE_SIZE, "%u\n", temp); return snprintf(sysfsbuf, PAGE_SIZE, "%u\n", temp);
} }
...@@ -703,21 +761,12 @@ static ssize_t applesmc_show_fan_speed(struct device *dev, ...@@ -703,21 +761,12 @@ static ssize_t applesmc_show_fan_speed(struct device *dev,
unsigned int speed = 0; unsigned int speed = 0;
char newkey[5]; char newkey[5];
u8 buffer[2]; u8 buffer[2];
struct sensor_device_attribute_2 *sensor_attr =
to_sensor_dev_attr_2(attr);
newkey[0] = fan_speed_keys[sensor_attr->nr][0];
newkey[1] = '0' + sensor_attr->index;
newkey[2] = fan_speed_keys[sensor_attr->nr][2];
newkey[3] = fan_speed_keys[sensor_attr->nr][3];
newkey[4] = 0;
mutex_lock(&applesmc_lock); sprintf(newkey, fan_speed_fmt[to_option(attr)], to_index(attr));
ret = applesmc_read_key(newkey, buffer, 2); ret = applesmc_read_key(newkey, buffer, 2);
speed = ((buffer[0] << 8 | buffer[1]) >> 2); speed = ((buffer[0] << 8 | buffer[1]) >> 2);
mutex_unlock(&applesmc_lock);
if (ret) if (ret)
return ret; return ret;
else else
...@@ -729,30 +778,19 @@ static ssize_t applesmc_store_fan_speed(struct device *dev, ...@@ -729,30 +778,19 @@ static ssize_t applesmc_store_fan_speed(struct device *dev,
const char *sysfsbuf, size_t count) const char *sysfsbuf, size_t count)
{ {
int ret; int ret;
u32 speed; unsigned long speed;
char newkey[5]; char newkey[5];
u8 buffer[2]; u8 buffer[2];
struct sensor_device_attribute_2 *sensor_attr =
to_sensor_dev_attr_2(attr);
speed = simple_strtoul(sysfsbuf, NULL, 10);
if (speed > 0x4000) /* Bigger than a 14-bit value */
return -EINVAL;
newkey[0] = fan_speed_keys[sensor_attr->nr][0]; if (strict_strtoul(sysfsbuf, 10, &speed) < 0 || speed >= 0x4000)
newkey[1] = '0' + sensor_attr->index; return -EINVAL; /* Bigger than a 14-bit value */
newkey[2] = fan_speed_keys[sensor_attr->nr][2];
newkey[3] = fan_speed_keys[sensor_attr->nr][3];
newkey[4] = 0;
mutex_lock(&applesmc_lock); sprintf(newkey, fan_speed_fmt[to_option(attr)], to_index(attr));
buffer[0] = (speed >> 6) & 0xff; buffer[0] = (speed >> 6) & 0xff;
buffer[1] = (speed << 2) & 0xff; buffer[1] = (speed << 2) & 0xff;
ret = applesmc_write_key(newkey, buffer, 2); ret = applesmc_write_key(newkey, buffer, 2);
mutex_unlock(&applesmc_lock);
if (ret) if (ret)
return ret; return ret;
else else
...@@ -760,19 +798,15 @@ static ssize_t applesmc_store_fan_speed(struct device *dev, ...@@ -760,19 +798,15 @@ static ssize_t applesmc_store_fan_speed(struct device *dev,
} }
static ssize_t applesmc_show_fan_manual(struct device *dev, static ssize_t applesmc_show_fan_manual(struct device *dev,
struct device_attribute *devattr, char *sysfsbuf) struct device_attribute *attr, char *sysfsbuf)
{ {
int ret; int ret;
u16 manual = 0; u16 manual = 0;
u8 buffer[2]; u8 buffer[2];
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
mutex_lock(&applesmc_lock);
ret = applesmc_read_key(FANS_MANUAL, buffer, 2); ret = applesmc_read_key(FANS_MANUAL, buffer, 2);
manual = ((buffer[0] << 8 | buffer[1]) >> attr->index) & 0x01; manual = ((buffer[0] << 8 | buffer[1]) >> to_index(attr)) & 0x01;
mutex_unlock(&applesmc_lock);
if (ret) if (ret)
return ret; return ret;
else else
...@@ -780,18 +814,16 @@ static ssize_t applesmc_show_fan_manual(struct device *dev, ...@@ -780,18 +814,16 @@ static ssize_t applesmc_show_fan_manual(struct device *dev,
} }
static ssize_t applesmc_store_fan_manual(struct device *dev, static ssize_t applesmc_store_fan_manual(struct device *dev,
struct device_attribute *devattr, struct device_attribute *attr,
const char *sysfsbuf, size_t count) const char *sysfsbuf, size_t count)
{ {
int ret; int ret;
u8 buffer[2]; u8 buffer[2];
u32 input; unsigned long input;
u16 val; u16 val;
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
input = simple_strtoul(sysfsbuf, NULL, 10);
mutex_lock(&applesmc_lock); if (strict_strtoul(sysfsbuf, 10, &input) < 0)
return -EINVAL;
ret = applesmc_read_key(FANS_MANUAL, buffer, 2); ret = applesmc_read_key(FANS_MANUAL, buffer, 2);
val = (buffer[0] << 8 | buffer[1]); val = (buffer[0] << 8 | buffer[1]);
...@@ -799,9 +831,9 @@ static ssize_t applesmc_store_fan_manual(struct device *dev, ...@@ -799,9 +831,9 @@ static ssize_t applesmc_store_fan_manual(struct device *dev,
goto out; goto out;
if (input) if (input)
val = val | (0x01 << attr->index); val = val | (0x01 << to_index(attr));
else else
val = val & ~(0x01 << attr->index); val = val & ~(0x01 << to_index(attr));
buffer[0] = (val >> 8) & 0xFF; buffer[0] = (val >> 8) & 0xFF;
buffer[1] = val & 0xFF; buffer[1] = val & 0xFF;
...@@ -809,7 +841,6 @@ static ssize_t applesmc_store_fan_manual(struct device *dev, ...@@ -809,7 +841,6 @@ static ssize_t applesmc_store_fan_manual(struct device *dev,
ret = applesmc_write_key(FANS_MANUAL, buffer, 2); ret = applesmc_write_key(FANS_MANUAL, buffer, 2);
out: out:
mutex_unlock(&applesmc_lock);
if (ret) if (ret)
return ret; return ret;
else else
...@@ -822,21 +853,12 @@ static ssize_t applesmc_show_fan_position(struct device *dev, ...@@ -822,21 +853,12 @@ static ssize_t applesmc_show_fan_position(struct device *dev,
int ret; int ret;
char newkey[5]; char newkey[5];
u8 buffer[17]; u8 buffer[17];
struct sensor_device_attribute_2 *sensor_attr =
to_sensor_dev_attr_2(attr);
newkey[0] = FAN_POSITION[0]; sprintf(newkey, FAN_ID_FMT, to_index(attr));
newkey[1] = '0' + sensor_attr->index;
newkey[2] = FAN_POSITION[2];
newkey[3] = FAN_POSITION[3];
newkey[4] = 0;
mutex_lock(&applesmc_lock);
ret = applesmc_read_key(newkey, buffer, 16); ret = applesmc_read_key(newkey, buffer, 16);
buffer[16] = 0; buffer[16] = 0;
mutex_unlock(&applesmc_lock);
if (ret) if (ret)
return ret; return ret;
else else
...@@ -852,18 +874,14 @@ static ssize_t applesmc_calibrate_show(struct device *dev, ...@@ -852,18 +874,14 @@ static ssize_t applesmc_calibrate_show(struct device *dev,
static ssize_t applesmc_calibrate_store(struct device *dev, static ssize_t applesmc_calibrate_store(struct device *dev,
struct device_attribute *attr, const char *sysfsbuf, size_t count) struct device_attribute *attr, const char *sysfsbuf, size_t count)
{ {
mutex_lock(&applesmc_lock);
applesmc_calibrate(); applesmc_calibrate();
mutex_unlock(&applesmc_lock);
return count; return count;
} }
static void applesmc_backlight_set(struct work_struct *work) static void applesmc_backlight_set(struct work_struct *work)
{ {
mutex_lock(&applesmc_lock);
applesmc_write_key(BACKLIGHT_KEY, backlight_state, 2); applesmc_write_key(BACKLIGHT_KEY, backlight_state, 2);
mutex_unlock(&applesmc_lock);
} }
static DECLARE_WORK(backlight_work, &applesmc_backlight_set); static DECLARE_WORK(backlight_work, &applesmc_backlight_set);
...@@ -886,13 +904,10 @@ static ssize_t applesmc_key_count_show(struct device *dev, ...@@ -886,13 +904,10 @@ static ssize_t applesmc_key_count_show(struct device *dev,
u8 buffer[4]; u8 buffer[4];
u32 count; u32 count;
mutex_lock(&applesmc_lock);
ret = applesmc_read_key(KEY_COUNT_KEY, buffer, 4); ret = applesmc_read_key(KEY_COUNT_KEY, buffer, 4);
count = ((u32)buffer[0]<<24) + ((u32)buffer[1]<<16) + count = ((u32)buffer[0]<<24) + ((u32)buffer[1]<<16) +
((u32)buffer[2]<<8) + buffer[3]; ((u32)buffer[2]<<8) + buffer[3];
mutex_unlock(&applesmc_lock);
if (ret) if (ret)
return ret; return ret;
else else
...@@ -902,113 +917,53 @@ static ssize_t applesmc_key_count_show(struct device *dev, ...@@ -902,113 +917,53 @@ static ssize_t applesmc_key_count_show(struct device *dev,
static ssize_t applesmc_key_at_index_read_show(struct device *dev, static ssize_t applesmc_key_at_index_read_show(struct device *dev,
struct device_attribute *attr, char *sysfsbuf) struct device_attribute *attr, char *sysfsbuf)
{ {
char key[5]; const struct applesmc_entry *entry;
char info[6];
int ret; int ret;
mutex_lock(&applesmc_lock); entry = applesmc_get_entry_by_index(key_at_index);
if (IS_ERR(entry))
ret = applesmc_get_key_at_index(key_at_index, key); return PTR_ERR(entry);
ret = applesmc_read_entry(entry, sysfsbuf, entry->len);
if (ret || !key[0]) { if (ret)
mutex_unlock(&applesmc_lock);
return -EINVAL;
}
ret = applesmc_get_key_type(key, info);
if (ret) {
mutex_unlock(&applesmc_lock);
return ret; return ret;
}
/*
* info[0] maximum value (APPLESMC_MAX_DATA_LENGTH) is much lower than
* PAGE_SIZE, so we don't need any checks before writing to sysfsbuf.
*/
ret = applesmc_read_key(key, sysfsbuf, info[0]);
mutex_unlock(&applesmc_lock); return entry->len;
if (!ret) {
return info[0];
} else {
return ret;
}
} }
static ssize_t applesmc_key_at_index_data_length_show(struct device *dev, static ssize_t applesmc_key_at_index_data_length_show(struct device *dev,
struct device_attribute *attr, char *sysfsbuf) struct device_attribute *attr, char *sysfsbuf)
{ {
char key[5]; const struct applesmc_entry *entry;
char info[6];
int ret;
mutex_lock(&applesmc_lock);
ret = applesmc_get_key_at_index(key_at_index, key);
if (ret || !key[0]) { entry = applesmc_get_entry_by_index(key_at_index);
mutex_unlock(&applesmc_lock); if (IS_ERR(entry))
return PTR_ERR(entry);
return -EINVAL; return snprintf(sysfsbuf, PAGE_SIZE, "%d\n", entry->len);
}
ret = applesmc_get_key_type(key, info);
mutex_unlock(&applesmc_lock);
if (!ret)
return snprintf(sysfsbuf, PAGE_SIZE, "%d\n", info[0]);
else
return ret;
} }
static ssize_t applesmc_key_at_index_type_show(struct device *dev, static ssize_t applesmc_key_at_index_type_show(struct device *dev,
struct device_attribute *attr, char *sysfsbuf) struct device_attribute *attr, char *sysfsbuf)
{ {
char key[5]; const struct applesmc_entry *entry;
char info[6];
int ret;
mutex_lock(&applesmc_lock);
ret = applesmc_get_key_at_index(key_at_index, key); entry = applesmc_get_entry_by_index(key_at_index);
if (IS_ERR(entry))
return PTR_ERR(entry);
if (ret || !key[0]) { return snprintf(sysfsbuf, PAGE_SIZE, "%s\n", entry->type);
mutex_unlock(&applesmc_lock);
return -EINVAL;
}
ret = applesmc_get_key_type(key, info);
mutex_unlock(&applesmc_lock);
if (!ret)
return snprintf(sysfsbuf, PAGE_SIZE, "%s\n", info+1);
else
return ret;
} }
static ssize_t applesmc_key_at_index_name_show(struct device *dev, static ssize_t applesmc_key_at_index_name_show(struct device *dev,
struct device_attribute *attr, char *sysfsbuf) struct device_attribute *attr, char *sysfsbuf)
{ {
char key[5]; const struct applesmc_entry *entry;
int ret;
mutex_lock(&applesmc_lock);
ret = applesmc_get_key_at_index(key_at_index, key);
mutex_unlock(&applesmc_lock); entry = applesmc_get_entry_by_index(key_at_index);
if (IS_ERR(entry))
return PTR_ERR(entry);
if (!ret && key[0]) return snprintf(sysfsbuf, PAGE_SIZE, "%s\n", entry->key);
return snprintf(sysfsbuf, PAGE_SIZE, "%s\n", key);
else
return -EINVAL;
} }
static ssize_t applesmc_key_at_index_show(struct device *dev, static ssize_t applesmc_key_at_index_show(struct device *dev,
...@@ -1020,12 +975,13 @@ static ssize_t applesmc_key_at_index_show(struct device *dev, ...@@ -1020,12 +975,13 @@ static ssize_t applesmc_key_at_index_show(struct device *dev,
static ssize_t applesmc_key_at_index_store(struct device *dev, static ssize_t applesmc_key_at_index_store(struct device *dev,
struct device_attribute *attr, const char *sysfsbuf, size_t count) struct device_attribute *attr, const char *sysfsbuf, size_t count)
{ {
mutex_lock(&applesmc_lock); unsigned long newkey;
key_at_index = simple_strtoul(sysfsbuf, NULL, 10);
mutex_unlock(&applesmc_lock); if (strict_strtoul(sysfsbuf, 10, &newkey) < 0
|| newkey >= smcreg.key_count)
return -EINVAL;
key_at_index = newkey;
return count; return count;
} }
...@@ -1035,387 +991,101 @@ static struct led_classdev applesmc_backlight = { ...@@ -1035,387 +991,101 @@ static struct led_classdev applesmc_backlight = {
.brightness_set = applesmc_brightness_set, .brightness_set = applesmc_brightness_set,
}; };
static DEVICE_ATTR(name, 0444, applesmc_name_show, NULL); static struct applesmc_node_group info_group[] = {
{ "name", applesmc_name_show },
static DEVICE_ATTR(position, 0444, applesmc_position_show, NULL); { "key_count", applesmc_key_count_show },
static DEVICE_ATTR(calibrate, 0644, { "key_at_index", applesmc_key_at_index_show, applesmc_key_at_index_store },
applesmc_calibrate_show, applesmc_calibrate_store); { "key_at_index_name", applesmc_key_at_index_name_show },
{ "key_at_index_type", applesmc_key_at_index_type_show },
static struct attribute *accelerometer_attributes[] = { { "key_at_index_data_length", applesmc_key_at_index_data_length_show },
&dev_attr_position.attr, { "key_at_index_data", applesmc_key_at_index_read_show },
&dev_attr_calibrate.attr, { }
NULL
};
static const struct attribute_group accelerometer_attributes_group =
{ .attrs = accelerometer_attributes };
static DEVICE_ATTR(light, 0444, applesmc_light_show, NULL);
static DEVICE_ATTR(key_count, 0444, applesmc_key_count_show, NULL);
static DEVICE_ATTR(key_at_index, 0644,
applesmc_key_at_index_show, applesmc_key_at_index_store);
static DEVICE_ATTR(key_at_index_name, 0444,
applesmc_key_at_index_name_show, NULL);
static DEVICE_ATTR(key_at_index_type, 0444,
applesmc_key_at_index_type_show, NULL);
static DEVICE_ATTR(key_at_index_data_length, 0444,
applesmc_key_at_index_data_length_show, NULL);
static DEVICE_ATTR(key_at_index_data, 0444,
applesmc_key_at_index_read_show, NULL);
static struct attribute *key_enumeration_attributes[] = {
&dev_attr_key_count.attr,
&dev_attr_key_at_index.attr,
&dev_attr_key_at_index_name.attr,
&dev_attr_key_at_index_type.attr,
&dev_attr_key_at_index_data_length.attr,
&dev_attr_key_at_index_data.attr,
NULL
}; };
static const struct attribute_group key_enumeration_group = static struct applesmc_node_group accelerometer_group[] = {
{ .attrs = key_enumeration_attributes }; { "position", applesmc_position_show },
{ "calibrate", applesmc_calibrate_show, applesmc_calibrate_store },
/* { }
* Macro defining SENSOR_DEVICE_ATTR for a fan sysfs entries.
* - show actual speed
* - show/store minimum speed
* - show maximum speed
* - show safe speed
* - show/store target speed
* - show/store manual mode
*/
#define sysfs_fan_speeds_offset(offset) \
static SENSOR_DEVICE_ATTR_2(fan##offset##_input, S_IRUGO, \
applesmc_show_fan_speed, NULL, 0, offset-1); \
\
static SENSOR_DEVICE_ATTR_2(fan##offset##_min, S_IRUGO | S_IWUSR, \
applesmc_show_fan_speed, applesmc_store_fan_speed, 1, offset-1); \
\
static SENSOR_DEVICE_ATTR_2(fan##offset##_max, S_IRUGO, \
applesmc_show_fan_speed, NULL, 2, offset-1); \
\
static SENSOR_DEVICE_ATTR_2(fan##offset##_safe, S_IRUGO, \
applesmc_show_fan_speed, NULL, 3, offset-1); \
\
static SENSOR_DEVICE_ATTR_2(fan##offset##_output, S_IRUGO | S_IWUSR, \
applesmc_show_fan_speed, applesmc_store_fan_speed, 4, offset-1); \
\
static SENSOR_DEVICE_ATTR(fan##offset##_manual, S_IRUGO | S_IWUSR, \
applesmc_show_fan_manual, applesmc_store_fan_manual, offset-1); \
\
static SENSOR_DEVICE_ATTR(fan##offset##_label, S_IRUGO, \
applesmc_show_fan_position, NULL, offset-1); \
\
static struct attribute *fan##offset##_attributes[] = { \
&sensor_dev_attr_fan##offset##_input.dev_attr.attr, \
&sensor_dev_attr_fan##offset##_min.dev_attr.attr, \
&sensor_dev_attr_fan##offset##_max.dev_attr.attr, \
&sensor_dev_attr_fan##offset##_safe.dev_attr.attr, \
&sensor_dev_attr_fan##offset##_output.dev_attr.attr, \
&sensor_dev_attr_fan##offset##_manual.dev_attr.attr, \
&sensor_dev_attr_fan##offset##_label.dev_attr.attr, \
NULL \
}; };
/* static struct applesmc_node_group light_sensor_group[] = {
* Create the needed functions for each fan using the macro defined above { "light", applesmc_light_show },
* (4 fans are supported) { }
*/
sysfs_fan_speeds_offset(1);
sysfs_fan_speeds_offset(2);
sysfs_fan_speeds_offset(3);
sysfs_fan_speeds_offset(4);
static const struct attribute_group fan_attribute_groups[] = {
{ .attrs = fan1_attributes },
{ .attrs = fan2_attributes },
{ .attrs = fan3_attributes },
{ .attrs = fan4_attributes },
}; };
/* static struct applesmc_node_group fan_group[] = {
* Temperature sensors sysfs entries. { "fan%d_label", applesmc_show_fan_position },
*/ { "fan%d_input", applesmc_show_fan_speed, NULL, 0 },
static SENSOR_DEVICE_ATTR(temp1_label, S_IRUGO, { "fan%d_min", applesmc_show_fan_speed, applesmc_store_fan_speed, 1 },
applesmc_show_sensor_label, NULL, 0); { "fan%d_max", applesmc_show_fan_speed, NULL, 2 },
static SENSOR_DEVICE_ATTR(temp2_label, S_IRUGO, { "fan%d_safe", applesmc_show_fan_speed, NULL, 3 },
applesmc_show_sensor_label, NULL, 1); { "fan%d_output", applesmc_show_fan_speed, applesmc_store_fan_speed, 4 },
static SENSOR_DEVICE_ATTR(temp3_label, S_IRUGO, { "fan%d_manual", applesmc_show_fan_manual, applesmc_store_fan_manual },
applesmc_show_sensor_label, NULL, 2); { }
static SENSOR_DEVICE_ATTR(temp4_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 3);
static SENSOR_DEVICE_ATTR(temp5_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 4);
static SENSOR_DEVICE_ATTR(temp6_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 5);
static SENSOR_DEVICE_ATTR(temp7_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 6);
static SENSOR_DEVICE_ATTR(temp8_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 7);
static SENSOR_DEVICE_ATTR(temp9_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 8);
static SENSOR_DEVICE_ATTR(temp10_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 9);
static SENSOR_DEVICE_ATTR(temp11_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 10);
static SENSOR_DEVICE_ATTR(temp12_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 11);
static SENSOR_DEVICE_ATTR(temp13_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 12);
static SENSOR_DEVICE_ATTR(temp14_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 13);
static SENSOR_DEVICE_ATTR(temp15_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 14);
static SENSOR_DEVICE_ATTR(temp16_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 15);
static SENSOR_DEVICE_ATTR(temp17_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 16);
static SENSOR_DEVICE_ATTR(temp18_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 17);
static SENSOR_DEVICE_ATTR(temp19_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 18);
static SENSOR_DEVICE_ATTR(temp20_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 19);
static SENSOR_DEVICE_ATTR(temp21_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 20);
static SENSOR_DEVICE_ATTR(temp22_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 21);
static SENSOR_DEVICE_ATTR(temp23_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 22);
static SENSOR_DEVICE_ATTR(temp24_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 23);
static SENSOR_DEVICE_ATTR(temp25_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 24);
static SENSOR_DEVICE_ATTR(temp26_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 25);
static SENSOR_DEVICE_ATTR(temp27_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 26);
static SENSOR_DEVICE_ATTR(temp28_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 27);
static SENSOR_DEVICE_ATTR(temp29_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 28);
static SENSOR_DEVICE_ATTR(temp30_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 29);
static SENSOR_DEVICE_ATTR(temp31_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 30);
static SENSOR_DEVICE_ATTR(temp32_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 31);
static SENSOR_DEVICE_ATTR(temp33_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 32);
static SENSOR_DEVICE_ATTR(temp34_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 33);
static SENSOR_DEVICE_ATTR(temp35_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 34);
static SENSOR_DEVICE_ATTR(temp36_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 35);
static SENSOR_DEVICE_ATTR(temp37_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 36);
static SENSOR_DEVICE_ATTR(temp38_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 37);
static SENSOR_DEVICE_ATTR(temp39_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 38);
static SENSOR_DEVICE_ATTR(temp40_label, S_IRUGO,
applesmc_show_sensor_label, NULL, 39);
static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO,
applesmc_show_temperature, NULL, 0);
static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO,
applesmc_show_temperature, NULL, 1);
static SENSOR_DEVICE_ATTR(temp3_input, S_IRUGO,
applesmc_show_temperature, NULL, 2);
static SENSOR_DEVICE_ATTR(temp4_input, S_IRUGO,
applesmc_show_temperature, NULL, 3);
static SENSOR_DEVICE_ATTR(temp5_input, S_IRUGO,
applesmc_show_temperature, NULL, 4);
static SENSOR_DEVICE_ATTR(temp6_input, S_IRUGO,
applesmc_show_temperature, NULL, 5);
static SENSOR_DEVICE_ATTR(temp7_input, S_IRUGO,
applesmc_show_temperature, NULL, 6);
static SENSOR_DEVICE_ATTR(temp8_input, S_IRUGO,
applesmc_show_temperature, NULL, 7);
static SENSOR_DEVICE_ATTR(temp9_input, S_IRUGO,
applesmc_show_temperature, NULL, 8);
static SENSOR_DEVICE_ATTR(temp10_input, S_IRUGO,
applesmc_show_temperature, NULL, 9);
static SENSOR_DEVICE_ATTR(temp11_input, S_IRUGO,
applesmc_show_temperature, NULL, 10);
static SENSOR_DEVICE_ATTR(temp12_input, S_IRUGO,
applesmc_show_temperature, NULL, 11);
static SENSOR_DEVICE_ATTR(temp13_input, S_IRUGO,
applesmc_show_temperature, NULL, 12);
static SENSOR_DEVICE_ATTR(temp14_input, S_IRUGO,
applesmc_show_temperature, NULL, 13);
static SENSOR_DEVICE_ATTR(temp15_input, S_IRUGO,
applesmc_show_temperature, NULL, 14);
static SENSOR_DEVICE_ATTR(temp16_input, S_IRUGO,
applesmc_show_temperature, NULL, 15);
static SENSOR_DEVICE_ATTR(temp17_input, S_IRUGO,
applesmc_show_temperature, NULL, 16);
static SENSOR_DEVICE_ATTR(temp18_input, S_IRUGO,
applesmc_show_temperature, NULL, 17);
static SENSOR_DEVICE_ATTR(temp19_input, S_IRUGO,
applesmc_show_temperature, NULL, 18);
static SENSOR_DEVICE_ATTR(temp20_input, S_IRUGO,
applesmc_show_temperature, NULL, 19);
static SENSOR_DEVICE_ATTR(temp21_input, S_IRUGO,
applesmc_show_temperature, NULL, 20);
static SENSOR_DEVICE_ATTR(temp22_input, S_IRUGO,
applesmc_show_temperature, NULL, 21);
static SENSOR_DEVICE_ATTR(temp23_input, S_IRUGO,
applesmc_show_temperature, NULL, 22);
static SENSOR_DEVICE_ATTR(temp24_input, S_IRUGO,
applesmc_show_temperature, NULL, 23);
static SENSOR_DEVICE_ATTR(temp25_input, S_IRUGO,
applesmc_show_temperature, NULL, 24);
static SENSOR_DEVICE_ATTR(temp26_input, S_IRUGO,
applesmc_show_temperature, NULL, 25);
static SENSOR_DEVICE_ATTR(temp27_input, S_IRUGO,
applesmc_show_temperature, NULL, 26);
static SENSOR_DEVICE_ATTR(temp28_input, S_IRUGO,
applesmc_show_temperature, NULL, 27);
static SENSOR_DEVICE_ATTR(temp29_input, S_IRUGO,
applesmc_show_temperature, NULL, 28);
static SENSOR_DEVICE_ATTR(temp30_input, S_IRUGO,
applesmc_show_temperature, NULL, 29);
static SENSOR_DEVICE_ATTR(temp31_input, S_IRUGO,
applesmc_show_temperature, NULL, 30);
static SENSOR_DEVICE_ATTR(temp32_input, S_IRUGO,
applesmc_show_temperature, NULL, 31);
static SENSOR_DEVICE_ATTR(temp33_input, S_IRUGO,
applesmc_show_temperature, NULL, 32);
static SENSOR_DEVICE_ATTR(temp34_input, S_IRUGO,
applesmc_show_temperature, NULL, 33);
static SENSOR_DEVICE_ATTR(temp35_input, S_IRUGO,
applesmc_show_temperature, NULL, 34);
static SENSOR_DEVICE_ATTR(temp36_input, S_IRUGO,
applesmc_show_temperature, NULL, 35);
static SENSOR_DEVICE_ATTR(temp37_input, S_IRUGO,
applesmc_show_temperature, NULL, 36);
static SENSOR_DEVICE_ATTR(temp38_input, S_IRUGO,
applesmc_show_temperature, NULL, 37);
static SENSOR_DEVICE_ATTR(temp39_input, S_IRUGO,
applesmc_show_temperature, NULL, 38);
static SENSOR_DEVICE_ATTR(temp40_input, S_IRUGO,
applesmc_show_temperature, NULL, 39);
static struct attribute *label_attributes[] = {
&sensor_dev_attr_temp1_label.dev_attr.attr,
&sensor_dev_attr_temp2_label.dev_attr.attr,
&sensor_dev_attr_temp3_label.dev_attr.attr,
&sensor_dev_attr_temp4_label.dev_attr.attr,
&sensor_dev_attr_temp5_label.dev_attr.attr,
&sensor_dev_attr_temp6_label.dev_attr.attr,
&sensor_dev_attr_temp7_label.dev_attr.attr,
&sensor_dev_attr_temp8_label.dev_attr.attr,
&sensor_dev_attr_temp9_label.dev_attr.attr,
&sensor_dev_attr_temp10_label.dev_attr.attr,
&sensor_dev_attr_temp11_label.dev_attr.attr,
&sensor_dev_attr_temp12_label.dev_attr.attr,
&sensor_dev_attr_temp13_label.dev_attr.attr,
&sensor_dev_attr_temp14_label.dev_attr.attr,
&sensor_dev_attr_temp15_label.dev_attr.attr,
&sensor_dev_attr_temp16_label.dev_attr.attr,
&sensor_dev_attr_temp17_label.dev_attr.attr,
&sensor_dev_attr_temp18_label.dev_attr.attr,
&sensor_dev_attr_temp19_label.dev_attr.attr,
&sensor_dev_attr_temp20_label.dev_attr.attr,
&sensor_dev_attr_temp21_label.dev_attr.attr,
&sensor_dev_attr_temp22_label.dev_attr.attr,
&sensor_dev_attr_temp23_label.dev_attr.attr,
&sensor_dev_attr_temp24_label.dev_attr.attr,
&sensor_dev_attr_temp25_label.dev_attr.attr,
&sensor_dev_attr_temp26_label.dev_attr.attr,
&sensor_dev_attr_temp27_label.dev_attr.attr,
&sensor_dev_attr_temp28_label.dev_attr.attr,
&sensor_dev_attr_temp29_label.dev_attr.attr,
&sensor_dev_attr_temp30_label.dev_attr.attr,
&sensor_dev_attr_temp31_label.dev_attr.attr,
&sensor_dev_attr_temp32_label.dev_attr.attr,
&sensor_dev_attr_temp33_label.dev_attr.attr,
&sensor_dev_attr_temp34_label.dev_attr.attr,
&sensor_dev_attr_temp35_label.dev_attr.attr,
&sensor_dev_attr_temp36_label.dev_attr.attr,
&sensor_dev_attr_temp37_label.dev_attr.attr,
&sensor_dev_attr_temp38_label.dev_attr.attr,
&sensor_dev_attr_temp39_label.dev_attr.attr,
&sensor_dev_attr_temp40_label.dev_attr.attr,
NULL
}; };
static struct attribute *temperature_attributes[] = { static struct applesmc_node_group temp_group[] = {
&sensor_dev_attr_temp1_input.dev_attr.attr, { "temp%d_label", applesmc_show_sensor_label },
&sensor_dev_attr_temp2_input.dev_attr.attr, { "temp%d_input", applesmc_show_temperature },
&sensor_dev_attr_temp3_input.dev_attr.attr, { }
&sensor_dev_attr_temp4_input.dev_attr.attr,
&sensor_dev_attr_temp5_input.dev_attr.attr,
&sensor_dev_attr_temp6_input.dev_attr.attr,
&sensor_dev_attr_temp7_input.dev_attr.attr,
&sensor_dev_attr_temp8_input.dev_attr.attr,
&sensor_dev_attr_temp9_input.dev_attr.attr,
&sensor_dev_attr_temp10_input.dev_attr.attr,
&sensor_dev_attr_temp11_input.dev_attr.attr,
&sensor_dev_attr_temp12_input.dev_attr.attr,
&sensor_dev_attr_temp13_input.dev_attr.attr,
&sensor_dev_attr_temp14_input.dev_attr.attr,
&sensor_dev_attr_temp15_input.dev_attr.attr,
&sensor_dev_attr_temp16_input.dev_attr.attr,
&sensor_dev_attr_temp17_input.dev_attr.attr,
&sensor_dev_attr_temp18_input.dev_attr.attr,
&sensor_dev_attr_temp19_input.dev_attr.attr,
&sensor_dev_attr_temp20_input.dev_attr.attr,
&sensor_dev_attr_temp21_input.dev_attr.attr,
&sensor_dev_attr_temp22_input.dev_attr.attr,
&sensor_dev_attr_temp23_input.dev_attr.attr,
&sensor_dev_attr_temp24_input.dev_attr.attr,
&sensor_dev_attr_temp25_input.dev_attr.attr,
&sensor_dev_attr_temp26_input.dev_attr.attr,
&sensor_dev_attr_temp27_input.dev_attr.attr,
&sensor_dev_attr_temp28_input.dev_attr.attr,
&sensor_dev_attr_temp29_input.dev_attr.attr,
&sensor_dev_attr_temp30_input.dev_attr.attr,
&sensor_dev_attr_temp31_input.dev_attr.attr,
&sensor_dev_attr_temp32_input.dev_attr.attr,
&sensor_dev_attr_temp33_input.dev_attr.attr,
&sensor_dev_attr_temp34_input.dev_attr.attr,
&sensor_dev_attr_temp35_input.dev_attr.attr,
&sensor_dev_attr_temp36_input.dev_attr.attr,
&sensor_dev_attr_temp37_input.dev_attr.attr,
&sensor_dev_attr_temp38_input.dev_attr.attr,
&sensor_dev_attr_temp39_input.dev_attr.attr,
&sensor_dev_attr_temp40_input.dev_attr.attr,
NULL
};
static const struct attribute_group temperature_attributes_group =
{ .attrs = temperature_attributes };
static const struct attribute_group label_attributes_group = {
.attrs = label_attributes
}; };
/* Module stuff */ /* Module stuff */
/* /*
* applesmc_dmi_match - found a match. return one, short-circuiting the hunt. * applesmc_destroy_nodes - remove files and free associated memory
*/ */
static int applesmc_dmi_match(const struct dmi_system_id *id) static void applesmc_destroy_nodes(struct applesmc_node_group *groups)
{ {
int i = 0; struct applesmc_node_group *grp;
struct dmi_match_data* dmi_data = id->driver_data; struct applesmc_dev_attr *node;
printk(KERN_INFO "applesmc: %s detected:\n", id->ident);
applesmc_accelerometer = dmi_data->accelerometer; for (grp = groups; grp->nodes; grp++) {
printk(KERN_INFO "applesmc: - Model %s accelerometer\n", for (node = grp->nodes; node->sda.dev_attr.attr.name; node++)
applesmc_accelerometer ? "with" : "without"); sysfs_remove_file(&pdev->dev.kobj,
applesmc_light = dmi_data->light; &node->sda.dev_attr.attr);
printk(KERN_INFO "applesmc: - Model %s light sensors and backlight\n", kfree(grp->nodes);
applesmc_light ? "with" : "without"); grp->nodes = NULL;
}
applesmc_temperature_set = dmi_data->temperature_set; }
while (temperature_sensors_sets[applesmc_temperature_set][i] != NULL)
i++; /*
printk(KERN_INFO "applesmc: - Model with %d temperature sensors\n", i); * applesmc_create_nodes - create a two-dimensional group of sysfs files
return 1; */
static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
{
struct applesmc_node_group *grp;
struct applesmc_dev_attr *node;
struct attribute *attr;
int ret, i;
for (grp = groups; grp->format; grp++) {
grp->nodes = kcalloc(num + 1, sizeof(*node), GFP_KERNEL);
if (!grp->nodes) {
ret = -ENOMEM;
goto out;
}
for (i = 0; i < num; i++) {
node = &grp->nodes[i];
sprintf(node->name, grp->format, i + 1);
node->sda.index = (grp->option << 16) | (i & 0xffff);
node->sda.dev_attr.show = grp->show;
node->sda.dev_attr.store = grp->store;
attr = &node->sda.dev_attr.attr;
attr->name = node->name;
attr->mode = S_IRUGO | (grp->store ? S_IWUSR : 0);
ret = sysfs_create_file(&pdev->dev.kobj, attr);
if (ret) {
attr->name = NULL;
goto out;
}
}
}
return 0;
out:
applesmc_destroy_nodes(groups);
return ret;
} }
/* Create accelerometer ressources */ /* Create accelerometer ressources */
...@@ -1424,8 +1094,10 @@ static int applesmc_create_accelerometer(void) ...@@ -1424,8 +1094,10 @@ static int applesmc_create_accelerometer(void)
struct input_dev *idev; struct input_dev *idev;
int ret; int ret;
ret = sysfs_create_group(&pdev->dev.kobj, if (!smcreg.has_accelerometer)
&accelerometer_attributes_group); return 0;
ret = applesmc_create_nodes(accelerometer_group, 1);
if (ret) if (ret)
goto out; goto out;
...@@ -1462,184 +1134,96 @@ static int applesmc_create_accelerometer(void) ...@@ -1462,184 +1134,96 @@ static int applesmc_create_accelerometer(void)
input_free_polled_device(applesmc_idev); input_free_polled_device(applesmc_idev);
out_sysfs: out_sysfs:
sysfs_remove_group(&pdev->dev.kobj, &accelerometer_attributes_group); applesmc_destroy_nodes(accelerometer_group);
out: out:
printk(KERN_WARNING "applesmc: driver init failed (ret=%d)!\n", ret); pr_warn("driver init failed (ret=%d)!\n", ret);
return ret; return ret;
} }
/* Release all ressources used by the accelerometer */ /* Release all ressources used by the accelerometer */
static void applesmc_release_accelerometer(void) static void applesmc_release_accelerometer(void)
{ {
if (!smcreg.has_accelerometer)
return;
input_unregister_polled_device(applesmc_idev); input_unregister_polled_device(applesmc_idev);
input_free_polled_device(applesmc_idev); input_free_polled_device(applesmc_idev);
sysfs_remove_group(&pdev->dev.kobj, &accelerometer_attributes_group); applesmc_destroy_nodes(accelerometer_group);
} }
static __initdata struct dmi_match_data applesmc_dmi_data[] = { static int applesmc_create_light_sensor(void)
/* MacBook Pro: accelerometer, backlight and temperature set 0 */ {
{ .accelerometer = 1, .light = 1, .temperature_set = 0 }, if (!smcreg.num_light_sensors)
/* MacBook2: accelerometer and temperature set 1 */ return 0;
{ .accelerometer = 1, .light = 0, .temperature_set = 1 }, return applesmc_create_nodes(light_sensor_group, 1);
/* MacBook: accelerometer and temperature set 2 */ }
{ .accelerometer = 1, .light = 0, .temperature_set = 2 },
/* MacMini: temperature set 3 */ static void applesmc_release_light_sensor(void)
{ .accelerometer = 0, .light = 0, .temperature_set = 3 }, {
/* MacPro: temperature set 4 */ if (!smcreg.num_light_sensors)
{ .accelerometer = 0, .light = 0, .temperature_set = 4 }, return;
/* iMac: temperature set 5 */ applesmc_destroy_nodes(light_sensor_group);
{ .accelerometer = 0, .light = 0, .temperature_set = 5 }, }
/* MacBook3, MacBook4: accelerometer and temperature set 6 */
{ .accelerometer = 1, .light = 0, .temperature_set = 6 }, static int applesmc_create_key_backlight(void)
/* MacBook Air: accelerometer, backlight and temperature set 7 */ {
{ .accelerometer = 1, .light = 1, .temperature_set = 7 }, if (!smcreg.has_key_backlight)
/* MacBook Pro 4: accelerometer, backlight and temperature set 8 */ return 0;
{ .accelerometer = 1, .light = 1, .temperature_set = 8 }, applesmc_led_wq = create_singlethread_workqueue("applesmc-led");
/* MacBook Pro 3: accelerometer, backlight and temperature set 9 */ if (!applesmc_led_wq)
{ .accelerometer = 1, .light = 1, .temperature_set = 9 }, return -ENOMEM;
/* iMac 5: light sensor only, temperature set 10 */ return led_classdev_register(&pdev->dev, &applesmc_backlight);
{ .accelerometer = 0, .light = 0, .temperature_set = 10 }, }
/* MacBook 5: accelerometer, backlight and temperature set 11 */
{ .accelerometer = 1, .light = 1, .temperature_set = 11 }, static void applesmc_release_key_backlight(void)
/* MacBook Pro 5: accelerometer, backlight and temperature set 12 */ {
{ .accelerometer = 1, .light = 1, .temperature_set = 12 }, if (!smcreg.has_key_backlight)
/* iMac 8: light sensor only, temperature set 13 */ return;
{ .accelerometer = 0, .light = 0, .temperature_set = 13 }, led_classdev_unregister(&applesmc_backlight);
/* iMac 6: light sensor only, temperature set 14 */ destroy_workqueue(applesmc_led_wq);
{ .accelerometer = 0, .light = 0, .temperature_set = 14 }, }
/* MacBook Air 2,1: accelerometer, backlight and temperature set 15 */
{ .accelerometer = 1, .light = 1, .temperature_set = 15 }, static int applesmc_dmi_match(const struct dmi_system_id *id)
/* MacPro3,1: temperature set 16 */ {
{ .accelerometer = 0, .light = 0, .temperature_set = 16 }, return 1;
/* iMac 9,1: light sensor only, temperature set 17 */ }
{ .accelerometer = 0, .light = 0, .temperature_set = 17 },
/* MacBook Pro 2,2: accelerometer, backlight and temperature set 18 */
{ .accelerometer = 1, .light = 1, .temperature_set = 18 },
/* MacBook Pro 5,3: accelerometer, backlight and temperature set 19 */
{ .accelerometer = 1, .light = 1, .temperature_set = 19 },
/* MacBook Pro 5,4: accelerometer, backlight and temperature set 20 */
{ .accelerometer = 1, .light = 1, .temperature_set = 20 },
/* MacBook Pro 6,2: accelerometer, backlight and temperature set 21 */
{ .accelerometer = 1, .light = 1, .temperature_set = 21 },
/* MacBook Pro 7,1: accelerometer, backlight and temperature set 22 */
{ .accelerometer = 1, .light = 1, .temperature_set = 22 },
};
/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
* So we need to put "Apple MacBook Pro" before "Apple MacBook". */ * So we need to put "Apple MacBook Pro" before "Apple MacBook". */
static __initdata struct dmi_system_id applesmc_whitelist[] = { static __initdata struct dmi_system_id applesmc_whitelist[] = {
{ applesmc_dmi_match, "Apple MacBook Air 2", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir2") },
&applesmc_dmi_data[15]},
{ applesmc_dmi_match, "Apple MacBook Air", { { applesmc_dmi_match, "Apple MacBook Air", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") }, DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") },
&applesmc_dmi_data[7]}, },
{ applesmc_dmi_match, "Apple MacBook Pro 7", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro7") },
&applesmc_dmi_data[22]},
{ applesmc_dmi_match, "Apple MacBook Pro 5,4", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,4") },
&applesmc_dmi_data[20]},
{ applesmc_dmi_match, "Apple MacBook Pro 5,3", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,3") },
&applesmc_dmi_data[19]},
{ applesmc_dmi_match, "Apple MacBook Pro 6", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro6") },
&applesmc_dmi_data[21]},
{ applesmc_dmi_match, "Apple MacBook Pro 5", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5") },
&applesmc_dmi_data[12]},
{ applesmc_dmi_match, "Apple MacBook Pro 4", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro4") },
&applesmc_dmi_data[8]},
{ applesmc_dmi_match, "Apple MacBook Pro 3", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro3") },
&applesmc_dmi_data[9]},
{ applesmc_dmi_match, "Apple MacBook Pro 2,2", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple Computer, Inc."),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro2,2") },
&applesmc_dmi_data[18]},
{ applesmc_dmi_match, "Apple MacBook Pro", { { applesmc_dmi_match, "Apple MacBook Pro", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") },
&applesmc_dmi_data[0]},
{ applesmc_dmi_match, "Apple MacBook (v2)", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"MacBook2") },
&applesmc_dmi_data[1]},
{ applesmc_dmi_match, "Apple MacBook (v3)", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"MacBook3") },
&applesmc_dmi_data[6]},
{ applesmc_dmi_match, "Apple MacBook 4", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBook4") }, DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro") },
&applesmc_dmi_data[6]}, },
{ applesmc_dmi_match, "Apple MacBook 5", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5") },
&applesmc_dmi_data[11]},
{ applesmc_dmi_match, "Apple MacBook", { { applesmc_dmi_match, "Apple MacBook", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") }, DMI_MATCH(DMI_PRODUCT_NAME, "MacBook") },
&applesmc_dmi_data[2]}, },
{ applesmc_dmi_match, "Apple Macmini", { { applesmc_dmi_match, "Apple Macmini", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"Macmini") },
&applesmc_dmi_data[3]},
{ applesmc_dmi_match, "Apple MacPro2", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") },
&applesmc_dmi_data[4]},
{ applesmc_dmi_match, "Apple MacPro3", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacPro3") }, DMI_MATCH(DMI_PRODUCT_NAME, "Macmini") },
&applesmc_dmi_data[16]}, },
{ applesmc_dmi_match, "Apple MacPro", { { applesmc_dmi_match, "Apple MacPro", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "MacPro") }, DMI_MATCH(DMI_PRODUCT_NAME, "MacPro") },
&applesmc_dmi_data[4]}, },
{ applesmc_dmi_match, "Apple iMac 9,1", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple Inc."),
DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1") },
&applesmc_dmi_data[17]},
{ applesmc_dmi_match, "Apple iMac 8", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "iMac8") },
&applesmc_dmi_data[13]},
{ applesmc_dmi_match, "Apple iMac 6", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "iMac6") },
&applesmc_dmi_data[14]},
{ applesmc_dmi_match, "Apple iMac 5", {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME, "iMac5") },
&applesmc_dmi_data[10]},
{ applesmc_dmi_match, "Apple iMac", { { applesmc_dmi_match, "Apple iMac", {
DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
DMI_MATCH(DMI_PRODUCT_NAME,"iMac") }, DMI_MATCH(DMI_PRODUCT_NAME, "iMac") },
&applesmc_dmi_data[5]}, },
{ .ident = NULL } { .ident = NULL }
}; };
static int __init applesmc_init(void) static int __init applesmc_init(void)
{ {
int ret; int ret;
int count;
int i;
if (!dmi_check_system(applesmc_whitelist)) { if (!dmi_check_system(applesmc_whitelist)) {
printk(KERN_WARNING "applesmc: supported laptop not found!\n"); pr_warn("supported laptop not found!\n");
ret = -ENODEV; ret = -ENODEV;
goto out; goto out;
} }
...@@ -1661,83 +1245,34 @@ static int __init applesmc_init(void) ...@@ -1661,83 +1245,34 @@ static int __init applesmc_init(void)
goto out_driver; goto out_driver;
} }
ret = sysfs_create_file(&pdev->dev.kobj, &dev_attr_name.attr); /* create register cache */
ret = applesmc_init_smcreg();
if (ret) if (ret)
goto out_device; goto out_device;
/* Create key enumeration sysfs files */ ret = applesmc_create_nodes(info_group, 1);
ret = sysfs_create_group(&pdev->dev.kobj, &key_enumeration_group);
if (ret) if (ret)
goto out_name; goto out_smcreg;
/* create fan files */ ret = applesmc_create_nodes(fan_group, smcreg.fan_count);
count = applesmc_get_fan_count();
if (count < 0)
printk(KERN_ERR "applesmc: Cannot get the number of fans.\n");
else
printk(KERN_INFO "applesmc: %d fans found.\n", count);
if (count > 4) {
count = 4;
printk(KERN_WARNING "applesmc: More than 4 fans found,"
" but at most 4 fans are supported"
" by the driver.\n");
}
while (fans_handled < count) {
ret = sysfs_create_group(&pdev->dev.kobj,
&fan_attribute_groups[fans_handled]);
if (ret) if (ret)
goto out_fans; goto out_info;
fans_handled++;
}
for (i = 0; ret = applesmc_create_nodes(temp_group, smcreg.temp_count);
temperature_sensors_sets[applesmc_temperature_set][i] != NULL;
i++) {
if (temperature_attributes[i] == NULL ||
label_attributes[i] == NULL) {
printk(KERN_ERR "applesmc: More temperature sensors "
"in temperature_sensors_sets (at least %i)"
"than available sysfs files in "
"temperature_attributes (%i), please report "
"this bug.\n", i, i-1);
goto out_temperature;
}
ret = sysfs_create_file(&pdev->dev.kobj,
temperature_attributes[i]);
if (ret) if (ret)
goto out_temperature; goto out_fans;
ret = sysfs_create_file(&pdev->dev.kobj,
label_attributes[i]);
if (ret)
goto out_temperature;
}
if (applesmc_accelerometer) {
ret = applesmc_create_accelerometer(); ret = applesmc_create_accelerometer();
if (ret) if (ret)
goto out_temperature; goto out_temperature;
}
if (applesmc_light) { ret = applesmc_create_light_sensor();
/* Add light sensor file */
ret = sysfs_create_file(&pdev->dev.kobj, &dev_attr_light.attr);
if (ret) if (ret)
goto out_accelerometer; goto out_accelerometer;
/* Create the workqueue */ ret = applesmc_create_key_backlight();
applesmc_led_wq = create_singlethread_workqueue("applesmc-led"); if (ret)
if (!applesmc_led_wq) {
ret = -ENOMEM;
goto out_light_sysfs; goto out_light_sysfs;
}
/* register as a led device */
ret = led_classdev_register(&pdev->dev, &applesmc_backlight);
if (ret < 0)
goto out_light_wq;
}
hwmon_dev = hwmon_device_register(&pdev->dev); hwmon_dev = hwmon_device_register(&pdev->dev);
if (IS_ERR(hwmon_dev)) { if (IS_ERR(hwmon_dev)) {
...@@ -1745,32 +1280,22 @@ static int __init applesmc_init(void) ...@@ -1745,32 +1280,22 @@ static int __init applesmc_init(void)
goto out_light_ledclass; goto out_light_ledclass;
} }
printk(KERN_INFO "applesmc: driver successfully loaded.\n");
return 0; return 0;
out_light_ledclass: out_light_ledclass:
if (applesmc_light) applesmc_release_key_backlight();
led_classdev_unregister(&applesmc_backlight);
out_light_wq:
if (applesmc_light)
destroy_workqueue(applesmc_led_wq);
out_light_sysfs: out_light_sysfs:
if (applesmc_light) applesmc_release_light_sensor();
sysfs_remove_file(&pdev->dev.kobj, &dev_attr_light.attr);
out_accelerometer: out_accelerometer:
if (applesmc_accelerometer)
applesmc_release_accelerometer(); applesmc_release_accelerometer();
out_temperature: out_temperature:
sysfs_remove_group(&pdev->dev.kobj, &label_attributes_group); applesmc_destroy_nodes(temp_group);
sysfs_remove_group(&pdev->dev.kobj, &temperature_attributes_group);
out_fans: out_fans:
while (fans_handled) applesmc_destroy_nodes(fan_group);
sysfs_remove_group(&pdev->dev.kobj, out_info:
&fan_attribute_groups[--fans_handled]); applesmc_destroy_nodes(info_group);
sysfs_remove_group(&pdev->dev.kobj, &key_enumeration_group); out_smcreg:
out_name: applesmc_destroy_smcreg();
sysfs_remove_file(&pdev->dev.kobj, &dev_attr_name.attr);
out_device: out_device:
platform_device_unregister(pdev); platform_device_unregister(pdev);
out_driver: out_driver:
...@@ -1778,32 +1303,23 @@ static int __init applesmc_init(void) ...@@ -1778,32 +1303,23 @@ static int __init applesmc_init(void)
out_region: out_region:
release_region(APPLESMC_DATA_PORT, APPLESMC_NR_PORTS); release_region(APPLESMC_DATA_PORT, APPLESMC_NR_PORTS);
out: out:
printk(KERN_WARNING "applesmc: driver init failed (ret=%d)!\n", ret); pr_warn("driver init failed (ret=%d)!\n", ret);
return ret; return ret;
} }
static void __exit applesmc_exit(void) static void __exit applesmc_exit(void)
{ {
hwmon_device_unregister(hwmon_dev); hwmon_device_unregister(hwmon_dev);
if (applesmc_light) { applesmc_release_key_backlight();
led_classdev_unregister(&applesmc_backlight); applesmc_release_light_sensor();
destroy_workqueue(applesmc_led_wq);
sysfs_remove_file(&pdev->dev.kobj, &dev_attr_light.attr);
}
if (applesmc_accelerometer)
applesmc_release_accelerometer(); applesmc_release_accelerometer();
sysfs_remove_group(&pdev->dev.kobj, &label_attributes_group); applesmc_destroy_nodes(temp_group);
sysfs_remove_group(&pdev->dev.kobj, &temperature_attributes_group); applesmc_destroy_nodes(fan_group);
while (fans_handled) applesmc_destroy_nodes(info_group);
sysfs_remove_group(&pdev->dev.kobj, applesmc_destroy_smcreg();
&fan_attribute_groups[--fans_handled]);
sysfs_remove_group(&pdev->dev.kobj, &key_enumeration_group);
sysfs_remove_file(&pdev->dev.kobj, &dev_attr_name.attr);
platform_device_unregister(pdev); platform_device_unregister(pdev);
platform_driver_unregister(&applesmc_driver); platform_driver_unregister(&applesmc_driver);
release_region(APPLESMC_DATA_PORT, APPLESMC_NR_PORTS); release_region(APPLESMC_DATA_PORT, APPLESMC_NR_PORTS);
printk(KERN_INFO "applesmc: driver unloaded.\n");
} }
module_init(applesmc_init); module_init(applesmc_init);
......
drivers/hwmon/asb100.c
View file @ a0894881
...@@ -36,6 +36,8 @@ ...@@ -36,6 +36,8 @@
asb100 7 3 1 4 0x31 0x0694 yes no asb100 7 3 1 4 0x31 0x0694 yes no
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/i2c.h> #include <linux/i2c.h>
...@@ -701,8 +703,7 @@ static int asb100_detect(struct i2c_client *client, ...@@ -701,8 +703,7 @@ static int asb100_detect(struct i2c_client *client,
int val1, val2; int val1, val2;
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) { if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
pr_debug("asb100.o: detect failed, " pr_debug("detect failed, smbus byte data not supported!\n");
"smbus byte data not supported!\n");
return -ENODEV; return -ENODEV;
} }
...@@ -715,7 +716,7 @@ static int asb100_detect(struct i2c_client *client, ...@@ -715,7 +716,7 @@ static int asb100_detect(struct i2c_client *client,
(((!(val1 & 0x80)) && (val2 != 0x94)) || (((!(val1 & 0x80)) && (val2 != 0x94)) ||
/* Check for ASB100 ID (high byte ) */ /* Check for ASB100 ID (high byte ) */
((val1 & 0x80) && (val2 != 0x06)))) { ((val1 & 0x80) && (val2 != 0x06)))) {
pr_debug("asb100: detect failed, bad chip id 0x%02x!\n", val2); pr_debug("detect failed, bad chip id 0x%02x!\n", val2);
return -ENODEV; return -ENODEV;
} }
...@@ -744,7 +745,7 @@ static int asb100_probe(struct i2c_client *client, ...@@ -744,7 +745,7 @@ static int asb100_probe(struct i2c_client *client,
data = kzalloc(sizeof(struct asb100_data), GFP_KERNEL); data = kzalloc(sizeof(struct asb100_data), GFP_KERNEL);
if (!data) { if (!data) {
pr_debug("asb100.o: probe failed, kzalloc failed!\n"); pr_debug("probe failed, kzalloc failed!\n");
err = -ENOMEM; err = -ENOMEM;
goto ERROR0; goto ERROR0;
} }
......
drivers/hwmon/asus_atk0110.c
View file @ a0894881
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
* See COPYING in the top level directory of the kernel tree. * See COPYING in the top level directory of the kernel tree.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
...@@ -1414,14 +1416,13 @@ static int __init atk0110_init(void) ...@@ -1414,14 +1416,13 @@ static int __init atk0110_init(void)
/* Make sure it's safe to access the device through ACPI */ /* Make sure it's safe to access the device through ACPI */
if (!acpi_resources_are_enforced()) { if (!acpi_resources_are_enforced()) {
pr_err("atk: Resources not safely usable due to " pr_err("Resources not safely usable due to acpi_enforce_resources kernel parameter\n");
"acpi_enforce_resources kernel parameter\n");
return -EBUSY; return -EBUSY;
} }
ret = acpi_bus_register_driver(&atk_driver); ret = acpi_bus_register_driver(&atk_driver);
if (ret) if (ret)
pr_info("atk: acpi_bus_register_driver failed: %d\n", ret); pr_info("acpi_bus_register_driver failed: %d\n", ret);
return ret; return ret;
} }
......
drivers/hwmon/coretemp.c
View file @ a0894881
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
* 02110-1301 USA. * 02110-1301 USA.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -445,8 +447,8 @@ static int __cpuinit coretemp_device_add(unsigned int cpu) ...@@ -445,8 +447,8 @@ static int __cpuinit coretemp_device_add(unsigned int cpu)
* without thermal sensors will be filtered out. * without thermal sensors will be filtered out.
*/ */
if (!cpu_has(c, X86_FEATURE_DTS)) { if (!cpu_has(c, X86_FEATURE_DTS)) {
printk(KERN_INFO DRVNAME ": CPU (model=0x%x)" pr_info("CPU (model=0x%x) has no thermal sensor\n",
" has no thermal sensor.\n", c->x86_model); c->x86_model);
return 0; return 0;
} }
...@@ -466,7 +468,7 @@ static int __cpuinit coretemp_device_add(unsigned int cpu) ...@@ -466,7 +468,7 @@ static int __cpuinit coretemp_device_add(unsigned int cpu)
pdev = platform_device_alloc(DRVNAME, cpu); pdev = platform_device_alloc(DRVNAME, cpu);
if (!pdev) { if (!pdev) {
err = -ENOMEM; err = -ENOMEM;
printk(KERN_ERR DRVNAME ": Device allocation failed\n"); pr_err("Device allocation failed\n");
goto exit; goto exit;
} }
...@@ -478,8 +480,7 @@ static int __cpuinit coretemp_device_add(unsigned int cpu) ...@@ -478,8 +480,7 @@ static int __cpuinit coretemp_device_add(unsigned int cpu)
err = platform_device_add(pdev); err = platform_device_add(pdev);
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n", pr_err("Device addition failed (%d)\n", err);
err);
goto exit_device_free; goto exit_device_free;
} }
......
drivers/hwmon/dme1737.c
View file @ a0894881
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -2446,7 +2448,7 @@ static int __init dme1737_isa_detect(int sio_cip, unsigned short *addr) ...@@ -2446,7 +2448,7 @@ static int __init dme1737_isa_detect(int sio_cip, unsigned short *addr)
/* Get the base address of the runtime registers */ /* Get the base address of the runtime registers */
if (!(base_addr = (dme1737_sio_inb(sio_cip, 0x60) << 8) | if (!(base_addr = (dme1737_sio_inb(sio_cip, 0x60) << 8) |
dme1737_sio_inb(sio_cip, 0x61))) { dme1737_sio_inb(sio_cip, 0x61))) {
printk(KERN_ERR "dme1737: Base address not set.\n"); pr_err("Base address not set\n");
err = -ENODEV; err = -ENODEV;
goto exit; goto exit;
} }
...@@ -2475,20 +2477,18 @@ static int __init dme1737_isa_device_add(unsigned short addr) ...@@ -2475,20 +2477,18 @@ static int __init dme1737_isa_device_add(unsigned short addr)
goto exit; goto exit;
if (!(pdev = platform_device_alloc("dme1737", addr))) { if (!(pdev = platform_device_alloc("dme1737", addr))) {
printk(KERN_ERR "dme1737: Failed to allocate device.\n"); pr_err("Failed to allocate device\n");
err = -ENOMEM; err = -ENOMEM;
goto exit; goto exit;
} }
if ((err = platform_device_add_resources(pdev, &res, 1))) { if ((err = platform_device_add_resources(pdev, &res, 1))) {
printk(KERN_ERR "dme1737: Failed to add device resource " pr_err("Failed to add device resource (err = %d)\n", err);
"(err = %d).\n", err);
goto exit_device_put; goto exit_device_put;
} }
if ((err = platform_device_add(pdev))) { if ((err = platform_device_add(pdev))) {
printk(KERN_ERR "dme1737: Failed to add device (err = %d).\n", pr_err("Failed to add device (err = %d)\n", err);
err);
goto exit_device_put; goto exit_device_put;
} }
......
drivers/hwmon/ds620.c 0 → 100644
View file @ a0894881
/*
* ds620.c - Support for temperature sensor and thermostat DS620
*
* Copyright (C) 2010, 2011 Roland Stigge <stigge@antcom.de>
*
* based on ds1621.c by Christian W. Zuckschwerdt <zany@triq.net>
*
* 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
#include <linux/err.h>
#include <linux/mutex.h>
#include <linux/sysfs.h>
#include <linux/i2c/ds620.h>
/*
* Many DS620 constants specified below
* 15 14 13 12 11 10 09 08
* |Done|NVB |THF |TLF |R1 |R0 |AUTOC|1SHOT|
*
* 07 06 05 04 03 02 01 00
* |PO2 |PO1 |A2 |A1 |A0 | | | |
*/
#define DS620_REG_CONFIG_DONE 0x8000
#define DS620_REG_CONFIG_NVB 0x4000
#define DS620_REG_CONFIG_THF 0x2000
#define DS620_REG_CONFIG_TLF 0x1000
#define DS620_REG_CONFIG_R1 0x0800
#define DS620_REG_CONFIG_R0 0x0400
#define DS620_REG_CONFIG_AUTOC 0x0200
#define DS620_REG_CONFIG_1SHOT 0x0100
#define DS620_REG_CONFIG_PO2 0x0080
#define DS620_REG_CONFIG_PO1 0x0040
#define DS620_REG_CONFIG_A2 0x0020
#define DS620_REG_CONFIG_A1 0x0010
#define DS620_REG_CONFIG_A0 0x0008
/* The DS620 registers */
static const u8 DS620_REG_TEMP[3] = {
0xAA, /* input, word, RO */
0xA2, /* min, word, RW */
0xA0, /* max, word, RW */
};
#define DS620_REG_CONF 0xAC /* word, RW */
#define DS620_COM_START 0x51 /* no data */
#define DS620_COM_STOP 0x22 /* no data */
/* Each client has this additional data */
struct ds620_data {
struct device *hwmon_dev;
struct mutex update_lock;
char valid; /* !=0 if following fields are valid */
unsigned long last_updated; /* In jiffies */
u16 temp[3]; /* Register values, word */
};
/*
* Temperature registers are word-sized.
* DS620 uses a high-byte first convention, which is exactly opposite to
* the SMBus standard.
*/
static int ds620_read_temp(struct i2c_client *client, u8 reg)
{
int ret;
ret = i2c_smbus_read_word_data(client, reg);
if (ret < 0)
return ret;
return swab16(ret);
}
static int ds620_write_temp(struct i2c_client *client, u8 reg, u16 value)
{
return i2c_smbus_write_word_data(client, reg, swab16(value));
}
static void ds620_init_client(struct i2c_client *client)
{
struct ds620_platform_data *ds620_info = client->dev.platform_data;
u16 conf, new_conf;
new_conf = conf =
swab16(i2c_smbus_read_word_data(client, DS620_REG_CONF));
/* switch to continuous conversion mode */
new_conf &= ~DS620_REG_CONFIG_1SHOT;
/* already high at power-on, but don't trust the BIOS! */
new_conf |= DS620_REG_CONFIG_PO2;
/* thermostat mode according to platform data */
if (ds620_info && ds620_info->pomode == 1)
new_conf &= ~DS620_REG_CONFIG_PO1; /* PO_LOW */
else if (ds620_info && ds620_info->pomode == 2)
new_conf |= DS620_REG_CONFIG_PO1; /* PO_HIGH */
else
new_conf &= ~DS620_REG_CONFIG_PO2; /* always low */
/* with highest precision */
new_conf |= DS620_REG_CONFIG_R1 | DS620_REG_CONFIG_R0;
if (conf != new_conf)
i2c_smbus_write_word_data(client, DS620_REG_CONF,
swab16(new_conf));
/* start conversion */
i2c_smbus_write_byte(client, DS620_COM_START);
}
static struct ds620_data *ds620_update_client(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
struct ds620_data *data = i2c_get_clientdata(client);
struct ds620_data *ret = data;
mutex_lock(&data->update_lock);
if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
|| !data->valid) {
int i;
int res;
dev_dbg(&client->dev, "Starting ds620 update\n");
for (i = 0; i < ARRAY_SIZE(data->temp); i++) {
res = ds620_read_temp(client,
DS620_REG_TEMP[i]);
if (res < 0) {
ret = ERR_PTR(res);
goto abort;
}
data->temp[i] = res;
}
data->last_updated = jiffies;
data->valid = 1;
}
abort:
mutex_unlock(&data->update_lock);
return ret;
}
static ssize_t show_temp(struct device *dev, struct device_attribute *da,
char *buf)
{
struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
struct ds620_data *data = ds620_update_client(dev);
if (IS_ERR(data))
return PTR_ERR(data);
return sprintf(buf, "%d\n", ((data->temp[attr->index] / 8) * 625) / 10);
}
static ssize_t set_temp(struct device *dev, struct device_attribute *da,
const char *buf, size_t count)
{
int res;
long val;
struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
struct i2c_client *client = to_i2c_client(dev);
struct ds620_data *data = i2c_get_clientdata(client);
res = strict_strtol(buf, 10, &val);
if (res)
return res;
val = (val * 10 / 625) * 8;
mutex_lock(&data->update_lock);
data->temp[attr->index] = val;
ds620_write_temp(client, DS620_REG_TEMP[attr->index],
data->temp[attr->index]);
mutex_unlock(&data->update_lock);
return count;
}
static ssize_t show_alarm(struct device *dev, struct device_attribute *da,
char *buf)
{
struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
struct ds620_data *data = ds620_update_client(dev);
struct i2c_client *client = to_i2c_client(dev);
u16 conf, new_conf;
int res;
if (IS_ERR(data))
return PTR_ERR(data);
/* reset alarms if necessary */
res = i2c_smbus_read_word_data(client, DS620_REG_CONF);
if (res < 0)
return res;
conf = swab16(res);
new_conf = conf;
new_conf &= ~attr->index;
if (conf != new_conf) {
res = i2c_smbus_write_word_data(client, DS620_REG_CONF,
swab16(new_conf));
if (res < 0)
return res;
}
return sprintf(buf, "%d\n", !!(conf & attr->index));
}
static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, show_temp, set_temp, 1);
static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp, set_temp, 2);
static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO, show_alarm, NULL,
DS620_REG_CONFIG_TLF);
static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL,
DS620_REG_CONFIG_THF);
static struct attribute *ds620_attributes[] = {
&sensor_dev_attr_temp1_input.dev_attr.attr,
&sensor_dev_attr_temp1_min.dev_attr.attr,
&sensor_dev_attr_temp1_max.dev_attr.attr,
&sensor_dev_attr_temp1_min_alarm.dev_attr.attr,
&sensor_dev_attr_temp1_max_alarm.dev_attr.attr,
NULL
};
static const struct attribute_group ds620_group = {
.attrs = ds620_attributes,
};
static int ds620_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct ds620_data *data;
int err;
data = kzalloc(sizeof(struct ds620_data), GFP_KERNEL);
if (!data) {
err = -ENOMEM;
goto exit;
}
i2c_set_clientdata(client, data);
mutex_init(&data->update_lock);
/* Initialize the DS620 chip */
ds620_init_client(client);
/* Register sysfs hooks */
err = sysfs_create_group(&client->dev.kobj, &ds620_group);
if (err)
goto exit_free;
data->hwmon_dev = hwmon_device_register(&client->dev);
if (IS_ERR(data->hwmon_dev)) {
err = PTR_ERR(data->hwmon_dev);
goto exit_remove_files;
}
dev_info(&client->dev, "temperature sensor found\n");
return 0;
exit_remove_files:
sysfs_remove_group(&client->dev.kobj, &ds620_group);
exit_free:
kfree(data);
exit:
return err;
}
static int ds620_remove(struct i2c_client *client)
{
struct ds620_data *data = i2c_get_clientdata(client);
hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &ds620_group);
kfree(data);
return 0;
}
static const struct i2c_device_id ds620_id[] = {
{"ds620", 0},
{}
};
MODULE_DEVICE_TABLE(i2c, ds620_id);
/* This is the driver that will be inserted */
static struct i2c_driver ds620_driver = {
.class = I2C_CLASS_HWMON,
.driver = {
.name = "ds620",
},
.probe = ds620_probe,
.remove = ds620_remove,
.id_table = ds620_id,
};
static int __init ds620_init(void)
{
return i2c_add_driver(&ds620_driver);
}
static void __exit ds620_exit(void)
{
i2c_del_driver(&ds620_driver);
}
MODULE_AUTHOR("Roland Stigge <stigge@antcom.de>");
MODULE_DESCRIPTION("DS620 driver");
MODULE_LICENSE("GPL");
module_init(ds620_init);
module_exit(ds620_exit);
drivers/hwmon/f71805f.c
View file @ a0894881
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -1309,7 +1311,7 @@ static int __devinit f71805f_probe(struct platform_device *pdev) ...@@ -1309,7 +1311,7 @@ static int __devinit f71805f_probe(struct platform_device *pdev)
if (!(data = kzalloc(sizeof(struct f71805f_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct f71805f_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
printk(KERN_ERR DRVNAME ": Out of memory\n"); pr_err("Out of memory\n");
goto exit; goto exit;
} }
...@@ -1451,7 +1453,7 @@ static int __init f71805f_device_add(unsigned short address, ...@@ -1451,7 +1453,7 @@ static int __init f71805f_device_add(unsigned short address,
pdev = platform_device_alloc(DRVNAME, address); pdev = platform_device_alloc(DRVNAME, address);
if (!pdev) { if (!pdev) {
err = -ENOMEM; err = -ENOMEM;
printk(KERN_ERR DRVNAME ": Device allocation failed\n"); pr_err("Device allocation failed\n");
goto exit; goto exit;
} }
...@@ -1462,22 +1464,20 @@ static int __init f71805f_device_add(unsigned short address, ...@@ -1462,22 +1464,20 @@ static int __init f71805f_device_add(unsigned short address,
err = platform_device_add_resources(pdev, &res, 1); err = platform_device_add_resources(pdev, &res, 1);
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Device resource addition failed " pr_err("Device resource addition failed (%d)\n", err);
"(%d)\n", err);
goto exit_device_put; goto exit_device_put;
} }
err = platform_device_add_data(pdev, sio_data, err = platform_device_add_data(pdev, sio_data,
sizeof(struct f71805f_sio_data)); sizeof(struct f71805f_sio_data));
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Platform data allocation failed\n"); pr_err("Platform data allocation failed\n");
goto exit_device_put; goto exit_device_put;
} }
err = platform_device_add(pdev); err = platform_device_add(pdev);
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n", pr_err("Device addition failed (%d)\n", err);
err);
goto exit_device_put; goto exit_device_put;
} }
...@@ -1516,28 +1516,25 @@ static int __init f71805f_find(int sioaddr, unsigned short *address, ...@@ -1516,28 +1516,25 @@ static int __init f71805f_find(int sioaddr, unsigned short *address,
sio_data->fnsel1 = superio_inb(sioaddr, SIO_REG_FNSEL1); sio_data->fnsel1 = superio_inb(sioaddr, SIO_REG_FNSEL1);
break; break;
default: default:
printk(KERN_INFO DRVNAME ": Unsupported Fintek device, " pr_info("Unsupported Fintek device, skipping\n");
"skipping\n");
goto exit; goto exit;
} }
superio_select(sioaddr, F71805F_LD_HWM); superio_select(sioaddr, F71805F_LD_HWM);
if (!(superio_inb(sioaddr, SIO_REG_ENABLE) & 0x01)) { if (!(superio_inb(sioaddr, SIO_REG_ENABLE) & 0x01)) {
printk(KERN_WARNING DRVNAME ": Device not activated, " pr_warn("Device not activated, skipping\n");
"skipping\n");
goto exit; goto exit;
} }
*address = superio_inw(sioaddr, SIO_REG_ADDR); *address = superio_inw(sioaddr, SIO_REG_ADDR);
if (*address == 0) { if (*address == 0) {
printk(KERN_WARNING DRVNAME ": Base address not set, " pr_warn("Base address not set, skipping\n");
"skipping\n");
goto exit; goto exit;
} }
*address &= ~(REGION_LENGTH - 1); /* Ignore 3 LSB */ *address &= ~(REGION_LENGTH - 1); /* Ignore 3 LSB */
err = 0; err = 0;
printk(KERN_INFO DRVNAME ": Found %s chip at %#x, revision %u\n", pr_info("Found %s chip at %#x, revision %u\n",
names[sio_data->kind], *address, names[sio_data->kind], *address,
superio_inb(sioaddr, SIO_REG_DEVREV)); superio_inb(sioaddr, SIO_REG_DEVREV));
......
drivers/hwmon/f71882fg.c
View file @ a0894881
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -865,8 +867,7 @@ static inline int superio_enter(int base) ...@@ -865,8 +867,7 @@ static inline int superio_enter(int base)
{ {
/* Don't step on other drivers' I/O space by accident */ /* Don't step on other drivers' I/O space by accident */
if (!request_muxed_region(base, 2, DRVNAME)) { if (!request_muxed_region(base, 2, DRVNAME)) {
printk(KERN_ERR DRVNAME ": I/O address 0x%04x already in use\n", pr_err("I/O address 0x%04x already in use\n", base);
base);
return -EBUSY; return -EBUSY;
} }
...@@ -2192,7 +2193,7 @@ static int __init f71882fg_find(int sioaddr, unsigned short *address, ...@@ -2192,7 +2193,7 @@ static int __init f71882fg_find(int sioaddr, unsigned short *address,
devid = superio_inw(sioaddr, SIO_REG_MANID); devid = superio_inw(sioaddr, SIO_REG_MANID);
if (devid != SIO_FINTEK_ID) { if (devid != SIO_FINTEK_ID) {
pr_debug(DRVNAME ": Not a Fintek device\n"); pr_debug("Not a Fintek device\n");
err = -ENODEV; err = -ENODEV;
goto exit; goto exit;
} }
...@@ -2215,7 +2216,7 @@ static int __init f71882fg_find(int sioaddr, unsigned short *address, ...@@ -2215,7 +2216,7 @@ static int __init f71882fg_find(int sioaddr, unsigned short *address,
sio_data->type = f8000; sio_data->type = f8000;
break; break;
default: default:
printk(KERN_INFO DRVNAME ": Unsupported Fintek device: %04x\n", pr_info("Unsupported Fintek device: %04x\n",
(unsigned int)devid); (unsigned int)devid);
err = -ENODEV; err = -ENODEV;
goto exit; goto exit;
...@@ -2227,21 +2228,21 @@ static int __init f71882fg_find(int sioaddr, unsigned short *address, ...@@ -2227,21 +2228,21 @@ static int __init f71882fg_find(int sioaddr, unsigned short *address,
superio_select(sioaddr, SIO_F71882FG_LD_HWM); superio_select(sioaddr, SIO_F71882FG_LD_HWM);
if (!(superio_inb(sioaddr, SIO_REG_ENABLE) & 0x01)) { if (!(superio_inb(sioaddr, SIO_REG_ENABLE) & 0x01)) {
printk(KERN_WARNING DRVNAME ": Device not activated\n"); pr_warn("Device not activated\n");
err = -ENODEV; err = -ENODEV;
goto exit; goto exit;
} }
*address = superio_inw(sioaddr, SIO_REG_ADDR); *address = superio_inw(sioaddr, SIO_REG_ADDR);
if (*address == 0) { if (*address == 0) {
printk(KERN_WARNING DRVNAME ": Base address not set\n"); pr_warn("Base address not set\n");
err = -ENODEV; err = -ENODEV;
goto exit; goto exit;
} }
*address &= ~(REGION_LENGTH - 1); /* Ignore 3 LSB */ *address &= ~(REGION_LENGTH - 1); /* Ignore 3 LSB */
err = 0; err = 0;
printk(KERN_INFO DRVNAME ": Found %s chip at %#x, revision %d\n", pr_info("Found %s chip at %#x, revision %d\n",
f71882fg_names[sio_data->type], (unsigned int)*address, f71882fg_names[sio_data->type], (unsigned int)*address,
(int)superio_inb(sioaddr, SIO_REG_DEVREV)); (int)superio_inb(sioaddr, SIO_REG_DEVREV));
exit: exit:
...@@ -2270,20 +2271,20 @@ static int __init f71882fg_device_add(unsigned short address, ...@@ -2270,20 +2271,20 @@ static int __init f71882fg_device_add(unsigned short address,
err = platform_device_add_resources(f71882fg_pdev, &res, 1); err = platform_device_add_resources(f71882fg_pdev, &res, 1);
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Device resource addition failed\n"); pr_err("Device resource addition failed\n");
goto exit_device_put; goto exit_device_put;
} }
err = platform_device_add_data(f71882fg_pdev, sio_data, err = platform_device_add_data(f71882fg_pdev, sio_data,
sizeof(struct f71882fg_sio_data)); sizeof(struct f71882fg_sio_data));
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Platform data allocation failed\n"); pr_err("Platform data allocation failed\n");
goto exit_device_put; goto exit_device_put;
} }
err = platform_device_add(f71882fg_pdev); err = platform_device_add(f71882fg_pdev);
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Device addition failed\n"); pr_err("Device addition failed\n");
goto exit_device_put; goto exit_device_put;
} }
......
drivers/hwmon/hp_accel.c
View file @ a0894881
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/dmi.h> #include <linux/dmi.h>
...@@ -147,7 +149,7 @@ int lis3lv02d_acpi_write(struct lis3lv02d *lis3, int reg, u8 val) ...@@ -147,7 +149,7 @@ int lis3lv02d_acpi_write(struct lis3lv02d *lis3, int reg, u8 val)
static int lis3lv02d_dmi_matched(const struct dmi_system_id *dmi) static int lis3lv02d_dmi_matched(const struct dmi_system_id *dmi)
{ {
lis3_dev.ac = *((union axis_conversion *)dmi->driver_data); lis3_dev.ac = *((union axis_conversion *)dmi->driver_data);
printk(KERN_INFO DRIVER_NAME ": hardware type %s found.\n", dmi->ident); pr_info("hardware type %s found\n", dmi->ident);
return 1; return 1;
} }
...@@ -303,11 +305,10 @@ static int lis3lv02d_add(struct acpi_device *device) ...@@ -303,11 +305,10 @@ static int lis3lv02d_add(struct acpi_device *device)
/* If possible use a "standard" axes order */ /* If possible use a "standard" axes order */
if (lis3_dev.ac.x && lis3_dev.ac.y && lis3_dev.ac.z) { if (lis3_dev.ac.x && lis3_dev.ac.y && lis3_dev.ac.z) {
printk(KERN_INFO DRIVER_NAME ": Using custom axes %d,%d,%d\n", pr_info("Using custom axes %d,%d,%d\n",
lis3_dev.ac.x, lis3_dev.ac.y, lis3_dev.ac.z); lis3_dev.ac.x, lis3_dev.ac.y, lis3_dev.ac.z);
} else if (dmi_check_system(lis3lv02d_dmi_ids) == 0) { } else if (dmi_check_system(lis3lv02d_dmi_ids) == 0) {
printk(KERN_INFO DRIVER_NAME ": laptop model unknown, " pr_info("laptop model unknown, using default axes configuration\n");
"using default axes configuration\n");
lis3_dev.ac = lis3lv02d_axis_normal; lis3_dev.ac = lis3lv02d_axis_normal;
} }
...@@ -385,7 +386,7 @@ static int __init lis3lv02d_init_module(void) ...@@ -385,7 +386,7 @@ static int __init lis3lv02d_init_module(void)
if (ret < 0) if (ret < 0)
return ret; return ret;
printk(KERN_INFO DRIVER_NAME " driver loaded.\n"); pr_info("driver loaded\n");
return 0; return 0;
} }
......
drivers/hwmon/hwmon-vid.c
View file @ a0894881
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/hwmon-vid.h> #include <linux/hwmon-vid.h>
...@@ -146,8 +148,8 @@ int vid_from_reg(int val, u8 vrm) ...@@ -146,8 +148,8 @@ int vid_from_reg(int val, u8 vrm)
return(val > 0x77 ? 0 : (1500000 - (val * 12500) + 500) / 1000); return(val > 0x77 ? 0 : (1500000 - (val * 12500) + 500) / 1000);
default: /* report 0 for unknown */ default: /* report 0 for unknown */
if (vrm) if (vrm)
printk(KERN_WARNING "hwmon-vid: Requested unsupported " pr_warn("Requested unsupported VRM version (%u)\n",
"VRM version (%u)\n", (unsigned int)vrm); (unsigned int)vrm);
return 0; return 0;
} }
} }
...@@ -246,8 +248,7 @@ u8 vid_which_vrm(void) ...@@ -246,8 +248,7 @@ u8 vid_which_vrm(void)
} }
vrm_ret = find_vrm(eff_family, eff_model, eff_stepping, c->x86_vendor); vrm_ret = find_vrm(eff_family, eff_model, eff_stepping, c->x86_vendor);
if (vrm_ret == 0) if (vrm_ret == 0)
printk(KERN_INFO "hwmon-vid: Unknown VRM version of your " pr_info("Unknown VRM version of your x86 CPU\n");
"x86 CPU\n");
return vrm_ret; return vrm_ret;
} }
...@@ -255,7 +256,7 @@ u8 vid_which_vrm(void) ...@@ -255,7 +256,7 @@ u8 vid_which_vrm(void)
#else #else
u8 vid_which_vrm(void) u8 vid_which_vrm(void)
{ {
printk(KERN_INFO "hwmon-vid: Unknown VRM version of your CPU\n"); pr_info("Unknown VRM version of your CPU\n");
return 0; return 0;
} }
#endif #endif
......
drivers/hwmon/hwmon.c
View file @ a0894881
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
the Free Software Foundation; version 2 of the License. the Free Software Foundation; version 2 of the License.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/err.h> #include <linux/err.h>
...@@ -119,7 +121,7 @@ static int __init hwmon_init(void) ...@@ -119,7 +121,7 @@ static int __init hwmon_init(void)
hwmon_class = class_create(THIS_MODULE, "hwmon"); hwmon_class = class_create(THIS_MODULE, "hwmon");
if (IS_ERR(hwmon_class)) { if (IS_ERR(hwmon_class)) {
printk(KERN_ERR "hwmon.c: couldn't create sysfs class\n"); pr_err("couldn't create sysfs class\n");
return PTR_ERR(hwmon_class); return PTR_ERR(hwmon_class);
} }
return 0; return 0;
......
drivers/hwmon/ibmaem.c
View file @ a0894881
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/ipmi.h> #include <linux/ipmi.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
...@@ -1090,7 +1092,7 @@ static int __init aem_init(void) ...@@ -1090,7 +1092,7 @@ static int __init aem_init(void)
res = driver_register(&aem_driver.driver); res = driver_register(&aem_driver.driver);
if (res) { if (res) {
printk(KERN_ERR "Can't register aem driver\n"); pr_err("Can't register aem driver\n");
return res; return res;
} }
......
drivers/hwmon/lis3lv02d.c
View file @ a0894881
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/dmi.h> #include <linux/dmi.h>
...@@ -860,8 +862,7 @@ static void lis3lv02d_8b_configure(struct lis3lv02d *dev, ...@@ -860,8 +862,7 @@ static void lis3lv02d_8b_configure(struct lis3lv02d *dev,
(p->irq_flags2 & IRQF_TRIGGER_MASK), (p->irq_flags2 & IRQF_TRIGGER_MASK),
DRIVER_NAME, &lis3_dev); DRIVER_NAME, &lis3_dev);
if (err < 0) if (err < 0)
printk(KERN_ERR DRIVER_NAME pr_err("No second IRQ. Limited functionality\n");
"No second IRQ. Limited functionality\n");
} }
} }
...@@ -879,7 +880,7 @@ int lis3lv02d_init_device(struct lis3lv02d *dev) ...@@ -879,7 +880,7 @@ int lis3lv02d_init_device(struct lis3lv02d *dev)
switch (dev->whoami) { switch (dev->whoami) {
case WAI_12B: case WAI_12B:
printk(KERN_INFO DRIVER_NAME ": 12 bits sensor found\n"); pr_info("12 bits sensor found\n");
dev->read_data = lis3lv02d_read_12; dev->read_data = lis3lv02d_read_12;
dev->mdps_max_val = 2048; dev->mdps_max_val = 2048;
dev->pwron_delay = LIS3_PWRON_DELAY_WAI_12B; dev->pwron_delay = LIS3_PWRON_DELAY_WAI_12B;
...@@ -890,7 +891,7 @@ int lis3lv02d_init_device(struct lis3lv02d *dev) ...@@ -890,7 +891,7 @@ int lis3lv02d_init_device(struct lis3lv02d *dev)
dev->regs_size = ARRAY_SIZE(lis3_wai12_regs); dev->regs_size = ARRAY_SIZE(lis3_wai12_regs);
break; break;
case WAI_8B: case WAI_8B:
printk(KERN_INFO DRIVER_NAME ": 8 bits sensor found\n"); pr_info("8 bits sensor found\n");
dev->read_data = lis3lv02d_read_8; dev->read_data = lis3lv02d_read_8;
dev->mdps_max_val = 128; dev->mdps_max_val = 128;
dev->pwron_delay = LIS3_PWRON_DELAY_WAI_8B; dev->pwron_delay = LIS3_PWRON_DELAY_WAI_8B;
...@@ -901,7 +902,7 @@ int lis3lv02d_init_device(struct lis3lv02d *dev) ...@@ -901,7 +902,7 @@ int lis3lv02d_init_device(struct lis3lv02d *dev)
dev->regs_size = ARRAY_SIZE(lis3_wai8_regs); dev->regs_size = ARRAY_SIZE(lis3_wai8_regs);
break; break;
case WAI_3DC: case WAI_3DC:
printk(KERN_INFO DRIVER_NAME ": 8 bits 3DC sensor found\n"); pr_info("8 bits 3DC sensor found\n");
dev->read_data = lis3lv02d_read_8; dev->read_data = lis3lv02d_read_8;
dev->mdps_max_val = 128; dev->mdps_max_val = 128;
dev->pwron_delay = LIS3_PWRON_DELAY_WAI_8B; dev->pwron_delay = LIS3_PWRON_DELAY_WAI_8B;
...@@ -910,8 +911,7 @@ int lis3lv02d_init_device(struct lis3lv02d *dev) ...@@ -910,8 +911,7 @@ int lis3lv02d_init_device(struct lis3lv02d *dev)
dev->scale = LIS3_SENSITIVITY_8B; dev->scale = LIS3_SENSITIVITY_8B;
break; break;
default: default:
printk(KERN_ERR DRIVER_NAME pr_err("unknown sensor type 0x%X\n", dev->whoami);
": unknown sensor type 0x%X\n", dev->whoami);
return -EINVAL; return -EINVAL;
} }
...@@ -935,7 +935,7 @@ int lis3lv02d_init_device(struct lis3lv02d *dev) ...@@ -935,7 +935,7 @@ int lis3lv02d_init_device(struct lis3lv02d *dev)
} }
if (lis3lv02d_joystick_enable()) if (lis3lv02d_joystick_enable())
printk(KERN_ERR DRIVER_NAME ": joystick initialization failed\n"); pr_err("joystick initialization failed\n");
/* passing in platform specific data is purely optional and only /* passing in platform specific data is purely optional and only
* used by the SPI transport layer at the moment */ * used by the SPI transport layer at the moment */
...@@ -957,8 +957,7 @@ int lis3lv02d_init_device(struct lis3lv02d *dev) ...@@ -957,8 +957,7 @@ int lis3lv02d_init_device(struct lis3lv02d *dev)
/* bail if we did not get an IRQ from the bus layer */ /* bail if we did not get an IRQ from the bus layer */
if (!dev->irq) { if (!dev->irq) {
printk(KERN_ERR DRIVER_NAME pr_err("No IRQ. Disabling /dev/freefall\n");
": No IRQ. Disabling /dev/freefall\n");
goto out; goto out;
} }
...@@ -985,12 +984,12 @@ int lis3lv02d_init_device(struct lis3lv02d *dev) ...@@ -985,12 +984,12 @@ int lis3lv02d_init_device(struct lis3lv02d *dev)
DRIVER_NAME, &lis3_dev); DRIVER_NAME, &lis3_dev);
if (err < 0) { if (err < 0) {
printk(KERN_ERR DRIVER_NAME "Cannot get IRQ\n"); pr_err("Cannot get IRQ\n");
goto out; goto out;
} }
if (misc_register(&lis3lv02d_misc_device)) if (misc_register(&lis3lv02d_misc_device))
printk(KERN_ERR DRIVER_NAME ": misc_register failed\n"); pr_err("misc_register failed\n");
out: out:
return 0; return 0;
} }
......
drivers/hwmon/lm70.c
View file @ a0894881
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
...@@ -67,8 +69,7 @@ static ssize_t lm70_sense_temp(struct device *dev, ...@@ -67,8 +69,7 @@ static ssize_t lm70_sense_temp(struct device *dev,
*/ */
status = spi_write_then_read(spi, NULL, 0, &rxbuf[0], 2); status = spi_write_then_read(spi, NULL, 0, &rxbuf[0], 2);
if (status < 0) { if (status < 0) {
printk(KERN_WARNING pr_warn("spi_write_then_read failed with status %d\n", status);
"spi_write_then_read failed with status %d\n", status);
goto out; goto out;
} }
raw = (rxbuf[0] << 8) + rxbuf[1]; raw = (rxbuf[0] << 8) + rxbuf[1];
......
drivers/hwmon/lm95241.c
View file @ a0894881
/* /*
* lm95241.c - Part of lm_sensors, Linux kernel modules for hardware * Copyright (C) 2008, 2010 Davide Rizzo <elpa.rizzo@gmail.com>
* monitoring
* Copyright (C) 2008 Davide Rizzo <elpa-rizzo@gmail.com>
* *
* Based on the max1619 driver. The LM95241 is a sensor chip made by National * The LM95241 is a sensor chip made by National Semiconductors.
* Semiconductors. * It reports up to three temperatures (its own plus up to two external ones).
* It reports up to three temperatures (its own plus up to * Complete datasheet can be obtained from National's website at:
* two external ones). Complete datasheet can be
* obtained from National's website at:
* http://www.national.com/ds.cgi/LM/LM95241.pdf * http://www.national.com/ds.cgi/LM/LM95241.pdf
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -36,8 +32,10 @@ ...@@ -36,8 +32,10 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/sysfs.h> #include <linux/sysfs.h>
#define DEVNAME "lm95241"
static const unsigned short normal_i2c[] = { static const unsigned short normal_i2c[] = {
0x19, 0x2a, 0x2b, I2C_CLIENT_END}; 0x19, 0x2a, 0x2b, I2C_CLIENT_END };
/* LM95241 registers */ /* LM95241 registers */
#define LM95241_REG_R_MAN_ID 0xFE #define LM95241_REG_R_MAN_ID 0xFE
...@@ -79,13 +77,14 @@ static const unsigned short normal_i2c[] = { ...@@ -79,13 +77,14 @@ static const unsigned short normal_i2c[] = {
#define MANUFACTURER_ID 0x01 #define MANUFACTURER_ID 0x01
#define DEFAULT_REVISION 0xA4 #define DEFAULT_REVISION 0xA4
/* Conversions and various macros */ static const u8 lm95241_reg_address[] = {
#define TEMP_FROM_REG(val_h, val_l) (((val_h) & 0x80 ? (val_h) - 0x100 : \ LM95241_REG_R_LOCAL_TEMPH,
(val_h)) * 1000 + (val_l) * 1000 / 256) LM95241_REG_R_LOCAL_TEMPL,
LM95241_REG_R_REMOTE1_TEMPH,
/* Functions declaration */ LM95241_REG_R_REMOTE1_TEMPL,
static void lm95241_init_client(struct i2c_client *client); LM95241_REG_R_REMOTE2_TEMPH,
static struct lm95241_data *lm95241_update_device(struct device *dev); LM95241_REG_R_REMOTE2_TEMPL
};
/* Client data (each client gets its own) */ /* Client data (each client gets its own) */
struct lm95241_data { struct lm95241_data {
...@@ -94,220 +93,230 @@ struct lm95241_data { ...@@ -94,220 +93,230 @@ struct lm95241_data {
unsigned long last_updated, interval; /* in jiffies */ unsigned long last_updated, interval; /* in jiffies */
char valid; /* zero until following fields are valid */ char valid; /* zero until following fields are valid */
/* registers values */ /* registers values */
u8 local_h, local_l; /* local */ u8 temp[ARRAY_SIZE(lm95241_reg_address)];
u8 remote1_h, remote1_l; /* remote1 */
u8 remote2_h, remote2_l; /* remote2 */
u8 config, model, trutherm; u8 config, model, trutherm;
}; };
/* Sysfs stuff */ /* Conversions */
#define show_temp(value) \ static int TempFromReg(u8 val_h, u8 val_l)
static ssize_t show_##value(struct device *dev, \ {
struct device_attribute *attr, char *buf) \ if (val_h & 0x80)
{ \ return val_h - 0x100;
struct lm95241_data *data = lm95241_update_device(dev); \ return val_h * 1000 + val_l * 1000 / 256;
snprintf(buf, PAGE_SIZE - 1, "%d\n", \
TEMP_FROM_REG(data->value##_h, data->value##_l)); \
return strlen(buf); \
} }
show_temp(local);
show_temp(remote1);
show_temp(remote2);
static ssize_t show_interval(struct device *dev, struct device_attribute *attr, static struct lm95241_data *lm95241_update_device(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
struct lm95241_data *data = i2c_get_clientdata(client);
mutex_lock(&data->update_lock);
if (time_after(jiffies, data->last_updated + data->interval) ||
!data->valid) {
int i;
dev_dbg(&client->dev, "Updating lm95241 data.\n");
for (i = 0; i < ARRAY_SIZE(lm95241_reg_address); i++)
data->temp[i]
= i2c_smbus_read_byte_data(client,
lm95241_reg_address[i]);
data->last_updated = jiffies;
data->valid = 1;
}
mutex_unlock(&data->update_lock);
return data;
}
/* Sysfs stuff */
static ssize_t show_input(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct lm95241_data *data = lm95241_update_device(dev); struct lm95241_data *data = lm95241_update_device(dev);
snprintf(buf, PAGE_SIZE - 1, "%lu\n", 1000 * data->interval / HZ); return snprintf(buf, PAGE_SIZE - 1, "%d\n",
return strlen(buf); TempFromReg(data->temp[to_sensor_dev_attr(attr)->index],
data->temp[to_sensor_dev_attr(attr)->index + 1]));
} }
static ssize_t set_interval(struct device *dev, struct device_attribute *attr, static ssize_t show_type(struct device *dev, struct device_attribute *attr,
char *buf)
{
struct i2c_client *client = to_i2c_client(dev);
struct lm95241_data *data = i2c_get_clientdata(client);
return snprintf(buf, PAGE_SIZE - 1,
data->model & to_sensor_dev_attr(attr)->index ? "1\n" : "2\n");
}
static ssize_t set_type(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct lm95241_data *data = i2c_get_clientdata(client); struct lm95241_data *data = i2c_get_clientdata(client);
unsigned long val; unsigned long val;
int shift;
u8 mask = to_sensor_dev_attr(attr)->index;
if (strict_strtoul(buf, 10, &val) < 0) if (strict_strtoul(buf, 10, &val) < 0)
return -EINVAL; return -EINVAL;
if (val != 1 && val != 2)
return -EINVAL;
data->interval = val * HZ / 1000; shift = mask == R1MS_MASK ? TT1_SHIFT : TT2_SHIFT;
mutex_lock(&data->update_lock);
data->trutherm &= ~(TT_MASK << shift);
if (val == 1) {
data->model |= mask;
data->trutherm |= (TT_ON << shift);
} else {
data->model &= ~mask;
data->trutherm |= (TT_OFF << shift);
}
data->valid = 0;
i2c_smbus_write_byte_data(client, LM95241_REG_RW_REMOTE_MODEL,
data->model);
i2c_smbus_write_byte_data(client, LM95241_REG_RW_TRUTHERM,
data->trutherm);
mutex_unlock(&data->update_lock);
return count; return count;
} }
#define show_type(flag) \ static ssize_t show_min(struct device *dev, struct device_attribute *attr,
static ssize_t show_type##flag(struct device *dev, \ char *buf)
struct device_attribute *attr, char *buf) \ {
{ \ struct i2c_client *client = to_i2c_client(dev);
struct i2c_client *client = to_i2c_client(dev); \ struct lm95241_data *data = i2c_get_clientdata(client);
struct lm95241_data *data = i2c_get_clientdata(client); \
\ return snprintf(buf, PAGE_SIZE - 1,
snprintf(buf, PAGE_SIZE - 1, \ data->config & to_sensor_dev_attr(attr)->index ?
data->model & R##flag##MS_MASK ? "1\n" : "2\n"); \ "-127000\n" : "0\n");
return strlen(buf); \
} }
show_type(1);
show_type(2); static ssize_t set_min(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
#define show_min(flag) \ {
static ssize_t show_min##flag(struct device *dev, \ struct i2c_client *client = to_i2c_client(dev);
struct device_attribute *attr, char *buf) \ struct lm95241_data *data = i2c_get_clientdata(client);
{ \ long val;
struct i2c_client *client = to_i2c_client(dev); \
struct lm95241_data *data = i2c_get_clientdata(client); \ if (strict_strtol(buf, 10, &val) < 0)
\ return -EINVAL;
snprintf(buf, PAGE_SIZE - 1, \ if (val < -128000)
data->config & R##flag##DF_MASK ? \ return -EINVAL;
"-127000\n" : "0\n"); \
return strlen(buf); \ mutex_lock(&data->update_lock);
if (val < 0)
data->config |= to_sensor_dev_attr(attr)->index;
else
data->config &= ~to_sensor_dev_attr(attr)->index;
data->valid = 0;
i2c_smbus_write_byte_data(client, LM95241_REG_RW_CONFIG, data->config);
mutex_unlock(&data->update_lock);
return count;
} }
show_min(1);
show_min(2); static ssize_t show_max(struct device *dev, struct device_attribute *attr,
char *buf)
#define show_max(flag) \ {
static ssize_t show_max##flag(struct device *dev, \ struct i2c_client *client = to_i2c_client(dev);
struct device_attribute *attr, char *buf) \ struct lm95241_data *data = i2c_get_clientdata(client);
{ \
struct i2c_client *client = to_i2c_client(dev); \ return snprintf(buf, PAGE_SIZE - 1,
struct lm95241_data *data = i2c_get_clientdata(client); \ data->config & to_sensor_dev_attr(attr)->index ?
\ "127000\n" : "255000\n");
snprintf(buf, PAGE_SIZE - 1, \
data->config & R##flag##DF_MASK ? \
"127000\n" : "255000\n"); \
return strlen(buf); \
} }
show_max(1);
show_max(2); static ssize_t set_max(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
#define set_type(flag) \ {
static ssize_t set_type##flag(struct device *dev, \ struct i2c_client *client = to_i2c_client(dev);
struct device_attribute *attr, \ struct lm95241_data *data = i2c_get_clientdata(client);
const char *buf, size_t count) \ long val;
{ \
struct i2c_client *client = to_i2c_client(dev); \ if (strict_strtol(buf, 10, &val) < 0)
struct lm95241_data *data = i2c_get_clientdata(client); \ return -EINVAL;
\ if (val >= 256000)
long val; \ return -EINVAL;
\
if (strict_strtol(buf, 10, &val) < 0) \ mutex_lock(&data->update_lock);
return -EINVAL; \
\ if (val <= 127000)
if ((val == 1) || (val == 2)) { \ data->config |= to_sensor_dev_attr(attr)->index;
\ else
mutex_lock(&data->update_lock); \ data->config &= ~to_sensor_dev_attr(attr)->index;
\ data->valid = 0;
data->trutherm &= ~(TT_MASK << TT##flag##_SHIFT); \
if (val == 1) { \ i2c_smbus_write_byte_data(client, LM95241_REG_RW_CONFIG, data->config);
data->model |= R##flag##MS_MASK; \
data->trutherm |= (TT_ON << TT##flag##_SHIFT); \ mutex_unlock(&data->update_lock);
} \
else { \ return count;
data->model &= ~R##flag##MS_MASK; \
data->trutherm |= (TT_OFF << TT##flag##_SHIFT); \
} \
\
data->valid = 0; \
\
i2c_smbus_write_byte_data(client, LM95241_REG_RW_REMOTE_MODEL, \
data->model); \
i2c_smbus_write_byte_data(client, LM95241_REG_RW_TRUTHERM, \
data->trutherm); \
\
mutex_unlock(&data->update_lock); \
\
} \
return count; \
} }
set_type(1);
set_type(2); static ssize_t show_interval(struct device *dev, struct device_attribute *attr,
char *buf)
#define set_min(flag) \ {
static ssize_t set_min##flag(struct device *dev, \ struct lm95241_data *data = lm95241_update_device(dev);
struct device_attribute *devattr, const char *buf, size_t count) \
{ \ return snprintf(buf, PAGE_SIZE - 1, "%lu\n", 1000 * data->interval
struct i2c_client *client = to_i2c_client(dev); \ / HZ);
struct lm95241_data *data = i2c_get_clientdata(client); \
\
long val; \
\
if (strict_strtol(buf, 10, &val) < 0) \
return -EINVAL;\
\
mutex_lock(&data->update_lock); \
\
if (val < 0) \
data->config |= R##flag##DF_MASK; \
else \
data->config &= ~R##flag##DF_MASK; \
\
data->valid = 0; \
\
i2c_smbus_write_byte_data(client, LM95241_REG_RW_CONFIG, \
data->config); \
\
mutex_unlock(&data->update_lock); \
\
return count; \
} }
set_min(1);
set_min(2); static ssize_t set_interval(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
#define set_max(flag) \ {
static ssize_t set_max##flag(struct device *dev, \ struct i2c_client *client = to_i2c_client(dev);
struct device_attribute *devattr, const char *buf, size_t count) \ struct lm95241_data *data = i2c_get_clientdata(client);
{ \ unsigned long val;
struct i2c_client *client = to_i2c_client(dev); \
struct lm95241_data *data = i2c_get_clientdata(client); \ if (strict_strtoul(buf, 10, &val) < 0)
\ return -EINVAL;
long val; \
\ data->interval = val * HZ / 1000;
if (strict_strtol(buf, 10, &val) < 0) \
return -EINVAL; \ return count;
\
mutex_lock(&data->update_lock); \
\
if (val <= 127000) \
data->config |= R##flag##DF_MASK; \
else \
data->config &= ~R##flag##DF_MASK; \
\
data->valid = 0; \
\
i2c_smbus_write_byte_data(client, LM95241_REG_RW_CONFIG, \
data->config); \
\
mutex_unlock(&data->update_lock); \
\
return count; \
} }
set_max(1);
set_max(2); static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_input, NULL, 0);
static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_input, NULL, 2);
static DEVICE_ATTR(temp1_input, S_IRUGO, show_local, NULL); static SENSOR_DEVICE_ATTR(temp3_input, S_IRUGO, show_input, NULL, 4);
static DEVICE_ATTR(temp2_input, S_IRUGO, show_remote1, NULL); static SENSOR_DEVICE_ATTR(temp2_type, S_IWUSR | S_IRUGO, show_type, set_type,
static DEVICE_ATTR(temp3_input, S_IRUGO, show_remote2, NULL); R1MS_MASK);
static DEVICE_ATTR(temp2_type, S_IWUSR | S_IRUGO, show_type1, set_type1); static SENSOR_DEVICE_ATTR(temp3_type, S_IWUSR | S_IRUGO, show_type, set_type,
static DEVICE_ATTR(temp3_type, S_IWUSR | S_IRUGO, show_type2, set_type2); R2MS_MASK);
static DEVICE_ATTR(temp2_min, S_IWUSR | S_IRUGO, show_min1, set_min1); static SENSOR_DEVICE_ATTR(temp2_min, S_IWUSR | S_IRUGO, show_min, set_min,
static DEVICE_ATTR(temp3_min, S_IWUSR | S_IRUGO, show_min2, set_min2); R1DF_MASK);
static DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_max1, set_max1); static SENSOR_DEVICE_ATTR(temp3_min, S_IWUSR | S_IRUGO, show_min, set_min,
static DEVICE_ATTR(temp3_max, S_IWUSR | S_IRUGO, show_max2, set_max2); R2DF_MASK);
static SENSOR_DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_max, set_max,
R1DF_MASK);
static SENSOR_DEVICE_ATTR(temp3_max, S_IWUSR | S_IRUGO, show_max, set_max,
R2DF_MASK);
static DEVICE_ATTR(update_interval, S_IWUSR | S_IRUGO, show_interval, static DEVICE_ATTR(update_interval, S_IWUSR | S_IRUGO, show_interval,
set_interval); set_interval);
static struct attribute *lm95241_attributes[] = { static struct attribute *lm95241_attributes[] = {
&dev_attr_temp1_input.attr, &sensor_dev_attr_temp1_input.dev_attr.attr,
&dev_attr_temp2_input.attr, &sensor_dev_attr_temp2_input.dev_attr.attr,
&dev_attr_temp3_input.attr, &sensor_dev_attr_temp3_input.dev_attr.attr,
&dev_attr_temp2_type.attr, &sensor_dev_attr_temp2_type.dev_attr.attr,
&dev_attr_temp3_type.attr, &sensor_dev_attr_temp3_type.dev_attr.attr,
&dev_attr_temp2_min.attr, &sensor_dev_attr_temp2_min.dev_attr.attr,
&dev_attr_temp3_min.attr, &sensor_dev_attr_temp3_min.dev_attr.attr,
&dev_attr_temp2_max.attr, &sensor_dev_attr_temp2_max.dev_attr.attr,
&dev_attr_temp3_max.attr, &sensor_dev_attr_temp3_max.dev_attr.attr,
&dev_attr_update_interval.attr, &dev_attr_update_interval.attr,
NULL NULL
}; };
...@@ -331,7 +340,7 @@ static int lm95241_detect(struct i2c_client *new_client, ...@@ -331,7 +340,7 @@ static int lm95241_detect(struct i2c_client *new_client,
== MANUFACTURER_ID) == MANUFACTURER_ID)
&& (i2c_smbus_read_byte_data(new_client, LM95241_REG_R_CHIP_ID) && (i2c_smbus_read_byte_data(new_client, LM95241_REG_R_CHIP_ID)
>= DEFAULT_REVISION)) { >= DEFAULT_REVISION)) {
name = "lm95241"; name = DEVNAME;
} else { } else {
dev_dbg(&adapter->dev, "LM95241 detection failed at 0x%02x\n", dev_dbg(&adapter->dev, "LM95241 detection failed at 0x%02x\n",
address); address);
...@@ -343,6 +352,25 @@ static int lm95241_detect(struct i2c_client *new_client, ...@@ -343,6 +352,25 @@ static int lm95241_detect(struct i2c_client *new_client,
return 0; return 0;
} }
static void lm95241_init_client(struct i2c_client *client)
{
struct lm95241_data *data = i2c_get_clientdata(client);
data->interval = HZ; /* 1 sec default */
data->valid = 0;
data->config = CFG_CR0076;
data->model = 0;
data->trutherm = (TT_OFF << TT1_SHIFT) | (TT_OFF << TT2_SHIFT);
i2c_smbus_write_byte_data(client, LM95241_REG_RW_CONFIG, data->config);
i2c_smbus_write_byte_data(client, LM95241_REG_RW_REM_FILTER,
R1FE_MASK | R2FE_MASK);
i2c_smbus_write_byte_data(client, LM95241_REG_RW_TRUTHERM,
data->trutherm);
i2c_smbus_write_byte_data(client, LM95241_REG_RW_REMOTE_MODEL,
data->model);
}
static int lm95241_probe(struct i2c_client *new_client, static int lm95241_probe(struct i2c_client *new_client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
...@@ -382,26 +410,6 @@ static int lm95241_probe(struct i2c_client *new_client, ...@@ -382,26 +410,6 @@ static int lm95241_probe(struct i2c_client *new_client,
return err; return err;
} }
static void lm95241_init_client(struct i2c_client *client)
{
struct lm95241_data *data = i2c_get_clientdata(client);
data->interval = HZ; /* 1 sec default */
data->valid = 0;
data->config = CFG_CR0076;
data->model = 0;
data->trutherm = (TT_OFF << TT1_SHIFT) | (TT_OFF << TT2_SHIFT);
i2c_smbus_write_byte_data(client, LM95241_REG_RW_CONFIG,
data->config);
i2c_smbus_write_byte_data(client, LM95241_REG_RW_REM_FILTER,
R1FE_MASK | R2FE_MASK);
i2c_smbus_write_byte_data(client, LM95241_REG_RW_TRUTHERM,
data->trutherm);
i2c_smbus_write_byte_data(client, LM95241_REG_RW_REMOTE_MODEL,
data->model);
}
static int lm95241_remove(struct i2c_client *client) static int lm95241_remove(struct i2c_client *client)
{ {
struct lm95241_data *data = i2c_get_clientdata(client); struct lm95241_data *data = i2c_get_clientdata(client);
...@@ -413,46 +421,9 @@ static int lm95241_remove(struct i2c_client *client) ...@@ -413,46 +421,9 @@ static int lm95241_remove(struct i2c_client *client)
return 0; return 0;
} }
static struct lm95241_data *lm95241_update_device(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
struct lm95241_data *data = i2c_get_clientdata(client);
mutex_lock(&data->update_lock);
if (time_after(jiffies, data->last_updated + data->interval) ||
!data->valid) {
dev_dbg(&client->dev, "Updating lm95241 data.\n");
data->local_h =
i2c_smbus_read_byte_data(client,
LM95241_REG_R_LOCAL_TEMPH);
data->local_l =
i2c_smbus_read_byte_data(client,
LM95241_REG_R_LOCAL_TEMPL);
data->remote1_h =
i2c_smbus_read_byte_data(client,
LM95241_REG_R_REMOTE1_TEMPH);
data->remote1_l =
i2c_smbus_read_byte_data(client,
LM95241_REG_R_REMOTE1_TEMPL);
data->remote2_h =
i2c_smbus_read_byte_data(client,
LM95241_REG_R_REMOTE2_TEMPH);
data->remote2_l =
i2c_smbus_read_byte_data(client,
LM95241_REG_R_REMOTE2_TEMPL);
data->last_updated = jiffies;
data->valid = 1;
}
mutex_unlock(&data->update_lock);
return data;
}
/* Driver data (common to all clients) */ /* Driver data (common to all clients) */
static const struct i2c_device_id lm95241_id[] = { static const struct i2c_device_id lm95241_id[] = {
{ "lm95241", 0 }, { DEVNAME, 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, lm95241_id); MODULE_DEVICE_TABLE(i2c, lm95241_id);
...@@ -460,7 +431,7 @@ MODULE_DEVICE_TABLE(i2c, lm95241_id); ...@@ -460,7 +431,7 @@ MODULE_DEVICE_TABLE(i2c, lm95241_id);
static struct i2c_driver lm95241_driver = { static struct i2c_driver lm95241_driver = {
.class = I2C_CLASS_HWMON, .class = I2C_CLASS_HWMON,
.driver = { .driver = {
.name = "lm95241", .name = DEVNAME,
}, },
.probe = lm95241_probe, .probe = lm95241_probe,
.remove = lm95241_remove, .remove = lm95241_remove,
...@@ -479,7 +450,7 @@ static void __exit sensors_lm95241_exit(void) ...@@ -479,7 +450,7 @@ static void __exit sensors_lm95241_exit(void)
i2c_del_driver(&lm95241_driver); i2c_del_driver(&lm95241_driver);
} }
MODULE_AUTHOR("Davide Rizzo <elpa-rizzo@gmail.com>"); MODULE_AUTHOR("Davide Rizzo <elpa.rizzo@gmail.com>");
MODULE_DESCRIPTION("LM95241 sensor driver"); MODULE_DESCRIPTION("LM95241 sensor driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
drivers/hwmon/pcf8591.c
View file @ a0894881
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -290,8 +292,7 @@ static struct i2c_driver pcf8591_driver = { ...@@ -290,8 +292,7 @@ static struct i2c_driver pcf8591_driver = {
static int __init pcf8591_init(void) static int __init pcf8591_init(void)
{ {
if (input_mode < 0 || input_mode > 3) { if (input_mode < 0 || input_mode > 3) {
printk(KERN_WARNING "pcf8591: invalid input_mode (%d)\n", pr_warn("invalid input_mode (%d)\n", input_mode);
input_mode);
input_mode = 0; input_mode = 0;
} }
return i2c_add_driver(&pcf8591_driver); return i2c_add_driver(&pcf8591_driver);
......
drivers/hwmon/pkgtemp.c
View file @ a0894881
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
* 02110-1301 USA. * 02110-1301 USA.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -303,7 +305,7 @@ static int __cpuinit pkgtemp_device_add(unsigned int cpu) ...@@ -303,7 +305,7 @@ static int __cpuinit pkgtemp_device_add(unsigned int cpu)
pdev = platform_device_alloc(DRVNAME, cpu); pdev = platform_device_alloc(DRVNAME, cpu);
if (!pdev) { if (!pdev) {
err = -ENOMEM; err = -ENOMEM;
printk(KERN_ERR DRVNAME ": Device allocation failed\n"); pr_err("Device allocation failed\n");
goto exit; goto exit;
} }
...@@ -315,8 +317,7 @@ static int __cpuinit pkgtemp_device_add(unsigned int cpu) ...@@ -315,8 +317,7 @@ static int __cpuinit pkgtemp_device_add(unsigned int cpu)
err = platform_device_add(pdev); err = platform_device_add(pdev);
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n", pr_err("Device addition failed (%d)\n", err);
err);
goto exit_device_free; goto exit_device_free;
} }
......
drivers/hwmon/sht21.c 0 → 100644
View file @ a0894881
/* Sensirion SHT21 humidity and temperature sensor driver
*
* Copyright (C) 2010 Urs Fleisch <urs.fleisch@sensirion.com>
*
* 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA
*
* Data sheet available (5/2010) at
* http://www.sensirion.com/en/pdf/product_information/Datasheet-humidity-sensor-SHT21.pdf
*/
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
#include <linux/err.h>
#include <linux/mutex.h>
#include <linux/device.h>
/* I2C command bytes */
#define SHT21_TRIG_T_MEASUREMENT_HM 0xe3
#define SHT21_TRIG_RH_MEASUREMENT_HM 0xe5
/**
* struct sht21 - SHT21 device specific data
* @hwmon_dev: device registered with hwmon
* @lock: mutex to protect measurement values
* @valid: only 0 before first measurement is taken
* @last_update: time of last update (jiffies)
* @temperature: cached temperature measurement value
* @humidity: cached humidity measurement value
*/
struct sht21 {
struct device *hwmon_dev;
struct mutex lock;
char valid;
unsigned long last_update;
int temperature;
int humidity;
};
/**
* sht21_temp_ticks_to_millicelsius() - convert raw temperature ticks to
* milli celsius
* @ticks: temperature ticks value received from sensor
*/
static inline int sht21_temp_ticks_to_millicelsius(int ticks)
{
ticks &= ~0x0003; /* clear status bits */
/*
* Formula T = -46.85 + 175.72 * ST / 2^16 from data sheet 6.2,
* optimized for integer fixed point (3 digits) arithmetic
*/
return ((21965 * ticks) >> 13) - 46850;
}
/**
* sht21_rh_ticks_to_per_cent_mille() - convert raw humidity ticks to
* one-thousandths of a percent relative humidity
* @ticks: humidity ticks value received from sensor
*/
static inline int sht21_rh_ticks_to_per_cent_mille(int ticks)
{
ticks &= ~0x0003; /* clear status bits */
/*
* Formula RH = -6 + 125 * SRH / 2^16 from data sheet 6.1,
* optimized for integer fixed point (3 digits) arithmetic
*/
return ((15625 * ticks) >> 13) - 6000;
}
/**
* sht21_read_word_data() - read word from register
* @client: I2C client device
* @reg: I2C command byte
*
* Returns value, negative errno on error.
*/
static inline int sht21_read_word_data(struct i2c_client *client, u8 reg)
{
int ret = i2c_smbus_read_word_data(client, reg);
if (ret < 0)
return ret;
/*
* SMBus specifies low byte first, but the SHT21 returns MSB
* first, so we have to swab16 the values
*/
return swab16(ret);
}
/**
* sht21_update_measurements() - get updated measurements from device
* @client: I2C client device
*
* Returns 0 on success, else negative errno.
*/
static int sht21_update_measurements(struct i2c_client *client)
{
int ret = 0;
struct sht21 *sht21 = i2c_get_clientdata(client);
mutex_lock(&sht21->lock);
/*
* Data sheet 2.4:
* SHT2x should not be active for more than 10% of the time - e.g.
* maximum two measurements per second at 12bit accuracy shall be made.
*/
if (time_after(jiffies, sht21->last_update + HZ / 2) || !sht21->valid) {
ret = sht21_read_word_data(client, SHT21_TRIG_T_MEASUREMENT_HM);
if (ret < 0)
goto out;
sht21->temperature = sht21_temp_ticks_to_millicelsius(ret);
ret = sht21_read_word_data(client,
SHT21_TRIG_RH_MEASUREMENT_HM);
if (ret < 0)
goto out;
sht21->humidity = sht21_rh_ticks_to_per_cent_mille(ret);
sht21->last_update = jiffies;
sht21->valid = 1;
}
out:
mutex_unlock(&sht21->lock);
return ret >= 0 ? 0 : ret;
}
/**
* sht21_show_temperature() - show temperature measurement value in sysfs
* @dev: device
* @attr: device attribute
* @buf: sysfs buffer (PAGE_SIZE) where measurement values are written to
*
* Will be called on read access to temp1_input sysfs attribute.
* Returns number of bytes written into buffer, negative errno on error.
*/
static ssize_t sht21_show_temperature(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct i2c_client *client = to_i2c_client(dev);
struct sht21 *sht21 = i2c_get_clientdata(client);
int ret = sht21_update_measurements(client);
if (ret < 0)
return ret;
return sprintf(buf, "%d\n", sht21->temperature);
}
/**
* sht21_show_humidity() - show humidity measurement value in sysfs
* @dev: device
* @attr: device attribute
* @buf: sysfs buffer (PAGE_SIZE) where measurement values are written to
*
* Will be called on read access to humidity1_input sysfs attribute.
* Returns number of bytes written into buffer, negative errno on error.
*/
static ssize_t sht21_show_humidity(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct i2c_client *client = to_i2c_client(dev);
struct sht21 *sht21 = i2c_get_clientdata(client);
int ret = sht21_update_measurements(client);
if (ret < 0)
return ret;
return sprintf(buf, "%d\n", sht21->humidity);
}
/* sysfs attributes */
static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, sht21_show_temperature,
NULL, 0);
static SENSOR_DEVICE_ATTR(humidity1_input, S_IRUGO, sht21_show_humidity,
NULL, 0);
static struct attribute *sht21_attributes[] = {
&sensor_dev_attr_temp1_input.dev_attr.attr,
&sensor_dev_attr_humidity1_input.dev_attr.attr,
NULL
};
static const struct attribute_group sht21_attr_group = {
.attrs = sht21_attributes,
};
/**
* sht21_probe() - probe device
* @client: I2C client device
* @id: device ID
*
* Called by the I2C core when an entry in the ID table matches a
* device's name.
* Returns 0 on success.
*/
static int __devinit sht21_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct sht21 *sht21;
int err;
if (!i2c_check_functionality(client->adapter,
I2C_FUNC_SMBUS_WORD_DATA)) {
dev_err(&client->dev,
"adapter does not support SMBus word transactions\n");
return -ENODEV;
}
sht21 = kzalloc(sizeof(*sht21), GFP_KERNEL);
if (!sht21) {
dev_dbg(&client->dev, "kzalloc failed\n");
return -ENOMEM;
}
i2c_set_clientdata(client, sht21);
mutex_init(&sht21->lock);
err = sysfs_create_group(&client->dev.kobj, &sht21_attr_group);
if (err) {
dev_dbg(&client->dev, "could not create sysfs files\n");
goto fail_free;
}
sht21->hwmon_dev = hwmon_device_register(&client->dev);
if (IS_ERR(sht21->hwmon_dev)) {
dev_dbg(&client->dev, "unable to register hwmon device\n");
err = PTR_ERR(sht21->hwmon_dev);
goto fail_remove_sysfs;
}
dev_info(&client->dev, "initialized\n");
return 0;
fail_remove_sysfs:
sysfs_remove_group(&client->dev.kobj, &sht21_attr_group);
fail_free:
kfree(sht21);
return err;
}
/**
* sht21_remove() - remove device
* @client: I2C client device
*/
static int __devexit sht21_remove(struct i2c_client *client)
{
struct sht21 *sht21 = i2c_get_clientdata(client);
hwmon_device_unregister(sht21->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &sht21_attr_group);
kfree(sht21);
return 0;
}
/* Device ID table */
static const struct i2c_device_id sht21_id[] = {
{ "sht21", 0 },
{ }
};
MODULE_DEVICE_TABLE(i2c, sht21_id);
static struct i2c_driver sht21_driver = {
.driver.name = "sht21",
.probe = sht21_probe,
.remove = __devexit_p(sht21_remove),
.id_table = sht21_id,
};
/**
* sht21_init() - initialize driver
*
* Called when kernel is booted or module is inserted.
* Returns 0 on success.
*/
static int __init sht21_init(void)
{
return i2c_add_driver(&sht21_driver);
}
module_init(sht21_init);
/**
* sht21_init() - clean up driver
*
* Called when module is removed.
*/
static void __exit sht21_exit(void)
{
i2c_del_driver(&sht21_driver);
}
module_exit(sht21_exit);
MODULE_AUTHOR("Urs Fleisch <urs.fleisch@sensirion.com>");
MODULE_DESCRIPTION("Sensirion SHT21 humidity and temperature sensor driver");
MODULE_LICENSE("GPL");
drivers/hwmon/sis5595.c
View file @ a0894881
...@@ -50,6 +50,8 @@ ...@@ -50,6 +50,8 @@
735 0008 0735 735 0008 0735
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/ioport.h> #include <linux/ioport.h>
...@@ -735,21 +737,19 @@ static int __devinit sis5595_device_add(unsigned short address) ...@@ -735,21 +737,19 @@ static int __devinit sis5595_device_add(unsigned short address)
pdev = platform_device_alloc("sis5595", address); pdev = platform_device_alloc("sis5595", address);
if (!pdev) { if (!pdev) {
err = -ENOMEM; err = -ENOMEM;
printk(KERN_ERR "sis5595: Device allocation failed\n"); pr_err("Device allocation failed\n");
goto exit; goto exit;
} }
err = platform_device_add_resources(pdev, &res, 1); err = platform_device_add_resources(pdev, &res, 1);
if (err) { if (err) {
printk(KERN_ERR "sis5595: Device resource addition failed " pr_err("Device resource addition failed (%d)\n", err);
"(%d)\n", err);
goto exit_device_put; goto exit_device_put;
} }
err = platform_device_add(pdev); err = platform_device_add(pdev);
if (err) { if (err) {
printk(KERN_ERR "sis5595: Device addition failed (%d)\n", pr_err("Device addition failed (%d)\n", err);
err);
goto exit_device_put; goto exit_device_put;
} }
......
drivers/hwmon/smsc47b397.c
View file @ a0894881
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/ioport.h> #include <linux/ioport.h>
...@@ -311,21 +313,19 @@ static int __init smsc47b397_device_add(unsigned short address) ...@@ -311,21 +313,19 @@ static int __init smsc47b397_device_add(unsigned short address)
pdev = platform_device_alloc(DRVNAME, address); pdev = platform_device_alloc(DRVNAME, address);
if (!pdev) { if (!pdev) {
err = -ENOMEM; err = -ENOMEM;
printk(KERN_ERR DRVNAME ": Device allocation failed\n"); pr_err("Device allocation failed\n");
goto exit; goto exit;
} }
err = platform_device_add_resources(pdev, &res, 1); err = platform_device_add_resources(pdev, &res, 1);
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Device resource addition failed " pr_err("Device resource addition failed (%d)\n", err);
"(%d)\n", err);
goto exit_device_put; goto exit_device_put;
} }
err = platform_device_add(pdev); err = platform_device_add(pdev);
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n", pr_err("Device addition failed (%d)\n", err);
err);
goto exit_device_put; goto exit_device_put;
} }
...@@ -367,8 +367,7 @@ static int __init smsc47b397_find(unsigned short *addr) ...@@ -367,8 +367,7 @@ static int __init smsc47b397_find(unsigned short *addr)
*addr = (superio_inb(SUPERIO_REG_BASE_MSB) << 8) *addr = (superio_inb(SUPERIO_REG_BASE_MSB) << 8)
| superio_inb(SUPERIO_REG_BASE_LSB); | superio_inb(SUPERIO_REG_BASE_LSB);
printk(KERN_INFO DRVNAME ": found SMSC %s " pr_info("found SMSC %s (base address 0x%04x, revision %u)\n",
"(base address 0x%04x, revision %u)\n",
name, *addr, rev); name, *addr, rev);
superio_exit(); superio_exit();
......
drivers/hwmon/smsc47m1.c
View file @ a0894881
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/ioport.h> #include <linux/ioport.h>
...@@ -435,30 +437,29 @@ static int __init smsc47m1_find(unsigned short *addr, ...@@ -435,30 +437,29 @@ static int __init smsc47m1_find(unsigned short *addr,
*/ */
switch (val) { switch (val) {
case 0x51: case 0x51:
pr_info(DRVNAME ": Found SMSC LPC47B27x\n"); pr_info("Found SMSC LPC47B27x\n");
sio_data->type = smsc47m1; sio_data->type = smsc47m1;
break; break;
case 0x59: case 0x59:
pr_info(DRVNAME ": Found SMSC LPC47M10x/LPC47M112/LPC47M13x\n"); pr_info("Found SMSC LPC47M10x/LPC47M112/LPC47M13x\n");
sio_data->type = smsc47m1; sio_data->type = smsc47m1;
break; break;
case 0x5F: case 0x5F:
pr_info(DRVNAME ": Found SMSC LPC47M14x\n"); pr_info("Found SMSC LPC47M14x\n");
sio_data->type = smsc47m1; sio_data->type = smsc47m1;
break; break;
case 0x60: case 0x60:
pr_info(DRVNAME ": Found SMSC LPC47M15x/LPC47M192/LPC47M997\n"); pr_info("Found SMSC LPC47M15x/LPC47M192/LPC47M997\n");
sio_data->type = smsc47m1; sio_data->type = smsc47m1;
break; break;
case 0x6B: case 0x6B:
if (superio_inb(SUPERIO_REG_DEVREV) & 0x80) { if (superio_inb(SUPERIO_REG_DEVREV) & 0x80) {
pr_debug(DRVNAME ": " pr_debug("Found SMSC LPC47M233, unsupported\n");
"Found SMSC LPC47M233, unsupported\n");
superio_exit(); superio_exit();
return -ENODEV; return -ENODEV;
} }
pr_info(DRVNAME ": Found SMSC LPC47M292\n"); pr_info("Found SMSC LPC47M292\n");
sio_data->type = smsc47m2; sio_data->type = smsc47m2;
break; break;
default: default:
...@@ -470,7 +471,7 @@ static int __init smsc47m1_find(unsigned short *addr, ...@@ -470,7 +471,7 @@ static int __init smsc47m1_find(unsigned short *addr,
*addr = (superio_inb(SUPERIO_REG_BASE) << 8) *addr = (superio_inb(SUPERIO_REG_BASE) << 8)
| superio_inb(SUPERIO_REG_BASE + 1); | superio_inb(SUPERIO_REG_BASE + 1);
if (*addr == 0) { if (*addr == 0) {
pr_info(DRVNAME ": Device address not set, will not use\n"); pr_info("Device address not set, will not use\n");
superio_exit(); superio_exit();
return -ENODEV; return -ENODEV;
} }
...@@ -479,7 +480,7 @@ static int __init smsc47m1_find(unsigned short *addr, ...@@ -479,7 +480,7 @@ static int __init smsc47m1_find(unsigned short *addr,
* Compaq Presario S4000NX) */ * Compaq Presario S4000NX) */
sio_data->activate = superio_inb(SUPERIO_REG_ACT); sio_data->activate = superio_inb(SUPERIO_REG_ACT);
if ((sio_data->activate & 0x01) == 0) { if ((sio_data->activate & 0x01) == 0) {
pr_info(DRVNAME ": Enabling device\n"); pr_info("Enabling device\n");
superio_outb(SUPERIO_REG_ACT, sio_data->activate | 0x01); superio_outb(SUPERIO_REG_ACT, sio_data->activate | 0x01);
} }
...@@ -494,7 +495,7 @@ static void smsc47m1_restore(const struct smsc47m1_sio_data *sio_data) ...@@ -494,7 +495,7 @@ static void smsc47m1_restore(const struct smsc47m1_sio_data *sio_data)
superio_enter(); superio_enter();
superio_select(); superio_select();
pr_info(DRVNAME ": Disabling device\n"); pr_info("Disabling device\n");
superio_outb(SUPERIO_REG_ACT, sio_data->activate); superio_outb(SUPERIO_REG_ACT, sio_data->activate);
superio_exit(); superio_exit();
...@@ -823,28 +824,26 @@ static int __init smsc47m1_device_add(unsigned short address, ...@@ -823,28 +824,26 @@ static int __init smsc47m1_device_add(unsigned short address,
pdev = platform_device_alloc(DRVNAME, address); pdev = platform_device_alloc(DRVNAME, address);
if (!pdev) { if (!pdev) {
err = -ENOMEM; err = -ENOMEM;
printk(KERN_ERR DRVNAME ": Device allocation failed\n"); pr_err("Device allocation failed\n");
goto exit; goto exit;
} }
err = platform_device_add_resources(pdev, &res, 1); err = platform_device_add_resources(pdev, &res, 1);
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Device resource addition failed " pr_err("Device resource addition failed (%d)\n", err);
"(%d)\n", err);
goto exit_device_put; goto exit_device_put;
} }
err = platform_device_add_data(pdev, sio_data, err = platform_device_add_data(pdev, sio_data,
sizeof(struct smsc47m1_sio_data)); sizeof(struct smsc47m1_sio_data));
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Platform data allocation failed\n"); pr_err("Platform data allocation failed\n");
goto exit_device_put; goto exit_device_put;
} }
err = platform_device_add(pdev); err = platform_device_add(pdev);
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n", pr_err("Device addition failed (%d)\n", err);
err);
goto exit_device_put; goto exit_device_put;
} }
......
drivers/hwmon/via-cputemp.c
View file @ a0894881
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
* 02110-1301 USA. * 02110-1301 USA.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -202,7 +204,7 @@ static int __cpuinit via_cputemp_device_add(unsigned int cpu) ...@@ -202,7 +204,7 @@ static int __cpuinit via_cputemp_device_add(unsigned int cpu)
pdev = platform_device_alloc(DRVNAME, cpu); pdev = platform_device_alloc(DRVNAME, cpu);
if (!pdev) { if (!pdev) {
err = -ENOMEM; err = -ENOMEM;
printk(KERN_ERR DRVNAME ": Device allocation failed\n"); pr_err("Device allocation failed\n");
goto exit; goto exit;
} }
...@@ -214,8 +216,7 @@ static int __cpuinit via_cputemp_device_add(unsigned int cpu) ...@@ -214,8 +216,7 @@ static int __cpuinit via_cputemp_device_add(unsigned int cpu)
err = platform_device_add(pdev); err = platform_device_add(pdev);
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n", pr_err("Device addition failed (%d)\n", err);
err);
goto exit_device_free; goto exit_device_free;
} }
...@@ -237,13 +238,16 @@ static int __cpuinit via_cputemp_device_add(unsigned int cpu) ...@@ -237,13 +238,16 @@ static int __cpuinit via_cputemp_device_add(unsigned int cpu)
static void __cpuinit via_cputemp_device_remove(unsigned int cpu) static void __cpuinit via_cputemp_device_remove(unsigned int cpu)
{ {
struct pdev_entry *p, *n; struct pdev_entry *p;
mutex_lock(&pdev_list_mutex); mutex_lock(&pdev_list_mutex);
list_for_each_entry_safe(p, n, &pdev_list, list) { list_for_each_entry(p, &pdev_list, list) {
if (p->cpu == cpu) { if (p->cpu == cpu) {
platform_device_unregister(p->pdev); platform_device_unregister(p->pdev);
list_del(&p->list); list_del(&p->list);
mutex_unlock(&pdev_list_mutex);
kfree(p); kfree(p);
return;
} }
} }
mutex_unlock(&pdev_list_mutex); mutex_unlock(&pdev_list_mutex);
...@@ -273,7 +277,6 @@ static struct notifier_block via_cputemp_cpu_notifier __refdata = { ...@@ -273,7 +277,6 @@ static struct notifier_block via_cputemp_cpu_notifier __refdata = {
static int __init via_cputemp_init(void) static int __init via_cputemp_init(void)
{ {
int i, err; int i, err;
struct pdev_entry *p, *n;
if (cpu_data(0).x86_vendor != X86_VENDOR_CENTAUR) { if (cpu_data(0).x86_vendor != X86_VENDOR_CENTAUR) {
printk(KERN_DEBUG DRVNAME ": Not a VIA CPU\n"); printk(KERN_DEBUG DRVNAME ": Not a VIA CPU\n");
...@@ -295,33 +298,27 @@ static int __init via_cputemp_init(void) ...@@ -295,33 +298,27 @@ static int __init via_cputemp_init(void)
continue; continue;
if (c->x86_model > 0x0f) { if (c->x86_model > 0x0f) {
printk(KERN_WARNING DRVNAME ": Unknown CPU " pr_warn("Unknown CPU model 0x%x\n", c->x86_model);
"model 0x%x\n", c->x86_model);
continue; continue;
} }
err = via_cputemp_device_add(i); via_cputemp_device_add(i);
if (err)
goto exit_devices_unreg;
} }
#ifndef CONFIG_HOTPLUG_CPU
if (list_empty(&pdev_list)) { if (list_empty(&pdev_list)) {
err = -ENODEV; err = -ENODEV;
goto exit_driver_unreg; goto exit_driver_unreg;
} }
#endif
register_hotcpu_notifier(&via_cputemp_cpu_notifier); register_hotcpu_notifier(&via_cputemp_cpu_notifier);
return 0; return 0;
exit_devices_unreg: #ifndef CONFIG_HOTPLUG_CPU
mutex_lock(&pdev_list_mutex);
list_for_each_entry_safe(p, n, &pdev_list, list) {
platform_device_unregister(p->pdev);
list_del(&p->list);
kfree(p);
}
mutex_unlock(&pdev_list_mutex);
exit_driver_unreg: exit_driver_unreg:
platform_driver_unregister(&via_cputemp_driver); platform_driver_unregister(&via_cputemp_driver);
#endif
exit: exit:
return err; return err;
} }
......
drivers/hwmon/via686a.c
View file @ a0894881
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
Warning - only supports a single device. Warning - only supports a single device.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/pci.h> #include <linux/pci.h>
...@@ -791,21 +793,19 @@ static int __devinit via686a_device_add(unsigned short address) ...@@ -791,21 +793,19 @@ static int __devinit via686a_device_add(unsigned short address)
pdev = platform_device_alloc("via686a", address); pdev = platform_device_alloc("via686a", address);
if (!pdev) { if (!pdev) {
err = -ENOMEM; err = -ENOMEM;
printk(KERN_ERR "via686a: Device allocation failed\n"); pr_err("Device allocation failed\n");
goto exit; goto exit;
} }
err = platform_device_add_resources(pdev, &res, 1); err = platform_device_add_resources(pdev, &res, 1);
if (err) { if (err) {
printk(KERN_ERR "via686a: Device resource addition failed " pr_err("Device resource addition failed (%d)\n", err);
"(%d)\n", err);
goto exit_device_put; goto exit_device_put;
} }
err = platform_device_add(pdev); err = platform_device_add(pdev);
if (err) { if (err) {
printk(KERN_ERR "via686a: Device addition failed (%d)\n", pr_err("Device addition failed (%d)\n", err);
err);
goto exit_device_put; goto exit_device_put;
} }
......
drivers/hwmon/vt1211.c
View file @ a0894881
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -1254,8 +1256,7 @@ static int __init vt1211_device_add(unsigned short address) ...@@ -1254,8 +1256,7 @@ static int __init vt1211_device_add(unsigned short address)
pdev = platform_device_alloc(DRVNAME, address); pdev = platform_device_alloc(DRVNAME, address);
if (!pdev) { if (!pdev) {
err = -ENOMEM; err = -ENOMEM;
printk(KERN_ERR DRVNAME ": Device allocation failed (%d)\n", pr_err("Device allocation failed (%d)\n", err);
err);
goto EXIT; goto EXIT;
} }
...@@ -1266,15 +1267,13 @@ static int __init vt1211_device_add(unsigned short address) ...@@ -1266,15 +1267,13 @@ static int __init vt1211_device_add(unsigned short address)
err = platform_device_add_resources(pdev, &res, 1); err = platform_device_add_resources(pdev, &res, 1);
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Device resource addition failed " pr_err("Device resource addition failed (%d)\n", err);
"(%d)\n", err);
goto EXIT_DEV_PUT; goto EXIT_DEV_PUT;
} }
err = platform_device_add(pdev); err = platform_device_add(pdev);
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n", pr_err("Device addition failed (%d)\n", err);
err);
goto EXIT_DEV_PUT; goto EXIT_DEV_PUT;
} }
...@@ -1301,23 +1300,20 @@ static int __init vt1211_find(int sio_cip, unsigned short *address) ...@@ -1301,23 +1300,20 @@ static int __init vt1211_find(int sio_cip, unsigned short *address)
superio_select(sio_cip, SIO_VT1211_LDN_HWMON); superio_select(sio_cip, SIO_VT1211_LDN_HWMON);
if ((superio_inb(sio_cip, SIO_VT1211_ACTIVE) & 1) == 0) { if ((superio_inb(sio_cip, SIO_VT1211_ACTIVE) & 1) == 0) {
printk(KERN_WARNING DRVNAME ": HW monitor is disabled, " pr_warn("HW monitor is disabled, skipping\n");
"skipping\n");
goto EXIT; goto EXIT;
} }
*address = ((superio_inb(sio_cip, SIO_VT1211_BADDR) << 8) | *address = ((superio_inb(sio_cip, SIO_VT1211_BADDR) << 8) |
(superio_inb(sio_cip, SIO_VT1211_BADDR + 1))) & 0xff00; (superio_inb(sio_cip, SIO_VT1211_BADDR + 1))) & 0xff00;
if (*address == 0) { if (*address == 0) {
printk(KERN_WARNING DRVNAME ": Base address is not set, " pr_warn("Base address is not set, skipping\n");
"skipping\n");
goto EXIT; goto EXIT;
} }
err = 0; err = 0;
printk(KERN_INFO DRVNAME ": Found VT1211 chip at 0x%04x, " pr_info("Found VT1211 chip at 0x%04x, revision %u\n",
"revision %u\n", *address, *address, superio_inb(sio_cip, SIO_VT1211_DEVREV));
superio_inb(sio_cip, SIO_VT1211_DEVREV));
EXIT: EXIT:
superio_exit(sio_cip); superio_exit(sio_cip);
...@@ -1336,14 +1332,14 @@ static int __init vt1211_init(void) ...@@ -1336,14 +1332,14 @@ static int __init vt1211_init(void)
if ((uch_config < -1) || (uch_config > 31)) { if ((uch_config < -1) || (uch_config > 31)) {
err = -EINVAL; err = -EINVAL;
printk(KERN_WARNING DRVNAME ": Invalid UCH configuration %d. " pr_warn("Invalid UCH configuration %d. "
"Choose a value between 0 and 31.\n", uch_config); "Choose a value between 0 and 31.\n", uch_config);
goto EXIT; goto EXIT;
} }
if ((int_mode < -1) || (int_mode > 0)) { if ((int_mode < -1) || (int_mode > 0)) {
err = -EINVAL; err = -EINVAL;
printk(KERN_WARNING DRVNAME ": Invalid interrupt mode %d. " pr_warn("Invalid interrupt mode %d. "
"Only mode 0 is supported.\n", int_mode); "Only mode 0 is supported.\n", int_mode);
goto EXIT; goto EXIT;
} }
......
drivers/hwmon/vt8231.c
View file @ a0894881
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
/* Supports VIA VT8231 South Bridge embedded sensors /* Supports VIA VT8231 South Bridge embedded sensors
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -902,21 +904,19 @@ static int __devinit vt8231_device_add(unsigned short address) ...@@ -902,21 +904,19 @@ static int __devinit vt8231_device_add(unsigned short address)
pdev = platform_device_alloc("vt8231", address); pdev = platform_device_alloc("vt8231", address);
if (!pdev) { if (!pdev) {
err = -ENOMEM; err = -ENOMEM;
printk(KERN_ERR "vt8231: Device allocation failed\n"); pr_err("Device allocation failed\n");
goto exit; goto exit;
} }
err = platform_device_add_resources(pdev, &res, 1); err = platform_device_add_resources(pdev, &res, 1);
if (err) { if (err) {
printk(KERN_ERR "vt8231: Device resource addition failed " pr_err("Device resource addition failed (%d)\n", err);
"(%d)\n", err);
goto exit_device_put; goto exit_device_put;
} }
err = platform_device_add(pdev); err = platform_device_add(pdev);
if (err) { if (err) {
printk(KERN_ERR "vt8231: Device addition failed (%d)\n", pr_err("Device addition failed (%d)\n", err);
err);
goto exit_device_put; goto exit_device_put;
} }
......
drivers/hwmon/w83627ehf.c
View file @ a0894881
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
w83667hg-b 9 5 3 3 0xb350 0xc1 0x5ca3 w83667hg-b 9 5 3 3 0xb350 0xc1 0x5ca3
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -1668,8 +1670,7 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr, ...@@ -1668,8 +1670,7 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr,
break; break;
default: default:
if (val != 0xffff) if (val != 0xffff)
pr_debug(DRVNAME ": unsupported chip ID: 0x%04x\n", pr_debug("unsupported chip ID: 0x%04x\n", val);
val);
superio_exit(sioaddr); superio_exit(sioaddr);
return -ENODEV; return -ENODEV;
} }
...@@ -1680,8 +1681,7 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr, ...@@ -1680,8 +1681,7 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr,
| superio_inb(sioaddr, SIO_REG_ADDR + 1); | superio_inb(sioaddr, SIO_REG_ADDR + 1);
*addr = val & IOREGION_ALIGNMENT; *addr = val & IOREGION_ALIGNMENT;
if (*addr == 0) { if (*addr == 0) {
printk(KERN_ERR DRVNAME ": Refusing to enable a Super-I/O " pr_err("Refusing to enable a Super-I/O device with a base I/O port 0\n");
"device with a base I/O port 0.\n");
superio_exit(sioaddr); superio_exit(sioaddr);
return -ENODEV; return -ENODEV;
} }
...@@ -1689,13 +1689,12 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr, ...@@ -1689,13 +1689,12 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr,
/* Activate logical device if needed */ /* Activate logical device if needed */
val = superio_inb(sioaddr, SIO_REG_ENABLE); val = superio_inb(sioaddr, SIO_REG_ENABLE);
if (!(val & 0x01)) { if (!(val & 0x01)) {
printk(KERN_WARNING DRVNAME ": Forcibly enabling Super-I/O. " pr_warn("Forcibly enabling Super-I/O. Sensor is probably unusable.\n");
"Sensor is probably unusable.\n");
superio_outb(sioaddr, SIO_REG_ENABLE, val | 0x01); superio_outb(sioaddr, SIO_REG_ENABLE, val | 0x01);
} }
superio_exit(sioaddr); superio_exit(sioaddr);
pr_info(DRVNAME ": Found %s chip at %#x\n", sio_name, *addr); pr_info("Found %s chip at %#x\n", sio_name, *addr);
sio_data->sioreg = sioaddr; sio_data->sioreg = sioaddr;
return 0; return 0;
...@@ -1729,14 +1728,14 @@ static int __init sensors_w83627ehf_init(void) ...@@ -1729,14 +1728,14 @@ static int __init sensors_w83627ehf_init(void)
if (!(pdev = platform_device_alloc(DRVNAME, address))) { if (!(pdev = platform_device_alloc(DRVNAME, address))) {
err = -ENOMEM; err = -ENOMEM;
printk(KERN_ERR DRVNAME ": Device allocation failed\n"); pr_err("Device allocation failed\n");
goto exit_unregister; goto exit_unregister;
} }
err = platform_device_add_data(pdev, &sio_data, err = platform_device_add_data(pdev, &sio_data,
sizeof(struct w83627ehf_sio_data)); sizeof(struct w83627ehf_sio_data));
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Platform data allocation failed\n"); pr_err("Platform data allocation failed\n");
goto exit_device_put; goto exit_device_put;
} }
...@@ -1752,16 +1751,14 @@ static int __init sensors_w83627ehf_init(void) ...@@ -1752,16 +1751,14 @@ static int __init sensors_w83627ehf_init(void)
err = platform_device_add_resources(pdev, &res, 1); err = platform_device_add_resources(pdev, &res, 1);
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Device resource addition failed " pr_err("Device resource addition failed (%d)\n", err);
"(%d)\n", err);
goto exit_device_put; goto exit_device_put;
} }
/* platform_device_add calls probe() */ /* platform_device_add calls probe() */
err = platform_device_add(pdev); err = platform_device_add(pdev);
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n", pr_err("Device addition failed (%d)\n", err);
err);
goto exit_device_put; goto exit_device_put;
} }
......
drivers/hwmon/w83627hf.c
View file @ a0894881
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
supported yet. supported yet.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -1166,14 +1168,13 @@ static int __init w83627hf_find(int sioaddr, unsigned short *addr, ...@@ -1166,14 +1168,13 @@ static int __init w83627hf_find(int sioaddr, unsigned short *addr,
superio_inb(sio_data, WINB_BASE_REG + 1); superio_inb(sio_data, WINB_BASE_REG + 1);
*addr = val & WINB_ALIGNMENT; *addr = val & WINB_ALIGNMENT;
if (*addr == 0) { if (*addr == 0) {
printk(KERN_WARNING DRVNAME ": Base address not set, " pr_warn("Base address not set, skipping\n");
"skipping\n");
goto exit; goto exit;
} }
val = superio_inb(sio_data, WINB_ACT_REG); val = superio_inb(sio_data, WINB_ACT_REG);
if (!(val & 0x01)) { if (!(val & 0x01)) {
printk(KERN_WARNING DRVNAME ": Enabling HWM logical device\n"); pr_warn("Enabling HWM logical device\n");
superio_outb(sio_data, WINB_ACT_REG, val | 0x01); superio_outb(sio_data, WINB_ACT_REG, val | 0x01);
} }
...@@ -1789,28 +1790,26 @@ static int __init w83627hf_device_add(unsigned short address, ...@@ -1789,28 +1790,26 @@ static int __init w83627hf_device_add(unsigned short address,
pdev = platform_device_alloc(DRVNAME, address); pdev = platform_device_alloc(DRVNAME, address);
if (!pdev) { if (!pdev) {
err = -ENOMEM; err = -ENOMEM;
printk(KERN_ERR DRVNAME ": Device allocation failed\n"); pr_err("Device allocation failed\n");
goto exit; goto exit;
} }
err = platform_device_add_resources(pdev, &res, 1); err = platform_device_add_resources(pdev, &res, 1);
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Device resource addition failed " pr_err("Device resource addition failed (%d)\n", err);
"(%d)\n", err);
goto exit_device_put; goto exit_device_put;
} }
err = platform_device_add_data(pdev, sio_data, err = platform_device_add_data(pdev, sio_data,
sizeof(struct w83627hf_sio_data)); sizeof(struct w83627hf_sio_data));
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Platform data allocation failed\n"); pr_err("Platform data allocation failed\n");
goto exit_device_put; goto exit_device_put;
} }
err = platform_device_add(pdev); err = platform_device_add(pdev);
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n", pr_err("Device addition failed (%d)\n", err);
err);
goto exit_device_put; goto exit_device_put;
} }
......
include/linux/i2c/ds620.h 0 → 100644
View file @ a0894881
#ifndef _LINUX_DS620_H
#define _LINUX_DS620_H
#include <linux/types.h>
#include <linux/i2c.h>
/* platform data for the DS620 temperature sensor and thermostat */
struct ds620_platform_data {
/*
* Thermostat output pin PO mode:
* 0 = always low (default)
* 1 = PO_LOW
* 2 = PO_HIGH
*
* (see Documentation/hwmon/ds620)
*/
int pomode;
};
#endif /* _LINUX_DS620_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7