linux-next: manual merge of the akpm-current tree with the stagingtree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
drivers/rtc/rtc-hid-sensor-time.c between commit 476b9547e872 ("HID RTC:
Open sensor hub open close") from the staging tree and commit
356c3c0a98b8 ("drivers/rtc/rtc-hid-sensor-time.c: enable HID input
processing early") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/rtc/rtc-hid-sensor-time.c
index 45560ffb038d,22254f08cea2..000000000000
--- a/drivers/rtc/rtc-hid-sensor-time.c
+++ b/drivers/rtc/rtc-hid-sensor-time.c
@@@ -275,21 -275,22 +275,28 @@@ static int hid_time_probe(struct platfo
  		return ret;
  	}
  
 +	ret = sensor_hub_device_open(hsdev);
 +	if (ret) {
 +		dev_err(&pdev->dev, "failed to open sensor hub device!\n");
 +		goto err_open;
 +	}
 +
+ 	/*
+ 	 * Enable HID input processing early in order to be able to read the
+ 	 * clock already in devm_rtc_device_register().
+ 	 */
+ 	hid_device_io_start(hsdev->hdev);
+ 
  	time_state->rtc = devm_rtc_device_register(&pdev->dev,
  					"hid-sensor-time", &hid_time_rtc_ops,
  					THIS_MODULE);
  
  	if (IS_ERR_OR_NULL(time_state->rtc)) {
+ 		hid_device_io_stop(hsdev->hdev);
  		ret = time_state->rtc ? PTR_ERR(time_state->rtc) : -ENODEV;
  		time_state->rtc = NULL;
 -		sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_TIME);
  		dev_err(&pdev->dev, "rtc device register failed!\n");
 +		goto err_rtc;
  	}
  
  	return ret;
@@@ -303,9 -298,8 +310,9 @@@ err_open
  
  static int hid_time_remove(struct platform_device *pdev)
  {
- 	struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
+ 	struct hid_sensor_hub_device *hsdev = dev_get_platdata(&pdev->dev);
  
 +	sensor_hub_device_close(hsdev);
  	sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_TIME);
  
  	return 0;

Attachment: pgp00000.pgp
Description: PGP signature