diff options
Diffstat (limited to 'drivers/staging/iio/magnetometer')
-rw-r--r-- | drivers/staging/iio/magnetometer/ak8975.c | 6 | ||||
-rw-r--r-- | drivers/staging/iio/magnetometer/hmc5843.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/iio/magnetometer/ak8975.c b/drivers/staging/iio/magnetometer/ak8975.c index 01b4b07c227b..28f080e9eeee 100644 --- a/drivers/staging/iio/magnetometer/ak8975.c +++ b/drivers/staging/iio/magnetometer/ak8975.c @@ -409,7 +409,7 @@ static const struct iio_info ak8975_info = { .driver_module = THIS_MODULE, }; -static int __devinit ak8975_probe(struct i2c_client *client, +static int ak8975_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct ak8975_data *data; @@ -475,7 +475,7 @@ exit: return err; } -static int __devexit ak8975_remove(struct i2c_client *client) +static int ak8975_remove(struct i2c_client *client) { struct iio_dev *indio_dev = i2c_get_clientdata(client); struct ak8975_data *data = iio_priv(indio_dev); @@ -510,7 +510,7 @@ static struct i2c_driver ak8975_driver = { .of_match_table = ak8975_of_match, }, .probe = ak8975_probe, - .remove = __devexit_p(ak8975_remove), + .remove = ak8975_remove, .id_table = ak8975_id, }; module_i2c_driver(ak8975_driver); diff --git a/drivers/staging/iio/magnetometer/hmc5843.c b/drivers/staging/iio/magnetometer/hmc5843.c index 10e095486e54..1a520ecfa3e2 100644 --- a/drivers/staging/iio/magnetometer/hmc5843.c +++ b/drivers/staging/iio/magnetometer/hmc5843.c @@ -555,7 +555,7 @@ static int hmc5843_read_raw(struct iio_dev *indio_dev, *val = 0; *val2 = data->variant->regval_to_nanoscale[data->range]; return IIO_VAL_INT_PLUS_NANO; - }; + } return -EINVAL; } @@ -665,7 +665,7 @@ static const struct iio_info hmc5843_info = { .driver_module = THIS_MODULE, }; -static int __devinit hmc5843_probe(struct i2c_client *client, +static int hmc5843_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct hmc5843_data *data; @@ -704,7 +704,7 @@ exit: return err; } -static int __devexit hmc5843_remove(struct i2c_client *client) +static int hmc5843_remove(struct i2c_client *client) { struct iio_dev *indio_dev = i2c_get_clientdata(client); @@ -755,7 +755,7 @@ static struct i2c_driver hmc5843_driver = { }, .id_table = hmc5843_id, .probe = hmc5843_probe, - .remove = __devexit_p(hmc5843_remove), + .remove = hmc5843_remove, .detect = hmc5843_detect, .address_list = normal_i2c, }; |