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

Commit 2fc75da0 authored by Axel Lin's avatar Axel Lin Committed by Jeff Garzik
Browse files

ata: use module_pci_driver 



This patch converts the drivers in drivers/ata/* to use module_pci_driver()
macro which makes the code smaller and a bit simpler.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: Mikael Pettersson <mikpe@it.uu.se>
Cc: Mark Lord <kernel@teksavvy.com>
Cc: Jeremy Higdon <jeremy@sgi.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent b08f5bc4

drivers/ata/acard-ahci.c

+1 −12
Original line number Diff line number Diff line
@@ -503,21 +503,10 @@ static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id 
				 &acard_ahci_sht);

}



static int __init acard_ahci_init(void)

{

	return pci_register_driver(&acard_ahci_pci_driver);

}



static void __exit acard_ahci_exit(void)

{

	pci_unregister_driver(&acard_ahci_pci_driver);

}

module_pci_driver(acard_ahci_pci_driver);



MODULE_AUTHOR("Jeff Garzik");

MODULE_DESCRIPTION("ACard AHCI SATA low-level driver");

MODULE_LICENSE("GPL");

MODULE_DEVICE_TABLE(pci, acard_ahci_pci_tbl);

MODULE_VERSION(DRV_VERSION);
 


module_init(acard_ahci_init);

module_exit(acard_ahci_exit);

drivers/ata/ahci.c

+1 −13
Original line number Diff line number Diff line
@@ -1249,22 +1249,10 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
				 &ahci_sht);

}



static int __init ahci_init(void)

{

	return pci_register_driver(&ahci_pci_driver);

}



static void __exit ahci_exit(void)

{

	pci_unregister_driver(&ahci_pci_driver);

}



module_pci_driver(ahci_pci_driver);



MODULE_AUTHOR("Jeff Garzik");

MODULE_DESCRIPTION("AHCI SATA low-level driver");

MODULE_LICENSE("GPL");

MODULE_DEVICE_TABLE(pci, ahci_pci_tbl);

MODULE_VERSION(DRV_VERSION);
 


module_init(ahci_init);

module_exit(ahci_exit);

drivers/ata/ata_generic.c

+1 −14
Original line number Diff line number Diff line
@@ -255,17 +255,7 @@ static struct pci_driver ata_generic_pci_driver = { 
#endif

};



static int __init ata_generic_init(void)

{

	return pci_register_driver(&ata_generic_pci_driver);

}





static void __exit ata_generic_exit(void)

{

	pci_unregister_driver(&ata_generic_pci_driver);

}



module_pci_driver(ata_generic_pci_driver);



MODULE_AUTHOR("Alan Cox");

MODULE_DESCRIPTION("low-level driver for generic ATA");
@@ -273,7 +263,4 @@ MODULE_LICENSE("GPL"); 
MODULE_DEVICE_TABLE(pci, ata_generic);

MODULE_VERSION(DRV_VERSION);



module_init(ata_generic_init);

module_exit(ata_generic_exit);



module_param(all_generic_ide, int, 0);

drivers/ata/pata_acpi.c

+1 −13
Original line number Diff line number Diff line
@@ -273,22 +273,10 @@ static struct pci_driver pacpi_pci_driver = { 
#endif

};



static int __init pacpi_init(void)

{

	return pci_register_driver(&pacpi_pci_driver);

}



static void __exit pacpi_exit(void)

{

	pci_unregister_driver(&pacpi_pci_driver);

}



module_init(pacpi_init);

module_exit(pacpi_exit);

module_pci_driver(pacpi_pci_driver);



MODULE_AUTHOR("Alan Cox");

MODULE_DESCRIPTION("SCSI low-level driver for ATA in ACPI mode");

MODULE_LICENSE("GPL");

MODULE_DEVICE_TABLE(pci, pacpi_pci_tbl);

MODULE_VERSION(DRV_VERSION);

drivers/ata/pata_amd.c

+1 −12
Original line number Diff line number Diff line
@@ -632,21 +632,10 @@ static struct pci_driver amd_pci_driver = { 
#endif

};



static int __init amd_init(void)

{

	return pci_register_driver(&amd_pci_driver);

}



static void __exit amd_exit(void)

{

	pci_unregister_driver(&amd_pci_driver);

}

module_pci_driver(amd_pci_driver);



MODULE_AUTHOR("Alan Cox");

MODULE_DESCRIPTION("low-level driver for AMD and Nvidia PATA IDE");

MODULE_LICENSE("GPL");

MODULE_DEVICE_TABLE(pci, amd);

MODULE_VERSION(DRV_VERSION);
 


module_init(amd_init);

module_exit(amd_exit);