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
/
ds1374.c
diff --git
a/drivers/i2c/chips/ds1374.c
b/drivers/i2c/chips/ds1374.c
index
0936327
..
0710b9d
100644
(file)
--- a/
drivers/i2c/chips/ds1374.c
+++ b/
drivers/i2c/chips/ds1374.c
@@
-167,7
+167,8
@@
static void ds1374_set_tlet(ulong arg)
static ulong new_time;
static ulong new_time;
-DECLARE_TASKLET_DISABLED(ds1374_tasklet, ds1374_set_tlet, (ulong) & new_time);
+static DECLARE_TASKLET_DISABLED(ds1374_tasklet, ds1374_set_tlet,
+ (ulong) & new_time);
int ds1374_set_rtc_time(ulong nowtime)
{
int ds1374_set_rtc_time(ulong nowtime)
{
@@
-193,13
+194,11
@@
static int ds1374_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, DS1374_DRV_NAME, I2C_NAME_SIZE);
strncpy(client->name, DS1374_DRV_NAME, I2C_NAME_SIZE);
- client->flags = I2C_DF_NOTIFY;
client->addr = addr;
client->adapter = adap;
client->driver = &ds1374_driver;
client->addr = addr;
client->adapter = adap;
client->driver = &ds1374_driver;
@@
-233,10
+232,10
@@
static int ds1374_detach(struct i2c_client *client)
}
static struct i2c_driver ds1374_driver = {
}
static struct i2c_driver ds1374_driver = {
- .owner = THIS_MODULE,
- .name = DS1374_DRV_NAME,
+ .driver = {
+ .name = DS1374_DRV_NAME,
+ },
.id = I2C_DRIVERID_DS1374,
.id = I2C_DRIVERID_DS1374,
- .flags = I2C_DF_NOTIFY,
.attach_adapter = ds1374_attach,
.detach_client = ds1374_detach,
};
.attach_adapter = ds1374_attach,
.detach_client = ds1374_detach,
};