From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 18 Jan 2022 02:03:39 +0000 (-0800)
Subject: Merge tag 'v5.16' into next
X-Git-Tag: v6.6.17~3754^2~70^2~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=87a0b2fafc09766d8c55461a18345a1cfb10a7fe;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'v5.16' into next

Sync up with mainline to bring in the latest API changes.
---

87a0b2fafc09766d8c55461a18345a1cfb10a7fe
diff --cc drivers/input/misc/axp20x-pek.c
index c8f87df9,e09b1fa..04da791
--- a/drivers/input/misc/axp20x-pek.c
+++ b/drivers/input/misc/axp20x-pek.c
@@@ -339,7 -293,19 +323,7 @@@ static int axp20x_pek_probe(struct plat
  
  	axp20x_pek->axp20x = dev_get_drvdata(pdev->dev.parent);
  
- 	if (axp20x_pek_should_register_input(axp20x_pek, pdev)) {
 -	axp20x_pek->irq_dbr = platform_get_irq_byname(pdev, "PEK_DBR");
 -	if (axp20x_pek->irq_dbr < 0)
 -		return axp20x_pek->irq_dbr;
 -	axp20x_pek->irq_dbr = regmap_irq_get_virq(
 -			axp20x_pek->axp20x->regmap_irqc, axp20x_pek->irq_dbr);
 -
 -	axp20x_pek->irq_dbf = platform_get_irq_byname(pdev, "PEK_DBF");
 -	if (axp20x_pek->irq_dbf < 0)
 -		return axp20x_pek->irq_dbf;
 -	axp20x_pek->irq_dbf = regmap_irq_get_virq(
 -			axp20x_pek->axp20x->regmap_irqc, axp20x_pek->irq_dbf);
 -
+ 	if (axp20x_pek_should_register_input(axp20x_pek)) {
  		error = axp20x_pek_probe_input_device(axp20x_pek, pdev);
  		if (error)
  			return error;