linux-next: manual merge of the workqueues tree with the omap_dss2 tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi Tejun,

Today's linux-next merge of the workqueues tree got a conflict in
drivers/video/omap2/displays/panel-taal.c between commit 5e56ad44b4d2
("OMAPDSS: Taal: use devm_* functions") from the omap_dss2 tree and
commit 203b42f73174 ("workqueue: make deferrable delayed_work initializer
names consistent") from the workqueues 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/video/omap2/displays/panel-taal.c
index 4cf9416,6b5e6e0..0000000
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@@ -925,50 -900,29 +925,50 @@@ static int taal_probe(struct omap_dss_d
  
  	atomic_set(&td->do_update, 0);
  
 -	td->workqueue = create_singlethread_workqueue("taal_esd");
 -	if (td->workqueue == NULL) {
 -		dev_err(&dssdev->dev, "can't create ESD workqueue\n");
 -		r = -ENOMEM;
 -		goto err_wq;
 +	if (gpio_is_valid(td->reset_gpio)) {
 +		r = devm_gpio_request_one(&dssdev->dev, td->reset_gpio,
 +				GPIOF_OUT_INIT_LOW, "taal rst");
 +		if (r) {
 +			dev_err(&dssdev->dev, "failed to request reset gpio\n");
 +			return r;
 +		}
  	}
 -	INIT_DEFERRABLE_WORK(&td->esd_work, taal_esd_work);
 -	INIT_DELAYED_WORK(&td->ulps_work, taal_ulps_work);
  
 -	dev_set_drvdata(&dssdev->dev, td);
 +	if (gpio_is_valid(td->ext_te_gpio)) {
 +		r = devm_gpio_request_one(&dssdev->dev, td->ext_te_gpio,
 +				GPIOF_IN, "taal irq");
 +		if (r) {
 +			dev_err(&dssdev->dev, "GPIO request failed\n");
 +			return r;
 +		}
 +
 +		r = devm_request_irq(&dssdev->dev, gpio_to_irq(td->ext_te_gpio),
 +				taal_te_isr,
 +				IRQF_TRIGGER_RISING,
 +				"taal vsync", dssdev);
  
 -	if (gpio_is_valid(panel_data->reset_gpio)) {
 -		r = gpio_request_one(panel_data->reset_gpio, GPIOF_OUT_INIT_LOW,
 -				"taal rst");
  		if (r) {
 -			dev_err(&dssdev->dev, "failed to request reset gpio\n");
 -			goto err_rst_gpio;
 +			dev_err(&dssdev->dev, "IRQ request failed\n");
 +			return r;
  		}
 +
- 		INIT_DELAYED_WORK_DEFERRABLE(&td->te_timeout_work,
++		INIT_DEFERRABLE_WORK(&td->te_timeout_work,
 +					taal_te_timeout_work_callback);
 +
 +		dev_dbg(&dssdev->dev, "Using GPIO TE\n");
  	}
  
 +	td->workqueue = create_singlethread_workqueue("taal_esd");
 +	if (td->workqueue == NULL) {
 +		dev_err(&dssdev->dev, "can't create ESD workqueue\n");
 +		return -ENOMEM;
 +	}
- 	INIT_DELAYED_WORK_DEFERRABLE(&td->esd_work, taal_esd_work);
++	INIT_DEFERRABLE_WORK(&td->esd_work, taal_esd_work);
 +	INIT_DELAYED_WORK(&td->ulps_work, taal_ulps_work);
 +
  	taal_hw_reset(dssdev);
  
 -	if (panel_data->use_dsi_backlight) {
 +	if (td->use_dsi_backlight) {
  		memset(&props, 0, sizeof(struct backlight_properties));
  		props.max_brightness = 255;

Attachment: pgpLqFgYF8KaL.pgp
Description: PGP signature