From 78d108705b34653247bfb5e548b5ea6b53afa200 Mon Sep 17 00:00:00 2001 From: Peter Meerwald Date: Fri, 8 Jun 2012 08:54:18 +0200 Subject: [PATCH] --- yaml --- r: 317312 b: refs/heads/master c: f9eb89e97dec966981494c75ef7dc41630b0cb43 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/iio/dac/max517.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 23eae48d5864..a91b742a1c8d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 227d5e0040ff18b6258ef6680e3c54150bb6b8b1 +refs/heads/master: f9eb89e97dec966981494c75ef7dc41630b0cb43 diff --git a/trunk/drivers/iio/dac/max517.c b/trunk/drivers/iio/dac/max517.c index 352abe2004a4..c3d748c25939 100644 --- a/trunk/drivers/iio/dac/max517.c +++ b/trunk/drivers/iio/dac/max517.c @@ -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; @@ -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)); @@ -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);