diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-07 02:05:40 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-07 02:05:40 -0500 |
| commit | add5b5ee992e40c9cd8697ea94c223628be162a7 (patch) | |
| tree | 7f3f279f3e6b41e61d7dfaf4d25a5251024a7185 /drivers/hwmon/it87.c | |
| parent | 25da0974601fc8096461f3d3f7ca3aab8e79adfb (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
| download | kernel_samsung_smdk4412-add5b5ee992e40c9cd8697ea94c223628be162a7.zip kernel_samsung_smdk4412-add5b5ee992e40c9cd8697ea94c223628be162a7.tar.gz kernel_samsung_smdk4412-add5b5ee992e40c9cd8697ea94c223628be162a7.tar.bz2 | |
Auto-update from upstream
Diffstat (limited to 'drivers/hwmon/it87.c')
| -rw-r--r-- | drivers/hwmon/it87.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index a61f5d0..0da7c9c 100644 --- a/drivers/hwmon/it87.c +++ b/drivers/hwmon/it87.c @@ -213,7 +213,7 @@ struct it87_data { u8 sensor; /* Register value */ u8 fan_div[3]; /* Register encoding, shifted right */ u8 vid; /* Register encoding, combined */ - int vrm; + u8 vrm; u32 alarms; /* Register encoding, combined */ u8 fan_main_ctrl; /* Register value */ u8 manual_pwm_ctl[3]; /* manual PWM value set by user */ @@ -234,17 +234,18 @@ static void it87_init_client(struct i2c_client *client, struct it87_data *data); static struct i2c_driver it87_driver = { - .owner = THIS_MODULE, - .name = "it87", + .driver = { + .name = "it87", + }, .id = I2C_DRIVERID_IT87, - .flags = I2C_DF_NOTIFY, .attach_adapter = it87_attach_adapter, .detach_client = it87_detach_client, }; static struct i2c_driver it87_isa_driver = { - .owner = THIS_MODULE, - .name = "it87-isa", + .driver = { + .name = "it87-isa", + }, .attach_adapter = it87_isa_attach_adapter, .detach_client = it87_detach_client, }; @@ -668,7 +669,7 @@ static ssize_t show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf) { struct it87_data *data = it87_update_device(dev); - return sprintf(buf, "%ld\n", (long) data->vrm); + return sprintf(buf, "%u\n", data->vrm); } static ssize_t store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) @@ -761,7 +762,8 @@ static int it87_detect(struct i2c_adapter *adapter, int address, int kind) /* Reserve the ISA region */ if (is_isa) - if (!request_region(address, IT87_EXTENT, it87_isa_driver.name)) + if (!request_region(address, IT87_EXTENT, + it87_isa_driver.driver.name)) goto ERROR0; /* For now, we presume we have a valid client. We create the |