Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

authored by

Guenter Roeck and committed by
Jean Delvare
db79f2a1 5ce914a8

+4 -4
+4 -4
drivers/i2c/muxes/pca954x.c
··· 181 181 /* 182 182 * I2C init/probing/exit functions 183 183 */ 184 - static int __devinit pca954x_probe(struct i2c_client *client, 185 - const struct i2c_device_id *id) 184 + static int pca954x_probe(struct i2c_client *client, 185 + const struct i2c_device_id *id) 186 186 { 187 187 struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent); 188 188 struct pca954x_platform_data *pdata = client->dev.platform_data; ··· 255 255 return ret; 256 256 } 257 257 258 - static int __devexit pca954x_remove(struct i2c_client *client) 258 + static int pca954x_remove(struct i2c_client *client) 259 259 { 260 260 struct pca954x *data = i2c_get_clientdata(client); 261 261 const struct chip_desc *chip = &chips[data->type]; ··· 279 279 .owner = THIS_MODULE, 280 280 }, 281 281 .probe = pca954x_probe, 282 - .remove = __devexit_p(pca954x_remove), 282 + .remove = pca954x_remove, 283 283 .id_table = pca954x_id, 284 284 }; 285 285