Commit a12deb44 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'input-for-v6.7-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input updates from Dmitry Torokhov:

 - a number of input drivers has been converted to use facilities
   provided by the device core to instantiate driver-specific attributes
   instead of using devm_device_add_group() and similar APIs

 - platform input devices have been converted to use remove() callback
   returning void

 - a fix for use-after-free when tearing down a Synaptics RMI device

 - a few flexible arrays in input structures have been annotated with
   __counted_by to help hardening efforts

 - handling of vddio supply in cyttsp5 driver

 - other miscellaneous fixups

* tag 'input-for-v6.7-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (86 commits)
  Input: walkera0701 - use module_parport_driver macro to simplify the code
  Input: synaptics-rmi4 - fix use after free in rmi_unregister_function()
  dt-bindings: input: fsl,scu-key: Document wakeup-source
  Input: cyttsp5 - add handling for vddio regulator
  dt-bindings: input: cyttsp5: document vddio-supply
  Input: tegra-kbc - use device_get_match_data()
  Input: Annotate struct ff_device with __counted_by
  Input: axp20x-pek - avoid needless newline removal
  Input: mt - annotate struct input_mt with __counted_by
  Input: leds - annotate struct input_leds with __counted_by
  Input: evdev - annotate struct evdev_client with __counted_by
  Input: synaptics-rmi4 - replace deprecated strncpy
  Input: wm97xx-core - convert to platform remove callback returning void
  Input: wm831x-ts - convert to platform remove callback returning void
  Input: ti_am335x_tsc - convert to platform remove callback returning void
  Input: sun4i-ts - convert to platform remove callback returning void
  Input: stmpe-ts - convert to platform remove callback returning void
  Input: pcap_ts - convert to platform remove callback returning void
  Input: mc13783_ts - convert to platform remove callback returning void
  Input: mainstone-wm97xx - convert to platform remove callback returning void
  ...
parents ace92fd9 cdd5b5a9

Documentation/devicetree/bindings/input/fsl,scu-key.yaml

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ properties: 
  linux,keycodes:

    maxItems: 1



  wakeup-source: true



required:

  - compatible

  - linux,keycodes

Documentation/devicetree/bindings/input/touchscreen/cypress,tt21000.yaml

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ properties: 
  vdd-supply:

    description: Regulator for voltage.



  vddio-supply:

    description: Optional Regulator for I/O voltage.



  reset-gpios:

    maxItems: 1

drivers/input/evdev.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ struct evdev_client { 
	bool revoked;

	unsigned long *evmasks[EV_CNT];

	unsigned int bufsize;

	struct input_event buffer[];

	struct input_event buffer[] __counted_by(bufsize);

};



static size_t evdev_get_mask_cnt(unsigned int type)

drivers/input/input-leds.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ struct input_led { 
struct input_leds {

	struct input_handle handle;

	unsigned int num_leds;

	struct input_led leds[];

	struct input_led leds[] __counted_by(num_leds);

};



static enum led_brightness input_leds_brightness_get(struct led_classdev *cdev)

drivers/input/joystick/walkera0701.c

+1 −12
Original line number Diff line number Diff line
@@ -296,15 +296,4 @@ static struct parport_driver walkera0701_parport_driver = { 
	.devmodel = true,

};



static int __init walkera0701_init(void)

{

	return parport_register_driver(&walkera0701_parport_driver);

}



static void __exit walkera0701_exit(void)

{

	parport_unregister_driver(&walkera0701_parport_driver);

}



module_init(walkera0701_init);

module_exit(walkera0701_exit);
 
module_parport_driver(walkera0701_parport_driver);