aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/i2c/algos/i2c-algo-pca.c4
-rw-r--r--drivers/i2c/busses/i2c-ibm_iic.c2
-rw-r--r--drivers/i2c/busses/i2c-iop3xx.c2
-rw-r--r--drivers/i2c/busses/i2c-s3c2410.c2
-rw-r--r--drivers/i2c/chips/adm1031.c2
-rw-r--r--drivers/i2c/chips/ds1621.c4
-rw-r--r--drivers/i2c/chips/it87.c4
-rw-r--r--drivers/i2c/chips/lm63.c4
-rw-r--r--drivers/i2c/chips/lm78.c4
-rw-r--r--drivers/i2c/chips/lm83.c2
-rw-r--r--drivers/i2c/chips/lm90.c8
11 files changed, 19 insertions, 19 deletions
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index c3d912cbbbc3..dfa77eb275b1 100644
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -49,7 +49,7 @@ static int i2c_debug=0;
49/* 49/*
50 * Generate a start condition on the i2c bus. 50 * Generate a start condition on the i2c bus.
51 * 51 *
52 * returns after the start condition has occured 52 * returns after the start condition has occurred
53 */ 53 */
54static void pca_start(struct i2c_algo_pca_data *adap) 54static void pca_start(struct i2c_algo_pca_data *adap)
55{ 55{
@@ -64,7 +64,7 @@ static void pca_start(struct i2c_algo_pca_data *adap)
64/* 64/*
65 * Generate a repeated start condition on the i2c bus 65 * Generate a repeated start condition on the i2c bus
66 * 66 *
67 * return after the repeated start condition has occured 67 * return after the repeated start condition has occurred
68 */ 68 */
69static void pca_repeated_start(struct i2c_algo_pca_data *adap) 69static void pca_repeated_start(struct i2c_algo_pca_data *adap)
70{ 70{
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index bb885215c08d..93ca36dc777e 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -695,7 +695,7 @@ static int __devinit iic_probe(struct ocp_device *ocp){
695 695
696 dev->irq = iic_force_poll ? -1 : ocp->def->irq; 696 dev->irq = iic_force_poll ? -1 : ocp->def->irq;
697 if (dev->irq >= 0){ 697 if (dev->irq >= 0){
698 /* Disable interrupts until we finish intialization, 698 /* Disable interrupts until we finish initialization,
699 assumes level-sensitive IRQ setup... 699 assumes level-sensitive IRQ setup...
700 */ 700 */
701 iic_interrupt_mode(dev, 0); 701 iic_interrupt_mode(dev, 0);
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index c961ba4cfb32..6b682e903f09 100644
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -85,7 +85,7 @@ iop3xx_i2c_enable(struct i2c_algo_iop3xx_data *iop3xx_adap)
85 u32 cr = IOP3XX_ICR_GCD | IOP3XX_ICR_SCLEN | IOP3XX_ICR_UE; 85 u32 cr = IOP3XX_ICR_GCD | IOP3XX_ICR_SCLEN | IOP3XX_ICR_UE;
86 86
87 /* 87 /*
88 * Everytime unit enable is asserted, GPOD needs to be cleared 88 * Every time unit enable is asserted, GPOD needs to be cleared
89 * on IOP321 to avoid data corruption on the bus. 89 * on IOP321 to avoid data corruption on the bus.
90 */ 90 */
91#ifdef CONFIG_ARCH_IOP321 91#ifdef CONFIG_ARCH_IOP321
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 1e71018085cb..a3b38257cc3d 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -534,7 +534,7 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int
534/* s3c24xx_i2c_xfer 534/* s3c24xx_i2c_xfer
535 * 535 *
536 * first port of call from the i2c bus code when an message needs 536 * first port of call from the i2c bus code when an message needs
537 * transfering across the i2c bus. 537 * transferring across the i2c bus.
538*/ 538*/
539 539
540static int s3c24xx_i2c_xfer(struct i2c_adapter *adap, 540static int s3c24xx_i2c_xfer(struct i2c_adapter *adap,
diff --git a/drivers/i2c/chips/adm1031.c b/drivers/i2c/chips/adm1031.c
index 2163dba467c4..9168e983ca1d 100644
--- a/drivers/i2c/chips/adm1031.c
+++ b/drivers/i2c/chips/adm1031.c
@@ -440,7 +440,7 @@ pwm_reg(2);
440 440
441/* 441/*
442 * That function checks the cases where the fan reading is not 442 * That function checks the cases where the fan reading is not
443 * relevent. It is used to provide 0 as fan reading when the fan is 443 * relevant. It is used to provide 0 as fan reading when the fan is
444 * not supposed to run 444 * not supposed to run
445 */ 445 */
446static int trust_fan_readings(struct adm1031_data *data, int chan) 446static int trust_fan_readings(struct adm1031_data *data, int chan)
diff --git a/drivers/i2c/chips/ds1621.c b/drivers/i2c/chips/ds1621.c
index 4ae15bd5dcfb..5360d58804f6 100644
--- a/drivers/i2c/chips/ds1621.c
+++ b/drivers/i2c/chips/ds1621.c
@@ -121,7 +121,7 @@ static int ds1621_write_value(struct i2c_client *client, u8 reg, u16 value)
121static void ds1621_init_client(struct i2c_client *client) 121static void ds1621_init_client(struct i2c_client *client)
122{ 122{
123 int reg = ds1621_read_value(client, DS1621_REG_CONF); 123 int reg = ds1621_read_value(client, DS1621_REG_CONF);
124 /* switch to continous conversion mode */ 124 /* switch to continuous conversion mode */
125 reg &= ~ DS1621_REG_CONFIG_1SHOT; 125 reg &= ~ DS1621_REG_CONFIG_1SHOT;
126 126
127 /* setup output polarity */ 127 /* setup output polarity */
@@ -303,7 +303,7 @@ static struct ds1621_data *ds1621_update_client(struct device *dev)
303 data->temp_max = ds1621_read_value(client, 303 data->temp_max = ds1621_read_value(client,
304 DS1621_REG_TEMP_MAX); 304 DS1621_REG_TEMP_MAX);
305 305
306 /* reset alarms if neccessary */ 306 /* reset alarms if necessary */
307 new_conf = data->conf; 307 new_conf = data->conf;
308 if (data->temp < data->temp_min) 308 if (data->temp < data->temp_min)
309 new_conf &= ~DS1621_ALARM_TEMP_LOW; 309 new_conf &= ~DS1621_ALARM_TEMP_LOW;
diff --git a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c
index 471eb4295a1d..16dbfd8dac1b 100644
--- a/drivers/i2c/chips/it87.c
+++ b/drivers/i2c/chips/it87.c
@@ -953,7 +953,7 @@ static int it87_detach_client(struct i2c_client *client)
953 return 0; 953 return 0;
954} 954}
955 955
956/* The SMBus locks itself, but ISA access must be locked explicitely! 956/* The SMBus locks itself, but ISA access must be locked explicitly!
957 We don't want to lock the whole ISA bus, so we lock each client 957 We don't want to lock the whole ISA bus, so we lock each client
958 separately. 958 separately.
959 We ignore the IT87 BUSY flag at this moment - it could lead to deadlocks, 959 We ignore the IT87 BUSY flag at this moment - it could lead to deadlocks,
@@ -973,7 +973,7 @@ static int it87_read_value(struct i2c_client *client, u8 reg)
973 return i2c_smbus_read_byte_data(client, reg); 973 return i2c_smbus_read_byte_data(client, reg);
974} 974}
975 975
976/* The SMBus locks itself, but ISA access muse be locked explicitely! 976/* The SMBus locks itself, but ISA access muse be locked explicitly!
977 We don't want to lock the whole ISA bus, so we lock each client 977 We don't want to lock the whole ISA bus, so we lock each client
978 separately. 978 separately.
979 We ignore the IT87 BUSY flag at this moment - it could lead to deadlocks, 979 We ignore the IT87 BUSY flag at this moment - it could lead to deadlocks,
diff --git a/drivers/i2c/chips/lm63.c b/drivers/i2c/chips/lm63.c
index 7bdacfd65d4a..18b2876e8df6 100644
--- a/drivers/i2c/chips/lm63.c
+++ b/drivers/i2c/chips/lm63.c
@@ -98,9 +98,9 @@ SENSORS_INSMOD_1(lm63);
98 * Conversions and various macros 98 * Conversions and various macros
99 * For tachometer counts, the LM63 uses 16-bit values. 99 * For tachometer counts, the LM63 uses 16-bit values.
100 * For local temperature and high limit, remote critical limit and hysteresis 100 * For local temperature and high limit, remote critical limit and hysteresis
101 * value, it uses signed 8-bit values with LSB = 1 degree Celcius. 101 * value, it uses signed 8-bit values with LSB = 1 degree Celsius.
102 * For remote temperature, low and high limits, it uses signed 11-bit values 102 * For remote temperature, low and high limits, it uses signed 11-bit values
103 * with LSB = 0.125 degree Celcius, left-justified in 16-bit registers. 103 * with LSB = 0.125 degree Celsius, left-justified in 16-bit registers.
104 */ 104 */
105 105
106#define FAN_FROM_REG(reg) ((reg) == 0xFFFC || (reg) == 0 ? 0 : \ 106#define FAN_FROM_REG(reg) ((reg) == 0xFFFC || (reg) == 0 ? 0 : \
diff --git a/drivers/i2c/chips/lm78.c b/drivers/i2c/chips/lm78.c
index 24619920a271..29241469dcba 100644
--- a/drivers/i2c/chips/lm78.c
+++ b/drivers/i2c/chips/lm78.c
@@ -670,7 +670,7 @@ static int lm78_detach_client(struct i2c_client *client)
670 return 0; 670 return 0;
671} 671}
672 672
673/* The SMBus locks itself, but ISA access must be locked explicitely! 673/* The SMBus locks itself, but ISA access must be locked explicitly!
674 We don't want to lock the whole ISA bus, so we lock each client 674 We don't want to lock the whole ISA bus, so we lock each client
675 separately. 675 separately.
676 We ignore the LM78 BUSY flag at this moment - it could lead to deadlocks, 676 We ignore the LM78 BUSY flag at this moment - it could lead to deadlocks,
@@ -689,7 +689,7 @@ static int lm78_read_value(struct i2c_client *client, u8 reg)
689 return i2c_smbus_read_byte_data(client, reg); 689 return i2c_smbus_read_byte_data(client, reg);
690} 690}
691 691
692/* The SMBus locks itself, but ISA access muse be locked explicitely! 692/* The SMBus locks itself, but ISA access muse be locked explicitly!
693 We don't want to lock the whole ISA bus, so we lock each client 693 We don't want to lock the whole ISA bus, so we lock each client
694 separately. 694 separately.
695 We ignore the LM78 BUSY flag at this moment - it could lead to deadlocks, 695 We ignore the LM78 BUSY flag at this moment - it could lead to deadlocks,
diff --git a/drivers/i2c/chips/lm83.c b/drivers/i2c/chips/lm83.c
index de8f8ea3ffd0..442dc17cdb77 100644
--- a/drivers/i2c/chips/lm83.c
+++ b/drivers/i2c/chips/lm83.c
@@ -80,7 +80,7 @@ SENSORS_INSMOD_1(lm83);
80 80
81/* 81/*
82 * Conversions and various macros 82 * Conversions and various macros
83 * The LM83 uses signed 8-bit values with LSB = 1 degree Celcius. 83 * The LM83 uses signed 8-bit values with LSB = 1 degree Celsius.
84 */ 84 */
85 85
86#define TEMP_FROM_REG(val) ((val) * 1000) 86#define TEMP_FROM_REG(val) ((val) * 1000)
diff --git a/drivers/i2c/chips/lm90.c b/drivers/i2c/chips/lm90.c
index d4da90da2eae..42795b43c8b9 100644
--- a/drivers/i2c/chips/lm90.c
+++ b/drivers/i2c/chips/lm90.c
@@ -19,7 +19,7 @@
19 * Complete datasheets can be obtained from National's website at: 19 * Complete datasheets can be obtained from National's website at:
20 * http://www.national.com/pf/LM/LM89.html 20 * http://www.national.com/pf/LM/LM89.html
21 * http://www.national.com/pf/LM/LM99.html 21 * http://www.national.com/pf/LM/LM99.html
22 * Note that there is no way to differenciate between both chips. 22 * Note that there is no way to differentiate between both chips.
23 * 23 *
24 * This driver also supports the LM86, another sensor chip made by 24 * This driver also supports the LM86, another sensor chip made by
25 * National Semiconductor. It is exactly similar to the LM90 except it 25 * National Semiconductor. It is exactly similar to the LM90 except it
@@ -39,7 +39,7 @@
39 * chips made by Maxim. These chips are similar to the LM86. Complete 39 * chips made by Maxim. These chips are similar to the LM86. Complete
40 * datasheet can be obtained at Maxim's website at: 40 * datasheet can be obtained at Maxim's website at:
41 * http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2578 41 * http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2578
42 * Note that there is no easy way to differenciate between the three 42 * Note that there is no easy way to differentiate between the three
43 * variants. The extra address and features of the MAX6659 are not 43 * variants. The extra address and features of the MAX6659 are not
44 * supported by this driver. 44 * supported by this driver.
45 * 45 *
@@ -138,9 +138,9 @@ SENSORS_INSMOD_6(lm90, adm1032, lm99, lm86, max6657, adt7461);
138/* 138/*
139 * Conversions and various macros 139 * Conversions and various macros
140 * For local temperatures and limits, critical limits and the hysteresis 140 * For local temperatures and limits, critical limits and the hysteresis
141 * value, the LM90 uses signed 8-bit values with LSB = 1 degree Celcius. 141 * value, the LM90 uses signed 8-bit values with LSB = 1 degree Celsius.
142 * For remote temperatures and limits, it uses signed 11-bit values with 142 * For remote temperatures and limits, it uses signed 11-bit values with
143 * LSB = 0.125 degree Celcius, left-justified in 16-bit registers. 143 * LSB = 0.125 degree Celsius, left-justified in 16-bit registers.
144 */ 144 */
145 145
146#define TEMP1_FROM_REG(val) ((val) * 1000) 146#define TEMP1_FROM_REG(val) ((val) * 1000)