projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] sem2mutex: tty
[powerpc.git]
/
drivers
/
hwmon
/
adm1026.c
diff --git
a/drivers/hwmon/adm1026.c
b/drivers/hwmon/adm1026.c
index
eb55133
..
fefe6e7
100644
(file)
--- a/
drivers/hwmon/adm1026.c
+++ b/
drivers/hwmon/adm1026.c
@@
-28,18
+28,16
@@
#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-sysfs.h>
#include <linux/hwmon.h>
#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/hwmon-vid.h>
#include <linux/err.h>
/* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
#include <linux/err.h>
/* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* Insmod parameters */
/* Insmod parameters */
-
SENSORS
_INSMOD_1(adm1026);
+
I2C_CLIENT
_INSMOD_1(adm1026);
static int gpio_input[17] = { -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1 };
static int gpio_input[17] = { -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1 };
@@
-310,22
+308,22
@@
static void adm1026_init_client(struct i2c_client *client);
static struct i2c_driver adm1026_driver = {
static struct i2c_driver adm1026_driver = {
- .
owner = THIS_MODULE,
-
.name
= "adm1026",
-
.flags = I2C_DF_NOTIFY
,
+ .
driver = {
+
.name
= "adm1026",
+
}
,
.attach_adapter = adm1026_attach_adapter,
.detach_client = adm1026_detach_client,
};
.attach_adapter = adm1026_attach_adapter,
.detach_client = adm1026_detach_client,
};
-int adm1026_attach_adapter(struct i2c_adapter *adapter)
+
static
int adm1026_attach_adapter(struct i2c_adapter *adapter)
{
if (!(adapter->class & I2C_CLASS_HWMON)) {
return 0;
}
{
if (!(adapter->class & I2C_CLASS_HWMON)) {
return 0;
}
- return i2c_
detect
(adapter, &addr_data, adm1026_detect);
+ return i2c_
probe
(adapter, &addr_data, adm1026_detect);
}
}
-int adm1026_detach_client(struct i2c_client *client)
+
static
int adm1026_detach_client(struct i2c_client *client)
{
struct adm1026_data *data = i2c_get_clientdata(client);
hwmon_device_unregister(data->class_dev);
{
struct adm1026_data *data = i2c_get_clientdata(client);
hwmon_device_unregister(data->class_dev);
@@
-334,7
+332,7
@@
int adm1026_detach_client(struct i2c_client *client)
return 0;
}
return 0;
}
-int adm1026_read_value(struct i2c_client *client, u8 reg)
+
static
int adm1026_read_value(struct i2c_client *client, u8 reg)
{
int res;
{
int res;
@@
-348,7
+346,7
@@
int adm1026_read_value(struct i2c_client *client, u8 reg)
return res;
}
return res;
}
-int adm1026_write_value(struct i2c_client *client, u8 reg, int value)
+
static
int adm1026_write_value(struct i2c_client *client, u8 reg, int value)
{
int res;
{
int res;
@@
-362,7
+360,7
@@
int adm1026_write_value(struct i2c_client *client, u8 reg, int value)
return res;
}
return res;
}
-void adm1026_init_client(struct i2c_client *client)
+
static
void adm1026_init_client(struct i2c_client *client)
{
int value, i;
struct adm1026_data *data = i2c_get_clientdata(client);
{
int value, i;
struct adm1026_data *data = i2c_get_clientdata(client);
@@
-462,7
+460,7
@@
void adm1026_init_client(struct i2c_client *client)
}
}
}
}
-void adm1026_print_gpio(struct i2c_client *client)
+
static
void adm1026_print_gpio(struct i2c_client *client)
{
struct adm1026_data *data = i2c_get_clientdata(client);
int i;
{
struct adm1026_data *data = i2c_get_clientdata(client);
int i;
@@
-494,7
+492,7
@@
void adm1026_print_gpio(struct i2c_client *client)
}
}
}
}
-void adm1026_fixup_gpio(struct i2c_client *client)
+
static
void adm1026_fixup_gpio(struct i2c_client *client)
{
struct adm1026_data *data = i2c_get_clientdata(client);
int i;
{
struct adm1026_data *data = i2c_get_clientdata(client);
int i;
@@
-1229,8
+1227,6
@@
static ssize_t show_vid_reg(struct device *dev, struct device_attribute *attr, c
struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", vid_from_reg(data->vid & 0x3f, data->vrm));
}
struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", vid_from_reg(data->vid & 0x3f, data->vrm));
}
-/* vid deprecated in favour of cpu0_vid, remove after 2005-11-11 */
-static DEVICE_ATTR(vid, S_IRUGO, show_vid_reg, NULL);
static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
static ssize_t show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
static ssize_t show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
@@
-1454,8
+1450,8
@@
static DEVICE_ATTR(temp1_auto_point2_pwm, S_IRUGO, show_auto_pwm_max, NULL);
static DEVICE_ATTR(temp2_auto_point2_pwm, S_IRUGO, show_auto_pwm_max, NULL);
static DEVICE_ATTR(temp3_auto_point2_pwm, S_IRUGO, show_auto_pwm_max, NULL);
static DEVICE_ATTR(temp2_auto_point2_pwm, S_IRUGO, show_auto_pwm_max, NULL);
static DEVICE_ATTR(temp3_auto_point2_pwm, S_IRUGO, show_auto_pwm_max, NULL);
-int adm1026_detect(struct i2c_adapter *adapter, int address,
- int kind)
+
static
int adm1026_detect(struct i2c_adapter *adapter, int address,
+
int kind)
{
int company, verstep;
struct i2c_client *new_client;
{
int company, verstep;
struct i2c_client *new_client;
@@
-1472,13
+1468,11
@@
int adm1026_detect(struct i2c_adapter *adapter, int address,
client structure, even though we cannot fill it completely yet.
But it allows us to access adm1026_{read,write}_value. */
client structure, even though we cannot fill it completely yet.
But it allows us to access adm1026_{read,write}_value. */
- if (!(data = k
m
alloc(sizeof(struct adm1026_data), GFP_KERNEL))) {
+ if (!(data = k
z
alloc(sizeof(struct adm1026_data), GFP_KERNEL))) {
err = -ENOMEM;
goto exit;
}
err = -ENOMEM;
goto exit;
}
- memset(data, 0, sizeof(struct adm1026_data));
-
new_client = &data->client;
i2c_set_clientdata(new_client, data);
new_client->addr = address;
new_client = &data->client;
i2c_set_clientdata(new_client, data);
new_client->addr = address;
@@
-1554,7
+1548,7
@@
int adm1026_detect(struct i2c_adapter *adapter, int address,
goto exitfree;
/* Set the VRM version */
goto exitfree;
/* Set the VRM version */
- data->vrm =
i2c
_which_vrm();
+ data->vrm =
vid
_which_vrm();
/* Initialize the ADM1026 chip */
adm1026_init_client(new_client);
/* Initialize the ADM1026 chip */
adm1026_init_client(new_client);
@@
-1677,8
+1671,6
@@
int adm1026_detect(struct i2c_adapter *adapter, int address,
device_create_file(&new_client->dev, &dev_attr_temp1_crit_enable);
device_create_file(&new_client->dev, &dev_attr_temp2_crit_enable);
device_create_file(&new_client->dev, &dev_attr_temp3_crit_enable);
device_create_file(&new_client->dev, &dev_attr_temp1_crit_enable);
device_create_file(&new_client->dev, &dev_attr_temp2_crit_enable);
device_create_file(&new_client->dev, &dev_attr_temp3_crit_enable);
- /* vid deprecated in favour of cpu0_vid, remove after 2005-11-11 */
- device_create_file(&new_client->dev, &dev_attr_vid);
device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
device_create_file(&new_client->dev, &dev_attr_vrm);
device_create_file(&new_client->dev, &dev_attr_alarms);
device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
device_create_file(&new_client->dev, &dev_attr_vrm);
device_create_file(&new_client->dev, &dev_attr_alarms);