From a69ade9c8947126a733ab7f503cc5d4ea8590244 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Sat, 12 Jan 2013 10:35:00 +0000 Subject: [PATCH] --- yaml --- r: 354222 b: refs/heads/master c: a9e244f65df170ae6efba03bdb0a203626ae1cd3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/light/tsl2563.c | 18 +++++------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 572079bd5aa1..ac838aae4ac8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ade7633ac324098b31ae859f83cee73129d74d3 +refs/heads/master: a9e244f65df170ae6efba03bdb0a203626ae1cd3 diff --git a/trunk/drivers/staging/iio/light/tsl2563.c b/trunk/drivers/staging/iio/light/tsl2563.c index 1ee0a6faf7c3..547203cfd5d5 100644 --- a/trunk/drivers/staging/iio/light/tsl2563.c +++ b/trunk/drivers/staging/iio/light/tsl2563.c @@ -190,8 +190,10 @@ static int tsl2563_configure(struct tsl2563_chip *chip) ret = i2c_smbus_write_byte_data(chip->client, TSL2563_CMD | TSL2563_REG_LOWHIGH, (chip->low_thres >> 8) & 0xFF); -/* Interrupt register is automatically written anyway if it is relevant - so is not here */ +/* + * Interrupt register is automatically written anyway if it is relevant + * so is not here. + */ error_ret: return ret; } @@ -423,9 +425,7 @@ static const struct tsl2563_lux_coeff lux_table[] = { }, }; -/* - * Convert normalized, scaled ADC values to lux. - */ +/* Convert normalized, scaled ADC values to lux. */ static unsigned int adc_to_lux(u32 adc0, u32 adc1) { const struct tsl2563_lux_coeff *lp = lux_table; @@ -441,11 +441,6 @@ static unsigned int adc_to_lux(u32 adc0, u32 adc1) return (unsigned int) (lux >> ADC_FRAC_BITS); } -/*--------------------------------------------------------------*/ -/* Sysfs interface */ -/*--------------------------------------------------------------*/ - - /* Apply calibration coefficient to ADC count. */ static u32 calib_adc(u32 adc, u32 calib) { @@ -684,9 +679,6 @@ static int tsl2563_read_interrupt_config(struct iio_dev *indio_dev, return ret; } -/*--------------------------------------------------------------*/ -/* Probe, Attach, Remove */ -/*--------------------------------------------------------------*/ static struct i2c_driver tsl2563_i2c_driver; static const struct iio_info tsl2563_info_no_irq = {