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

Commit 21c9eb7c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging/IIO fixes from Greg KH:
 "These are mostly all IIO driver fixes, resolving a number of tiny
  issues. There's also a ccree and lustre fix in here as well, both fix
  problems found in those codebases.

  All have been in linux-next with no reported issues"

* tag 'staging-4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: ccree: fix buffer copy
  staging/lustre/lov: remove set_fs() call from lov_getstripe()
  staging: ccree: add CRYPTO dependency
  iio: adc: sun4i-gpadc-iio: fix parent device being used in devm function
  iio: light: ltr501 Fix interchanged als/ps register field
  iio: adc: bcm_iproc_adc: swap primary and secondary isr handler's
  iio: trigger: fix NULL pointer dereference in iio_trigger_write_current()
  iio: adc: max9611: Fix attribute measure unit
  iio: adc: ti_am335x_adc: allocating too much in probe
  iio: adc: sun4i-gpadc-iio: Fix module autoload when OF devices are registered
  iio: adc: sun4i-gpadc-iio: Fix module autoload when PLATFORM devices are registered
  iio: proximity: as3935: fix iio_trigger_poll issue
  iio: proximity: as3935: fix AS3935_INT mask
  iio: adc: Max9611: checking for ERR_PTR instead of NULL in probe
  iio: proximity: as3935: recalibrate RCO after resume
parents 246baac2 26f4b1f7

drivers/iio/adc/bcm_iproc_adc.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -143,7 +143,7 @@ static void iproc_adc_reg_dump(struct iio_dev *indio_dev) 
	iproc_adc_dbg_reg(dev, adc_priv, IPROC_SOFT_BYPASS_DATA);

	iproc_adc_dbg_reg(dev, adc_priv, IPROC_SOFT_BYPASS_DATA);

}

}





static irqreturn_t iproc_adc_interrupt_handler(int irq, void *data)

static irqreturn_t iproc_adc_interrupt_thread(int irq, void *data)

{

{

	u32 channel_intr_status;

	u32 channel_intr_status;

	u32 intr_status;

	u32 intr_status;
@@ -167,7 +167,7 @@ static irqreturn_t iproc_adc_interrupt_handler(int irq, void *data) 
	return IRQ_NONE;

	return IRQ_NONE;

}

}





static irqreturn_t iproc_adc_interrupt_thread(int irq, void *data)

static irqreturn_t iproc_adc_interrupt_handler(int irq, void *data)

{

{

	irqreturn_t retval = IRQ_NONE;

	irqreturn_t retval = IRQ_NONE;

	struct iproc_adc_priv *adc_priv;

	struct iproc_adc_priv *adc_priv;
@@ -181,7 +181,7 @@ static irqreturn_t iproc_adc_interrupt_thread(int irq, void *data) 
	adc_priv = iio_priv(indio_dev);

	adc_priv = iio_priv(indio_dev);





	regmap_read(adc_priv->regmap, IPROC_INTERRUPT_STATUS, &intr_status);

	regmap_read(adc_priv->regmap, IPROC_INTERRUPT_STATUS, &intr_status);

	dev_dbg(&indio_dev->dev, "iproc_adc_interrupt_thread(),INTRPT_STS:%x\n",

	dev_dbg(&indio_dev->dev, "iproc_adc_interrupt_handler(),INTRPT_STS:%x\n",

			intr_status);

			intr_status);





	intr_channels = (intr_status & IPROC_ADC_INTR_MASK) >> IPROC_ADC_INTR;

	intr_channels = (intr_status & IPROC_ADC_INTR_MASK) >> IPROC_ADC_INTR;
@@ -566,8 +566,8 @@ static int iproc_adc_probe(struct platform_device *pdev) 
	}

	}





	ret = devm_request_threaded_irq(&pdev->dev, adc_priv->irqno,

	ret = devm_request_threaded_irq(&pdev->dev, adc_priv->irqno,

				iproc_adc_interrupt_thread,

				iproc_adc_interrupt_handler,

				iproc_adc_interrupt_handler,

				iproc_adc_interrupt_thread,

				IRQF_SHARED, "iproc-adc", indio_dev);

				IRQF_SHARED, "iproc-adc", indio_dev);

	if (ret) {

	if (ret) {

		dev_err(&pdev->dev, "request_irq error %d\n", ret);

		dev_err(&pdev->dev, "request_irq error %d\n", ret);

drivers/iio/adc/max9611.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -438,10 +438,10 @@ static ssize_t max9611_shunt_resistor_show(struct device *dev, 
	struct max9611_dev *max9611 = iio_priv(dev_to_iio_dev(dev));

	struct max9611_dev *max9611 = iio_priv(dev_to_iio_dev(dev));

	unsigned int i, r;

	unsigned int i, r;





	i = max9611->shunt_resistor_uohm / 1000;

	i = max9611->shunt_resistor_uohm / 1000000;

	r = max9611->shunt_resistor_uohm % 1000;

	r = max9611->shunt_resistor_uohm % 1000000;





	return sprintf(buf, "%u.%03u\n", i, r);

	return sprintf(buf, "%u.%06u\n", i, r);

}

}





static IIO_DEVICE_ATTR(in_power_shunt_resistor, 0444,

static IIO_DEVICE_ATTR(in_power_shunt_resistor, 0444,
@@ -536,8 +536,8 @@ static int max9611_probe(struct i2c_client *client, 
	int ret;

	int ret;





	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*max9611));

	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*max9611));

	if (IS_ERR(indio_dev))

	if (!indio_dev)

		return PTR_ERR(indio_dev);

		return -ENOMEM;





	i2c_set_clientdata(client, indio_dev);

	i2c_set_clientdata(client, indio_dev);

drivers/iio/adc/sun4i-gpadc-iio.c

+24 −14
Original line number Original line Diff line number Diff line
@@ -105,6 +105,8 @@ struct sun4i_gpadc_iio { 
	bool				no_irq;

	bool				no_irq;

	/* prevents concurrent reads of temperature and ADC */

	/* prevents concurrent reads of temperature and ADC */

	struct mutex			mutex;

	struct mutex			mutex;

	struct thermal_zone_device	*tzd;

	struct device			*sensor_device;

};

};





#define SUN4I_GPADC_ADC_CHANNEL(_channel, _name) {		\

#define SUN4I_GPADC_ADC_CHANNEL(_channel, _name) {		\
@@ -502,7 +504,6 @@ static int sun4i_gpadc_probe_dt(struct platform_device *pdev, 
{

{

	struct sun4i_gpadc_iio *info = iio_priv(indio_dev);

	struct sun4i_gpadc_iio *info = iio_priv(indio_dev);

	const struct of_device_id *of_dev;

	const struct of_device_id *of_dev;

	struct thermal_zone_device *tzd;

	struct resource *mem;

	struct resource *mem;

	void __iomem *base;

	void __iomem *base;

	int ret;

	int ret;
@@ -532,13 +533,14 @@ static int sun4i_gpadc_probe_dt(struct platform_device *pdev, 
	if (!IS_ENABLED(CONFIG_THERMAL_OF))

	if (!IS_ENABLED(CONFIG_THERMAL_OF))

		return 0;

		return 0;





	tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, 0, info,

	info->sensor_device = &pdev->dev;

						   &sun4i_ts_tz_ops);

	info->tzd = thermal_zone_of_sensor_register(info->sensor_device, 0,

	if (IS_ERR(tzd))

						    info, &sun4i_ts_tz_ops);

	if (IS_ERR(info->tzd))

		dev_err(&pdev->dev, "could not register thermal sensor: %ld\n",

		dev_err(&pdev->dev, "could not register thermal sensor: %ld\n",

			PTR_ERR(tzd));

			PTR_ERR(info->tzd));





	return PTR_ERR_OR_ZERO(tzd);

	return PTR_ERR_OR_ZERO(info->tzd);

}

}





static int sun4i_gpadc_probe_mfd(struct platform_device *pdev,

static int sun4i_gpadc_probe_mfd(struct platform_device *pdev,
@@ -584,15 +586,15 @@ static int sun4i_gpadc_probe_mfd(struct platform_device *pdev, 
		 * of_node, and the device from this driver as third argument to

		 * of_node, and the device from this driver as third argument to

		 * return the temperature.

		 * return the temperature.

		 */

		 */

		struct thermal_zone_device *tzd;

		info->sensor_device = pdev->dev.parent;

		tzd = devm_thermal_zone_of_sensor_register(pdev->dev.parent, 0,

		info->tzd = thermal_zone_of_sensor_register(info->sensor_device,

							   info,

							    0, info,

							    &sun4i_ts_tz_ops);

							    &sun4i_ts_tz_ops);

		if (IS_ERR(tzd)) {

		if (IS_ERR(info->tzd)) {

			dev_err(&pdev->dev,

			dev_err(&pdev->dev,

				"could not register thermal sensor: %ld\n",

				"could not register thermal sensor: %ld\n",

				PTR_ERR(tzd));

				PTR_ERR(info->tzd));

			return PTR_ERR(tzd);

			return PTR_ERR(info->tzd);

		}

		}

	} else {

	} else {

		indio_dev->num_channels =

		indio_dev->num_channels =
@@ -688,7 +690,13 @@ static int sun4i_gpadc_remove(struct platform_device *pdev) 




	pm_runtime_put(&pdev->dev);

	pm_runtime_put(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

	if (!info->no_irq && IS_ENABLED(CONFIG_THERMAL_OF))



	if (!IS_ENABLED(CONFIG_THERMAL_OF))

		return 0;



	thermal_zone_of_sensor_unregister(info->sensor_device, info->tzd);



	if (!info->no_irq)

		iio_map_array_unregister(indio_dev);

		iio_map_array_unregister(indio_dev);





	return 0;

	return 0;
@@ -700,6 +708,7 @@ static const struct platform_device_id sun4i_gpadc_id[] = { 
	{ "sun6i-a31-gpadc-iio", (kernel_ulong_t)&sun6i_gpadc_data },

	{ "sun6i-a31-gpadc-iio", (kernel_ulong_t)&sun6i_gpadc_data },

	{ /* sentinel */ },

	{ /* sentinel */ },

};

};

MODULE_DEVICE_TABLE(platform, sun4i_gpadc_id);





static struct platform_driver sun4i_gpadc_driver = {

static struct platform_driver sun4i_gpadc_driver = {

	.driver = {

	.driver = {
@@ -711,6 +720,7 @@ static struct platform_driver sun4i_gpadc_driver = { 
	.probe = sun4i_gpadc_probe,

	.probe = sun4i_gpadc_probe,

	.remove = sun4i_gpadc_remove,

	.remove = sun4i_gpadc_remove,

};

};

MODULE_DEVICE_TABLE(of, sun4i_gpadc_of_id);





module_platform_driver(sun4i_gpadc_driver);

module_platform_driver(sun4i_gpadc_driver);

drivers/iio/adc/ti_am335x_adc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -614,7 +614,7 @@ static int tiadc_probe(struct platform_device *pdev) 
		return -EINVAL;

		return -EINVAL;

	}

	}





	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*indio_dev));

	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*adc_dev));

	if (indio_dev == NULL) {

	if (indio_dev == NULL) {

		dev_err(&pdev->dev, "failed to allocate iio device\n");

		dev_err(&pdev->dev, "failed to allocate iio device\n");

		return -ENOMEM;

		return -ENOMEM;

drivers/iio/industrialio-trigger.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -451,6 +451,7 @@ static ssize_t iio_trigger_write_current(struct device *dev, 
	return len;

	return len;





out_trigger_put:

out_trigger_put:

	if (trig)

		iio_trigger_put(trig);

		iio_trigger_put(trig);

	return ret;

	return ret;

}

}