From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 Nov 2024 18:31:39 +0000 (-0800)
Subject: Merge tag 'input-for-v6.13-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: microblaze-v6.16~559
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=3e51108c72e8adbcf3180ed40527a2a9d2d0123b;p=linux-2.6-microblaze.git

Merge tag 'input-for-v6.13-rc0' of git://git./linux/kernel/git/dtor/input

Pull input updates from Dmitry Torokhov:

 - support for NT36672A touchscreen added to novatek-nvt-ts driver

 - a change to ads7846 driver to prevent XPT2046 from locking up

 - a change switching platform input dirves back to using remove()
   method (from remove_new())

 - updates to a number of input drivers to use the new cleanup
   facilities (__free(...), guard(), and scoped-guard()) which ensure
   that the resources and locks are released properly and automatically

 - other assorted driver cleanups and fixes.

* tag 'input-for-v6.13-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (109 commits)
  Input: mpr121 - use devm_regulator_get_enable_read_voltage()
  Input: sun4i-lradc-keys - don't include 'pm_wakeup.h' directly
  Input: spear-keyboard - don't include 'pm_wakeup.h' directly
  Input: cypress-sf - constify struct i2c_device_id
  Input: ads7846 - increase xfer array size in 'struct ser_req'
  Input: fix the input_event struct documentation
  Input: i8042 - fix typo dublicate to duplicate
  Input: ads7846 - add dummy command register clearing cycle
  Input: cs40l50 - fix wrong usage of INIT_WORK()
  Input: introduce notion of passive observers for input handlers
  Input: maple_keyb - use guard notation when acquiring mutex
  Input: locomokbd - use guard notation when acquiring spinlock
  Input: hilkbd - use guard notation when acquiring spinlock
  Input: synaptics-rmi4 - switch to using cleanup functions in F34
  Input: synaptics - fix a typo
  dt-bindings: input: rotary-encoder: Fix "rotary-encoder,rollover" type
  Input: omap-keypad - use guard notation when acquiring mutex
  Input: imagis - fix warning regarding 'imagis_3038_data' being unused
  Input: userio - remove unneeded semicolon
  Input: sparcspkr - use cleanup facility for device_node
  ...
---

3e51108c72e8adbcf3180ed40527a2a9d2d0123b
diff --cc drivers/input/keyboard/ep93xx_keypad.c
index dcbc50304a5a,144c73540d45..817c23438f6e
--- a/drivers/input/keyboard/ep93xx_keypad.c
+++ b/drivers/input/keyboard/ep93xx_keypad.c
@@@ -286,10 -313,9 +282,10 @@@ static struct platform_driver ep93xx_ke
  	.driver		= {
  		.name	= "ep93xx-keypad",
  		.pm	= pm_sleep_ptr(&ep93xx_keypad_pm_ops),
 +		.of_match_table = ep93xx_keypad_of_ids,
  	},
  	.probe		= ep93xx_keypad_probe,
- 	.remove_new	= ep93xx_keypad_remove,
+ 	.remove		= ep93xx_keypad_remove,
  };
  module_platform_driver(ep93xx_keypad_driver);