linux-next: manual merge of the iio tree with the iio-fixes tree

[Mark Brown]

Hi all,

Today's linux-next merge of the iio tree got a conflict in:

  drivers/iio/humidity/hid-sensor-humidity.c

between commit:

  340d44bdf9db0 ("iio: humidity: hid-sensor-humidity: Use per-instance callbacks")

from the iio-fixes tree and commit:

  5ee5d306f1bd1 ("iio: humidity: hid-sensor-humidity: convert probe and teardown to devm-managed resources")

from the iio tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/iio/humidity/hid-sensor-humidity.c
index aa7d4f25c3937,12c88efe66be6..0000000000000
--- a/drivers/iio/humidity/hid-sensor-humidity.c
+++ b/drivers/iio/humidity/hid-sensor-humidity.c
@@@ -236,39 -241,13 +237,17 @@@ static int hid_humidity_probe(struct pl
  
  	platform_set_drvdata(pdev, indio_dev);
  
 -	humidity_callbacks.pdev = pdev;
 +	humid_st->callbacks = (struct hid_sensor_hub_callbacks) {
 +		.send_event = humidity_proc_event,
 +		.capture_sample = humidity_capture_sample,
 +		.pdev = pdev,
 +	};
- 	ret = sensor_hub_register_callback(hsdev, HID_USAGE_SENSOR_HUMIDITY,
+ 	ret = devm_sensor_hub_register_callback(dev, hsdev, HID_USAGE_SENSOR_HUMIDITY,
 -						&humidity_callbacks);
 +					   &humid_st->callbacks);
  	if (ret)
- 		goto error_remove_trigger;
+ 		return ret;
  
- 	ret = iio_device_register(indio_dev);
- 	if (ret)
- 		goto error_remove_callback;
- 
- 	return ret;
- 
- error_remove_callback:
- 	sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_HUMIDITY);
- error_remove_trigger:
- 	hid_sensor_remove_trigger(indio_dev, &humid_st->common_attributes);
- 	return ret;
- }
- 
- /* Function to deinitialize the processing for usage id */
- static void hid_humidity_remove(struct platform_device *pdev)
- {
- 	struct hid_sensor_hub_device *hsdev = dev_get_platdata(&pdev->dev);
- 	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
- 	struct hid_humidity_state *humid_st = iio_priv(indio_dev);
- 
- 	iio_device_unregister(indio_dev);
- 	sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_HUMIDITY);
- 	hid_sensor_remove_trigger(indio_dev, &humid_st->common_attributes);
+ 	return devm_iio_device_register(dev, indio_dev);
  }
  
  static const struct platform_device_id hid_humidity_ids[] = {

Attachment: signature.asc
Description: PGP signature