projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with Linus' kernel.
[powerpc.git]
/
drivers
/
i2c
/
chips
/
m41t00.c
diff --git
a/drivers/i2c/chips/m41t00.c
b/drivers/i2c/chips/m41t00.c
index
5e463c4
..
2dc3d48
100644
(file)
--- a/
drivers/i2c/chips/m41t00.c
+++ b/
drivers/i2c/chips/m41t00.c
@@
-42,7
+42,6
@@
static struct i2c_client_address_data addr_data = {
.normal_i2c = normal_addr,
.probe = ignore,
.ignore = ignore,
.normal_i2c = normal_addr,
.probe = ignore,
.ignore = ignore,
- .force = ignore,
};
ulong
};
ulong
@@
-145,7
+144,7
@@
m41t00_set_tlet(ulong arg)
return;
}
return;
}
-
ulong
new_time;
+
static ulong
new_time;
DECLARE_TASKLET_DISABLED(m41t00_tasklet, m41t00_set_tlet, (ulong)&new_time);
DECLARE_TASKLET_DISABLED(m41t00_tasklet, m41t00_set_tlet, (ulong)&new_time);
@@
-175,13
+174,11
@@
m41t00_probe(struct i2c_adapter *adap, int addr, int kind)
struct i2c_client *client;
int rc;
struct i2c_client *client;
int rc;
- client = k
m
alloc(sizeof(struct i2c_client), GFP_KERNEL);
+ client = k
z
alloc(sizeof(struct i2c_client), GFP_KERNEL);
if (!client)
return -ENOMEM;
if (!client)
return -ENOMEM;
- memset(client, 0, sizeof(struct i2c_client));
strncpy(client->name, M41T00_DRV_NAME, I2C_NAME_SIZE);
strncpy(client->name, M41T00_DRV_NAME, I2C_NAME_SIZE);
- client->flags = I2C_DF_NOTIFY;
client->addr = addr;
client->adapter = adap;
client->driver = &m41t00_driver;
client->addr = addr;
client->adapter = adap;
client->driver = &m41t00_driver;
@@
-207,17
+204,17
@@
m41t00_detach(struct i2c_client *client)
int rc;
if ((rc = i2c_detach_client(client)) == 0) {
int rc;
if ((rc = i2c_detach_client(client)) == 0) {
- kfree(
i2c_get_clientdata(client)
);
+ kfree(
client
);
tasklet_kill(&m41t00_tasklet);
}
return rc;
}
static struct i2c_driver m41t00_driver = {
tasklet_kill(&m41t00_tasklet);
}
return rc;
}
static struct i2c_driver m41t00_driver = {
- .owner = THIS_MODULE,
- .name = M41T00_DRV_NAME,
+ .driver = {
+ .name = M41T00_DRV_NAME,
+ },
.id = I2C_DRIVERID_STM41T00,
.id = I2C_DRIVERID_STM41T00,
- .flags = I2C_DF_NOTIFY,
.attach_adapter = m41t00_attach,
.detach_client = m41t00_detach,
};
.attach_adapter = m41t00_attach,
.detach_client = m41t00_detach,
};