Subject: linux-next: manual merge of the thermal-soc tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 15 May 2019 10:05:12 +1000

Hi all,

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

  drivers/hwmon/pwm-fan.c

between commits:

  6b1ec4789fb1 ("hwmon: (pwm-fan) Add RPM support via external interrupt")
  841cf6767bf6 ("hwmon: (pwm-fan) Report probe errors consistently")

from Linus' tree and commit:

  37bcec5d9f71 ("hwmon: (pwm-fan) Use devm_thermal_of_cooling_device_register")

from the thermal-soc 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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/hwmon/pwm-fan.c
index eead8afe6447,0243ba70107e..000000000000
--- a/drivers/hwmon/pwm-fan.c
+++ b/drivers/hwmon/pwm-fan.c
@@@ -280,9 -225,8 +291,9 @@@ static int pwm_fan_probe(struct platfor
  	struct device *hwmon;
  	int ret;
  	struct pwm_state state = { };
 +	u32 ppr = 2;
  
- 	ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
+ 	ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
  	if (!ctx)
  		return -ENOMEM;
  
@@@ -300,11 -244,7 +311,11 @@@
  
  	platform_set_drvdata(pdev, ctx);
  
 +	ctx->irq = platform_get_irq(pdev, 0);
 +	if (ctx->irq == -EPROBE_DEFER)
 +		return ctx->irq;
 +
- 	ctx->reg_en = devm_regulator_get_optional(&pdev->dev, "fan");
+ 	ctx->reg_en = devm_regulator_get_optional(dev, "fan");
  	if (IS_ERR(ctx->reg_en)) {
  		if (PTR_ERR(ctx->reg_en) != -ENODEV)
  			return PTR_ERR(ctx->reg_en);
@@@ -328,93 -269,38 +340,66 @@@
  
  	ret = pwm_apply_state(ctx->pwm, &state);
  	if (ret) {
- 		dev_err(&pdev->dev, "Failed to configure PWM: %d\n", ret);
- 		goto err_reg_disable;
 -		dev_err(dev, "Failed to configure PWM\n");
++		dev_err(dev, "Failed to configure PWM: %d\n", ret);
+ 		return ret;
  	}
+ 	devm_add_action_or_reset(dev, pwm_fan_pwm_disable, ctx->pwm);
  
 +	timer_setup(&ctx->rpm_timer, sample_timer, 0);
 +
- 	of_property_read_u32(pdev->dev.of_node, "pulses-per-revolution", &ppr);
++	of_property_read_u32(dev->of_node, "pulses-per-revolution", &ppr);
 +	ctx->pulses_per_revolution = ppr;
 +	if (!ctx->pulses_per_revolution) {
- 		dev_err(&pdev->dev, "pulses-per-revolution can't be zero.\n");
++		dev_err(dev, "pulses-per-revolution can't be zero.\n");
 +		ret = -EINVAL;
- 		goto err_pwm_disable;
++		return ret;
 +	}
 +
 +	if (ctx->irq > 0) {
- 		ret = devm_request_irq(&pdev->dev, ctx->irq, pulse_handler, 0,
++		ret = devm_request_irq(dev, ctx->irq, pulse_handler, 0,
 +				       pdev->name, ctx);
 +		if (ret) {
- 			dev_err(&pdev->dev,
- 				"Failed to request interrupt: %d\n", ret);
- 			goto err_pwm_disable;
++			dev_err(dev, "Failed to request interrupt: %d\n", ret);
++			return ret;
 +		}
 +		ctx->sample_start = ktime_get();
 +		mod_timer(&ctx->rpm_timer, jiffies + HZ);
 +	}
 +
- 	hwmon = devm_hwmon_device_register_with_groups(&pdev->dev, "pwmfan",
+ 	hwmon = devm_hwmon_device_register_with_groups(dev, "pwmfan",
  						       ctx, pwm_fan_groups);
  	if (IS_ERR(hwmon)) {
 -		dev_err(dev, "Failed to register hwmon device\n");
 -		return PTR_ERR(hwmon);
 +		ret = PTR_ERR(hwmon);
- 		dev_err(&pdev->dev,
- 			"Failed to register hwmon device: %d\n", ret);
++		dev_err(dev, "Failed to register hwmon device: %d\n", ret);
 +		goto err_del_timer;
  	}
  
- 	ret = pwm_fan_of_get_cooling_data(&pdev->dev, ctx);
+ 	ret = pwm_fan_of_get_cooling_data(dev, ctx);
  	if (ret)
 -		return ret;
 +		goto err_del_timer;
  
  	ctx->pwm_fan_state = ctx->pwm_fan_max_state;
  	if (IS_ENABLED(CONFIG_THERMAL)) {
- 		cdev = thermal_of_cooling_device_register(pdev->dev.of_node,
- 							  "pwm-fan", ctx,
- 							  &pwm_fan_cooling_ops);
+ 		cdev = devm_thermal_of_cooling_device_register(dev,
+ 			dev->of_node, "pwm-fan", ctx, &pwm_fan_cooling_ops);
  		if (IS_ERR(cdev)) {
 +			ret = PTR_ERR(cdev);
- 			dev_err(&pdev->dev,
+ 			dev_err(dev,
 -				"Failed to register pwm-fan as cooling device");
 -			return PTR_ERR(cdev);
 +				"Failed to register pwm-fan as cooling device: %d\n",
 +				ret);
 +			goto err_del_timer;
  		}
  		ctx->cdev = cdev;
  		thermal_cdev_update(cdev);
  	}
  
  	return 0;
 +
 +err_del_timer:
 +	del_timer_sync(&ctx->rpm_timer);
- 
- err_pwm_disable:
- 	state.enabled = false;
- 	pwm_apply_state(ctx->pwm, &state);
- 
- err_reg_disable:
- 	if (ctx->reg_en)
- 		regulator_disable(ctx->reg_en);
- 
 +	return ret;
  }
  
- static int pwm_fan_remove(struct platform_device *pdev)
- {
- 	struct pwm_fan_ctx *ctx = platform_get_drvdata(pdev);
- 
- 	thermal_cooling_device_unregister(ctx->cdev);
- 	del_timer_sync(&ctx->rpm_timer);
- 
- 	if (ctx->pwm_value)
- 		pwm_disable(ctx->pwm);
- 
- 	if (ctx->reg_en)
- 		regulator_disable(ctx->reg_en);
- 
- 	return 0;
- }
- 
  #ifdef CONFIG_PM_SLEEP
  static int pwm_fan_suspend(struct device *dev)
  {