projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] hwmon: Static function fixes, 2 of 4
[powerpc.git]
/
drivers
/
hwmon
/
adm1025.c
diff --git
a/drivers/hwmon/adm1025.c
b/drivers/hwmon/adm1025.c
index
5b21284
..
3ec1242
100644
(file)
--- a/
drivers/hwmon/adm1025.c
+++ b/
drivers/hwmon/adm1025.c
@@
-50,9
+50,8
@@
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
#include <linux/hwmon.h>
#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
#include <linux/err.h>
/*
#include <linux/err.h>
/*
@@
-67,7
+66,7
@@
static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
* Insmod parameters
*/
* Insmod parameters
*/
-
SENSORS
_INSMOD_2(adm1025, ne1619);
+
I2C_CLIENT
_INSMOD_2(adm1025, ne1619);
/*
* The ADM1025 registers
/*
* The ADM1025 registers
@@
-332,11
+331,10
@@
static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind)
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
goto exit;
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
goto exit;
- if (!(data = k
m
alloc(sizeof(struct adm1025_data), GFP_KERNEL))) {
+ if (!(data = k
z
alloc(sizeof(struct adm1025_data), GFP_KERNEL))) {
err = -ENOMEM;
goto exit;
}
err = -ENOMEM;
goto exit;
}
- memset(data, 0, sizeof(struct adm1025_data));
/* The common I2C client data is placed right before the
ADM1025-specific data. */
/* The common I2C client data is placed right before the
ADM1025-specific data. */
@@
-474,7
+472,7
@@
static void adm1025_init_client(struct i2c_client *client)
struct adm1025_data *data = i2c_get_clientdata(client);
int i;
struct adm1025_data *data = i2c_get_clientdata(client);
int i;
- data->vrm =
i2c
_which_vrm();
+ data->vrm =
vid
_which_vrm();
/*
* Set high limits
/*
* Set high limits