diff options
Diffstat (limited to 'drivers/staging/iio/cdc')
-rw-r--r-- | drivers/staging/iio/cdc/ad7150.c | 18 | ||||
-rw-r--r-- | drivers/staging/iio/cdc/ad7152.c | 8 | ||||
-rw-r--r-- | drivers/staging/iio/cdc/ad7746.c | 8 |
3 files changed, 17 insertions, 17 deletions
diff --git a/drivers/staging/iio/cdc/ad7150.c b/drivers/staging/iio/cdc/ad7150.c index 6a40414..3c608c1 100644 --- a/drivers/staging/iio/cdc/ad7150.c +++ b/drivers/staging/iio/cdc/ad7150.c @@ -156,7 +156,7 @@ static int ad7150_read_event_config(struct iio_dev *indio_dev, u64 event_code) return !adaptive && (threshtype == 0x1); else return !adaptive && (threshtype == 0x0); - }; + } return -EINVAL; } @@ -194,7 +194,7 @@ static int ad7150_write_event_params(struct iio_dev *indio_dev, u64 event_code) break; default: return -EINVAL; - }; + } ret = i2c_smbus_write_byte_data(chip->client, ad7150_addresses[chan][4], sens); @@ -257,7 +257,7 @@ static int ad7150_write_event_config(struct iio_dev *indio_dev, default: ret = -EINVAL; goto error_ret; - }; + } cfg |= (!adaptive << 7) | (thresh_type << 5); @@ -327,7 +327,7 @@ static int ad7150_write_event_value(struct iio_dev *indio_dev, default: ret = -EINVAL; goto error_ret; - }; + } /* write back if active */ ret = ad7150_write_event_params(indio_dev, event_code); @@ -360,7 +360,7 @@ static ssize_t ad7150_show_timeout(struct device *dev, break; default: return -EINVAL; - }; + } return sprintf(buf, "%d\n", value); } @@ -394,7 +394,7 @@ static ssize_t ad7150_store_timeout(struct device *dev, default: ret = -EINVAL; goto error_ret; - }; + } ret = ad7150_write_event_params(indio_dev, this_attr->address); error_ret: @@ -551,7 +551,7 @@ static const struct iio_info ad7150_info = { * device probe and remove */ -static int __devinit ad7150_probe(struct i2c_client *client, +static int ad7150_probe(struct i2c_client *client, const struct i2c_device_id *id) { int ret; @@ -628,7 +628,7 @@ error_ret: return ret; } -static int __devexit ad7150_remove(struct i2c_client *client) +static int ad7150_remove(struct i2c_client *client) { struct iio_dev *indio_dev = i2c_get_clientdata(client); @@ -658,7 +658,7 @@ static struct i2c_driver ad7150_driver = { .name = "ad7150", }, .probe = ad7150_probe, - .remove = __devexit_p(ad7150_remove), + .remove = ad7150_remove, .id_table = ad7150_id, }; module_i2c_driver(ad7150_driver); diff --git a/drivers/staging/iio/cdc/ad7152.c b/drivers/staging/iio/cdc/ad7152.c index 98c3015..3c92ba3 100644 --- a/drivers/staging/iio/cdc/ad7152.c +++ b/drivers/staging/iio/cdc/ad7152.c @@ -405,7 +405,7 @@ static int ad7152_read_raw(struct iio_dev *indio_dev, break; default: ret = -EINVAL; - }; + } out: mutex_unlock(&indio_dev->mlock); return ret; @@ -474,7 +474,7 @@ static const struct iio_chan_spec ad7152_channels[] = { * device probe and remove */ -static int __devinit ad7152_probe(struct i2c_client *client, +static int ad7152_probe(struct i2c_client *client, const struct i2c_device_id *id) { int ret = 0; @@ -518,7 +518,7 @@ error_ret: return ret; } -static int __devexit ad7152_remove(struct i2c_client *client) +static int ad7152_remove(struct i2c_client *client) { struct iio_dev *indio_dev = i2c_get_clientdata(client); @@ -541,7 +541,7 @@ static struct i2c_driver ad7152_driver = { .name = KBUILD_MODNAME, }, .probe = ad7152_probe, - .remove = __devexit_p(ad7152_remove), + .remove = ad7152_remove, .id_table = ad7152_id, }; module_i2c_driver(ad7152_driver); diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/ad7746.c index 754e11e..466b82e 100644 --- a/drivers/staging/iio/cdc/ad7746.c +++ b/drivers/staging/iio/cdc/ad7746.c @@ -677,7 +677,7 @@ static int ad7746_read_raw(struct iio_dev *indio_dev, break; default: ret = -EINVAL; - }; + } out: mutex_unlock(&indio_dev->mlock); return ret; @@ -694,7 +694,7 @@ static const struct iio_info ad7746_info = { * device probe and remove */ -static int __devinit ad7746_probe(struct i2c_client *client, +static int ad7746_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct ad7746_platform_data *pdata = client->dev.platform_data; @@ -768,7 +768,7 @@ error_ret: return ret; } -static int __devexit ad7746_remove(struct i2c_client *client) +static int ad7746_remove(struct i2c_client *client) { struct iio_dev *indio_dev = i2c_get_clientdata(client); @@ -792,7 +792,7 @@ static struct i2c_driver ad7746_driver = { .name = KBUILD_MODNAME, }, .probe = ad7746_probe, - .remove = __devexit_p(ad7746_remove), + .remove = ad7746_remove, .id_table = ad7746_id, }; module_i2c_driver(ad7746_driver); |