diff options
author | Jonathan Cameron <jic23@kernel.org> | 2013-02-02 05:47:08 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-02 10:03:32 -0500 |
commit | e2d979ccb73928bb22201a9d9035d0169aa37691 (patch) | |
tree | 8e1618dd6baf247eb7a1ea61c773b1370bbf8502 /drivers/iio | |
parent | 085494ac2039433a5df9fdd6fb653579e18b8c71 (diff) |
iio:max1363 remove some functions left after merge
merge commit 17cb3be61b45d716f6b21a9380925493413ce0ed
seems to have resulted in two functions that were removed in
4389fbec5b8fd0577c1e854ff5d7139329558c20 reappearing.
Spotted due to a build kicking out
drivers/iio/adc/max1363.c:1486:12: warning: 'max1363_register_buffered_funcs_and_init' defined but not used
drivers/iio/adc/max1363.c:1521:13: warning: 'max1363_buffer_cleanup' defined but not used
This patch just removes them again.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio')
-rw-r--r-- | drivers/iio/adc/max1363.c | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/drivers/iio/adc/max1363.c b/drivers/iio/adc/max1363.c index eba1034d8606..5db56f5ce7dc 100644 --- a/drivers/iio/adc/max1363.c +++ b/drivers/iio/adc/max1363.c | |||
@@ -1483,48 +1483,6 @@ static const struct iio_buffer_setup_ops max1363_buffered_setup_ops = { | |||
1483 | .predisable = &iio_triggered_buffer_predisable, | 1483 | .predisable = &iio_triggered_buffer_predisable, |
1484 | }; | 1484 | }; |
1485 | 1485 | ||
1486 | static int max1363_register_buffered_funcs_and_init(struct iio_dev *indio_dev) | ||
1487 | { | ||
1488 | struct max1363_state *st = iio_priv(indio_dev); | ||
1489 | int ret = 0; | ||
1490 | |||
1491 | indio_dev->buffer = iio_kfifo_allocate(indio_dev); | ||
1492 | if (!indio_dev->buffer) { | ||
1493 | ret = -ENOMEM; | ||
1494 | goto error_ret; | ||
1495 | } | ||
1496 | indio_dev->pollfunc = iio_alloc_pollfunc(NULL, | ||
1497 | &max1363_trigger_handler, | ||
1498 | IRQF_ONESHOT, | ||
1499 | indio_dev, | ||
1500 | "%s_consumer%d", | ||
1501 | st->client->name, | ||
1502 | indio_dev->id); | ||
1503 | if (indio_dev->pollfunc == NULL) { | ||
1504 | ret = -ENOMEM; | ||
1505 | goto error_deallocate_sw_rb; | ||
1506 | } | ||
1507 | /* Buffer functions - here trigger setup related */ | ||
1508 | indio_dev->setup_ops = &max1363_buffered_setup_ops; | ||
1509 | |||
1510 | /* Flag that polled buffering is possible */ | ||
1511 | indio_dev->modes |= INDIO_BUFFER_TRIGGERED; | ||
1512 | |||
1513 | return 0; | ||
1514 | |||
1515 | error_deallocate_sw_rb: | ||
1516 | iio_kfifo_free(indio_dev->buffer); | ||
1517 | error_ret: | ||
1518 | return ret; | ||
1519 | } | ||
1520 | |||
1521 | static void max1363_buffer_cleanup(struct iio_dev *indio_dev) | ||
1522 | { | ||
1523 | /* ensure that the trigger has been detached */ | ||
1524 | iio_dealloc_pollfunc(indio_dev->pollfunc); | ||
1525 | iio_kfifo_free(indio_dev->buffer); | ||
1526 | } | ||
1527 | |||
1528 | static int max1363_probe(struct i2c_client *client, | 1486 | static int max1363_probe(struct i2c_client *client, |
1529 | const struct i2c_device_id *id) | 1487 | const struct i2c_device_id *id) |
1530 | { | 1488 | { |