Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d23108d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-3.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging fixes from Greg KH:
 "Here are a number of small staging tree and iio driver fixes.  Nothing
  major, just lots of little things"

* tag 'staging-3.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (34 commits)
  iio:buffer_cb: Add missing iio_buffer_init()
  iio: Prevent race between IIO chardev opening and IIO device free
  iio: fix: Keep a reference to the IIO device for open file descriptors
  iio: Stop sampling when the device is removed
  iio: Fix crash when scan_bytes is computed with active_scan_mask == NULL
  iio: Fix mcp4725 dev-to-indio_dev conversion in suspend/resume
  iio: Fix bma180 dev-to-indio_dev conversion in suspend/resume
  iio: Fix tmp006 dev-to-indio_dev conversion in suspend/resume
  iio: iio_device_add_event_sysfs() bugfix
  staging: iio: ade7854-spi: Fix return value
  staging:iio:hmc5843: Fix measurement conversion
  iio: isl29018: Fix uninitialized value
  staging:iio:dummy fix kfifo_buf kconfig dependency issue if kfifo modular and buffer enabled for built in dummy driver.
  iio: at91: fix adc_clk overflow
  staging: line6: add bounds check in snd_toneport_source_put()
  Staging: comedi: Fix dependencies for drivers misclassified as PCI
  staging: r8188eu: Adjust RX gain
  staging: r8188eu: Fix smatch warning in core/rtw_ieee80211.
  staging: r8188eu: Fix smatch error in core/rtw_mlme_ext.c
  staging: r8188eu: Fix Smatch off-by-one warning in hal/rtl8188e_hal_init.c
  ...
parents e04a0a5a 61740810

drivers/iio/accel/bma180.c

+2 −2
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ static int bma180_remove(struct i2c_client *client) 
#ifdef CONFIG_PM_SLEEP

static int bma180_suspend(struct device *dev)

{

	struct iio_dev *indio_dev = dev_to_iio_dev(dev);

	struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));

	struct bma180_data *data = iio_priv(indio_dev);

	int ret;
@@ -633,7 +633,7 @@ static int bma180_suspend(struct device *dev) 


static int bma180_resume(struct device *dev)

{

	struct iio_dev *indio_dev = dev_to_iio_dev(dev);

	struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));

	struct bma180_data *data = iio_priv(indio_dev);

	int ret;

drivers/iio/adc/at91_adc.c

+6 −5
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ static const struct iio_info at91_adc_info = { 


static int at91_adc_probe(struct platform_device *pdev)

{

	unsigned int prsc, mstrclk, ticks, adc_clk, shtim;

	unsigned int prsc, mstrclk, ticks, adc_clk, adc_clk_khz, shtim;

	int ret;

	struct iio_dev *idev;

	struct at91_adc_state *st;
@@ -649,6 +649,7 @@ static int at91_adc_probe(struct platform_device *pdev) 
	 */

	mstrclk = clk_get_rate(st->clk);

	adc_clk = clk_get_rate(st->adc_clk);

	adc_clk_khz = adc_clk / 1000;

	prsc = (mstrclk / (2 * adc_clk)) - 1;



	if (!st->startup_time) {
@@ -662,15 +663,15 @@ static int at91_adc_probe(struct platform_device *pdev) 
	 * defined in the electrical characteristics of the board, divided by 8.

	 * The formula thus is : Startup Time = (ticks + 1) * 8 / ADC Clock

	 */

	ticks = round_up((st->startup_time * adc_clk /

			  1000000) - 1, 8) / 8;

	ticks = round_up((st->startup_time * adc_clk_khz /

			  1000) - 1, 8) / 8;

	/*

	 * a minimal Sample and Hold Time is necessary for the ADC to guarantee

	 * the best converted final value between two channels selection

	 * The formula thus is : Sample and Hold Time = (shtim + 1) / ADCClock

	 */

	shtim = round_up((st->sample_hold_time * adc_clk /

			  1000000) - 1, 1);

	shtim = round_up((st->sample_hold_time * adc_clk_khz /

			  1000) - 1, 1);



	reg = AT91_ADC_PRESCAL_(prsc) & st->registers->mr_prescal_mask;

	reg |= AT91_ADC_STARTUP_(ticks) & st->registers->mr_startup_mask;

drivers/iio/buffer_cb.c

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev, 
		goto error_ret;

	}



	iio_buffer_init(&cb_buff->buffer);



	cb_buff->private = private;

	cb_buff->cb = cb;

	cb_buff->buffer.access = &iio_cb_access;

drivers/iio/dac/mcp4725.c

+6 −6
Original line number Diff line number Diff line
@@ -37,21 +37,21 @@ struct mcp4725_data { 


static int mcp4725_suspend(struct device *dev)

{

	struct iio_dev *indio_dev = dev_to_iio_dev(dev);

	struct mcp4725_data *data = iio_priv(indio_dev);

	struct mcp4725_data *data = iio_priv(i2c_get_clientdata(

		to_i2c_client(dev)));

	u8 outbuf[2];



	outbuf[0] = (data->powerdown_mode + 1) << 4;

	outbuf[1] = 0;

	data->powerdown = true;



	return i2c_master_send(to_i2c_client(dev), outbuf, 2);

	return i2c_master_send(data->client, outbuf, 2);

}



static int mcp4725_resume(struct device *dev)

{

	struct iio_dev *indio_dev = dev_to_iio_dev(dev);

	struct mcp4725_data *data = iio_priv(indio_dev);

	struct mcp4725_data *data = iio_priv(i2c_get_clientdata(

		to_i2c_client(dev)));

	u8 outbuf[2];



	/* restore previous DAC value */
@@ -59,7 +59,7 @@ static int mcp4725_resume(struct device *dev) 
	outbuf[1] = data->dac_value & 0xff;

	data->powerdown = false;



	return i2c_master_send(to_i2c_client(dev), outbuf, 2);

	return i2c_master_send(data->client, outbuf, 2);

}



#ifdef CONFIG_PM_SLEEP

drivers/iio/iio_core.h

+4 −0
Original line number Diff line number Diff line
@@ -49,11 +49,15 @@ ssize_t iio_buffer_read_first_n_outer(struct file *filp, char __user *buf, 
#define iio_buffer_poll_addr (&iio_buffer_poll)

#define iio_buffer_read_first_n_outer_addr (&iio_buffer_read_first_n_outer)



void iio_disable_all_buffers(struct iio_dev *indio_dev);



#else



#define iio_buffer_poll_addr NULL

#define iio_buffer_read_first_n_outer_addr NULL



static inline void iio_disable_all_buffers(struct iio_dev *indio_dev) {}



#endif



int iio_device_register_eventset(struct iio_dev *indio_dev);