From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Fri, 10 May 2019 18:40:35 +0000 (-0700)
Subject: Merge branch 'next' into for-linus
X-Git-Tag: v5.4~3^2~40
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14e0c7317ed58bcd15af5c3d09818ee0f2e3984c;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'next' into for-linus

Prepare input updates for 5.2 merge window.
---

14e0c7317ed58bcd15af5c3d09818ee0f2e3984c
diff --cc drivers/input/keyboard/snvs_pwrkey.c
index 4c67cf3,c8d7484..5342d8d
--- a/drivers/input/keyboard/snvs_pwrkey.c
+++ b/drivers/input/keyboard/snvs_pwrkey.c
@@@ -166,29 -164,13 +167,10 @@@ static int imx_snvs_pwrkey_probe(struc
  		return error;
  	}
  
 -	pdata->input = input;
 -	platform_set_drvdata(pdev, pdata);
 -
  	device_init_wakeup(&pdev->dev, pdata->wakeup);
- 
- 	return 0;
- }
- 
- static int __maybe_unused imx_snvs_pwrkey_suspend(struct device *dev)
- {
- 	struct platform_device *pdev = to_platform_device(dev);
- 	struct pwrkey_drv_data *pdata = platform_get_drvdata(pdev);
- 
- 	if (device_may_wakeup(&pdev->dev))
- 		enable_irq_wake(pdata->irq);
- 
- 	return 0;
- }
- 
- static int __maybe_unused imx_snvs_pwrkey_resume(struct device *dev)
- {
- 	struct platform_device *pdev = to_platform_device(dev);
- 	struct pwrkey_drv_data *pdata = platform_get_drvdata(pdev);
- 
- 	if (device_may_wakeup(&pdev->dev))
- 		disable_irq_wake(pdata->irq);
+ 	error = dev_pm_set_wake_irq(&pdev->dev, pdata->irq);
+ 	if (error)
+ 		dev_err(&pdev->dev, "irq wake enable failed.\n");
  
  	return 0;
  }