git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[sfrench/cifs-2.6.git]
/
drivers
/
hwmon
/
sis5595.c
diff --git
a/drivers/hwmon/sis5595.c
b/drivers/hwmon/sis5595.c
index 21aa9a41f62cbc5e7432a73e93318de9be0cf666..8be5189d9bd9edda783f4f44f038702ad881a461 100644
(file)
--- a/
drivers/hwmon/sis5595.c
+++ b/
drivers/hwmon/sis5595.c
@@
-198,8
+198,9
@@
static struct sis5595_data *sis5595_update_device(struct device *dev);
static void sis5595_init_client(struct i2c_client *client);
static struct i2c_driver sis5595_driver = {
static void sis5595_init_client(struct i2c_client *client);
static struct i2c_driver sis5595_driver = {
- .owner = THIS_MODULE,
- .name = "sis5595",
+ .driver = {
+ .name = "sis5595",
+ },
.attach_adapter = sis5595_detect,
.detach_client = sis5595_detach_client,
};
.attach_adapter = sis5595_detect,
.detach_client = sis5595_detach_client,
};
@@
-484,7
+485,8
@@
static int sis5595_detect(struct i2c_adapter *adapter)
if (force_addr)
address = force_addr & ~(SIS5595_EXTENT - 1);
/* Reserve the ISA region */
if (force_addr)
address = force_addr & ~(SIS5595_EXTENT - 1);
/* Reserve the ISA region */
- if (!request_region(address, SIS5595_EXTENT, sis5595_driver.name)) {
+ if (!request_region(address, SIS5595_EXTENT,
+ sis5595_driver.driver.name)) {
err = -EBUSY;
goto exit;
}
err = -EBUSY;
goto exit;
}
@@
-518,11
+520,10
@@
static int sis5595_detect(struct i2c_adapter *adapter)
goto exit_release;
}
goto exit_release;
}
- if (!(data = k
m
alloc(sizeof(struct sis5595_data), GFP_KERNEL))) {
+ if (!(data = k
z
alloc(sizeof(struct sis5595_data), GFP_KERNEL))) {
err = -ENOMEM;
goto exit_release;
}
err = -ENOMEM;
goto exit_release;
}
- memset(data, 0, sizeof(struct sis5595_data));
new_client = &data->client;
new_client->addr = address;
new_client = &data->client;
new_client->addr = address;