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

Commit 2485a4b6 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: bcm5974 - set BUTTONPAD property
  Input: serio_raw - return proper result when serio_raw_write fails
  Input: serio_raw - really signal HUP upon disconnect
  Input: serio_raw - remove stray semicolon
  Input: revert some over-zealous conversions to module_platform_driver()
parents 6733e54b 52965cc0

drivers/input/keyboard/amikbd.c

+14 −1
Original line number Diff line number Diff line
@@ -259,6 +259,19 @@ static struct platform_driver amikbd_driver = { 
		.owner	= THIS_MODULE,

	},

};

module_platform_driver(amikbd_driver);



static int __init amikbd_init(void)

{

	return platform_driver_probe(&amikbd_driver, amikbd_probe);

}



module_init(amikbd_init);



static void __exit amikbd_exit(void)

{

	platform_driver_unregister(&amikbd_driver);

}



module_exit(amikbd_exit);



MODULE_ALIAS("platform:amiga-keyboard");

drivers/input/keyboard/davinci_keyscan.c

+12 −1
Original line number Diff line number Diff line
@@ -328,7 +328,18 @@ static struct platform_driver davinci_ks_driver = { 
	},

	.remove	= __devexit_p(davinci_ks_remove),

};

module_platform_driver(davinci_ks_driver);



static int __init davinci_ks_init(void)

{

	return platform_driver_probe(&davinci_ks_driver, davinci_ks_probe);

}

module_init(davinci_ks_init);



static void __exit davinci_ks_exit(void)

{

	platform_driver_unregister(&davinci_ks_driver);

}

module_exit(davinci_ks_exit);



MODULE_AUTHOR("Miguel Aguilar");

MODULE_DESCRIPTION("Texas Instruments DaVinci Key Scan Driver");

drivers/input/keyboard/nomadik-ske-keypad.c

+12 −1
Original line number Diff line number Diff line
@@ -390,7 +390,18 @@ static struct platform_driver ske_keypad_driver = { 
	.probe = ske_keypad_probe,

	.remove = __devexit_p(ske_keypad_remove),

};

module_platform_driver(ske_keypad_driver);



static int __init ske_keypad_init(void)

{

	return platform_driver_probe(&ske_keypad_driver, ske_keypad_probe);

}

module_init(ske_keypad_init);



static void __exit ske_keypad_exit(void)

{

	platform_driver_unregister(&ske_keypad_driver);

}

module_exit(ske_keypad_exit);



MODULE_LICENSE("GPL v2");

MODULE_AUTHOR("Naveen Kumar <naveen.gaddipati@stericsson.com> / Sundar Iyer <sundar.iyer@stericsson.com>");

drivers/input/misc/twl4030-pwrbutton.c

+13 −2
Original line number Diff line number Diff line
@@ -107,14 +107,25 @@ static int __exit twl4030_pwrbutton_remove(struct platform_device *pdev) 
}



static struct platform_driver twl4030_pwrbutton_driver = {

	.probe		= twl4030_pwrbutton_probe,

	.remove		= __exit_p(twl4030_pwrbutton_remove),

	.driver		= {

		.name	= "twl4030_pwrbutton",

		.owner	= THIS_MODULE,

	},

};

module_platform_driver(twl4030_pwrbutton_driver);



static int __init twl4030_pwrbutton_init(void)

{

	return platform_driver_probe(&twl4030_pwrbutton_driver,

			twl4030_pwrbutton_probe);

}

module_init(twl4030_pwrbutton_init);



static void __exit twl4030_pwrbutton_exit(void)

{

	platform_driver_unregister(&twl4030_pwrbutton_driver);

}

module_exit(twl4030_pwrbutton_exit);



MODULE_ALIAS("platform:twl4030_pwrbutton");

MODULE_DESCRIPTION("Triton2 Power Button");

drivers/input/mouse/amimouse.c

+14 −2
Original line number Diff line number Diff line
@@ -140,13 +140,25 @@ static int __exit amimouse_remove(struct platform_device *pdev) 
}



static struct platform_driver amimouse_driver = {

	.probe = amimouse_probe,

	.remove = __exit_p(amimouse_remove),

	.driver   = {

		.name	= "amiga-mouse",

		.owner	= THIS_MODULE,

	},

};

module_platform_driver(amimouse_driver);



static int __init amimouse_init(void)

{

	return platform_driver_probe(&amimouse_driver, amimouse_probe);

}



module_init(amimouse_init);



static void __exit amimouse_exit(void)

{

	platform_driver_unregister(&amimouse_driver);

}



module_exit(amimouse_exit);



MODULE_ALIAS("platform:amiga-mouse");