Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b3bf204 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elantech - touchpad driver miss-recognising logitech mice
  Input: synaptics - ensure we reset the device on resume
  Input: usbtouchscreen - fix eGalax HID ignoring
  Input: ambakmi - fix timeout handling in amba_kmi_write()
  Input: pxa930_trkball - fix write timeout handling
  Input: struct device - replace bus_id with dev_name(), dev_set_name()
  Input: bf54x-keys - fix debounce time validation
  Input: spitzkbd - mark probe function as __devinit
  Input: omap-keypad - mark probe function as __devinit
  Input: corgi_ts - mark probe function as __devinit
  Input: corgikbd - mark probe function as __devinit
  Input: uvc - the button on the camera is KEY_CAMERA
  Input: psmouse - make MOUSE_PS2_LIFEBOOK depend on X86
  Input: atkbd - make forced_release_keys[] static
  Input: usbtouchscreen - allow reporting calibrated data
parents 36b31106 9ab7b25e

drivers/input/keyboard/atkbd.c

+2 −2
Original line number Diff line number Diff line
@@ -839,7 +839,7 @@ static void atkbd_disconnect(struct serio *serio) 
 */

static void atkbd_dell_laptop_keymap_fixup(struct atkbd *atkbd)

{

	const unsigned int forced_release_keys[] = {

	static const unsigned int forced_release_keys[] = {

		0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8f, 0x93,

	};

	int i;
@@ -856,7 +856,7 @@ static void atkbd_dell_laptop_keymap_fixup(struct atkbd *atkbd) 
 */

static void atkbd_hp_keymap_fixup(struct atkbd *atkbd)

{

	const unsigned int forced_release_keys[] = {

	static const unsigned int forced_release_keys[] = {

		0x94,

	};

	int i;

drivers/input/keyboard/bf54x-keys.c

+2 −2
Original line number Diff line number Diff line
@@ -209,8 +209,8 @@ static int __devinit bfin_kpad_probe(struct platform_device *pdev) 
		goto out;

	}



	if (!pdata->debounce_time || !pdata->debounce_time > MAX_MULT ||

	    !pdata->coldrive_time || !pdata->coldrive_time > MAX_MULT) {

	if (!pdata->debounce_time || pdata->debounce_time > MAX_MULT ||

	    !pdata->coldrive_time || pdata->coldrive_time > MAX_MULT) {

		printk(KERN_ERR DRV_NAME

			": Invalid Debounce/Columdrive Time from pdata\n");

		bfin_write_KPAD_MSEL(0xFF0);	/* Default MSEL	*/

drivers/input/keyboard/corgikbd.c

+4 −4
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static int corgikbd_resume(struct platform_device *dev) 
#define corgikbd_resume		NULL

#endif



static int __init corgikbd_probe(struct platform_device *pdev)

static int __devinit corgikbd_probe(struct platform_device *pdev)

{

	struct corgikbd *corgikbd;

	struct input_dev *input_dev;
@@ -368,7 +368,7 @@ static int __init corgikbd_probe(struct platform_device *pdev) 
	return err;

}



static int corgikbd_remove(struct platform_device *pdev)

static int __devexit corgikbd_remove(struct platform_device *pdev)

{

	int i;

	struct corgikbd *corgikbd = platform_get_drvdata(pdev);
@@ -388,7 +388,7 @@ static int corgikbd_remove(struct platform_device *pdev) 


static struct platform_driver corgikbd_driver = {

	.probe		= corgikbd_probe,

	.remove		= corgikbd_remove,

	.remove		= __devexit_p(corgikbd_remove),

	.suspend	= corgikbd_suspend,

	.resume		= corgikbd_resume,

	.driver		= {
@@ -397,7 +397,7 @@ static struct platform_driver corgikbd_driver = { 
	},

};



static int __devinit corgikbd_init(void)

static int __init corgikbd_init(void)

{

	return platform_driver_register(&corgikbd_driver);

}

drivers/input/keyboard/omap-keypad.c

+4 −4
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static int omap_kp_resume(struct platform_device *dev) 
#define omap_kp_resume	NULL

#endif



static int __init omap_kp_probe(struct platform_device *pdev)

static int __devinit omap_kp_probe(struct platform_device *pdev)

{

	struct omap_kp *omap_kp;

	struct input_dev *input_dev;
@@ -422,7 +422,7 @@ err1: 
	return -EINVAL;

}



static int omap_kp_remove(struct platform_device *pdev)

static int __devexit omap_kp_remove(struct platform_device *pdev)

{

	struct omap_kp *omap_kp = platform_get_drvdata(pdev);
@@ -454,7 +454,7 @@ static int omap_kp_remove(struct platform_device *pdev) 


static struct platform_driver omap_kp_driver = {

	.probe		= omap_kp_probe,

	.remove		= omap_kp_remove,

	.remove		= __devexit_p(omap_kp_remove),

	.suspend	= omap_kp_suspend,

	.resume		= omap_kp_resume,

	.driver		= {
@@ -463,7 +463,7 @@ static struct platform_driver omap_kp_driver = { 
	},

};



static int __devinit omap_kp_init(void)

static int __init omap_kp_init(void)

{

	printk(KERN_INFO "OMAP Keypad Driver\n");

	return platform_driver_register(&omap_kp_driver);

drivers/input/keyboard/spitzkbd.c

+4 −4
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static int spitzkbd_resume(struct platform_device *dev) 
#define spitzkbd_resume		NULL

#endif



static int __init spitzkbd_probe(struct platform_device *dev)

static int __devinit spitzkbd_probe(struct platform_device *dev)

{

	struct spitzkbd *spitzkbd;

	struct input_dev *input_dev;
@@ -444,7 +444,7 @@ static int __init spitzkbd_probe(struct platform_device *dev) 
	return err;

}



static int spitzkbd_remove(struct platform_device *dev)

static int __devexit spitzkbd_remove(struct platform_device *dev)

{

	int i;

	struct spitzkbd *spitzkbd = platform_get_drvdata(dev);
@@ -470,7 +470,7 @@ static int spitzkbd_remove(struct platform_device *dev) 


static struct platform_driver spitzkbd_driver = {

	.probe		= spitzkbd_probe,

	.remove		= spitzkbd_remove,

	.remove		= __devexit_p(spitzkbd_remove),

	.suspend	= spitzkbd_suspend,

	.resume		= spitzkbd_resume,

	.driver		= {
@@ -479,7 +479,7 @@ static struct platform_driver spitzkbd_driver = { 
	},

};



static int __devinit spitzkbd_init(void)

static int __init spitzkbd_init(void)

{

	return platform_driver_register(&spitzkbd_driver);

}