Commit 85417aef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide 

Pull IDE cleanup from David Miller:
 "Just one minor cleanup"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: use module_platform_driver()
parents 049711bf a53dae49

drivers/ide/au1xxx-ide.c

+1 −12
Original line number Diff line number Diff line
@@ -592,18 +592,7 @@ static struct platform_driver au1200_ide_driver = { 
	.remove		= au_ide_remove,

};



static int __init au_ide_init(void)

{

	return platform_driver_register(&au1200_ide_driver);

}



static void __exit au_ide_exit(void)

{

	platform_driver_unregister(&au1200_ide_driver);

}

module_platform_driver(au1200_ide_driver);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("AU1200 IDE driver");
 


module_init(au_ide_init);

module_exit(au_ide_exit);

drivers/ide/ide_platform.c

+1 −12
Original line number Diff line number Diff line
@@ -131,19 +131,8 @@ static struct platform_driver platform_ide_driver = { 
	.remove = plat_ide_remove,

};



static int __init platform_ide_init(void)

{

	return platform_driver_register(&platform_ide_driver);

}



static void __exit platform_ide_exit(void)

{

	platform_driver_unregister(&platform_ide_driver);

}

module_platform_driver(platform_ide_driver);



MODULE_DESCRIPTION("Platform IDE driver");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:pata_platform");
 


module_init(platform_ide_init);

module_exit(platform_ide_exit);