aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2013-03-13 19:40:39 -0400
committerGuenter Roeck <linux@roeck-us.net>2013-04-08 00:16:40 -0400
commit088ce2ac9ebac5c74faf4d39083627875fa6f0f0 (patch)
tree4e62aa545bf3fc762ec35538799dcfc24751e769
parent236d9039480059f97dc9d3cd75e3651582b62997 (diff)
hwmon: Fix CamelCase checkpatch warnings
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-rw-r--r--drivers/hwmon/ads7871.c42
-rw-r--r--drivers/hwmon/asc7621.c56
-rw-r--r--drivers/hwmon/da9052-hwmon.c14
-rw-r--r--drivers/hwmon/da9055-hwmon.c4
-rw-r--r--drivers/hwmon/it87.c24
-rw-r--r--drivers/hwmon/lm93.c38
-rw-r--r--drivers/hwmon/ntc_thermistor.c216
-rw-r--r--drivers/hwmon/via686a.c38
-rw-r--r--include/linux/platform_data/ntc_thermistor.h4
9 files changed, 218 insertions, 218 deletions
diff --git a/drivers/hwmon/ads7871.c b/drivers/hwmon/ads7871.c
index a79875986f91..3eff73b6220d 100644
--- a/drivers/hwmon/ads7871.c
+++ b/drivers/hwmon/ads7871.c
@@ -40,25 +40,25 @@
40 * the instruction byte 40 * the instruction byte
41 */ 41 */
42/*Instruction Bit masks*/ 42/*Instruction Bit masks*/
43#define INST_MODE_bm (1<<7) 43#define INST_MODE_BM (1 << 7)
44#define INST_READ_bm (1<<6) 44#define INST_READ_BM (1 << 6)
45#define INST_16BIT_bm (1<<5) 45#define INST_16BIT_BM (1 << 5)
46 46
47/*From figure 18 in the datasheet*/ 47/*From figure 18 in the datasheet*/
48/*bit masks for Rev/Oscillator Control Register*/ 48/*bit masks for Rev/Oscillator Control Register*/
49#define MUX_CNV_bv 7 49#define MUX_CNV_BV 7
50#define MUX_CNV_bm (1<<MUX_CNV_bv) 50#define MUX_CNV_BM (1 << MUX_CNV_BV)
51#define MUX_M3_bm (1<<3) /*M3 selects single ended*/ 51#define MUX_M3_BM (1 << 3) /*M3 selects single ended*/
52#define MUX_G_bv 4 /*allows for reg = (gain << MUX_G_bv) | ...*/ 52#define MUX_G_BV 4 /*allows for reg = (gain << MUX_G_BV) | ...*/
53 53
54/*From figure 18 in the datasheet*/ 54/*From figure 18 in the datasheet*/
55/*bit masks for Rev/Oscillator Control Register*/ 55/*bit masks for Rev/Oscillator Control Register*/
56#define OSC_OSCR_bm (1<<5) 56#define OSC_OSCR_BM (1 << 5)
57#define OSC_OSCE_bm (1<<4) 57#define OSC_OSCE_BM (1 << 4)
58#define OSC_REFE_bm (1<<3) 58#define OSC_REFE_BM (1 << 3)
59#define OSC_BUFE_bm (1<<2) 59#define OSC_BUFE_BM (1 << 2)
60#define OSC_R2V_bm (1<<1) 60#define OSC_R2V_BM (1 << 1)
61#define OSC_RBG_bm (1<<0) 61#define OSC_RBG_BM (1 << 0)
62 62
63#include <linux/module.h> 63#include <linux/module.h>
64#include <linux/init.h> 64#include <linux/init.h>
@@ -79,7 +79,7 @@ struct ads7871_data {
79static int ads7871_read_reg8(struct spi_device *spi, int reg) 79static int ads7871_read_reg8(struct spi_device *spi, int reg)
80{ 80{
81 int ret; 81 int ret;
82 reg = reg | INST_READ_bm; 82 reg = reg | INST_READ_BM;
83 ret = spi_w8r8(spi, reg); 83 ret = spi_w8r8(spi, reg);
84 return ret; 84 return ret;
85} 85}
@@ -87,7 +87,7 @@ static int ads7871_read_reg8(struct spi_device *spi, int reg)
87static int ads7871_read_reg16(struct spi_device *spi, int reg) 87static int ads7871_read_reg16(struct spi_device *spi, int reg)
88{ 88{
89 int ret; 89 int ret;
90 reg = reg | INST_READ_bm | INST_16BIT_bm; 90 reg = reg | INST_READ_BM | INST_16BIT_BM;
91 ret = spi_w8r16(spi, reg); 91 ret = spi_w8r16(spi, reg);
92 return ret; 92 return ret;
93} 93}
@@ -111,13 +111,13 @@ static ssize_t show_voltage(struct device *dev,
111 * TODO: add support for conversions 111 * TODO: add support for conversions
112 * other than single ended with a gain of 1 112 * other than single ended with a gain of 1
113 */ 113 */
114 /*MUX_M3_bm forces single ended*/ 114 /*MUX_M3_BM forces single ended*/
115 /*This is also where the gain of the PGA would be set*/ 115 /*This is also where the gain of the PGA would be set*/
116 ads7871_write_reg8(spi, REG_GAIN_MUX, 116 ads7871_write_reg8(spi, REG_GAIN_MUX,
117 (MUX_CNV_bm | MUX_M3_bm | channel)); 117 (MUX_CNV_BM | MUX_M3_BM | channel));
118 118
119 ret = ads7871_read_reg8(spi, REG_GAIN_MUX); 119 ret = ads7871_read_reg8(spi, REG_GAIN_MUX);
120 mux_cnv = ((ret & MUX_CNV_bm)>>MUX_CNV_bv); 120 mux_cnv = ((ret & MUX_CNV_BM) >> MUX_CNV_BV);
121 /* 121 /*
122 * on 400MHz arm9 platform the conversion 122 * on 400MHz arm9 platform the conversion
123 * is already done when we do this test 123 * is already done when we do this test
@@ -125,14 +125,14 @@ static ssize_t show_voltage(struct device *dev,
125 while ((i < 2) && mux_cnv) { 125 while ((i < 2) && mux_cnv) {
126 i++; 126 i++;
127 ret = ads7871_read_reg8(spi, REG_GAIN_MUX); 127 ret = ads7871_read_reg8(spi, REG_GAIN_MUX);
128 mux_cnv = ((ret & MUX_CNV_bm)>>MUX_CNV_bv); 128 mux_cnv = ((ret & MUX_CNV_BM) >> MUX_CNV_BV);
129 msleep_interruptible(1); 129 msleep_interruptible(1);
130 } 130 }
131 131
132 if (mux_cnv == 0) { 132 if (mux_cnv == 0) {
133 val = ads7871_read_reg16(spi, REG_LS_BYTE); 133 val = ads7871_read_reg16(spi, REG_LS_BYTE);
134 /*result in volts*10000 = (val/8192)*2.5*10000*/ 134 /*result in volts*10000 = (val/8192)*2.5*10000*/
135 val = ((val>>2) * 25000) / 8192; 135 val = ((val >> 2) * 25000) / 8192;
136 return sprintf(buf, "%d\n", val); 136 return sprintf(buf, "%d\n", val);
137 } else { 137 } else {
138 return -1; 138 return -1;
@@ -189,7 +189,7 @@ static int ads7871_probe(struct spi_device *spi)
189 ads7871_write_reg8(spi, REG_SER_CONTROL, 0); 189 ads7871_write_reg8(spi, REG_SER_CONTROL, 0);
190 ads7871_write_reg8(spi, REG_AD_CONTROL, 0); 190 ads7871_write_reg8(spi, REG_AD_CONTROL, 0);
191 191
192 val = (OSC_OSCR_bm | OSC_OSCE_bm | OSC_REFE_bm | OSC_BUFE_bm); 192 val = (OSC_OSCR_BM | OSC_OSCE_BM | OSC_REFE_BM | OSC_BUFE_BM);
193 ads7871_write_reg8(spi, REG_OSC_CONTROL, val); 193 ads7871_write_reg8(spi, REG_OSC_CONTROL, val);
194 ret = ads7871_read_reg8(spi, REG_OSC_CONTROL); 194 ret = ads7871_read_reg8(spi, REG_OSC_CONTROL);
195 195
diff --git a/drivers/hwmon/asc7621.c b/drivers/hwmon/asc7621.c
index da7f5b5d5db5..3ad9d849add2 100644
--- a/drivers/hwmon/asc7621.c
+++ b/drivers/hwmon/asc7621.c
@@ -159,12 +159,12 @@ static inline int write_byte(struct i2c_client *client, u8 reg, u8 data)
159 * and retrieval of like parameters. 159 * and retrieval of like parameters.
160 */ 160 */
161 161
162#define SETUP_SHOW_data_param(d, a) \ 162#define SETUP_SHOW_DATA_PARAM(d, a) \
163 struct sensor_device_attribute *sda = to_sensor_dev_attr(a); \ 163 struct sensor_device_attribute *sda = to_sensor_dev_attr(a); \
164 struct asc7621_data *data = asc7621_update_device(d); \ 164 struct asc7621_data *data = asc7621_update_device(d); \
165 struct asc7621_param *param = to_asc7621_param(sda) 165 struct asc7621_param *param = to_asc7621_param(sda)
166 166
167#define SETUP_STORE_data_param(d, a) \ 167#define SETUP_STORE_DATA_PARAM(d, a) \
168 struct sensor_device_attribute *sda = to_sensor_dev_attr(a); \ 168 struct sensor_device_attribute *sda = to_sensor_dev_attr(a); \
169 struct i2c_client *client = to_i2c_client(d); \ 169 struct i2c_client *client = to_i2c_client(d); \
170 struct asc7621_data *data = i2c_get_clientdata(client); \ 170 struct asc7621_data *data = i2c_get_clientdata(client); \
@@ -177,7 +177,7 @@ static inline int write_byte(struct i2c_client *client, u8 reg, u8 data)
177static ssize_t show_u8(struct device *dev, struct device_attribute *attr, 177static ssize_t show_u8(struct device *dev, struct device_attribute *attr,
178 char *buf) 178 char *buf)
179{ 179{
180 SETUP_SHOW_data_param(dev, attr); 180 SETUP_SHOW_DATA_PARAM(dev, attr);
181 181
182 return sprintf(buf, "%u\n", data->reg[param->msb[0]]); 182 return sprintf(buf, "%u\n", data->reg[param->msb[0]]);
183} 183}
@@ -185,7 +185,7 @@ static ssize_t show_u8(struct device *dev, struct device_attribute *attr,
185static ssize_t store_u8(struct device *dev, struct device_attribute *attr, 185static ssize_t store_u8(struct device *dev, struct device_attribute *attr,
186 const char *buf, size_t count) 186 const char *buf, size_t count)
187{ 187{
188 SETUP_STORE_data_param(dev, attr); 188 SETUP_STORE_DATA_PARAM(dev, attr);
189 long reqval; 189 long reqval;
190 190
191 if (kstrtol(buf, 10, &reqval)) 191 if (kstrtol(buf, 10, &reqval))
@@ -206,7 +206,7 @@ static ssize_t store_u8(struct device *dev, struct device_attribute *attr,
206static ssize_t show_bitmask(struct device *dev, 206static ssize_t show_bitmask(struct device *dev,
207 struct device_attribute *attr, char *buf) 207 struct device_attribute *attr, char *buf)
208{ 208{
209 SETUP_SHOW_data_param(dev, attr); 209 SETUP_SHOW_DATA_PARAM(dev, attr);
210 210
211 return sprintf(buf, "%u\n", 211 return sprintf(buf, "%u\n",
212 (data->reg[param->msb[0]] >> param-> 212 (data->reg[param->msb[0]] >> param->
@@ -217,7 +217,7 @@ static ssize_t store_bitmask(struct device *dev,
217 struct device_attribute *attr,