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

Commit 17528b31 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pnp' 

* pnp:
  PNP: Avoid leaving unregistered device objects in lists
  PNP: Convert pnp_lock into a mutex
  PNP: tty/serial/8250/8250_fintek: Use module_pnp_driver to register driver
  PNP: platform/x86/apple-gmux: Use module_pnp_driver to register driver
  PNP: net/sb1000: Use module_pnp_driver to register driver
  PNP: media/rc: Use module_pnp_driver to register driver
  PNP: ide/ide-pnp: Use module_pnp_driver to register driver
  PNP: ata/pata_isapnp: Use module_pnp_driver to register driver
  PNP: tpm/tpm_infineon: Use module_pnp_driver to register driver
  PNP: Add helper macro for pnp_register_driver boilerplate
  PNP / ACPI: Use ACPI_COMPANION_SET() during initialization
parents 9a9ca16e 71150d22

drivers/ata/pata_isapnp.c

+1 −13
Original line number Diff line number Diff line
@@ -128,20 +128,8 @@ static struct pnp_driver isapnp_driver = { 
	.remove		= isapnp_remove_one,

};



static int __init isapnp_init(void)

{

	return pnp_register_driver(&isapnp_driver);

}



static void __exit isapnp_exit(void)

{

	pnp_unregister_driver(&isapnp_driver);

}



module_pnp_driver(isapnp_driver);

MODULE_AUTHOR("Alan Cox");

MODULE_DESCRIPTION("low-level driver for ISA PnP ATA");

MODULE_LICENSE("GPL");

MODULE_VERSION(DRV_VERSION);
 


module_init(isapnp_init);

module_exit(isapnp_exit);

drivers/char/tpm/tpm_infineon.c

+1 −12
Original line number Diff line number Diff line
@@ -637,18 +637,7 @@ static struct pnp_driver tpm_inf_pnp_driver = { 
	.remove = tpm_inf_pnp_remove

};



static int __init init_inf(void)

{

	return pnp_register_driver(&tpm_inf_pnp_driver);

}



static void __exit cleanup_inf(void)

{

	pnp_unregister_driver(&tpm_inf_pnp_driver);

}



module_init(init_inf);

module_exit(cleanup_inf);

module_pnp_driver(tpm_inf_pnp_driver);



MODULE_AUTHOR("Marcel Selhorst <tpmdd@sirrix.com>");

MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2");

drivers/ide/ide-pnp.c

+1 −13
Original line number Diff line number Diff line
@@ -96,17 +96,5 @@ static struct pnp_driver idepnp_driver = { 
	.remove		= idepnp_remove,

};



static int __init pnpide_init(void)

{

	return pnp_register_driver(&idepnp_driver);

}



static void __exit pnpide_exit(void)

{

	pnp_unregister_driver(&idepnp_driver);

}



module_init(pnpide_init);

module_exit(pnpide_exit);



module_pnp_driver(idepnp_driver);

MODULE_LICENSE("GPL");

drivers/media/rc/ene_ir.c

+1 −12
Original line number Diff line number Diff line
@@ -1195,16 +1195,6 @@ static struct pnp_driver ene_driver = { 
	.shutdown = ene_shutdown,

};



static int __init ene_init(void)

{

	return pnp_register_driver(&ene_driver);

}



static void ene_exit(void)

{

	pnp_unregister_driver(&ene_driver);

}



module_param(sample_period, int, S_IRUGO);

MODULE_PARM_DESC(sample_period, "Hardware sample period (50 us default)");
@@ -1226,5 +1216,4 @@ MODULE_DESCRIPTION 
MODULE_AUTHOR("Maxim Levitsky");

MODULE_LICENSE("GPL");



module_init(ene_init);

module_exit(ene_exit);
 
module_pnp_driver(ene_driver);

drivers/media/rc/fintek-cir.c

+1 −12
Original line number Diff line number Diff line
@@ -684,16 +684,6 @@ static struct pnp_driver fintek_driver = { 
	.shutdown	= fintek_shutdown,

};



static int __init fintek_init(void)

{

	return pnp_register_driver(&fintek_driver);

}



static void __exit fintek_exit(void)

{

	pnp_unregister_driver(&fintek_driver);

}



module_param(debug, int, S_IRUGO | S_IWUSR);

MODULE_PARM_DESC(debug, "Enable debugging output");
@@ -703,5 +693,4 @@ MODULE_DESCRIPTION(FINTEK_DESCRIPTION " driver"); 
MODULE_AUTHOR("Jarod Wilson <jarod@redhat.com>");

MODULE_LICENSE("GPL");



module_init(fintek_init);

module_exit(fintek_exit);
 
module_pnp_driver(fintek_driver);