提交 db79f2a1 编写于 作者: G Guenter Roeck 提交者: Jean Delvare

i2c/pca954x: Remove __devinit and __devexit from probe and remove functions

The underlying I2C adapter may or may not be present when this driver
gets initialized, and may disappear later, so there is no safe time at
which the probe and remove functions can be discarded.
Signed-off-by: NGuenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: NJean Delvare <khali@linux-fr.org>
上级 5ce914a8
...@@ -181,7 +181,7 @@ static int pca954x_deselect_mux(struct i2c_adapter *adap, ...@@ -181,7 +181,7 @@ static int pca954x_deselect_mux(struct i2c_adapter *adap,
/* /*
* I2C init/probing/exit functions * I2C init/probing/exit functions
*/ */
static int __devinit pca954x_probe(struct i2c_client *client, static int pca954x_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent); struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
...@@ -255,7 +255,7 @@ static int __devinit pca954x_probe(struct i2c_client *client, ...@@ -255,7 +255,7 @@ static int __devinit pca954x_probe(struct i2c_client *client,
return ret; return ret;
} }
static int __devexit pca954x_remove(struct i2c_client *client) static int pca954x_remove(struct i2c_client *client)
{ {
struct pca954x *data = i2c_get_clientdata(client); struct pca954x *data = i2c_get_clientdata(client);
const struct chip_desc *chip = &chips[data->type]; const struct chip_desc *chip = &chips[data->type];
...@@ -279,7 +279,7 @@ static struct i2c_driver pca954x_driver = { ...@@ -279,7 +279,7 @@ static struct i2c_driver pca954x_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = pca954x_probe, .probe = pca954x_probe,
.remove = __devexit_p(pca954x_remove), .remove = pca954x_remove,
.id_table = pca954x_id, .id_table = pca954x_id,
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册