Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317312
b: refs/heads/master
c: f9eb89e
h: refs/heads/master
v: v3
  • Loading branch information
Peter Meerwald authored and Greg Kroah-Hartman committed Jun 12, 2012
1 parent 88f0398 commit 78d1087
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 227d5e0040ff18b6258ef6680e3c54150bb6b8b1
refs/heads/master: f9eb89e97dec966981494c75ef7dc41630b0cb43
6 changes: 3 additions & 3 deletions trunk/drivers/iio/dac/max517.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ static const struct iio_chan_spec max517_channels[] = {
MAX517_CHANNEL(1)
};

static int max517_probe(struct i2c_client *client,
static int __devinit max517_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct max517_data *data;
Expand Down Expand Up @@ -210,7 +210,7 @@ static int max517_probe(struct i2c_client *client,
return err;
}

static int max517_remove(struct i2c_client *client)
static int __devexit max517_remove(struct i2c_client *client)
{
iio_device_unregister(i2c_get_clientdata(client));
iio_device_free(i2c_get_clientdata(client));
Expand All @@ -232,7 +232,7 @@ static struct i2c_driver max517_driver = {
.pm = MAX517_PM_OPS,
},
.probe = max517_probe,
.remove = max517_remove,
.remove = __devexit_p(max517_remove),
.id_table = max517_id,
};
module_i2c_driver(max517_driver);
Expand Down

0 comments on commit 78d1087

Please sign in to comment.