Skip to content

Commit f6a0d9d

Browse files
torvaldstorvalds
committed
Merge tag 'staging-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging tree fixes from Greg KH: "Here are a few iio driver fixes for 3.11-rc2. They are still spread across drivers/iio and drivers/staging/iio so they are coming in through this tree. I've also removed the drivers/staging/csr/ driver as the developers who originally sent it to me have moved on to other companies, and CSR still will not send us the specs for the device, making the driver pretty much obsolete and impossible to fix up. Deleting it now prevents people from sending in lots of tiny codingsyle fixes that will never go anywhere. It also helps to offset the large lustre filesystem merge that happened in 3.11-rc1 in the overall 3.11.0 diffstat. :)" * tag 'staging-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: csr: remove driver iio: lps331ap: Fix wrong in_pressure_scale output value iio staging: fix lis3l02dq, read error handling staging:iio:ad7291: add missing .driver_module to struct iio_info iio: ti_am335x_adc: add missing .driver_module to struct iio_info iio: mxs-lradc: Remove useless check in read_raw iio: mxs-lradc: Fix misuse of iio->trig iio: inkern: fix iio_convert_raw_to_processed_unlocked iio: Fix iio_channel_has_info iio:trigger: device_unregister->device_del to avoid double free iio: dac: ad7303: fix error return code in ad7303_probe()
2 parents 36231d2 + 7807725 commit f6a0d9d

File tree

155 files changed

+22
-91617
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+22
-91617
lines changed

‎drivers/iio/adc/ti_am335x_adc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ static int tiadc_read_raw(struct iio_dev *indio_dev,
183183

184184
static const struct iio_info tiadc_info = {
185185
.read_raw = &tiadc_read_raw,
186+
.driver_module = THIS_MODULE,
186187
};
187188

188189
static int tiadc_probe(struct platform_device *pdev)

‎drivers/iio/dac/ad7303.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,10 @@ static int ad7303_probe(struct spi_device *spi)
235235

236236
if (ext_ref) {
237237
st->vref_reg = regulator_get(&spi->dev, "REF");
238-
if (IS_ERR(st->vref_reg))
238+
if (IS_ERR(st->vref_reg)) {
239+
ret = PTR_ERR(st->vref_reg);
239240
goto err_disable_vdd_reg;
241+
}
240242

241243
ret = regulator_enable(st->vref_reg);
242244
if (ret)

‎drivers/iio/industrialio-trigger.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ void iio_trigger_unregister(struct iio_trigger *trig_info)
104104

105105
ida_simple_remove(&iio_trigger_ida, trig_info->id);
106106
/* Possible issue in here */
107-
device_unregister(&trig_info->dev);
107+
device_del(&trig_info->dev);
108108
}
109109
EXPORT_SYMBOL(iio_trigger_unregister);
110110

‎drivers/iio/inkern.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ static int iio_convert_raw_to_processed_unlocked(struct iio_channel *chan,
451451
int ret;
452452

453453
ret = iio_channel_read(chan, &offset, NULL, IIO_CHAN_INFO_OFFSET);
454-
if (ret == 0)
454+
if (ret >= 0)
455455
raw64 += offset;
456456

457457
scale_type = iio_channel_read(chan, &scale_val, &scale_val2,

‎drivers/iio/pressure/st_pressure_core.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
#include <linux/iio/common/st_sensors.h>
2929
#include "st_pressure.h"
3030

31-
#define ST_PRESS_MBAR_TO_KPASCAL(x) (x * 10)
31+
#define ST_PRESS_LSB_PER_MBAR 4096UL
32+
#define ST_PRESS_KPASCAL_NANO_SCALE (100000000UL / \
33+
ST_PRESS_LSB_PER_MBAR)
3234
#define ST_PRESS_NUMBER_DATA_CHANNELS 1
3335

3436
/* DEFAULT VALUE FOR SENSORS */
@@ -51,8 +53,8 @@
5153
#define ST_PRESS_1_FS_ADDR 0x23
5254
#define ST_PRESS_1_FS_MASK 0x30
5355
#define ST_PRESS_1_FS_AVL_1260_VAL 0x00
54-
#define ST_PRESS_1_FS_AVL_1260_GAIN ST_PRESS_MBAR_TO_KPASCAL(244141)
5556
#define ST_PRESS_1_FS_AVL_TEMP_GAIN 2083000
57+
#define ST_PRESS_1_FS_AVL_1260_GAIN ST_PRESS_KPASCAL_NANO_SCALE
5658
#define ST_PRESS_1_BDU_ADDR 0x20
5759
#define ST_PRESS_1_BDU_MASK 0x04
5860
#define ST_PRESS_1_DRDY_IRQ_ADDR 0x22

‎drivers/staging/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ source "drivers/staging/ozwpan/Kconfig"
118118

119119
source "drivers/staging/gdm72xx/Kconfig"
120120

121-
source "drivers/staging/csr/Kconfig"
122-
123121
source "drivers/staging/silicom/Kconfig"
124122

125123
source "drivers/staging/ced1401/Kconfig"

‎drivers/staging/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ obj-$(CONFIG_MFD_NVEC) += nvec/
5252
obj-$(CONFIG_ANDROID) += android/
5353
obj-$(CONFIG_USB_WPAN_HCD) += ozwpan/
5454
obj-$(CONFIG_WIMAX_GDM72XX) += gdm72xx/
55-
obj-$(CONFIG_CSR_WIFI) += csr/
5655
obj-$(CONFIG_NET_VENDOR_SILICOM) += silicom/
5756
obj-$(CONFIG_CED1401) += ced1401/
5857
obj-$(CONFIG_DRM_IMX) += imx-drm/

‎drivers/staging/csr/Kconfig

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎drivers/staging/csr/LICENSE.txt

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎drivers/staging/csr/Makefile

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)