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

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input 

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input:
  Input: remove obsolete setup parameters from input drivers
  Input: HIL - fix improper call to release_region()
  Input: hid-lgff - treat devices as joysticks unless told otherwise
  Input: HID - add support for Logitech Formula Force EX
  Input: gpio-keys - switch to common GPIO API
  Input: do not lock device when showing name, phys and uniq
  Input: i8042 - let serio bus suspend ports
  Input: psmouse - properly reset mouse on shutdown/suspend
parents cb4aaf46 62b529a7

drivers/input/input.c

+2 −15
Original line number Diff line number Diff line
@@ -588,18 +588,9 @@ static inline void input_proc_exit(void) { } 
static ssize_t input_dev_show_##name(struct class_device *dev, char *buf)	\

{										\

	struct input_dev *input_dev = to_input_dev(dev);			\

	int retval;								\

										\

	retval = mutex_lock_interruptible(&input_dev->mutex);			\

	if (retval)								\

		return retval;							\

										\

	retval = scnprintf(buf, PAGE_SIZE,					\

			   "%s\n", input_dev->name ? input_dev->name : "");	\

										\

	mutex_unlock(&input_dev->mutex);					\

										\

	return retval;								\

	return scnprintf(buf, PAGE_SIZE, "%s\n",				\

			 input_dev->name ? input_dev->name : "");		\

}										\

static CLASS_DEVICE_ATTR(name, S_IRUGO, input_dev_show_##name, NULL);
@@ -1049,10 +1040,6 @@ void input_unregister_device(struct input_dev *dev) 
	sysfs_remove_group(&dev->cdev.kobj, &input_dev_id_attr_group);

	sysfs_remove_group(&dev->cdev.kobj, &input_dev_attr_group);



	mutex_lock(&dev->mutex);

	dev->name = dev->phys = dev->uniq = NULL;

	mutex_unlock(&dev->mutex);



	class_device_unregister(&dev->cdev);



	input_wakeup_procfs_readers();

drivers/input/joystick/amijoy.c

+0 −2
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ static int amijoy[2] = { 0, 1 }; 
module_param_array_named(map, amijoy, uint, NULL, 0);

MODULE_PARM_DESC(map, "Map of attached joysticks in form of <a>,<b> (default is 0,1)");



__obsolete_setup("amijoy=");



static int amijoy_used;

static DEFINE_MUTEX(amijoy_mutex);

static struct input_dev *amijoy_dev[2];

drivers/input/joystick/analog.c

+0 −2
Original line number Diff line number Diff line
@@ -58,8 +58,6 @@ static int analog_options[ANALOG_PORTS]; 
module_param_array_named(map, js, charp, &js_nargs, 0);

MODULE_PARM_DESC(map, "Describes analog joysticks type/capabilities");



__obsolete_setup("js=");



/*

 * Times, feature definitions.

 */

drivers/input/joystick/db9.c

+0 −4
Original line number Diff line number Diff line
@@ -59,10 +59,6 @@ MODULE_PARM_DESC(dev2, "Describes second attached device (<parport#>,<type>)"); 
module_param_array_named(dev3, db9[2].args, int, &db9[2].nargs, 0);

MODULE_PARM_DESC(dev3, "Describes third attached device (<parport#>,<type>)");



__obsolete_setup("db9=");

__obsolete_setup("db9_2=");

__obsolete_setup("db9_3=");



#define DB9_ARG_PARPORT		0

#define DB9_ARG_MODE		1

drivers/input/joystick/gamecon.c

+0 −6
Original line number Diff line number Diff line
@@ -60,10 +60,6 @@ MODULE_PARM_DESC(map2, "Describes second set of devices"); 
module_param_array_named(map3, gc[2].args, int, &gc[2].nargs, 0);

MODULE_PARM_DESC(map3, "Describes third set of devices");



__obsolete_setup("gc=");

__obsolete_setup("gc_2=");

__obsolete_setup("gc_3=");



/* see also gs_psx_delay parameter in PSX support section */



#define GC_SNES		1
@@ -403,8 +399,6 @@ static int gc_psx_delay = GC_PSX_DELAY; 
module_param_named(psx_delay, gc_psx_delay, uint, 0);

MODULE_PARM_DESC(psx_delay, "Delay when accessing Sony PSX controller (usecs)");



__obsolete_setup("gc_psx_delay=");



static short gc_psx_abs[] = { ABS_X, ABS_Y, ABS_RX, ABS_RY, ABS_HAT0X, ABS_HAT0Y };

static short gc_psx_btn[] = { BTN_TL, BTN_TR, BTN_TL2, BTN_TR2, BTN_A, BTN_B, BTN_X, BTN_Y,

				BTN_START, BTN_SELECT, BTN_THUMBL, BTN_THUMBR };

CRA Git | Maintained and supported by SUSTech CRA and CCSE