projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'bugzilla-14886', 'bugzilla-15000', 'bugzilla-15040', 'bugzilla-15108...
[deliverable/linux.git]
/
drivers
/
hwmon
/
thmc50.c
diff --git
a/drivers/hwmon/thmc50.c
b/drivers/hwmon/thmc50.c
index 4b793849c73818eb3fd6d5c8cd2aca986d17d514..7dfb4dec4c5f6ca3fb60d91e398446b1456d3423 100644
(file)
--- a/
drivers/hwmon/thmc50.c
+++ b/
drivers/hwmon/thmc50.c
@@
-35,7
+35,7
@@
MODULE_LICENSE("GPL");
static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
/* Insmod parameters */
static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
/* Insmod parameters */
-
I2C_CLIENT_INSMOD_2(thmc50, adm1022)
;
+
enum chips { thmc50, adm1022 }
;
static unsigned short adm1022_temp3[16];
static unsigned int adm1022_temp3_num;
static unsigned short adm1022_temp3[16];
static unsigned int adm1022_temp3_num;
@@
-84,7
+84,7
@@
struct thmc50_data {
u8 alarms;
};
u8 alarms;
};
-static int thmc50_detect(struct i2c_client *client,
int kind,
+static int thmc50_detect(struct i2c_client *client,
struct i2c_board_info *info);
static int thmc50_probe(struct i2c_client *client,
const struct i2c_device_id *id);
struct i2c_board_info *info);
static int thmc50_probe(struct i2c_client *client,
const struct i2c_device_id *id);
@@
-108,7
+108,7
@@
static struct i2c_driver thmc50_driver = {
.remove = thmc50_remove,
.id_table = thmc50_id,
.detect = thmc50_detect,
.remove = thmc50_remove,
.id_table = thmc50_id,
.detect = thmc50_detect,
- .address_
data = &addr_data
,
+ .address_
list = normal_i2c
,
};
static ssize_t show_analog_out(struct device *dev,
};
static ssize_t show_analog_out(struct device *dev,
@@
-286,7
+286,7
@@
static const struct attribute_group temp3_group = {
};
/* Return 0 if detection is successful, -ENODEV otherwise */
};
/* Return 0 if detection is successful, -ENODEV otherwise */
-static int thmc50_detect(struct i2c_client *client,
int kind,
+static int thmc50_detect(struct i2c_client *client,
struct i2c_board_info *info)
{
unsigned company;
struct i2c_board_info *info)
{
unsigned company;
This page took
0.024369 seconds
and
5
git commands to generate.