From 300a3854ad054a2536c63bc4be2ecf8a74c1e698 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Sun, 24 Oct 2010 18:16:59 +0200 Subject: [PATCH] --- yaml --- r: 215608 b: refs/heads/master c: db79f2a1d259a9026241dd0f192c20d6264d5afa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/i2c/muxes/pca954x.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6f53439395d8..08c80ee55175 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ce914a8965031a4de503235eb9e0d33ff294fa8 +refs/heads/master: db79f2a1d259a9026241dd0f192c20d6264d5afa diff --git a/trunk/drivers/i2c/muxes/pca954x.c b/trunk/drivers/i2c/muxes/pca954x.c index 6f9accf3189d..54e1ce73534b 100644 --- a/trunk/drivers/i2c/muxes/pca954x.c +++ b/trunk/drivers/i2c/muxes/pca954x.c @@ -181,8 +181,8 @@ static int pca954x_deselect_mux(struct i2c_adapter *adap, /* * I2C init/probing/exit functions */ -static int __devinit pca954x_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int pca954x_probe(struct i2c_client *client, + const struct i2c_device_id *id) { struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent); struct pca954x_platform_data *pdata = client->dev.platform_data; @@ -255,7 +255,7 @@ static int __devinit pca954x_probe(struct i2c_client *client, 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); const struct chip_desc *chip = &chips[data->type]; @@ -279,7 +279,7 @@ static struct i2c_driver pca954x_driver = { .owner = THIS_MODULE, }, .probe = pca954x_probe, - .remove = __devexit_p(pca954x_remove), + .remove = pca954x_remove, .id_table = pca954x_id, };